Bladeren bron

Little fixes heatmap; Improved script

Furkan Karakocaoglu 2 jaren geleden
bovenliggende
commit
2132ee45a0
55 gewijzigde bestanden met toevoegingen van 1545 en 117 verwijderingen
  1. 85 0
      testumgebung/CrowdModelling/Assets/Data_image/Heatmap1.mat
  2. 8 0
      testumgebung/CrowdModelling/Assets/Data_image/Heatmap1.mat.meta
  3. BIN
      testumgebung/CrowdModelling/Assets/Data_image/Heatmap1.png
  4. BIN
      testumgebung/CrowdModelling/Assets/Data_image/Heatmap2.png
  5. BIN
      testumgebung/CrowdModelling/Assets/Data_image/obstacle.pkl
  6. 1 1
      testumgebung/CrowdModelling/Assets/Depictions_Years/Prefabs/Characters/Character_Prefab.prefab
  7. 337 4
      testumgebung/CrowdModelling/Assets/Depictions_Years/Prefabs/GameObjects/## Obstacles ##.prefab
  8. 141 61
      testumgebung/CrowdModelling/Assets/Depictions_Years/Prefabs/GameObjects/## Visual Obstacles ##.prefab
  9. 1 0
      testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/ChangeMaterial/SetDiamondMaterialTime.cs
  10. 1 1
      testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/ChangeMaterial/SetDiamondMaterialTime.cs.meta
  11. 1 0
      testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/ChangeMaterial/SetModelMaterialTime.cs
  12. 1 1
      testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/ChangeMaterial/SetModelMaterialTime.cs.meta
  13. 1 0
      testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/ChangeMaterial/SetProjectorMaterialTime.cs
  14. 1 1
      testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/ChangeMaterial/SetProjectorMaterialTime.cs.meta
  15. 1 0
      testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/General/InstantiatePrefab.cs
  16. 1 1
      testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/General/InstantiatePrefab.cs.meta
  17. 1 0
      testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/General/PlaybackController.cs
  18. 1 1
      testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/General/PlaybackController.cs.meta
  19. 1 0
      testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/Heatmap/GridArray.cs
  20. 3 1
      testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/Heatmap/Heatmap.cs
  21. 1 1
      testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/Heatmap/Heatmap.cs.meta
  22. 0 0
      testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/Info.cs
  23. 0 0
      testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/Info.cs.meta
  24. 4 5
      testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/Python/Heatmap.py
  25. 3 1
      testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/ReadWrite/ReadFromCSV.cs
  26. 1 1
      testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/ReadWrite/ReadFromCSV.cs.meta
  27. 3 1
      testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/ReadWrite/WriteInCSV.cs
  28. 0 0
      testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/ReadWrite/WriteInCSV.cs.meta
  29. 4 2
      testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/WanderingAI/WalkLerpPlayback.cs
  30. 1 1
      testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/WanderingAI/WalkLerpPlayback.cs.meta
  31. 3 1
      testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/WanderingAI/WanderingAI.cs
  32. 1 1
      testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/WanderingAI/WanderingAI.cs.meta
  33. 1 1
      testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/_Discard/SetDiamondMaterialTimeOld.cs.meta
  34. 2 2
      testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/_Discard/WalkPos_LerpNew.cs
  35. 1 1
      testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/_Discard/WalkPos_LerpNew.cs.meta
  36. 923 16
      testumgebung/CrowdModelling/Assets/Scenes/Origin_OnlyYears.unity
  37. BIN
      testumgebung/CrowdModelling/Assets/Scenes/Origin_OnlyYears/NavMesh-## Surface Obstacles ##.asset
  38. 1 1
      testumgebung/CrowdModelling/Assets/Scripts/ReadWrite/ReadFromCSVOld.cs
  39. 0 0
      testumgebung/CrowdModelling/Assets/Scripts/ReadWrite/ReadFromCSVOld.cs.meta
  40. 1 1
      testumgebung/CrowdModelling/Assets/Scripts/ReadWrite/ReadFromFileOld.cs
  41. 0 0
      testumgebung/CrowdModelling/Assets/Scripts/ReadWrite/ReadFromFileOld.cs.meta
  42. 1 1
      testumgebung/CrowdModelling/Assets/Scripts/ReadWrite/WriteInCSVOld.cs
  43. 0 0
      testumgebung/CrowdModelling/Assets/Scripts/ReadWrite/WriteInCSVOld.cs.meta
  44. 1 1
      testumgebung/CrowdModelling/Assets/Scripts/ReadWrite/WriteInFileOld.cs
  45. 0 0
      testumgebung/CrowdModelling/Assets/Scripts/ReadWrite/WriteInFileOld.cs.meta
  46. 1 1
      testumgebung/CrowdModelling/Assets/Scripts/Walking/FollowLeaderOld.cs
  47. 0 0
      testumgebung/CrowdModelling/Assets/Scripts/Walking/FollowLeaderOld.cs.meta
  48. 1 1
      testumgebung/CrowdModelling/Assets/Scripts/Walking/LerpOld.cs
  49. 0 0
      testumgebung/CrowdModelling/Assets/Scripts/Walking/LerpOld.cs.meta
  50. 3 3
      testumgebung/CrowdModelling/Assets/Scripts/Walking/WalkPos_LerpOld.cs
  51. 0 0
      testumgebung/CrowdModelling/Assets/Scripts/Walking/WalkPos_LerpOld.cs.meta
  52. 1 1
      testumgebung/CrowdModelling/Assets/Scripts/Walking/WanderingAIOld.cs
  53. 0 0
      testumgebung/CrowdModelling/Assets/Scripts/Walking/WanderingAIOld.cs.meta
  54. 1 1
      testumgebung/CrowdModelling/Assets/Scripts/Walking/WanderingAIWaypointsOld.cs
  55. 0 0
      testumgebung/CrowdModelling/Assets/Scripts/Walking/WanderingAIWaypointsOld.cs.meta

