Skip to content

Commit 951874e

Browse files
committed
Added feet camera and shadow blob
1 parent 3555430 commit 951874e

File tree

16 files changed

+1925
-191
lines changed

16 files changed

+1925
-191
lines changed

unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/Camera/Resources/CameraController.prefab

Lines changed: 1220 additions & 175 deletions
Large diffs are not rendered by default.

unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/CharacterControllerV2/CharacterControllerV2.prefab

Lines changed: 132 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,38 @@ Transform:
150150
m_Father: {fileID: 8401150569409203572}
151151
m_RootOrder: 2
152152
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
153+
--- !u!1 &3481547600097224243
154+
GameObject:
155+
m_ObjectHideFlags: 0
156+
m_CorrespondingSourceObject: {fileID: 0}
157+
m_PrefabInstance: {fileID: 0}
158+
m_PrefabAsset: {fileID: 0}
159+
serializedVersion: 6
160+
m_Component:
161+
- component: {fileID: 4212329383853933911}
162+
m_Layer: 16
163+
m_Name: ShadowBlob
164+
m_TagString: Untagged
165+
m_Icon: {fileID: 0}
166+
m_NavMeshLayer: 0
167+
m_StaticEditorFlags: 0
168+
m_IsActive: 1
169+
--- !u!4 &4212329383853933911
170+
Transform:
171+
m_ObjectHideFlags: 0
172+
m_CorrespondingSourceObject: {fileID: 0}
173+
m_PrefabInstance: {fileID: 0}
174+
m_PrefabAsset: {fileID: 0}
175+
m_GameObject: {fileID: 3481547600097224243}
176+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
177+
m_LocalPosition: {x: 0, y: 0, z: 0}
178+
m_LocalScale: {x: 1, y: 1, z: 1}
179+
m_ConstrainProportionsScale: 0
180+
m_Children:
181+
- {fileID: 7528613400586354996}
182+
m_Father: {fileID: 8401150569409203572}
183+
m_RootOrder: 5
184+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
153185
--- !u!1 &4910672507465472199
154186
GameObject:
155187
m_ObjectHideFlags: 0
@@ -181,6 +213,104 @@ Transform:
181213
m_Father: {fileID: 5282359372234703465}
182214
m_RootOrder: 0
183215
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
216+
--- !u!1 &5275467346922806467
217+
GameObject:
218+
m_ObjectHideFlags: 0
219+
m_CorrespondingSourceObject: {fileID: 0}
220+
m_PrefabInstance: {fileID: 0}
221+
m_PrefabAsset: {fileID: 0}
222+
serializedVersion: 6
223+
m_Component:
224+
- component: {fileID: 7528613400586354996}
225+
- component: {fileID: 1814975366841693723}
226+
- component: {fileID: 5794557155178772368}
227+
- component: {fileID: 4051750961049473338}
228+
m_Layer: 16
229+
m_Name: Quad
230+
m_TagString: Untagged
231+
m_Icon: {fileID: 0}
232+
m_NavMeshLayer: 0
233+
m_StaticEditorFlags: 0
234+
m_IsActive: 1
235+
--- !u!4 &7528613400586354996
236+
Transform:
237+
m_ObjectHideFlags: 0
238+
m_CorrespondingSourceObject: {fileID: 0}
239+
m_PrefabInstance: {fileID: 0}
240+
m_PrefabAsset: {fileID: 0}
241+
m_GameObject: {fileID: 5275467346922806467}
242+
m_LocalRotation: {x: 0.70710576, y: -0, z: -0, w: 0.70710784}
243+
m_LocalPosition: {x: 0, y: 0.01, z: 0}
244+
m_LocalScale: {x: 1, y: 1, z: 1}
245+
m_ConstrainProportionsScale: 0
246+
m_Children: []
247+
m_Father: {fileID: 4212329383853933911}
248+
m_RootOrder: 0
249+
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
250+
--- !u!33 &1814975366841693723
251+
MeshFilter:
252+
m_ObjectHideFlags: 0
253+
m_CorrespondingSourceObject: {fileID: 0}
254+
m_PrefabInstance: {fileID: 0}
255+
m_PrefabAsset: {fileID: 0}
256+
m_GameObject: {fileID: 5275467346922806467}
257+
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
258+
--- !u!23 &5794557155178772368
259+
MeshRenderer:
260+
m_ObjectHideFlags: 0
261+
m_CorrespondingSourceObject: {fileID: 0}
262+
m_PrefabInstance: {fileID: 0}
263+
m_PrefabAsset: {fileID: 0}
264+
m_GameObject: {fileID: 5275467346922806467}
265+
m_Enabled: 1
266+
m_CastShadows: 1
267+
m_ReceiveShadows: 1
268+
m_DynamicOccludee: 1
269+
m_StaticShadowCaster: 0
270+
m_MotionVectors: 1
271+
m_LightProbeUsage: 1
272+
m_ReflectionProbeUsage: 1
273+
m_RayTracingMode: 2
274+
m_RayTraceProcedural: 0
275+
m_RenderingLayerMask: 1
276+
m_RendererPriority: 0
277+
m_Materials:
278+
- {fileID: 2100000, guid: 4ee26dc4a1e18c64a8395a784a095b54, type: 2}
279+
m_StaticBatchInfo:
280+
firstSubMesh: 0
281+
subMeshCount: 0
282+
m_StaticBatchRoot: {fileID: 0}
283+
m_ProbeAnchor: {fileID: 0}
284+
m_LightProbeVolumeOverride: {fileID: 0}
285+
m_ScaleInLightmap: 1
286+
m_ReceiveGI: 1
287+
m_PreserveUVs: 0
288+
m_IgnoreNormalsForChartDetection: 0
289+
m_ImportantGI: 0
290+
m_StitchLightmapSeams: 1
291+
m_SelectedEditorRenderState: 3
292+
m_MinimumChartSize: 4
293+
m_AutoUVMaxDistance: 0.5
294+
m_AutoUVMaxAngle: 89
295+
m_LightmapParameters: {fileID: 0}
296+
m_SortingLayerID: 0
297+
m_SortingLayer: 0
298+
m_SortingOrder: 0
299+
m_AdditionalVertexStreams: {fileID: 0}
300+
--- !u!64 &4051750961049473338
301+
MeshCollider:
302+
m_ObjectHideFlags: 0
303+
m_CorrespondingSourceObject: {fileID: 0}
304+
m_PrefabInstance: {fileID: 0}
305+
m_PrefabAsset: {fileID: 0}
306+
m_GameObject: {fileID: 5275467346922806467}
307+
m_Material: {fileID: 0}
308+
m_IsTrigger: 0
309+
m_Enabled: 1
310+
serializedVersion: 4
311+
m_Convex: 0
312+
m_CookingOptions: 30
313+
m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
184314
--- !u!1 &5713059157034656006
185315
GameObject:
186316
m_ObjectHideFlags: 0
@@ -340,6 +470,7 @@ Transform:
340470
- {fileID: 4437337631692653963}
341471
- {fileID: 6189346922540596867}
342472
- {fileID: 1072361780311930703}
473+
- {fileID: 4212329383853933911}
343474
m_Father: {fileID: 0}
344475
m_RootOrder: 0
345476
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -399,6 +530,7 @@ MonoBehaviour:
399530
characterController: {fileID: 1478447575556445965}
400531
animationController: {fileID: 9061226439687306306}
401532
data: {fileID: 11400000, guid: 47cfcbf883a4f2d438ffd56818e5b6e5, type: 2}
533+
shadowBlob: {fileID: 3481547600097224243}
402534
jumpAction: {fileID: 11400000, guid: 8eddef1fc072ec845aeb62f5e1041b52, type: 2}
403535
sprintAction: {fileID: 11400000, guid: 0cfb8d150b7d6934d856665cf924d01d, type: 2}
404536
walkAction: {fileID: 11400000, guid: 2b9a8249daeada149be90467c4bb981c, type: 2}

unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/CharacterControllerV2/CharacterView.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ public class CharacterView : MonoBehaviour, ICharacterView
2020

2121
[Header("Data")]
2222
[SerializeField] private CharacterControllerData data;
23+
[SerializeField] private GameObject shadowBlob;
2324

2425
[Header("InputActions")]
2526
[SerializeField] private InputAction_Hold jumpAction;
@@ -52,7 +53,7 @@ public class CharacterView : MonoBehaviour, ICharacterView
5253

5354
private void Awake()
5455
{
55-
controller = new DCLCharacterControllerV2(this, data, jumpAction, sprintAction, walkAction, characterXAxis, characterYAxis, cameraForward, cameraRight, CameraMode);
56+
controller = new DCLCharacterControllerV2(this, data, jumpAction, sprintAction, walkAction, characterXAxis, characterYAxis, cameraForward, cameraRight, CameraMode, shadowBlob);
5657

5758
characterState = controller.GetCharacterState();
5859
animationController.SetupCharacterState(characterState);
Lines changed: 3 additions & 0 deletions
Loading

unity-renderer/Assets/Scripts/MainScripts/DCL/Controllers/CharacterControllerV2/Cursor.png.meta

Lines changed: 171 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)