Merge pull request #1 from sandalconsumer/advanced-visualization

Separate Visualization Module

Author: sandalconsumer

.idea/.idea.unity-harmonics/.idea/.gitignore

@@ -2,37 +2,32 @@
 using System.Collections.Generic;
 
 [System.Serializable]
-public class Spring // in this simulation, springs are considered to all be acting on one body, and class "Body" is a singleton although not explicitly being defined as that.
+public class Spring 
 {
     public Vector3 rootPosition = new Vector3(0,0,0);
     public float springConstant = 100;
 
     [HideInInspector]public Vector3 restorativeForce = Vector3.zero;
-    [HideInInspector]public Vector3 stretch; //how far the mass is from the root position
+    [HideInInspector]public Vector3 stretch;
     public Vector3 restPosition = new Vector3(3, 0, 0);
 }
 
 public class Body : MonoBehaviour
 {
+    public SimulationDataCompiler dataCompiler;
+    
     Vector3 position;
     Vector3 acceleration;
     Vector3 velocity;
 
-    float mass = 100;
+    public float mass = 100;
 
     Vector3 leadForce;
 
     public List<Spring> connectedSprings = new List<Spring>();
 
     private float timestep;
 
-    public float plotScale = 1f;
-    public Vector3 plotOrigin = new Vector3(0, 0, -10);
-    
-    private List<float> timeStamps = new List<float>();
-    private List<Vector3> positions = new List<Vector3>();
-    private List<float> stretches = new List<float>();
-    
     void Start()
     {
         position = transform.position;
@@ -64,16 +59,10 @@ void FixedUpdate()
 
         VerletFinalstep(timestep);
 
-        timeStamps.Add(Time.fixedTime);
-        positions.Add(position);
-        stretches.Add(connectedSprings[0].stretch.magnitude);
+        dataCompiler.simulationEndData.timeStamps.Add(Time.fixedTime);
+        dataCompiler.simulationEndData.positions.Add(position);
+        dataCompiler.simulationEndData.stretches.Add(connectedSprings[0].stretch.magnitude);
 
-        for (int i = 1; i < timeStamps.Count; i++)
-        {
-            Vector3 p1 = plotOrigin + new Vector3(timeStamps[i-1] * plotScale, stretches[i-1] * plotScale, 0);
-            Vector3 p2 = plotOrigin + new Vector3(timeStamps[i] * plotScale, stretches[i] * plotScale, 0);
-            Debug.DrawLine(p1, p2, Color.cyan);
-        }
     }
 
     void UpdateSpringDisplacement(List<Spring> springs)

.idea/.idea.unity-harmonics/.idea/indexLayout.xml

@@ -0,0 +1,27 @@
+using UnityEngine;
+using System.Collections.Generic;
+
+public class SimulationEndData
+{
+    public List<float> timeStamps = new List<float>();
+    public List<Vector3> positions = new List<Vector3>();
+    public List<float> stretches = new List<float>();
+}
+
+public class SimulationDataCompiler : MonoBehaviour // to be used as a singleton
+{
+    public SimulationEndData simulationEndData = new SimulationEndData();
+    
+    public float plotScale = 1f;
+    public Vector3 plotOrigin = new Vector3(10, 0, 0);
+    
+    void Update()
+    {
+        for (int i = 1; i < simulationEndData.timeStamps.Count; i++)
+        {
+            Vector3 p1 = plotOrigin + new Vector3(simulationEndData.timeStamps[i-1] * plotScale, simulationEndData.stretches[i-1] * plotScale, 0);
+            Vector3 p2 = plotOrigin + new Vector3(simulationEndData.timeStamps[i] * plotScale, simulationEndData.stretches[i] * plotScale, 0);
+            Debug.DrawLine(p1, p2, Color.cyan);
+        }
+    }
+}

.idea/.idea.unity-harmonics/.idea/vcs.xml

@@ -1,80 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!114 &-7893295128165547882
-MonoBehaviour:
-  m_ObjectHideFlags: 3
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 0b2db86121404754db890f4c8dfe81b2, type: 3}
-  m_Name: Bloom
-  m_EditorClassIdentifier: 
-  active: 1
-  skipIterations:
-    m_OverrideState: 1
-    m_Value: 0
-  threshold:
-    m_OverrideState: 1
-    m_Value: 1
-  intensity:
-    m_OverrideState: 1
-    m_Value: 0.25
-  scatter:
-    m_OverrideState: 1
-    m_Value: 0.5
-  clamp:
-    m_OverrideState: 0
-    m_Value: 65472
-  tint:
-    m_OverrideState: 0
-    m_Value: {r: 1, g: 1, b: 1, a: 1}
-  highQualityFiltering:
-    m_OverrideState: 1
-    m_Value: 1
-  downscale:
-    m_OverrideState: 0
-    m_Value: 0
-  maxIterations:
-    m_OverrideState: 0
-    m_Value: 6
-  dirtTexture:
-    m_OverrideState: 0
-    m_Value: {fileID: 0}
-    dimension: 1
-  dirtIntensity:
-    m_OverrideState: 0
-    m_Value: 0
---- !u!114 &-3357603926938260329
-MonoBehaviour:
-  m_ObjectHideFlags: 3
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 899c54efeace73346a0a16faa3afe726, type: 3}
-  m_Name: Vignette
-  m_EditorClassIdentifier: 
-  active: 1
-  color:
-    m_OverrideState: 0
-    m_Value: {r: 0, g: 0, b: 0, a: 1}
-  center:
-    m_OverrideState: 0
-    m_Value: {x: 0.5, y: 0.5}
-  intensity:
-    m_OverrideState: 1
-    m_Value: 0.2
-  smoothness:
-    m_OverrideState: 0
-    m_Value: 0.2
-  rounded:
-    m_OverrideState: 0
-    m_Value: 0
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -89,9 +14,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   components:
   - {fileID: 849379129802519247}
-  - {fileID: -7893295128165547882}
-  - {fileID: 7391319092446245454}
-  - {fileID: -3357603926938260329}
 --- !u!114 &849379129802519247
 MonoBehaviour:
   m_ObjectHideFlags: 3
@@ -107,7 +29,7 @@ MonoBehaviour:
   active: 1
   mode:
     m_OverrideState: 1
-    m_Value: 1
+    m_Value: 2
   neutralHDRRangeReductionMode:
     m_OverrideState: 0
     m_Value: 2
@@ -132,28 +54,3 @@ MonoBehaviour:
   maxNits:
     m_OverrideState: 1
     m_Value: 647
---- !u!114 &7391319092446245454
-MonoBehaviour:
-  m_ObjectHideFlags: 3
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: ccf1aba9553839d41ae37dd52e9ebcce, type: 3}
-  m_Name: MotionBlur
-  m_EditorClassIdentifier: 
-  active: 0
-  mode:
-    m_OverrideState: 0
-    m_Value: 0
-  quality:
-    m_OverrideState: 1
-    m_Value: 2
-  intensity:
-    m_OverrideState: 1
-    m_Value: 0.6
-  clamp:
-    m_OverrideState: 0
-    m_Value: 0.05