Explorar o código

Added new hitting color, if threshold is not reached

Furkan Karakocaoglu %!s(int64=3) %!d(string=hai) anos
pai
achega
8734dccdff

+ 31 - 10
testumgebung/CrowdModelling/Assets/Humans/Basic Motions/Textures/BasicMotionsTexture.png.meta

@@ -1,11 +1,9 @@
 fileFormatVersion: 2
 guid: fad9765a35536374695ea4ff22aca373
-timeCreated: 1568740370
-licenseType: Store
 TextureImporter:
-  fileIDToRecycleName: {}
+  internalIDToNameTable: []
   externalObjects: {}
-  serializedVersion: 4
+  serializedVersion: 11
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
@@ -23,6 +21,8 @@ TextureImporter:
     heightScale: 0.25
     normalMapFilter: 0
   isReadable: 0
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
   grayScaleToAlpha: 0
   generateCubemap: 6
   cubemapConvolution: 0
@@ -33,7 +33,7 @@ TextureImporter:
     serializedVersion: 2
     filterMode: -1
     aniso: -1
-    mipBias: -1
+    mipBias: -100
     wrapU: -1
     wrapV: -1
     wrapW: -1
@@ -45,18 +45,22 @@ TextureImporter:
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
   alphaUsage: 1
   alphaIsTransparency: 0
   spriteTessellationDetail: -1
   textureType: 0
   textureShape: 1
+  singleChannelComponent: 0
   maxTextureSizeSet: 0
   compressionQualitySet: 0
   textureFormatSet: 0
+  applyGammaDecoding: 1
   platformSettings:
-  - buildTarget: DefaultTexturePlatform
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
     maxTextureSize: 128
     resizeAlgorithm: 0
     textureFormat: -1
@@ -66,7 +70,9 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
-  - buildTarget: Standalone
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 3
+    buildTarget: Standalone
     maxTextureSize: 128
     resizeAlgorithm: 0
     textureFormat: -1
@@ -76,7 +82,9 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
-  - buildTarget: Android
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 3
+    buildTarget: Android
     maxTextureSize: 128
     resizeAlgorithm: 0
     textureFormat: -1
@@ -86,7 +94,9 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
-  - buildTarget: WebGL
+    forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 3
+    buildTarget: WebGL
     maxTextureSize: 128
     resizeAlgorithm: 0
     textureFormat: -1
@@ -96,12 +106,23 @@ TextureImporter:
     allowsAlphaSplitting: 0
     overridden: 0
     androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
   spriteSheet:
     serializedVersion: 2
     sprites: []
     outline: []
     physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
   spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 

+ 1 - 1
testumgebung/CrowdModelling/Assets/Prefabs/HumansWaypoints/Human.prefab → testumgebung/CrowdModelling/Assets/Prefabs/HumansWaypoints/Human_Lerp.prefab

@@ -14,7 +14,7 @@ GameObject:
   - component: {fileID: 4261327489547883748}
   - component: {fileID: 4261327489547883753}
   m_Layer: 11
-  m_Name: Human
+  m_Name: Human_Lerp
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

+ 0 - 0
testumgebung/CrowdModelling/Assets/Prefabs/HumansWaypoints/Human.prefab.meta → testumgebung/CrowdModelling/Assets/Prefabs/HumansWaypoints/Human_Lerp.prefab.meta


+ 1 - 1
testumgebung/CrowdModelling/Assets/Prefabs/Materials/Highlighting/Model_RED.mat

@@ -73,5 +73,5 @@ Material:
     - _UVSec: 0
     - _ZWrite: 1
     m_Colors:
-    - _Color: {r: 1, g: 0, b: 0, a: 1}
+    - _Color: {r: 0.5882353, g: 0, b: 0, a: 1}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

+ 77 - 0
testumgebung/CrowdModelling/Assets/Prefabs/Materials/Highlighting/Model_Yellow.mat

