fix only can select capture desktop; small improvements
Add Touch Panel Air Wall Add Light Strength Slider Fix some config panel slider issues Add .blend file for cab Fix small shader issue
This commit is contained in:
@@ -21,29 +21,34 @@ public class CaptureSettingManager : MonoBehaviour
|
||||
var desktopIndexDropdown = desktopIndexWidget.GetComponent<TMP_Dropdown>();
|
||||
|
||||
modeDropdown.onValueChanged.AddListener((int value) => {
|
||||
windowTexture.captureMode = (CaptureMode)Enum.GetValues(typeof(CaptureMode)).GetValue(value) - 1;
|
||||
windowTexture.captureMode = (CaptureMode)value - 1;
|
||||
Debug.Log("CaptureFPS: " + windowTexture.captureMode);
|
||||
});
|
||||
|
||||
fpsDropdown.onValueChanged.AddListener((int value) => {
|
||||
var fps = Enum.GetName(typeof(CEnum.FPS), value);
|
||||
windowTexture.captureFrameRate = int.Parse(fps.Remove(0, 3));
|
||||
Debug.Log("CaptureFPS: " + windowTexture.captureFrameRate);
|
||||
});
|
||||
|
||||
desktopToggle.onValueChanged.AddListener((bool value) => {
|
||||
if (value)
|
||||
{
|
||||
|
||||
windowTexture.type = WindowTextureType.Desktop;
|
||||
desktopIndexDropdown.interactable = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
windowTexture.type = WindowTextureType.Desktop;
|
||||
windowTexture.type = WindowTextureType.Window;
|
||||
desktopIndexDropdown.interactable = false;
|
||||
}
|
||||
Debug.Log("CaptureTarget: " + windowTexture.type);
|
||||
});
|
||||
|
||||
desktopIndexDropdown.onValueChanged.AddListener((int value) => {
|
||||
windowTexture.desktopIndex = value;
|
||||
Debug.Log("DesktopIndex: " + windowTexture.desktopIndex);
|
||||
});
|
||||
modeDropdown.onValueChanged?.Invoke(modeDropdown.value);
|
||||
fpsDropdown.onValueChanged?.Invoke(fpsDropdown.value);
|
||||
|
||||
@@ -23,13 +23,12 @@ public class Config
|
||||
public float HapticDuration = 0.1f;
|
||||
public float HapticAmplitude = 0.75f;
|
||||
public int TouchSampleRate = 3;
|
||||
public int HandTrackingMode = 0;
|
||||
public int HandTrackingMode = 1;
|
||||
public float Threshold = 0.3f;
|
||||
public float HandStabilVelocity = 0.3f;
|
||||
public float HandStabilDistance = 0.1f;
|
||||
public float HandStabilSmooth = 0.1f;
|
||||
public bool TouchPanelAirWall = false;
|
||||
public bool UseIPCLighting = true;
|
||||
public bool UseIPCTouch = true;
|
||||
public float LightStrength = 1.35f;
|
||||
public int TestKeyBind = 40;
|
||||
public int ServiceKeyBind = 41;
|
||||
public int CoinKeyBind = 31;
|
||||
|
||||
@@ -127,30 +127,30 @@ public class ConfigManager : MonoBehaviour
|
||||
{
|
||||
var dropdown = widget.GetComponent<TMP_Dropdown>();
|
||||
// add listener to dropdown to update config by key name
|
||||
dropdown.onValueChanged.AddListener(delegate
|
||||
dropdown.onValueChanged.AddListener((int value) =>
|
||||
{
|
||||
var field = config.GetType().GetField(configPanelComponent.ConfigKeyName);
|
||||
field.SetValue(config, dropdown.value);
|
||||
field.SetValue(config, value);
|
||||
onConfigChanged?.Invoke();
|
||||
});
|
||||
}
|
||||
else if (widget.GetComponent<Toggle>() != null)
|
||||
{
|
||||
var toggle = widget.GetComponent<Toggle>();
|
||||
toggle.onValueChanged.AddListener(delegate
|
||||
toggle.onValueChanged.AddListener((bool value) =>
|
||||
{
|
||||
var field = config.GetType().GetField(configPanelComponent.ConfigKeyName);
|
||||
field.SetValue(config, toggle.isOn);
|
||||
field.SetValue(config, value);
|
||||
onConfigChanged?.Invoke();
|
||||
});
|
||||
}
|
||||
else if (widget.GetComponent<Slider>() != null)
|
||||
{
|
||||
var slider = widget.GetComponent<Slider>();
|
||||
slider.onValueChanged.AddListener(delegate
|
||||
slider.onValueChanged.AddListener((float value) =>
|
||||
{
|
||||
var field = config.GetType().GetField(configPanelComponent.ConfigKeyName);
|
||||
field.SetValue(config, slider.value);
|
||||
field.SetValue(config, value);
|
||||
onConfigChanged?.Invoke();
|
||||
});
|
||||
}
|
||||
|
||||
@@ -25,7 +25,7 @@ public class HandFollowManager : MonoBehaviour
|
||||
var threshSlider = threshWidget.GetComponent<Slider>();
|
||||
|
||||
modeDropdown.onValueChanged.AddListener((int value) => {
|
||||
VelocityThreshold = ConfigManager.config.HandStabilVelocity;
|
||||
VelocityThreshold = ConfigManager.config.Threshold;
|
||||
Mode = (CEnum.handStabilization)value;
|
||||
switch (Mode)
|
||||
{
|
||||
|
||||
@@ -18,16 +18,27 @@ public class LightManager : MonoBehaviour
|
||||
|
||||
private void Start()
|
||||
{
|
||||
var widget = ConfigManager.GetConfigPanelWidget("UseIPCLighting");
|
||||
var toggle = widget.GetComponent<Toggle>();
|
||||
toggle.onValueChanged.AddListener((value) => {
|
||||
useIPCLighting = value;
|
||||
});
|
||||
toggle.onValueChanged.Invoke(useIPCLighting);
|
||||
|
||||
for (int i = 0; i < Lights.Count; i++)
|
||||
Materials.Add(Lights[i].GetComponent<Renderer>().material);
|
||||
|
||||
var lightWidget = ConfigManager.GetConfigPanelWidget("UseIPCLighting");
|
||||
var strengthWidgent = ConfigManager.GetConfigPanelWidget("LightStrength");
|
||||
|
||||
var lightToggle = lightWidget.GetComponent<Toggle>();
|
||||
var strengthSlider = strengthWidgent.GetComponent<Slider>();
|
||||
|
||||
lightToggle.onValueChanged.AddListener((bool value) => {
|
||||
useIPCLighting = value;
|
||||
});
|
||||
|
||||
strengthSlider.onValueChanged.AddListener((float value) => {
|
||||
for (int i = 0; i < Materials.Count; i++)
|
||||
Materials[i].SetFloat("_EmissionStrength", value);
|
||||
});
|
||||
|
||||
lightToggle.onValueChanged.Invoke(useIPCLighting);
|
||||
strengthSlider.onValueChanged.Invoke(strengthSlider.value);
|
||||
|
||||
if (useIPCLighting)
|
||||
{
|
||||
RGBColor2D = new Texture2D(480, 1, TextureFormat.RGBA32, false);
|
||||
|
||||
@@ -15,7 +15,7 @@ public class ColliderToTouch : MonoBehaviour
|
||||
{
|
||||
Area = Convert.ToInt32(gameObject.name);
|
||||
}
|
||||
private void OnTriggerEnter(Collider other)
|
||||
private void OnTriggerEnter(Collider collider)
|
||||
{
|
||||
_insideColliderCount += 1;
|
||||
TouchManager.SetTouch(Area, true);
|
||||
@@ -23,7 +23,7 @@ public class ColliderToTouch : MonoBehaviour
|
||||
LightManager.UpdateFadeLight(Area, true);
|
||||
}
|
||||
|
||||
private void OnTriggerExit(Collider other)
|
||||
private void OnTriggerExit(Collider collider)
|
||||
{
|
||||
_insideColliderCount -= 1;
|
||||
_insideColliderCount = Mathf.Max(0, _insideColliderCount);
|
||||
|
||||
Reference in New Issue
Block a user