diff --git a/.vs/UKSA-orbital-project/v15/.suo b/.vs/UKSA-orbital-project/v15/.suo index 20ad69b458c92e8a5596d8a0c88483244a33cdfa..fc126ce80e908801ca58e75892ff7af908ab8811 100644 Binary files a/.vs/UKSA-orbital-project/v15/.suo and b/.vs/UKSA-orbital-project/v15/.suo differ diff --git a/.vs/UKSA-orbital-project/v15/Server/sqlite3/storage.ide b/.vs/UKSA-orbital-project/v15/Server/sqlite3/storage.ide index 09f66356ef62d69dcefdcdb14e5ea9bdec422cb9..01c49605cb9b373a42aa8ae931a7a56f6d465dfd 100644 Binary files a/.vs/UKSA-orbital-project/v15/Server/sqlite3/storage.ide and b/.vs/UKSA-orbital-project/v15/Server/sqlite3/storage.ide differ diff --git a/.vs/UKSA-orbital-project/v15/Server/sqlite3/storage.ide-shm b/.vs/UKSA-orbital-project/v15/Server/sqlite3/storage.ide-shm index 0ceeb957ed5aa40efe889ecfadfaae9b7df56f54..ef753f09445d3a9be871fc26c12245f7766dde7a 100644 Binary files a/.vs/UKSA-orbital-project/v15/Server/sqlite3/storage.ide-shm and b/.vs/UKSA-orbital-project/v15/Server/sqlite3/storage.ide-shm differ diff --git a/.vs/UKSA-orbital-project/v15/Server/sqlite3/storage.ide-wal b/.vs/UKSA-orbital-project/v15/Server/sqlite3/storage.ide-wal index aa75a5e6264588d0faee16bbc1d060791de6799c..0510c4ae38b398ab191c63dfe953b060d656aacf 100644 Binary files a/.vs/UKSA-orbital-project/v15/Server/sqlite3/storage.ide-wal and b/.vs/UKSA-orbital-project/v15/Server/sqlite3/storage.ide-wal differ diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index 0c7889d82588adc1962da1fec4142619ee2065df..3644a366c64537132080a5c675d02da7cc941d3e 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -315,8 +315,10 @@ <Compile Include="Assets\OSLO\TBP_Integrator\obj\Debug\TemporaryGeneratedFile_E7A71F73-0F8D-4B9B-B56E-8E70B10BC5D3.cs" /> <Compile Include="Assets\OSLO\TBP_Integrator\Program.cs" /> <Compile Include="Assets\OSLO\TBP_Integrator\Properties\AssemblyInfo.cs" /> + <Compile Include="Assets\Scripts\FollowTrajectory.cs" /> <Compile Include="Assets\Scripts\ObjectPooling.cs" /> <Compile Include="Assets\Scripts\OrbitManagement.cs" /> + <Compile Include="Assets\Scripts\TubeRenderer.cs" /> <Compile Include="Assets\SteamVR\Extras\SteamVR_GazeTracker.cs" /> <Compile Include="Assets\SteamVR\Extras\SteamVR_LaserPointer.cs" /> <Compile Include="Assets\SteamVR\Extras\SteamVR_Teleporter.cs" /> diff --git a/Assets/OSLO/TBP_Integrator/Program.cs b/Assets/OSLO/TBP_Integrator/Program.cs index 90eec89e333901fa3958759650368561baa593f6..4f757770b7a587fc70a48e6758fd3bbbe3cd6ca3 100644 --- a/Assets/OSLO/TBP_Integrator/Program.cs +++ b/Assets/OSLO/TBP_Integrator/Program.cs @@ -77,10 +77,10 @@ namespace threeBodyProblemIntegrator static void Main() { - ThreeBodyProblemIntegration(0.94949344, 0.39329306, -0.00426519, 2.0 * Math.PI); + ThreeBodyProblemIntegration(0.94949344, 0.39329306, -0.00426519, 2.0 * Math.PI, 1); } - public static void ThreeBodyProblemIntegration(double xVal, double yVal, double zVal, double TFinal) + public static void ThreeBodyProblemIntegration(double xVal, double yVal, double zVal, double TFinal, int scale) { var tFinal = TFinal; // Final integration time @@ -135,6 +135,11 @@ namespace threeBodyProblemIntegrator // cache orbit management script component to save on getcomponent requests during loop OrbitManagement OM = orbitalmanager.GetComponent<OrbitManagement>(); + //find orbiter game object + GameObject orbiter = GameObject.Find("Orbiter"); + // cache Physics orbit script component to save on getcomponent requests during loop + FollowTrajectory PO = orbiter.GetComponent<FollowTrajectory>(); + foreach (var solPoint in Ode.RK547M(0.0, x0, f, opts).SolveTo(tFinal)) { Console.WriteLine("Time={0}, x={1}, y={2}, z={3}", @@ -152,15 +157,26 @@ namespace threeBodyProblemIntegrator float zpos = (float)solPoint.X[1]; // convert floats to vector3 positions - Vector3 positions = new Vector3(xpos, ypos, zpos); + Vector3 positions = new Vector3(xpos*scale, ypos*scale, zpos*scale); // instantiate orbital objects at given positions OM.PointCreator(positions); + PO.PositionCreator(positions); //unsuccessful attempt at object pooling //orbitalmanager.GetComponent<ObjectPooling>().SpawnFromPool("OrbitalPoint", positions, Quaternion.identity); + + //float Xvel = (float)solPoint.X[3]; + //float Yvel = (float)solPoint.X[5]; + //float Zvel = (float)solPoint.X[4]; + + //Vector3 Velocities = new Vector3(Xvel, Yvel, Zvel); + + //PO.VelocityGenerator(Velocities); + //PO.SetMass((float)tFinal); } OM.RenderPoints(); + PO.SetPath(); } public static Vector f(double t, Vector xIn) diff --git a/Assets/Prefabs/OrbitalManager.prefab b/Assets/Prefabs/OrbitalManager.prefab index 564e47710d8d415e3357bf2eac76db94a144f9c3..ad47d15ff3728caa4ab17abaf7d122d80da0a783 100644 --- a/Assets/Prefabs/OrbitalManager.prefab +++ b/Assets/Prefabs/OrbitalManager.prefab @@ -11,6 +11,24 @@ Prefab: m_SourcePrefab: {fileID: 0} m_RootGameObject: {fileID: 1198702483434230} m_IsPrefabAsset: 1 +--- !u!1 &1018089812025110 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 6 + m_Component: + - component: {fileID: 4193857716961762} + - component: {fileID: 33906683958323452} + - component: {fileID: 135078933661898756} + - component: {fileID: 23741550501594102} + m_Layer: 0 + m_Name: Sun + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 --- !u!1 &1198702483434230 GameObject: m_ObjectHideFlags: 0 @@ -28,6 +46,37 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &1906921185347290 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 6 + m_Component: + - component: {fileID: 4607681190172036} + - component: {fileID: 33150282079081022} + - component: {fileID: 135115487466297768} + - component: {fileID: 23618424008261278} + m_Layer: 0 + m_Name: Earth + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &4193857716961762 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1018089812025110} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.6, y: 0.6, z: 0.6} + m_Children: [] + m_Father: {fileID: 4302902151158742} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &4302902151158742 Transform: m_ObjectHideFlags: 1 @@ -37,10 +86,109 @@ Transform: 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_Children: [] + m_Children: + - {fileID: 4607681190172036} + - {fileID: 4193857716961762} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4607681190172036 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1906921185347290} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.001, y: 0.001, z: 0.001} + m_Children: [] + m_Father: {fileID: 4302902151158742} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &23618424008261278 +MeshRenderer: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1906921185347290} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + m_Materials: + - {fileID: 2100000, guid: 4a790e8d96cce17498d19f118acb47ad, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!23 &23741550501594102 +MeshRenderer: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1018089812025110} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + m_Materials: + - {fileID: 2100000, guid: 1da746019f1b32e4bace20d00a834fc8, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 1 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &33150282079081022 +MeshFilter: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1906921185347290} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &33906683958323452 +MeshFilter: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1018089812025110} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!114 &114258614712536936 MonoBehaviour: m_ObjectHideFlags: 1 @@ -52,16 +200,17 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 8f0ab999539a613449b207564146142a, type: 3} m_Name: m_EditorClassIdentifier: - Sun: {fileID: 1831391653828916, guid: 49dbf13a74e4cfa4dae471aa3efec728, type: 2} - Earth: {fileID: 1875462545181328, guid: 86b0af4437e4e5c4bb4935928b56d6b8, type: 2} + Sun: {fileID: 1018089812025110} + Earth: {fileID: 1906921185347290} orbitalindicator: {fileID: 1892811845398980, guid: 54ed12ec5415cab42a09454756297974, type: 2} + Orbiter: {fileID: 0} startingX: 0.94949344 startingY: 0.39329306 startingZ: -0.00426519 tFinal: 6.283185307179586 + newscale: 1 orbitalpoints: [] - col: {r: 0.028562069, g: 0, b: 1, a: 0.50980395} --- !u!120 &120870686573013508 LineRenderer: m_ObjectHideFlags: 1 @@ -154,3 +303,27 @@ LineRenderer: generateLightingData: 0 m_UseWorldSpace: 1 m_Loop: 0 +--- !u!135 &135078933661898756 +SphereCollider: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1018089812025110} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!135 &135115487466297768 +SphereCollider: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1906921185347290} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Orbiter.prefab b/Assets/Prefabs/Orbiter.prefab new file mode 100644 index 0000000000000000000000000000000000000000..601c2c4fb7f344506f71c3b8ac12a620482c1170 --- /dev/null +++ b/Assets/Prefabs/Orbiter.prefab @@ -0,0 +1,205 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 0} + m_RootGameObject: {fileID: 1728962188446272} + m_IsPrefabAsset: 1 +--- !u!1 &1549931834022464 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 6 + m_Component: + - component: {fileID: 4309694492153302} + - component: {fileID: 33914355953585272} + - component: {fileID: 23604401791692996} + - component: {fileID: 136372897210272804} + m_Layer: 0 + m_Name: Capsule + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1728962188446272 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 6 + m_Component: + - component: {fileID: 4498083717724734} + - component: {fileID: 33560172974985944} + - component: {fileID: 23903745820241946} + - component: {fileID: 135601874173358710} + - component: {fileID: 114604265000529572} + m_Layer: 0 + m_Name: Orbiter + m_TagString: Orbiter + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4309694492153302 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1549931834022464} + m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_Children: [] + m_Father: {fileID: 4498083717724734} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} +--- !u!4 &4498083717724734 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1728962188446272} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_Children: + - {fileID: 4309694492153302} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &23604401791692996 +MeshRenderer: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1549931834022464} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!23 &23903745820241946 +MeshRenderer: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1728962188446272} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &33560172974985944 +MeshFilter: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1728962188446272} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!33 &33914355953585272 +MeshFilter: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1549931834022464} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &114604265000529572 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1728962188446272} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fb221c71c4445104ba9af8b29b3242cf, type: 3} + m_Name: + m_EditorClassIdentifier: + positionsList: [] + orbitalpoints: [] + targetposition: {fileID: 0} + currentposition: 0 + nextposition: {x: 0, y: 0, z: 0} + speed: 1 + OM: {fileID: 0} + timescale: 0.1 +--- !u!135 &135601874173358710 +SphereCollider: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1728962188446272} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 0 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!136 &136372897210272804 +CapsuleCollider: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1549931834022464} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.5 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Orbiter.prefab.meta b/Assets/Prefabs/Orbiter.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..e64760afec1b5e4d06d91c50748273df7cb4d9dc --- /dev/null +++ b/Assets/Prefabs/Orbiter.prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b139490968f43a049ac34ea0c9974208 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 100100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index 1e1df90c34bfa1535e3bc45b02d65fee870bfbec..6cd8d516127477911d1d967c27e3f56933aff264 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -575,6 +575,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3e1ce31d654631d43baf0c1ca39fcdff, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &178715996 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1728962188446272, guid: b139490968f43a049ac34ea0c9974208, + type: 2} + m_PrefabInternal: {fileID: 614334256} --- !u!1 &184891684 GameObject: m_ObjectHideFlags: 0 @@ -1726,6 +1731,48 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: eb7a6650b6cb46545967d3b380b7396c, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &614334256 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4498083717724734, guid: b139490968f43a049ac34ea0c9974208, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4498083717724734, guid: b139490968f43a049ac34ea0c9974208, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4498083717724734, guid: b139490968f43a049ac34ea0c9974208, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4498083717724734, guid: b139490968f43a049ac34ea0c9974208, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4498083717724734, guid: b139490968f43a049ac34ea0c9974208, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4498083717724734, guid: b139490968f43a049ac34ea0c9974208, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4498083717724734, guid: b139490968f43a049ac34ea0c9974208, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4498083717724734, guid: b139490968f43a049ac34ea0c9974208, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b139490968f43a049ac34ea0c9974208, type: 2} + m_IsPrefabAsset: 0 --- !u!1 &637906018 GameObject: m_ObjectHideFlags: 0 @@ -1831,252 +1878,252 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnTriggerReleased: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnTriggerTouchStart: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnTriggerTouchEnd: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnTriggerHairlineStart: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnTriggerHairlineEnd: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnTriggerClicked: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnTriggerUnclicked: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnTriggerAxisChanged: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnGripPressed: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnGripReleased: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnGripTouchStart: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnGripTouchEnd: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnGripHairlineStart: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnGripHairlineEnd: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnGripClicked: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnGripUnclicked: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnGripAxisChanged: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnTouchpadPressed: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnTouchpadReleased: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnTouchpadTouchStart: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnTouchpadTouchEnd: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnTouchpadAxisChanged: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnButtonOnePressed: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnButtonOneReleased: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnButtonOneTouchStart: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnButtonOneTouchEnd: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnButtonTwoPressed: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnButtonTwoReleased: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnButtonTwoTouchStart: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnButtonTwoTouchEnd: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnStartMenuPressed: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnStartMenuReleased: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnAliasPointerOn: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnAliasPointerOff: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnAliasPointerSet: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnAliasGrabOn: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnAliasGrabOff: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnAliasUseOn: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnAliasUseOff: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnAliasUIClickOn: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnAliasUIClickOff: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnAliasMenuOn: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnAliasMenuOff: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnControllerEnabled: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnControllerDisabled: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnControllerIndexChanged: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnControllerModelAvailable: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnControllerVisible: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null OnControllerHidden: m_PersistentCalls: m_Calls: [] m_TypeName: VRTK.UnityEventHelper.VRTK_ControllerEvents_UnityEvents+ControllerInteractionEvent, - Assembly-CSharp, Version=1.0.6899.24848, Culture=neutral, PublicKeyToken=null + Assembly-CSharp, Version=1.0.6960.26536, Culture=neutral, PublicKeyToken=null --- !u!1 &644715789 GameObject: m_ObjectHideFlags: 0 @@ -5215,11 +5262,11 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4302902151158742, guid: d1d6601fa64e04444994747b2e5bd1d6, type: 2} propertyPath: m_LocalPosition.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4302902151158742, guid: d1d6601fa64e04444994747b2e5bd1d6, type: 2} propertyPath: m_LocalPosition.z - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 4302902151158742, guid: d1d6601fa64e04444994747b2e5bd1d6, type: 2} propertyPath: m_LocalRotation.x @@ -5241,6 +5288,11 @@ Prefab: propertyPath: m_RootOrder value: 3 objectReference: {fileID: 0} + - target: {fileID: 114258614712536936, guid: d1d6601fa64e04444994747b2e5bd1d6, + type: 2} + propertyPath: Orbiter + value: + objectReference: {fileID: 178715996} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d1d6601fa64e04444994747b2e5bd1d6, type: 2} m_IsPrefabAsset: 0 diff --git a/Assets/Scenes/Non-VR-scene.unity b/Assets/Scenes/Non-VR-scene.unity index fd1e277edc5b811e339b382637f2c43cf2ea327b..857cb99ea987670b897e75961ae4c4d7deda938f 100644 --- a/Assets/Scenes/Non-VR-scene.unity +++ b/Assets/Scenes/Non-VR-scene.unity @@ -113,6 +113,11 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &30412846 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1198702483434230, guid: d1d6601fa64e04444994747b2e5bd1d6, + type: 2} + m_PrefabInternal: {fileID: 858481304} --- !u!1 &676556591 GameObject: m_ObjectHideFlags: 0 @@ -190,6 +195,11 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &708525587 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1728962188446272, guid: b139490968f43a049ac34ea0c9974208, + type: 2} + m_PrefabInternal: {fileID: 1527494930} --- !u!1001 &858481304 Prefab: m_ObjectHideFlags: 0 @@ -229,14 +239,61 @@ Prefab: propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 1198702483434230, guid: d1d6601fa64e04444994747b2e5bd1d6, type: 2} - propertyPath: m_Icon + - target: {fileID: 114258614712536936, guid: d1d6601fa64e04444994747b2e5bd1d6, + type: 2} + propertyPath: Orbiter value: - objectReference: {fileID: -964228994112308473, guid: 0000000000000000d000000000000000, - type: 0} + objectReference: {fileID: 708525587} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d1d6601fa64e04444994747b2e5bd1d6, type: 2} m_IsPrefabAsset: 0 +--- !u!1001 &1527494930 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4498083717724734, guid: b139490968f43a049ac34ea0c9974208, type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4498083717724734, guid: b139490968f43a049ac34ea0c9974208, type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4498083717724734, guid: b139490968f43a049ac34ea0c9974208, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4498083717724734, guid: b139490968f43a049ac34ea0c9974208, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4498083717724734, guid: b139490968f43a049ac34ea0c9974208, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4498083717724734, guid: b139490968f43a049ac34ea0c9974208, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4498083717724734, guid: b139490968f43a049ac34ea0c9974208, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4498083717724734, guid: b139490968f43a049ac34ea0c9974208, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 114604265000529572, guid: b139490968f43a049ac34ea0c9974208, + type: 2} + propertyPath: OM + value: + objectReference: {fileID: 30412846} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: b139490968f43a049ac34ea0c9974208, type: 2} + m_IsPrefabAsset: 0 --- !u!1 &1717079046 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/FollowTrajectory.cs b/Assets/Scripts/FollowTrajectory.cs new file mode 100644 index 0000000000000000000000000000000000000000..a1787d208b4abe4b976a36014d6e12056eb19879 --- /dev/null +++ b/Assets/Scripts/FollowTrajectory.cs @@ -0,0 +1,77 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class FollowTrajectory : MonoBehaviour { + + [SerializeField] + private Vector3[] positionsList; + public List<Vector3> orbitalpoints; + [SerializeField] + private Transform targetposition; + public int currentposition = 0; + [SerializeField] + private Vector3 nextposition; + + public float speed = 1f; + public GameObject OM; + public float timescale = 1; + + + // Use this for initialization + void Start () { + SetPath(); + //Invoke("SetPath", 1f); + } + + public void PositionCreator(Vector3 position) + { + orbitalpoints.Add(position); + } + + public void SetPath() + { + //get orbital points from orbit management script + positionsList = orbitalpoints.ToArray(); + + //declare starting position + targetposition = this.transform; + targetposition.position = positionsList[0]; + targetposition.rotation = Quaternion.identity; + + nextposition = positionsList[1]; + } + + private void Update() + { + Mathf.Clamp(timescale, 0, 100); + Time.timeScale = timescale; + if (currentposition < this.positionsList.Length) + { + if(targetposition.position == null) + { + targetposition.position = positionsList[currentposition]; + } + FollowPath(); + } + } + + private void FollowPath() + { + // rotate towards the target + //transform.forward = Vector3.RotateTowards(transform.forward, targetposition.position - transform.position, speed * Time.deltaTime, 0.0f); + transform.LookAt(nextposition); + + // move towards the target + transform.position = Vector3.Lerp(transform.position, targetposition.position, speed * Time.deltaTime); + //transform.position = Vector3.MoveToward(transform.position, targetposition.position, speed * Time.deltaTime); + + if (transform.position == targetposition.position) + { + currentposition++; + targetposition.position = positionsList[currentposition]; + nextposition = positionsList[currentposition + 1]; + } + } + +} diff --git a/Assets/Scripts/FollowTrajectory.cs.meta b/Assets/Scripts/FollowTrajectory.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..c20937f86484afee08288849947c97bfa08eaf90 --- /dev/null +++ b/Assets/Scripts/FollowTrajectory.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fb221c71c4445104ba9af8b29b3242cf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/OrbitManagement.cs b/Assets/Scripts/OrbitManagement.cs index 3e6a8da5cd954ba7c3d4ac5d21d87c7308696eeb..b252e75b74ec1b2a330f7aea2f0a35a5b77df72d 100644 --- a/Assets/Scripts/OrbitManagement.cs +++ b/Assets/Scripts/OrbitManagement.cs @@ -10,41 +10,60 @@ namespace threeBodyProblemIntegrator { public GameObject Sun; public GameObject Earth; public GameObject orbitalindicator; + public GameObject Orbiter; public double startingX = 0.94949344; public double startingY = 0.39329306; public double startingZ = -0.00426519; public double tFinal = 2.0 * Math.PI; private static double Mu = 3.003e-06; + + private int startingscale = 1; + private int currentscale = 1; + public int newscale = 1; + public List<Vector3> orbitalpoints; + //public List<Vector3> Velocities; private LineRenderer LR; - //public Color col; //used for tube renderer, but doesn't actually color tube, tube colour uses material. + //public Color col; //used for tube renderer, but doesn't actually color tube, tube colour uses material. // all math in 3BPI uses Z-up, not Y-up. void Start() { + //edited out for scaling test float mu = (float)Mu; - Sun.transform.position = new Vector3(-mu, 0, 0); - Earth.transform.position = new Vector3(1-mu, 0, 0); - Instantiate(Sun); - Instantiate(Earth); + Sun.transform.localPosition = new Vector3(-mu, 0, 0); + Earth.transform.localPosition = new Vector3(1 - mu, 0, 0); + Sun.SetActive(true); + Earth.SetActive(true); LR = GetComponent<LineRenderer>(); orbitalpoints = new List<Vector3>(); - TBP(); + TBP(startingscale); } - public void TBP() + public void TBP(int Scaling) { - //set starting Values - // Trigger creation of 3BPI orbital points - Program.ThreeBodyProblemIntegration(startingX, startingY, startingZ, tFinal); + Program.ThreeBodyProblemIntegration(startingX, startingY, startingZ, tFinal, Scaling); // set X[0] in 3BPI to a range of 0.15 / 0.85 // set Tfinal in 3BPI to a range between 0.005 / 0.5 // start coroutine 3BPI } + private void Update() + { + if (currentscale != newscale) + { + orbitalpoints.Clear(); + Orbiter.GetComponent<FollowTrajectory>().orbitalpoints.Clear(); + TBP(newscale); + gameObject.transform.localScale = new Vector3(newscale, newscale, newscale); + Orbiter.transform.localScale = Orbiter.transform.localScale * newscale; + currentscale = newscale; + } + } + public void PointCreator(Vector3 position) { //create orbital point object at position - render heavy. @@ -65,12 +84,12 @@ namespace threeBodyProblemIntegrator { for (int i = 0; i < orbitalpoints.Count; i++) { LR.positionCount = orbitalpoints.Count; - LR.startWidth = 0.001f; - LR.endWidth = 0.001f; + LR.startWidth = 0.001f*currentscale; + LR.endWidth = 0.001f*currentscale; LR.SetPosition(i, orbitalpoints[i]); } // line renderer most efficient render so far. - } + } } } diff --git a/Library/AnnotationManager b/Library/AnnotationManager index 8897f3292cc3271efdaeaeab032b5f064ad2d95a..6c258c80ca84f4040eee044776e1c6b62f8279f5 100644 Binary files a/Library/AnnotationManager and b/Library/AnnotationManager differ diff --git a/Library/CurrentLayout.dwlt b/Library/CurrentLayout.dwlt index 3b14cec9a6c5e024ace226bd6da717ca8a7b133d..eb010c68ec73965c273c559940269350ace2e656 100644 --- a/Library/CurrentLayout.dwlt +++ b/Library/CurrentLayout.dwlt @@ -1,6 +1,28 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_PixelRect: + serializedVersion: 2 + x: -1205 + y: 193 + width: 976 + height: 571 + m_ShowMode: 0 + m_Title: + m_RootView: {fileID: 4} + m_MinSize: {x: 200, y: 222} + m_MaxSize: {x: 4000, y: 4022} +--- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -19,10 +41,10 @@ MonoBehaviour: height: 967 m_ShowMode: 4 m_Title: - m_RootView: {fileID: 7} + m_RootView: {fileID: 11} m_MinSize: {x: 950, y: 300} m_MaxSize: {x: 10000, y: 10000} ---- !u!114 &2 +--- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -36,22 +58,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 206 + x: 0 y: 0 - width: 974 - height: 638 - m_MinSize: {x: 204, y: 221} - m_MaxSize: {x: 4004, y: 4021} - m_ActualView: {fileID: 23} + width: 976 + height: 571 + m_MinSize: {x: 200, y: 222} + m_MaxSize: {x: 4000, y: 4022} + m_ActualView: {fileID: 28} m_Panes: - - {fileID: 23} - - {fileID: 19} - - {fileID: 16} - - {fileID: 12} - - {fileID: 15} + - {fileID: 28} m_Selected: 0 - m_LastSelected: 2 ---- !u!114 &3 + m_LastSelected: 0 +--- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -63,19 +81,41 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 10} - - {fileID: 4} + - {fileID: 3} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 976 + height: 571 + m_MinSize: {x: 200, y: 222} + m_MaxSize: {x: 4000, y: 4022} + vertical: 0 + controlID: 529 +--- !u!114 &5 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 7} m_Position: serializedVersion: 2 x: 0 y: 30 width: 1680 height: 917 - m_MinSize: {x: 681, y: 492} - m_MaxSize: {x: 14004, y: 14042} - vertical: 0 - controlID: 11 ---- !u!114 &4 + m_MinSize: {x: 579, y: 471} + m_MaxSize: {x: 14002, y: 14042} + vertical: 1 + controlID: 61 +--- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -89,22 +129,74 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1180 + x: 208 y: 0 - width: 500 - height: 917 - m_MinSize: {x: 277, y: 71} - m_MaxSize: {x: 4002, y: 4021} + width: 980 + height: 570 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 21} m_Panes: - {fileID: 21} - - {fileID: 18} + - {fileID: 24} - {fileID: 17} + - {fileID: 20} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &7 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: - {fileID: 14} - - {fileID: 13} + - {fileID: 8} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1680 + height: 917 + m_MinSize: {x: 579, y: 471} + m_MaxSize: {x: 14002, y: 14042} + vertical: 0 + controlID: 62 +--- !u!114 &8 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 1188 + y: 0 + width: 492 + height: 917 + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 26} + m_Panes: + - {fileID: 26} + - {fileID: 23} + - {fileID: 22} + - {fileID: 19} + - {fileID: 18} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &5 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -120,16 +212,16 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 206 - height: 638 + width: 208 + height: 570 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 22} + m_ActualView: {fileID: 27} m_Panes: - - {fileID: 22} + - {fileID: 27} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &6 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -144,18 +236,19 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 638 - width: 1180 - height: 279 + y: 570 + width: 1188 + height: 347 m_MinSize: {x: 232, y: 271} m_MaxSize: {x: 10002, y: 10021} - m_ActualView: {fileID: 20} + m_ActualView: {fileID: 25} m_Panes: - - {fileID: 20} - - {fileID: 24} + - {fileID: 25} + - {fileID: 29} + - {fileID: 16} m_Selected: 0 m_LastSelected: 1 ---- !u!114 &7 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -167,9 +260,9 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 8} - - {fileID: 3} - - {fileID: 9} + - {fileID: 12} + - {fileID: 5} + - {fileID: 13} m_Position: serializedVersion: 2 x: 0 @@ -178,7 +271,7 @@ MonoBehaviour: height: 967 m_MinSize: {x: 950, y: 300} m_MaxSize: {x: 10000, y: 10000} ---- !u!114 &8 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -199,7 +292,7 @@ MonoBehaviour: m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} m_LastLoadedLayoutName: ---- !u!114 &9 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -219,7 +312,7 @@ MonoBehaviour: height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} ---- !u!114 &10 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -231,19 +324,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 11} - - {fileID: 6} + - {fileID: 15} + - {fileID: 10} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1180 + width: 1188 height: 917 - m_MinSize: {x: 404, y: 492} + m_MinSize: {x: 304, y: 471} m_MaxSize: {x: 10002, y: 14042} vertical: 1 - controlID: 12 ---- !u!114 &11 + controlID: 63 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -255,19 +348,351 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Children: - - {fileID: 5} - - {fileID: 2} + - {fileID: 9} + - {fileID: 6} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1180 - height: 638 - m_MinSize: {x: 404, y: 221} + width: 1188 + height: 570 + m_MinSize: {x: 304, y: 200} m_MaxSize: {x: 8004, y: 4021} vertical: 0 - controlID: 13 ---- !u!114 &12 + controlID: 16 +--- !u!114 &16 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12070, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 260, y: 216} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Profiler + m_Image: {fileID: 248956144125838126, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 662 + width: 1186 + height: 326 + m_PersistentViewDataDictionary: {fileID: 0} + m_VertSplit: + ID: 634 + splitterInitialOffset: 117 + currentActiveSplitter: -1 + realSizes: 64000000d2000000 + relativeSizes: + - 0.32258064 + - 0.67741936 + minSizes: 6400000064000000 + maxSizes: 0000000000000000 + lastTotalSize: 310 + splitSize: 6 + xOffset: 0 + m_Recording: 1 + m_ActiveNativePlatformSupportModule: + m_ViewType: 1 + m_CurrentArea: 0 + m_ShowInactiveDSPChains: 0 + m_HighlightAudibleDSPChains: 1 + m_DSPGraphZoomFactor: 1 + m_CPUFrameDataHierarchyView: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_MultiColumnHeaderState: + m_Columns: [] + m_VisibleColumns: + m_SortedColumns: + m_DetailedViewType: 0 + m_DetailedViewSpliterState: + ID: 0 + splitterInitialOffset: 0 + currentActiveSplitter: 0 + realSizes: + relativeSizes: [] + minSizes: + maxSizes: + lastTotalSize: 0 + splitSize: 0 + xOffset: 0 + m_DetailedObjectsView: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_MultiColumnHeaderState: + m_Columns: [] + m_VisibleColumns: + m_SortedColumns: + m_VertSplit: + ID: 0 + splitterInitialOffset: 0 + currentActiveSplitter: 0 + realSizes: + relativeSizes: [] + minSizes: + maxSizes: + lastTotalSize: 0 + splitSize: 0 + xOffset: 0 + m_DetailedCallsView: + m_VertSplit: + ID: 0 + splitterInitialOffset: 0 + currentActiveSplitter: 0 + realSizes: + relativeSizes: [] + minSizes: + maxSizes: + lastTotalSize: 0 + splitSize: 0 + xOffset: 0 + m_CalleesTreeView: + m_ViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_ViewHeaderState: + m_Columns: [] + m_VisibleColumns: + m_SortedColumns: + m_CallersTreeView: + m_ViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_ViewHeaderState: + m_Columns: [] + m_VisibleColumns: + m_SortedColumns: + m_GPUFrameDataHierarchyView: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_MultiColumnHeaderState: + m_Columns: [] + m_VisibleColumns: + m_SortedColumns: + m_DetailedViewType: 0 + m_DetailedViewSpliterState: + ID: 0 + splitterInitialOffset: 0 + currentActiveSplitter: 0 + realSizes: + relativeSizes: [] + minSizes: + maxSizes: + lastTotalSize: 0 + splitSize: 0 + xOffset: 0 + m_DetailedObjectsView: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_MultiColumnHeaderState: + m_Columns: [] + m_VisibleColumns: + m_SortedColumns: + m_VertSplit: + ID: 0 + splitterInitialOffset: 0 + currentActiveSplitter: 0 + realSizes: + relativeSizes: [] + minSizes: + maxSizes: + lastTotalSize: 0 + splitSize: 0 + xOffset: 0 + m_DetailedCallsView: + m_VertSplit: + ID: 0 + splitterInitialOffset: 0 + currentActiveSplitter: 0 + realSizes: + relativeSizes: [] + minSizes: + maxSizes: + lastTotalSize: 0 + splitSize: 0 + xOffset: 0 + m_CalleesTreeView: + m_ViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_ViewHeaderState: + m_Columns: [] + m_VisibleColumns: + m_SortedColumns: + m_CallersTreeView: + m_ViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_ViewHeaderState: + m_Columns: [] + m_VisibleColumns: + m_SortedColumns: + m_ClearOnPlay: 0 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -292,7 +717,7 @@ MonoBehaviour: width: 970 height: 617 m_PersistentViewDataDictionary: {fileID: 0} ---- !u!114 &13 +--- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -317,7 +742,7 @@ MonoBehaviour: width: 388 height: 936 m_PersistentViewDataDictionary: {fileID: 0} ---- !u!114 &14 +--- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -342,7 +767,7 @@ MonoBehaviour: width: 625 height: 896 m_PersistentViewDataDictionary: {fileID: 0} ---- !u!114 &15 +--- !u!114 &20 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -367,7 +792,7 @@ MonoBehaviour: width: 1096 height: 616 m_PersistentViewDataDictionary: {fileID: 0} ---- !u!114 &16 +--- !u!114 &21 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -387,13 +812,13 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 208 + x: 210 y: 92 - width: 970 - height: 617 + width: 976 + height: 549 m_PersistentViewDataDictionary: {fileID: 0} m_MaximizeOnPlay: 0 - m_Gizmos: 0 + m_Gizmos: 1 m_Stats: 1 m_SelectedSizes: 00000000000000000000000000000000000000000000000000000000000000000000000000000000 m_TargetDisplay: 0 @@ -402,10 +827,10 @@ MonoBehaviour: m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -485 - m_HBaseRangeMax: 485 - m_VBaseRangeMin: -300 - m_VBaseRangeMax: 300 + m_HBaseRangeMin: -488 + m_HBaseRangeMax: 488 + m_VBaseRangeMin: -266 + m_VBaseRangeMax: 266 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -414,7 +839,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -423,30 +848,30 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 17 - width: 970 - height: 600 + width: 976 + height: 532 m_Scale: {x: 1, y: 1} - m_Translation: {x: 485, y: 300} + m_Translation: {x: 488, y: 266} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -485 - y: -300 - width: 970 - height: 600 + x: -488 + y: -266 + width: 976 + height: 532 m_MinimalGUI: 1 m_defaultScale: 1 m_TargetTexture: {fileID: 0} m_CurrentColorSpace: 1 - m_LastWindowPixelSize: {x: 970, y: 617} + m_LastWindowPixelSize: {x: 976, y: 549} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000100000100 m_XRRenderMode: 0 ---- !u!114 &17 +--- !u!114 &22 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -478,7 +903,7 @@ MonoBehaviour: m_RegisteredViewInstances: - {fileID: 0} - {fileID: 0} ---- !u!114 &18 +--- !u!114 &23 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -503,7 +928,7 @@ MonoBehaviour: width: 760 height: 1286 m_PersistentViewDataDictionary: {fileID: 0} ---- !u!114 &19 +--- !u!114 &24 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -545,7 +970,7 @@ MonoBehaviour: m_CurrentEditor: 1 m_LayerEditor: m_SelectedLayerIndex: 0 ---- !u!114 &20 +--- !u!114 &25 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -566,9 +991,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 730 - width: 1178 - height: 258 + y: 662 + width: 1186 + height: 326 m_PersistentViewDataDictionary: {fileID: 0} m_SearchFilter: m_NameFilter: @@ -582,20 +1007,20 @@ MonoBehaviour: m_ShowAllHits: 0 m_SearchArea: 1 m_Folders: - - Assets/Prefabs + - Assets/Scenes m_ViewMode: 1 m_StartGridSize: 16 m_LastFolders: - - Assets/Prefabs + - Assets/Scenes m_LastFoldersGridSize: 16 m_LastProjectPath: U:\Unity 2018 Projects\UKSA-orbital-project m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 51} - m_SelectedIDs: ca120000 - m_LastClickedID: 4810 - m_ExpandedIDs: 00000000f40f00000e1500001416000000ca9a3b + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 94130000 + m_LastClickedID: 5012 + m_ExpandedIDs: 00000000dc0f0000f8140000fe15000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -611,7 +1036,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 6} + m_ClientGUIView: {fileID: 10} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -623,7 +1048,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000f40f0000b81100000e15000014160000 + m_ExpandedIDs: 00000000dc0f0000f8140000fe150000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -667,7 +1092,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 6} + m_ClientGUIView: {fileID: 10} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -678,7 +1103,7 @@ MonoBehaviour: m_ScrollPosition: {x: 0, y: 0} m_GridSize: 16 m_DirectoriesAreaWidth: 272 ---- !u!114 &21 +--- !u!114 &26 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -698,9 +1123,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1182 + x: 1190 y: 92 - width: 498 + width: 490 height: 896 m_PersistentViewDataDictionary: {fileID: 0} m_ObjectsLockedBeforeSerialization: [] @@ -712,7 +1137,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_PreviewWindow: {fileID: 0} ---- !u!114 &22 +--- !u!114 &27 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -734,30 +1159,30 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 92 - width: 204 - height: 617 + width: 206 + height: 549 m_PersistentViewDataDictionary: {fileID: 0} m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: 361a0000 m_LastClickedID: 0 - m_ExpandedIDs: c4fbffff00000000 + m_ExpandedIDs: 7014f8ffc81af8ff2a31f8ff5c73f8ffdefbffff000000008820000092200000f4550000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: Earth(Clone) + m_OriginalName: Earth(Clone) m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: -424534 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 5} + m_ClientGUIView: {fileID: 9} m_SearchString: m_ExpandedScenes: - MainScene @@ -765,7 +1190,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_CurrentSortingName: TransformSorting ---- !u!114 &23 +--- !u!114 &28 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -785,20 +1210,20 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 208 - y: 92 - width: 970 - height: 617 + x: -1205 + y: 215 + width: 976 + height: 549 m_PersistentViewDataDictionary: {fileID: 0} m_SceneLighting: 0 - lastFramingTime: 2622.8227122999997 + lastFramingTime: 9572.071050999999 m_2DMode: 0 m_isRotationLocked: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0.67380625, y: 0.060675193, z: -0.25584832} + m_Target: {x: 4.999985, y: 0, z: 0} speed: 2 - m_Value: {x: 0.67380625, y: 0.060675193, z: -0.25584832} + m_Value: {x: 4.999985, y: 0, z: 0} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -826,13 +1251,13 @@ MonoBehaviour: speed: 2 m_Value: 0 m_Rotation: - m_Target: {x: 0.028715087, y: 0.87496513, z: 0.052288927, w: -0.48049703} + m_Target: {x: 0.01859073, y: 0.9485387, z: -0.310988, w: 0.056701913} speed: 2 - m_Value: {x: 0.028715089, y: 0.87496513, z: 0.052288935, w: -0.48049703} + m_Value: {x: 0.018590732, y: 0.9485388, z: -0.31098804, w: 0.056701917} m_Size: - m_Target: 0.60285795 + m_Target: 1.8142896 speed: 2 - m_Value: 0.60285795 + m_Value: 1.8142896 m_Ortho: m_Target: 0 speed: 2 @@ -844,7 +1269,7 @@ MonoBehaviour: m_ReplacementString: m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 ---- !u!114 &24 +--- !u!114 &29 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -865,7 +1290,7 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 730 - width: 1178 - height: 258 + y: 662 + width: 1186 + height: 326 m_PersistentViewDataDictionary: {fileID: 0} diff --git a/Library/InspectorExpandedItems.asset b/Library/InspectorExpandedItems.asset index 84e0820bf64f4c60333296bd112ca055566f36a2..1de72f1864cd59fc61c8aaeec98501d16a8b68b1 100644 Binary files a/Library/InspectorExpandedItems.asset and b/Library/InspectorExpandedItems.asset differ diff --git a/Library/LastSceneManagerSetup.txt b/Library/LastSceneManagerSetup.txt index 6b1e60058eaba76449d304d4cffc0560e7f75687..486f446db12a6c50317950fae2edfd702d5bb7c4 100644 --- a/Library/LastSceneManagerSetup.txt +++ b/Library/LastSceneManagerSetup.txt @@ -1,4 +1,4 @@ sceneSetups: -- path: Assets/Scenes/MainScene.unity +- path: Assets/Scenes/Non-VR-scene.unity isLoaded: 1 isActive: 1 diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll index 238b415d6fa3ebff4a99b820a366b239c31d5105..99c87d82ba7e973e92ecd561c712e08bd7571d49 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll and b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb index 9d46bc82770bab394f76067708ba1daf1e8c3015..9b8ac2cbd4a3565e4f227157bf8bb49d6786b458 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb and b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll.mdb differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll b/Library/ScriptAssemblies/Assembly-CSharp.dll index 394c9273b98800f7410288734df77598b1e9970e..27166503b08af1ee4b85790255a94f2252c9df4f 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp.dll and b/Library/ScriptAssemblies/Assembly-CSharp.dll differ diff --git a/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb b/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb index c074d5f266fb45e6b327f557f1687bb0834cc292..b0b3fb2d66991b2f2773323e299f39053121ec81 100644 Binary files a/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb and b/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb differ diff --git a/Library/ScriptAssemblies/Assembly-UnityScript.dll b/Library/ScriptAssemblies/Assembly-UnityScript.dll index 91b6af821f5081076657389a8d56c9828cf8e335..69f61886e656fc17168a8ee57b71f7b0ae959a42 100644 Binary files a/Library/ScriptAssemblies/Assembly-UnityScript.dll and b/Library/ScriptAssemblies/Assembly-UnityScript.dll differ diff --git a/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb b/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb index ab6dbfb8c7167920ffa680d888d362bc22a4c824..d4dbf164977afc9c90c27755252385711ba2ddd6 100644 Binary files a/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb and b/Library/ScriptAssemblies/Assembly-UnityScript.dll.mdb differ diff --git a/Library/ShaderCache/0/02ef363fb517106ea623c61821010913.bin b/Library/ShaderCache/0/02ef363fb517106ea623c61821010913.bin new file mode 100644 index 0000000000000000000000000000000000000000..71239356f9e9273c059295dd5d75788178c466ee Binary files /dev/null and b/Library/ShaderCache/0/02ef363fb517106ea623c61821010913.bin differ diff --git a/Library/ShaderCache/0/077a07044c1b1b56f430fbc609283e0d.bin b/Library/ShaderCache/0/077a07044c1b1b56f430fbc609283e0d.bin new file mode 100644 index 0000000000000000000000000000000000000000..23914b9c0f27813eee7cb95d00ff0d1ef4e0083b Binary files /dev/null and b/Library/ShaderCache/0/077a07044c1b1b56f430fbc609283e0d.bin differ diff --git a/Library/ShaderCache/0/0da8c90b28c98e44f9334a47118146af.bin b/Library/ShaderCache/0/0da8c90b28c98e44f9334a47118146af.bin new file mode 100644 index 0000000000000000000000000000000000000000..b44118239d65b8f07736270239eac5a2767038db Binary files /dev/null and b/Library/ShaderCache/0/0da8c90b28c98e44f9334a47118146af.bin differ diff --git a/Library/ShaderCache/0/0fad7d598e26df897b437c128fb79584.bin b/Library/ShaderCache/0/0fad7d598e26df897b437c128fb79584.bin new file mode 100644 index 0000000000000000000000000000000000000000..401f7e38379c169514def0d5e6ee30521de2a8dd Binary files /dev/null and b/Library/ShaderCache/0/0fad7d598e26df897b437c128fb79584.bin differ diff --git a/Library/ShaderCache/1/1a7abacbb8fb982e6488e6305e1dc940.bin b/Library/ShaderCache/1/1a7abacbb8fb982e6488e6305e1dc940.bin new file mode 100644 index 0000000000000000000000000000000000000000..28604c360277dfb97d34a8449f92332d57b9d1e1 Binary files /dev/null and b/Library/ShaderCache/1/1a7abacbb8fb982e6488e6305e1dc940.bin differ diff --git a/Library/ShaderCache/2/272aab2aa23a3b2e351855dd70990d88.bin b/Library/ShaderCache/2/272aab2aa23a3b2e351855dd70990d88.bin new file mode 100644 index 0000000000000000000000000000000000000000..0bd6ba0a779643d441a9b9653581febb2ad34237 Binary files /dev/null and b/Library/ShaderCache/2/272aab2aa23a3b2e351855dd70990d88.bin differ diff --git a/Library/ShaderCache/3/35b1274fd39a3a1c7785d6b9e55159a7.bin b/Library/ShaderCache/3/35b1274fd39a3a1c7785d6b9e55159a7.bin new file mode 100644 index 0000000000000000000000000000000000000000..ece40faace76b271b7b972da09c3125a695f49af Binary files /dev/null and b/Library/ShaderCache/3/35b1274fd39a3a1c7785d6b9e55159a7.bin differ diff --git a/Library/ShaderCache/5/5b30d92256e77f6e90ca84fdf5821b78.bin b/Library/ShaderCache/5/5b30d92256e77f6e90ca84fdf5821b78.bin new file mode 100644 index 0000000000000000000000000000000000000000..ce44cc2d7a11436c2442281588ac8ae3e35a6b02 Binary files /dev/null and b/Library/ShaderCache/5/5b30d92256e77f6e90ca84fdf5821b78.bin differ diff --git a/Library/ShaderCache/6/6109865014d840710972d6082cf94615.bin b/Library/ShaderCache/6/6109865014d840710972d6082cf94615.bin new file mode 100644 index 0000000000000000000000000000000000000000..d33f644e011615886b814c7a0bb9202ca486ce1e Binary files /dev/null and b/Library/ShaderCache/6/6109865014d840710972d6082cf94615.bin differ diff --git a/Library/ShaderCache/6/6462acd6cea1eaf9524b2ec4303bef04.bin b/Library/ShaderCache/6/6462acd6cea1eaf9524b2ec4303bef04.bin new file mode 100644 index 0000000000000000000000000000000000000000..e7350872e454225160fabd22dae593997777153d Binary files /dev/null and b/Library/ShaderCache/6/6462acd6cea1eaf9524b2ec4303bef04.bin differ diff --git a/Library/ShaderCache/6/6b1e10af65f38f1eebabb5636145c660.bin b/Library/ShaderCache/6/6b1e10af65f38f1eebabb5636145c660.bin new file mode 100644 index 0000000000000000000000000000000000000000..d10e746e3048b40dd2ac14dfff455354381a0199 Binary files /dev/null and b/Library/ShaderCache/6/6b1e10af65f38f1eebabb5636145c660.bin differ diff --git a/Library/ShaderCache/8/818ae65ff5e09cbb66f6a75ed1551c2a.bin b/Library/ShaderCache/8/818ae65ff5e09cbb66f6a75ed1551c2a.bin new file mode 100644 index 0000000000000000000000000000000000000000..cb0f5805abd417ff0efc9a9b710160be3b40b39e Binary files /dev/null and b/Library/ShaderCache/8/818ae65ff5e09cbb66f6a75ed1551c2a.bin differ diff --git a/Library/ShaderCache/9/9495a3b6ffb16792c4e599bb8d822d47.bin b/Library/ShaderCache/9/9495a3b6ffb16792c4e599bb8d822d47.bin new file mode 100644 index 0000000000000000000000000000000000000000..254bd1c5331b7044d001f32cca29a363571b087f Binary files /dev/null and b/Library/ShaderCache/9/9495a3b6ffb16792c4e599bb8d822d47.bin differ diff --git a/Library/ShaderCache/9/9e932beb58bb894ea63cd05b23b917de.bin b/Library/ShaderCache/9/9e932beb58bb894ea63cd05b23b917de.bin new file mode 100644 index 0000000000000000000000000000000000000000..0c3ebb160d2c4c274948c1ad36672aa87ce9d9b4 Binary files /dev/null and b/Library/ShaderCache/9/9e932beb58bb894ea63cd05b23b917de.bin differ diff --git a/Library/ShaderCache/a/a0bdc4db2320c45111f513adc4c82028.bin b/Library/ShaderCache/a/a0bdc4db2320c45111f513adc4c82028.bin new file mode 100644 index 0000000000000000000000000000000000000000..68ea7f82cf341f83a128fd8a3de654e6da38d849 Binary files /dev/null and b/Library/ShaderCache/a/a0bdc4db2320c45111f513adc4c82028.bin differ diff --git a/Library/ShaderCache/a/ad134b80b31a6669ac9a0ea30b863351.bin b/Library/ShaderCache/a/ad134b80b31a6669ac9a0ea30b863351.bin new file mode 100644 index 0000000000000000000000000000000000000000..875ba65988773f310a85ddf360f460da76601932 Binary files /dev/null and b/Library/ShaderCache/a/ad134b80b31a6669ac9a0ea30b863351.bin differ diff --git a/Library/ShaderCache/b/b30adeec841845028ba13c6fd9cdf5d3.bin b/Library/ShaderCache/b/b30adeec841845028ba13c6fd9cdf5d3.bin new file mode 100644 index 0000000000000000000000000000000000000000..76b0956228601ba82a83f15b760886bb47c4cd1d Binary files /dev/null and b/Library/ShaderCache/b/b30adeec841845028ba13c6fd9cdf5d3.bin differ diff --git a/Library/ShaderCache/b/bebb19e7d344ad491679cfb6f6c26def.bin b/Library/ShaderCache/b/bebb19e7d344ad491679cfb6f6c26def.bin new file mode 100644 index 0000000000000000000000000000000000000000..3637ee2aecaa2495d61f5e52e26cbd54a0bb836b Binary files /dev/null and b/Library/ShaderCache/b/bebb19e7d344ad491679cfb6f6c26def.bin differ diff --git a/Library/ShaderCache/e/ef5174573a4ec365c499fb0eac36bdab.bin b/Library/ShaderCache/e/ef5174573a4ec365c499fb0eac36bdab.bin new file mode 100644 index 0000000000000000000000000000000000000000..9f3cb63dbb50c076738dfd201eec58075af15503 Binary files /dev/null and b/Library/ShaderCache/e/ef5174573a4ec365c499fb0eac36bdab.bin differ diff --git a/Library/ShaderCache/f/ff5c312e56f4c7788d3e466a99367ddf.bin b/Library/ShaderCache/f/ff5c312e56f4c7788d3e466a99367ddf.bin new file mode 100644 index 0000000000000000000000000000000000000000..86284d828e441a5f08621dc313128a7edada15c0 Binary files /dev/null and b/Library/ShaderCache/f/ff5c312e56f4c7788d3e466a99367ddf.bin differ diff --git a/Library/assetDatabase3 b/Library/assetDatabase3 index 5bd67aee4e219ccc7bf31b8335784a7c1a11bcb7..1f140e6b0620542fad93c2ee33296db6dc93c337 100644 Binary files a/Library/assetDatabase3 and b/Library/assetDatabase3 differ diff --git a/Library/metadata/09/09d475cc5350571409bba62ebc89c4d8 b/Library/metadata/09/09d475cc5350571409bba62ebc89c4d8 new file mode 100644 index 0000000000000000000000000000000000000000..8b4755438dfd1611e757abb63f38a602bd93ae84 Binary files /dev/null and b/Library/metadata/09/09d475cc5350571409bba62ebc89c4d8 differ diff --git a/Library/metadata/09/09d475cc5350571409bba62ebc89c4d8.info b/Library/metadata/09/09d475cc5350571409bba62ebc89c4d8.info new file mode 100644 index 0000000000000000000000000000000000000000..8e4c862af0bf0c04900b63982d0780417ce77e3b Binary files /dev/null and b/Library/metadata/09/09d475cc5350571409bba62ebc89c4d8.info differ diff --git a/Library/metadata/0a/0a6073575c4fa534daa1367157d97ade b/Library/metadata/0a/0a6073575c4fa534daa1367157d97ade index 238c13197f97af99e1f9409e2f633e84df76ffe6..8afd1863a4d1bcd60e37491c0e9f09a0fc49b3e8 100644 Binary files a/Library/metadata/0a/0a6073575c4fa534daa1367157d97ade and b/Library/metadata/0a/0a6073575c4fa534daa1367157d97ade differ diff --git a/Library/metadata/49/49dbf13a74e4cfa4dae471aa3efec728.info b/Library/metadata/49/49dbf13a74e4cfa4dae471aa3efec728.info index 75ddc793872ec47a2d1ef1aec858a3aab8c31f8d..68d1f1b15493e7f3e796690e85c6900d0f3fa5d4 100644 Binary files a/Library/metadata/49/49dbf13a74e4cfa4dae471aa3efec728.info and b/Library/metadata/49/49dbf13a74e4cfa4dae471aa3efec728.info differ diff --git a/Library/metadata/86/86b0af4437e4e5c4bb4935928b56d6b8.info b/Library/metadata/86/86b0af4437e4e5c4bb4935928b56d6b8.info index a04b5b89684c30f5dbf1747d3d8f95cd9459b12b..2210b36c6160471055f8c5511c8583bdfff25d44 100644 Binary files a/Library/metadata/86/86b0af4437e4e5c4bb4935928b56d6b8.info and b/Library/metadata/86/86b0af4437e4e5c4bb4935928b56d6b8.info differ diff --git a/Library/metadata/8f/8f0ab999539a613449b207564146142a b/Library/metadata/8f/8f0ab999539a613449b207564146142a index 7fe14b9f1c3732a73c55e208c2911a9ca230b565..e19abc91ae7129b43b9cacd03201d90687ebdead 100644 Binary files a/Library/metadata/8f/8f0ab999539a613449b207564146142a and b/Library/metadata/8f/8f0ab999539a613449b207564146142a differ diff --git a/Library/metadata/b1/b139490968f43a049ac34ea0c9974208 b/Library/metadata/b1/b139490968f43a049ac34ea0c9974208 new file mode 100644 index 0000000000000000000000000000000000000000..58f0b4ce1a6fbe7c76a7422755e13baca7382fd5 Binary files /dev/null and b/Library/metadata/b1/b139490968f43a049ac34ea0c9974208 differ diff --git a/Library/metadata/b1/b139490968f43a049ac34ea0c9974208.info b/Library/metadata/b1/b139490968f43a049ac34ea0c9974208.info new file mode 100644 index 0000000000000000000000000000000000000000..a34cf3fe6c2dce47819b8536de0a14023fcf7f48 Binary files /dev/null and b/Library/metadata/b1/b139490968f43a049ac34ea0c9974208.info differ diff --git a/Library/metadata/b7/b7984bad0d865004291caa67b4a24e21 b/Library/metadata/b7/b7984bad0d865004291caa67b4a24e21 new file mode 100644 index 0000000000000000000000000000000000000000..adc166289f2e319322f9a607af531d88200e7734 Binary files /dev/null and b/Library/metadata/b7/b7984bad0d865004291caa67b4a24e21 differ diff --git a/Library/metadata/b7/b7984bad0d865004291caa67b4a24e21.info b/Library/metadata/b7/b7984bad0d865004291caa67b4a24e21.info new file mode 100644 index 0000000000000000000000000000000000000000..839070720596efb24ce33168d090743e4fa52cc2 Binary files /dev/null and b/Library/metadata/b7/b7984bad0d865004291caa67b4a24e21.info differ diff --git a/Library/metadata/ba/ba466e2599735e1438767d59679914d2 b/Library/metadata/ba/ba466e2599735e1438767d59679914d2 new file mode 100644 index 0000000000000000000000000000000000000000..96cfbceaeb37e9b4388b5c9401f121eb82a4c61e Binary files /dev/null and b/Library/metadata/ba/ba466e2599735e1438767d59679914d2 differ diff --git a/Library/metadata/ba/ba466e2599735e1438767d59679914d2.info b/Library/metadata/ba/ba466e2599735e1438767d59679914d2.info new file mode 100644 index 0000000000000000000000000000000000000000..8a4ee1e1c6e3811fb52dc5f97d7c4362191916c8 Binary files /dev/null and b/Library/metadata/ba/ba466e2599735e1438767d59679914d2.info differ diff --git a/Library/metadata/d1/d1d6601fa64e04444994747b2e5bd1d6.info b/Library/metadata/d1/d1d6601fa64e04444994747b2e5bd1d6.info index d3bcbec18d3144530ec9678f35c19ba183673029..5b21fd530deab432d83b80b643da726db4891ca9 100644 Binary files a/Library/metadata/d1/d1d6601fa64e04444994747b2e5bd1d6.info and b/Library/metadata/d1/d1d6601fa64e04444994747b2e5bd1d6.info differ diff --git a/Library/metadata/f2/f2cee3b221963284cb49b44877e9638d b/Library/metadata/f2/f2cee3b221963284cb49b44877e9638d new file mode 100644 index 0000000000000000000000000000000000000000..00dae79d9db77a1e357f5e5e4e49b1a97923be4c Binary files /dev/null and b/Library/metadata/f2/f2cee3b221963284cb49b44877e9638d differ diff --git a/Library/metadata/f2/f2cee3b221963284cb49b44877e9638d.info b/Library/metadata/f2/f2cee3b221963284cb49b44877e9638d.info new file mode 100644 index 0000000000000000000000000000000000000000..04e44c3cd5acd2488a63c8433c5ac76e88182028 Binary files /dev/null and b/Library/metadata/f2/f2cee3b221963284cb49b44877e9638d.info differ diff --git a/Library/metadata/fb/fb221c71c4445104ba9af8b29b3242cf b/Library/metadata/fb/fb221c71c4445104ba9af8b29b3242cf new file mode 100644 index 0000000000000000000000000000000000000000..73cb0f32ed5191278672b0e289eee39bb233a0c2 Binary files /dev/null and b/Library/metadata/fb/fb221c71c4445104ba9af8b29b3242cf differ diff --git a/Library/metadata/fb/fb221c71c4445104ba9af8b29b3242cf.info b/Library/metadata/fb/fb221c71c4445104ba9af8b29b3242cf.info new file mode 100644 index 0000000000000000000000000000000000000000..5f21b25ed98331a9cb04e382fd24bab2901c1677 Binary files /dev/null and b/Library/metadata/fb/fb221c71c4445104ba9af8b29b3242cf.info differ diff --git a/Library/shadercompiler-UnityShaderCompiler.exe0.log b/Library/shadercompiler-UnityShaderCompiler.exe0.log index 963aa5d145f543423b9c87f30d878812e9fa2789..12fd7097285bc6783534204a71ec87a88f164216 100644 --- a/Library/shadercompiler-UnityShaderCompiler.exe0.log +++ b/Library/shadercompiler-UnityShaderCompiler.exe0.log @@ -1,12 +1,33 @@ Base path: C:/Program Files/Unity/Hub/Editor/2018.2.15f1/Editor/Data Cmd: initializeCompiler -Cmd: compileSnippet - api=4 type=0 insize=1032 outsize=1414 kw=UNITY_PASS_SHADOWCASTER SHADOWS_DEPTH pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_RGBM_ENCODING ok=1 -Cmd: compileSnippet - api=4 type=1 insize=1032 outsize=218 kw=UNITY_PASS_SHADOWCASTER SHADOWS_DEPTH pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_RGBM_ENCODING ok=1 -Cmd: compileSnippet - api=4 type=0 insize=18355 outsize=2290 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL LIGHTPROBE_SH pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_RGBM_ENCODING ok=1 -Cmd: compileSnippet - api=4 type=1 insize=18355 outsize=1770 kw=UNITY_PASS_FORWARDBASE DIRECTIONAL LIGHTPROBE_SH pd=UNITY_ENABLE_REFLECTION_BUFFERS UNITY_USE_DITHER_MASK_FOR_ALPHABLENDED_SHADOWS UNITY_PBS_USE_BRDF1 UNITY_SPECCUBE_BOX_PROJECTION UNITY_SPECCUBE_BLENDING UNITY_ENABLE_DETAIL_NORMALMAP SHADER_API_DESKTOP UNITY_LIGHT_PROBE_PROXY_VOLUME UNITY_LIGHTMAP_RGBM_ENCODING ok=1 +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler Cmd: initializeCompiler Cmd: initializeCompiler diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 48e69d82ae09d566ba0396b4df5f151143fea710..4d0c8f32865c513c90e45ce58dbbfccfba2800ca 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -5,6 +5,8 @@ TagManager: serializedVersion: 2 tags: - OrbitalPoint + - OrbitalManager + - Orbiter layers: - Default - TransparentFX diff --git a/obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache b/obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache index d96ead5f0a13981d8f752200d7bb68615ce13a40..22c6dd0b163fa3d01745a7803efe8dc52d1d9278 100644 Binary files a/obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache and b/obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache differ diff --git a/obj/Debug/Assembly-CSharp.csproj.CoreCompileInputs.cache b/obj/Debug/Assembly-CSharp.csproj.CoreCompileInputs.cache index 817d8a3e4630452ac0bdb1c17e343a7b77fa0680..13312c6efbf9912fdeb2f70b83f23871b92ffc37 100644 --- a/obj/Debug/Assembly-CSharp.csproj.CoreCompileInputs.cache +++ b/obj/Debug/Assembly-CSharp.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -cf91e1adc32fd1ae153dc8ff42eeeeb34b4b503c +a9b8439e52556e524ba95f61af83c821b3460238 diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index ab470a89bb9d78c5dd66d2335a05df9f61bb2f22..e96a8b7ac3dd4abd2a9f3d1c81e6cc2ced1ae7c9 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