diff --git a/Assets/Materials/FairwaytestMat.mat b/Assets/Materials/FairwaytestMat.mat index d1c498a8..77375681 100644 --- a/Assets/Materials/FairwaytestMat.mat +++ b/Assets/Materials/FairwaytestMat.mat @@ -117,8 +117,8 @@ Material: - _WorkflowMode: 1 - _ZWrite: 0 m_Colors: - - _BaseColor: {r: 0, g: 0.51886785, b: 0.04760272, a: 0.4745098} - - _Color: {r: 0, g: 0.5188678, b: 0.0476027, a: 0.4745098} + - _BaseColor: {r: 0, g: 0.5188678, b: 0.0476027, a: 1} + - _Color: {r: 0, g: 0.51886773, b: 0.047602676, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Prefabs/Hole/Hole.prefab b/Assets/Prefabs/Hole/Hole.prefab index 8c71dd24..f0faac8f 100644 --- a/Assets/Prefabs/Hole/Hole.prefab +++ b/Assets/Prefabs/Hole/Hole.prefab @@ -9,6 +9,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7492627932365574004} + - component: {fileID: 6031538953657281359} + - component: {fileID: 7171974296929999656} m_Layer: 0 m_Name: GoalTrigger m_TagString: Untagged @@ -31,6 +33,55 @@ Transform: m_Children: [] m_Father: {fileID: 8649987843805268783} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &6031538953657281359 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1455082168975920177} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &7171974296929999656 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1455082168975920177} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1d1605eb45b6d498aba96ddda565cb6a, type: 3} + m_Name: + m_EditorClassIdentifier: + invertResult: 0 + onTrigger: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 11400000, guid: 3b0e06d0a76bceb4296c54d02f0d34a4, type: 2} + m_TargetAssemblyTypeName: UnityAtoms.AtomVariable`5[[System.Boolean, mscorlib + m_MethodName: set_Value + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &6121683813469744371 GameObject: m_ObjectHideFlags: 0 @@ -60,8 +111,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 84093497478952920} - {fileID: 7564410484071446836} + - {fileID: 84093497478952920} - {fileID: 6595505223521729305} - {fileID: 7492627932365574004} m_Father: {fileID: 0} @@ -134,6 +185,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1d1605eb45b6d498aba96ddda565cb6a, type: 3} m_Name: m_EditorClassIdentifier: + invertResult: 1 onTrigger: m_PersistentCalls: m_Calls: [] diff --git a/Assets/Scenes/TestControls.unity b/Assets/Scenes/TestControls.unity index 168028dc..c9804994 100644 --- a/Assets/Scenes/TestControls.unity +++ b/Assets/Scenes/TestControls.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} + m_IndirectSpecularColor: {r: 0.18028373, g: 0.22571398, b: 0.30692294, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -1954,6 +1954,171 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 819962205} m_CullTransparentMesh: 1 +--- !u!43 &985481929 +Mesh: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: pb_Mesh-6468 + serializedVersion: 11 + m_SubMeshes: + - serializedVersion: 2 + firstByte: 0 + indexCount: 60 + topology: 0 + baseVertex: 0 + firstVertex: 0 + vertexCount: 21 + localAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0.5, y: 0, z: 0.5} + m_Shapes: + vertices: [] + shapes: [] + channels: [] + fullWeights: [] + m_BindPose: [] + m_BoneNameHashes: + m_RootBoneNameHash: 0 + m_BonesAABB: [] + m_VariableBoneCountWeights: + m_Data: + m_MeshCompression: 0 + m_IsReadable: 1 + m_KeepVertices: 1 + m_KeepIndices: 1 + m_IndexFormat: 0 + m_IndexBuffer: 000001000200020001000300030001000400040001000500050001000600060001000700070001000800080001000900090001000a000a0001000b000b0001000c000c0001000d000d0001000e000e0001000f000f0001001000100001001100110001001200120001001300130001001400140001000000 + m_VertexData: + serializedVersion: 3 + m_VertexCount: 21 + m_Channels: + - stream: 0 + offset: 0 + format: 0 + dimension: 3 + - stream: 0 + offset: 12 + format: 0 + dimension: 3 + - stream: 0 + offset: 24 + format: 0 + dimension: 4 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 40 + format: 0 + dimension: 2 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + - stream: 0 + offset: 0 + format: 0 + dimension: 0 + m_DataSize: 1008 + _typelessdata: 0000003f0000000000000000000000000000803f000000000000803f0000000000000000000080bf0000003f00000000000000000000000000000000000000000000803f000000000000803f0000000000000000000080bf00000000000000007078f33e0000000078371e3e000000000000803f000000000000803f0000000000000000000080bf7078f33e78371e3ebc1bcf3e000000001879963e000000000000803f000000000000803f0000000000000000000080bfbc1bcf3e1879963e1879963e00000000bc1bcf3e000000000000803f000000000000803f0000000000000000000080bf1879963ebc1bcf3e78371e3e000000007078f33e000000000000803f000000000000803f0000000000000000000080bf78371e3e7078f33e000000b3000000000000003f000000000000803f000000000000803f0000000000000000000080bf000000b30000003f78371ebe000000007078f33e000000000000803f000000000000803f0000000000000000000080bf78371ebe7078f33e177996be00000000bc1bcf3e000000000000803f000000000000803f0000000000000000000080bf177996bebc1bcf3ebe1bcfbe000000001879963e000000000000803f000000000000803f0000000000000000000080bfbe1bcfbe1879963e7078f3be000000007c371e3e000000000000803f000000000000803f0000000000000000000080bf7078f3be7c371e3e000000bf00000000000000b3000000000000803f000000000000803f0000000000000000000080bf000000bf000000b37178f3be0000000078371ebe000000000000803f000000000000803f0000000000000000000080bf7178f3be78371ebebe1bcfbe00000000167996be000000000000803f000000000000803f0000000000000000000080bfbe1bcfbe167996be1b7996be00000000ba1bcfbe000000000000803f000000000000803f0000000000000000000080bf1b7996beba1bcfbe7d371ebe000000007078f3be000000000000803f000000000000803f0000000000000000000080bf7d371ebe7078f3be0000000000000000000000bf000000000000803f000000000000803f0000000000000000000080bf00000000000000bf7e371e3e000000007078f3be000000000000803f000000000000803f0000000000000000000080bf7e371e3e7078f3be1479963e00000000bf1bcfbe000000000000803f000000000000803f0000000000000000000080bf1479963ebf1bcfbebc1bcf3e00000000197996be000000000000803f000000000000803f0000000000000000000080bfbc1bcf3e197996be7078f33e0000000078371ebe000000000000803f000000000000803f0000000000000000000080bf7078f33e78371ebe + m_CompressedMesh: + m_Vertices: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_UV: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Normals: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Tangents: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_Weights: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_NormalSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_TangentSigns: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_FloatColors: + m_NumItems: 0 + m_Range: 0 + m_Start: 0 + m_Data: + m_BitSize: 0 + m_BoneIndices: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_Triangles: + m_NumItems: 0 + m_Data: + m_BitSize: 0 + m_UVInfo: 0 + m_LocalAABB: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0.5, y: 0, z: 0.5} + m_MeshUsageFlags: 0 + m_CookingOptions: 30 + m_BakedConvexCollisionMesh: + m_BakedTriangleCollisionMesh: + m_MeshMetrics[0]: 1 + m_MeshMetrics[1]: 1 + m_MeshOptimizationFlags: 1 + m_StreamData: + serializedVersion: 2 + offset: 0 + size: 0 + path: --- !u!1 &1028760414 GameObject: m_ObjectHideFlags: 0 @@ -1999,6 +2164,140 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1178232459 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1895921797} + m_Modifications: + - target: {fileID: 386271633039628962, guid: 67b92308c184e4945a702caf44784747, + type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 985481929} + - target: {fileID: 4851804087237104553, guid: 67b92308c184e4945a702caf44784747, + type: 3} + propertyPath: m_Mesh + value: + objectReference: {fileID: 985481929} + - target: {fileID: 6121683813469744371, guid: 67b92308c184e4945a702caf44784747, + type: 3} + propertyPath: m_Name + value: Hole + objectReference: {fileID: 0} + - target: {fileID: 8299546483346534859, guid: 67b92308c184e4945a702caf44784747, + type: 3} + propertyPath: onTrigger.m_PersistentCalls.m_Calls.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8299546483346534859, guid: 67b92308c184e4945a702caf44784747, + type: 3} + propertyPath: onTrigger.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 1507380960} + - target: {fileID: 8299546483346534859, guid: 67b92308c184e4945a702caf44784747, + type: 3} + propertyPath: onTrigger.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8299546483346534859, guid: 67b92308c184e4945a702caf44784747, + type: 3} + propertyPath: onTrigger.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: set_enabled + objectReference: {fileID: 0} + - target: {fileID: 8299546483346534859, guid: 67b92308c184e4945a702caf44784747, + type: 3} + propertyPath: onTrigger.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.Renderer, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 8299546483346534859, guid: 67b92308c184e4945a702caf44784747, + type: 3} + propertyPath: onTrigger.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 8649987843805268783, guid: 67b92308c184e4945a702caf44784747, + type: 3} + propertyPath: m_LocalScale.x + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 8649987843805268783, guid: 67b92308c184e4945a702caf44784747, + type: 3} + propertyPath: m_LocalScale.y + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 8649987843805268783, guid: 67b92308c184e4945a702caf44784747, + type: 3} + propertyPath: m_LocalScale.z + value: 0.15 + objectReference: {fileID: 0} + - target: {fileID: 8649987843805268783, guid: 67b92308c184e4945a702caf44784747, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8649987843805268783, guid: 67b92308c184e4945a702caf44784747, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.95 + objectReference: {fileID: 0} + - target: {fileID: 8649987843805268783, guid: 67b92308c184e4945a702caf44784747, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8649987843805268783, guid: 67b92308c184e4945a702caf44784747, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8649987843805268783, guid: 67b92308c184e4945a702caf44784747, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8649987843805268783, guid: 67b92308c184e4945a702caf44784747, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8649987843805268783, guid: 67b92308c184e4945a702caf44784747, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 8649987843805268783, guid: 67b92308c184e4945a702caf44784747, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8649987843805268783, guid: 67b92308c184e4945a702caf44784747, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8649987843805268783, guid: 67b92308c184e4945a702caf44784747, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8649987843805268783, guid: 67b92308c184e4945a702caf44784747, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 67b92308c184e4945a702caf44784747, type: 3} +--- !u!4 &1178232460 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8649987843805268783, guid: 67b92308c184e4945a702caf44784747, + type: 3} + m_PrefabInstance: {fileID: 1178232459} + m_PrefabAsset: {fileID: 0} --- !u!1 &1320667993 GameObject: m_ObjectHideFlags: 0 @@ -2047,7 +2346,7 @@ GameObject: - component: {fileID: 1507380960} - component: {fileID: 1507380959} - component: {fileID: 1507380963} - m_Layer: 0 + m_Layer: 6 m_Name: FairwayCube m_TagString: Untagged m_Icon: {fileID: 0} @@ -2905,6 +3204,7 @@ Transform: - {fileID: 1507380962} - {fileID: 1752515856} - {fileID: 371693856} + - {fileID: 1178232460} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1895921798 diff --git a/Assets/Scripts/OnColliderTrigger.cs b/Assets/Scripts/OnColliderTrigger.cs index e54e9e75..90fc6ae9 100644 --- a/Assets/Scripts/OnColliderTrigger.cs +++ b/Assets/Scripts/OnColliderTrigger.cs @@ -5,6 +5,8 @@ namespace MAVRIC.GEEKCup { public class OnColliderTrigger : MonoBehaviour { + public bool invertResult = false; + // TODO: Update this to use a UnityAtoms BoolReference [SerializeField] private UnityEvent onTrigger; @@ -13,7 +15,7 @@ namespace MAVRIC.GEEKCup // TODO: Update this to a different system if (other.CompareTag("Player")) { - onTrigger?.Invoke(false); + onTrigger?.Invoke(!invertResult); } } @@ -21,7 +23,7 @@ namespace MAVRIC.GEEKCup { if (other.CompareTag("Player")) { - onTrigger?.Invoke(true); + onTrigger?.Invoke(invertResult); } } } diff --git a/Assets/Settings/URP-Performant-Renderer.asset b/Assets/Settings/URP-Performant-Renderer.asset index 41ea1c64..0520358d 100644 --- a/Assets/Settings/URP-Performant-Renderer.asset +++ b/Assets/Settings/URP-Performant-Renderer.asset @@ -10,11 +10,11 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 6b3d386ba5cd94485973aee1479b272e, type: 3} - m_Name: RenderObjects + m_Name: GroundOpaque m_EditorClassIdentifier: m_Active: 1 settings: - passTag: RenderObjects + passTag: GroundOpaque Event: 300 filterSettings: RenderQueueType: 0 @@ -32,7 +32,7 @@ MonoBehaviour: enableWrite: 1 stencilSettings: overrideStencilState: 1 - stencilReference: 0 + stencilReference: 1 stencilCompareFunction: 7 passOperation: 0 failOperation: 0 @@ -61,7 +61,8 @@ MonoBehaviour: m_RendererFeatures: - {fileID: 3239328064754543239} - {fileID: -2959076149000536660} - m_RendererFeatureMap: 87eaa552b667f42cacfd7d9beb3fefd6 + - {fileID: 4908369937859052871} + m_RendererFeatureMap: 87eaa552b667f42cacfd7d9beb3fefd647854bec73081e44 m_UseNativeRenderPass: 0 postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2} xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2} @@ -117,3 +118,45 @@ MonoBehaviour: m_Name: ARBackgroundRendererFeature m_EditorClassIdentifier: m_Active: 1 +--- !u!114 &4908369937859052871 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6b3d386ba5cd94485973aee1479b272e, type: 3} + m_Name: GroundTransparent + m_EditorClassIdentifier: + m_Active: 1 + settings: + passTag: GroundTransparent + Event: 500 + filterSettings: + RenderQueueType: 1 + LayerMask: + serializedVersion: 2 + m_Bits: 64 + PassNames: [] + overrideMaterial: {fileID: 0} + overrideMaterialPassIndex: 0 + overrideShader: {fileID: 0} + overrideShaderPassIndex: 0 + overrideMode: 0 + overrideDepthState: 0 + depthCompareFunction: 4 + enableWrite: 1 + stencilSettings: + overrideStencilState: 1 + stencilReference: 0 + stencilCompareFunction: 7 + passOperation: 0 + failOperation: 0 + zFailOperation: 0 + cameraSettings: + overrideCamera: 0 + restoreCamera: 1 + offset: {x: 0, y: 0, z: 0, w: 0} + cameraFieldOfView: 60