+ 85 - 0
testumgebung/CrowdModelling/Assets/Data_image/Heatmap1.mat

@@ -0,0 +1,85 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Heatmap1
+  m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: _ALPHATEST_ON
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _AlphaTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: b4f8e0fce70c321429f980bb8f7a166e, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - PixelSnap: 0
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _EnableExternalAlpha: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 1
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _Flip: {r: 1, g: 1, b: 1, a: 1}
+    - _RendererColor: {r: 1, g: 1, b: 1, a: 1}

+ 8 - 0
testumgebung/CrowdModelling/Assets/Data_image/Heatmap1.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 540f5f9c17cfc08438f8485bec7cdcf2
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
testumgebung/CrowdModelling/Assets/Data_image/Heatmap1.png


BIN
testumgebung/CrowdModelling/Assets/Data_image/Heatmap2.png


BIN
testumgebung/CrowdModelling/Assets/Data_image/obstacle.pkl


+ 1 - 1
testumgebung/CrowdModelling/Assets/Depictions_Years/Prefabs/Characters/Character_Prefab.prefab

@@ -203,4 +203,4 @@ Projector:
   m_Material: {fileID: 2100000, guid: ed25753679523484690acb14f554677c, type: 2}
   m_IgnoreLayers:
     serializedVersion: 2
-    m_Bits: 12289
+    m_Bits: 45057

+ 337 - 4
testumgebung/CrowdModelling/Assets/Depictions_Years/Prefabs/GameObjects/## Obstacles ##.prefab

@@ -1,5 +1,335 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &267559728
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 267559729}
+  - component: {fileID: 267559733}
+  - component: {fileID: 267559732}
+  - component: {fileID: 267559731}
+  - component: {fileID: 267559730}
+  m_Layer: 12
+  m_Name: Cube (8)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 1
+  m_StaticEditorFlags: 4294967263
+  m_IsActive: 0
+--- !u!4 &267559729
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 267559728}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -22.5, y: 6, z: -2.5}
+  m_LocalScale: {x: 15, y: 1, z: 10}
+  m_Children: []
+  m_Father: {fileID: 5722838056590811863}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &267559733
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 267559728}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &267559732
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 267559728}
+  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_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 795740e7287456740adf1fe506708fd3, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  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
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!65 &267559731
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 267559728}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &267559730
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 267559728}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6d07ce676d7afda4dabb3b0f7dd5e654, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_OverrideArea: 1
+  m_Area: 1
+  m_IgnoreFromBuild: 0
+  m_AffectedAgents: ffffffff
+--- !u!1 &635959907
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 635959908}
+  - component: {fileID: 635959912}
+  - component: {fileID: 635959911}
+  - component: {fileID: 635959910}
+  - component: {fileID: 635959909}
+  m_Layer: 12
+  m_Name: Cube (7)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 1
+  m_StaticEditorFlags: 4294967263
+  m_IsActive: 1
+--- !u!4 &635959908
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 635959907}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -22.5, y: 3.5, z: -12.5}
+  m_LocalScale: {x: 15, y: 6, z: 10}
+  m_Children: []
+  m_Father: {fileID: 5722838056590811863}
+  m_RootOrder: 7
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &635959912
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 635959907}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &635959911
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 635959907}
+  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_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 795740e7287456740adf1fe506708fd3, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  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
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!65 &635959910
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 635959907}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &635959909
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 635959907}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6d07ce676d7afda4dabb3b0f7dd5e654, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_OverrideArea: 1
+  m_Area: 1
+  m_IgnoreFromBuild: 0
+  m_AffectedAgents: ffffffff
+--- !u!1 &1630429661
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1630429662}
+  - component: {fileID: 1630429666}
+  - component: {fileID: 1630429665}
+  - component: {fileID: 1630429664}
+  - component: {fileID: 1630429663}
+  m_Layer: 12
+  m_Name: Cube (6)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 1
+  m_StaticEditorFlags: 4294967263
+  m_IsActive: 1
+--- !u!4 &1630429662
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1630429661}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -22.5, y: 3.5, z: 7.5}
+  m_LocalScale: {x: 15, y: 6, z: 10}
+  m_Children: []
+  m_Father: {fileID: 5722838056590811863}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &1630429666
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1630429661}
+  m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &1630429665
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1630429661}
+  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_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 795740e7287456740adf1fe506708fd3, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  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
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+--- !u!65 &1630429664
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1630429661}
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_Enabled: 1
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1, z: 1}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &1630429663
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1630429661}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6d07ce676d7afda4dabb3b0f7dd5e654, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_OverrideArea: 1
+  m_Area: 1
+  m_IgnoreFromBuild: 0
+  m_AffectedAgents: ffffffff
 --- !u!1 &5722838055709917572
 GameObject:
   m_ObjectHideFlags: 0
@@ -138,8 +468,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5722838055796001581}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -10.5, y: 3.5, z: -11.5}
-  m_LocalScale: {x: 4.99, y: 6, z: 12}
+  m_LocalPosition: {x: -11.5, y: 3.5, z: -11.5}
+  m_LocalScale: {x: 6.99, y: 6, z: 12}
   m_Children: []
   m_Father: {fileID: 5722838056590811863}
   m_RootOrder: 4
@@ -253,6 +583,9 @@ Transform:
   - {fileID: 5722838055709917573}
   - {fileID: 5722838055796001582}
   - {fileID: 5722838056933929291}
+  - {fileID: 1630429662}
+  - {fileID: 635959908}
+  - {fileID: 267559729}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -394,8 +727,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5722838056933929290}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -10.5, y: 3.5, z: 6.5}
-  m_LocalScale: {x: 4.99, y: 6, z: 12}
+  m_LocalPosition: {x: -11.5, y: 3.5, z: 6.5}
+  m_LocalScale: {x: 6.99, y: 6, z: 12}
   m_Children: []
   m_Father: {fileID: 5722838056590811863}
   m_RootOrder: 5

+ 141 - 61
testumgebung/CrowdModelling/Assets/Depictions_Years/Prefabs/GameObjects/## Visual Obstacles ##.prefab

@@ -256,6 +256,85 @@ MonoBehaviour:
   m_Area: 1
   m_IgnoreFromBuild: 0
   m_AffectedAgents: ffffffff
+--- !u!1 &6692015860023350374
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1767825864937186401}
+  - component: {fileID: 3073545681911007061}
+  - component: {fileID: 3984389297001019728}
+  m_Layer: 0
+  m_Name: Plane
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1767825864937186401
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6692015860023350374}
+  m_LocalRotation: {x: 0, y: 0, z: -0.7071068, w: 0.7071068}
+  m_LocalPosition: {x: 20, y: 3.5, z: 15}
+  m_LocalScale: {x: 0.6, y: 1, z: 0.6}
+  m_Children: []
+  m_Father: {fileID: 8219362847804128349}
+  m_RootOrder: 19
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90}
+--- !u!33 &3073545681911007061
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6692015860023350374}
+  m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &3984389297001019728
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6692015860023350374}
+  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_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 795740e7287456740adf1fe506708fd3, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  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
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
 --- !u!114 &629312419744296296
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -318,6 +397,7 @@ Transform:
   - {fileID: 7061422419744143225}
   - {fileID: 8467437420651242550}
   - {fileID: 6539257868115575157}
+  - {fileID: 1767825864937186401}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -372,7 +452,7 @@ PrefabInstance:
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 54.7
+      value: 44.7
       objectReference: {fileID: 0}
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
@@ -468,7 +548,7 @@ PrefabInstance:
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 57.3
+      value: 47.3
       objectReference: {fileID: 0}
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
@@ -564,7 +644,7 @@ PrefabInstance:
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 57.3
+      value: 47.3
       objectReference: {fileID: 0}
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
@@ -613,18 +693,18 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 30d324db88b2bbd46a3d177dbd23569b, type: 3}
---- !u!1 &2148454209898064745 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 2751288608230703314, guid: 30d324db88b2bbd46a3d177dbd23569b,
-    type: 3}
-  m_PrefabInstance: {fileID: 4322995844635765691}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &2148454209898231625 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
     type: 3}
   m_PrefabInstance: {fileID: 4322995844635765691}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &2148454209898064745 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2751288608230703314, guid: 30d324db88b2bbd46a3d177dbd23569b,
+    type: 3}
+  m_PrefabInstance: {fileID: 4322995844635765691}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5175124355028888459
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -660,7 +740,7 @@ PrefabInstance:
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 54.7
+      value: 44.7
       objectReference: {fileID: 0}
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
@@ -756,7 +836,7 @@ PrefabInstance:
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 54.7
+      value: 44.7
       objectReference: {fileID: 0}
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
@@ -852,7 +932,7 @@ PrefabInstance:
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 54.7
+      value: 44.7
       objectReference: {fileID: 0}
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
@@ -901,18 +981,18 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 30d324db88b2bbd46a3d177dbd23569b, type: 3}
---- !u!4 &6070712245664172926 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
-    type: 3}
-  m_PrefabInstance: {fileID: 8219362846878816140}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &6070712245664012126 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 2751288608230703314, guid: 30d324db88b2bbd46a3d177dbd23569b,
     type: 3}
   m_PrefabInstance: {fileID: 8219362846878816140}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &6070712245664172926 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
+    type: 3}
+  m_PrefabInstance: {fileID: 8219362846878816140}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8219362847059632623
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -948,7 +1028,7 @@ PrefabInstance:
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 57.3
+      value: 47.3
       objectReference: {fileID: 0}
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
@@ -997,18 +1077,18 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 30d324db88b2bbd46a3d177dbd23569b, type: 3}
---- !u!4 &6070712245575515421 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
-    type: 3}
-  m_PrefabInstance: {fileID: 8219362847059632623}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &6070712245575475517 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 2751288608230703314, guid: 30d324db88b2bbd46a3d177dbd23569b,
     type: 3}
   m_PrefabInstance: {fileID: 8219362847059632623}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &6070712245575515421 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
