Skip to content

Commit

Permalink
Merge pull request #1 from mahilab/xbox-control
Browse files Browse the repository at this point in the history
fixing inability to reset, and resizing some text
  • Loading branch information
nathandunk authored Jun 16, 2022
2 parents e50dd21 + 7359e1d commit f71886f
Show file tree
Hide file tree
Showing 245 changed files with 449 additions and 1,005 deletions.
46 changes: 23 additions & 23 deletions unity/MOE_sim/Assets/Scenes/SampleScene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 2138677392}
m_IndirectSpecularColor: {r: 0.28502658, g: 0.37139305, b: 0.49600944, a: 1}
m_IndirectSpecularColor: {r: 0.2850269, g: 0.3713935, b: 0.49601045, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
Expand Down Expand Up @@ -1778,7 +1778,7 @@ RectTransform:
m_GameObject: {fileID: 319443974}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2, y: 2, z: 2}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1839692338}
- {fileID: 1265535138}
Expand All @@ -1787,7 +1787,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -600, y: 250}
m_AnchoredPosition: {x: -700, y: 250}
m_SizeDelta: {x: 160, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &319443976
Expand Down Expand Up @@ -2552,10 +2552,10 @@ RectTransform:
m_Father: {fileID: 547950001}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 9, y: -0.5}
m_SizeDelta: {x: -28, y: -3}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 180, y: 0}
m_SizeDelta: {x: 300, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &492997728
MonoBehaviour:
Expand All @@ -2579,12 +2579,12 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 14
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 0
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
Expand Down Expand Up @@ -2846,7 +2846,7 @@ RectTransform:
m_GameObject: {fileID: 547950000}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2, y: 2, z: 2}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 829812063}
- {fileID: 492997727}
Expand All @@ -2855,7 +2855,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -600, y: 350}
m_AnchoredPosition: {x: -700, y: 350}
m_SizeDelta: {x: 160, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &547950002
Expand Down Expand Up @@ -4193,7 +4193,7 @@ RectTransform:
m_GameObject: {fileID: 829812062}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
m_Children:
- {fileID: 146356364}
m_Father: {fileID: 547950001}
Expand Down Expand Up @@ -5857,10 +5857,10 @@ RectTransform:
m_Father: {fileID: 319443975}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 9, y: -0.5}
m_SizeDelta: {x: -28, y: -3}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 180, y: 0}
m_SizeDelta: {x: 300, y: 60}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1265535139
MonoBehaviour:
Expand All @@ -5884,12 +5884,12 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 14
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MinSize: 3
m_MaxSize: 40
m_Alignment: 0
m_Alignment: 3
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
Expand Down Expand Up @@ -7901,10 +7901,10 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 14
m_FontSize: 20
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
Expand Down Expand Up @@ -8170,7 +8170,7 @@ RectTransform:
m_GameObject: {fileID: 1839692337}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 1.5, y: 1.5, z: 1.5}
m_Children:
- {fileID: 666141141}
m_Father: {fileID: 319443975}
Expand Down
10 changes: 5 additions & 5 deletions unity/MOE_sim/Assets/Scripts/MOE_Script.cs
Original file line number Diff line number Diff line change
Expand Up @@ -98,11 +98,11 @@ void Update () {
J3.transform.localEulerAngles = new Vector3(0, 0, -q3*Mathf.Rad2Deg);

// if the user hits R, reset the simulation
// if (Input.GetKeyDown(KeyCode.R))
// {
// Native.Invoke<stop>(nativeLibraryPtr);
// Native.Invoke<start>(nativeLibraryPtr);
// }
if (Input.GetKeyDown(KeyCode.R))
{
Native.Invoke<stop>(nativeLibraryPtr);
Native.Invoke<start>(nativeLibraryPtr);
}

CurrentTime -= Time.deltaTime;

Expand Down
3 changes: 3 additions & 0 deletions unity/MOE_sim/Assets/Scripts/MouseOrbit.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@ void LateUpdate ()
x += Input.GetAxis("Mouse X") * xSpeed * distance * 0.02f;
y -= Input.GetAxis("Mouse Y") * ySpeed * 0.02f;
}
if (EventSystem.current.currentSelectedGameObject != null){
Debug.Log(EventSystem.current.currentSelectedGameObject.name);
}

