Skip to content

Commit 3555430

Browse files
KineriusKinerius
committed
Added camera angles that can be toggled with J
1 parent 92a4d22 commit 3555430

File tree

33 files changed

+3638
-887
lines changed

33 files changed

+3638
-887
lines changed

‎unity-renderer/Assets/DCLPlugins/ECS7/ECSComponents/Utils/ProtoConvertUtils.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ public static CameraMode.ModeId PBCameraEnumToUnityEnum(CameraType mode)
7272
case CameraType.CtFirstPerson:
7373
return CameraMode.ModeId.FirstPerson;
7474
case CameraType.CtThirdPerson:
75-
return CameraMode.ModeId.ThirdPerson;
75+
return CameraMode.ModeId.ThirdPersonRight;
7676
default:
7777
return CommonScriptableObjects.cameraMode.Get();
7878
}
@@ -84,7 +84,7 @@ public static CameraType UnityEnumToPBCameraEnum(CameraMode.ModeId mode)
8484
{
8585
case CameraMode.ModeId.FirstPerson:
8686
return CameraType.CtFirstPerson;
87-
case CameraMode.ModeId.ThirdPerson:
87+
case CameraMode.ModeId.ThirdPersonRight:
8888
default:
8989
return CameraType.CtThirdPerson;
9090
}

‎unity-renderer/Assets/DCLPlugins/ECS7/Systems/CameraSystem/Tests/ECSCameraEntitySystemShould.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ public void SendCameraMode()
169169

170170
outgoingMessages.Clear_Calls();
171171

172-
CommonScriptableObjects.cameraMode.Set(CameraMode.ModeId.ThirdPerson);
172+
CommonScriptableObjects.cameraMode.Set(CameraMode.ModeId.ThirdPersonRight);
173173

174174
system.Update();
175175

‎unity-renderer/Assets/Fonts/Fonts Sources/NotoSansJP-SemiBold SDF.asset‎

Lines changed: 37 additions & 10 deletions
Large diffs are not rendered by default.

‎unity-renderer/Assets/Prefabs/Resources/Player.prefab‎

