Переглянути джерело

Working Break Sensor, performance testing

Marcel Zickler 3 роки тому
батько
коміт
ee41f4da42

+ 7 - 0
Assets/MeshCombiner/HDRP/Mesh Combiner_2019.3.2_HDRP.unitypackage.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 5147c378a83cc5247ba7d765c8e6b7ac
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 7 - 0
Assets/MeshCombiner/Standard/Mesh Combiner_2018.4.15_Standard.unitypackage.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: c14e2c1b3f66c914eadda6e37fd68cea
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 7 - 0
Assets/MeshCombiner/URP/Mesh Combiner_2019.3.2_URP.unitypackage.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: fd04eeb770a55ad479ca27b18678b930
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/PolygonCity/Materials/PolygonCity_Mat_Bike_Road.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5ef4bf80a393edb4aade7b34e29bd181
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 37 - 82
Assets/PolygonCity/Prefabs/Environments/SM_Env_WaterEdge_Rock_01.prefab

@@ -3,17 +3,15 @@
 --- !u!1 &189994
 GameObject:
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
   m_Component:
   - component: {fileID: 424094}
   - component: {fileID: 3333414}
   - component: {fileID: 2355912}
-  - component: {fileID: 64981815381328800}
-  - component: {fileID: 64474712490020048}
-  - component: {fileID: 64221812245575668}
-  - component: {fileID: 64425191101232302}
+  - component: {fileID: 4275631046669186075}
   m_Layer: 0
   m_Name: SM_Env_WaterEdge_Rock_01
   m_TagString: Untagged
@@ -23,9 +21,10 @@ GameObject:
   m_IsActive: 1
 --- !u!4 &424094
 Transform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 189994}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
@@ -34,18 +33,32 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &3333414
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 189994}
+  m_Mesh: {fileID: 4300000, guid: 27bf65190db556643904ee371814b40c, type: 3}
 --- !u!23 &2355912
 MeshRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 189994}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
   m_Materials:
   - {fileID: 2100000, guid: 62e25ef75a2216f418d06453c9ad15cb, type: 2}
   m_StaticBatchInfo:
@@ -55,9 +68,11 @@ MeshRenderer:
   m_ProbeAnchor: {fileID: 0}
   m_LightProbeVolumeOverride: {fileID: 0}
   m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
   m_PreserveUVs: 0
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
   m_SelectedEditorRenderState: 3
   m_MinimumChartSize: 4
   m_AutoUVMaxDistance: 0.5
@@ -66,77 +81,17 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!33 &3333414
-MeshFilter:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 189994}
-  m_Mesh: {fileID: 4300000, guid: 27bf65190db556643904ee371814b40c, type: 3}
---- !u!1001 &100100000
-Prefab:
-  m_ObjectHideFlags: 1
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications: []
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 0}
-  m_RootGameObject: {fileID: 189994}
-  m_IsPrefabParent: 1
---- !u!64 &64221812245575668
-MeshCollider:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 189994}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Convex: 1
-  m_InflateMesh: 0
-  m_SkinWidth: 0.01
-  m_Mesh: {fileID: 43682171214045796, guid: d1584963dfdd0de42802e9768e1d8bc3, type: 2}
---- !u!64 &64425191101232302
-MeshCollider:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 189994}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Convex: 1
-  m_InflateMesh: 0
-  m_SkinWidth: 0.01
-  m_Mesh: {fileID: 43745175693449050, guid: d1584963dfdd0de42802e9768e1d8bc3, type: 2}
---- !u!64 &64474712490020048
-MeshCollider:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 189994}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Convex: 1
-  m_InflateMesh: 0
-  m_SkinWidth: 0.01
-  m_Mesh: {fileID: 43072241649083074, guid: d1584963dfdd0de42802e9768e1d8bc3, type: 2}
---- !u!64 &64981815381328800
-MeshCollider:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!65 &4275631046669186075
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 189994}
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Convex: 1
-  m_InflateMesh: 0
-  m_SkinWidth: 0.01
-  m_Mesh: {fileID: 43572271772285082, guid: d1584963dfdd0de42802e9768e1d8bc3, type: 2}
+  m_Size: {x: 3.9905415, y: 0.9083607, z: 4.8152456}
+  m_Center: {x: -0.26611263, y: 0.45418036, z: 0.0955889}

+ 39 - 53
Assets/PolygonCity/Prefabs/Props/SM_Prop_LightPole_Base_02.prefab

@@ -3,15 +3,15 @@
 --- !u!1 &128712
 GameObject:
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  serializedVersion: 5
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
   m_Component:
   - component: {fileID: 441074}
   - component: {fileID: 3397512}
   - component: {fileID: 2374856}
-  - component: {fileID: 64816266506434986}
-  - component: {fileID: 64779195209775840}
+  - component: {fileID: 4049838200665426416}
   m_Layer: 0
   m_Name: SM_Prop_LightPole_Base_02
   m_TagString: Untagged
@@ -21,9 +21,10 @@ GameObject:
   m_IsActive: 1
 --- !u!4 &441074
 Transform:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 128712}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
@@ -32,18 +33,32 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &3397512
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 128712}
+  m_Mesh: {fileID: 4300000, guid: 11a53405bf8df1743b8f665e72258cb7, type: 3}
 --- !u!23 &2374856
 MeshRenderer:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 128712}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
   m_Materials:
   - {fileID: 2100000, guid: 62e25ef75a2216f418d06453c9ad15cb, type: 2}
   m_StaticBatchInfo:
@@ -53,9 +68,11 @@ MeshRenderer:
   m_ProbeAnchor: {fileID: 0}
   m_LightProbeVolumeOverride: {fileID: 0}
   m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
   m_PreserveUVs: 0
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
   m_SelectedEditorRenderState: 3
   m_MinimumChartSize: 4
   m_AutoUVMaxDistance: 0.5
