diff --git a/.vs/UKSA-orbital-project/v15/.suo b/.vs/UKSA-orbital-project/v15/.suo
index fc126ce80e908801ca58e75892ff7af908ab8811..abba4e2eca8b1b61adebaa1c48680d94328381a7 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 01c49605cb9b373a42aa8ae931a7a56f6d465dfd..4fb06bc744aa0948741eab2324d5ce62aabfd8b1 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 ef753f09445d3a9be871fc26c12245f7766dde7a..4b59b1bb9861ed84071aa1736c36041e9dd9a116 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 0510c4ae38b398ab191c63dfe953b060d656aacf..e8cfbeed9da2b65db03821d949c22ce51b61bf80 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 3644a366c64537132080a5c675d02da7cc941d3e..98aa2725556b318df4e91d27e11922fd6241f205 100644
--- a/Assembly-CSharp.csproj
+++ b/Assembly-CSharp.csproj
@@ -61,6 +61,7 @@
</Reference>
</ItemGroup>
<ItemGroup>
+ <Compile Include="Assets\DrawLine.cs" />
<Compile Include="Assets\Oculus\AudioManager\Scenes\Scripts\TestScript.cs" />
<Compile Include="Assets\Oculus\AudioManager\Scripts\Audio\AmbienceEmitter.cs" />
<Compile Include="Assets\Oculus\AudioManager\Scripts\Audio\AudioManager.cs" />
diff --git a/Assets/DrawLine.cs b/Assets/DrawLine.cs
new file mode 100644
index 0000000000000000000000000000000000000000..49493939663dec516ab32bb6f65f14ab06bf63c9
--- /dev/null
+++ b/Assets/DrawLine.cs
@@ -0,0 +1,16 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class DrawLine : MonoBehaviour {
+
+ // Use this for initialization
+ void Start () {
+
+ }
+
+ // Update is called once per frame
+ void Update () {
+
+ }
+}
diff --git a/Assets/DrawLine.cs.meta b/Assets/DrawLine.cs.meta
new file mode 100644
index 0000000000000000000000000000000000000000..43c1eda1c297790d37b0856b7c50b1aff5a1eb8c
--- /dev/null
+++ b/Assets/DrawLine.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: f0f062d3d44005a4dbd2b4f8e28b8aef
+MonoImporter:
+ externalObjects: {}
+ serializedVersion: 2
+ defaultReferences: []
+ executionOrder: 0
+ icon: {instanceID: 0}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/OSLO/TBP_Integrator/Program.cs b/Assets/OSLO/TBP_Integrator/Program.cs
index 4f757770b7a587fc70a48e6758fd3bbbe3cd6ca3..8d8435ccd0829aec69950843b89e0dc7a5c25f89 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, 1);
+ ThreeBodyProblemIntegration(0.94949344, 0.39329306, -0.00426519, 2.0 * Math.PI);
}
- public static void ThreeBodyProblemIntegration(double xVal, double yVal, double zVal, double TFinal, int scale)
+ public static void ThreeBodyProblemIntegration(double xVal, double yVal, double zVal, double TFinal)
{
var tFinal = TFinal; // Final integration time
@@ -157,7 +157,7 @@ namespace threeBodyProblemIntegrator
float zpos = (float)solPoint.X[1];
// convert floats to vector3 positions
- Vector3 positions = new Vector3(xpos*scale, ypos*scale, zpos*scale);
+ Vector3 positions = new Vector3(xpos, ypos, zpos);
// instantiate orbital objects at given positions
OM.PointCreator(positions);
diff --git a/Assets/Prefabs/OrbitalManager.prefab b/Assets/Prefabs/OrbitalManager.prefab
index ad47d15ff3728caa4ab17abaf7d122d80da0a783..226075ee2d7b854fefd13617a12091230450331d 100644
--- a/Assets/Prefabs/OrbitalManager.prefab
+++ b/Assets/Prefabs/OrbitalManager.prefab
@@ -210,7 +210,7 @@ MonoBehaviour:
startingZ: -0.00426519
tFinal: 6.283185307179586
newscale: 1
- orbitalpoints: []
+ orbitalobjects: []
--- !u!120 &120870686573013508
LineRenderer:
m_ObjectHideFlags: 1
diff --git a/Assets/Prefabs/OrbitalPoint.prefab b/Assets/Prefabs/OrbitalPoint.prefab
index 58f369ba06564c89439ec25206fc667a780d3f72..0476afc42064e433cd0d1e1cfc0daa3ae47f37ab 100644
--- a/Assets/Prefabs/OrbitalPoint.prefab
+++ b/Assets/Prefabs/OrbitalPoint.prefab
@@ -19,9 +19,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 4592784013972448}
- - component: {fileID: 33976148626495848}
- - component: {fileID: 135202599758979206}
- - component: {fileID: 23037390059043676}
m_Layer: 0
m_Name: OrbitalPoint
m_TagString: OrbitalPoint
@@ -42,57 +39,3 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!23 &23037390059043676
-MeshRenderer:
- m_ObjectHideFlags: 1
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1892811845398980}
- m_Enabled: 1
- m_CastShadows: 0
- m_ReceiveShadows: 0
- m_DynamicOccludee: 1
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RenderingLayerMask: 4294967295
- m_Materials:
- - {fileID: 2100000, guid: 90e1f011370cc5a4aa2e34d67175de6d, 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 &33976148626495848
-MeshFilter:
- m_ObjectHideFlags: 1
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1892811845398980}
- m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
---- !u!135 &135202599758979206
-SphereCollider:
- m_ObjectHideFlags: 1
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInternal: {fileID: 100100000}
- m_GameObject: {fileID: 1892811845398980}
- 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/Scripts/FollowTrajectory.cs b/Assets/Scripts/FollowTrajectory.cs
index a1787d208b4abe4b976a36014d6e12056eb19879..870235a46bd0f82bf2d195ee18a621487cf96fab 100644
--- a/Assets/Scripts/FollowTrajectory.cs
+++ b/Assets/Scripts/FollowTrajectory.cs
@@ -16,14 +16,7 @@ public class FollowTrajectory : MonoBehaviour {
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);
@@ -59,7 +52,6 @@ public class FollowTrajectory : MonoBehaviour {
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
diff --git a/Assets/Scripts/OrbitManagement.cs b/Assets/Scripts/OrbitManagement.cs
index b252e75b74ec1b2a330f7aea2f0a35a5b77df72d..bc5befb3b4683eb8b7c9ec3ec4b1289729003441 100644
--- a/Assets/Scripts/OrbitManagement.cs
+++ b/Assets/Scripts/OrbitManagement.cs
@@ -18,33 +18,31 @@ namespace threeBodyProblemIntegrator {
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;
+ private float startingscale = 1;
+ private float OrbiterStartingScale;
+ private float currentscale = 1;
+ public float 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 List<GameObject> orbitalobjects;
+ private LineRenderer LR;
// all math in 3BPI uses Z-up, not Y-up.
void Start()
{
- //edited out for scaling test
float mu = (float)Mu;
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(startingscale);
+ TBP();
+ OrbiterStartingScale = Orbiter.GetComponent<Transform>().localScale.x;
}
- public void TBP(int Scaling)
+ public void TBP()
{
- Program.ThreeBodyProblemIntegration(startingX, startingY, startingZ, tFinal, Scaling);
+ Program.ThreeBodyProblemIntegration(startingX, startingY, startingZ, tFinal);
// 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
@@ -55,39 +53,39 @@ namespace threeBodyProblemIntegrator {
{
if (currentscale != newscale)
{
- orbitalpoints.Clear();
- Orbiter.GetComponent<FollowTrajectory>().orbitalpoints.Clear();
- TBP(newscale);
+ FollowTrajectory FT = Orbiter.GetComponent<FollowTrajectory>();
+ FT.orbitalpoints.Clear();
gameObject.transform.localScale = new Vector3(newscale, newscale, newscale);
- Orbiter.transform.localScale = Orbiter.transform.localScale * newscale;
+ Orbiter.transform.localScale = new Vector3(OrbiterStartingScale * newscale, OrbiterStartingScale * newscale, OrbiterStartingScale * newscale);
currentscale = newscale;
+ RenderPoints();
+ for (int i = 0; i < orbitalobjects.Count; i++)
+ {
+ FT.PositionCreator(orbitalobjects[i].transform.position);
+ }
+ FT.SetPath();
}
}
public void PointCreator(Vector3 position)
{
- //create orbital point object at position - render heavy.
- //Instantiate(orbitalindicator, position, Quaternion.identity);
- //dont instantiate, create array of positions.
- orbitalpoints.Add(position);
+ //create orbital point object at position
+ GameObject orbitalchild = Instantiate(orbitalindicator, position, Quaternion.identity) as GameObject;
+ orbitalchild.transform.parent = gameObject.transform;
+ orbitalobjects.Add(orbitalchild);
}
public void RenderPoints()
{
- // render tube
- //TubeRenderer TR = GetComponent<TubeRenderer>();
- //Vector3[] pointlist = orbitalpoints.ToArray();
- //TR.SetPoints(pointlist, 0.005f, col);
- // tube renderer is expensive to render.
-
- // render line
- for (int i = 0; i < orbitalpoints.Count; i++)
- {
- LR.positionCount = orbitalpoints.Count;
- LR.startWidth = 0.001f*currentscale;
- LR.endWidth = 0.001f*currentscale;
- LR.SetPosition(i, orbitalpoints[i]);
+ // render line between all orbitalobjects
+ LR.positionCount = orbitalobjects.Count;
+ LR.startWidth = 0.001f * currentscale;
+ LR.endWidth = 0.001f * currentscale;
+ for (int i = 0; i < orbitalobjects.Count; i++)
+ {
+ LR.SetPosition(i, orbitalobjects[i].transform.position);
}
+
// line renderer most efficient render so far.
}
}
diff --git a/Library/CurrentLayout.dwlt b/Library/CurrentLayout.dwlt
index eb010c68ec73965c273c559940269350ace2e656..2ec6332f636d51ae374ec8b6ecc2e0d19f2d973d 100644
--- a/Library/CurrentLayout.dwlt
+++ b/Library/CurrentLayout.dwlt
@@ -1,28 +1,6 @@
%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}
@@ -41,58 +19,10 @@ MonoBehaviour:
height: 967
m_ShowMode: 4
m_Title:
- m_RootView: {fileID: 11}
- m_MinSize: {x: 950, y: 300}
+ m_RootView: {fileID: 8}
+ m_MinSize: {x: 950, y: 542}
m_MaxSize: {x: 10000, y: 10000}
---- !u!114 &3
-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: 0
- y: 0
- width: 976
- height: 571
- m_MinSize: {x: 200, y: 222}
- m_MaxSize: {x: 4000, y: 4022}
- m_ActualView: {fileID: 28}
- m_Panes:
- - {fileID: 28}
- m_Selected: 0
- m_LastSelected: 0
---- !u!114 &4
-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: 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
+--- !u!114 &2
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -104,18 +34,18 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Children:
- - {fileID: 7}
+ - {fileID: 4}
m_Position:
serializedVersion: 2
x: 0
y: 30
width: 1680
height: 917
- m_MinSize: {x: 579, y: 471}
- m_MaxSize: {x: 14002, y: 14042}
+ m_MinSize: {x: 681, y: 492}
+ m_MaxSize: {x: 14004, y: 14042}
vertical: 1
- controlID: 61
---- !u!114 &6
+ controlID: 107
+--- !u!114 &3
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -133,17 +63,18 @@ MonoBehaviour:
y: 0
width: 980
height: 570
- m_MinSize: {x: 100, y: 100}
- m_MaxSize: {x: 4000, y: 4000}
- m_ActualView: {fileID: 21}
+ m_MinSize: {x: 204, y: 221}
+ m_MaxSize: {x: 4004, y: 4021}
+ m_ActualView: {fileID: 25}
m_Panes:
+ - {fileID: 25}
+ - {fileID: 18}
- {fileID: 21}
- - {fileID: 24}
+ - {fileID: 14}
- {fileID: 17}
- - {fileID: 20}
m_Selected: 0
- m_LastSelected: 0
---- !u!114 &7
+ m_LastSelected: 1
+--- !u!114 &4
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -155,19 +86,19 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Children:
- - {fileID: 14}
- - {fileID: 8}
+ - {fileID: 11}
+ - {fileID: 5}
m_Position:
serializedVersion: 2
x: 0
y: 0
width: 1680
height: 917
- m_MinSize: {x: 579, y: 471}
- m_MaxSize: {x: 14002, y: 14042}
+ m_MinSize: {x: 681, y: 492}
+ m_MaxSize: {x: 14004, y: 14042}
vertical: 0
- controlID: 62
---- !u!114 &8
+ controlID: 108
+--- !u!114 &5
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -185,18 +116,18 @@ MonoBehaviour:
y: 0
width: 492
height: 917
- m_MinSize: {x: 275, y: 50}
- m_MaxSize: {x: 4000, y: 4000}
- m_ActualView: {fileID: 26}
+ m_MinSize: {x: 277, y: 71}
+ m_MaxSize: {x: 4002, y: 4021}
+ m_ActualView: {fileID: 23}
m_Panes:
- - {fileID: 26}
- {fileID: 23}
- - {fileID: 22}
+ - {fileID: 20}
- {fileID: 19}
- - {fileID: 18}
+ - {fileID: 16}
+ - {fileID: 15}
m_Selected: 0
m_LastSelected: 0
---- !u!114 &9
+--- !u!114 &6
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -216,12 +147,12 @@ MonoBehaviour:
height: 570
m_MinSize: {x: 200, y: 200}
m_MaxSize: {x: 4000, y: 4000}
- m_ActualView: {fileID: 27}
+ m_ActualView: {fileID: 24}
m_Panes:
- - {fileID: 27}
+ - {fileID: 24}
m_Selected: 0
m_LastSelected: 0
---- !u!114 &10
+--- !u!114 &7
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -241,14 +172,14 @@ MonoBehaviour:
height: 347
m_MinSize: {x: 232, y: 271}
m_MaxSize: {x: 10002, y: 10021}
- m_ActualView: {fileID: 25}
+ m_ActualView: {fileID: 22}
m_Panes:
- - {fileID: 25}
- - {fileID: 29}
- - {fileID: 16}
+ - {fileID: 22}
+ - {fileID: 26}
+ - {fileID: 13}
m_Selected: 0
m_LastSelected: 1
---- !u!114 &11
+--- !u!114 &8
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -260,18 +191,18 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Children:
- - {fileID: 12}
- - {fileID: 5}
- - {fileID: 13}
+ - {fileID: 9}
+ - {fileID: 2}
+ - {fileID: 10}
m_Position:
serializedVersion: 2
x: 0
y: 0
width: 1680
height: 967
- m_MinSize: {x: 950, y: 300}
+ m_MinSize: {x: 950, y: 542}
m_MaxSize: {x: 10000, y: 10000}
---- !u!114 &12
+--- !u!114 &9
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -292,7 +223,7 @@ MonoBehaviour:
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
m_LastLoadedLayoutName:
---- !u!114 &13
+--- !u!114 &10
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -312,7 +243,7 @@ MonoBehaviour:
height: 20
m_MinSize: {x: 0, y: 0}
m_MaxSize: {x: 0, y: 0}
---- !u!114 &14
+--- !u!114 &11
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -324,19 +255,19 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Children:
- - {fileID: 15}
- - {fileID: 10}
+ - {fileID: 12}
+ - {fileID: 7}
m_Position:
serializedVersion: 2
x: 0
y: 0
width: 1188
height: 917
- m_MinSize: {x: 304, y: 471}
+ m_MinSize: {x: 404, y: 492}
m_MaxSize: {x: 10002, y: 14042}
vertical: 1
- controlID: 63
---- !u!114 &15
+ controlID: 109
+--- !u!114 &12
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -348,19 +279,19 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Children:
- - {fileID: 9}
- {fileID: 6}
+ - {fileID: 3}
m_Position:
serializedVersion: 2
x: 0
y: 0
width: 1188
height: 570
- m_MinSize: {x: 304, y: 200}
+ m_MinSize: {x: 404, y: 221}
m_MaxSize: {x: 8004, y: 4021}
vertical: 0
- controlID: 16
---- !u!114 &16
+ controlID: 58
+--- !u!114 &13
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -386,7 +317,7 @@ MonoBehaviour:
height: 326
m_PersistentViewDataDictionary: {fileID: 0}
m_VertSplit:
- ID: 634
+ ID: 1608
splitterInitialOffset: 117
currentActiveSplitter: -1
realSizes: 64000000d2000000
@@ -692,7 +623,7 @@ MonoBehaviour:
m_VisibleColumns:
m_SortedColumns:
m_ClearOnPlay: 0
---- !u!114 &17
+--- !u!114 &14
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -717,7 +648,7 @@ MonoBehaviour:
width: 970
height: 617
m_PersistentViewDataDictionary: {fileID: 0}
---- !u!114 &18
+--- !u!114 &15
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -742,7 +673,7 @@ MonoBehaviour:
width: 388
height: 936
m_PersistentViewDataDictionary: {fileID: 0}
---- !u!114 &19
+--- !u!114 &16
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -767,7 +698,7 @@ MonoBehaviour:
width: 625
height: 896
m_PersistentViewDataDictionary: {fileID: 0}
---- !u!114 &20
+--- !u!114 &17
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -787,12 +718,12 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: 305
+ x: 210
y: 92
- width: 1096
- height: 616
+ width: 976
+ height: 549
m_PersistentViewDataDictionary: {fileID: 0}
---- !u!114 &21
+--- !u!114 &18
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -839,7 +770,7 @@ MonoBehaviour:
m_HSlider: 0
m_VSlider: 0
m_IgnoreScrollWheelUntilClicked: 0
- m_EnableMouseInput: 1
+ m_EnableMouseInput: 0
m_EnableSliderZoomHorizontal: 0
m_EnableSliderZoomVertical: 0
m_UniformScale: 1
@@ -871,7 +802,7 @@ MonoBehaviour:
m_NoCameraWarning: 1
m_LowResolutionForAspectRatios: 01000000000100000100
m_XRRenderMode: 0
---- !u!114 &22
+--- !u!114 &19
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -903,7 +834,7 @@ MonoBehaviour:
m_RegisteredViewInstances:
- {fileID: 0}
- {fileID: 0}
---- !u!114 &23
+--- !u!114 &20
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -928,7 +859,7 @@ MonoBehaviour:
width: 760
height: 1286
m_PersistentViewDataDictionary: {fileID: 0}
---- !u!114 &24
+--- !u!114 &21
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -970,7 +901,7 @@ MonoBehaviour:
m_CurrentEditor: 1
m_LayerEditor:
m_SelectedLayerIndex: 0
---- !u!114 &25
+--- !u!114 &22
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -1007,20 +938,20 @@ MonoBehaviour:
m_ShowAllHits: 0
m_SearchArea: 1
m_Folders:
- - Assets/Scenes
+ - Assets/VRTK/Source
m_ViewMode: 1
m_StartGridSize: 16
m_LastFolders:
- - Assets/Scenes
+ - Assets/VRTK/Source
m_LastFoldersGridSize: 16
m_LastProjectPath: U:\Unity 2018 Projects\UKSA-orbital-project
m_LockTracker:
m_IsLocked: 0
m_FolderTreeState:
scrollPos: {x: 0, y: 0}
- m_SelectedIDs: 94130000
- m_LastClickedID: 5012
- m_ExpandedIDs: 00000000dc0f0000f8140000fe15000000ca9a3b
+ m_SelectedIDs: 74100000
+ m_LastClickedID: 4212
+ m_ExpandedIDs: 00000000fe15000000ca9a3b
m_RenameOverlay:
m_UserAcceptedRename: 0
m_Name:
@@ -1036,7 +967,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
- m_ClientGUIView: {fileID: 10}
+ m_ClientGUIView: {fileID: 7}
m_SearchString:
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
@@ -1092,7 +1023,7 @@ MonoBehaviour:
m_IsRenaming: 0
m_OriginalEventType: 11
m_IsRenamingFilename: 1
- m_ClientGUIView: {fileID: 10}
+ m_ClientGUIView: {fileID: 7}
m_CreateAssetUtility:
m_EndAction: {fileID: 0}
m_InstanceID: 0
@@ -1103,7 +1034,7 @@ MonoBehaviour:
m_ScrollPosition: {x: 0, y: 0}
m_GridSize: 16
m_DirectoriesAreaWidth: 272
---- !u!114 &26
+--- !u!114 &23
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -1137,7 +1068,7 @@ MonoBehaviour:
m_ControlHash: -371814159
m_PrefName: Preview_InspectorPreview
m_PreviewWindow: {fileID: 0}
---- !u!114 &27
+--- !u!114 &24
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -1164,25 +1095,25 @@ MonoBehaviour:
m_PersistentViewDataDictionary: {fileID: 0}
m_TreeViewState:
scrollPos: {x: 0, y: 0}
- m_SelectedIDs: 361a0000
+ m_SelectedIDs:
m_LastClickedID: 0
- m_ExpandedIDs: 7014f8ffc81af8ff2a31f8ff5c73f8ffdefbffff000000008820000092200000f4550000
+ m_ExpandedIDs: defbffff0000000090200000
m_RenameOverlay:
m_UserAcceptedRename: 0
- m_Name: Earth(Clone)
- m_OriginalName: Earth(Clone)
+ m_Name: Orbiter
+ m_OriginalName: Orbiter
m_EditFieldRect:
serializedVersion: 2
x: 0
y: 0
width: 0
height: 0
- m_UserData: -424534
+ m_UserData: 8346
m_IsWaitingForDelay: 0
m_IsRenaming: 0
m_OriginalEventType: 0
m_IsRenamingFilename: 0
- m_ClientGUIView: {fileID: 9}
+ m_ClientGUIView: {fileID: 6}
m_SearchString:
m_ExpandedScenes:
- MainScene
@@ -1190,7 +1121,7 @@ MonoBehaviour:
m_LockTracker:
m_IsLocked: 0
m_CurrentSortingName: TransformSorting
---- !u!114 &28
+--- !u!114 &25
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
@@ -1210,20 +1141,20 @@ MonoBehaviour:
m_Tooltip:
m_Pos:
serializedVersion: 2
- x: -1205
- y: 215
+ x: 210
+ y: 92
width: 976
height: 549
m_PersistentViewDataDictionary: {fileID: 0}
m_SceneLighting: 0
- lastFramingTime: 9572.071050999999
+ lastFramingTime: 76406.3716996
m_2DMode: 0
m_isRotationLocked: 0
m_AudioPlay: 0
m_Position:
- m_Target: {x: 4.999985, y: 0, z: 0}
+ m_Target: {x: 5.1599846, y: 0, z: 0}
speed: 2
- m_Value: {x: 4.999985, y: 0, z: 0}
+ m_Value: {x: 5.1599846, y: 0, z: 0}
m_RenderMode: 0
m_CameraMode:
drawMode: 0
@@ -1251,13 +1182,13 @@ MonoBehaviour:
speed: 2
m_Value: 0
m_Rotation:
- m_Target: {x: 0.01859073, y: 0.9485387, z: -0.310988, w: 0.056701913}
+ m_Target: {x: 0.24959771, y: 0.55967224, z: -0.1816369, w: 0.7690748}
speed: 2
- m_Value: {x: 0.018590732, y: 0.9485388, z: -0.31098804, w: 0.056701917}
+ m_Value: {x: 0.24959771, y: 0.55967224, z: -0.1816369, w: 0.7690748}
m_Size:
- m_Target: 1.8142896
+ m_Target: 1.8147471
speed: 2
- m_Value: 1.8142896
+ m_Value: 1.8147471
m_Ortho:
m_Target: 0
speed: 2
@@ -1269,7 +1200,7 @@ MonoBehaviour:
m_ReplacementString:
m_LastLockedObject: {fileID: 0}
m_ViewIsLockedToObject: 0
---- !u!114 &29
+--- !u!114 &26
MonoBehaviour:
m_ObjectHideFlags: 52
m_CorrespondingSourceObject: {fileID: 0}
diff --git a/Library/InspectorExpandedItems.asset b/Library/InspectorExpandedItems.asset
index 1de72f1864cd59fc61c8aaeec98501d16a8b68b1..cf78705040b49b4004dfb19a77fe23345e406bd0 100644
Binary files a/Library/InspectorExpandedItems.asset and b/Library/InspectorExpandedItems.asset differ
diff --git a/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll b/Library/ScriptAssemblies/Assembly-CSharp-Editor.dll
index 99c87d82ba7e973e92ecd561c712e08bd7571d49..dfa629a6e55c62aef3fb9d882e18666709af499e 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 9b8ac2cbd4a3565e4f227157bf8bb49d6786b458..321ca8867ce105ecc2d659abb55b9561d0206f44 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 27166503b08af1ee4b85790255a94f2252c9df4f..aebc08b18fff487a066a184cf97b8f1989fc775a 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 b0b3fb2d66991b2f2773323e299f39053121ec81..683c8f4a48ec273db7314740736d23d4c259c68a 100644
Binary files a/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb and b/Library/ScriptAssemblies/Assembly-CSharp.dll.mdb differ
diff --git a/Library/assetDatabase3 b/Library/assetDatabase3
index 1f140e6b0620542fad93c2ee33296db6dc93c337..50e83181793f31687d6f1b1c7fea2d1090c7c393 100644
Binary files a/Library/assetDatabase3 and b/Library/assetDatabase3 differ
diff --git a/Library/expandedItems b/Library/expandedItems
index 0dc21ee33f49d1ee76ed773661706c1e544bf5bf..4a788596ad7b23ccd29af71c4a03c79962c8197e 100644
Binary files a/Library/expandedItems and b/Library/expandedItems differ
diff --git a/Library/metadata/0a/0a6073575c4fa534daa1367157d97ade b/Library/metadata/0a/0a6073575c4fa534daa1367157d97ade
index 8afd1863a4d1bcd60e37491c0e9f09a0fc49b3e8..0a7b66374be20b73842590c9ade36c9d0db2b05a 100644
Binary files a/Library/metadata/0a/0a6073575c4fa534daa1367157d97ade and b/Library/metadata/0a/0a6073575c4fa534daa1367157d97ade differ
diff --git a/Library/metadata/54/54ed12ec5415cab42a09454756297974.info b/Library/metadata/54/54ed12ec5415cab42a09454756297974.info
index 5e0075e65b6c3fe2ea89304f05a675befcbe4127..87cf616af7333fe92bba828659671fe9f476b92e 100644
Binary files a/Library/metadata/54/54ed12ec5415cab42a09454756297974.info and b/Library/metadata/54/54ed12ec5415cab42a09454756297974.info differ
diff --git a/Library/metadata/8f/8f0ab999539a613449b207564146142a b/Library/metadata/8f/8f0ab999539a613449b207564146142a
index e19abc91ae7129b43b9cacd03201d90687ebdead..5d7c7cdf2904ed79e47c7deb1ac3a701e9dd2e7d 100644
Binary files a/Library/metadata/8f/8f0ab999539a613449b207564146142a and b/Library/metadata/8f/8f0ab999539a613449b207564146142a differ
diff --git a/Library/metadata/f0/f0f062d3d44005a4dbd2b4f8e28b8aef b/Library/metadata/f0/f0f062d3d44005a4dbd2b4f8e28b8aef
new file mode 100644
index 0000000000000000000000000000000000000000..a86a060dadb3296d99fbabed3abfa4a6ba1566ec
Binary files /dev/null and b/Library/metadata/f0/f0f062d3d44005a4dbd2b4f8e28b8aef differ
diff --git a/Library/metadata/f0/f0f062d3d44005a4dbd2b4f8e28b8aef.info b/Library/metadata/f0/f0f062d3d44005a4dbd2b4f8e28b8aef.info
new file mode 100644
index 0000000000000000000000000000000000000000..5f6a0d46d2e09b7240b75d0bf7de45dd20a15a75
Binary files /dev/null and b/Library/metadata/f0/f0f062d3d44005a4dbd2b4f8e28b8aef.info differ
diff --git a/Library/metadata/fb/fb221c71c4445104ba9af8b29b3242cf b/Library/metadata/fb/fb221c71c4445104ba9af8b29b3242cf
index 73cb0f32ed5191278672b0e289eee39bb233a0c2..0a8bd376a555053517a3d0203a808af88f37d7f1 100644
Binary files a/Library/metadata/fb/fb221c71c4445104ba9af8b29b3242cf and b/Library/metadata/fb/fb221c71c4445104ba9af8b29b3242cf differ
diff --git a/Library/metadata/fb/fb221c71c4445104ba9af8b29b3242cf.info b/Library/metadata/fb/fb221c71c4445104ba9af8b29b3242cf.info
index 5f21b25ed98331a9cb04e382fd24bab2901c1677..f2f945300c988ee099f2aa9440b13a799bc7a6e6 100644
Binary files a/Library/metadata/fb/fb221c71c4445104ba9af8b29b3242cf.info and b/Library/metadata/fb/fb221c71c4445104ba9af8b29b3242cf.info differ
diff --git a/Library/shadercompiler-UnityShaderCompiler.exe0.log b/Library/shadercompiler-UnityShaderCompiler.exe0.log
index 12fd7097285bc6783534204a71ec87a88f164216..20d7f6202408a1f520e72928bb5ed684cf2a58ea 100644
--- a/Library/shadercompiler-UnityShaderCompiler.exe0.log
+++ b/Library/shadercompiler-UnityShaderCompiler.exe0.log
@@ -19,15 +19,3 @@ 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/obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache b/obj/Debug/Assembly-CSharp-Editor.csprojAssemblyReference.cache
index 22c6dd0b163fa3d01745a7803efe8dc52d1d9278..88951026f3a64adce7c1b437e3e7214f8cc14f2b 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 13312c6efbf9912fdeb2f70b83f23871b92ffc37..b85bf691ae7a55302fa6fa11b7d4fd00dc063a60 100644
--- a/obj/Debug/Assembly-CSharp.csproj.CoreCompileInputs.cache
+++ b/obj/Debug/Assembly-CSharp.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-a9b8439e52556e524ba95f61af83c821b3460238
+2b74fe78970e78e1a6bdb541763476012db5e1b6