@@ -0,0 +1,77 @@
+%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: Model_Yellow
+  m_Shader: {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _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: fad9765a35536374695ea4ff22aca373, 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:
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 0.19607843, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

+ 10 - 0
testumgebung/CrowdModelling/Assets/Prefabs/Materials/Highlighting/Model_Yellow.mat.meta

@@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: f941f63dd61634f4d874c3bb477a07e1
+timeCreated: 1568740184
+licenseType: Store
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 496 - 13
testumgebung/CrowdModelling/Assets/Scenes/Lerp.unity

@@ -761,7 +761,7 @@ PrefabInstance:
     - target: {fileID: 4261327489547883753, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
         type: 3}
       propertyPath: speed
-      value: 6
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: 4261327489547883753, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
         type: 3}
@@ -944,8 +944,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   highlightRed: {fileID: 2100000, guid: a7c095bfc879ed44ab827356312a1911, type: 2}
   highlightGreen: {fileID: 2100000, guid: a6d181ce68f181143bd8057a41002754, type: 2}
-  threshold: 1
-  radius: 1
+  highlightYellow: {fileID: 2100000, guid: f941f63dd61634f4d874c3bb477a07e1, type: 2}
+  threshold: 2
+  radius: 2
 --- !u!4 &236975794 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 8112525647522758292, guid: 1e15d8b1798398d4cb02383a00a79757,
@@ -1113,7 +1114,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 254130682}
   m_LocalRotation: {x: -0, y: 0.15420079, z: -0, w: 0.98803955}
-  m_LocalPosition: {x: -4.65, y: 1.5319302, z: -35.85}
+  m_LocalPosition: {x: -4.4, y: 1.5319302, z: -35.93}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 410172589}
@@ -1559,7 +1560,7 @@ PrefabInstance:
     - target: {fileID: 4261327489547883753, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
         type: 3}
       propertyPath: speed
-      value: 6
+      value: 4.5
       objectReference: {fileID: 0}
     - target: {fileID: 4261327489547883753, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
         type: 3}
@@ -1708,7 +1709,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &327023583
 Transform:
   m_ObjectHideFlags: 0
@@ -1779,7 +1780,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &410172589
 Transform:
   m_ObjectHideFlags: 0
@@ -2241,7 +2242,7 @@ PrefabInstance:
     - target: {fileID: 4261327489547883753, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
         type: 3}
       propertyPath: speed
-      value: 5
+      value: 3
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: b2310697a913a1e4bb9b98dbfa2a2ad4, type: 3}
@@ -5622,7 +5623,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1604532828
 Transform:
   m_ObjectHideFlags: 0
@@ -5639,6 +5640,7 @@ Transform:
   - {fileID: 2031044569}
   - {fileID: 1492196060}
   - {fileID: 780183532}
+  - {fileID: 2096321245}
   m_Father: {fileID: 0}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -5672,8 +5674,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   highlightRed: {fileID: 2100000, guid: 1e1ca54e0c261f44c87e04340377c9e8, type: 2}
   highlightGreen: {fileID: 2100000, guid: 34bf8c5c89b3c6d43877bd0fc0941e2e, type: 2}
-  threshold: 1
-  radius: 1
+  highlightYellow: {fileID: 2100000, guid: f941f63dd61634f4d874c3bb477a07e1, type: 2}
+  threshold: 2
+  radius: 2
 --- !u!1001 &1607308111
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -7822,7 +7825,7 @@ PrefabInstance:
     - target: {fileID: 4261327489547883753, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
         type: 3}
       propertyPath: speed
-      value: 7.3
+      value: 5
       objectReference: {fileID: 0}
     - target: {fileID: 4261327489547883753, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
         type: 3}