y = ClampAngle(y, yMinLimit, yMaxLimit);

Expand Down
Binary file modified unity/MOE_sim/Library/ArtifactDB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

44 changes: 22 additions & 22 deletions unity/MOE_sim/Library/BuildPlayerData/response.rsp
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
-a="C:\Git\MOE_sim\unity\MOE_sim\Library\PlayerScriptAssemblies\Assembly-CSharp.dll"
-a="C:\Git\MOE_sim\unity\MOE_sim\Library\PlayerScriptAssemblies\Unity.RenderPipelines.Universal.Shaders.dll"
-a="C:\Git\MOE_sim\unity\MOE_sim\Library\PlayerScriptAssemblies\Unity.RenderPipelines.Universal.Runtime.dll"
-a="C:\Git\MOE_sim\unity\MOE_sim\Library\PlayerScriptAssemblies\UnityEngine.TestRunner.dll"
-a="C:\Git\MOE_sim\unity\MOE_sim\Library\PlayerScriptAssemblies\Unity.RenderPipeline.Universal.ShaderLibrary.dll"
-a="C:\Git\MOE_sim\unity\MOE_sim\Library\PlayerScriptAssemblies\Unity.Timeline.dll"
-a="C:\Git\MOE_sim\unity\MOE_sim\Library\PlayerScriptAssemblies\Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.dll"
-a="C:\Git\MOE_sim\unity\MOE_sim\Library\PlayerScriptAssemblies\Unity.TextMeshPro.dll"
-a="C:\Git\MOE_sim\unity\MOE_sim\Library\PlayerScriptAssemblies\Unity.RenderPipelines.Core.Runtime.dll"
-a="C:\Git\MOE_sim\unity\MOE_sim\Library\PlayerScriptAssemblies\Unity.RenderPipelines.Core.ShaderLibrary.dll"
-a="C:\Git\MOE_sim\unity\MOE_sim\Library\PlayerScriptAssemblies\UnityEngine.UI.dll"
-a="C:\Git\MOE_sim\unity\MOE_sim\Library\PlayerScriptAssemblies\Unity.Mathematics.dll"
-a="C:\Git\MOE_sim\unity\MOE_sim\Library\PackageCache\com.unity.nuget.newtonsoft-json@2.0.0\Runtime\AOT\Newtonsoft.Json.dll"
-a="C:\Git\MOE_sim\unity\MOE_sim\Library\PackageCache\com.unity.nuget.newtonsoft-json@2.0.0\Runtime\Portable\Newtonsoft.Json.dll"
-a="C:\Git\MOE_sim\unity\MOE_sim\Library\PackageCache\com.unity.nuget.newtonsoft-json@2.0.0\Runtime\Newtonsoft.Json.dll"
-a="C:\Git\MOE_sim\unity\MOE_sim\Library\PackageCache\com.unity.ext.nunit@1.0.6\net35\unity-custom\nunit.framework.dll"
-a="C:\Git\moe_sim\unity\MOE_sim\Library\PlayerScriptAssemblies\Assembly-CSharp.dll"
-a="C:\Git\moe_sim\unity\MOE_sim\Library\PlayerScriptAssemblies\Unity.RenderPipelines.Universal.Shaders.dll"
-a="C:\Git\moe_sim\unity\MOE_sim\Library\PlayerScriptAssemblies\Unity.RenderPipelines.Universal.Runtime.dll"
-a="C:\Git\moe_sim\unity\MOE_sim\Library\PlayerScriptAssemblies\UnityEngine.TestRunner.dll"
-a="C:\Git\moe_sim\unity\MOE_sim\Library\PlayerScriptAssemblies\Unity.RenderPipeline.Universal.ShaderLibrary.dll"
-a="C:\Git\moe_sim\unity\MOE_sim\Library\PlayerScriptAssemblies\Unity.Timeline.dll"
-a="C:\Git\moe_sim\unity\MOE_sim\Library\PlayerScriptAssemblies\Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.dll"
-a="C:\Git\moe_sim\unity\MOE_sim\Library\PlayerScriptAssemblies\Unity.TextMeshPro.dll"
-a="C:\Git\moe_sim\unity\MOE_sim\Library\PlayerScriptAssemblies\Unity.RenderPipelines.Core.Runtime.dll"
-a="C:\Git\moe_sim\unity\MOE_sim\Library\PlayerScriptAssemblies\Unity.RenderPipelines.Core.ShaderLibrary.dll"
-a="C:\Git\moe_sim\unity\MOE_sim\Library\PlayerScriptAssemblies\UnityEngine.UI.dll"
-a="C:\Git\moe_sim\unity\MOE_sim\Library\PlayerScriptAssemblies\Unity.Mathematics.dll"
-a="C:\Git\moe_sim\unity\MOE_sim\Library\PackageCache\com.unity.nuget.newtonsoft-json@2.0.0\Runtime\AOT\Newtonsoft.Json.dll"
-a="C:\Git\moe_sim\unity\MOE_sim\Library\PackageCache\com.unity.nuget.newtonsoft-json@2.0.0\Runtime\Portable\Newtonsoft.Json.dll"
-a="C:\Git\moe_sim\unity\MOE_sim\Library\PackageCache\com.unity.nuget.newtonsoft-json@2.0.0\Runtime\Newtonsoft.Json.dll"
-a="C:\Git\moe_sim\unity\MOE_sim\Library\PackageCache\com.unity.ext.nunit@1.0.6\net35\unity-custom\nunit.framework.dll"
-s="C:\Program Files\Unity\Hub\Editor\2020.3.16f1\Editor\Data\Managed\UnityEngine"
-s="C:\Git\MOE_sim\unity\MOE_sim\Library\PlayerScriptAssemblies"
-s="C:\Git\MOE_sim\unity\MOE_sim\Library\PackageCache\com.unity.nuget.newtonsoft-json@2.0.0\Runtime\AOT"
-s="C:\Git\MOE_sim\unity\MOE_sim\Library\PackageCache\com.unity.nuget.newtonsoft-json@2.0.0\Runtime\Portable"
-s="C:\Git\MOE_sim\unity\MOE_sim\Library\PackageCache\com.unity.nuget.newtonsoft-json@2.0.0\Runtime"
-s="C:\Git\MOE_sim\unity\MOE_sim\Library\PackageCache\com.unity.ext.nunit@1.0.6\net35\unity-custom"
-s="C:\Git\moe_sim\unity\MOE_sim\Library\PlayerScriptAssemblies"
-s="C:\Git\moe_sim\unity\MOE_sim\Library\PackageCache\com.unity.nuget.newtonsoft-json@2.0.0\Runtime\AOT"
-s="C:\Git\moe_sim\unity\MOE_sim\Library\PackageCache\com.unity.nuget.newtonsoft-json@2.0.0\Runtime\Portable"
-s="C:\Git\moe_sim\unity\MOE_sim\Library\PackageCache\com.unity.nuget.newtonsoft-json@2.0.0\Runtime"
-s="C:\Git\moe_sim\unity\MOE_sim\Library\PackageCache\com.unity.ext.nunit@1.0.6\net35\unity-custom"
-s="C:\Program Files\Unity\Hub\Editor\2020.3.16f1\Editor\Data\Managed\UnityEngine"
-s="C:\Program Files\Unity\Hub\Editor\2020.3.16f1\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api"
-s="C:\Program Files\Unity\Hub\Editor\2020.3.16f1\Editor\Data\MonoBleedingEdge\lib\mono\4.7.1-api\Facades"
-o="C:\Git\MOE_sim\unity\MOE_sim\Library\BuildPlayerData\Player"
-o="C:\Git\moe_sim\unity\MOE_sim\Library\BuildPlayerData\Player"
-rn="RuntimeInitializeOnLoads.json"
-tn="TypeDb-All.json"
Loading

0 comments on commit f71886f

Please sign in to comment.