diff --git a/Assets/Animations/Camera/Round 1 Cameras/Opening.anim b/Assets/Animations/Camera/Round 1 Cameras/Opening.anim index 0cbea2c..cb57c6a 100644 --- a/Assets/Animations/Camera/Round 1 Cameras/Opening.anim +++ b/Assets/Animations/Camera/Round 1 Cameras/Opening.anim @@ -138,35 +138,35 @@ AnimationClip: time: 0.6666667 value: 0 inSlope: 0 - outSlope: 0 - tangentMode: 136 + outSlope: 3.0000002 + tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1 value: 1 - inSlope: 0 + inSlope: 3.0000002 outSlope: 0 - tangentMode: 136 + tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 3.1666667 value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: -0 + outSlope: -3.0000007 + tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 3.5 value: 0 - inSlope: 0 + inSlope: -3.0000007 outSlope: 0 - tangentMode: 136 + tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -372,35 +372,35 @@ AnimationClip: time: 0.6666667 value: 0 inSlope: 0 - outSlope: 0 - tangentMode: 136 + outSlope: 3.0000002 + tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 1 value: 1 - inSlope: 0 + inSlope: 3.0000002 outSlope: 0 - tangentMode: 136 + tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 3.1666667 value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + inSlope: -0 + outSlope: -3.0000007 + tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 3.5 value: 0 - inSlope: 0 + inSlope: -3.0000007 outSlope: 0 - tangentMode: 136 + tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 diff --git a/Assets/Animations/Camera/Round 3 Cameras/Do It Rockapella.anim b/Assets/Animations/Camera/Round 3 Cameras/Do It Rockapella.anim index 80f86e6..af4bf98 100644 --- a/Assets/Animations/Camera/Round 3 Cameras/Do It Rockapella.anim +++ b/Assets/Animations/Camera/Round 3 Cameras/Do It Rockapella.anim @@ -65,38 +65,33 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: Overhead Camera Anchor - m_ScaleCurves: [] - m_FloatCurves: - - serializedVersion: 2 - curve: + m_ScaleCurves: + - curve: serializedVersion: 2 m_Curve: - serializedVersion: 3 time: 0 - value: 8 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + value: {x: 1, y: 1, z: 0.22346} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 2 - value: 35.8 - inSlope: 0 - outSlope: 0 - tangentMode: 136 + value: {x: 1, y: 1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - attribute: field of view - path: Overhead Camera Anchor/Camera 3 - classID: 20 - script: {fileID: 0} - flags: 0 + path: Overhead Camera Anchor/Camera Root + m_FloatCurves: [] m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -124,11 +119,11 @@ AnimationClip: isIntCurve: 0 isSerializeReferenceCurve: 0 - serializedVersion: 2 - path: 1300112320 - attribute: 3138646591 + path: 317110899 + attribute: 3 script: {fileID: 0} - typeID: 20 - customType: 37 + typeID: 4 + customType: 0 isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 @@ -154,36 +149,6 @@ AnimationClip: m_HeightFromFeet: 0 m_Mirror: 0 m_EditorCurves: - - serializedVersion: 2 - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 8 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 2 - value: 35.8 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: field of view - path: Overhead Camera Anchor/Camera 3 - classID: 20 - script: {fileID: 0} - flags: 0 - serializedVersion: 2 curve: serializedVersion: 2 @@ -364,6 +329,96 @@ AnimationClip: classID: 4 script: {fileID: 0} flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: Overhead Camera Anchor/Camera Root + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: Overhead Camera Anchor/Camera Root + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.22346 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: Overhead Camera Anchor/Camera Root + classID: 4 + script: {fileID: 0} + flags: 0 m_EulerEditorCurves: - serializedVersion: 2 curve: diff --git a/Assets/Animations/Camera/Round 3 Cameras/I Feel Good.anim b/Assets/Animations/Camera/Round 3 Cameras/I Feel Good.anim index 62feedf..ac7870e 100644 --- a/Assets/Animations/Camera/Round 3 Cameras/I Feel Good.anim +++ b/Assets/Animations/Camera/Round 3 Cameras/I Feel Good.anim @@ -83,7 +83,23 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: Overhead Camera Anchor - m_ScaleCurves: [] + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: Overhead Camera Anchor/Camera Root m_FloatCurves: [] m_PPtrCurves: [] m_SampleRate: 60 @@ -111,6 +127,15 @@ AnimationClip: isPPtrCurve: 0 isIntCurve: 0 isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 317110899 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -367,6 +392,69 @@ AnimationClip: classID: 4 script: {fileID: 0} flags: 16 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: Overhead Camera Anchor/Camera Root + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: Overhead Camera Anchor/Camera Root + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: Overhead Camera Anchor/Camera Root + classID: 4 + script: {fileID: 0} + flags: 0 m_EulerEditorCurves: - serializedVersion: 2 curve: diff --git a/Assets/Animations/The Chase/Ooh, The Chase~.anim b/Assets/Animations/The Chase/Ooh, The Chase~.anim index a232c8a..de76c1c 100644 --- a/Assets/Animations/The Chase/Ooh, The Chase~.anim +++ b/Assets/Animations/The Chase/Ooh, The Chase~.anim @@ -29,9 +29,9 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.33333334 - value: {x: -3.299, y: 1.04, z: 6.327} - inSlope: {x: 0, y: 0, z: 0} - outSlope: {x: 0, y: 0, z: 0} + value: {x: -2.27, y: 0.2, z: 5.42} + inSlope: {x: 2.122826, y: -0.92608696, z: -1.8508697} + outSlope: {x: 2.122826, y: -0.92608696, z: -1.8508697} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -39,11 +39,11 @@ AnimationClip: - serializedVersion: 3 time: 1.5333333 value: {x: -0.044, y: -0.38, z: 3.489} - inSlope: {x: 13.865665, y: 0, z: 0} - outSlope: {x: 13.865665, y: 0, z: 0} + inSlope: {x: 4.0082116, y: 0, z: 0} + outSlope: {x: 9.745956, y: 0, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.08974801, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0.37609997, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1.6666666 @@ -92,7 +92,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 3.3 - value: {x: 0, y: -0.38, z: 3.49} + value: {x: -0.329, y: -0.381, z: 3.48} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -101,7 +101,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 3.4 - value: {x: 0.909, y: -0.336, z: 3.653} + value: {x: 0.284, y: -0.338, z: 3.635} inSlope: {x: 2.3713043, y: 0.1147826, z: 0.4252177} outSlope: {x: 5.432757, y: 0.38916695, z: 0.6304357} tangentMode: 0 @@ -110,7 +110,7 @@ AnimationClip: outWeight: {x: 0.1313459, y: 0.13725291, z: 0.13725291} - serializedVersion: 3 time: 4.8333335 - value: {x: 6.81, y: 3.12, z: 11.77} + value: {x: 5.26, y: 3.12, z: 11.72} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -146,11 +146,11 @@ AnimationClip: - serializedVersion: 3 time: 1.5333333 value: {x: 1, y: 1, z: 1} - inSlope: {x: 0, y: 1.0125, z: 0} + inSlope: {x: 1.9979328, y: 1.0125, z: 0} outSlope: {x: -14.01605, y: 1.0125, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0.10389527, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.57070005, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 1.6666666 @@ -209,8 +209,17 @@ AnimationClip: - serializedVersion: 3 time: 4.1666665 value: {x: 0.23, y: 1, z: 1} - inSlope: {x: -0.657143, y: 0, z: 0} - outSlope: {x: -0.657143, y: 0, z: 0} + inSlope: {x: -1.0615386, y: 0, z: 0} + outSlope: {x: -1.0615386, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 4.3 + value: {x: 0, y: 0.89599955, z: 0.89599955} + inSlope: {x: 0, y: -1.4400017, z: -1.4400017} + outSlope: {x: 0, y: -1.4400017, z: -1.4400017} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -254,11 +263,11 @@ AnimationClip: - serializedVersion: 3 time: 1.5333333 value: 0 - inSlope: 0 + inSlope: -180.3934 outSlope: 0 - tangentMode: 136 + tangentMode: 1 weightedMode: 0 - inWeight: 0.33333334 + inWeight: 0.11665484 outWeight: 0.33333334 - serializedVersion: 3 time: 1.6666666 @@ -346,7 +355,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1.6666666 - value: 0 + value: 1.21 inSlope: -3.3436704 outSlope: -3.3436704 tangentMode: 0 @@ -355,13 +364,22 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1.8333334 - value: 0 + value: -0.46 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.9666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 2.25 value: 0 @@ -432,62 +450,62 @@ AnimationClip: time: 0.33333334 value: -1.23 inSlope: -2.34 - outSlope: 3.757948 + outSlope: 1.6159433 tangentMode: 5 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.0801749 + outWeight: 0.11623818 - serializedVersion: 3 time: 1.5333333 value: 0 - inSlope: 1.27063 - outSlope: 1.27063 - tangentMode: 0 + inSlope: 0.51066005 + outSlope: 0 + tangentMode: 65 weightedMode: 0 - inWeight: 0.083308734 + inWeight: 0.22015592 outWeight: 0.33333334 - serializedVersion: 3 time: 1.6666666 value: 0 - inSlope: 1.27063 - outSlope: 1.27063 - tangentMode: 0 + inSlope: -0 + outSlope: 0 + tangentMode: 69 weightedMode: 0 inWeight: 0.083308734 outWeight: 0.33333334 - serializedVersion: 3 time: 1.8333334 value: 0 - inSlope: 0 + inSlope: -0 outSlope: 0 - tangentMode: 136 + tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 2.25 value: 0 - inSlope: 1.27063 - outSlope: 1.27063 - tangentMode: 0 + inSlope: -0 + outSlope: 0 + tangentMode: 69 weightedMode: 0 inWeight: 0.083308734 outWeight: 0.33333334 - serializedVersion: 3 time: 2.6666667 value: 0 - inSlope: 0 + inSlope: -0 outSlope: 0 - tangentMode: 136 + tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 2.9166667 value: 0 - inSlope: 1.27063 - outSlope: 1.27063 - tangentMode: 0 + inSlope: -0 + outSlope: 0 + tangentMode: 69 weightedMode: 0 inWeight: 0.083308734 outWeight: 0.33333334 @@ -496,7 +514,7 @@ AnimationClip: value: 0 inSlope: 0 outSlope: 0 - tangentMode: 136 + tangentMode: 1 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -716,6 +734,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 1.6666666 value: 0 @@ -907,9 +934,9 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 - value: -3.299 - inSlope: 0 - outSlope: 0 + value: -2.27 + inSlope: 2.122826 + outSlope: 2.122826 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 @@ -917,11 +944,11 @@ AnimationClip: - serializedVersion: 3 time: 1.5333333 value: -0.044 - inSlope: 13.865665 - outSlope: 13.865665 - tangentMode: 0 + inSlope: 4.0082116 + outSlope: 9.745956 + tangentMode: 1 weightedMode: 0 - inWeight: 0.08974801 + inWeight: 0.37609997 outWeight: 0.33333334 - serializedVersion: 3 time: 1.6666666 @@ -970,7 +997,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 3.3 - value: 0 + value: -0.329 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -979,7 +1006,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 3.4 - value: 0.909 + value: 0.284 inSlope: 2.3713043 outSlope: 5.432757 tangentMode: 1 @@ -988,7 +1015,7 @@ AnimationClip: outWeight: 0.1313459 - serializedVersion: 3 time: 4.8333335 - value: 6.81 + value: 5.26 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1018,9 +1045,9 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 - value: 1.04 - inSlope: 0 - outSlope: 0 + value: 0.2 + inSlope: -0.92608696 + outSlope: -0.92608696 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 @@ -1081,7 +1108,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 3.3 - value: -0.38 + value: -0.381 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1090,7 +1117,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 3.4 - value: -0.336 + value: -0.338 inSlope: 0.1147826 outSlope: 0.38916695 tangentMode: 1 @@ -1129,9 +1156,9 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.33333334 - value: 6.327 - inSlope: 0 - outSlope: 0 + value: 5.42 + inSlope: -1.8508697 + outSlope: -1.8508697 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 @@ -1192,7 +1219,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 3.3 - value: 3.49 + value: 3.48 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1201,7 +1228,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 3.4 - value: 3.653 + value: 3.635 inSlope: 0.4252177 outSlope: 0.6304357 tangentMode: 1 @@ -1210,7 +1237,7 @@ AnimationClip: outWeight: 0.13725291 - serializedVersion: 3 time: 4.8333335 - value: 11.77 + value: 11.72 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -1250,11 +1277,11 @@ AnimationClip: - serializedVersion: 3 time: 1.5333333 value: 0 - inSlope: 0 + inSlope: -180.3934 outSlope: 0 - tangentMode: 136 + tangentMode: 1 weightedMode: 0 - inWeight: 0.33333334 + inWeight: 0.11665484 outWeight: 0.33333334 - serializedVersion: 3 time: 1.6666666 @@ -1342,7 +1369,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1.6666666 - value: 0 + value: 1.21 inSlope: -3.3436704 outSlope: -3.3436704 tangentMode: 0 @@ -1351,13 +1378,22 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 1.8333334 - value: 0 + value: -0.46 inSlope: 0 outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.9666667 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 2.25 value: 0 @@ -1428,62 +1464,62 @@ AnimationClip: time: 0.33333334 value: -1.23 inSlope: -2.34 - outSlope: 3.757948 + outSlope: 1.6159433 tangentMode: 5 weightedMode: 0 inWeight: 0.33333334 - outWeight: 0.0801749 + outWeight: 0.11623818 - serializedVersion: 3 time: 1.5333333 value: 0 - inSlope: 1.27063 - outSlope: 1.27063 - tangentMode: 0 + inSlope: 0.51066005 + outSlope: 0 + tangentMode: 65 weightedMode: 0 - inWeight: 0.083308734 + inWeight: 0.22015592 outWeight: 0.33333334 - serializedVersion: 3 time: 1.6666666 value: 0 - inSlope: 1.27063 - outSlope: 1.27063 - tangentMode: 0 + inSlope: -0 + outSlope: 0 + tangentMode: 69 weightedMode: 0 inWeight: 0.083308734 outWeight: 0.33333334 - serializedVersion: 3 time: 1.8333334 value: 0 - inSlope: 0 + inSlope: -0 outSlope: 0 - tangentMode: 136 + tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 2.25 value: 0 - inSlope: 1.27063 - outSlope: 1.27063 - tangentMode: 0 + inSlope: -0 + outSlope: 0 + tangentMode: 69 weightedMode: 0 inWeight: 0.083308734 outWeight: 0.33333334 - serializedVersion: 3 time: 2.6666667 value: 0 - inSlope: 0 + inSlope: -0 outSlope: 0 - tangentMode: 136 + tangentMode: 69 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 time: 2.9166667 value: 0 - inSlope: 1.27063 - outSlope: 1.27063 - tangentMode: 0 + inSlope: -0 + outSlope: 0 + tangentMode: 69 weightedMode: 0 inWeight: 0.083308734 outWeight: 0.33333334 @@ -1492,7 +1528,7 @@ AnimationClip: value: 0 inSlope: 0 outSlope: 0 - tangentMode: 136 + tangentMode: 1 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 @@ -1724,11 +1760,11 @@ AnimationClip: - serializedVersion: 3 time: 1.5333333 value: 1 - inSlope: 0 + inSlope: 1.9979328 outSlope: -14.01605 tangentMode: 1 weightedMode: 0 - inWeight: 0.33333334 + inWeight: 0.10389527 outWeight: 0.57070005 - serializedVersion: 3 time: 1.6666666 @@ -1787,8 +1823,17 @@ AnimationClip: - serializedVersion: 3 time: 4.1666665 value: 0.23 - inSlope: -0.657143 - outSlope: -0.657143 + inSlope: -1.0615386 + outSlope: -1.0615386 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4.3 + value: 0 + inSlope: 0 + outSlope: 0 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 @@ -2027,6 +2072,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5333333 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 1.6666666 value: 0 diff --git a/Assets/Materials/M_ScreenNoise.mat b/Assets/Materials/M_ScreenNoise.mat index 9887578..a589440 100644 --- a/Assets/Materials/M_ScreenNoise.mat +++ b/Assets/Materials/M_ScreenNoise.mat @@ -45,8 +45,8 @@ Material: m_Offset: {x: 0, y: 0} - _MainTex: m_Texture: {fileID: 2800000, guid: cb072d3765e9cf443b3c71b63f2c4b9c, type: 3} - m_Scale: {x: 0.1, y: 0.1} - m_Offset: {x: 0, y: 0} + m_Scale: {x: 0.25, y: 0.25} + m_Offset: {x: -512, y: 128} - _MetallicGlossMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} diff --git a/Assets/Materials/M_TheChaseBillboard.mat b/Assets/Materials/M_TheChaseBillboard.mat index 0f878ef..9032566 100644 --- a/Assets/Materials/M_TheChaseBillboard.mat +++ b/Assets/Materials/M_TheChaseBillboard.mat @@ -96,9 +96,11 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _Flip: {r: 1, g: 1, b: 1, a: 1} - _LeftColour: {r: 1, g: 1, b: 0.78431374, a: 1} + - _LeftLineColour: {r: 0.19607843, g: 0.19607843, b: 0, a: 1} - _LineColour: {r: 0, g: 0, b: 0, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1} - _RightColour: {r: 1, g: 0.39215687, b: 0, a: 1} + - _RightLineColour: {r: 0.19607843, g: 0.078431375, b: 0, a: 1} - _Scale: {r: 1, g: 1, b: 0, a: 0} - _ScaleAndSkew: {r: 1, g: 1, b: 0, a: 0} - _Skew: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Prefabs/Camera Anchor.prefab b/Assets/Prefabs/Camera Anchor.prefab index eeb7fac..94f4420 100644 --- a/Assets/Prefabs/Camera Anchor.prefab +++ b/Assets/Prefabs/Camera Anchor.prefab @@ -1,5 +1,36 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1761436705912035902 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6802575006468162178} + m_Layer: 22 + m_Name: Camera Root + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6802575006468162178 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1761436705912035902} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5462889507286591849} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4175776851245093875 GameObject: m_ObjectHideFlags: 0 @@ -30,7 +61,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 6802575006468162178} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1360612188282181879 @@ -56,7 +88,10 @@ MonoBehaviour: SerializationNodes: [] _udonSharpBackingUdonBehaviour: {fileID: 4941474114823655580} FOV: 60 + NearClippingPlane: 0.3 FarClippingPlane: 1000 + CameraRoot: {fileID: 6802575006468162178} + FOVChangeObject: {fileID: 0} --- !u!114 &4941474114823655580 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 53de6ff..fd18c63 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -11835,6 +11835,11 @@ PrefabInstance: propertyPath: FarClippingPlane value: 28 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 0.03 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: serializationData.Prefab @@ -13442,6 +13447,11 @@ PrefabInstance: propertyPath: FarClippingPlane value: 28 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 0.03 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: serializationData.Prefab @@ -14231,6 +14241,11 @@ PrefabInstance: propertyPath: FarClippingPlane value: 28 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 0.03 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: serializationData.Prefab @@ -15239,6 +15254,11 @@ PrefabInstance: propertyPath: FarClippingPlane value: 28 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 0.03 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: serializationData.Prefab @@ -17352,6 +17372,11 @@ PrefabInstance: propertyPath: FarClippingPlane value: 28 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 0.03 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: serializationData.Prefab @@ -17442,7 +17467,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 307419630495019032, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} - target: {fileID: 407602586891760847, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_Enabled @@ -17457,7 +17483,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 879219473364115229, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} - target: {fileID: 1340351174269024408, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: volumeTrigger @@ -17493,7 +17520,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 2558719919891730038, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} - target: {fileID: 2585420374601623244, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_Name @@ -17508,7 +17536,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 3212071530946994482, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} - target: {fileID: 3809294410070927801, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_Materials.Array.data[0] @@ -17614,7 +17643,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -30699,6 +30729,11 @@ PrefabInstance: propertyPath: FarClippingPlane value: 28 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 0.03 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: serializationData.Prefab @@ -32912,6 +32947,11 @@ PrefabInstance: propertyPath: FarClippingPlane value: 28 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 0.03 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: serializationData.Prefab @@ -33263,6 +33303,11 @@ PrefabInstance: propertyPath: FarClippingPlane value: 28 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 0.03 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: serializationData.Prefab @@ -35855,12 +35900,12 @@ PrefabInstance: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FOV - value: 10 + value: 30 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 8 + value: 12 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -35876,37 +35921,37 @@ PrefabInstance: - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.x - value: 4.767739 + value: 5.1816745 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.y - value: 1.49 + value: 2.227 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.z - value: -3.1127365 + value: -5.875307 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.w - value: 0.6755904 + value: -0.76493686 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: -0.027404279 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.y - value: 0.7372772 + value: -0.6431094 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0.023039734 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -35916,7 +35961,7 @@ PrefabInstance: - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 150 + value: 180 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -35982,6 +36027,11 @@ PrefabInstance: propertyPath: FarClippingPlane value: 28 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 0.03 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: serializationData.Prefab @@ -37055,86 +37105,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1534889732} m_PrefabAsset: {fileID: 0} ---- !u!1001 &647022020 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 966631265} - m_Modifications: - - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - propertyPath: FOV - value: 13 - objectReference: {fileID: 0} - - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - propertyPath: FarClippingPlane - value: 30 - objectReference: {fileID: 0} - - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - - target: {fileID: 4175776851245093875, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - propertyPath: m_Name - value: Modem Camera Anchor - objectReference: {fileID: 0} - - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - propertyPath: m_LocalPosition.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - propertyPath: m_LocalPosition.y - value: 1.81 - objectReference: {fileID: 0} - - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - propertyPath: m_LocalPosition.z - value: 12.515 - objectReference: {fileID: 0} - - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - propertyPath: m_LocalRotation.w - value: 0.00000019470718 - objectReference: {fileID: 0} - - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - propertyPath: m_LocalRotation.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} ---- !u!4 &647022021 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - m_PrefabInstance: {fileID: 647022020} - m_PrefabAsset: {fileID: 0} --- !u!1 &648149265 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8341718854610640972, guid: 126991d511ca61841a0ef899b6c038a6, @@ -39106,11 +39076,7 @@ PrefabInstance: objectReference: {fileID: 966631269} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 6538633228974114170, guid: 597de72e4385c0d498ba1475ac5ef4f7, - type: 3} - insertIndex: -1 - addedObject: {fileID: 1358503112} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 597de72e4385c0d498ba1475ac5ef4f7, type: 3} --- !u!114 &709364350 stripped @@ -41351,6 +41317,38 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1042026143} m_PrefabAsset: {fileID: 0} +--- !u!1 &758768598 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 758768599} + m_Layer: 0 + m_Name: Alternate Camera Anchors + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &758768599 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 758768598} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1358503112} + m_Father: {fileID: 1967712740} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &759078070 stripped GameObject: m_CorrespondingSourceObject: {fileID: 9006868906988065029, guid: 899ce13087fd5974f88dcbccaea2df85, @@ -41607,6 +41605,11 @@ PrefabInstance: propertyPath: FarClippingPlane value: 28 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 0.03 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: serializationData.Prefab @@ -42123,6 +42126,11 @@ PrefabInstance: propertyPath: FarClippingPlane value: 28 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 0.03 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: serializationData.Prefab @@ -42393,6 +42401,11 @@ PrefabInstance: propertyPath: FarClippingPlane value: 28 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 0.03 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: serializationData.Prefab @@ -45188,6 +45201,11 @@ PrefabInstance: propertyPath: FarClippingPlane value: 28 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 0.03 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: serializationData.Prefab @@ -45563,6 +45581,11 @@ PrefabInstance: propertyPath: FarClippingPlane value: 28 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 0.03 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: serializationData.Prefab @@ -47723,6 +47746,11 @@ PrefabInstance: propertyPath: FarClippingPlane value: 28 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 0.03 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: serializationData.Prefab @@ -48838,6 +48866,11 @@ PrefabInstance: propertyPath: FarClippingPlane value: 28 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 0.03 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: serializationData.Prefab @@ -50738,12 +50771,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1534889732} m_PrefabAsset: {fileID: 0} ---- !u!1 &1035342647 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 4175776851245093875, guid: b7be9e74a7f7fe24cb526bc367e85829, - type: 3} - m_PrefabInstance: {fileID: 647022020} - m_PrefabAsset: {fileID: 0} --- !u!1 &1035978671 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5603122950512127924, guid: aecb18996fccac6488cfcd38604796da, @@ -58742,6 +58769,11 @@ PrefabInstance: propertyPath: FarClippingPlane value: 28 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 0.03 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: serializationData.Prefab @@ -62860,6 +62892,11 @@ PrefabInstance: propertyPath: FarClippingPlane value: 28 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 0.03 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: serializationData.Prefab @@ -63645,6 +63682,11 @@ PrefabInstance: propertyPath: FarClippingPlane value: 28 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 0.03 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: serializationData.Prefab @@ -64370,6 +64412,11 @@ PrefabInstance: propertyPath: FarClippingPlane value: 28 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 0.03 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: serializationData.Prefab @@ -64666,17 +64713,17 @@ PrefabInstance: serializedVersion: 2 m_Modification: serializedVersion: 3 - m_TransformParent: {fileID: 709364351} + m_TransformParent: {fileID: 758768599} m_Modifications: - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FOV - value: 13 + value: 30 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: FarClippingPlane - value: 30 + value: 12 objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -64687,32 +64734,42 @@ PrefabInstance: - target: {fileID: 4175776851245093875, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_Name - value: Modem Camera Anchor + value: Modem objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -2.0480034 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.y - value: 1.81 + value: 2.227 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalPosition.z - value: 12.515 + value: 7.704004 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.w - value: 0 + value: -0.9232874 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.03307725 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalRotation.y - value: 1 + value: 0.38243777 + objectReference: {fileID: 0} + - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.013701049 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -64722,7 +64779,7 @@ PrefabInstance: - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 180 + value: 0 objectReference: {fileID: 0} - target: {fileID: 5462889507286591849, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} @@ -64870,6 +64927,11 @@ PrefabInstance: propertyPath: FarClippingPlane value: 28 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 0.03 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: serializationData.Prefab @@ -65263,7 +65325,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 307419630495019032, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} - target: {fileID: 407602586891760847, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_Enabled @@ -65278,7 +65341,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 879219473364115229, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} - target: {fileID: 1340351174269024408, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: volumeTrigger @@ -65314,7 +65378,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 2558719919891730038, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} - target: {fileID: 2585420374601623244, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_Name @@ -65329,7 +65394,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 3212071530946994482, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} - target: {fileID: 3809294410070927801, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_Materials.Array.data[0] @@ -65435,7 +65501,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -88479,6 +88546,11 @@ PrefabInstance: propertyPath: FarClippingPlane value: 28 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 0.03 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: serializationData.Prefab @@ -89315,6 +89387,11 @@ PrefabInstance: propertyPath: FarClippingPlane value: 28 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 0.03 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: serializationData.Prefab @@ -92972,6 +93049,7 @@ Transform: - {fileID: 1922829038} - {fileID: 1670138122} - {fileID: 1931140525} + - {fileID: 758768599} m_Father: {fileID: 1451322102} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1968326128 stripped @@ -93800,6 +93878,11 @@ PrefabInstance: propertyPath: FarClippingPlane value: 28 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 0.03 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: serializationData.Prefab @@ -93896,7 +93979,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 307419630495019032, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} - target: {fileID: 407602586891760847, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_Enabled @@ -93911,7 +93995,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 879219473364115229, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} - target: {fileID: 1340351174269024408, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: volumeTrigger @@ -93947,7 +94032,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 2558719919891730038, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} - target: {fileID: 2585420374601623244, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_Name @@ -93962,7 +94048,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 3212071530946994482, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} - target: {fileID: 3809294410070927801, guid: fac4aa7abd3ecbe44a9eaf7f05275244, type: 3} propertyPath: m_Materials.Array.data[0] @@ -94068,7 +94155,8 @@ PrefabInstance: type: 3} propertyPath: serializationData.Prefab value: - objectReference: {fileID: 0} + objectReference: {fileID: 8896942705519841538, guid: fac4aa7abd3ecbe44a9eaf7f05275244, + type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -94642,6 +94730,11 @@ PrefabInstance: propertyPath: FarClippingPlane value: 28 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 0.03 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: serializationData.Prefab @@ -96690,6 +96783,11 @@ PrefabInstance: propertyPath: FarClippingPlane value: 28 objectReference: {fileID: 0} + - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, + type: 3} + propertyPath: NearClippingPlane + value: 0.03 + objectReference: {fileID: 0} - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829, type: 3} propertyPath: serializationData.Prefab @@ -101030,11 +101128,7 @@ PrefabInstance: objectReference: {fileID: 1034723246} m_RemovedComponents: [] m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 6538633228974114170, guid: 597de72e4385c0d498ba1475ac5ef4f7, - type: 3} - insertIndex: -1 - addedObject: {fileID: 647022021} + m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 597de72e4385c0d498ba1475ac5ef4f7, type: 3} --- !u!114 &3231720197660963110 @@ -108087,7 +108181,7 @@ MonoBehaviour: ID: 117 SerializedTypeNames: - VRC.Udon.UdonBehaviour - - gameObject: {fileID: 1035342647} + - gameObject: {fileID: 0} ID: 118 SerializedTypeNames: - VRC.Udon.UdonBehaviour diff --git a/Assets/Shaders/Billboard.shader b/Assets/Shaders/Billboard.shader index 723845b..37523a1 100644 --- a/Assets/Shaders/Billboard.shader +++ b/Assets/Shaders/Billboard.shader @@ -14,7 +14,7 @@ Shader "Carmen/Logo" Properties { _MainTex ("Logo Image", 2D) = "white" {} - _Tint ("Tint", Color) = (1.0, 1.0, 1.0, 1.0) + _Color ("Colour", Color) = (1.0, 1.0, 1.0, 1.0) [ShowAsVector2] _Skew ("Scale And Skew", Vector) = (0.0, 0.0, 0.0, 0.0) } @@ -38,7 +38,7 @@ Shader "Carmen/Logo" UNITY_DECLARE_TEX2D(_MainTex); UNITY_DECLARE_TEX2D(_FadeMask); - half4 _Tint; + half4 _Color; half4 _Skew; struct Data @@ -74,7 +74,7 @@ Shader "Carmen/Logo" fixed4 frag(V2F i) : SV_TARGET { - return UNITY_SAMPLE_TEX2D(_MainTex, i.uv) * _Tint; + return UNITY_SAMPLE_TEX2D(_MainTex, i.uv) * _Color; } ENDCG } diff --git a/Assets/Shaders/SDF The Chase.shader b/Assets/Shaders/SDF The Chase.shader index adec2db..febbce7 100644 --- a/Assets/Shaders/SDF The Chase.shader +++ b/Assets/Shaders/SDF The Chase.shader @@ -20,7 +20,8 @@ Shader "Carmen/SDF/The Chase" _LeftColour ("Left Colour", Color) = (1.0, 0.0, 0.0, 1.0) _RightColour ("Right Colour", Color) = (0.0, 0.0, 1.0, 1.0) - _LineColour ("Line Colour", Color) = (0.0, 0.0, 0.0, 1.0) + _LeftLineColour ("Left Line Colour", Color) = (0.0, 0.0, 0.0, 1.0) + _RightLineColour ("Right Line Colour", Color) = (0.0, 0.0, 0.0, 1.0) _LineThickness ("Line Thickness", float) = 0.25 } SubShader @@ -31,8 +32,8 @@ Shader "Carmen/SDF/The Chase" Pass { Cull Back Lighting Off - ZWrite Off - ZTest Always + //ZWrite Off + //ZTest Always CGPROGRAM #include "UnityCG.cginc" @@ -47,7 +48,8 @@ Shader "Carmen/SDF/The Chase" half4 _LeftColour; half4 _RightColour; - half4 _LineColour; + half4 _LeftLineColour; + half4 _RightLineColour; float _LineThickness; struct Data @@ -95,9 +97,10 @@ Shader "Carmen/SDF/The Chase" if (alphastep < 0.5) discard; half linestep = step(texsample, 0.1); + half uvrange = i.uv.x % 1.0; return lerp( - _LineColour, - lerp(_LeftColour, _RightColour, i.uv.x % 1.0), + lerp(_LeftLineColour, _RightLineColour, uvrange), + lerp(_LeftColour, _RightColour, uvrange), linestep); } ENDCG diff --git a/Assets/Shaders/ScreenUV.shader b/Assets/Shaders/ScreenUV.shader index c31405c..6189ceb 100644 --- a/Assets/Shaders/ScreenUV.shader +++ b/Assets/Shaders/ScreenUV.shader @@ -1,4 +1,4 @@ -Shader "Custom/ScreenNoise" +Shader "Custom/ScreenFill" { Properties { @@ -21,6 +21,7 @@ #pragma fragment frag sampler2D _MainTex; + float4 _MainTex_ST; CBUFFER_START(UnityPerMaterial) uniform float4 _Colour1; @@ -30,28 +31,29 @@ struct Data { float4 vertex : POSITION; - float2 uv : TEXCOORD0; }; struct V2F { float4 position : SV_POSITION; - float4 screenPosition : TEXCOORD0; + float4 screenuv : TEXCOORD0; }; V2F vert(Data v) { V2F o; o.position = UnityObjectToClipPos(v.vertex); - o.screenPosition = ComputeScreenPos(o.position); + o.screenuv = ComputeScreenPos(o.position); return o; } fixed4 frag(V2F i) : SV_TARGET { - float2 textureCoordinate = (i.screenPosition.xy / i.screenPosition.w) + (_Time * 512); - float staticImage = tex2D(_MainTex, textureCoordinate).r; - return lerp(_Colour1, _Colour2, staticImage); + half2 textureCoordinate = ((i.screenuv.xy / i.screenuv.w) % 1.0) * _MainTex_ST.xy; + half coordoffset = (_MainTex_ST.zw * _Time) % 1.0; + textureCoordinate.x += coordoffset; + textureCoordinate.y += coordoffset; + return lerp(_Colour1, _Colour2, tex2D(_MainTex, textureCoordinate).r); } ENDCG } diff --git a/Assets/UdonSharp/Cameras/CameraAnchor.asset b/Assets/UdonSharp/Cameras/CameraAnchor.asset index 62024f5..7a77ba0 100644 --- a/Assets/UdonSharp/Cameras/CameraAnchor.asset +++ b/Assets/UdonSharp/Cameras/CameraAnchor.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 3 + Data: 5 - Name: Entry: 7 Data: @@ -213,6 +213,139 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: CameraRoot + - Name: $v + Entry: 7 + Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: CameraRoot + - Name: k__BackingField + Entry: 7 + Data: 13|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Transform, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 13 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 14|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 3 + - Name: + Entry: 7 + Data: 15|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 16|UnityEngine.TooltipAttribute, UnityEngine.CoreModule + - Name: tooltip + Entry: 1 + Data: Changing the Z scale of this object will change the FOV of the attached + camera. + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 17|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _AttachedCamera + - Name: $v + Entry: 7 + Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _AttachedCamera + - Name: k__BackingField + Entry: 7 + Data: 19|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Camera, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 19 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: diff --git a/Assets/UdonSharp/Cameras/CameraAnchor.cs b/Assets/UdonSharp/Cameras/CameraAnchor.cs index 37cc86a..774304d 100644 --- a/Assets/UdonSharp/Cameras/CameraAnchor.cs +++ b/Assets/UdonSharp/Cameras/CameraAnchor.cs @@ -12,16 +12,38 @@ public class CameraAnchor : UdonSharpBehaviour [SerializeField] private float FOV = 60.0f; [SerializeField] private float NearClippingPlane = 0.3f; [SerializeField] private float FarClippingPlane = 1000.0f; + [Space] + [Tooltip("Changing the Z scale of this object will change the FOV of the attached camera.")] + [SerializeField] private Transform CameraRoot; + + private Camera _AttachedCamera = null; + + + void LateUpdate() + { + if (_AttachedCamera) + { + if (CameraRoot.childCount <= 0) + { + _AttachedCamera = null; + } + else + { + _AttachedCamera.fieldOfView = FOV * CameraRoot.transform.localScale.z; + } + } + } public void AttachCamera(Camera CameraComponent) { - CameraComponent.gameObject.SetActive(true); - CameraComponent.transform.parent = transform; - CameraComponent.fieldOfView = FOV; - CameraComponent.nearClipPlane = NearClippingPlane; - CameraComponent.farClipPlane = FarClippingPlane; - CameraComponent.GetComponent().TeleportToLocalSpace(Vector3.zero, Quaternion.identity, true); + _AttachedCamera = CameraComponent; + _AttachedCamera.gameObject.SetActive(true); + _AttachedCamera.transform.parent = CameraRoot; + _AttachedCamera.fieldOfView = FOV; + _AttachedCamera.nearClipPlane = NearClippingPlane; + _AttachedCamera.farClipPlane = FarClippingPlane; + _AttachedCamera.GetComponent().TeleportToLocalSpace(Vector3.zero, Quaternion.identity, true); } diff --git a/Assets/UdonSharp/Cameras/CameraControllerRound2.cs b/Assets/UdonSharp/Cameras/CameraControllerRound2.cs index a46a5f7..c23f43f 100644 --- a/Assets/UdonSharp/Cameras/CameraControllerRound2.cs +++ b/Assets/UdonSharp/Cameras/CameraControllerRound2.cs @@ -46,6 +46,7 @@ public class CameraControllerRound2 : CameraControllerBase Player2CameraAnchor.AttachCamera(Player2Camera); HostAndWinnerCameraAnchor.AttachCamera(HostAndWinnerCamera); LocationBoardCameraAnchor.AttachCamera(LocationBoardCamera); + ModemCameraAnchor.AttachCamera(PrimaryFocusCamera); VideoPlayerCameraAnchor.AttachCamera(VideoPlayerCamera); } @@ -102,6 +103,11 @@ public class CameraControllerRound2 : CameraControllerBase SwitchToLiveCamera(LocationBoardCamera); } + public void SwitchToModemCamera() + { + SwitchToLiveCamera(PrimaryFocusCamera); + } + public void SwitchToVideoPlayerCamera() { SwitchToLiveCamera(VideoPlayerCamera); diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs index cc8564a..2ef7df6 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs @@ -72,6 +72,7 @@ public class GameManagerRound2 : GameManagerBase _CameraControllerRound2.InitialiseCameras(); _CameraControllerRound2.DisableAllSwitchers(); + _CameraControllerRound2.SwitchToModemCamera(); _CameraControllerRound2.ActivateHostAllPlayersCameraTrigger(); RequestSerialization();