#2 #1 Added edge detection to OverseerCamera and DogCameras

vladimirdlc · Mar 24, 2017 · 05f23da · 05f23da
1 parent deb0210
commit 05f23da
Show file tree

Hide file tree

Showing 3 changed files with 90 additions and 6 deletions.
diff --git a/Assets/Prefabs/Ground Characters/Test Dog Clone.prefab b/Assets/Prefabs/Ground Characters/Test Dog Clone.prefab
@@ -575,6 +575,7 @@ GameObject:
   - component: {fileID: 114274210798098350}
   - component: {fileID: 114032423469924148}
   - component: {fileID: 114468833786986380}
+  - component: {fileID: 114701524271416830}
   m_Layer: 19
   m_Name: Camera
   m_TagString: Untagged
@@ -2743,6 +2744,26 @@ MonoBehaviour:
   m_FillAmount: 1
   m_FillClockwise: 1
   m_FillOrigin: 0
+--- !u!114 &114701524271416830
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1469419833160056}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 730475ee64f9a894bbac0d9e6f22e813, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mode: 0
+  sensitivityDepth: 1
+  sensitivityNormals: 1
+  lumThreshold: 1
+  edgeExp: 1.75
+  sampleDist: -1.14
+  edgesOnly: 0
+  edgesOnlyBgColor: {r: 1, g: 1, b: 1, a: 1}
+  edgeDetectShader: {fileID: 4800000, guid: 0d1644bdf064147baa97f235fc5b4903, type: 3}
 --- !u!114 &114703957566848652
 MonoBehaviour:
   m_ObjectHideFlags: 1

diff --git a/Assets/Prefabs/Ground Characters/Test Dog.prefab b/Assets/Prefabs/Ground Characters/Test Dog.prefab
@@ -104,6 +104,7 @@ GameObject:
   - component: {fileID: 95064026120732850}
   - component: {fileID: 114662011035024238}
   - component: {fileID: 114126837694399530}
+  - component: {fileID: 114381794096924950}
   m_Layer: 14
   m_Name: Dog Camera
   m_TagString: Camera Ground Character
@@ -1631,8 +1632,8 @@ Transform:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1497780920488766}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -39.28, y: 0.76, z: -14.65}
+  m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: -61.23, y: -1.38, z: -17.9}
   m_LocalScale: {x: 10, y: 10, z: 10}
   m_Children:
   - {fileID: 4904484860453324}
@@ -1644,7 +1645,7 @@ Transform:
   - {fileID: 4182938055822026}
   m_Father: {fileID: 0}
   m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 71.489006, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
 --- !u!4 &4373999978945466
 Transform:
   m_ObjectHideFlags: 1
@@ -3016,6 +3017,26 @@ MonoBehaviour:
   m_Bark: {fileID: 8300000, guid: 3be42057eaf14c04d830e8f2bd469410, type: 3}
   m_MovementAudiosource: {fileID: 82103515527864108}
   m_BackgroundHum: {fileID: 82055928726426022}
+--- !u!114 &114381794096924950
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1115569924498180}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 730475ee64f9a894bbac0d9e6f22e813, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mode: 0
+  sensitivityDepth: 1
+  sensitivityNormals: 1
+  lumThreshold: 1
+  edgeExp: 1.75
+  sampleDist: -1.14
+  edgesOnly: 0
+  edgesOnlyBgColor: {r: 1, g: 1, b: 1, a: 1}
+  edgeDetectShader: {fileID: 4800000, guid: 0d1644bdf064147baa97f235fc5b4903, type: 3}
 --- !u!114 &114388267382343990
 MonoBehaviour:
   m_ObjectHideFlags: 1

diff --git a/Assets/Prefabs/Overseer/Overseer Camera.prefab b/Assets/Prefabs/Overseer/Overseer Camera.prefab
@@ -24,6 +24,7 @@ GameObject:
   - component: {fileID: 92121130511338426}
   - component: {fileID: 81378788193971602}
   - component: {fileID: 114080699090803756}
+  - component: {fileID: 114234224903203070}
   m_Layer: 0
   m_Name: GlowPrePassCamera
   m_TagString: Untagged
@@ -54,6 +55,7 @@ GameObject:
   - component: {fileID: 95535478316193998}
   - component: {fileID: 114086166394973654}
   - component: {fileID: 114413703272565968}
+  - component: {fileID: 114738710428922086}
   m_Layer: 0
   m_Name: Overseer Camera
   m_TagString: MainCamera
@@ -68,7 +70,7 @@ Transform:
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1743480622849158}
   m_LocalRotation: {x: 0.27219734, y: 0.53356946, z: -0.17246751, w: 0.7819637}
-  m_LocalPosition: {x: -4.61, y: 10.72, z: 0.21}
+  m_LocalPosition: {x: -3.94, y: 11.67, z: 0.5}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4177683222155914}
@@ -130,7 +132,7 @@ Camera:
   m_GameObject: {fileID: 1607725418486808}
   m_Enabled: 1
   serializedVersion: 2
-  m_ClearFlags: 1
+  m_ClearFlags: 2
   m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
   m_NormalizedViewPortRect:
     serializedVersion: 2
@@ -191,7 +193,7 @@ Animator:
   m_PrefabParentObject: {fileID: 0}
   m_PrefabInternal: {fileID: 100100000}
   m_GameObject: {fileID: 1743480622849158}
-  m_Enabled: 1
+  m_Enabled: 0
   m_Avatar: {fileID: 0}
   m_Controller: {fileID: 9100000, guid: d4e1aa0238ba2474b8fbce487a079213, type: 2}
   m_CullingMode: 0
@@ -250,6 +252,26 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   Intensity: 2
   glowShader: {fileID: 4800000, guid: e4b39d1c04bdfb24ebc10e5897e6b067, type: 3}
+--- !u!114 &114234224903203070
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1607725418486808}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 730475ee64f9a894bbac0d9e6f22e813, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mode: 3
+  sensitivityDepth: 1
+  sensitivityNormals: 1
+  lumThreshold: 0.2
+  edgeExp: 1
+  sampleDist: 1
+  edgesOnly: 0
+  edgesOnlyBgColor: {r: 1, g: 1, b: 1, a: 1}
+  edgeDetectShader: {fileID: 4800000, guid: 0d1644bdf064147baa97f235fc5b4903, type: 3}
 --- !u!114 &114413703272565968
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -429,6 +451,26 @@ MonoBehaviour:
   yEdgeSpeed: 0
   cloudDrawState: 1
   terrainAdjustTilt: 0
+--- !u!114 &114738710428922086
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 100100000}
+  m_GameObject: {fileID: 1743480622849158}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 730475ee64f9a894bbac0d9e6f22e813, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  mode: 0
+  sensitivityDepth: 1
+  sensitivityNormals: 0.5
+  lumThreshold: 1
+  edgeExp: 1.75
+  sampleDist: -1.14
+  edgesOnly: 0
+  edgesOnlyBgColor: {r: 1, g: 1, b: 1, a: 1}
+  edgeDetectShader: {fileID: 4800000, guid: 0d1644bdf064147baa97f235fc5b4903, type: 3}
 --- !u!114 &114763695715970150
 MonoBehaviour:
   m_ObjectHideFlags: 1