Lines changed: 1 addition & 229 deletions
Original file line numberDiff line numberDiff line change
@@ -246,154 +246,6 @@ PrefabInstance:
246246
m_Modification:
247247
m_TransformParent: {fileID: 326638023455565217}
248248
m_Modifications:
249-
- target: {fileID: 163332511, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
250-
propertyPath: m_LocalPosition.x
251-
value: -0.80036104
252-
objectReference: {fileID: 0}
253-
- target: {fileID: 163332511, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
254-
propertyPath: m_LocalPosition.y
255-
value: 4.994813
256-
objectReference: {fileID: 0}
257-
- target: {fileID: 163332511, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
258-
propertyPath: m_LocalPosition.z
259-
value: 0.8401191
260-
objectReference: {fileID: 0}
261-
- target: {fileID: 573743093, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
262-
propertyPath: m_LocalPosition.y
263-
value: -4.5099936
264-
objectReference: {fileID: 0}
265-
- target: {fileID: 573743093, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
266-
propertyPath: m_LocalPosition.z
267-
value: 0.70707655
268-
objectReference: {fileID: 0}
269-
- target: {fileID: 573743093, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
270-
propertyPath: m_LocalRotation.w
271-
value: 0.94000196
272-
objectReference: {fileID: 0}
273-
- target: {fileID: 573743093, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
274-
propertyPath: m_LocalRotation.x
275-
value: -0.2922378
276-
objectReference: {fileID: 0}
277-
- target: {fileID: 573743093, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
278-
propertyPath: m_LocalRotation.y
279-
value: 0.16495328
280-
objectReference: {fileID: 0}
281-
- target: {fileID: 573743093, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
282-
propertyPath: m_LocalRotation.z
283-
value: -0.061513122
284-
objectReference: {fileID: 0}
285-
- target: {fileID: 573743094, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
286-
propertyPath: m_Lens.m_SensorSize.x
287-
value: 1
288-
objectReference: {fileID: 0}
289-
- target: {fileID: 659778075, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
290-
propertyPath: m_FollowOffset.y
291-
value: 4.5
292-
objectReference: {fileID: 0}
293-
- target: {fileID: 659778075, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
294-
propertyPath: m_FollowOffset.z
295-
value: -1
296-
objectReference: {fileID: 0}
297-
- target: {fileID: 989669553, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
298-
propertyPath: m_FollowOffset.y
299-
value: 4.5
300-
objectReference: {fileID: 0}
301-
- target: {fileID: 989669553, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
302-
propertyPath: m_FollowOffset.z
303-
value: -1
304-
objectReference: {fileID: 0}
305-
- target: {fileID: 1128386904, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
306-
propertyPath: m_YAxis.Value
307-
value: 1
308-
objectReference: {fileID: 0}
309-
- target: {fileID: 1128386904, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
310-
propertyPath: m_Lens.m_SensorSize.x
311-
value: 1
312-
objectReference: {fileID: 0}
313-
- target: {fileID: 1128386904, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
314-
propertyPath: m_Orbits.Array.data[0].m_Height
315-
value: 4.5
316-
objectReference: {fileID: 0}
317-
- target: {fileID: 1128386904, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
318-
propertyPath: m_Orbits.Array.data[0].m_Radius
319-
value: 1
320-
objectReference: {fileID: 0}
321-
- target: {fileID: 1128386904, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
322-
propertyPath: m_Orbits.Array.data[1].m_Height
323-
value: 0.65
324-
objectReference: {fileID: 0}
325-
- target: {fileID: 1128386904, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
326-
propertyPath: m_Orbits.Array.data[1].m_Radius
327-
value: 4.5
328-
objectReference: {fileID: 0}
329-
- target: {fileID: 1128386904, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
330-
propertyPath: m_Orbits.Array.data[2].m_Radius
331-
value: 1
332-
objectReference: {fileID: 0}
333-
- target: {fileID: 1404322283, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
334-
propertyPath: m_LocalPosition.y
335-
value: 0
336-
objectReference: {fileID: 0}
337-
- target: {fileID: 1404322283, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
338-
propertyPath: m_LocalPosition.z
339-
value: 0
340-
objectReference: {fileID: 0}
341-
- target: {fileID: 1404322283, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
342-
propertyPath: m_LocalRotation.w
343-
value: 0.96203464
344-
objectReference: {fileID: 0}
345-
- target: {fileID: 1404322283, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
346-
propertyPath: m_LocalRotation.x
347-
value: 0.22253668
348-
objectReference: {fileID: 0}
349-
- target: {fileID: 1404322283, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
350-
propertyPath: m_LocalRotation.y
351-
value: 0.099982336
352-
objectReference: {fileID: 0}
353-
- target: {fileID: 1404322283, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
354-
propertyPath: m_LocalRotation.z
355-
value: -0.1223531
356-
objectReference: {fileID: 0}
357-
- target: {fileID: 1404322284, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
358-
propertyPath: m_Lens.m_SensorSize.x
359-
value: 1
360-
objectReference: {fileID: 0}
361-
- target: {fileID: 1915684162, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
362-
propertyPath: m_FollowOffset.y
363-
value: 4.5
364-
objectReference: {fileID: 0}
365-
- target: {fileID: 1915684162, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
366-
propertyPath: m_FollowOffset.z
367-
value: -1
368-
objectReference: {fileID: 0}
369-
- target: {fileID: 2072030609, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
370-
propertyPath: m_LocalPosition.y
371-
value: 0
372-
objectReference: {fileID: 0}
373-
- target: {fileID: 2072030609, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
374-
propertyPath: m_LocalPosition.z
375-
value: 0
376-
objectReference: {fileID: 0}
377-
- target: {fileID: 2072030609, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
378-
propertyPath: m_LocalRotation.w
379-
value: 0.93190134
380-
objectReference: {fileID: 0}
381-
- target: {fileID: 2072030609, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
382-
propertyPath: m_LocalRotation.x
383-
value: 0.35563514
384-
objectReference: {fileID: 0}
385-
- target: {fileID: 2072030609, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
386-
propertyPath: m_LocalRotation.y
387-
value: 0.0371378
388-
objectReference: {fileID: 0}
389-
- target: {fileID: 2072030609, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
390-
propertyPath: m_LocalRotation.z
391-
value: -0.060863227
392-
objectReference: {fileID: 0}
393-
- target: {fileID: 2072030610, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
394-
propertyPath: m_Lens.m_SensorSize.x
395-
value: 1
396-
objectReference: {fileID: 0}
397249
- target: {fileID: 1379362891393605244, guid: bc570f5e94906eb47814191e0beaee7a,
398250
type: 3}
399251
propertyPath: m_RootOrder
@@ -449,74 +301,12 @@ PrefabInstance:
449301
propertyPath: m_LocalEulerAnglesHint.z
450302
value: 0
451303
objectReference: {fileID: 0}
452-
- target: {fileID: 1526003882666009685, guid: bc570f5e94906eb47814191e0beaee7a,
453-
type: 3}
454-
propertyPath: m_LocalPosition.x
455-
value: -0.80036104
456-
objectReference: {fileID: 0}
457-
- target: {fileID: 1526003882666009685, guid: bc570f5e94906eb47814191e0beaee7a,
458-
type: 3}
459-
propertyPath: m_LocalPosition.y
460-
value: 4.994813
461-
objectReference: {fileID: 0}
462-
- target: {fileID: 1526003882666009685, guid: bc570f5e94906eb47814191e0beaee7a,
463-
type: 3}
464-
propertyPath: m_LocalPosition.z
465-
value: 0.8401191
466-
objectReference: {fileID: 0}
467-
- target: {fileID: 1526003882666009685, guid: bc570f5e94906eb47814191e0beaee7a,
468-
type: 3}
469-
propertyPath: m_LocalRotation.w
470-
value: 0.83844274
471-
objectReference: {fileID: 0}
472-
- target: {fileID: 1526003882666009685, guid: bc570f5e94906eb47814191e0beaee7a,
473-
type: 3}
474-
propertyPath: m_LocalRotation.x
475-
value: 0.52158135
476-
objectReference: {fileID: 0}
477-
- target: {fileID: 1526003882666009685, guid: bc570f5e94906eb47814191e0beaee7a,
478-
type: 3}
479-
propertyPath: m_LocalRotation.y
480-
value: 0.13416672
481-
objectReference: {fileID: 0}
482-
- target: {fileID: 1526003882666009685, guid: bc570f5e94906eb47814191e0beaee7a,
483-
type: 3}
484-
propertyPath: m_LocalRotation.z
485-
value: -0.08346289
486-
objectReference: {fileID: 0}
487-
- target: {fileID: 3920995719202391552, guid: bc570f5e94906eb47814191e0beaee7a,
488-
type: 3}
489-
propertyPath: m_Follow
490-
value:
491-
objectReference: {fileID: 786950729174411787}
492-
- target: {fileID: 3920995719202391552, guid: bc570f5e94906eb47814191e0beaee7a,
493-
type: 3}
494-
propertyPath: m_Lens.m_SensorSize.x
495-
value: 1
496-
objectReference: {fileID: 0}
497-
- target: {fileID: 4346516745184911389, guid: bc570f5e94906eb47814191e0beaee7a,
498-
type: 3}
499-
propertyPath: overrideInput
500-
value:
501-
objectReference: {fileID: 954399581682607488}
502-
- target: {fileID: 4346516745184911389, guid: bc570f5e94906eb47814191e0beaee7a,
503-
type: 3}
504-
propertyPath: mouseWheelAction
505-
value:
506-
objectReference: {fileID: 11400000, guid: 321d843783c1847a2a90e7e46f44e476,
507-
type: 2}
508304
- target: {fileID: 7362351758441030831, guid: bc570f5e94906eb47814191e0beaee7a,
509305
type: 3}
510306
propertyPath: m_Name
511307
value: CameraController
512308
objectReference: {fileID: 0}
513-
- target: {fileID: 9058585267122995640, guid: bc570f5e94906eb47814191e0beaee7a,
514-
type: 3}
515-
propertyPath: target
516-
value:
517-
objectReference: {fileID: 0}
518-
m_RemovedComponents:
519-
- {fileID: 5137756179740078520, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
309+
m_RemovedComponents: []
520310
m_SourcePrefab: {fileID: 100100000, guid: bc570f5e94906eb47814191e0beaee7a, type: 3}
521311
--- !u!114 &326638022635035865 stripped
522312
MonoBehaviour:
@@ -530,24 +320,6 @@ MonoBehaviour:
530320
m_Script: {fileID: 11500000, guid: 319d2fe34a804e245819465c9505ea59, type: 3}
531321
m_Name:
532322
m_EditorClassIdentifier:
533-
--- !u!4 &786950729174411787 stripped
534-
Transform:
535-
m_CorrespondingSourceObject: {fileID: 1036879088249284490, guid: bc570f5e94906eb47814191e0beaee7a,
536-
type: 3}
537-
m_PrefabInstance: {fileID: 326638023721471361}
538-
m_PrefabAsset: {fileID: 0}
539-
--- !u!114 &954399581682607488 stripped
540-
MonoBehaviour:
541-
m_CorrespondingSourceObject: {fileID: 699965395904555009, guid: bc570f5e94906eb47814191e0beaee7a,
542-
type: 3}
543-
m_PrefabInstance: {fileID: 326638023721471361}
544-
m_PrefabAsset: {fileID: 0}
545-
m_GameObject: {fileID: 0}
546-
m_Enabled: 1
547-
m_EditorHideFlags: 0
548-
m_Script: {fileID: 11500000, guid: 53dcbf5be5df4a299e84e111796164c7, type: 3}
549-
m_Name:
550-
m_EditorClassIdentifier:
551323
--- !u!4 &1705747913488126973 stripped
552324
Transform:
553325
m_CorrespondingSourceObject: {fileID: 1379362891393605244, guid: bc570f5e94906eb47814191e0beaee7a,

‎unity-renderer/Assets/Rendering/ProceduralSkybox/ShaderProceduralSkybox/M_Skybox02.mat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ Material:
350350
- _horizonMaskValues: {r: 0, g: 0, b: 0, a: 0}
351351
- _horizonPlaneColor: {r: 0.38893938, g: 0.4288591, b: 0.2993215, a: 1}
352352
- _horizonPlaneValues: {r: 0, g: 0, b: 0, a: 0}
353-
- _lightDirection: {r: 51.19924, g: 134.9999, b: 90.00013, a: 0}
353+
- _lightDirection: {r: 356.18976, g: 134.99998, b: 90, a: 0}
354354
- _lightTint: {r: 0.8318454, g: 0.6150512, b: 0.31468695, a: 1}
355355
- _particlesMainParameters_0: {r: 0, g: 0, b: 0, a: 0}
356356
- _particlesMainParameters_1: {r: 0, g: 0, b: 0, a: 0}

‎unity-renderer/Assets/Rendering/UI/ChargeWheel/M_ChargeBarV2.mat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Material:
5151
- _StencilOp: 0
5252
- _StencilReadMask: 255
5353
- _StencilWriteMask: 255
54-
- _fillHead: 0.4463196
54+
- _fillHead: 1
5555
- _fillTail: 0
5656
- _fillTails: 0.5
5757
m_Colors:

‎unity-renderer/Assets/Rendering/UI/ChargeWheel/M_ChargeBarV2Thicker.mat‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ Material:
5151
- _StencilOp: 0
5252
- _StencilReadMask: 255
5353
- _StencilWriteMask: 255
54-
- _fillHead: 0.2998311
54+
- _fillHead: 0.28495982
5555
- _fillTail: 0
5656
- _fillTails: 0.5
5757
m_Colors:

‎unity-renderer/Assets/Scripts/MainScripts/DCL/Components/CameraModeArea/CameraModeArea.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public class Area
2323
}
2424

2525
public Area area = new ();
26-
public CameraMode.ModeId cameraMode = CameraMode.ModeId.ThirdPerson;
26+
public CameraMode.ModeId cameraMode = CameraMode.ModeId.ThirdPersonRight;
2727

2828
public override BaseModel GetDataFromJSON(string json) =>
2929
Utils.SafeFromJson<Model>(json);
@@ -48,7 +48,7 @@ public override BaseModel GetDataFromPb(ComponentBodyPayload pbModel)
4848

4949
private Collider playerCollider;
5050
internal IUpdateEventHandler updateEventHandler;
51-
internal int validCameraModes = 1 << (int)CameraMode.ModeId.FirstPerson | 1 << (int)CameraMode.ModeId.ThirdPerson;
51+
internal int validCameraModes = 1 << (int)CameraMode.ModeId.FirstPerson | 1 << (int)CameraMode.ModeId.ThirdPersonRight;
5252

5353
internal bool isPlayerInside = false;
5454

‎unity-renderer/Assets/Scripts/MainScripts/DCL/Components/CameraModeArea/Tests/CameraModeAreaShould.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ public void WorkCorrectlyWithAreasInsideAreas()
216216

217217
Vector3 smallAreaSize = new Vector3(1, 1, 1);
218218
Vector3 smallAreaPos = (bigAreaPos + Vector3.right * bigAreaSize.x * 0.5f) + Vector3.left * smallAreaSize.x * 0.5f;
219-
const CameraMode.ModeId smallAreaMode = CameraMode.ModeId.ThirdPerson;
219+
const CameraMode.ModeId smallAreaMode = CameraMode.ModeId.ThirdPersonRight;
220220

221221
CameraModeArea bigArea = CreateArea(bigAreaPos, bigAreaSize, bigAreaMode);
222222
CameraModeArea mediumArea = CreateArea(mediumAreaPos, mediumAreaSize, mediumAreaMode);

‎unity-renderer/Assets/Scripts/MainScripts/DCL/Components/CameraModeArea/Tests/CameraModeAreasControllerShould.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public void ApplyTriggersPrioritiesCorrectly()
2222
{
2323
CameraMode.ModeId.FirstPerson,
2424
CameraMode.ModeId.BuildingToolGodMode,
25-
CameraMode.ModeId.ThirdPerson
25+
CameraMode.ModeId.ThirdPersonRight
2626
};
2727

2828
ICameraModeArea[] areas = new ICameraModeArea[modes.Length];
@@ -85,9 +85,9 @@ public void UpdateComponentModeCorrectly()
8585
Assert.AreEqual(CameraMode.ModeId.FirstPerson, CommonScriptableObjects.cameraMode.Get());
8686
Assert.IsTrue(CommonScriptableObjects.cameraModeInputLocked.Get());
8787

88-
areas[1].cameraMode.Returns( CameraMode.ModeId.ThirdPerson);
88+
areas[1].cameraMode.Returns( CameraMode.ModeId.ThirdPersonRight);
8989
controller.ChangeAreaMode(areas[1]);
90-
Assert.AreEqual(CameraMode.ModeId.ThirdPerson, CommonScriptableObjects.cameraMode.Get());
90+
Assert.AreEqual(CameraMode.ModeId.ThirdPersonRight, CommonScriptableObjects.cameraMode.Get());
9191
Assert.IsTrue(CommonScriptableObjects.cameraModeInputLocked.Get());
9292
areas[1].cameraMode.Returns(CameraMode.ModeId.FirstPerson);
9393

0 commit comments

Comments
 (0)