@@ -64,49 +81,18 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
---- !u!33 &3397512
-MeshFilter:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 128712}
-  m_Mesh: {fileID: 4300000, guid: 11a53405bf8df1743b8f665e72258cb7, type: 3}
---- !u!1001 &100100000
-Prefab:
-  m_ObjectHideFlags: 1
-  serializedVersion: 2
-  m_Modification:
-    m_TransformParent: {fileID: 0}
-    m_Modifications: []
-    m_RemovedComponents: []
-  m_ParentPrefab: {fileID: 0}
-  m_RootGameObject: {fileID: 128712}
-  m_IsPrefabParent: 1
---- !u!64 &64779195209775840
-MeshCollider:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
-  m_GameObject: {fileID: 128712}
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_Enabled: 1
-  serializedVersion: 2
-  m_Convex: 1
-  m_InflateMesh: 0
-  m_SkinWidth: 0.01
-  m_Mesh: {fileID: 43747470520237788, guid: fe8350762c8608d42ba2bdd5fbb28d68, type: 2}
---- !u!64 &64816266506434986
-MeshCollider:
-  m_ObjectHideFlags: 1
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 100100000}
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!136 &4049838200665426416
+CapsuleCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 128712}
   m_Material: {fileID: 0}
   m_IsTrigger: 0
   m_Enabled: 1
-  serializedVersion: 2
-  m_Convex: 1
-  m_InflateMesh: 0
-  m_SkinWidth: 0.01
-  m_Mesh: {fileID: 43735133230528260, guid: fe8350762c8608d42ba2bdd5fbb28d68, type: 2}
+  m_Radius: 0.18524162
+  m_Height: 4.9472804
+  m_Direction: 1
+  m_Center: {x: -0.008027417, y: 2.4736402, z: 0.000015257348}

+ 3 - 1
Assets/Scenes/BikeBreakSensorScene.unity

@@ -2991,13 +2991,15 @@ MonoBehaviour:
     deviceId: 0
     wheelCircumference: 0
   usbSensorConfig:
-    serialPort: /dev/tty.usbserial-01ABC030
+    serialPort: COM5
     baudRate: 115200
     parity: 0
     stopBits: 1
     dataBits: 8
     handshake: 0
     rtsEnable: 1
+    debug: 0
+    debugSignaler: {fileID: 0}
   bleSensorConfig:
     port: 0
     ipAddress: 127.0.0.1

BIN
Assets/Scenes/MainScene.unity


+ 7 - 0
Assets/Scenes/TrafficScenes/TrafficLightsTestScene 2.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a9e21c21225466d4fa552b4ff3b53a6c
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 0
Assets/Scripts/Controller/SensorBikeController.cs

@@ -46,6 +46,7 @@ namespace Controller
             var speedData = sensorData.SpeedData;
 
             if (speedData != null && accelerate) SetSpeed(speedData.Value);
+            //SetSpeed(new SpeedSensorData());
 
             var breakData = sensorData.UsbData;
             if(breakData != null && breaking){
@@ -71,6 +72,7 @@ namespace Controller
         private void SetSpeed(SpeedSensorData speedData)
         {
             bicycleController.CurrentSpeed = speedData.Speed;
+            //bicycleController.CurrentSpeed = 16 / 3.6f;
         }
         private void SetBreaking(USBSensorData breakData)
         {

+ 1 - 20
Assets/Scripts/Sensors/USB/BreakReceiver.cs

@@ -16,7 +16,6 @@ namespace Sensors.USB
         public Handshake handshake;
         public Boolean rtsEnable;
         public Boolean debug;
-        public GameObject debugSignaler;
 
         public USBSensorConfig(
             String port = "COM1", 
@@ -26,8 +25,7 @@ namespace Sensors.USB
             Int32 dataBits = 8, 
             Handshake handshake = Handshake.None, 
             Boolean rtsEnable = true,
-            Boolean debug = false,
-            GameObject debugSignaler = null
+            Boolean debug = false
         ){
             this.serialPort = port;
             this.baudRate = baudRate;
@@ -37,7 +35,6 @@ namespace Sensors.USB
             this.handshake  = handshake;
             this.rtsEnable = rtsEnable;
             this.debug = debug;
-            this.debugSignaler = debugSignaler;
         }
     }
     public struct USBSensorData
@@ -53,7 +50,6 @@ namespace Sensors.USB
         private USBSensorData sensorData;
         private Thread serialThread;
         private Boolean looping;
-        private Renderer debugRenderer;
 
         public USBSensorData SensorData => sensorData;
 
@@ -77,12 +73,6 @@ namespace Sensors.USB
 
             /*this.sp.Handshake = this.config.handshake;
             this.sp.RtsEnable = this.config.rtsEnable;*/
-
-            //this.sp.DataReceived += new SerialDataReceivedEventHandler(OnDataRecveived); # Does not work in unity projects..
-            
-            if(this.config.debug){
-                this.debugRenderer = this.config.debugSignaler.GetComponent<Renderer>();
-            }
             this.sp.Open();
             this.looping = true;
             this.serialThread = new Thread(CheckSerialPort);
@@ -105,15 +95,6 @@ namespace Sensors.USB
             Debug.Log("Dispose Serial Port Listening");
             StopListening();
         }
-        public void OnDataRecveived(object Sender, SerialDataReceivedEventArgs e){
-            Debug.Log("Received Port Data");
-            Debug.Log(e.ToString());
-        }
-        private void setDebugColor(Color col){
-            if(this.debugRenderer != null){
-                this.debugRenderer.material.color = col;
-            }
-        }
         private void CheckSerialPort(){
             while(this.looping){
                 if(this.sp != null){