- Map markers have a lit texture when they are on the correct location.
- Markers now expire when they end up finding no collisions for long enough.
This commit is contained in:
Jamie Greunbaum
parent
44b78fb8b8
commit
4fad27ce19
@ -134,6 +134,7 @@
|
|||||||
<None Include="Assets\Shaders\FrontfaceCulling.shader" />
|
<None Include="Assets\Shaders\FrontfaceCulling.shader" />
|
||||||
<None Include="Assets\Shaders\SDF Map Marker Spokes.shader" />
|
<None Include="Assets\Shaders\SDF Map Marker Spokes.shader" />
|
||||||
<None Include="Assets\TextMesh Pro\Shaders\TMP_SDF-Mobile.shader" />
|
<None Include="Assets\TextMesh Pro\Shaders\TMP_SDF-Mobile.shader" />
|
||||||
|
<None Include="Assets\Shaders\SDF Map Marker Lamp.shader" />
|
||||||
<None Include="Assets\TextMesh Pro\Shaders\TMP_Sprite.shader" />
|
<None Include="Assets\TextMesh Pro\Shaders\TMP_Sprite.shader" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
90
Assets/Materials/Maps/M_MarkerLitLamp.mat
Normal file
90
Assets/Materials/Maps/M_MarkerLitLamp.mat
Normal file
@ -0,0 +1,90 @@
|
|||||||
|
%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: M_MarkerLitLamp
|
||||||
|
m_Shader: {fileID: 4800000, guid: 9f94b38d823fc7a4897e2e1f0c9b263f, type: 3}
|
||||||
|
m_Parent: {fileID: 0}
|
||||||
|
m_ModifiedSerializedProperties: 0
|
||||||
|
m_ValidKeywords:
|
||||||
|
- _EMISSION
|
||||||
|
- _SPECULARHIGHLIGHTS_OFF
|
||||||
|
m_InvalidKeywords: []
|
||||||
|
m_LightmapFlags: 2
|
||||||
|
m_EnableInstancingVariants: 1
|
||||||
|
m_DoubleSidedGI: 0
|
||||||
|
m_CustomRenderQueue: -1
|
||||||
|
stringTagMap: {}
|
||||||
|
disabledShaderPasses: []
|
||||||
|
m_LockedProperties:
|
||||||
|
m_SavedProperties:
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TexEnvs:
|
||||||
|
- _BumpMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailAlbedoMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailMask:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _DetailNormalMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _EmissionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MainTex:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _MetallicGlossMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _OcclusionMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
- _ParallaxMap:
|
||||||
|
m_Texture: {fileID: 0}
|
||||||
|
m_Scale: {x: 1, y: 1}
|
||||||
|
m_Offset: {x: 0, y: 0}
|
||||||
|
m_Ints: []
|
||||||
|
m_Floats:
|
||||||
|
- _Bicubic: 0
|
||||||
|
- _BumpScale: 1
|
||||||
|
- _Cutoff: 0.5
|
||||||
|
- _DetailNormalMapScale: 1
|
||||||
|
- _DstBlend: 0
|
||||||
|
- _EnableGeometricSpecularAA: 0
|
||||||
|
- _GlossMapScale: 1
|
||||||
|
- _Glossiness: 1
|
||||||
|
- _GlossyReflections: 1
|
||||||
|
- _LightmapType: 0
|
||||||
|
- _Metallic: 0
|
||||||
|
- _Mode: 0
|
||||||
|
- _OcclusionStrength: 1
|
||||||
|
- _Parallax: 0.02
|
||||||
|
- _SmoothnessTextureChannel: 0
|
||||||
|
- _SpecularAAScreenSpaceVariance: 0.1
|
||||||
|
- _SpecularAAThreshold: 0.2
|
||||||
|
- _SpecularHighlights: 0
|
||||||
|
- _SrcBlend: 1
|
||||||
|
- _UVSec: 0
|
||||||
|
- _ZWrite: 1
|
||||||
|
m_Colors:
|
||||||
|
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
- _EmissionColor: {r: 1.5686276, g: 0, b: 0, a: 1}
|
||||||
|
m_BuildTextureStacks: []
|
||||||
8
Assets/Materials/Maps/M_MarkerLitLamp.mat.meta
Normal file
8
Assets/Materials/Maps/M_MarkerLitLamp.mat.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 3fef7fe6d628ca64ba291c8ee8d7a723
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 2100000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@ -12,7 +12,7 @@ Material:
|
|||||||
m_Parent: {fileID: 0}
|
m_Parent: {fileID: 0}
|
||||||
m_ModifiedSerializedProperties: 0
|
m_ModifiedSerializedProperties: 0
|
||||||
m_ValidKeywords:
|
m_ValidKeywords:
|
||||||
- _ENABLE_GEOMETRIC_SPECULAR_AA
|
- _SPECULARHIGHLIGHTS_OFF
|
||||||
m_InvalidKeywords: []
|
m_InvalidKeywords: []
|
||||||
m_LightmapFlags: 4
|
m_LightmapFlags: 4
|
||||||
m_EnableInstancingVariants: 1
|
m_EnableInstancingVariants: 1
|
||||||
@ -67,7 +67,7 @@ Material:
|
|||||||
- _Cutoff: 0.5
|
- _Cutoff: 0.5
|
||||||
- _DetailNormalMapScale: 1
|
- _DetailNormalMapScale: 1
|
||||||
- _DstBlend: 0
|
- _DstBlend: 0
|
||||||
- _EnableGeometricSpecularAA: 1
|
- _EnableGeometricSpecularAA: 0
|
||||||
- _GlossMapScale: 1
|
- _GlossMapScale: 1
|
||||||
- _Glossiness: 1
|
- _Glossiness: 1
|
||||||
- _GlossyReflections: 1
|
- _GlossyReflections: 1
|
||||||
@ -79,7 +79,7 @@ Material:
|
|||||||
- _SmoothnessTextureChannel: 0
|
- _SmoothnessTextureChannel: 0
|
||||||
- _SpecularAAScreenSpaceVariance: 0.1
|
- _SpecularAAScreenSpaceVariance: 0.1
|
||||||
- _SpecularAAThreshold: 0.2
|
- _SpecularAAThreshold: 0.2
|
||||||
- _SpecularHighlights: 1
|
- _SpecularHighlights: 0
|
||||||
- _SrcBlend: 1
|
- _SrcBlend: 1
|
||||||
- _UVSec: 0
|
- _UVSec: 0
|
||||||
- _ZWrite: 1
|
- _ZWrite: 1
|
||||||
|
|||||||
@ -12,7 +12,7 @@ Material:
|
|||||||
m_Parent: {fileID: 0}
|
m_Parent: {fileID: 0}
|
||||||
m_ModifiedSerializedProperties: 0
|
m_ModifiedSerializedProperties: 0
|
||||||
m_ValidKeywords:
|
m_ValidKeywords:
|
||||||
- _ENABLE_GEOMETRIC_SPECULAR_AA
|
- _SPECULARHIGHLIGHTS_OFF
|
||||||
m_InvalidKeywords: []
|
m_InvalidKeywords: []
|
||||||
m_LightmapFlags: 4
|
m_LightmapFlags: 4
|
||||||
m_EnableInstancingVariants: 1
|
m_EnableInstancingVariants: 1
|
||||||
@ -67,7 +67,7 @@ Material:
|
|||||||
- _Cutoff: 0.5
|
- _Cutoff: 0.5
|
||||||
- _DetailNormalMapScale: 1
|
- _DetailNormalMapScale: 1
|
||||||
- _DstBlend: 0
|
- _DstBlend: 0
|
||||||
- _EnableGeometricSpecularAA: 1
|
- _EnableGeometricSpecularAA: 0
|
||||||
- _GlossMapScale: 1
|
- _GlossMapScale: 1
|
||||||
- _Glossiness: 1
|
- _Glossiness: 1
|
||||||
- _GlossyReflections: 1
|
- _GlossyReflections: 1
|
||||||
@ -79,7 +79,7 @@ Material:
|
|||||||
- _SmoothnessTextureChannel: 0
|
- _SmoothnessTextureChannel: 0
|
||||||
- _SpecularAAScreenSpaceVariance: 0.1
|
- _SpecularAAScreenSpaceVariance: 0.1
|
||||||
- _SpecularAAThreshold: 0.2
|
- _SpecularAAThreshold: 0.2
|
||||||
- _SpecularHighlights: 1
|
- _SpecularHighlights: 0
|
||||||
- _SrcBlend: 1
|
- _SrcBlend: 1
|
||||||
- _UVSec: 0
|
- _UVSec: 0
|
||||||
- _ZWrite: 1
|
- _ZWrite: 1
|
||||||
|
|||||||
@ -12,7 +12,7 @@ Material:
|
|||||||
m_Parent: {fileID: 0}
|
m_Parent: {fileID: 0}
|
||||||
m_ModifiedSerializedProperties: 0
|
m_ModifiedSerializedProperties: 0
|
||||||
m_ValidKeywords:
|
m_ValidKeywords:
|
||||||
- _ENABLE_GEOMETRIC_SPECULAR_AA
|
- _SPECULARHIGHLIGHTS_OFF
|
||||||
m_InvalidKeywords: []
|
m_InvalidKeywords: []
|
||||||
m_LightmapFlags: 4
|
m_LightmapFlags: 4
|
||||||
m_EnableInstancingVariants: 1
|
m_EnableInstancingVariants: 1
|
||||||
@ -67,7 +67,7 @@ Material:
|
|||||||
- _Cutoff: 0.5
|
- _Cutoff: 0.5
|
||||||
- _DetailNormalMapScale: 1
|
- _DetailNormalMapScale: 1
|
||||||
- _DstBlend: 0
|
- _DstBlend: 0
|
||||||
- _EnableGeometricSpecularAA: 1
|
- _EnableGeometricSpecularAA: 0
|
||||||
- _GlossMapScale: 1
|
- _GlossMapScale: 1
|
||||||
- _Glossiness: 1
|
- _Glossiness: 1
|
||||||
- _GlossyReflections: 1
|
- _GlossyReflections: 1
|
||||||
@ -79,11 +79,11 @@ Material:
|
|||||||
- _SmoothnessTextureChannel: 0
|
- _SmoothnessTextureChannel: 0
|
||||||
- _SpecularAAScreenSpaceVariance: 0.1
|
- _SpecularAAScreenSpaceVariance: 0.1
|
||||||
- _SpecularAAThreshold: 0.2
|
- _SpecularAAThreshold: 0.2
|
||||||
- _SpecularHighlights: 1
|
- _SpecularHighlights: 0
|
||||||
- _SrcBlend: 1
|
- _SrcBlend: 1
|
||||||
- _UVSec: 0
|
- _UVSec: 0
|
||||||
- _ZWrite: 1
|
- _ZWrite: 1
|
||||||
m_Colors:
|
m_Colors:
|
||||||
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
- _Color: {r: 1, g: 1, b: 1, a: 1}
|
||||||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
|
- _EmissionColor: {r: 0.78431374, g: 0, b: 0, a: 1}
|
||||||
m_BuildTextureStacks: []
|
m_BuildTextureStacks: []
|
||||||
|
|||||||
@ -1889,6 +1889,55 @@ GameObject:
|
|||||||
type: 3}
|
type: 3}
|
||||||
m_PrefabInstance: {fileID: 6044205050412544512}
|
m_PrefabInstance: {fileID: 6044205050412544512}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
--- !u!1 &123630532
|
||||||
|
GameObject:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
serializedVersion: 6
|
||||||
|
m_Component:
|
||||||
|
- component: {fileID: 123630534}
|
||||||
|
- component: {fileID: 123630533}
|
||||||
|
m_Layer: 0
|
||||||
|
m_Name: Post Processing
|
||||||
|
m_TagString: Untagged
|
||||||
|
m_Icon: {fileID: 0}
|
||||||
|
m_NavMeshLayer: 0
|
||||||
|
m_StaticEditorFlags: 0
|
||||||
|
m_IsActive: 1
|
||||||
|
--- !u!114 &123630533
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 123630532}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
sharedProfile: {fileID: 11400000, guid: 626c9b1e47af7dc4d9583060a42503d1, type: 2}
|
||||||
|
isGlobal: 1
|
||||||
|
blendDistance: 0
|
||||||
|
weight: 1
|
||||||
|
priority: 0
|
||||||
|
--- !u!4 &123630534
|
||||||
|
Transform:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 123630532}
|
||||||
|
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: 0}
|
||||||
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1 &124376886 stripped
|
--- !u!1 &124376886 stripped
|
||||||
GameObject:
|
GameObject:
|
||||||
m_CorrespondingSourceObject: {fileID: 2459420928616881142, guid: 446a9df6c2a92264b85d9cfa3e6c0d4f,
|
m_CorrespondingSourceObject: {fileID: 2459420928616881142, guid: 446a9df6c2a92264b85d9cfa3e6c0d4f,
|
||||||
@ -7149,6 +7198,7 @@ MonoBehaviour:
|
|||||||
_udonSharpBackingUdonBehaviour: {fileID: 222678234}
|
_udonSharpBackingUdonBehaviour: {fileID: 222678234}
|
||||||
_LocationFindingEnabled: 0
|
_LocationFindingEnabled: 0
|
||||||
_GameManager: {fileID: 969831474}
|
_GameManager: {fileID: 969831474}
|
||||||
|
_LitLampMaterial: {fileID: 2100000, guid: 3fef7fe6d628ca64ba291c8ee8d7a723, type: 2}
|
||||||
--- !u!1 &224730389 stripped
|
--- !u!1 &224730389 stripped
|
||||||
GameObject:
|
GameObject:
|
||||||
m_CorrespondingSourceObject: {fileID: 3378133619498976289, guid: 899ce13087fd5974f88dcbccaea2df85,
|
m_CorrespondingSourceObject: {fileID: 3378133619498976289, guid: 899ce13087fd5974f88dcbccaea2df85,
|
||||||
@ -14850,6 +14900,7 @@ MonoBehaviour:
|
|||||||
_udonSharpBackingUdonBehaviour: {fileID: 683256953}
|
_udonSharpBackingUdonBehaviour: {fileID: 683256953}
|
||||||
_LocationFindingEnabled: 0
|
_LocationFindingEnabled: 0
|
||||||
_GameManager: {fileID: 969831474}
|
_GameManager: {fileID: 969831474}
|
||||||
|
_LitLampMaterial: {fileID: 2100000, guid: 3fef7fe6d628ca64ba291c8ee8d7a723, type: 2}
|
||||||
--- !u!64 &683256955
|
--- !u!64 &683256955
|
||||||
MeshCollider:
|
MeshCollider:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -17760,6 +17811,7 @@ MonoBehaviour:
|
|||||||
_udonSharpBackingUdonBehaviour: {fileID: 827257402}
|
_udonSharpBackingUdonBehaviour: {fileID: 827257402}
|
||||||
_LocationFindingEnabled: 0
|
_LocationFindingEnabled: 0
|
||||||
_GameManager: {fileID: 969831474}
|
_GameManager: {fileID: 969831474}
|
||||||
|
_LitLampMaterial: {fileID: 2100000, guid: 3fef7fe6d628ca64ba291c8ee8d7a723, type: 2}
|
||||||
--- !u!64 &827257404
|
--- !u!64 &827257404
|
||||||
MeshCollider:
|
MeshCollider:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -19135,6 +19187,7 @@ MonoBehaviour:
|
|||||||
_udonSharpBackingUdonBehaviour: {fileID: 889644688}
|
_udonSharpBackingUdonBehaviour: {fileID: 889644688}
|
||||||
_LocationFindingEnabled: 0
|
_LocationFindingEnabled: 0
|
||||||
_GameManager: {fileID: 969831474}
|
_GameManager: {fileID: 969831474}
|
||||||
|
_LitLampMaterial: {fileID: 2100000, guid: 3fef7fe6d628ca64ba291c8ee8d7a723, type: 2}
|
||||||
--- !u!64 &889644690
|
--- !u!64 &889644690
|
||||||
MeshCollider:
|
MeshCollider:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -19630,6 +19683,7 @@ MonoBehaviour:
|
|||||||
_udonSharpBackingUdonBehaviour: {fileID: 925359996}
|
_udonSharpBackingUdonBehaviour: {fileID: 925359996}
|
||||||
_LocationFindingEnabled: 0
|
_LocationFindingEnabled: 0
|
||||||
_GameManager: {fileID: 969831474}
|
_GameManager: {fileID: 969831474}
|
||||||
|
_LitLampMaterial: {fileID: 2100000, guid: 3fef7fe6d628ca64ba291c8ee8d7a723, type: 2}
|
||||||
--- !u!64 &925359998
|
--- !u!64 &925359998
|
||||||
MeshCollider:
|
MeshCollider:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -22004,6 +22058,7 @@ MonoBehaviour:
|
|||||||
_udonSharpBackingUdonBehaviour: {fileID: 1012840705}
|
_udonSharpBackingUdonBehaviour: {fileID: 1012840705}
|
||||||
_LocationFindingEnabled: 0
|
_LocationFindingEnabled: 0
|
||||||
_GameManager: {fileID: 969831474}
|
_GameManager: {fileID: 969831474}
|
||||||
|
_LitLampMaterial: {fileID: 2100000, guid: 3fef7fe6d628ca64ba291c8ee8d7a723, type: 2}
|
||||||
--- !u!64 &1012840707
|
--- !u!64 &1012840707
|
||||||
MeshCollider:
|
MeshCollider:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -23250,6 +23305,7 @@ MonoBehaviour:
|
|||||||
_udonSharpBackingUdonBehaviour: {fileID: 1055793927}
|
_udonSharpBackingUdonBehaviour: {fileID: 1055793927}
|
||||||
_LocationFindingEnabled: 0
|
_LocationFindingEnabled: 0
|
||||||
_GameManager: {fileID: 969831474}
|
_GameManager: {fileID: 969831474}
|
||||||
|
_LitLampMaterial: {fileID: 2100000, guid: 3fef7fe6d628ca64ba291c8ee8d7a723, type: 2}
|
||||||
--- !u!64 &1055793929
|
--- !u!64 &1055793929
|
||||||
MeshCollider:
|
MeshCollider:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -30722,6 +30778,7 @@ MonoBehaviour:
|
|||||||
_udonSharpBackingUdonBehaviour: {fileID: 1507936582}
|
_udonSharpBackingUdonBehaviour: {fileID: 1507936582}
|
||||||
_LocationFindingEnabled: 0
|
_LocationFindingEnabled: 0
|
||||||
_GameManager: {fileID: 969831474}
|
_GameManager: {fileID: 969831474}
|
||||||
|
_LitLampMaterial: {fileID: 2100000, guid: 3fef7fe6d628ca64ba291c8ee8d7a723, type: 2}
|
||||||
--- !u!64 &1507936584
|
--- !u!64 &1507936584
|
||||||
MeshCollider:
|
MeshCollider:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -35670,6 +35727,7 @@ MonoBehaviour:
|
|||||||
_udonSharpBackingUdonBehaviour: {fileID: 1647705499}
|
_udonSharpBackingUdonBehaviour: {fileID: 1647705499}
|
||||||
_LocationFindingEnabled: 0
|
_LocationFindingEnabled: 0
|
||||||
_GameManager: {fileID: 969831474}
|
_GameManager: {fileID: 969831474}
|
||||||
|
_LitLampMaterial: {fileID: 2100000, guid: 3fef7fe6d628ca64ba291c8ee8d7a723, type: 2}
|
||||||
--- !u!64 &1647705501
|
--- !u!64 &1647705501
|
||||||
MeshCollider:
|
MeshCollider:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -36306,6 +36364,7 @@ MonoBehaviour:
|
|||||||
_udonSharpBackingUdonBehaviour: {fileID: 1662234761}
|
_udonSharpBackingUdonBehaviour: {fileID: 1662234761}
|
||||||
_LocationFindingEnabled: 0
|
_LocationFindingEnabled: 0
|
||||||
_GameManager: {fileID: 969831474}
|
_GameManager: {fileID: 969831474}
|
||||||
|
_LitLampMaterial: {fileID: 2100000, guid: 3fef7fe6d628ca64ba291c8ee8d7a723, type: 2}
|
||||||
--- !u!64 &1662234763
|
--- !u!64 &1662234763
|
||||||
MeshCollider:
|
MeshCollider:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -37795,6 +37854,7 @@ MonoBehaviour:
|
|||||||
_udonSharpBackingUdonBehaviour: {fileID: 1801476823}
|
_udonSharpBackingUdonBehaviour: {fileID: 1801476823}
|
||||||
_LocationFindingEnabled: 0
|
_LocationFindingEnabled: 0
|
||||||
_GameManager: {fileID: 969831474}
|
_GameManager: {fileID: 969831474}
|
||||||
|
_LitLampMaterial: {fileID: 2100000, guid: 3fef7fe6d628ca64ba291c8ee8d7a723, type: 2}
|
||||||
--- !u!64 &1801476825
|
--- !u!64 &1801476825
|
||||||
MeshCollider:
|
MeshCollider:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -41887,6 +41947,7 @@ MonoBehaviour:
|
|||||||
_udonSharpBackingUdonBehaviour: {fileID: 2023627961}
|
_udonSharpBackingUdonBehaviour: {fileID: 2023627961}
|
||||||
_LocationFindingEnabled: 0
|
_LocationFindingEnabled: 0
|
||||||
_GameManager: {fileID: 969831474}
|
_GameManager: {fileID: 969831474}
|
||||||
|
_LitLampMaterial: {fileID: 2100000, guid: 3fef7fe6d628ca64ba291c8ee8d7a723, type: 2}
|
||||||
--- !u!64 &2023627963
|
--- !u!64 &2023627963
|
||||||
MeshCollider:
|
MeshCollider:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -43555,6 +43616,7 @@ MonoBehaviour:
|
|||||||
_udonSharpBackingUdonBehaviour: {fileID: 2067971418}
|
_udonSharpBackingUdonBehaviour: {fileID: 2067971418}
|
||||||
_LocationFindingEnabled: 0
|
_LocationFindingEnabled: 0
|
||||||
_GameManager: {fileID: 969831474}
|
_GameManager: {fileID: 969831474}
|
||||||
|
_LitLampMaterial: {fileID: 2100000, guid: 3fef7fe6d628ca64ba291c8ee8d7a723, type: 2}
|
||||||
--- !u!64 &2067971420
|
--- !u!64 &2067971420
|
||||||
MeshCollider:
|
MeshCollider:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -48971,8 +49033,11 @@ MonoBehaviour:
|
|||||||
DynamicPrefabs: []
|
DynamicPrefabs: []
|
||||||
DynamicMaterials:
|
DynamicMaterials:
|
||||||
- {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2}
|
- {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2}
|
||||||
- {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2}
|
|
||||||
- {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2}
|
- {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2}
|
||||||
|
- {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2}
|
||||||
|
- {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2}
|
||||||
|
- {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2}
|
||||||
- {fileID: 2100000, guid: faae26a849699fc4b804b74882a344df, type: 2}
|
- {fileID: 2100000, guid: faae26a849699fc4b804b74882a344df, type: 2}
|
||||||
- {fileID: 2100000, guid: bd8b723337ae5824fa61f693f76e943f, type: 2}
|
- {fileID: 2100000, guid: bd8b723337ae5824fa61f693f76e943f, type: 2}
|
||||||
- {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2}
|
- {fileID: 2100000, guid: 7eb7cd9bfc12d4c4198d1874ca5a1aa4, type: 2}
|
||||||
@ -48987,10 +49052,7 @@ MonoBehaviour:
|
|||||||
- {fileID: 2100000, guid: 74aa3dbc50df9464e8d9d11815b389a7, type: 2}
|
- {fileID: 2100000, guid: 74aa3dbc50df9464e8d9d11815b389a7, type: 2}
|
||||||
- {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2}
|
- {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2}
|
||||||
- {fileID: 2100000, guid: 49170bf20870c7c45873b3c1966d86af, type: 2}
|
- {fileID: 2100000, guid: 49170bf20870c7c45873b3c1966d86af, type: 2}
|
||||||
- {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2}
|
- {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2}
|
||||||
- {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2}
|
|
||||||
- {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2}
|
|
||||||
- {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2}
|
- {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2}
|
||||||
- {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2}
|
- {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2}
|
||||||
- {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2}
|
- {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2}
|
||||||
@ -52015,3 +52077,4 @@ SceneRoots:
|
|||||||
- {fileID: 6044205050412544512}
|
- {fileID: 6044205050412544512}
|
||||||
- {fileID: 875814628}
|
- {fileID: 875814628}
|
||||||
- {fileID: 938262255}
|
- {fileID: 938262255}
|
||||||
|
- {fileID: 123630534}
|
||||||
|
|||||||
8
Assets/Scenes/witwics_Profiles.meta
Normal file
8
Assets/Scenes/witwics_Profiles.meta
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 00ef6c1c0ad9e614c8f349366a69d807
|
||||||
|
folderAsset: yes
|
||||||
|
DefaultImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
63
Assets/Scenes/witwics_Profiles/Post Processing Profile.asset
Normal file
63
Assets/Scenes/witwics_Profiles/Post Processing Profile.asset
Normal file
@ -0,0 +1,63 @@
|
|||||||
|
%YAML 1.1
|
||||||
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
|
--- !u!114 &-5823598373179945978
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 3
|
||||||
|
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: 48a79b01ea5641d4aa6daa2e23605641, type: 3}
|
||||||
|
m_Name: Bloom
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
active: 1
|
||||||
|
enabled:
|
||||||
|
overrideState: 1
|
||||||
|
value: 1
|
||||||
|
intensity:
|
||||||
|
overrideState: 1
|
||||||
|
value: 1
|
||||||
|
threshold:
|
||||||
|
overrideState: 0
|
||||||
|
value: 1
|
||||||
|
softKnee:
|
||||||
|
overrideState: 0
|
||||||
|
value: 0.5
|
||||||
|
clamp:
|
||||||
|
overrideState: 0
|
||||||
|
value: 65472
|
||||||
|
diffusion:
|
||||||
|
overrideState: 0
|
||||||
|
value: 7
|
||||||
|
anamorphicRatio:
|
||||||
|
overrideState: 0
|
||||||
|
value: 0
|
||||||
|
color:
|
||||||
|
overrideState: 0
|
||||||
|
value: {r: 1, g: 1, b: 1, a: 1}
|
||||||
|
fastMode:
|
||||||
|
overrideState: 0
|
||||||
|
value: 0
|
||||||
|
dirtTexture:
|
||||||
|
overrideState: 0
|
||||||
|
value: {fileID: 0}
|
||||||
|
defaultState: 1
|
||||||
|
dirtIntensity:
|
||||||
|
overrideState: 0
|
||||||
|
value: 0
|
||||||
|
--- !u!114 &11400000
|
||||||
|
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: 8e6292b2c06870d4495f009f912b9600, type: 3}
|
||||||
|
m_Name: Post Processing Profile
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
settings:
|
||||||
|
- {fileID: -5823598373179945978}
|
||||||
@ -0,0 +1,8 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 626c9b1e47af7dc4d9583060a42503d1
|
||||||
|
NativeFormatImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
mainObjectFileID: 11400000
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
209
Assets/Shaders/SDF Map Marker Lamp.shader
Normal file
209
Assets/Shaders/SDF Map Marker Lamp.shader
Normal file
@ -0,0 +1,209 @@
|
|||||||
|
Shader "Carmen/Map/Marker Lamp"
|
||||||
|
{
|
||||||
|
Properties
|
||||||
|
{
|
||||||
|
_MainTex("Albedo(RGB)", 2D) = "white" {}
|
||||||
|
_Color("Color", Color) = (1,1,1,1)
|
||||||
|
|
||||||
|
[NoScaleOffset] _MetallicGlossMap("Metallic(R) Smoothness(A) Map", 2D) = "white" {}
|
||||||
|
[Gamma] _Metallic("Metallic", Range(0.0, 1.0)) = 1.0
|
||||||
|
_Glossiness("Smoothness", Range(0.0, 1.0)) = 1.0
|
||||||
|
|
||||||
|
_BumpScale("Scale", Float) = 1.0
|
||||||
|
[NoScaleOffset] _BumpMap("Normal Map", 2D) = "bump" {}
|
||||||
|
|
||||||
|
[NoScaleOffset] _OcclusionMap("Occlusion(G)", 2D) = "white" {}
|
||||||
|
_OcclusionStrength("Strength", Range(0.0, 1.0)) = 1.0
|
||||||
|
|
||||||
|
[NoScaleOffset] _EmissionMap("Emission(RGB)", 2D) = "white" {}
|
||||||
|
_EmissionColor("Emission Color", Color) = (0, 0, 0)
|
||||||
|
|
||||||
|
[Enum(UV0,0,UV1,1)] _UVSec ("UV Set for secondary textures", Float) = 0
|
||||||
|
[NoScaleOffset] _DetailMask("Detail Mask(A)", 2D) = "white" {}
|
||||||
|
|
||||||
|
_DetailAlbedoMap("Detail Albedo x2(RGB)", 2D) = "grey" {}
|
||||||
|
_DetailNormalMapScale("Scale", Float) = 1.0
|
||||||
|
[NoScaleOffset] _DetailNormalMap("Detail Normal Map", 2D) = "bump" {}
|
||||||
|
|
||||||
|
[ToggleOff] _SpecularHighlights("Specular Highlights", Float) = 0
|
||||||
|
[ToggleOff] _GlossyReflections("Glossy Reflections", Float) = 0
|
||||||
|
|
||||||
|
[Toggle(_ENABLE_GEOMETRIC_SPECULAR_AA)] _EnableGeometricSpecularAA("EnableGeometricSpecularAA", Float) = 1.0
|
||||||
|
_SpecularAAScreenSpaceVariance("SpecularAAScreenSpaceVariance", Range(0.0, 1.0)) = 0.1
|
||||||
|
_SpecularAAThreshold("SpecularAAThreshold", Range(0.0, 1.0)) = 0.2
|
||||||
|
|
||||||
|
[Enum(Default,0,MonoSH,1,MonoSH (no highlights),2)] _LightmapType ("Lightmap Type", Float) = 0
|
||||||
|
|
||||||
|
// TODO: This has questionable performance impact on Mobile but very little discernable impact on PC. Should
|
||||||
|
// make a toggle once we have properly branched compilation between those platforms, that's PC-only
|
||||||
|
[Toggle(_BICUBIC)] _Bicubic ("Enable Bicubic Sampling", Float) = 0
|
||||||
|
}
|
||||||
|
|
||||||
|
SubShader
|
||||||
|
{
|
||||||
|
Tags { "RenderType"="Opaque" }
|
||||||
|
LOD 200
|
||||||
|
|
||||||
|
CGPROGRAM
|
||||||
|
|
||||||
|
//#define _DEBUG_VRC
|
||||||
|
#ifdef _DEBUG_VRC
|
||||||
|
#define DEBUG_COL(rgb) debugCol = half4(rgb, 1)
|
||||||
|
#define DEBUG_VAL(val) debugCol = half4(val, val, val, 1)
|
||||||
|
half4 debugCol = half4(0,0,0,1);
|
||||||
|
#else
|
||||||
|
#define DEBUG_COL(rgb)
|
||||||
|
#define DEBUG_VAL(val)
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#pragma target 3.0
|
||||||
|
#pragma multi_compile_fragment _ _EMISSION
|
||||||
|
#pragma multi_compile _ _DETAIL
|
||||||
|
#pragma multi_compile_fragment _ _SPECULARHIGHLIGHTS_OFF
|
||||||
|
#pragma multi_compile_fragment _ _GLOSSYREFLECTIONS_OFF
|
||||||
|
#pragma multi_compile_fragment _ _MONOSH_SPECULAR _MONOSH_NOSPECULAR
|
||||||
|
#pragma multi_compile_fragment _ _ENABLE_GEOMETRIC_SPECULAR_AA
|
||||||
|
#pragma dynamic_branch_local_fragment _ DISABLE_VERTEX_COLORING
|
||||||
|
//SDK-SYNC-IGNORE-LINE - unused variants in SDK projects - #pragma multi_compile_fragment _ FORCE_UNITY_DLDR_LIGHTMAP_ENCODING FORCE_UNITY_RGBM_LIGHTMAP_ENCODING FORCE_UNITY_LIGHTMAP_FULL_HDR_ENCODING UNITY_LIGHTMAP_NONE
|
||||||
|
//#pragma multi_compile _ _BICUBIC
|
||||||
|
|
||||||
|
#if defined(LIGHTMAP_ON)
|
||||||
|
#if defined(_MONOSH_SPECULAR) || defined(_MONOSH_NOSPECULAR)
|
||||||
|
#define _MONOSH
|
||||||
|
#if defined(_MONOSH_SPECULAR)
|
||||||
|
#define _LMSPEC
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "/Packages/com.vrchat.base/Runtime/VRCSDK/Sample Assets/Shaders/Mobile/VRChat.cginc"
|
||||||
|
|
||||||
|
#pragma surface surf StandardVRC vertex:vert exclude_path:prepass exclude_path:deferred noforwardadd noshadow nodynlightmap nolppv noshadowmask
|
||||||
|
#pragma skip_variants LIGHTMAP_SHADOW_MIXING
|
||||||
|
|
||||||
|
// -------------------------------------
|
||||||
|
|
||||||
|
struct Input
|
||||||
|
{
|
||||||
|
float2 texcoord0;
|
||||||
|
#ifdef _DETAIL
|
||||||
|
float2 texcoord1;
|
||||||
|
#endif
|
||||||
|
fixed4 color : COLOR;
|
||||||
|
};
|
||||||
|
|
||||||
|
UNITY_DECLARE_TEX2D(_MainTex);
|
||||||
|
float4 _MainTex_ST;
|
||||||
|
half4 _Color;
|
||||||
|
|
||||||
|
UNITY_DECLARE_TEX2D(_MetallicGlossMap);
|
||||||
|
uniform half _Glossiness;
|
||||||
|
uniform half _Metallic;
|
||||||
|
|
||||||
|
UNITY_DECLARE_TEX2D(_BumpMap);
|
||||||
|
uniform half _BumpScale;
|
||||||
|
|
||||||
|
UNITY_DECLARE_TEX2D(_OcclusionMap);
|
||||||
|
uniform half _OcclusionStrength;
|
||||||
|
|
||||||
|
uniform half _SpecularAAScreenSpaceVariance;
|
||||||
|
uniform half _SpecularAAThreshold;
|
||||||
|
|
||||||
|
#ifdef _EMISSION
|
||||||
|
UNITY_DECLARE_TEX2D(_EmissionMap);
|
||||||
|
half4 _EmissionColor;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef _DETAIL
|
||||||
|
uniform half _UVSec;
|
||||||
|
float4 _DetailAlbedoMap_ST;
|
||||||
|
UNITY_DECLARE_TEX2D(_DetailMask);
|
||||||
|
UNITY_DECLARE_TEX2D(_DetailAlbedoMap);
|
||||||
|
UNITY_DECLARE_TEX2D(_DetailNormalMap);
|
||||||
|
uniform half _DetailNormalMapScale;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Add instancing support for this shader. You need to check 'Enable Instancing' on materials that use the shader.
|
||||||
|
// See https://docs.unity3d.com/Manual/GPUInstancing.html for more information about instancing.
|
||||||
|
// #pragma instancing_options assumeuniformscaling
|
||||||
|
UNITY_INSTANCING_BUFFER_START(Props)
|
||||||
|
// put more per-instance properties here
|
||||||
|
UNITY_INSTANCING_BUFFER_END(Props)
|
||||||
|
|
||||||
|
// -------------------------------------
|
||||||
|
void vert(inout appdata_full v, out Input o)
|
||||||
|
{
|
||||||
|
UNITY_INITIALIZE_OUTPUT(Input,o);
|
||||||
|
o.texcoord0 = TRANSFORM_TEX(v.texcoord.xy, _MainTex); // Always source from uv0
|
||||||
|
#ifdef _DETAIL
|
||||||
|
o.texcoord1 = TRANSFORM_TEX(((_UVSec == 0) ? v.texcoord.xy : v.texcoord1.xy), _DetailAlbedoMap);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
void surf(Input IN, inout SurfaceOutputStandardVRC o)
|
||||||
|
{
|
||||||
|
// Albedo comes from a texture tinted by color
|
||||||
|
half4 albedoMap = UNITY_SAMPLE_TEX2D(_MainTex, IN.texcoord0) * _Color;
|
||||||
|
if(!DISABLE_VERTEX_COLORING)
|
||||||
|
albedoMap *= IN.color;
|
||||||
|
o.Albedo = albedoMap.rgb;
|
||||||
|
|
||||||
|
// Metallic and smoothness come from slider variables
|
||||||
|
half4 metallicGlossMap = UNITY_SAMPLE_TEX2D(_MetallicGlossMap, IN.texcoord0);
|
||||||
|
o.Metallic = metallicGlossMap.r * _Metallic;
|
||||||
|
o.Smoothness = metallicGlossMap.a * _Glossiness;
|
||||||
|
|
||||||
|
// Occlusion is sampled from the Green channel to match up with Standard. Can be packed to Metallic if you insert it into multiple slots.
|
||||||
|
o.Occlusion = LerpOneTo(UNITY_SAMPLE_TEX2D(_OcclusionMap, IN.texcoord0).g, _OcclusionStrength);
|
||||||
|
|
||||||
|
// only takes into account directional lights, so only use if using noforwardadd!
|
||||||
|
float dx0 = ddx(IN.texcoord0);
|
||||||
|
float dy0 = ddy(IN.texcoord0);
|
||||||
|
#if defined(LIGHTMAP_ON) && !defined(_MONOSH) && !defined(DIRLIGHTMAP_COMBINED) && defined(_GLOSSYREFLECTIONS_OFF)
|
||||||
|
UNITY_BRANCH if (any(_LightColor0.xyz))
|
||||||
|
#else
|
||||||
|
if (true)
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
o.Normal = UnpackScaleNormal(SAMPLE_TEXTURE2D_GRAD(_BumpMap, sampler_BumpMap, IN.texcoord0, dx0, dy0), _BumpScale);
|
||||||
|
} else {
|
||||||
|
o.Normal = half3(0, 0, 1);
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef _ENABLE_GEOMETRIC_SPECULAR_AA
|
||||||
|
o.SpecularAAVariance = _SpecularAAScreenSpaceVariance;
|
||||||
|
o.SpecularAAThreshold = _SpecularAAThreshold;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef _DETAIL
|
||||||
|
half4 detailMask = UNITY_SAMPLE_TEX2D(_DetailMask, IN.texcoord0);
|
||||||
|
float dx1 = ddx(IN.texcoord1);
|
||||||
|
float dy1 = ddy(IN.texcoord1);
|
||||||
|
UNITY_BRANCH
|
||||||
|
if (detailMask.a > 0)
|
||||||
|
{
|
||||||
|
half4 detailAlbedoMap = SAMPLE_TEXTURE2D_GRAD(_DetailAlbedoMap, sampler_DetailAlbedoMap, IN.texcoord1, dx1, dy1);
|
||||||
|
o.Albedo *= LerpWhiteTo(detailAlbedoMap.rgb * unity_ColorSpaceDouble.rgb, detailMask.a);
|
||||||
|
|
||||||
|
#if defined(LIGHTMAP_ON) && !defined(_MONOSH) && !defined(DIRLIGHTMAP_COMBINED) && defined(_GLOSSYREFLECTIONS_OFF)
|
||||||
|
UNITY_BRANCH if (any(_LightColor0.xyz))
|
||||||
|
#else
|
||||||
|
if (true)
|
||||||
|
#endif
|
||||||
|
{
|
||||||
|
half3 detailNormalTangent = UnpackScaleNormal(SAMPLE_TEXTURE2D_GRAD(_DetailNormalMap, sampler_DetailNormalMap, IN.texcoord1, dx1, dy1), _DetailNormalMapScale);
|
||||||
|
o.Normal = lerp(o.Normal, BlendNormals(o.Normal, detailNormalTangent), detailMask.a);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef _EMISSION
|
||||||
|
o.Emission = _EmissionColor * frac(sin(_Time * 150.0) / 2.0 + 1.5);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
ENDCG
|
||||||
|
}
|
||||||
|
|
||||||
|
FallBack "VRChat/Mobile/Diffuse"
|
||||||
|
CustomEditor "StandardLiteShaderGUI"
|
||||||
|
}
|
||||||
9
Assets/Shaders/SDF Map Marker Lamp.shader.meta
Normal file
9
Assets/Shaders/SDF Map Marker Lamp.shader.meta
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 9f94b38d823fc7a4897e2e1f0c9b263f
|
||||||
|
ShaderImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
defaultTextures: []
|
||||||
|
nonModifiableTextures: []
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
@ -1,774 +1,129 @@
|
|||||||
Shader "Carmen/Maps/SDF Map Marker Spokes"
|
Shader "Carmen/SDF/Map Marker Spokes"
|
||||||
{
|
{
|
||||||
Properties
|
Properties
|
||||||
{
|
|
||||||
_MainTex("Albedo(RGB)", 2D) = "white" {}
|
|
||||||
_Color("Color", Color) = (1,1,1,1)
|
|
||||||
_SDFCutoff("SDF Cutoff", Range(0.0, 1.0)) = 1.0
|
|
||||||
|
|
||||||
[NoScaleOffset] _MetallicGlossMap("Metallic(R) Smoothness(A) Map", 2D) = "white" {}
|
|
||||||
[Gamma] _Metallic("Metallic", Range(0.0, 1.0)) = 1.0
|
|
||||||
_Glossiness("Smoothness", Range(0.0, 1.0)) = 1.0
|
|
||||||
|
|
||||||
_BumpScale("Scale", Float) = 1.0
|
|
||||||
[NoScaleOffset] _BumpMap("Normal Map", 2D) = "bump" {}
|
|
||||||
|
|
||||||
[NoScaleOffset] _OcclusionMap("Occlusion(G)", 2D) = "white" {}
|
|
||||||
_OcclusionStrength("Strength", Range(0.0, 1.0)) = 1.0
|
|
||||||
|
|
||||||
[NoScaleOffset] _EmissionMap("Emission(RGB)", 2D) = "white" {}
|
|
||||||
_EmissionColor("Emission Color", Color) = (0, 0, 0)
|
|
||||||
|
|
||||||
[Enum(UV0,0,UV1,1)] _UVSec ("UV Set for secondary textures", Float) = 0
|
|
||||||
[NoScaleOffset] _DetailMask("Detail Mask(A)", 2D) = "white" {}
|
|
||||||
|
|
||||||
_DetailAlbedoMap("Detail Albedo x2(RGB)", 2D) = "grey" {}
|
|
||||||
_DetailNormalMapScale("Scale", Float) = 1.0
|
|
||||||
[NoScaleOffset] _DetailNormalMap("Detail Normal Map", 2D) = "bump" {}
|
|
||||||
|
|
||||||
[ToggleOff] _SpecularHighlights("Specular Highlights", Float) = 0
|
|
||||||
[ToggleOff] _GlossyReflections("Glossy Reflections", Float) = 0
|
|
||||||
|
|
||||||
[Toggle(_ENABLE_GEOMETRIC_SPECULAR_AA)] _EnableGeometricSpecularAA("EnableGeometricSpecularAA", Float) = 1.0
|
|
||||||
_SpecularAAScreenSpaceVariance("SpecularAAScreenSpaceVariance", Range(0.0, 1.0)) = 0.1
|
|
||||||
_SpecularAAThreshold("SpecularAAThreshold", Range(0.0, 1.0)) = 0.2
|
|
||||||
|
|
||||||
[Enum(Default,0,MonoSH,1,MonoSH (no highlights),2)] _LightmapType ("Lightmap Type", Float) = 0
|
|
||||||
|
|
||||||
// TODO: This has questionable performance impact on Mobile but very little discernable impact on PC. Should
|
|
||||||
// make a toggle once we have properly branched compilation between those platforms, that's PC-only
|
|
||||||
[Toggle(_BICUBIC)] _Bicubic ("Enable Bicubic Sampling", Float) = 0
|
|
||||||
}
|
|
||||||
|
|
||||||
SubShader
|
|
||||||
{
|
|
||||||
Tags { "RenderType"="Opaque" }
|
|
||||||
LOD 200
|
|
||||||
|
|
||||||
CGPROGRAM
|
|
||||||
|
|
||||||
//#define _DEBUG_VRC
|
|
||||||
#ifdef _DEBUG_VRC
|
|
||||||
#define DEBUG_COL(rgb) debugCol = half4(rgb, 1)
|
|
||||||
#define DEBUG_VAL(val) debugCol = half4(val, val, val, 1)
|
|
||||||
half4 debugCol = half4(0,0,0,1);
|
|
||||||
#else
|
|
||||||
#define DEBUG_COL(rgb)
|
|
||||||
#define DEBUG_VAL(val)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#pragma target 3.0
|
|
||||||
#pragma multi_compile_fragment _ _EMISSION
|
|
||||||
#pragma multi_compile _ _DETAIL
|
|
||||||
#pragma multi_compile_fragment _ _SPECULARHIGHLIGHTS_OFF
|
|
||||||
#pragma multi_compile_fragment _ _GLOSSYREFLECTIONS_OFF
|
|
||||||
#pragma multi_compile_fragment _ _MONOSH_SPECULAR _MONOSH_NOSPECULAR
|
|
||||||
#pragma multi_compile_fragment _ _ENABLE_GEOMETRIC_SPECULAR_AA
|
|
||||||
#pragma dynamic_branch_local_fragment _ DISABLE_VERTEX_COLORING
|
|
||||||
//SDK-SYNC-IGNORE-LINE - unused variants in SDK projects - #pragma multi_compile_fragment _ FORCE_UNITY_DLDR_LIGHTMAP_ENCODING FORCE_UNITY_RGBM_LIGHTMAP_ENCODING FORCE_UNITY_LIGHTMAP_FULL_HDR_ENCODING UNITY_LIGHTMAP_NONE
|
|
||||||
//#pragma multi_compile _ _BICUBIC
|
|
||||||
|
|
||||||
#if defined(LIGHTMAP_ON)
|
|
||||||
#if defined(_MONOSH_SPECULAR) || defined(_MONOSH_NOSPECULAR)
|
|
||||||
#define _MONOSH
|
|
||||||
#if defined(_MONOSH_SPECULAR)
|
|
||||||
#define _LMSPEC
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef VRCHAT_INCLUDED
|
|
||||||
#define VRCHAT_INCLUDED
|
|
||||||
|
|
||||||
#include "UnityCG.cginc"
|
|
||||||
#include "UnityPBSLighting.cginc"
|
|
||||||
|
|
||||||
#if defined(UNITY_SHOULD_SAMPLE_SH) || defined(LIGHTMAP_ON) || defined(DYNAMICLIGHTMAP_ON)
|
|
||||||
#define UNITY_LIGHT_FUNCTION_APPLY_INDIRECT
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(SHADER_API_D3D11) || defined(SHADER_API_XBOXONE) || defined(UNITY_COMPILER_HLSLCC) || defined(SHADER_API_PSSL) || (defined(SHADER_TARGET_SURFACE_ANALYSIS) && !defined(SHADER_TARGET_SURFACE_ANALYSIS_MOJOSHADER))
|
|
||||||
#define SAMPLE_TEXTURE2D(tex,samplertex,coord) tex.Sample (samplertex,coord)
|
|
||||||
#define SAMPLE_TEXTURE2D_GRAD(tex,samplertex,coord,ddx,ddy) tex.SampleGrad(samplertex, coord, ddx, ddy)
|
|
||||||
#define TEXTURE2D_PARAM(textureName, samplerName) Texture2D textureName, SamplerState samplerName
|
|
||||||
#define TEXTURE2D_ARGS(textureName, samplerName) textureName, samplerName
|
|
||||||
#else
|
|
||||||
#define SAMPLE_TEXTURE2D(tex,samplertex,coord) tex2D (tex,coord)
|
|
||||||
#define SAMPLE_TEXTURE2D_GRAD(tex,samplertex,coord,ddx,ddy) tex2Dgrad(tex, coord, ddx, ddy)
|
|
||||||
#define TEXTURE2D_PARAM(textureName, samplerName) sampler2D textureName
|
|
||||||
#define TEXTURE2D_ARGS(textureName, samplerName) textureName
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Use our squeezed BRDF on mobile
|
|
||||||
// In general we want FLOAT_MIN to be the smallest value such that (1.0f + FLOAT_MIN) != FLOAT_MIN
|
|
||||||
#if defined(SHADER_API_MOBILE)
|
|
||||||
#define VRC_BRDF_PBS BRDF2_VRC_PBS
|
|
||||||
#define FLOAT_MIN 1e-4
|
|
||||||
#else
|
|
||||||
#define VRC_BRDF_PBS UNITY_BRDF_PBS
|
|
||||||
#define FLOAT_MIN 1e-6
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(_BICUBIC)
|
|
||||||
float BakeryBicubic_w0(float a)
|
|
||||||
{
|
|
||||||
return (1.0f/6.0f)*(a*(a*(-a + 3.0f) - 3.0f) + 1.0f);
|
|
||||||
}
|
|
||||||
|
|
||||||
float BakeryBicubic_w1(float a)
|
|
||||||
{
|
|
||||||
return (1.0f/6.0f)*(a*a*(3.0f*a - 6.0f) + 4.0f);
|
|
||||||
}
|
|
||||||
|
|
||||||
float BakeryBicubic_w2(float a)
|
|
||||||
{
|
|
||||||
return (1.0f/6.0f)*(a*(a*(-3.0f*a + 3.0f) + 3.0f) + 1.0f);
|
|
||||||
}
|
|
||||||
|
|
||||||
float BakeryBicubic_w3(float a)
|
|
||||||
{
|
|
||||||
return (1.0f/6.0f)*(a*a*a);
|
|
||||||
}
|
|
||||||
|
|
||||||
float BakeryBicubic_g0(float a)
|
|
||||||
{
|
|
||||||
return BakeryBicubic_w0(a) + BakeryBicubic_w1(a);
|
|
||||||
}
|
|
||||||
|
|
||||||
float BakeryBicubic_g1(float a)
|
|
||||||
{
|
|
||||||
return BakeryBicubic_w2(a) + BakeryBicubic_w3(a);
|
|
||||||
}
|
|
||||||
|
|
||||||
float BakeryBicubic_h0(float a)
|
|
||||||
{
|
|
||||||
return -1.0f + BakeryBicubic_w1(a) / (BakeryBicubic_w0(a) + BakeryBicubic_w1(a)) + 0.5f;
|
|
||||||
}
|
|
||||||
|
|
||||||
float BakeryBicubic_h1(float a)
|
|
||||||
{
|
|
||||||
return 1.0f + BakeryBicubic_w3(a) / (BakeryBicubic_w2(a) + BakeryBicubic_w3(a)) + 0.5f;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Bicubic
|
|
||||||
float4 SampleTexture2DBicubicFilter(TEXTURE2D_PARAM(tex, smp), float2 coord)
|
|
||||||
{
|
|
||||||
#if defined(SHADER_API_D3D11) || defined(SHADER_API_XBOXONE) || defined(UNITY_COMPILER_HLSLCC) || defined(SHADER_API_PSSL) || (defined(SHADER_TARGET_SURFACE_ANALYSIS) && !defined(SHADER_TARGET_SURFACE_ANALYSIS_MOJOSHADER))
|
|
||||||
float width, height;
|
|
||||||
tex.GetDimensions(width, height);
|
|
||||||
float4 texelSize = float4(width, height, 1/width, 1/height);
|
|
||||||
#else
|
|
||||||
float2 theSize = textureSize(tex, 0);
|
|
||||||
float4 texelSize = float4(
|
|
||||||
float(theSize.x),
|
|
||||||
float(theSize.y),
|
|
||||||
1/float(theSize.x),
|
|
||||||
1/float(theSize.y));;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
float x = coord.x * texelSize.z;
|
|
||||||
float y = coord.y * texelSize.z;
|
|
||||||
|
|
||||||
x -= 0.5f;
|
|
||||||
y -= 0.5f;
|
|
||||||
|
|
||||||
float px = floor(x);
|
|
||||||
float py = floor(y);
|
|
||||||
|
|
||||||
float fx = x - px;
|
|
||||||
float fy = y - py;
|
|
||||||
|
|
||||||
float g0x = BakeryBicubic_g0(fx);
|
|
||||||
float g1x = BakeryBicubic_g1(fx);
|
|
||||||
float h0x = BakeryBicubic_h0(fx);
|
|
||||||
float h1x = BakeryBicubic_h1(fx);
|
|
||||||
float h0y = BakeryBicubic_h0(fy);
|
|
||||||
float h1y = BakeryBicubic_h1(fy);
|
|
||||||
|
|
||||||
return BakeryBicubic_g0(fy) * ( g0x * SAMPLE_TEXTURE2D(tex, smp, (float2(px + h0x, py + h0y) * texelSize.x)) +
|
|
||||||
g1x * SAMPLE_TEXTURE2D(tex, smp, (float2(px + h1x, py + h0y) * texelSize.x))) +
|
|
||||||
BakeryBicubic_g1(fy) * ( g0x * SAMPLE_TEXTURE2D(tex, smp, (float2(px + h0x, py + h1y) * texelSize.x)) +
|
|
||||||
g1x * SAMPLE_TEXTURE2D(tex, smp, (float2(px + h1x, py + h1y) * texelSize.x)));
|
|
||||||
}
|
|
||||||
#define MAYBE_BICUBIC_SAMPLE(texture, smp, uv) SampleTexture2DBicubicFilter(TEXTURE2D_ARGS(texture, smp), uv)
|
|
||||||
#else
|
|
||||||
#define MAYBE_BICUBIC_SAMPLE(texture, smp, uv) SAMPLE_TEXTURE2D(texture, smp, uv)
|
|
||||||
#endif
|
|
||||||
|
|
||||||
inline half3 VRC_SafeNormalize(half3 value)
|
|
||||||
{
|
|
||||||
float lenSqr = max((float)dot(value, value), FLOAT_MIN);
|
|
||||||
return value * (half) rsqrt(lenSqr);
|
|
||||||
}
|
|
||||||
|
|
||||||
inline half shEvaluateDiffuseL1Geomerics(half L0, half3 L1, half3 n)
|
|
||||||
{
|
|
||||||
// avg direction of incoming light
|
|
||||||
half3 R1 = 0.5f * L1;
|
|
||||||
|
|
||||||
// directional brightness
|
|
||||||
half lenR1 = length(R1);
|
|
||||||
|
|
||||||
// linear angle between normal and direction 0-1, saturate fix from filamented
|
|
||||||
half q = dot(VRC_SafeNormalize(R1), n) * 0.5 + 0.5;
|
|
||||||
q = isnan(q) ? 1 : q;
|
|
||||||
q = saturate(q);
|
|
||||||
|
|
||||||
// power for q
|
|
||||||
// lerps from 1 (linear) to 3 (cubic) based on directionality
|
|
||||||
//half p = 1.0f + 2.0f * lenR1 / L0;
|
|
||||||
|
|
||||||
// dynamic range constant
|
|
||||||
// should vary between 4 (highly directional) and 0 (ambient)
|
|
||||||
//half a = (1.0f - lenR1 / L0) / (1.0f + lenR1 / L0);
|
|
||||||
|
|
||||||
// negative ambient fix, if L0 <= 0, return 0
|
|
||||||
//return (L0 <= 0.f) ? 0.f : (L0 * (a + (1.0f - a) * (p + 1.0f) * pow(q, p)));
|
|
||||||
|
|
||||||
// optimized reordering. thanks wolfram
|
|
||||||
return (L0 <= 0.f) ? 0.f : ( 4. * lenR1 * pow(q, (2 * lenR1) / L0 + 1) + ( L0 * (L0 - lenR1) )/(L0 + lenR1));
|
|
||||||
}
|
|
||||||
|
|
||||||
inline half shEvaluateDiffuseL1Normalized(half L0, half3 L1, half3 n)
|
|
||||||
{
|
|
||||||
return shEvaluateDiffuseL1Geomerics(1, L1 / L0, n);
|
|
||||||
}
|
|
||||||
|
|
||||||
#if defined(_ENABLE_GEOMETRIC_SPECULAR_AA)
|
|
||||||
float PerceptualSmoothnessToRoughness(float perceptualSmoothness)
|
|
||||||
{
|
|
||||||
float perceptualRoughness = SmoothnessToPerceptualRoughness(perceptualSmoothness);
|
|
||||||
half roughness = PerceptualRoughnessToRoughness(perceptualRoughness);
|
|
||||||
return roughness;
|
|
||||||
}
|
|
||||||
|
|
||||||
float RoughnessToPerceptualSmoothness(float roughness)
|
|
||||||
{
|
|
||||||
float perceptualRoughness = RoughnessToPerceptualRoughness(roughness);
|
|
||||||
return 1.0 - perceptualRoughness;
|
|
||||||
}
|
|
||||||
|
|
||||||
float ProjectedSpaceNormalFiltering(half perceptualSmoothness, float variance, float threshold)
|
|
||||||
{
|
|
||||||
float roughness = PerceptualSmoothnessToRoughness(perceptualSmoothness);
|
|
||||||
// Ref: Stable Geometric Specular Antialiasing with Projected-Space NDF Filtering - https://yusuketokuyoshi.com/papers/2021/Tokuyoshi2021SAA.pdf
|
|
||||||
float squaredRoughness = roughness * roughness;
|
|
||||||
float projRoughness2 = squaredRoughness / (1.0 - squaredRoughness);
|
|
||||||
float filteredProjRoughness2 = saturate(projRoughness2 + min(2.0 * variance, threshold * threshold));
|
|
||||||
squaredRoughness = filteredProjRoughness2 / (filteredProjRoughness2 + 1.0f);
|
|
||||||
|
|
||||||
return RoughnessToPerceptualSmoothness(sqrt(squaredRoughness));
|
|
||||||
}
|
|
||||||
|
|
||||||
// Reference: Error Reduction and Simplification for Shading Anti-Aliasing
|
|
||||||
// Specular antialiasing for geometry-induced normal (and NDF) variations: Tokuyoshi / Kaplanyan et al.'s method.
|
|
||||||
// This is the deferred approximation, which works reasonably well so we keep it for forward too for now.
|
|
||||||
// screenSpaceVariance should be at most 0.5^2 = 0.25, as that corresponds to considering
|
|
||||||
// a gaussian pixel reconstruction kernel with a standard deviation of 0.5 of a pixel, thus 2 sigma covering the whole pixel.
|
|
||||||
float GeometricNormalVariance(float3 geometricNormalWS, float screenSpaceVariance)
|
|
||||||
{
|
|
||||||
float3 deltaU = ddx(geometricNormalWS);
|
|
||||||
float3 deltaV = ddy(geometricNormalWS);
|
|
||||||
|
|
||||||
return screenSpaceVariance * (dot(deltaU, deltaU) + dot(deltaV, deltaV));
|
|
||||||
}
|
|
||||||
|
|
||||||
float ProjectedSpaceGeometricNormalFiltering(float perceptualSmoothness, float3 geometricNormalWS, float screenSpaceVariance, float threshold)
|
|
||||||
{
|
|
||||||
float variance = GeometricNormalVariance(geometricNormalWS, screenSpaceVariance);
|
|
||||||
return ProjectedSpaceNormalFiltering(perceptualSmoothness, variance, threshold);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
//#define OLD_GGX_TERM
|
|
||||||
#if !defined (OLD_GGX_TERM)
|
|
||||||
inline half ComputeSpecularGGX(half3 nL1, half3 viewDir, half3 normalWorld, half smoothness)
|
|
||||||
{
|
|
||||||
nL1 = VRC_SafeNormalize(nL1);
|
|
||||||
|
|
||||||
half3 halfDir = VRC_SafeNormalize(nL1 - viewDir);
|
|
||||||
half nh = saturate(dot(normalWorld, halfDir));
|
|
||||||
|
|
||||||
half perceptualRoughness = SmoothnessToPerceptualRoughness(smoothness);//* sqrt(focus));
|
|
||||||
half roughness = PerceptualRoughnessToRoughness(perceptualRoughness);
|
|
||||||
|
|
||||||
half lh = saturate(dot(nL1, halfDir));
|
|
||||||
// ------------------------
|
|
||||||
// Specular term
|
|
||||||
// GGX Distribution multiplied by combined approximation of Visibility and Fresnel
|
|
||||||
// See "Optimizing PBR for Mobile" from Siggraph 2015 moving mobile graphics course
|
|
||||||
// https://community.arm.com/events/1155
|
|
||||||
|
|
||||||
half a = roughness;
|
|
||||||
half a2 = a*a;
|
|
||||||
|
|
||||||
half d = nh * nh * (a2 - 1.f) + 1.00001f;
|
|
||||||
half specularTerm = a2 / (max(0.1f, lh*lh) * (a + 0.5f) * (d * d) * 4);
|
|
||||||
|
|
||||||
#if defined (SHADER_API_MOBILE)
|
|
||||||
// on mobiles (where half actually means something) denominator have risk of overflow
|
|
||||||
// clamp below was added specifically to "fix" that, but dx compiler (we convert bytecode to metal/gles)
|
|
||||||
// sees that specularTerm have only non-negative terms, so it skips max(0,..) in clamp (leaving only min(100,...))
|
|
||||||
specularTerm = specularTerm - FLOAT_MIN;
|
|
||||||
specularTerm = clamp(specularTerm, 0.0, 100.0); // Prevent FP16 overflow on mobiles
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return specularTerm;
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
inline half ComputeSpecularGGX(half3 nL1, half3 viewDir, half3 normalWorld, half smoothness)
|
|
||||||
{
|
|
||||||
nL1 = VRC_SafeNormalize(nL1);
|
|
||||||
half3 halfDir = VRC_SafeNormalize(nL1 - viewDir);
|
|
||||||
half nh = saturate(dot(normalWorld, halfDir));
|
|
||||||
half perceptualRoughness = SmoothnessToPerceptualRoughness(smoothness );//* sqrt(focus));
|
|
||||||
half roughness = PerceptualRoughnessToRoughness(perceptualRoughness);
|
|
||||||
return GGXTerm(nh, roughness);
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(_MONOSH)
|
|
||||||
// MonoSH by Bakery Lightmapper https://assetstore.unity.com/packages/tools/level-design/bakery-gpu-lightmapper-122218
|
|
||||||
inline void BakeryMonoSH(out half3 diffuseColor, out half3 specularContrib, float2 lmUV, half3 normalWorld, half3 viewDir, half smoothness, half occlusion)
|
|
||||||
{
|
|
||||||
half3 dominantDir = MAYBE_BICUBIC_SAMPLE(unity_LightmapInd, samplerunity_Lightmap, lmUV).xyz;;
|
|
||||||
half3 L0 = DecodeLightmap(MAYBE_BICUBIC_SAMPLE(unity_Lightmap, samplerunity_Lightmap, lmUV));
|
|
||||||
|
|
||||||
half3 nL1 = dominantDir * 2 - 1;
|
|
||||||
half3x3 L1 = half3x3(nL1.x * L0, nL1.y * L0, nL1.z * L0) * 2;
|
|
||||||
|
|
||||||
half lumaL0 = dot(L0, 1);
|
|
||||||
half3 lumaL1 = mul(L1, half3(1, 1, 1));
|
|
||||||
half lumaSH = shEvaluateDiffuseL1Geomerics(lumaL0, lumaL1, normalWorld);
|
|
||||||
|
|
||||||
half3 sh = L0 + mul(normalWorld, L1);
|
|
||||||
half regularLumaSH = dot(sh, 1);
|
|
||||||
sh *= lerp(1, lumaSH / regularLumaSH, saturate(regularLumaSH*16));
|
|
||||||
|
|
||||||
diffuseColor = max(sh, 0.0);
|
|
||||||
|
|
||||||
#if defined(_LMSPEC)
|
|
||||||
half L1len = length(mul(L1, half3(1, 1, 1)));
|
|
||||||
half focus = L1len / (length(L0) + L1len);
|
|
||||||
half specularTerm = ComputeSpecularGGX(nL1, viewDir, normalWorld, smoothness * focus);
|
|
||||||
|
|
||||||
sh = L0 + mul(nL1, L1);
|
|
||||||
|
|
||||||
specularContrib = max(specularTerm * sh, 0.0);
|
|
||||||
|
|
||||||
// Reflection Probes use occlusion, direct lights don't. MonoSH and Specular Hack are both somewhere in between,
|
|
||||||
// so we use focus to split the difference - 1.0 is direct, 0.0 is reflection probe, so we invert.
|
|
||||||
specularContrib *= LerpOneTo(occlusion, 1 - focus);
|
|
||||||
#else
|
|
||||||
specularContrib = 0;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
|
|
||||||
inline UnityGI UnityGI_BaseVRC(UnityGIInput data, half occlusion, half3 normalWorld, half3 eyeVec, half smoothness, half hasReflProbe)
|
|
||||||
{
|
|
||||||
UnityGI o_gi;
|
|
||||||
|
|
||||||
// Base pass with Lightmap support is responsible for handling ShadowMask / blending here for performance reason
|
|
||||||
#if defined(HANDLE_SHADOWS_BLENDING_IN_GI)
|
|
||||||
half bakedAtten = UnitySampleBakedOcclusion(data.lightmapUV.xy, data.worldPos);
|
|
||||||
float zDist = dot(_WorldSpaceCameraPos - data.worldPos, UNITY_MATRIX_V[2].xyz);
|
|
||||||
float fadeDist = UnityComputeShadowFadeDistance(data.worldPos, zDist);
|
|
||||||
data.atten = UnityMixRealtimeAndBakedShadows(data.atten, bakedAtten, UnityComputeShadowFade(fadeDist));
|
|
||||||
#endif
|
|
||||||
|
|
||||||
o_gi.light = data.light;
|
|
||||||
o_gi.light.color *= data.atten;
|
|
||||||
|
|
||||||
#if defined(LIGHTMAP_ON)
|
|
||||||
#if defined(_MONOSH)
|
|
||||||
BakeryMonoSH(o_gi.indirect.diffuse, o_gi.indirect.specular, data.lightmapUV.xy, normalWorld, eyeVec, smoothness, occlusion);
|
|
||||||
#else
|
|
||||||
// Baked lightmaps
|
|
||||||
|
|
||||||
half3 bakedColor = half3(1.0, 1.0, 1.0);
|
|
||||||
half4 bakedColorTex = UNITY_SAMPLE_TEX2D(unity_Lightmap, data.lightmapUV.xy);
|
|
||||||
#if defined(FORCE_UNITY_DLDR_LIGHTMAP_ENCODING)
|
|
||||||
bakedColor = DecodeLightmapDoubleLDR(bakedColorTex, unity_Lightmap_HDR);
|
|
||||||
#elif defined(FORCE_UNITY_RGBM_LIGHTMAP_ENCODING)
|
|
||||||
bakedColor = DecodeLightmapRGBM(bakedColorTex, unity_Lightmap_HDR);
|
|
||||||
#elif defined(FORCE_UNITY_LIGHTMAP_FULL_HDR_ENCODING)
|
|
||||||
bakedColor = bakedColorTex;
|
|
||||||
#else
|
|
||||||
bakedColor = DecodeLightmap(bakedColorTex);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Can be set if the renderer has a valid lightmap but the shader doesn't use it
|
|
||||||
#if !defined(UNITY_LIGHTMAP_NONE)
|
|
||||||
#if defined(DIRLIGHTMAP_COMBINED)
|
|
||||||
fixed4 bakedDirTex = UNITY_SAMPLE_TEX2D_SAMPLER(unity_LightmapInd, unity_Lightmap, data.lightmapUV.xy);
|
|
||||||
o_gi.indirect.diffuse = DecodeDirectionalLightmap(bakedColor, bakedDirTex, normalWorld);
|
|
||||||
#else // not directional lightmap
|
|
||||||
o_gi.indirect.diffuse = bakedColor;
|
|
||||||
#endif
|
|
||||||
#else
|
|
||||||
o_gi.indirect.diffuse = 1;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
o_gi.indirect.specular = 0;
|
|
||||||
#endif
|
|
||||||
o_gi.indirect.diffuse *= occlusion;
|
|
||||||
#elif defined(UNITY_SHOULD_SAMPLE_SH)
|
|
||||||
o_gi.indirect.diffuse.r = shEvaluateDiffuseL1Geomerics(unity_SHAr.w, unity_SHAr.xyz, normalWorld);
|
|
||||||
o_gi.indirect.diffuse.g = shEvaluateDiffuseL1Geomerics(unity_SHAg.w, unity_SHAg.xyz, normalWorld);
|
|
||||||
o_gi.indirect.diffuse.b = shEvaluateDiffuseL1Geomerics(unity_SHAb.w, unity_SHAb.xyz, normalWorld);
|
|
||||||
|
|
||||||
#if !defined(_SPECULARHIGHLIGHTS_OFF)
|
|
||||||
UNITY_BRANCH
|
|
||||||
#if !defined(_GLOSSYREFLECTIONS_OFF)
|
|
||||||
if(!any(o_gi.light.color) && !hasReflProbe)
|
|
||||||
#else
|
|
||||||
if(!any(o_gi.light.color))
|
|
||||||
#endif
|
|
||||||
{
|
|
||||||
half3 L0rgb = half3(unity_SHAr.w, unity_SHAg.w, unity_SHAb.w);
|
|
||||||
half3x3 L1rgb = half3x3(unity_SHAr.x, unity_SHAg.x, unity_SHAb.x,
|
|
||||||
unity_SHAr.y, unity_SHAg.y, unity_SHAb.y,
|
|
||||||
unity_SHAr.z, unity_SHAg.z, unity_SHAb.z);
|
|
||||||
half3 L1 = unity_SHAr.xyz + unity_SHAg.xyz + unity_SHAb.xyz;
|
|
||||||
|
|
||||||
half3 dominantDir = VRC_SafeNormalize(L1);
|
|
||||||
|
|
||||||
// Light can be anywhere from 'fully sparse' to 'completely focused' based on how much of it is L0 or L1rgb.
|
|
||||||
half L1len = length(L1);
|
|
||||||
half focus = L1len / (length(L0rgb) + L1len);
|
|
||||||
half specularTerm = ComputeSpecularGGX(dominantDir, eyeVec, normalWorld, smoothness * focus);
|
|
||||||
|
|
||||||
// L0 + L1, the total light energy expected, is the same over the whole mesh. This is a problem with specular highlights
|
|
||||||
// as they have a second peak in the negative direction - normally hidden by the fact that light energy there is normally zero.
|
|
||||||
// Multiplying by non-linear diffuse gives satisfactory results, though isn't particularly physically accurate.
|
|
||||||
// The brightness vs ground truth (a reflection probe) is too low though... closest we can get appears to be
|
|
||||||
// a dimensionless version, shEvaluateDiffuseL1Geometrics but applied to just the ratio.
|
|
||||||
half energyFactor = shEvaluateDiffuseL1Normalized(dot(L0rgb, 1), L1, normalWorld);
|
|
||||||
half3 sh = (L0rgb + mul(dominantDir, L1rgb)) * energyFactor;
|
|
||||||
|
|
||||||
o_gi.indirect.specular = max(specularTerm * sh, 0.0);
|
|
||||||
|
|
||||||
// Reflection Probes use occlusion, direct lights don't. MonoSH and Specular Hack are both somewhere in between,
|
|
||||||
// so we use focus to split the difference - 1.0 is direct, 0.0 is reflection probe, so we invert.
|
|
||||||
o_gi.indirect.specular *= LerpOneTo(occlusion, 1 - focus);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
o_gi.indirect.specular = 0;
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
o_gi.indirect.specular = 0;
|
|
||||||
#endif
|
|
||||||
o_gi.indirect.diffuse += data.ambient;
|
|
||||||
o_gi.indirect.diffuse *= occlusion;
|
|
||||||
#else
|
|
||||||
o_gi.indirect.specular = 0;
|
|
||||||
o_gi.indirect.diffuse = 0;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return o_gi;
|
|
||||||
}
|
|
||||||
|
|
||||||
struct SurfaceOutputStandardVRC
|
|
||||||
{
|
|
||||||
fixed3 Albedo; // base (diffuse or specular) color
|
|
||||||
float3 Normal; // tangent space normal, if written
|
|
||||||
half3 Emission;
|
|
||||||
half Metallic; // 0=non-metal, 1=metal
|
|
||||||
// Smoothness is the user facing name, it should be perceptual smoothness but user should not have to deal with it.
|
|
||||||
// Everywhere in the code you meet smoothness it is perceptual smoothness
|
|
||||||
half Smoothness; // 0=rough, 1=smooth
|
|
||||||
half Occlusion;
|
|
||||||
#if defined(_ENABLE_GEOMETRIC_SPECULAR_AA)
|
|
||||||
half SpecularAAVariance;
|
|
||||||
half SpecularAAThreshold;
|
|
||||||
#endif
|
|
||||||
fixed Alpha; // alpha for transparencies
|
|
||||||
half MinimumBrightness; // minimum brightness regardless of lighting
|
|
||||||
};
|
|
||||||
|
|
||||||
struct SurfaceOutputVRC
|
|
||||||
{
|
|
||||||
fixed3 Albedo;
|
|
||||||
fixed3 Normal;
|
|
||||||
fixed3 Emission;
|
|
||||||
half Specular;
|
|
||||||
fixed Gloss;
|
|
||||||
fixed Alpha;
|
|
||||||
};
|
|
||||||
|
|
||||||
// Based on BRDF2_Unity_PBS
|
|
||||||
// Modified here to re-use calculations for MonoSH and squeeze out all use cases not covered by VRC
|
|
||||||
half4 BRDF2_VRC_PBS (half3 diffColor, half3 specColor, half oneMinusReflectivity, half smoothness,
|
|
||||||
float3 normal, float3 viewDir,
|
|
||||||
UnityLight light, UnityIndirect gi)
|
|
||||||
{
|
|
||||||
half3 color = gi.diffuse * diffColor;
|
|
||||||
#if !defined(_SPECULARHIGHLIGHTS_OFF) || !defined(_GLOSSYREFLECTIONS_OFF)
|
|
||||||
half nv = saturate(dot(normal, viewDir));
|
|
||||||
half grazingTerm = saturate(smoothness + (1-oneMinusReflectivity));
|
|
||||||
// surfaceReduction = Int D(NdotH) * NdotH * Id(NdotL>0) dH = 1/(realRoughness^2+1)
|
|
||||||
half perceptualRoughness = SmoothnessToPerceptualRoughness(smoothness );//* sqrt(focus));
|
|
||||||
half roughness = PerceptualRoughnessToRoughness(perceptualRoughness);
|
|
||||||
|
|
||||||
// 1-0.28*x^3 as approximation for (1/(x^4+1))^(1/2.2) on the domain [0;1]
|
|
||||||
// 1-x^3*(0.6-0.08*x) approximation for 1/(x^4+1)
|
|
||||||
half surfaceReduction = (0.6-0.08*perceptualRoughness);
|
|
||||||
|
|
||||||
surfaceReduction = 1.0 - roughness*perceptualRoughness*surfaceReduction;
|
|
||||||
|
|
||||||
color += surfaceReduction * gi.specular * FresnelLerpFast (specColor, grazingTerm, nv);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// The DIRECTIONAL static branch exists, but in practice it seems like unity never switches back to the non-DIRECTIONAL variant once it switches
|
|
||||||
// Not worth branching for a single dotproduct, i.e. if no specularity
|
|
||||||
#if !defined(_SPECULARHIGHLIGHTS_OFF)
|
|
||||||
UNITY_BRANCH
|
|
||||||
if(any(light.color))
|
|
||||||
#else
|
|
||||||
if (true)
|
|
||||||
#endif
|
|
||||||
{
|
|
||||||
half nl = saturate(dot(normal, light.dir));
|
|
||||||
half3 mergedContrib = diffColor * nl;
|
|
||||||
#if !defined(_SPECULARHIGHLIGHTS_OFF)
|
|
||||||
half specularTerm = ComputeSpecularGGX(light.dir, -viewDir, normal, smoothness);
|
|
||||||
mergedContrib += max(specularTerm * specColor, 0.0);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
color += light.color * mergedContrib;
|
|
||||||
}
|
|
||||||
// Original BRDF's color function.
|
|
||||||
// Interestingly, it doesn't appear as though fresnel is applied to specular highlights caused by lights?
|
|
||||||
// half3 color = (diffColor + specularTerm * specColor) * light.color * nl
|
|
||||||
// + gi.diffuse * diffColor
|
|
||||||
// + surfaceReduction * gi.specular * FresnelLerpFast (specColor, grazingTerm, nv);
|
|
||||||
|
|
||||||
return half4(color, 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
// executed second
|
|
||||||
inline half4 LightingStandardVRC(SurfaceOutputStandardVRC s, float3 viewDir, UnityGI gi)
|
|
||||||
{
|
|
||||||
s.Normal = normalize(s.Normal);
|
|
||||||
#if defined(_ENABLE_GEOMETRIC_SPECULAR_AA)
|
|
||||||
s.Smoothness = ProjectedSpaceGeometricNormalFiltering(s.Smoothness, s.Normal, s.SpecularAAVariance, s.SpecularAAThreshold);
|
|
||||||
#endif
|
|
||||||
half3 specularColor;
|
|
||||||
half oneMinusReflectivity;
|
|
||||||
s.Albedo = DiffuseAndSpecularFromMetallic(s.Albedo, s.Metallic, /*out*/ specularColor, /*out*/ oneMinusReflectivity);
|
|
||||||
|
|
||||||
// shader relies on pre-multiply alpha-blend (_SrcBlend = One, _DstBlend = OneMinusSrcAlpha)
|
|
||||||
// this is necessary to handle transparency in physically correct way - only diffuse component gets affected by alpha
|
|
||||||
half outputAlpha;
|
|
||||||
s.Albedo = PreMultiplyAlpha (s.Albedo, s.Alpha, oneMinusReflectivity, /*out*/ outputAlpha);
|
|
||||||
|
|
||||||
half4 c = VRC_BRDF_PBS(s.Albedo, specularColor, oneMinusReflectivity, s.Smoothness, s.Normal, viewDir, gi.light, gi.indirect);
|
|
||||||
c.a = outputAlpha;
|
|
||||||
|
|
||||||
#ifndef _DEBUG_VRC
|
|
||||||
return c;
|
|
||||||
#else
|
|
||||||
return debugCol;
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
half3 VRC_GlossyEnvironment (UNITY_ARGS_TEXCUBE(tex), half4 hdr, Unity_GlossyEnvironmentData glossIn, out half hasReflProbe)
|
|
||||||
{
|
|
||||||
half perceptualRoughness = glossIn.roughness /* perceptualRoughness */ ;
|
|
||||||
|
|
||||||
// TODO: CAUTION: remap from Morten may work only with offline convolution, see impact with runtime convolution!
|
|
||||||
// For now disabled
|
|
||||||
#if 0
|
|
||||||
float m = PerceptualRoughnessToRoughness(perceptualRoughness); // m is the real roughness parameter
|
|
||||||
const float fEps = 1.192092896e-07F; // smallest such that 1.0+FLT_EPSILON != 1.0 (+1e-4h is NOT good here. is visibly very wrong)
|
|
||||||
float n = (2.0/max(fEps, m*m))-2.0; // remap to spec power. See eq. 21 in --> https://dl.dropboxusercontent.com/u/55891920/papers/mm_brdf.pdf
|
|
||||||
|
|
||||||
n /= 4; // remap from n_dot_h formulatino to n_dot_r. See section "Pre-convolved Cube Maps vs Path Tracers" --> https://s3.amazonaws.com/docs.knaldtech.com/knald/1.0.0/lys_power_drops.html
|
|
||||||
|
|
||||||
perceptualRoughness = pow( 2/(n+2), 0.25); // remap back to square root of real roughness (0.25 include both the sqrt root of the conversion and sqrt for going from roughness to perceptualRoughness)
|
|
||||||
#else
|
|
||||||
// MM: came up with a surprisingly close approximation to what the #if 0'ed out code above does.
|
|
||||||
perceptualRoughness = perceptualRoughness*(1.7 - 0.7*perceptualRoughness);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
half mip = perceptualRoughnessToMipmapLevel(perceptualRoughness);
|
|
||||||
half3 R = glossIn.reflUVW;
|
|
||||||
half4 rgbm = UNITY_SAMPLE_TEXCUBE_LOD(tex, R, mip);
|
|
||||||
hasReflProbe = rgbm.a;
|
|
||||||
|
|
||||||
return DecodeHDR(rgbm, hdr);
|
|
||||||
}
|
|
||||||
|
|
||||||
inline half3 UnityGI_IndirectSpecularVRC(UnityGIInput data, half occlusion, Unity_GlossyEnvironmentData glossIn, out half hasReflProbe)
|
|
||||||
{
|
|
||||||
half3 specular;
|
|
||||||
|
|
||||||
#if defined(_GLOSSYREFLECTIONS_OFF)
|
|
||||||
specular = unity_IndirectSpecColor.rgb;
|
|
||||||
hasReflProbe = 0;
|
|
||||||
#else
|
|
||||||
#if defined(UNITY_SPECCUBE_BOX_PROJECTION)
|
|
||||||
// we will tweak reflUVW in glossIn directly (as we pass it to Unity_GlossyEnvironment twice for probe0 and probe1), so keep original to pass into BoxProjectedCubemapDirection
|
|
||||||
half3 originalReflUVW = glossIn.reflUVW;
|
|
||||||
glossIn.reflUVW = BoxProjectedCubemapDirection (originalReflUVW, data.worldPos, data.probePosition[0], data.boxMin[0], data.boxMax[0]);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
half3 env0 = VRC_GlossyEnvironment (UNITY_PASS_TEXCUBE(unity_SpecCube0), data.probeHDR[0], glossIn, hasReflProbe);
|
|
||||||
#if defined(UNITY_SPECCUBE_BLENDING)
|
|
||||||
const float kBlendFactor = 0.99999;
|
|
||||||
float blendLerp = data.boxMin[0].w;
|
|
||||||
UNITY_BRANCH
|
|
||||||
if (blendLerp < kBlendFactor)
|
|
||||||
{
|
|
||||||
half secondReflProbe = 0;
|
|
||||||
half3 env1 = VRC_GlossyEnvironment (UNITY_PASS_TEXCUBE_SAMPLER(unity_SpecCube1,unity_SpecCube0), data.probeHDR[1], glossIn, secondReflProbe);
|
|
||||||
hasReflProbe += secondReflProbe;
|
|
||||||
specular = lerp(env1, env0, blendLerp);
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
specular = env0;
|
|
||||||
}
|
|
||||||
#else
|
|
||||||
specular = env0;
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
return specular * occlusion;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void VRC_ApplyMinBrightness(inout UnityGI gi, half minBright)
|
|
||||||
{
|
|
||||||
gi.indirect.diffuse = max(gi.indirect.diffuse, minBright);
|
|
||||||
}
|
|
||||||
|
|
||||||
// executed first
|
|
||||||
inline void LightingStandardVRC_GI(SurfaceOutputStandardVRC s, UnityGIInput data, inout UnityGI gi)
|
|
||||||
{
|
|
||||||
Unity_GlossyEnvironmentData g = UnityGlossyEnvironmentSetup(s.Smoothness, data.worldViewDir, s.Normal, lerp(unity_ColorSpaceDielectricSpec.rgb, s.Albedo, s.Metallic));
|
|
||||||
half hasReflProbe = 0;
|
|
||||||
half3 indirectSpecular = UnityGI_IndirectSpecularVRC(data, s.Occlusion, g, /* out */ hasReflProbe);
|
|
||||||
gi = UnityGI_BaseVRC(data, s.Occlusion, s.Normal, -data.worldViewDir, s.Smoothness, hasReflProbe);
|
|
||||||
VRC_ApplyMinBrightness(gi, s.MinimumBrightness);
|
|
||||||
gi.indirect.specular += indirectSpecular;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline fixed4 UnityLambertVRCLight (SurfaceOutputVRC s, UnityLight light)
|
|
||||||
{
|
|
||||||
fixed diff = max (0, dot (s.Normal, light.dir));
|
|
||||||
|
|
||||||
fixed4 c;
|
|
||||||
c.rgb = s.Albedo * light.color * diff;
|
|
||||||
c.a = s.Alpha;
|
|
||||||
return c;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline fixed4 LightingLambertVRC (SurfaceOutputVRC s, UnityGI gi)
|
|
||||||
{
|
|
||||||
fixed4 c;
|
|
||||||
c = UnityLambertVRCLight (s, gi.light);
|
|
||||||
|
|
||||||
#if defined(UNITY_LIGHT_FUNCTION_APPLY_INDIRECT)
|
|
||||||
c.rgb += s.Albedo * gi.indirect.diffuse;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
return c;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void LightingLambertVRC_GI (
|
|
||||||
SurfaceOutputVRC s,
|
|
||||||
UnityGIInput data,
|
|
||||||
inout UnityGI gi)
|
|
||||||
{
|
|
||||||
gi = UnityGI_BaseVRC(data, 1.0, s.Normal, half3(0, 0, 0), half(0), 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
#pragma surface surf StandardVRC vertex:vert exclude_path:prepass exclude_path:deferred noforwardadd noshadow nodynlightmap nolppv noshadowmask
|
|
||||||
#pragma skip_variants LIGHTMAP_SHADOW_MIXING
|
|
||||||
|
|
||||||
// -------------------------------------
|
|
||||||
|
|
||||||
struct Input
|
|
||||||
{
|
|
||||||
float2 texcoord0;
|
|
||||||
#ifdef _DETAIL
|
|
||||||
float2 texcoord1;
|
|
||||||
#endif
|
|
||||||
fixed4 color : COLOR;
|
|
||||||
};
|
|
||||||
|
|
||||||
UNITY_DECLARE_TEX2D(_MainTex);
|
|
||||||
float4 _MainTex_ST;
|
|
||||||
half4 _Color;
|
|
||||||
uniform half _SDFCutoff;
|
|
||||||
|
|
||||||
UNITY_DECLARE_TEX2D(_MetallicGlossMap);
|
|
||||||
uniform half _Glossiness;
|
|
||||||
uniform half _Metallic;
|
|
||||||
|
|
||||||
UNITY_DECLARE_TEX2D(_BumpMap);
|
|
||||||
uniform half _BumpScale;
|
|
||||||
|
|
||||||
UNITY_DECLARE_TEX2D(_OcclusionMap);
|
|
||||||
uniform half _OcclusionStrength;
|
|
||||||
|
|
||||||
uniform half _SpecularAAScreenSpaceVariance;
|
|
||||||
uniform half _SpecularAAThreshold;
|
|
||||||
|
|
||||||
#ifdef _EMISSION
|
|
||||||
UNITY_DECLARE_TEX2D(_EmissionMap);
|
|
||||||
half4 _EmissionColor;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef _DETAIL
|
|
||||||
uniform half _UVSec;
|
|
||||||
float4 _DetailAlbedoMap_ST;
|
|
||||||
UNITY_DECLARE_TEX2D(_DetailMask);
|
|
||||||
UNITY_DECLARE_TEX2D(_DetailAlbedoMap);
|
|
||||||
UNITY_DECLARE_TEX2D(_DetailNormalMap);
|
|
||||||
uniform half _DetailNormalMapScale;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// Add instancing support for this shader. You need to check 'Enable Instancing' on materials that use the shader.
|
|
||||||
// See https://docs.unity3d.com/Manual/GPUInstancing.html for more information about instancing.
|
|
||||||
// #pragma instancing_options assumeuniformscaling
|
|
||||||
UNITY_INSTANCING_BUFFER_START(Props)
|
|
||||||
// put more per-instance properties here
|
|
||||||
UNITY_INSTANCING_BUFFER_END(Props)
|
|
||||||
|
|
||||||
// -------------------------------------
|
|
||||||
void vert(inout appdata_full v, out Input o)
|
|
||||||
{
|
{
|
||||||
UNITY_INITIALIZE_OUTPUT(Input,o);
|
_MainTex("Albedo(RGB)", 2D) = "white" {}
|
||||||
o.texcoord0 = TRANSFORM_TEX(v.texcoord.xy, _MainTex); // Always source from uv0
|
_Color("Color", Color) = (1.0, 1.0, 1.0, 1.0)
|
||||||
#ifdef _DETAIL
|
_SDFCutoff("SDF Cutoff", Range(0.0, 1.0)) = 1.0
|
||||||
o.texcoord1 = TRANSFORM_TEX(((_UVSec == 0) ? v.texcoord.xy : v.texcoord1.xy), _DetailAlbedoMap);
|
|
||||||
#endif
|
[ToggleOff] _SpecularHighlights("Specular Highlights", Float) = 0.0
|
||||||
|
[ToggleOff] _GlossyReflections("Glossy Reflections", Float) = 0.0
|
||||||
|
|
||||||
|
[Toggle(_ENABLE_GEOMETRIC_SPECULAR_AA)] _EnableGeometricSpecularAA("EnableGeometricSpecularAA", Float) = 1.0
|
||||||
|
_SpecularAAScreenSpaceVariance("SpecularAAScreenSpaceVariance", Range(0.0, 1.0)) = 0.1
|
||||||
|
_SpecularAAThreshold("SpecularAAThreshold", Range(0.0, 1.0)) = 0.2
|
||||||
|
|
||||||
|
[Enum(Default,0,MonoSH,1,MonoSH (no highlights),2)] _LightmapType ("Lightmap Type", Float) = 0.0
|
||||||
|
|
||||||
|
// TODO: This has questionable performance impact on Mobile but very little discernable impact on PC. Should
|
||||||
|
// make a toggle once we have properly branched compilation between those platforms, that's PC-only
|
||||||
|
[Toggle(_BICUBIC)] _Bicubic ("Enable Bicubic Sampling", Float) = 0.0
|
||||||
}
|
}
|
||||||
|
|
||||||
void surf(Input IN, inout SurfaceOutputStandardVRC o)
|
SubShader
|
||||||
{
|
{
|
||||||
half alphastep = step(UNITY_SAMPLE_TEX2D(_MainTex, IN.texcoord0), 0.0020f);
|
Tags { "RenderType"="Opaque" }
|
||||||
if (alphastep < 0.5f) discard;
|
LOD 200
|
||||||
o.Albedo = _Color;
|
|
||||||
o.Alpha = alphastep;
|
|
||||||
|
|
||||||
o.Metallic = 0.0f;
|
CGPROGRAM
|
||||||
o.Smoothness = _Glossiness;
|
|
||||||
o.Normal = half3(0, 0, 1);
|
|
||||||
|
|
||||||
#ifdef _EMISSION
|
//#define _DEBUG_VRC
|
||||||
o.Emission = UNITY_SAMPLE_TEX2D(_EmissionMap, IN.texcoord0) * _EmissionColor;
|
#ifdef _DEBUG_VRC
|
||||||
#endif
|
#define DEBUG_COL(rgb) debugCol = half4(rgb, 1)
|
||||||
}
|
#define DEBUG_VAL(val) debugCol = half4(val, val, val, 1)
|
||||||
ENDCG
|
half4 debugCol = half4(0,0,0,1);
|
||||||
}
|
#else
|
||||||
|
#define DEBUG_COL(rgb)
|
||||||
|
#define DEBUG_VAL(val)
|
||||||
|
#endif
|
||||||
|
|
||||||
FallBack "VRChat/Mobile/Diffuse"
|
#pragma target 3.0
|
||||||
CustomEditor "StandardLiteShaderGUI"
|
#pragma multi_compile_fragment _ _EMISSION
|
||||||
|
#pragma multi_compile _ _DETAIL
|
||||||
|
#pragma multi_compile_fragment _ _SPECULARHIGHLIGHTS_OFF
|
||||||
|
#pragma multi_compile_fragment _ _GLOSSYREFLECTIONS_OFF
|
||||||
|
#pragma multi_compile_fragment _ _MONOSH_SPECULAR _MONOSH_NOSPECULAR
|
||||||
|
#pragma multi_compile_fragment _ _ENABLE_GEOMETRIC_SPECULAR_AA
|
||||||
|
#pragma dynamic_branch_local_fragment _ DISABLE_VERTEX_COLORING
|
||||||
|
//SDK-SYNC-IGNORE-LINE - unused variants in SDK projects - #pragma multi_compile_fragment _ FORCE_UNITY_DLDR_LIGHTMAP_ENCODING FORCE_UNITY_RGBM_LIGHTMAP_ENCODING FORCE_UNITY_LIGHTMAP_FULL_HDR_ENCODING UNITY_LIGHTMAP_NONE
|
||||||
|
//#pragma multi_compile _ _BICUBIC
|
||||||
|
|
||||||
|
#if defined(LIGHTMAP_ON)
|
||||||
|
#if defined(_MONOSH_SPECULAR) || defined(_MONOSH_NOSPECULAR)
|
||||||
|
#define _MONOSH
|
||||||
|
#if defined(_MONOSH_SPECULAR)
|
||||||
|
#define _LMSPEC
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#include "/Packages/com.vrchat.base/Runtime/VRCSDK/Sample Assets/Shaders/Mobile/VRChat.cginc"
|
||||||
|
|
||||||
|
#pragma surface surf StandardVRC vertex:vert exclude_path:prepass exclude_path:deferred noforwardadd noshadow nodynlightmap nolppv noshadowmask
|
||||||
|
#pragma skip_variants LIGHTMAP_SHADOW_MIXING
|
||||||
|
|
||||||
|
// -------------------------------------
|
||||||
|
|
||||||
|
struct Input
|
||||||
|
{
|
||||||
|
float2 texcoord0;
|
||||||
|
#ifdef _DETAIL
|
||||||
|
float2 texcoord1;
|
||||||
|
#endif
|
||||||
|
fixed4 color : COLOR;
|
||||||
|
};
|
||||||
|
|
||||||
|
UNITY_DECLARE_TEX2D(_MainTex);
|
||||||
|
float4 _MainTex_ST;
|
||||||
|
half4 _Color;
|
||||||
|
uniform half _SDFCutoff;
|
||||||
|
|
||||||
|
uniform half _SpecularAAScreenSpaceVariance;
|
||||||
|
uniform half _SpecularAAThreshold;
|
||||||
|
|
||||||
|
#ifdef _EMISSION
|
||||||
|
UNITY_DECLARE_TEX2D(_EmissionMap);
|
||||||
|
half4 _EmissionColor;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifdef _DETAIL
|
||||||
|
uniform half _UVSec;
|
||||||
|
float4 _DetailAlbedoMap_ST;
|
||||||
|
UNITY_DECLARE_TEX2D(_DetailMask);
|
||||||
|
UNITY_DECLARE_TEX2D(_DetailAlbedoMap);
|
||||||
|
UNITY_DECLARE_TEX2D(_DetailNormalMap);
|
||||||
|
uniform half _DetailNormalMapScale;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Add instancing support for this shader. You need to check 'Enable Instancing' on materials that use the shader.
|
||||||
|
// See https://docs.unity3d.com/Manual/GPUInstancing.html for more information about instancing.
|
||||||
|
// #pragma instancing_options assumeuniformscaling
|
||||||
|
UNITY_INSTANCING_BUFFER_START(Props)
|
||||||
|
// put more per-instance properties here
|
||||||
|
UNITY_INSTANCING_BUFFER_END(Props)
|
||||||
|
|
||||||
|
// -------------------------------------
|
||||||
|
void vert(inout appdata_full v, out Input o)
|
||||||
|
{
|
||||||
|
UNITY_INITIALIZE_OUTPUT(Input,o);
|
||||||
|
o.texcoord0 = TRANSFORM_TEX(v.texcoord.xy, _MainTex); // Always source from uv0
|
||||||
|
}
|
||||||
|
|
||||||
|
void surf(Input IN, inout SurfaceOutputStandardVRC o)
|
||||||
|
{
|
||||||
|
half alphastep = step(UNITY_SAMPLE_TEX2D(_MainTex, IN.texcoord0), 0.002f);
|
||||||
|
if (alphastep < 0.5f) discard;
|
||||||
|
|
||||||
|
o.Albedo = _Color;
|
||||||
|
o.Alpha = alphastep;
|
||||||
|
|
||||||
|
o.Metallic = 0.0f;
|
||||||
|
o.Smoothness = 1.0f;
|
||||||
|
o.Normal = half3(0, 0, 1);
|
||||||
|
}
|
||||||
|
ENDCG
|
||||||
|
}
|
||||||
|
|
||||||
|
FallBack "VRChat/Mobile/Diffuse"
|
||||||
|
CustomEditor "StandardLiteShaderGUI"
|
||||||
}
|
}
|
||||||
@ -92,7 +92,7 @@ public class CaseManager : UdonSharpBehaviour
|
|||||||
ErrorString = "Ensure the 'Round 3' dictionary entry is a dictionary with a key called 'Continent' and an integer value.";
|
ErrorString = "Ensure the 'Round 3' dictionary entry is a dictionary with a key called 'Continent' and an integer value.";
|
||||||
}
|
}
|
||||||
|
|
||||||
ContinueToRound1();
|
ContinueToRound3();
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@ -255,9 +255,9 @@ public class GameManagerRound2 : GameManagerBase
|
|||||||
_StageIndex++;
|
_StageIndex++;
|
||||||
switch(_StageIndex)
|
switch(_StageIndex)
|
||||||
{
|
{
|
||||||
case 1: DisplayBriefing(); break;
|
case 1: DisplayBriefing(); break;
|
||||||
case 2: BeginRound(); break;
|
case 2: BeginRound(); break;
|
||||||
case 3: _CaseManager.ContinueToRound3(); break;
|
case 3: _CaseManager.ContinueToRound3(); break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -1,13 +1,9 @@
|
|||||||
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using TMPro;
|
using TMPro;
|
||||||
using UdonSharp;
|
using UdonSharp;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
using VRC.Dynamics;
|
|
||||||
using VRC.SDK3.UdonNetworkCalling;
|
using VRC.SDK3.UdonNetworkCalling;
|
||||||
using VRC.SDKBase;
|
using VRC.SDKBase;
|
||||||
using VRC.Udon;
|
|
||||||
using VRC.Udon.Common.Interfaces;
|
|
||||||
|
|
||||||
|
|
||||||
[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)]
|
[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)]
|
||||||
|
|||||||
@ -44,7 +44,7 @@ MonoBehaviour:
|
|||||||
Data:
|
Data:
|
||||||
- Name:
|
- Name:
|
||||||
Entry: 12
|
Entry: 12
|
||||||
Data: 5
|
Data: 7
|
||||||
- Name:
|
- Name:
|
||||||
Entry: 7
|
Entry: 7
|
||||||
Data:
|
Data:
|
||||||
@ -248,19 +248,19 @@ MonoBehaviour:
|
|||||||
Data:
|
Data:
|
||||||
- Name: $k
|
- Name: $k
|
||||||
Entry: 1
|
Entry: 1
|
||||||
Data: _CollidingLocations
|
Data: _LitLampMaterial
|
||||||
- Name: $v
|
- Name: $v
|
||||||
Entry: 7
|
Entry: 7
|
||||||
Data: 17|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
Data: 17|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||||
- Name: <Name>k__BackingField
|
- Name: <Name>k__BackingField
|
||||||
Entry: 1
|
Entry: 1
|
||||||
Data: _CollidingLocations
|
Data: _LitLampMaterial
|
||||||
- Name: <UserType>k__BackingField
|
- Name: <UserType>k__BackingField
|
||||||
Entry: 7
|
Entry: 7
|
||||||
Data: 18|System.RuntimeType, mscorlib
|
Data: 18|System.RuntimeType, mscorlib
|
||||||
- Name:
|
- Name:
|
||||||
Entry: 1
|
Entry: 1
|
||||||
Data: VRC.SDK3.Data.DataList, VRCSDK3
|
Data: UnityEngine.Material, UnityEngine.CoreModule
|
||||||
- Name:
|
- Name:
|
||||||
Entry: 8
|
Entry: 8
|
||||||
Data:
|
Data:
|
||||||
@ -278,10 +278,70 @@ MonoBehaviour:
|
|||||||
Data:
|
Data:
|
||||||
- Name: <IsSerialized>k__BackingField
|
- Name: <IsSerialized>k__BackingField
|
||||||
Entry: 5
|
Entry: 5
|
||||||
Data: false
|
Data: true
|
||||||
- Name: _fieldAttributes
|
- Name: _fieldAttributes
|
||||||
Entry: 7
|
Entry: 7
|
||||||
Data: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
Data: 19|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||||
|
- Name:
|
||||||
|
Entry: 12
|
||||||
|
Data: 1
|
||||||
|
- Name:
|
||||||
|
Entry: 7
|
||||||
|
Data: 20|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: _CollidingLocations
|
||||||
|
- Name: $v
|
||||||
|
Entry: 7
|
||||||
|
Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||||
|
- Name: <Name>k__BackingField
|
||||||
|
Entry: 1
|
||||||
|
Data: _CollidingLocations
|
||||||
|
- Name: <UserType>k__BackingField
|
||||||
|
Entry: 7
|
||||||
|
Data: 22|System.RuntimeType, mscorlib
|
||||||
|
- Name:
|
||||||
|
Entry: 1
|
||||||
|
Data: VRC.SDK3.Data.DataList, VRCSDK3
|
||||||
|
- Name:
|
||||||
|
Entry: 8
|
||||||
|
Data:
|
||||||
|
- Name: <SystemType>k__BackingField
|
||||||
|
Entry: 9
|
||||||
|
Data: 22
|
||||||
|
- Name: <SyncMode>k__BackingField
|
||||||
|
Entry: 7
|
||||||
|
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||||
|
- Name:
|
||||||
|
Entry: 6
|
||||||
|
Data:
|
||||||
|
- Name:
|
||||||
|
Entry: 8
|
||||||
|
Data:
|
||||||
|
- Name: <IsSerialized>k__BackingField
|
||||||
|
Entry: 5
|
||||||
|
Data: false
|
||||||
|
- Name: _fieldAttributes
|
||||||
|
Entry: 7
|
||||||
|
Data: 23|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||||
- Name:
|
- Name:
|
||||||
Entry: 12
|
Entry: 12
|
||||||
Data: 0
|
Data: 0
|
||||||
@ -305,13 +365,13 @@ MonoBehaviour:
|
|||||||
Data: _CollisionCheckCounter
|
Data: _CollisionCheckCounter
|
||||||
- Name: $v
|
- Name: $v
|
||||||
Entry: 7
|
Entry: 7
|
||||||
Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||||
- Name: <Name>k__BackingField
|
- Name: <Name>k__BackingField
|
||||||
Entry: 1
|
Entry: 1
|
||||||
Data: _CollisionCheckCounter
|
Data: _CollisionCheckCounter
|
||||||
- Name: <UserType>k__BackingField
|
- Name: <UserType>k__BackingField
|
||||||
Entry: 7
|
Entry: 7
|
||||||
Data: 21|System.RuntimeType, mscorlib
|
Data: 25|System.RuntimeType, mscorlib
|
||||||
- Name:
|
- Name:
|
||||||
Entry: 1
|
Entry: 1
|
||||||
Data: System.Int32, mscorlib
|
Data: System.Int32, mscorlib
|
||||||
@ -320,7 +380,7 @@ MonoBehaviour:
|
|||||||
Data:
|
Data:
|
||||||
- Name: <SystemType>k__BackingField
|
- Name: <SystemType>k__BackingField
|
||||||
Entry: 9
|
Entry: 9
|
||||||
Data: 21
|
Data: 25
|
||||||
- Name: <SyncMode>k__BackingField
|
- Name: <SyncMode>k__BackingField
|
||||||
Entry: 7
|
Entry: 7
|
||||||
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||||
@ -335,7 +395,55 @@ MonoBehaviour:
|
|||||||
Data: false
|
Data: false
|
||||||
- Name: _fieldAttributes
|
- Name: _fieldAttributes
|
||||||
Entry: 7
|
Entry: 7
|
||||||
Data: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
Data: 26|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: 7
|
||||||
|
Data:
|
||||||
|
- Name: $k
|
||||||
|
Entry: 1
|
||||||
|
Data: _NoCollisionCounter
|
||||||
|
- Name: $v
|
||||||
|
Entry: 7
|
||||||
|
Data: 27|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
|
||||||
|
- Name: <Name>k__BackingField
|
||||||
|
Entry: 1
|
||||||
|
Data: _NoCollisionCounter
|
||||||
|
- Name: <UserType>k__BackingField
|
||||||
|
Entry: 9
|
||||||
|
Data: 25
|
||||||
|
- Name: <SystemType>k__BackingField
|
||||||
|
Entry: 9
|
||||||
|
Data: 25
|
||||||
|
- Name: <SyncMode>k__BackingField
|
||||||
|
Entry: 7
|
||||||
|
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
|
||||||
|
- Name:
|
||||||
|
Entry: 6
|
||||||
|
Data:
|
||||||
|
- Name:
|
||||||
|
Entry: 8
|
||||||
|
Data:
|
||||||
|
- Name: <IsSerialized>k__BackingField
|
||||||
|
Entry: 5
|
||||||
|
Data: false
|
||||||
|
- Name: _fieldAttributes
|
||||||
|
Entry: 7
|
||||||
|
Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
|
||||||
- Name:
|
- Name:
|
||||||
Entry: 12
|
Entry: 12
|
||||||
Data: 0
|
Data: 0
|
||||||
|
|||||||
@ -14,10 +14,14 @@ public class FloorMapMarker : UdonSharpBehaviour
|
|||||||
|
|
||||||
[SerializeField] private GameManagerRound3 _GameManager;
|
[SerializeField] private GameManagerRound3 _GameManager;
|
||||||
|
|
||||||
|
[SerializeField] private Material _LitLampMaterial;
|
||||||
|
|
||||||
private DataList _CollidingLocations = new DataList();
|
private DataList _CollidingLocations = new DataList();
|
||||||
private int _CollisionCheckCounter = 0;
|
private int _CollisionCheckCounter = 0;
|
||||||
|
private int _NoCollisionCounter = 0;
|
||||||
|
|
||||||
private const int MAX_REPEAT_COLLISION_CHECKS = 3;
|
private const int MAX_REPEAT_COLLISION_CHECKS = 3;
|
||||||
|
private const int MAX_TIME_WITH_NO_COLLISIONS = 8;
|
||||||
private const float TIME_BETWEEN_REPEAT_COLLISION_CHECKS = 0.15f;
|
private const float TIME_BETWEEN_REPEAT_COLLISION_CHECKS = 0.15f;
|
||||||
|
|
||||||
|
|
||||||
@ -28,6 +32,7 @@ public class FloorMapMarker : UdonSharpBehaviour
|
|||||||
{
|
{
|
||||||
_CollidingLocations.Add(Location);
|
_CollidingLocations.Add(Location);
|
||||||
_CollisionCheckCounter = 0;
|
_CollisionCheckCounter = 0;
|
||||||
|
_NoCollisionCounter = 0;
|
||||||
if (!IsGrabbed) CheckCollisions();
|
if (!IsGrabbed) CheckCollisions();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -39,6 +44,7 @@ public class FloorMapMarker : UdonSharpBehaviour
|
|||||||
{
|
{
|
||||||
_CollidingLocations.Remove(Location);
|
_CollidingLocations.Remove(Location);
|
||||||
_CollisionCheckCounter = 0;
|
_CollisionCheckCounter = 0;
|
||||||
|
_NoCollisionCounter = 0;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -52,6 +58,7 @@ public class FloorMapMarker : UdonSharpBehaviour
|
|||||||
|
|
||||||
LocationFindingEnabled = true;
|
LocationFindingEnabled = true;
|
||||||
IsGrabbed = true;
|
IsGrabbed = true;
|
||||||
|
_NoCollisionCounter = 0;
|
||||||
_CollidingLocations.Clear();
|
_CollidingLocations.Clear();
|
||||||
|
|
||||||
base.OnPickup();
|
base.OnPickup();
|
||||||
@ -67,6 +74,7 @@ public class FloorMapMarker : UdonSharpBehaviour
|
|||||||
transform.eulerAngles = new Vector3(0.0f, transform.eulerAngles.y, 0.0f);
|
transform.eulerAngles = new Vector3(0.0f, transform.eulerAngles.y, 0.0f);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_NoCollisionCounter = 0;
|
||||||
CheckCollisions();
|
CheckCollisions();
|
||||||
|
|
||||||
base.OnDrop();
|
base.OnDrop();
|
||||||
@ -75,10 +83,12 @@ public class FloorMapMarker : UdonSharpBehaviour
|
|||||||
|
|
||||||
public void CheckCollisions()
|
public void CheckCollisions()
|
||||||
{
|
{
|
||||||
if (!LocationFindingEnabled) return;
|
if (!LocationFindingEnabled || IsGrabbed) return;
|
||||||
|
|
||||||
if (_CollidingLocations.Count > 0 && IsUpright() && !IsGrabbed)
|
if (_CollidingLocations.Count > 0 && IsUpright())
|
||||||
{
|
{
|
||||||
|
_NoCollisionCounter = 0;
|
||||||
|
|
||||||
for (int i = 0; i < _CollidingLocations.Count; i++)
|
for (int i = 0; i < _CollidingLocations.Count; i++)
|
||||||
{
|
{
|
||||||
FloorMapLocation Location = (FloorMapLocation)_CollidingLocations[i].Reference;
|
FloorMapLocation Location = (FloorMapLocation)_CollidingLocations[i].Reference;
|
||||||
@ -87,8 +97,7 @@ public class FloorMapMarker : UdonSharpBehaviour
|
|||||||
bool FoundCorrectResponse = ConfirmChoice(Location.Country, Location.City);
|
bool FoundCorrectResponse = ConfirmChoice(Location.Country, Location.City);
|
||||||
if (FoundCorrectResponse)
|
if (FoundCorrectResponse)
|
||||||
{
|
{
|
||||||
DisableMovementCompletely(Location);
|
SendCorrectResponse(Location);
|
||||||
_GameManager.CorrectResponse();
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -102,20 +111,24 @@ public class FloorMapMarker : UdonSharpBehaviour
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
DisableMovementCompletely();
|
SendIncorrectResponse();
|
||||||
|
|
||||||
_GameManager.IncorrectResponse();
|
|
||||||
|
|
||||||
_CollisionCheckCounter = 0;
|
|
||||||
_CollidingLocations.Clear();
|
|
||||||
}
|
}
|
||||||
_CollisionCheckCounter++;
|
_CollisionCheckCounter++;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// If the marker isn't sitting mostly upright and is not grabbed,
|
_NoCollisionCounter++;
|
||||||
// don't check collisions until later, in case it becomes upright.
|
Debug.Log("No collisions for " + _NoCollisionCounter + " ticks.");
|
||||||
SendCustomEventDelayedSeconds(nameof(CheckCollisions), TIME_BETWEEN_REPEAT_COLLISION_CHECKS);
|
if (_NoCollisionCounter >= MAX_TIME_WITH_NO_COLLISIONS)
|
||||||
|
{
|
||||||
|
SendIncorrectResponse();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
// If the marker isn't sitting mostly upright and is not grabbed,
|
||||||
|
// don't check collisions until later, in case it becomes upright.
|
||||||
|
SendCustomEventDelayedSeconds(nameof(CheckCollisions), TIME_BETWEEN_REPEAT_COLLISION_CHECKS);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -131,6 +144,31 @@ public class FloorMapMarker : UdonSharpBehaviour
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void SendCorrectResponse(FloorMapLocation CorrectLocation)
|
||||||
|
{
|
||||||
|
DisableMovementCompletely(CorrectLocation);
|
||||||
|
|
||||||
|
MeshRenderer MarkerMesh;
|
||||||
|
if (MarkerMesh = GetComponent<MeshRenderer>())
|
||||||
|
{
|
||||||
|
Material[] Materials = MarkerMesh.materials;
|
||||||
|
Materials[2] = _LitLampMaterial;
|
||||||
|
MarkerMesh.materials = Materials;
|
||||||
|
}
|
||||||
|
|
||||||
|
_GameManager.CorrectResponse();
|
||||||
|
}
|
||||||
|
|
||||||
|
private void SendIncorrectResponse()
|
||||||
|
{
|
||||||
|
DisableMovementCompletely();
|
||||||
|
|
||||||
|
_GameManager.IncorrectResponse();
|
||||||
|
|
||||||
|
_CollisionCheckCounter = 0;
|
||||||
|
_CollidingLocations.Clear();
|
||||||
|
}
|
||||||
|
|
||||||
public void EnablePickup(bool Enable)
|
public void EnablePickup(bool Enable)
|
||||||
{
|
{
|
||||||
VRCPickup Pickup;
|
VRCPickup Pickup;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user