mirror of
https://projects.caleb-brown.dev/UDRI-XRT/UDRIGEEKCup2024.git
synced 2025-01-22 07:08:51 -05:00
Merge pull request 'feature/occlusion-mat' (#23) from feature/occlusion-mat into development
Reviewed-on: https://udrimavric.com/MAVRIC/UDRIGolf2024/pulls/23
This commit is contained in:
Noah Calderon
commit
d6b4a8fe00
@ -11,7 +11,7 @@ GameObject:
|
||||
- component: {fileID: 3277065184914629628}
|
||||
- component: {fileID: 2691174032354108224}
|
||||
- component: {fileID: 6770967778482584083}
|
||||
m_Layer: 6
|
||||
m_Layer: 0
|
||||
m_Name: Control_Room
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@ -50,7 +50,7 @@ MeshRenderer:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 782634506160621956}
|
||||
m_Enabled: 0
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
@ -63,24 +63,24 @@ MeshRenderer:
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 3782537492510617720, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: -8678783539337122896, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: -1897068076869964313, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 1817904841586580917, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 1400299459531279933, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 5769006626239210234, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: -4852876050859037171, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 4871088224896908678, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: -472640028747157849, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 3312464896659963331, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: -1931442285631450791, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 6571694528262885598, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 2306785539569755410, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: -6111753311978520593, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 4314078867566056019, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 8958458835243448021, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: -4033169851070158369, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: -8072554559249862221, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
|
||||
@ -138,7 +138,7 @@ MeshRenderer:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 4908809923922535070}
|
||||
m_Enabled: 0
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
@ -151,19 +151,19 @@ MeshRenderer:
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 4262279356327169087, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: -1476036267000219877, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 4330194371847207021, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 4871088224896908678, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: -986714056514370855, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: -6111753311978520593, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 4314078867566056019, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 1621441309887403949, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 725830131102301292, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: -6937023281896900525, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: -3935038264227054355, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 999810707010055239, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: -8072554559249862221, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
|
||||
@ -11,7 +11,7 @@ GameObject:
|
||||
- component: {fileID: 8622549130173790273}
|
||||
- component: {fileID: 1435961146019601622}
|
||||
- component: {fileID: 6864179191514092418}
|
||||
m_Layer: 6
|
||||
m_Layer: 0
|
||||
m_Name: Main_Room
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@ -63,27 +63,27 @@ MeshRenderer:
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: -8678783539337122896, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: -5519532238635984052, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 6951589847359152772, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 1400299459531279933, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 5769006626239210234, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 4871088224896908678, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: -472640028747157849, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 3312464896659963331, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 5789191641659325971, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 1753179848374011791, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: -1931442285631450791, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 6571694528262885598, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 5241665347299591453, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 2306785539569755410, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: -6111753311978520593, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: -2410684081991112172, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 8958458835243448021, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: -612021366180181654, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: -8020161474384093832, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: -8723399642204636786, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: -8072554559249862221, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
@ -166,21 +166,21 @@ MeshRenderer:
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: -8678783539337122896, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: -5519532238635984052, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 6951589847359152772, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 1400299459531279933, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 5769006626239210234, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: -5482881581812828905, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: -7040501356501458794, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 3312464896659963331, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 6571694528262885598, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 5241665347299591453, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 2306785539569755410, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: -2410684081991112172, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 8958458835243448021, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: -612021366180181654, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: -8020161474384093832, guid: b7fca572b45104109acc041b816d7aa6, type: 3}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
- {fileID: 2100000, guid: 0f43e801f3555471697e41f98d8bb45b, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
|
||||
@ -201,11 +201,6 @@ PrefabInstance:
|
||||
propertyPath: m_Name
|
||||
value: Main_Room
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6864179191514092418, guid: 23df27f8eab164f53a62e09b8b7c7325,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8622549130173790273, guid: 23df27f8eab164f53a62e09b8b7c7325,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
|
||||
@ -527,9 +527,9 @@ PrefabInstance:
|
||||
propertyPath: m_Name
|
||||
value: Green_Room
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8147166029460412950, guid: 0c2d73280f95e463cb0a553c52a488a7,
|
||||
- target: {fileID: 4908809923922535070, guid: 0c2d73280f95e463cb0a553c52a488a7,
|
||||
type: 3}
|
||||
propertyPath: m_Enabled
|
||||
propertyPath: m_Layer
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8232610969819635902, guid: 0c2d73280f95e463cb0a553c52a488a7,
|
||||
|
||||
29
Assets/Shaders/Custom_PlaneOcclusion.mat
Normal file
29
Assets/Shaders/Custom_PlaneOcclusion.mat
Normal file
@ -0,0 +1,29 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!21 &2100000
|
||||
Material:
|
||||
serializedVersion: 8
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: Custom_PlaneOcclusion
|
||||
m_Shader: {fileID: 4800000, guid: c61d797fe0ea0441b89a9718ccc96897, type: 3}
|
||||
m_Parent: {fileID: 0}
|
||||
m_ModifiedSerializedProperties: 0
|
||||
m_ValidKeywords: []
|
||||
m_InvalidKeywords: []
|
||||
m_LightmapFlags: 4
|
||||
m_EnableInstancingVariants: 0
|
||||
m_DoubleSidedGI: 0
|
||||
m_CustomRenderQueue: -1
|
||||
stringTagMap: {}
|
||||
disabledShaderPasses: []
|
||||
m_LockedProperties:
|
||||
m_SavedProperties:
|
||||
serializedVersion: 3
|
||||
m_TexEnvs: []
|
||||
m_Ints: []
|
||||
m_Floats: []
|
||||
m_Colors: []
|
||||
m_BuildTextureStacks: []
|
||||
8
Assets/Shaders/Custom_PlaneOcclusion.mat.meta
Normal file
8
Assets/Shaders/Custom_PlaneOcclusion.mat.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 0f43e801f3555471697e41f98d8bb45b
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 2100000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
42
Assets/Shaders/PlaneOcclusion.shader
Normal file
42
Assets/Shaders/PlaneOcclusion.shader
Normal file
@ -0,0 +1,42 @@
|
||||
Shader "Custom/PlaneOcclusion"
|
||||
{
|
||||
SubShader
|
||||
{
|
||||
Tags { "RenderType"="Opaque" "Queue" = "Geometry-1" "RenderPipeline" = "UniversalPipeline" }
|
||||
ZWrite On
|
||||
ZTest LEqual
|
||||
ColorMask 0
|
||||
|
||||
Pass
|
||||
{
|
||||
CGPROGRAM
|
||||
#pragma vertex vert
|
||||
#pragma fragment frag
|
||||
|
||||
#include "UnityCG.cginc"
|
||||
|
||||
struct appdata
|
||||
{
|
||||
float4 vertex : POSITION;
|
||||
};
|
||||
|
||||
struct v2f
|
||||
{
|
||||
float4 vertex : SV_POSITION;
|
||||
};
|
||||
|
||||
v2f vert (appdata v)
|
||||
{
|
||||
v2f o;
|
||||
o.vertex = UnityObjectToClipPos(v.vertex);
|
||||
return o;
|
||||
}
|
||||
|
||||
fixed4 frag (v2f i) : SV_Target
|
||||
{
|
||||
return fixed4(0.0, 0.0, 0.0, 0.0);
|
||||
}
|
||||
ENDCG
|
||||
}
|
||||
}
|
||||
}
|
||||
9
Assets/Shaders/PlaneOcclusion.shader.meta
Normal file
9
Assets/Shaders/PlaneOcclusion.shader.meta
Normal file
@ -0,0 +1,9 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c61d797fe0ea0441b89a9718ccc96897
|
||||
ShaderImporter:
|
||||
externalObjects: {}
|
||||
defaultTextures: []
|
||||
nonModifiableTextures: []
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Loading…
Reference in New Issue
Block a user