+    type: 3}
+  m_PrefabInstance: {fileID: 8219362847059632623}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8219362847189268171
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1044,7 +1124,7 @@ PrefabInstance:
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 57.3
+      value: 47.3
       objectReference: {fileID: 0}
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
@@ -1140,7 +1220,7 @@ PrefabInstance:
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 38.8
+      value: 28.8
       objectReference: {fileID: 0}
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
@@ -1189,18 +1269,18 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 30d324db88b2bbd46a3d177dbd23569b, type: 3}
---- !u!1 &6070712246230365675 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 2751288608230703314, guid: 30d324db88b2bbd46a3d177dbd23569b,
-    type: 3}
-  m_PrefabInstance: {fileID: 8219362847445431609}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &6070712246230264267 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
     type: 3}
   m_PrefabInstance: {fileID: 8219362847445431609}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &6070712246230365675 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2751288608230703314, guid: 30d324db88b2bbd46a3d177dbd23569b,
+    type: 3}
+  m_PrefabInstance: {fileID: 8219362847445431609}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8219362847457460114
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1236,7 +1316,7 @@ PrefabInstance:
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 73.2
+      value: 63.199997
       objectReference: {fileID: 0}
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
@@ -1332,7 +1412,7 @@ PrefabInstance:
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 54.7
+      value: 44.7
       objectReference: {fileID: 0}
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
@@ -1381,18 +1461,18 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 30d324db88b2bbd46a3d177dbd23569b, type: 3}
---- !u!4 &6070712246753243617 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
-    type: 3}
-  m_PrefabInstance: {fileID: 8219362847973125395}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &6070712246752816577 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 2751288608230703314, guid: 30d324db88b2bbd46a3d177dbd23569b,
     type: 3}
   m_PrefabInstance: {fileID: 8219362847973125395}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &6070712246753243617 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
+    type: 3}
+  m_PrefabInstance: {fileID: 8219362847973125395}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8219362847991128298
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1428,7 +1508,7 @@ PrefabInstance:
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 38.8
+      value: 28.8
       objectReference: {fileID: 0}
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
@@ -1524,7 +1604,7 @@ PrefabInstance:
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 38.8
+      value: 28.8
       objectReference: {fileID: 0}
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
@@ -1620,7 +1700,7 @@ PrefabInstance:
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 54.7
+      value: 44.7
       objectReference: {fileID: 0}
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
@@ -1669,18 +1749,18 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 30d324db88b2bbd46a3d177dbd23569b, type: 3}
---- !u!4 &6070712246833733278 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
-    type: 3}
-  m_PrefabInstance: {fileID: 8219362848049939052}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &6070712246833824446 stripped
 GameObject:
   m_CorrespondingSourceObject: {fileID: 2751288608230703314, guid: 30d324db88b2bbd46a3d177dbd23569b,
     type: 3}
   m_PrefabInstance: {fileID: 8219362848049939052}
   m_PrefabAsset: {fileID: 0}
+--- !u!4 &6070712246833733278 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
+    type: 3}
+  m_PrefabInstance: {fileID: 8219362848049939052}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &8219362848062694033
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1716,7 +1796,7 @@ PrefabInstance:
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 57.3
+      value: 47.3
       objectReference: {fileID: 0}
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
@@ -1792,7 +1872,7 @@ PrefabInstance:
     - target: {fileID: 2362278803267104790, guid: e53b84e8ccd068249a0ceb963572d69d,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 65.5
+      value: 55.5
       objectReference: {fileID: 0}
     - target: {fileID: 2362278803267104790, guid: e53b84e8ccd068249a0ceb963572d69d,
         type: 3}
@@ -1897,7 +1977,7 @@ PrefabInstance:
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 57.3
+      value: 47.3
       objectReference: {fileID: 0}
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
@@ -1946,18 +2026,18 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 30d324db88b2bbd46a3d177dbd23569b, type: 3}
---- !u!1 &6539257868115418453 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 2751288608230703314, guid: 30d324db88b2bbd46a3d177dbd23569b,
-    type: 3}
-  m_PrefabInstance: {fileID: 9002297683370122631}
-  m_PrefabAsset: {fileID: 0}
 --- !u!4 &6539257868115575157 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
     type: 3}
   m_PrefabInstance: {fileID: 9002297683370122631}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &6539257868115418453 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 2751288608230703314, guid: 30d324db88b2bbd46a3d177dbd23569b,
+    type: 3}
+  m_PrefabInstance: {fileID: 9002297683370122631}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &9102577889850802032
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1993,7 +2073,7 @@ PrefabInstance:
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 54.7
+      value: 44.7
       objectReference: {fileID: 0}
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
@@ -2089,7 +2169,7 @@ PrefabInstance:
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}
       propertyPath: m_LocalPosition.x
-      value: 57.3
+      value: 47.3
       objectReference: {fileID: 0}
     - target: {fileID: 2751288608230743282, guid: 30d324db88b2bbd46a3d177dbd23569b,
         type: 3}

+ 1 - 0
testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/ChangeMaterial/SetDiamondMaterialTime.cs

@@ -1,6 +1,7 @@
 using UnityEngine;
 
 // Use this Script in parent folder of all Humans
+[DefaultExecutionOrder(80)]
 public class SetDiamondMaterialTime : MonoBehaviour
 {
     [Header("Different Characters:")]

+ 1 - 1
testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/ChangeMaterial/SetDiamondMaterialTime.cs.meta

@@ -10,7 +10,7 @@ MonoImporter:
   - year2020: {fileID: 2100000, guid: d80b1f1d4019c2546a100d041cf04850, type: 2}
   - year2021: {fileID: 2100000, guid: 055943b3f1c34b44f8891a1eb9a50fe6, type: 2}
   - default_mat: {fileID: 2100000, guid: 82d6b8197aa06ec42af3757695a54a8c, type: 2}
-  executionOrder: 400
+  executionOrder: 0
   icon: {instanceID: 0}
   userData: 
   assetBundleName: 

+ 1 - 0
testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/ChangeMaterial/SetModelMaterialTime.cs

@@ -1,6 +1,7 @@
 using UnityEngine;
 
 // Use this Script in parent folder of all Humans
+[DefaultExecutionOrder(60)]
 public class SetModelMaterialTime : MonoBehaviour
 {
     [Header("Select Model:")]

+ 1 - 1
testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/ChangeMaterial/SetModelMaterialTime.cs.meta

@@ -10,7 +10,7 @@ MonoImporter:
   - year2020: {fileID: 2100000, guid: d80b1f1d4019c2546a100d041cf04850, type: 2}
   - year2021: {fileID: 2100000, guid: 055943b3f1c34b44f8891a1eb9a50fe6, type: 2}
   - default_mat: {fileID: 2100000, guid: 82d6b8197aa06ec42af3757695a54a8c, type: 2}
-  executionOrder: 500
+  executionOrder: 0
   icon: {instanceID: 0}
   userData: 
   assetBundleName: 

+ 1 - 0
testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/ChangeMaterial/SetProjectorMaterialTime.cs

@@ -1,6 +1,7 @@
  using UnityEngine;
 
 // Use this Script in parent folder of all Humans
+[DefaultExecutionOrder(70)]
 public class SetProjectorMaterialTime : MonoBehaviour
 {
     [Header("Projector Materials:")]

+ 1 - 1
testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/ChangeMaterial/SetProjectorMaterialTime.cs.meta

@@ -8,7 +8,7 @@ MonoImporter:
   - year2020: {fileID: 2100000, guid: 6aa2d13e3ade7a54fbe2538a1fb5edaa, type: 2}
   - year2021: {fileID: 2100000, guid: e89eac9c50ef88e48a55ac1a107039a9, type: 2}
   - default_mat: {fileID: 2100000, guid: ed25753679523484690acb14f554677c, type: 2}
-  executionOrder: 600
+  executionOrder: 0
   icon: {instanceID: 0}
   userData: 
   assetBundleName: 

+ 1 - 0
testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/General/InstantiatePrefab.cs

@@ -8,6 +8,7 @@ using System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.AI;
 
+[DefaultExecutionOrder(0)]
 public class InstantiatePrefab : MonoBehaviour
 {
     [Header("Game Objects")]

+ 1 - 1
testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/General/InstantiatePrefab.cs.meta

@@ -8,7 +8,7 @@ MonoImporter:
       type: 3}
   - waypoints: {fileID: 271094133710174784, guid: 12d447b6707b0b842943f7c517e898ec,
       type: 3}
-  executionOrder: -50
+  executionOrder: 0
   icon: {instanceID: 0}
   userData: 
   assetBundleName: 

+ 1 - 0
testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/General/PlaybackController.cs

@@ -1,5 +1,6 @@
 using UnityEngine;
 
+[DefaultExecutionOrder(50)]
 public class PlaybackController : MonoBehaviour
 {
     private Component[] years;

+ 1 - 1
testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/General/PlaybackController.cs.meta

@@ -4,7 +4,7 @@ MonoImporter:
   externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
-  executionOrder: 380
+  executionOrder: 0
   icon: {instanceID: 0}
   userData: 
   assetBundleName: 

+ 1 - 0
testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/Heatmap/GridArray.cs

@@ -2,6 +2,7 @@
 using UnityEngine;
 using UnityEngine.AI;
 
+[DefaultExecutionOrder(100)]
 public class GridArray
 {
     private int width;

+ 3 - 1
testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/Heatmap/Heatmap.cs

@@ -1,6 +1,8 @@
 using System.IO;
 using UnityEngine;
 
+[DefaultExecutionOrder(90)]
+[RequireComponent(typeof(ReadFromCSV))]
 public class Heatmap : MonoBehaviour
 {
     [Header("Read and Save Settings:")]
@@ -19,7 +21,7 @@ public class Heatmap : MonoBehaviour
         // Read from CSV file and save time, position, rotation in matrix
         string dir = Directory.GetCurrentDirectory();
         string reference = @"\Assets\Data_position\Walk" + readIndex + ".csv";
-        var timePosRotList = gameObject.GetComponent<ReadFromCSVNew>().ReadFromCSVFile(dir + reference);
+        var timePosRotList = gameObject.GetComponent<ReadFromCSV>().ReadFromCSVFile(dir + reference);
 
         // increment grid at the positions where the people are located
         for(int i = 0; i < timePosRotList.Length; ++i) // groups

+ 1 - 1
testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/Heatmap/Heatmap.cs.meta

@@ -4,7 +4,7 @@ MonoImporter:
   externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
-  executionOrder: 700
+  executionOrder: 0
   icon: {instanceID: 0}
   userData: 
   assetBundleName: 

+ 0 - 0
testumgebung/CrowdModelling/Assets/Scripts/Info.cs → testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/Info.cs


+ 0 - 0
testumgebung/CrowdModelling/Assets/Scripts/Info.cs.meta → testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/Info.cs.meta


+ 4 - 5
testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/Python/Heatmap.py

@@ -1,4 +1,3 @@
-from matplotlib.pyplot import fill
 import UnityEngine as ue
 import numpy as np
 import seaborn as sns
@@ -10,8 +9,8 @@ import pandas as pd
 WIDTH = int(70)
 HEIGHT = int(35)
 OBSTACLE_PATH = "Assets/Data_image/obstacle.pkl"
-POSITION_PATH = ue.Application.dataPath + '/Data_position/Walk2.csv'
-HEATMAP_PATH = "Assets/Data_image/heatmap2.png"
+POSITION_PATH = ue.Application.dataPath + '/Data_position/Walk1.csv'
+HEATMAP_PATH = "Assets/Data_image/heatmap1.png"
 
 # Generate only if obstacles change
 def set_obstacles():
@@ -66,7 +65,7 @@ positions = positions.reindex_axis(range(0, WIDTH), axis=1, fill_value=0)
 
 # 6. Get obstacles (obstacles, market stalls) and paste specific value in positions
 # Therefore save pkl file in folder and read from it afterwards
-# set_obstacles()
+set_obstacles()
 positions_heatmap = pd.read_pickle(OBSTACLE_PATH)
 
 # 6.1 Merge positions data with obstacles data
@@ -90,4 +89,4 @@ set_patches(plt)
 plt.show()
 
 # 10. Save Heatmap
-heatmap.get_figure().savefig(HEATMAP_PATH)
+heatmap.get_figure().savefig(HEATMAP_PATH, transparent=True)

+ 3 - 1
testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/ReadWrite/ReadFromCSVNew.cs → testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/ReadWrite/ReadFromCSV.cs

@@ -3,7 +3,9 @@ using System.Collections.Generic;
 using System.IO;
 using System;
 
-public class ReadFromCSVNew : MonoBehaviour
+[DefaultExecutionOrder(20)]
+[RequireComponent(typeof(InstantiatePrefab))]
+public class ReadFromCSV : MonoBehaviour
 {
     private Tuple<List<float>, List<Vector3>, List<Quaternion>, List<float>>[][] humansData;
 

+ 1 - 1
testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/ReadWrite/ReadFromCSVNew.cs.meta → testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/ReadWrite/ReadFromCSV.cs.meta

@@ -4,7 +4,7 @@ MonoImporter:
   externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
-  executionOrder: 200
+  executionOrder: 0
   icon: {instanceID: 0}
   userData: 
   assetBundleName: 

+ 3 - 1
testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/ReadWrite/WriteInCSVNew.cs → testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/ReadWrite/WriteInCSV.cs

@@ -3,7 +3,9 @@ using UnityEngine.AI;
 using System;
 using System.IO;
 
-public class WriteInCSVNew : MonoBehaviour
+[DefaultExecutionOrder(30)]
+[RequireComponent(typeof(InstantiatePrefab))]
+public class WriteInCSV : MonoBehaviour
 {
     [Header("File Index:")]
     public int index = 0;

+ 0 - 0
testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/ReadWrite/WriteInCSVNew.cs.meta → testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/ReadWrite/WriteInCSV.cs.meta


+ 4 - 2
testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/WanderingAI/WalkLerpPlayback.cs

@@ -4,6 +4,8 @@ using System.Collections.Generic;
 using System.IO;
 using System;
 
+[DefaultExecutionOrder(40)]
+[RequireComponent(typeof(InstantiatePrefab), typeof(WriteInCSV), typeof(ReadFromCSV))]
 public class WalkLerpPlayback : MonoBehaviour
 {
     // Waypoints and Rotations
@@ -33,10 +35,10 @@ public class WalkLerpPlayback : MonoBehaviour
         NavMeshAgent[][] humansNMA = gameObject.GetComponent<InstantiatePrefab>().humanNavMeshAgent;
 
         // Read from CSV file and save time, position, rotation in matrix
-        int index = gameObject.GetComponent<WriteInCSVNew>().index;
+        int index = gameObject.GetComponent<WriteInCSV>().index;
         string dir = Directory.GetCurrentDirectory();
         string reference = @"\Assets\Data_position\Walk" + index + ".csv";
-        timePosRotList = gameObject.GetComponent<ReadFromCSVNew>().ReadFromCSVFile(dir + reference);
+        timePosRotList = gameObject.GetComponent<ReadFromCSV>().ReadFromCSVFile(dir + reference);
 
         // Set initial position and rotation
         currentStartPoint = 0;

+ 1 - 1
testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/WanderingAI/WalkLerpPlayback.cs.meta

@@ -6,7 +6,7 @@ MonoImporter:
   defaultReferences:
   - walkForward: {fileID: 9100000, guid: e4dc4a5693462ed49ab802e8ae7aa4e2, type: 2}
   - walkBackwards: {fileID: 9100000, guid: 918a798931293534ea1275448bd89d60, type: 2}
-  executionOrder: 300
+  executionOrder: 0
   icon: {instanceID: 0}
   userData: 
   assetBundleName: 

+ 3 - 1
testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/WanderingAI/WanderingAITest.cs → testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/WanderingAI/WanderingAI.cs

@@ -1,7 +1,9 @@
 using UnityEngine;
 using UnityEngine.AI;
 
-public class WanderingAITest : MonoBehaviour
+[DefaultExecutionOrder(10)]
+[RequireComponent(typeof(InstantiatePrefab))]
+public class WanderingAI : MonoBehaviour
 {
     [Header("Only for Debugging (do not set from here)")]
     public Transform[] waypoints;

+ 1 - 1
testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/WanderingAI/WanderingAITest.cs.meta → testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/WanderingAI/WanderingAI.cs.meta

@@ -4,7 +4,7 @@ MonoImporter:
   externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
-  executionOrder: 100
+  executionOrder: 0
   icon: {instanceID: 0}
   userData: 
   assetBundleName: 

+ 1 - 1
testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/_Discard/SetDiamondMaterialTimeOld.cs.meta

@@ -8,7 +8,7 @@ MonoImporter:
   - year2020: {fileID: 2100000, guid: d80b1f1d4019c2546a100d041cf04850, type: 2}
   - year2021: {fileID: 2100000, guid: 055943b3f1c34b44f8891a1eb9a50fe6, type: 2}
   - default_mat: {fileID: 2100000, guid: 82d6b8197aa06ec42af3757695a54a8c, type: 2}
-  executionOrder: 400
+  executionOrder: 0
   icon: {instanceID: 0}
   userData: 
   assetBundleName: 

+ 2 - 2
testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/_Discard/WalkPos_LerpNew.cs

@@ -29,10 +29,10 @@ public class WalkPos_LerpNew : MonoBehaviour
         humansNMA = gameObject.GetComponent<InstantiatePrefab>().humanNavMeshAgent;
 
         // Read from CSV file and save time, position, rotation in matrix
-        int index = gameObject.GetComponent<WriteInCSVNew>().index;
+        int index = gameObject.GetComponent<WriteInCSV>().index;
         string dir = Directory.GetCurrentDirectory();
         string reference = @"\Assets\Data_position\Walk" + index + ".csv";
-        timePosRotList = gameObject.GetComponent<ReadFromCSVNew>().ReadFromCSVFile(dir + reference);
+        timePosRotList = gameObject.GetComponent<ReadFromCSV>().ReadFromCSVFile(dir + reference);
 
         // Set initial position and rotation
         currentStartPoint = new int[humansGO.Length][];

+ 1 - 1
testumgebung/CrowdModelling/Assets/Depictions_Years/Scripts/_Discard/WalkPos_LerpNew.cs.meta

@@ -4,7 +4,7 @@ MonoImporter:
   externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
-  executionOrder: 350
+  executionOrder: 0
   icon: {instanceID: 0}
   userData: 
   assetBundleName: 

File diff suppressed because it is too large
+ 923 - 16
testumgebung/CrowdModelling/Assets/Scenes/Origin_OnlyYears.unity


BIN
testumgebung/CrowdModelling/Assets/Scenes/Origin_OnlyYears/NavMesh-## Surface Obstacles ##.asset


+ 1 - 1
testumgebung/CrowdModelling/Assets/Scripts/ReadWrite/ReadFromCSV.cs → testumgebung/CrowdModelling/Assets/Scripts/ReadWrite/ReadFromCSVOld.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.IO;
 using System;
 
-public class ReadFromCSV : MonoBehaviour
+public class ReadFromCSVOld : MonoBehaviour
 {
     //private void Start()
     //{

+ 0 - 0
testumgebung/CrowdModelling/Assets/Scripts/ReadWrite/ReadFromCSV.cs.meta → testumgebung/CrowdModelling/Assets/Scripts/ReadWrite/ReadFromCSVOld.cs.meta


+ 1 - 1
testumgebung/CrowdModelling/Assets/Scripts/ReadWrite/ReadFromFile.cs → testumgebung/CrowdModelling/Assets/Scripts/ReadWrite/ReadFromFileOld.cs

@@ -4,7 +4,7 @@ using System.Collections.Generic;
 using System.IO;
 using System;
 
-public class ReadFromFile : MonoBehaviour
+public class ReadFromFileOld : MonoBehaviour
 {
     //private void Start()
     //{

+ 0 - 0
testumgebung/CrowdModelling/Assets/Scripts/ReadWrite/ReadFromFile.cs.meta → testumgebung/CrowdModelling/Assets/Scripts/ReadWrite/ReadFromFileOld.cs.meta


+ 1 - 1
testumgebung/CrowdModelling/Assets/Scripts/ReadWrite/WriteInCSV.cs → testumgebung/CrowdModelling/Assets/Scripts/ReadWrite/WriteInCSVOld.cs

@@ -2,7 +2,7 @@
 using System;
 using System.IO;
 
-public class WriteInCSV : MonoBehaviour
+public class WriteInCSVOld : MonoBehaviour
 {
     public int index = 0;
 

+ 0 - 0
testumgebung/CrowdModelling/Assets/Scripts/ReadWrite/WriteInCSV.cs.meta → testumgebung/CrowdModelling/Assets/Scripts/ReadWrite/WriteInCSVOld.cs.meta


+ 1 - 1
testumgebung/CrowdModelling/Assets/Scripts/ReadWrite/WriteInFile.cs → testumgebung/CrowdModelling/Assets/Scripts/ReadWrite/WriteInFileOld.cs

@@ -2,7 +2,7 @@
 using System;
 using System.IO;
 
-public class WriteInFile : MonoBehaviour
+public class WriteInFileOld : MonoBehaviour
 {
     public int index = 0;
 

+ 0 - 0
testumgebung/CrowdModelling/Assets/Scripts/ReadWrite/WriteInFile.cs.meta → testumgebung/CrowdModelling/Assets/Scripts/ReadWrite/WriteInFileOld.cs.meta


+ 1 - 1
testumgebung/CrowdModelling/Assets/Scripts/Walking/FollowLeader.cs → testumgebung/CrowdModelling/Assets/Scripts/Walking/FollowLeaderOld.cs

@@ -1,7 +1,7 @@
 using UnityEngine;
 using UnityEngine.AI;
 
-public class FollowLeader : MonoBehaviour
+public class FollowLeaderOld : MonoBehaviour
 {
     public GameObject leader;
 

+ 0 - 0
testumgebung/CrowdModelling/Assets/Scripts/Walking/FollowLeader.cs.meta → testumgebung/CrowdModelling/Assets/Scripts/Walking/FollowLeaderOld.cs.meta


+ 1 - 1
testumgebung/CrowdModelling/Assets/Scripts/Walking/Lerp.cs → testumgebung/CrowdModelling/Assets/Scripts/Walking/LerpOld.cs

@@ -1,6 +1,6 @@
 using UnityEngine;
 
-public class Lerp : MonoBehaviour
+public class LerpOld : MonoBehaviour
 {            
     private Transform startPoint, endPoint;
     [SerializeField]

+ 0 - 0
testumgebung/CrowdModelling/Assets/Scripts/Walking/Lerp.cs.meta → testumgebung/CrowdModelling/Assets/Scripts/Walking/LerpOld.cs.meta


+ 3 - 3
testumgebung/CrowdModelling/Assets/Scripts/Walking/WalkPos_Lerp.cs → testumgebung/CrowdModelling/Assets/Scripts/Walking/WalkPos_LerpOld.cs

@@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-public class WalkPos_Lerp : MonoBehaviour
+public class WalkPos_LerpOld : MonoBehaviour
 {
     // Public Settings
     public float speed = 1.0f;
@@ -26,11 +26,11 @@ public class WalkPos_Lerp : MonoBehaviour
 
     private void Start()
     {
-        int index = gameObject.GetComponent<WriteInCSV>().index;
+        int index = gameObject.GetComponent<WriteInCSVOld>().index;
         string dir = Directory.GetCurrentDirectory();
         string reference = @"\Assets\Data_position\Walk" + index + ".csv";
         // var -> Tuple<List<Vector3>, List<Quaternion>>
-        var posRotList = gameObject.GetComponent<ReadFromCSV>().ReadFromCSVFile(dir + reference);
+        var posRotList = gameObject.GetComponent<ReadFromCSVOld>().ReadFromCSVFile(dir + reference);
         posList = posRotList.Item1;
         rotList = posRotList.Item2;
         

+ 0 - 0
testumgebung/CrowdModelling/Assets/Scripts/Walking/WalkPos_Lerp.cs.meta → testumgebung/CrowdModelling/Assets/Scripts/Walking/WalkPos_LerpOld.cs.meta


+ 1 - 1
testumgebung/CrowdModelling/Assets/Scripts/Walking/WanderingAI.cs → testumgebung/CrowdModelling/Assets/Scripts/Walking/WanderingAIOld.cs

@@ -1,7 +1,7 @@
 using UnityEngine;
 using UnityEngine.AI;
 
-public class WanderingAI : MonoBehaviour
+public class WanderingAIOld : MonoBehaviour
 {
     public float wanderRadius;
     public float wanderTimer;

+ 0 - 0
testumgebung/CrowdModelling/Assets/Scripts/Walking/WanderingAI.cs.meta → testumgebung/CrowdModelling/Assets/Scripts/Walking/WanderingAIOld.cs.meta


+ 1 - 1
testumgebung/CrowdModelling/Assets/Scripts/Walking/WanderingAIWaypoints.cs → testumgebung/CrowdModelling/Assets/Scripts/Walking/WanderingAIWaypointsOld.cs

@@ -1,7 +1,7 @@
 using UnityEngine;
 using UnityEngine.AI;
 
-public class WanderingAIWaypoints : MonoBehaviour
+public class WanderingAIWaypointsOld : MonoBehaviour
 {
     public Transform[] waypoints;
     public float wanderTimer;

+ 0 - 0
testumgebung/CrowdModelling/Assets/Scripts/Walking/WanderingAIWaypoints.cs.meta → testumgebung/CrowdModelling/Assets/Scripts/Walking/WanderingAIWaypointsOld.cs.meta


Some files were not shown because too many files changed in this diff