Browse Source

Logging updates, Spawns, new Route, Arrows..

Marcel Zickler 2 years ago
parent
commit
b99b763f8d

+ 1 - 1
Assets/Prefabs/Cars/Convertable.prefab

@@ -1002,7 +1002,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 2750396513886025969}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c727ef9fc0f4f412e9af1893b478cba9, type: 3}
+  m_Script: {fileID: 11500000, guid: 2353d0f9395367242a91c029c28d976e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   rightIndicators:

+ 1 - 1
Assets/Prefabs/Cars/SUV.prefab

@@ -1091,7 +1091,7 @@ MonoBehaviour:
   m_GameObject: {fileID: 1141346736640394312}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: c727ef9fc0f4f412e9af1893b478cba9, type: 3}
+  m_Script: {fileID: 11500000, guid: 2353d0f9395367242a91c029c28d976e, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   rightIndicators:

BIN
Assets/Scenes/MainScene.unity


+ 8 - 1
Assets/Scripts/TrafficSimulation/CarPool.cs

@@ -18,6 +18,7 @@ namespace TrafficSimulation{
         public bool randomizeRayLength = false;
         public float rayRandomizeRange = 4;
         public Camera bikeCam;
+        public float spawnPositionCorrectionY;
 
         private void Awake() {
             SharedInstance = this;    
@@ -52,7 +53,13 @@ namespace TrafficSimulation{
             return null;
         }
         public GameObject SpawnCar(Transform spawnTranform){
-            return SpawnCar(spawnTranform.position, spawnTranform.rotation, null);
+            Vector3 carPosition = spawnTranform.position;
+            if (spawnPositionCorrectionY != 0f)
+            {
+
+                carPosition = new Vector3(carPosition.x, carPosition.y + spawnPositionCorrectionY, carPosition.z);
+            }
+            return SpawnCar(carPosition, spawnTranform.rotation, null);
         }
         public GameObject SpawnCar(Vector3 spawnPos, Quaternion spawnRot, Transform lookAt)
         {

+ 2 - 2
Assets/Scripts/TrafficSimulation/IndicatorHandler.cs

@@ -30,7 +30,7 @@ namespace TrafficSimulation
         {
             if (leftIndicatorsRunning)
             {
-                Debug.Log("Left indicator already running. Abort!");
+                //Debug.Log("Left indicator already running. Abort!");
                 return;
             }
 
@@ -41,7 +41,7 @@ namespace TrafficSimulation
         {
             if (rightIndicatorsRunning)
             {
-                Debug.Log("Right indicator already running. Abort!");
+                //Debug.Log("Right indicator already running. Abort!");
                 return;
             }
 

+ 11 - 0
Assets/Scripts/TrafficSimulation/IndicatorHandler.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 2353d0f9395367242a91c029c28d976e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 2
Assets/Scripts/TrafficSimulation/IntersectionSituation/IntersectionPreset.cs

@@ -48,7 +48,7 @@ namespace TrafficSimulation
         /// </summary>
         private void HandleInTrigger()
         {
-            Debug.Log("In Trigger");
+            Debug.Log("In Trigger - " + this.gameObject.name);
 
             if (this.presetRunning)
             {
@@ -63,7 +63,7 @@ namespace TrafficSimulation
         /// </summary>
         private void HandleOutTrigger()
         {
-            Debug.Log("Out Trigger");
+            Debug.Log("Out Trigger - " + this.gameObject.name);
             if (!this.presetRunning)
             {
                 Debug.Log("Preset wasn´t running, so couldn´t be ended.");

+ 4 - 4
Assets/Scripts/TrafficSimulation/WheelDrive.cs

@@ -74,13 +74,13 @@ namespace TrafficSimulation{
                 {
                     var ws = Instantiate(leftWheelShape);
                     ws.transform.parent = wheel.transform;
-                    ws.transform.localPosition = Vector3.zero;
+                    //ws.transform.localPosition = Vector3.zero;
                 }
                 else if (rightWheelShape != null && wheel.transform.localPosition.x > 0)
                 {
                     var ws = Instantiate(rightWheelShape);
                     ws.transform.parent = wheel.transform;
-                    ws.transform.localPosition = Vector3.zero;
+                    //ws.transform.localPosition = Vector3.zero;
                 }
 
                 wheel.ConfigureVehicleSubsteps(10, 1, 1);
@@ -92,7 +92,7 @@ namespace TrafficSimulation{
         }
         private void ResetWheels()
         {
-            Debug.Log("Reset Steering!");
+            //Debug.Log("Reset Steering!");
             this.currentSteering = 0f;
         }
 
@@ -127,7 +127,7 @@ namespace TrafficSimulation{
                     wheel.GetWorldPose(out p, out q);
 
                     Transform shapeTransform = wheel.transform.GetChild (0);
-                    //shapeTransform.position = p;
+                    shapeTransform.position = p;
                     shapeTransform.rotation = q;
                 }
             }