@@ -7952,6 +7955,481 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 1370743614}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &2096321244
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1604532828}
+    m_Modifications:
+    - target: {fileID: 678759736977924816, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977924818, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977924820, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977924822, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977924828, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977924840, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977924842, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977924846, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927680, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927682, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927684, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927686, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927688, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927690, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927692, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927694, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927696, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927698, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927700, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927702, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927704, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927706, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927708, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927710, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927712, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927714, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927716, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927718, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927720, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927722, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927724, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927726, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927728, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927730, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927732, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927734, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927736, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927738, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927740, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927742, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927776, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927778, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927780, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927782, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927784, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927786, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927788, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927790, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927792, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927794, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927796, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927798, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927800, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927802, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927804, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977927806, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977928128, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977928130, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977928132, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977928134, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977928136, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977928138, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977928140, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977928142, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977928146, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977928150, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977928152, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977928154, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977928156, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 678759736977928158, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 4261327489547883749, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -23.690554
+      objectReference: {fileID: 0}
+    - target: {fileID: 4261327489547883749, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -2.17
+      objectReference: {fileID: 0}
+    - target: {fileID: 4261327489547883749, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -13.1005535
+      objectReference: {fileID: 0}
+    - target: {fileID: 4261327489547883749, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4261327489547883749, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0.9991214
+      objectReference: {fileID: 0}
+    - target: {fileID: 4261327489547883749, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4261327489547883749, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.041909512
+      objectReference: {fileID: 0}
+    - target: {fileID: 4261327489547883749, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4261327489547883749, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4261327489547883749, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: -175.19601
+      objectReference: {fileID: 0}
+    - target: {fileID: 4261327489547883749, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4261327489547883749, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4261327489547883749, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_LocalScale.z
+      value: 1.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4261327489547883750, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Name
+      value: Human (5)
+      objectReference: {fileID: 0}
+    - target: {fileID: 4261327489547883750, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Layer
+      value: 11
+      objectReference: {fileID: 0}
+    - target: {fileID: 4261327489547883750, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4261327489547883753, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: waypoints.Array.size
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 4261327489547883753, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: speed
+      value: 3.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 4261327489547883753, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: waypoints.Array.data[0]
+      value: 
+      objectReference: {fileID: 1648430291}
+    - target: {fileID: 4261327489547883753, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: waypoints.Array.data[1]
+      value: 
+      objectReference: {fileID: 1326523704}
+    - target: {fileID: 4261327489547883753, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: waypoints.Array.data[2]
+      value: 
+      objectReference: {fileID: 2120446621}
+    - target: {fileID: 4261327489547883753, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: waypoints.Array.data[3]
+      value: 
+      objectReference: {fileID: 469675632}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: b2310697a913a1e4bb9b98dbfa2a2ad4, type: 3}
+--- !u!4 &2096321245 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4261327489547883749, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+    type: 3}
+  m_PrefabInstance: {fileID: 2096321244}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &2102922752
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -8383,6 +8861,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 1604532828}
     m_Modifications:
+    - target: {fileID: 3538549103382459901, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
+        type: 3}
+      propertyPath: m_Enabled
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4261327489547883749, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -8491,7 +8974,7 @@ PrefabInstance:
     - target: {fileID: 4261327489547883753, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
         type: 3}
       propertyPath: speed
-      value: 4
+      value: 2
       objectReference: {fileID: 0}
     - target: {fileID: 4261327489547883753, guid: b2310697a913a1e4bb9b98dbfa2a2ad4,
         type: 3}

+ 20 - 12
testumgebung/CrowdModelling/Assets/Scripts/ChangeMaterial/ChangeCapsuleMaterial.cs

@@ -6,6 +6,7 @@ public class ChangeCapsuleMaterial : MonoBehaviour
 {
     public Material highlightRed;
     public Material highlightGreen;
+    public Material highlightYellow;
     public int threshold = 1;
     public float radius = 1f;
 
@@ -38,26 +39,33 @@ public class ChangeCapsuleMaterial : MonoBehaviour
             center = lst.GetComponent<Transform>().position;
             // only collisions with Layer "Humans" are listed in "hitHumans"
             hitHumans = Physics.OverlapSphere(center, radius, LayerMask.GetMask("Humans"));
-
+            
             // if Humans only hits themselves (threshold == 1) or nobody, then Material change to Green
-            if (hitHumans.Length <= threshold)
+            if (hitHumans.Length <= 1)
             {
                 Debug.Log(lst.gameObject.name + " set to Green");
-                //lst.GetComponent<MeshRenderer>().material = highlightGreen;
                 lst.GetComponent<MeshRenderer>().material = highlightGreen;
             }
-
-            // if Humans hits somebody else (threshold >= 1), then Material change to Red
-            foreach (Collider hitHuman in hitHumans)
+            // if Human hits lesser then threshold but is hitting minimum 1 other human, then Material change to Yellow
+            else if (hitHumans.Length <= threshold)
+            {
+                Debug.Log(lst.gameObject.name + " set to Yellow");
+                lst.transform.GetChild(0).GetChild(0).gameObject.GetComponent<SkinnedMeshRenderer>().material = highlightYellow;
+            }
+            else
             {
-                if (lst.gameObject.name != hitHuman.gameObject.name) // overlap with themselves
+                // if Humans hits somebody else (threshold >= 1), then Material change to Red
+                foreach (Collider hitHuman in hitHumans)
                 {
-                    if (hitHuman.GetComponent<MeshRenderer>().material != highlightRed 
-                        || lst.GetComponent<MeshRenderer>().material != highlightRed)
+                    if (lst.gameObject.name != hitHuman.gameObject.name) // overlap with themselves
                     {
-                        Debug.Log(lst.gameObject.name + " overlaps with " + hitHuman.gameObject.name);
-                        hitHuman.GetComponent<MeshRenderer>().material = highlightRed;
-                        lst.GetComponent<MeshRenderer>().material = highlightRed;
+                        if (hitHuman.GetComponent<MeshRenderer>().material != highlightRed 
+                            || lst.GetComponent<MeshRenderer>().material != highlightRed)
+                        {
+                            Debug.Log(lst.gameObject.name + " overlaps with " + hitHuman.gameObject.name);
+                            hitHuman.GetComponent<MeshRenderer>().material = highlightRed;
+                            lst.GetComponent<MeshRenderer>().material = highlightRed;
+                        }
                     }
                 }
             }

+ 1 - 0
testumgebung/CrowdModelling/Assets/Scripts/ChangeMaterial/ChangeCapsuleMaterial.cs.meta

@@ -6,6 +6,7 @@ MonoImporter:
   defaultReferences:
   - highlightRed: {fileID: 2100000, guid: a7c095bfc879ed44ab827356312a1911, type: 2}
   - highlightGreen: {fileID: 2100000, guid: a6d181ce68f181143bd8057a41002754, type: 2}
+  - highlightYellow: {fileID: 2100000, guid: f941f63dd61634f4d874c3bb477a07e1, type: 2}
   executionOrder: 0
   icon: {instanceID: 0}
   userData: 

+ 27 - 14
testumgebung/CrowdModelling/Assets/Scripts/ChangeMaterial/ChangeModelMaterial.cs

@@ -1,11 +1,12 @@
 using System.Collections.Generic;
 using UnityEngine;
 
-// Use Script in parent Folder of all humans
+// Use this Script in parent folder of all Humans
 public class ChangeModelMaterial : MonoBehaviour
 {
     public Material highlightRed;
     public Material highlightGreen;
+    public Material highlightYellow;
     public int threshold = 1;
     public float radius = 1f;
 
@@ -31,7 +32,13 @@ public class ChangeModelMaterial : MonoBehaviour
         //}
     }
 
-    private void Update()
+    private void OnDrawGizmos()
+    {
+        Gizmos.color = Color.red;
+        Gizmos.DrawWireSphere(center, radius);
+    }
+
+    private void FixedUpdate()
     {
         foreach (Component lst in allHumansTransform)
         {
@@ -40,28 +47,34 @@ public class ChangeModelMaterial : MonoBehaviour
             hitHumans = Physics.OverlapSphere(center, radius, LayerMask.GetMask("Humans"));
 
             // if Humans only hits themselves (threshold == 1) or nobody, then Material change to Green
-            if (hitHumans.Length <= threshold)
+            if (hitHumans.Length <= 1)
             {
                 Debug.Log(lst.gameObject.name + " set to Green");
-                //lst.GetComponent<MeshRenderer>().material = highlightGreen;
                 lst.transform.GetChild(0).GetChild(0).gameObject.GetComponent<SkinnedMeshRenderer>().material = highlightGreen;
             }
-
-            // if Humans hits somebody else (threshold >= 1), then Material change to Red
-            foreach (Collider hitHuman in hitHumans)
+            // if Human hits lesser then threshold but is hitting minimum 1 other human, then Material change to Yellow
+            else if (hitHumans.Length <= threshold)
             {
-                if (lst.gameObject.name != hitHuman.gameObject.name) // overlap with themselves
+                Debug.Log(lst.gameObject.name + " set to Yellow");
+                lst.transform.GetChild(0).GetChild(0).gameObject.GetComponent<SkinnedMeshRenderer>().material = highlightYellow;
+            }
+            else
+            {
+                // if Humans hits somebody else (threshold >= 1), then Material change to Red
+                foreach (Collider hitHuman in hitHumans)
                 {
-                    if (hitHuman.transform.GetChild(0).GetChild(0).gameObject.GetComponent<SkinnedMeshRenderer>().material != highlightRed 
-                        || lst.transform.GetChild(0).GetChild(0).gameObject.GetComponent<SkinnedMeshRenderer>().material != highlightRed)
+                    if (lst.gameObject.name != hitHuman.gameObject.name) // overlap with themselves
                     {
-                        Debug.Log(lst.gameObject.name + " overlaps with " + hitHuman.gameObject.name);
-                        hitHuman.transform.GetChild(0).GetChild(0).gameObject.GetComponent<SkinnedMeshRenderer>().material = highlightRed;
-                        lst.transform.GetChild(0).GetChild(0).gameObject.GetComponent<SkinnedMeshRenderer>().material = highlightRed;
+                        if (hitHuman.transform.GetChild(0).GetChild(0).gameObject.GetComponent<SkinnedMeshRenderer>().material != highlightRed
+                            || lst.transform.GetChild(0).GetChild(0).gameObject.GetComponent<SkinnedMeshRenderer>().material != highlightRed)
+                        {
+                            Debug.Log(lst.gameObject.name + " overlaps with " + hitHuman.gameObject.name);
+                            hitHuman.transform.GetChild(0).GetChild(0).gameObject.GetComponent<SkinnedMeshRenderer>().material = highlightRed;
+                            lst.transform.GetChild(0).GetChild(0).gameObject.GetComponent<SkinnedMeshRenderer>().material = highlightRed;
+                        }
                     }
                 }
             }
         }
     }
-
 }

+ 1 - 0
testumgebung/CrowdModelling/Assets/Scripts/ChangeMaterial/ChangeModelMaterial.cs.meta

@@ -6,6 +6,7 @@ MonoImporter:
   defaultReferences:
   - highlightRed: {fileID: 2100000, guid: 1e1ca54e0c261f44c87e04340377c9e8, type: 2}
   - highlightGreen: {fileID: 2100000, guid: 34bf8c5c89b3c6d43877bd0fc0941e2e, type: 2}
+  - highlightYellow: {fileID: 2100000, guid: f941f63dd61634f4d874c3bb477a07e1, type: 2}
   executionOrder: 0
   icon: {instanceID: 0}
   userData: