Skip to content
Snippets Groups Projects
Commit 9f6c5261 authored by Stefan Richter's avatar Stefan Richter
Browse files

Updated HideUI to new Input System Package.

parent d4e60a00
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 613 additions and 63 deletions
Assets/Scripts/UI/HideUI.cs
+ 224
− 31
View file @ 9f6c5261
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
using UnityEngine.SceneManagement; using UnityEngine.SceneManagement;
using static CommunicationEvents; using static CommunicationEvents;
using static UIconfig; using static UIconfig;
using System.Collections;
//using static CamControl_1; //using static CamControl_1;
public class HideUI : MonoBehaviour public class HideUI : MonoBehaviour
...@@ -19,7 +20,8 @@ public string ...@@ -19,7 +20,8 @@ public string
modload; modload;
public string cancel_keyBind; public string cancel_keyBind;
public string MathM_keyBind; public string MathM_keyBind;
public float waitingBetweenInputs = 0.2f;
private double numinputtrigger = 0;
public UnityStandardAssets.Characters.FirstPerson.FirstPersonController CamControl_StdAsset; public UnityStandardAssets.Characters.FirstPerson.FirstPersonController CamControl_StdAsset;
...@@ -33,10 +35,52 @@ public string ...@@ -33,10 +35,52 @@ public string
//public MeshRenderer CursorRenderer_FirstP_oldInpOrig; //public MeshRenderer CursorRenderer_FirstP_oldInpOrig;
//public int whichCursor; //public int whichCursor;
private ControlMapping input_ControlMapping;
internal Canvas UICanvas; internal Canvas UICanvas;
private void Awake()
{
//New InputSystem
input_ControlMapping = new ControlMapping();
input_ControlMapping.Actionmap1.Cancel.Enable();
input_ControlMapping.Actionmap1.ToolMode.Enable();
input_ControlMapping.Actionmap1.MathMode.Enable();
input_ControlMapping.Actionmap1.Modifier.Enable();
input_ControlMapping.Actionmap1.Load.Enable();
input_ControlMapping.Actionmap1.Save.Enable();
input_ControlMapping.Actionmap1.Reset.Enable();
input_ControlMapping.Actionmap1.Undo.Enable();
input_ControlMapping.Actionmap1.Redo.Enable();
}
private void OnEnable()
{
input_ControlMapping.Actionmap1.Cancel.Enable();
input_ControlMapping.Actionmap1.ToolMode.Enable();
input_ControlMapping.Actionmap1.MathMode.Enable();
input_ControlMapping.Actionmap1.Modifier.Enable();
input_ControlMapping.Actionmap1.Load.Enable();
input_ControlMapping.Actionmap1.Save.Enable();
input_ControlMapping.Actionmap1.Reset.Enable();
input_ControlMapping.Actionmap1.Undo.Enable();
input_ControlMapping.Actionmap1.Redo.Enable();
}
private void OnDisable()
{
input_ControlMapping.Actionmap1.Cancel.Disable();
input_ControlMapping.Actionmap1.ToolMode.Disable();
input_ControlMapping.Actionmap1.MathMode.Disable();
input_ControlMapping.Actionmap1.Modifier.Enable();
input_ControlMapping.Actionmap1.Load.Disable();
input_ControlMapping.Actionmap1.Save.Disable();
input_ControlMapping.Actionmap1.Reset.Disable();
input_ControlMapping.Actionmap1.Undo.Disable();
input_ControlMapping.Actionmap1.Redo.Disable();
}
void Start() void Start()
{ {
if (UIconfig.FrameITUIversion == 1) // 1= FrameITUI; 2= FrameITUI_mobil if (UIconfig.FrameITUIversion == 1) // 1= FrameITUI; 2= FrameITUI_mobil
...@@ -70,6 +114,31 @@ void Start2() ...@@ -70,6 +114,31 @@ void Start2()
SetCursorRenderer123(camActive); SetCursorRenderer123(camActive);
} }
}
void Start3()
{
print("Start3");
/*
UIconfig.CanvasOnOff_Array[14] = 1;
UIconfig.CanvasOnOff_Array[20] = 0;
//setUI_Vis_walk(0);
//UIconfig.CanvasOnOff_Array[20] = 0;
*/
Update();
/*
//CheckUI_Vis_walk();
UIconfig.CanvasOnOff_Array[14] = 0;
UIconfig.CanvasOnOff_Array[20] = 1;
UIconfig.CanvasOnOff_Array[10] = 1;
UIconfig.CanvasOnOff_Array[3] = 1;
*/
SetCamControl123(false);
} }
// Update is called once per frame // Update is called once per frame
...@@ -78,11 +147,45 @@ void Update() ...@@ -78,11 +147,45 @@ void Update()
if (UIconfig.FrameITUIversion == 1) if (UIconfig.FrameITUIversion == 1)
{ {
Update3();
}
}
void Update3()
{
//CheckUI_Vis_walk();
CheckIf();
Update2(); Update2();
CheckUI_Vis();
} }
IEnumerator slowInput()
{
yield return new WaitForSecondsRealtime(waitingBetweenInputs);
numinputtrigger = 0;
yield return null;
} }
void CheckIf()
{
void Update2() { if (UIconfig.InputManagerVersion == 1)
{
if (Input.GetButtonDown(cancel_keyBind))
{
UIconfig.CanvasOnOff_Array[02] = 1;
//UIconfig.CanvasOnOff_Array[10] = 0;
return;
}
if (Input.GetButtonDown(MathM_keyBind)) if (Input.GetButtonDown(MathM_keyBind))
{ {
...@@ -102,8 +205,67 @@ void Update2() { ...@@ -102,8 +205,67 @@ void Update2() {
UICanvas.enabled = !UICanvas.enabled; UICanvas.enabled = !UICanvas.enabled;
} }
}
}
if (UIconfig.InputManagerVersion == 2 && numinputtrigger == 0)
{
if (input_ControlMapping.Actionmap1.Cancel.ReadValue<float>() != 0)
{
numinputtrigger++;
StartCoroutine(slowInput());
UIconfig.CanvasOnOff_Array[02] = 1;
//UIconfig.CanvasOnOff_Array[10] = 0;
return;
}
if (input_ControlMapping.Actionmap1.MathMode.ReadValue<float>() != 0)
{
numinputtrigger++;
StartCoroutine(slowInput());
if (LockOnly)
{
CamControl_StdAsset.enabled = !CamControl_StdAsset.enabled;
SetCursorRenderer123(CamControl_StdAsset.enabled);
SetCamControl123(CamControl_StdAsset.enabled);
}
else
{
Cursor.visible = !UICanvas.enabled;
SetCamControl123(UICanvas.enabled);
SetCursorRenderer123(UICanvas.enabled);
UICanvas.enabled = !UICanvas.enabled;
}
}
} }
else if (Input.GetButton(modifier))
}
void CheckUI_Vis()
{
GadgetCanBeUsed = true;
}
void Update2() {
if (UIconfig.InputManagerVersion == 1)
{
if (Input.GetButton(modifier))
{ {
if (Input.GetButtonDown(modundo)) if (Input.GetButtonDown(modundo))
StageStatic.stage.factState.undo(); StageStatic.stage.factState.undo();
...@@ -119,12 +281,43 @@ void Update2() { ...@@ -119,12 +281,43 @@ void Update2() {
StageStatic.LoadInitStage(StageStatic.stage.name, !StageStatic.stage.use_install_folder); StageStatic.LoadInitStage(StageStatic.stage.name, !StageStatic.stage.use_install_folder);
} }
} }
if (Input.GetButtonDown(cancel_keyBind)) }
if (UIconfig.InputManagerVersion == 2)
{ {
if (input_ControlMapping.Actionmap1.Modifier.ReadValue<float>() != 0)
UIconfig.CanvasOnOff_Array[02] = 1; {
//UIconfig.CanvasOnOff_Array[10] = 0; if (input_ControlMapping.Actionmap1.Undo.ReadValue<float>() != 0 && numinputtrigger == 0)
return; {
StageStatic.stage.factState.undo();
numinputtrigger++;
StartCoroutine(slowInput());
}
else if (input_ControlMapping.Actionmap1.Redo.ReadValue<float>() != 0 && numinputtrigger == 0)
{
StageStatic.stage.factState.redo();
numinputtrigger++;
StartCoroutine(slowInput());
}
else if (input_ControlMapping.Actionmap1.Reset.ReadValue<float>() != 0 && numinputtrigger == 0)
{
StageStatic.stage.factState.softreset();
numinputtrigger++;
StartCoroutine(slowInput());
}
else if (input_ControlMapping.Actionmap1.Save.ReadValue<float>() != 0 && numinputtrigger < 10)
{
StageStatic.stage.push_record();
numinputtrigger = numinputtrigger + 10;
StartCoroutine(slowInput());
}
else if (input_ControlMapping.Actionmap1.Load.ReadValue<float>() != 0 && numinputtrigger == 0)
{
StageStatic.stage.factState.hardreset();
StageStatic.LoadInitStage(StageStatic.stage.name, !StageStatic.stage.use_install_folder);
numinputtrigger++;
StartCoroutine(slowInput());
}
}
} }
/* /*
......
Assets/Scripts/UI/HideUI_mobile.cs
+ 84
− 27
View file @ 9f6c5261
...@@ -43,6 +43,12 @@ private void Awake() ...@@ -43,6 +43,12 @@ private void Awake()
input_ControlMapping.Actionmap1.Cancel.Enable(); input_ControlMapping.Actionmap1.Cancel.Enable();
input_ControlMapping.Actionmap1.ToolMode.Enable(); input_ControlMapping.Actionmap1.ToolMode.Enable();
input_ControlMapping.Actionmap1.MathMode.Enable(); input_ControlMapping.Actionmap1.MathMode.Enable();
input_ControlMapping.Actionmap1.Modifier.Enable();
input_ControlMapping.Actionmap1.Load.Enable();
input_ControlMapping.Actionmap1.Save.Enable();
input_ControlMapping.Actionmap1.Reset.Enable();
input_ControlMapping.Actionmap1.Undo.Enable();
input_ControlMapping.Actionmap1.Redo.Enable();
} }
private void OnEnable() private void OnEnable()
...@@ -50,6 +56,12 @@ private void OnEnable() ...@@ -50,6 +56,12 @@ private void OnEnable()
input_ControlMapping.Actionmap1.Cancel.Enable(); input_ControlMapping.Actionmap1.Cancel.Enable();
input_ControlMapping.Actionmap1.ToolMode.Enable(); input_ControlMapping.Actionmap1.ToolMode.Enable();
input_ControlMapping.Actionmap1.MathMode.Enable(); input_ControlMapping.Actionmap1.MathMode.Enable();
input_ControlMapping.Actionmap1.Modifier.Enable();
input_ControlMapping.Actionmap1.Load.Enable();
input_ControlMapping.Actionmap1.Save.Enable();
input_ControlMapping.Actionmap1.Reset.Enable();
input_ControlMapping.Actionmap1.Undo.Enable();
input_ControlMapping.Actionmap1.Redo.Enable();
} }
private void OnDisable() private void OnDisable()
...@@ -57,6 +69,12 @@ private void OnDisable() ...@@ -57,6 +69,12 @@ private void OnDisable()
input_ControlMapping.Actionmap1.Cancel.Disable(); input_ControlMapping.Actionmap1.Cancel.Disable();
input_ControlMapping.Actionmap1.ToolMode.Disable(); input_ControlMapping.Actionmap1.ToolMode.Disable();
input_ControlMapping.Actionmap1.MathMode.Disable(); input_ControlMapping.Actionmap1.MathMode.Disable();
input_ControlMapping.Actionmap1.Modifier.Enable();
input_ControlMapping.Actionmap1.Load.Disable();
input_ControlMapping.Actionmap1.Save.Disable();
input_ControlMapping.Actionmap1.Reset.Disable();
input_ControlMapping.Actionmap1.Undo.Disable();
input_ControlMapping.Actionmap1.Redo.Disable();
} }
...@@ -122,8 +140,6 @@ void Start3() ...@@ -122,8 +140,6 @@ void Start3()
UIconfig.CanvasOnOff_Array[3] = 1; UIconfig.CanvasOnOff_Array[3] = 1;
SetCamControl123(false); SetCamControl123(false);
Update();
print("Start4");
} }
...@@ -152,10 +168,9 @@ void Update3() ...@@ -152,10 +168,9 @@ void Update3()
CheckUI_Vis_walk(); CheckUI_Vis_walk();
CheckIf(); CheckIf();
if (UIconfig.InputManagerVersion == 1)
{
Update2(); Update2();
}
CheckUI_Vis(); CheckUI_Vis();
} }
...@@ -514,7 +529,8 @@ void CheckUI_Vis() ...@@ -514,7 +529,8 @@ void CheckUI_Vis()
void Update2() void Update2()
{ {
if (UIconfig.InputManagerVersion == 1)
{
if (Input.GetButton(modifier)) if (Input.GetButton(modifier))
{ {
if (Input.GetButtonDown(modundo)) if (Input.GetButtonDown(modundo))
...@@ -531,7 +547,44 @@ void Update2() ...@@ -531,7 +547,44 @@ void Update2()
StageStatic.LoadInitStage(StageStatic.stage.name, !StageStatic.stage.use_install_folder); StageStatic.LoadInitStage(StageStatic.stage.name, !StageStatic.stage.use_install_folder);
} }
} }
}
if (UIconfig.InputManagerVersion == 2)
{
if (input_ControlMapping.Actionmap1.Modifier.ReadValue<float>() != 0)
{
if (input_ControlMapping.Actionmap1.Undo.ReadValue<float>() != 0 && numinputtrigger == 0)
{
StageStatic.stage.factState.undo();
numinputtrigger++;
StartCoroutine(slowInput());
}
else if (input_ControlMapping.Actionmap1.Redo.ReadValue<float>() != 0 && numinputtrigger == 0)
{
StageStatic.stage.factState.redo();
numinputtrigger++;
StartCoroutine(slowInput());
}
else if (input_ControlMapping.Actionmap1.Reset.ReadValue<float>() != 0 && numinputtrigger == 0)
{
StageStatic.stage.factState.softreset();
numinputtrigger++;
StartCoroutine(slowInput());
}
else if (input_ControlMapping.Actionmap1.Save.ReadValue<float>() != 0 && numinputtrigger < 10)
{
StageStatic.stage.push_record();
numinputtrigger= numinputtrigger+10;
StartCoroutine(slowInput());
}
else if (input_ControlMapping.Actionmap1.Load.ReadValue<float>() != 0 && numinputtrigger == 0)
{
StageStatic.stage.factState.hardreset();
StageStatic.LoadInitStage(StageStatic.stage.name, !StageStatic.stage.use_install_folder);
numinputtrigger++;
StartCoroutine(slowInput());
}
}
}
/* /*
//Todo before capturing: Make directories "UFrameIT-Screenshots/Unity_ScreenCapture" in project folder //Todo before capturing: Make directories "UFrameIT-Screenshots/Unity_ScreenCapture" in project folder
else if (Input.GetKeyDown(ScreenshotKey)) { else if (Input.GetKeyDown(ScreenshotKey)) {
...@@ -540,6 +593,10 @@ void Update2() ...@@ -540,6 +593,10 @@ void Update2()
*/ */
} }
private void SetCursorRenderer123(bool opt) private void SetCursorRenderer123(bool opt)
{ {
CursorRenderer.enabled = opt; CursorRenderer.enabled = opt;
......
Assets/Scripts/UI/PlayerControls/ControlMapping.cs
+ 180
− 0
View file @ 9f6c5261
...@@ -98,6 +98,60 @@ public @ControlMapping() ...@@ -98,6 +98,60 @@ public @ControlMapping()
""processors"": """", ""processors"": """",
""interactions"": """", ""interactions"": """",
""initialStateCheck"": false ""initialStateCheck"": false
},
{
""name"": ""Modifier"",
""type"": ""Button"",
""id"": ""1cf75c5d-6c25-442f-85f6-bda3011e9b4b"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": """",
""initialStateCheck"": false
},
{
""name"": ""Load"",
""type"": ""Button"",
""id"": ""e399348c-431a-4b20-a0d2-1521ad09a56d"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": """",
""initialStateCheck"": false
},
{
""name"": ""Save"",
""type"": ""Button"",
""id"": ""ad291feb-9419-473d-8e23-d15653e6f34d"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": """",
""initialStateCheck"": false
},
{
""name"": ""Reset"",
""type"": ""Button"",
""id"": ""d55ab964-c17f-4aa1-a32d-788cb189b6a6"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": """",
""initialStateCheck"": false
},
{
""name"": ""Undo"",
""type"": ""Button"",
""id"": ""61668718-3468-40a0-a21c-37ec8ac1c6fc"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": """",
""initialStateCheck"": false
},
{
""name"": ""Redo"",
""type"": ""Button"",
""id"": ""672b8c93-e33f-4ad1-8da0-0214551c817d"",
""expectedControlType"": ""Button"",
""processors"": """",
""interactions"": """",
""initialStateCheck"": false
} }
], ],
""bindings"": [ ""bindings"": [
...@@ -463,6 +517,72 @@ public @ControlMapping() ...@@ -463,6 +517,72 @@ public @ControlMapping()
""action"": ""Talking"", ""action"": ""Talking"",
""isComposite"": false, ""isComposite"": false,
""isPartOfComposite"": false ""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""85df03b3-004a-42f1-9305-910a2a23c72c"",
""path"": ""<Keyboard>/m"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Modifier"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""3d9f5766-f379-403b-adca-e68c3a59646f"",
""path"": ""<Keyboard>/l"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Load"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""00a13e97-1c6c-45bd-85e0-ae69f4d6ae99"",
""path"": ""<Keyboard>/s"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Save"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""a02a919b-c908-4739-bb38-0d78bf336bc5"",
""path"": ""<Keyboard>/backspace"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Reset"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""bb711fbe-cc20-4036-b440-6ccabba2354c"",
""path"": ""<Keyboard>/u"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Undo"",
""isComposite"": false,
""isPartOfComposite"": false
},
{
""name"": """",
""id"": ""fc16e4e3-32ae-4e08-8314-fe84f611e0ad"",
""path"": ""<Keyboard>/r"",
""interactions"": """",
""processors"": """",
""groups"": """",
""action"": ""Redo"",
""isComposite"": false,
""isPartOfComposite"": false
} }
] ]
}, },
...@@ -1252,6 +1372,12 @@ public @ControlMapping() ...@@ -1252,6 +1372,12 @@ public @ControlMapping()
m_Actionmap1_ToolMode = m_Actionmap1.FindAction("ToolMode", throwIfNotFound: true); m_Actionmap1_ToolMode = m_Actionmap1.FindAction("ToolMode", throwIfNotFound: true);
m_Actionmap1_MathMode = m_Actionmap1.FindAction("MathMode", throwIfNotFound: true); m_Actionmap1_MathMode = m_Actionmap1.FindAction("MathMode", throwIfNotFound: true);
m_Actionmap1_Talking = m_Actionmap1.FindAction("Talking", throwIfNotFound: true); m_Actionmap1_Talking = m_Actionmap1.FindAction("Talking", throwIfNotFound: true);
m_Actionmap1_Modifier = m_Actionmap1.FindAction("Modifier", throwIfNotFound: true);
m_Actionmap1_Load = m_Actionmap1.FindAction("Load", throwIfNotFound: true);
m_Actionmap1_Save = m_Actionmap1.FindAction("Save", throwIfNotFound: true);
m_Actionmap1_Reset = m_Actionmap1.FindAction("Reset", throwIfNotFound: true);
m_Actionmap1_Undo = m_Actionmap1.FindAction("Undo", throwIfNotFound: true);
m_Actionmap1_Redo = m_Actionmap1.FindAction("Redo", throwIfNotFound: true);
// Actnmp_HC_Bttn // Actnmp_HC_Bttn
m_Actnmp_HC_Bttn = asset.FindActionMap("Actnmp_HC_Bttn", throwIfNotFound: true); m_Actnmp_HC_Bttn = asset.FindActionMap("Actnmp_HC_Bttn", throwIfNotFound: true);
m_Actnmp_HC_Bttn_Movement = m_Actnmp_HC_Bttn.FindAction("Movement", throwIfNotFound: true); m_Actnmp_HC_Bttn_Movement = m_Actnmp_HC_Bttn.FindAction("Movement", throwIfNotFound: true);
...@@ -1335,6 +1461,12 @@ public int FindBinding(InputBinding bindingMask, out InputAction action) ...@@ -1335,6 +1461,12 @@ public int FindBinding(InputBinding bindingMask, out InputAction action)
private readonly InputAction m_Actionmap1_ToolMode; private readonly InputAction m_Actionmap1_ToolMode;
private readonly InputAction m_Actionmap1_MathMode; private readonly InputAction m_Actionmap1_MathMode;
private readonly InputAction m_Actionmap1_Talking; private readonly InputAction m_Actionmap1_Talking;
private readonly InputAction m_Actionmap1_Modifier;
private readonly InputAction m_Actionmap1_Load;
private readonly InputAction m_Actionmap1_Save;
private readonly InputAction m_Actionmap1_Reset;
private readonly InputAction m_Actionmap1_Undo;
private readonly InputAction m_Actionmap1_Redo;
public struct Actionmap1Actions public struct Actionmap1Actions
{ {
private @ControlMapping m_Wrapper; private @ControlMapping m_Wrapper;
...@@ -1347,6 +1479,12 @@ public struct Actionmap1Actions ...@@ -1347,6 +1479,12 @@ public struct Actionmap1Actions
public InputAction @ToolMode => m_Wrapper.m_Actionmap1_ToolMode; public InputAction @ToolMode => m_Wrapper.m_Actionmap1_ToolMode;
public InputAction @MathMode => m_Wrapper.m_Actionmap1_MathMode; public InputAction @MathMode => m_Wrapper.m_Actionmap1_MathMode;
public InputAction @Talking => m_Wrapper.m_Actionmap1_Talking; public InputAction @Talking => m_Wrapper.m_Actionmap1_Talking;
public InputAction @Modifier => m_Wrapper.m_Actionmap1_Modifier;
public InputAction @Load => m_Wrapper.m_Actionmap1_Load;
public InputAction @Save => m_Wrapper.m_Actionmap1_Save;
public InputAction @Reset => m_Wrapper.m_Actionmap1_Reset;
public InputAction @Undo => m_Wrapper.m_Actionmap1_Undo;
public InputAction @Redo => m_Wrapper.m_Actionmap1_Redo;
public InputActionMap Get() { return m_Wrapper.m_Actionmap1; } public InputActionMap Get() { return m_Wrapper.m_Actionmap1; }
public void Enable() { Get().Enable(); } public void Enable() { Get().Enable(); }
public void Disable() { Get().Disable(); } public void Disable() { Get().Disable(); }
...@@ -1380,6 +1518,24 @@ public void SetCallbacks(IActionmap1Actions instance) ...@@ -1380,6 +1518,24 @@ public void SetCallbacks(IActionmap1Actions instance)
@Talking.started -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnTalking; @Talking.started -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnTalking;
@Talking.performed -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnTalking; @Talking.performed -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnTalking;
@Talking.canceled -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnTalking; @Talking.canceled -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnTalking;
@Modifier.started -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnModifier;
@Modifier.performed -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnModifier;
@Modifier.canceled -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnModifier;
@Load.started -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnLoad;
@Load.performed -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnLoad;
@Load.canceled -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnLoad;
@Save.started -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnSave;
@Save.performed -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnSave;
@Save.canceled -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnSave;
@Reset.started -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnReset;
@Reset.performed -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnReset;
@Reset.canceled -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnReset;
@Undo.started -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnUndo;
@Undo.performed -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnUndo;
@Undo.canceled -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnUndo;
@Redo.started -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnRedo;
@Redo.performed -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnRedo;
@Redo.canceled -= m_Wrapper.m_Actionmap1ActionsCallbackInterface.OnRedo;
} }
m_Wrapper.m_Actionmap1ActionsCallbackInterface = instance; m_Wrapper.m_Actionmap1ActionsCallbackInterface = instance;
if (instance != null) if (instance != null)
...@@ -1408,6 +1564,24 @@ public void SetCallbacks(IActionmap1Actions instance) ...@@ -1408,6 +1564,24 @@ public void SetCallbacks(IActionmap1Actions instance)
@Talking.started += instance.OnTalking; @Talking.started += instance.OnTalking;
@Talking.performed += instance.OnTalking; @Talking.performed += instance.OnTalking;
@Talking.canceled += instance.OnTalking; @Talking.canceled += instance.OnTalking;
@Modifier.started += instance.OnModifier;
@Modifier.performed += instance.OnModifier;
@Modifier.canceled += instance.OnModifier;
@Load.started += instance.OnLoad;
@Load.performed += instance.OnLoad;
@Load.canceled += instance.OnLoad;
@Save.started += instance.OnSave;
@Save.performed += instance.OnSave;
@Save.canceled += instance.OnSave;
@Reset.started += instance.OnReset;
@Reset.performed += instance.OnReset;
@Reset.canceled += instance.OnReset;
@Undo.started += instance.OnUndo;
@Undo.performed += instance.OnUndo;
@Undo.canceled += instance.OnUndo;
@Redo.started += instance.OnRedo;
@Redo.performed += instance.OnRedo;
@Redo.canceled += instance.OnRedo;
} }
} }
} }
...@@ -1613,6 +1787,12 @@ public interface IActionmap1Actions ...@@ -1613,6 +1787,12 @@ public interface IActionmap1Actions
void OnToolMode(InputAction.CallbackContext context); void OnToolMode(InputAction.CallbackContext context);
void OnMathMode(InputAction.CallbackContext context); void OnMathMode(InputAction.CallbackContext context);
void OnTalking(InputAction.CallbackContext context); void OnTalking(InputAction.CallbackContext context);
void OnModifier(InputAction.CallbackContext context);
void OnLoad(InputAction.CallbackContext context);
void OnSave(InputAction.CallbackContext context);
void OnReset(InputAction.CallbackContext context);
void OnUndo(InputAction.CallbackContext context);
void OnRedo(InputAction.CallbackContext context);
} }
public interface IActnmp_HC_BttnActions public interface IActnmp_HC_BttnActions
{ {
......
Assets/Scripts/UI/PlayerControls/ControlMapping.inputactions
+ 120
− 0
View file @ 9f6c5261
...@@ -76,6 +76,60 @@ ...@@ -76,6 +76,60 @@
"processors": "", "processors": "",
"interactions": "", "interactions": "",
"initialStateCheck": false "initialStateCheck": false
},
{
"name": "Modifier",
"type": "Button",
"id": "1cf75c5d-6c25-442f-85f6-bda3011e9b4b",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Load",
"type": "Button",
"id": "e399348c-431a-4b20-a0d2-1521ad09a56d",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Save",
"type": "Button",
"id": "ad291feb-9419-473d-8e23-d15653e6f34d",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Reset",
"type": "Button",
"id": "d55ab964-c17f-4aa1-a32d-788cb189b6a6",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Undo",
"type": "Button",
"id": "61668718-3468-40a0-a21c-37ec8ac1c6fc",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
},
{
"name": "Redo",
"type": "Button",
"id": "672b8c93-e33f-4ad1-8da0-0214551c817d",
"expectedControlType": "Button",
"processors": "",
"interactions": "",
"initialStateCheck": false
} }
], ],
"bindings": [ "bindings": [
...@@ -441,6 +495,72 @@ ...@@ -441,6 +495,72 @@
"action": "Talking", "action": "Talking",
"isComposite": false, "isComposite": false,
"isPartOfComposite": false "isPartOfComposite": false
},
{
"name": "",
"id": "85df03b3-004a-42f1-9305-910a2a23c72c",
"path": "<Keyboard>/m",
"interactions": "",
"processors": "",
"groups": "",
"action": "Modifier",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "3d9f5766-f379-403b-adca-e68c3a59646f",
"path": "<Keyboard>/l",
"interactions": "",
"processors": "",
"groups": "",
"action": "Load",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "00a13e97-1c6c-45bd-85e0-ae69f4d6ae99",
"path": "<Keyboard>/s",
"interactions": "",
"processors": "",
"groups": "",
"action": "Save",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "a02a919b-c908-4739-bb38-0d78bf336bc5",
"path": "<Keyboard>/backspace",
"interactions": "",
"processors": "",
"groups": "",
"action": "Reset",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "bb711fbe-cc20-4036-b440-6ccabba2354c",
"path": "<Keyboard>/u",
"interactions": "",
"processors": "",
"groups": "",
"action": "Undo",
"isComposite": false,
"isPartOfComposite": false
},
{
"name": "",
"id": "fc16e4e3-32ae-4e08-8314-fe84f611e0ad",
"path": "<Keyboard>/r",
"interactions": "",
"processors": "",
"groups": "",
"action": "Redo",
"isComposite": false,
"isPartOfComposite": false
} }
] ]
}, },
......
Assets/Stages/TechDemo B.JSON
+ 1
− 1
View file @ 9f6c5261
{"category":"Demo Category","number":0,"name":"TechDemo B","description":"River Stage","scene":"RiverWorld","use_install_folder":true,"hierarchie":[],"player_record_list":{},"player_record":{}} {"category":"Demo Category","number":0,"name":"TechDemo B","description":"River Stage","scene":"RiverWorld","use_install_folder":true,"hierarchie":[],"player_record_list":{"TechDemo B_save_0":{"solved":false,"date":-8585445539369229758,"seconds":27.484050800001569,"name":"TechDemo B_save_0"},"TechDemo B_save_1":{"solved":false,"date":-8585445539366582645,"seconds":55.249958000003971,"name":"TechDemo B_save_1"},"TechDemo B_save_2":{"solved":false,"date":-8585445539358723962,"seconds":83.800902800005133,"name":"TechDemo B_save_2"},"TechDemo B_save_3":{"solved":false,"date":-8585445539356242005,"seconds":112.60032270000738,"name":"TechDemo B_save_3"}},"player_record":{"solved":false,"date":-8585445539671936283,"seconds":112.60032270000738,"name":"TechDemo B_save"}}
\ No newline at end of file \ No newline at end of file
Assets/Stages/ValidationSets/FactStateMachines/TechDemo B_sol.JSON
+ 1
− 1
View file @ 9f6c5261
{"PointFacts":[{"Point":{"x":0.0,"y":0.0,"z":0.0,"magnitude":0.0,"sqrMagnitude":0.0},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact149","Label":"A","hasCustomLabel":false,"LabelId":1},{"Point":{"x":0.0,"y":6.0,"z":0.0,"normalized":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"magnitude":6.0,"sqrMagnitude":36.0},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact150","Label":"B","hasCustomLabel":false,"LabelId":2}],"LineFacts":[{"Distance":6.0,"Pid1":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact149","Pid2":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact150","Dir":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact151","Label":"[AB]","hasCustomLabel":false,"LabelId":0}],"RayFacts":[],"OnLineFacts":[],"AngleFacts":[],"MetaInf":{"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact149":{"workflow_id":0,"active":true},"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact150":{"workflow_id":1,"active":true},"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact151":{"workflow_id":2,"active":true}},"Workflow":[{"Id":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact149","samestep":false,"steplink":3,"creation":true},{"Id":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact150","samestep":true,"steplink":0,"creation":true},{"Id":"http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact151","samestep":true,"steplink":0,"creation":true}],"marker":3,"worksteps":1,"backlog":0,"soft_resetted":false,"invoke":false,"MaxLabelId":2,"UnusedLabelIds":[]} {"PointFacts":[{"Point":{"x":0.0,"y":0.0,"z":0.0,"magnitude":0.0,"sqrMagnitude":0.0},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact567","Label":"A","hasCustomLabel":false,"LabelId":1},{"Point":{"x":0.0,"y":6.0,"z":0.0,"normalized":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"magnitude":6.0,"sqrMagnitude":36.0},"Normal":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact568","Label":"B","hasCustomLabel":false,"LabelId":2}],"LineFacts":[{"Distance":6.0,"Pid1":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact567","Pid2":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact568","Dir":{"x":0.0,"y":1.0,"z":0.0,"magnitude":1.0,"sqrMagnitude":1.0},"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact569","Label":"[AB]","hasCustomLabel":false,"LabelId":0}],"RayFacts":[],"OnLineFacts":[],"AngleFacts":[],"MetaInf":{"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact567":{"workflow_id":0,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact568":{"workflow_id":1,"active":true},"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact569":{"workflow_id":2,"active":true}},"Workflow":[{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact567","samestep":false,"steplink":3,"creation":true},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact568","samestep":true,"steplink":0,"creation":true},{"Id":"http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact569","samestep":true,"steplink":0,"creation":true}],"marker":3,"worksteps":1,"backlog":0,"soft_resetted":false,"invoke":false,"MaxLabelId":2,"UnusedLabelIds":[]}
\ No newline at end of file \ No newline at end of file
Assets/Stages/ValidationSets/TechDemo B_val.JSON
+ 1
− 1
View file @ 9f6c5261
[{"MasterIDs":["http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact151"],"SolutionIndex":[],"RelationIndex":[],"ComparerString":"LineFactHightDirectionComparer"},{"MasterIDs":["http://mathhub.info/FrameIT/frameworld/integrationtests?SampleSituationSpace/Root?fact151"],"SolutionIndex":[],"RelationIndex":[],"ComparerString":"LineSpanningOverRiverWorldComparer"},{"MasterIDs":[],"SolutionIndex":[1],"RelationIndex":[0],"ComparerString":"LineFactHightComparer"}] [{"MasterIDs":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact569"],"SolutionIndex":[],"RelationIndex":[],"ComparerString":"LineFactHightDirectionComparer"},{"MasterIDs":["http://mathhub.info/FrameIT/frameworld?DefaultSituationSpace/SituationTheory1?fact569"],"SolutionIndex":[],"RelationIndex":[],"ComparerString":"LineSpanningOverRiverWorldComparer"},{"MasterIDs":[],"SolutionIndex":[1],"RelationIndex":[0],"ComparerString":"LineFactHightComparer"}]
\ No newline at end of file \ No newline at end of file
UserSettings/EditorUserSettings.asset
+ 2
− 2
View file @ 9f6c5261
...@@ -27,10 +27,10 @@ EditorUserSettings: ...@@ -27,10 +27,10 @@ EditorUserSettings:
value: 22424703114646680e0b0227036c721518021d39630527392304183df7e57a2decee22f0 value: 22424703114646680e0b0227036c721518021d39630527392304183df7e57a2decee22f0
flags: 0 flags: 0
RecentlyUsedScenePath-7: RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c681f041b1c39631a2f26283b2a3cf0ec3076f7e93ffdfe value: 22424703114646680e0b0227036c721518021d3963042725232a151ee7ee213dacf238e0f323
flags: 0 flags: 0
RecentlyUsedScenePath-8: RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c721518021d3963042725232a151ee7ee213dacf238e0f323 value: 22424703114646680e0b0227036c681f041b1c39631a2f26283b2a3cf0ec3076f7e93ffdfe
flags: 0 flags: 0
UnityRemoteDevice: UnityRemoteDevice:
value: 225f4d46245b0d4902070862342649191512 value: 225f4d46245b0d4902070862342649191512
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment