- Reworked UV mapping and materials on map marker.

- Renamed dark green plastic material to its proper name.
- Adjusted host and player camera anchor far plane distances in round 3.

Assembly-CSharp.csproj

@@ -195,7 +195,6 @@
     <None Include="Assets\TextMesh Pro\Shaders\TMP_Bitmap-Mobile.shader" />
     <None Include="Assets\TextMesh Pro\Fonts\LiberationSans - OFL.txt" />
     <None Include="Assets\Shaders\FrontfaceCulling.shader" />
-    <None Include="Assets\Shaders\SDF Map Marker Spokes.shader" />
     <None Include="Assets\TextMesh Pro\Shaders\TMP_SDF-Mobile.shader" />
     <None Include="Assets\Shaders\Map Marker Lamp.shader" />
     <None Include="Assets\TextMesh Pro\Shaders\TMP_Sprite.shader" />

Assets/Materials/Maps/M_Marker_Spokes_SDF.mat

@@ -1,95 +0,0 @@
-%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_Marker_Spokes_SDF
-  m_Shader: {fileID: 4800000, guid: ee8714d3a4c72874697299893a31f79a, type: 3}
-  m_Parent: {fileID: 0}
-  m_ModifiedSerializedProperties: 0
-  m_ValidKeywords:
-  - _EMISSION
-  - _ENABLE_GEOMETRIC_SPECULAR_AA
-  m_InvalidKeywords: []
-  m_LightmapFlags: 0
-  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}
-    - _ColourTex:
-        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: 2800000, guid: f9769dd687fc7b541ac23b1f56c618bb, type: 3}
-        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: 1
-    - _GlossMapScale: 1
-    - _Glossiness: 1
-    - _GlossyReflections: 1
-    - _LightmapType: 0
-    - _Metallic: 0
-    - _Mode: 0
-    - _OcclusionStrength: 1
-    - _Parallax: 0.02
-    - _SDFCutoff: 1
-    - _SmoothnessTextureChannel: 0
-    - _SpecularAAScreenSpaceVariance: 0.1
-    - _SpecularAAThreshold: 0.2
-    - _SpecularHighlights: 1
-    - _SrcBlend: 1
-    - _UVSec: 0
-    - _ZWrite: 1
-    m_Colors:
-    - _Color: {r: 1, g: 1, b: 1, a: 1}
-    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
-  m_BuildTextureStacks: []

Assets/Materials/Maps/M_Marker_Spokes_SDF.mat.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: cc22c7f9de95cab4488b30fe8699a82a
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 2100000
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Materials/Plastic/M_DarkGreenPlastic.mat

@@ -7,7 +7,7 @@ Material:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: M_GreenPlastic 1
+  m_Name: M_DarkGreenPlastic
   m_Shader: {fileID: 4800000, guid: 0b7113dea2069fc4e8943843eff19f70, type: 3}
   m_Parent: {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2}
   m_ModifiedSerializedProperties: 0

Assets/Models/Maps/SM_FloorMap_Marker.fbx.meta

@@ -20,7 +20,7 @@ ModelImporter:
       name: Spokes
     second: {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2}
   materials:
-    materialImportMode: 2
+    materialImportMode: 0
     materialName: 0
     materialSearch: 1
     materialLocation: 1

Assets/Prefabs/Maps/Floor Map Marker.prefab

@@ -328,6 +328,21 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: -7511558181221131132, guid: 02b4b8ced7ec91947943a7a393611db0,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2}
+    - target: {fileID: -7511558181221131132, guid: 02b4b8ced7ec91947943a7a393611db0,
+        type: 3}
+      propertyPath: m_Materials.Array.data[1]
+      value: 
+      objectReference: {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2}
+    - target: {fileID: -7511558181221131132, guid: 02b4b8ced7ec91947943a7a393611db0,
+        type: 3}
+      propertyPath: m_Materials.Array.data[2]
+      value: 
+      objectReference: {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2}
     - target: {fileID: 919132149155446097, guid: 02b4b8ced7ec91947943a7a393611db0,
         type: 3}
       propertyPath: m_Name

Assets/Scenes/witwics.unity

@@ -13084,7 +13084,7 @@ PrefabInstance:
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
       propertyPath: FarClippingPlane
-      value: 28
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
@@ -15185,7 +15185,7 @@ PrefabInstance:
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
       propertyPath: FarClippingPlane
-      value: 28
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
@@ -16119,7 +16119,7 @@ PrefabInstance:
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
       propertyPath: FarClippingPlane
-      value: 28
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
@@ -17215,7 +17215,7 @@ PrefabInstance:
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
       propertyPath: FarClippingPlane
-      value: 28
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
@@ -19457,7 +19457,7 @@ PrefabInstance:
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
       propertyPath: FarClippingPlane
-      value: 28
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
@@ -23936,7 +23936,7 @@ PrefabInstance:
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
       propertyPath: FarClippingPlane
-      value: 28
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
@@ -26467,7 +26467,7 @@ PrefabInstance:
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
       propertyPath: FarClippingPlane
-      value: 28
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
@@ -26829,7 +26829,7 @@ PrefabInstance:
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
       propertyPath: FarClippingPlane
-      value: 28
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
@@ -29478,7 +29478,7 @@ PrefabInstance:
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
       propertyPath: FarClippingPlane
-      value: 28
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
@@ -35666,7 +35666,7 @@ PrefabInstance:
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
       propertyPath: FarClippingPlane
-      value: 28
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
@@ -36290,7 +36290,7 @@ PrefabInstance:
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
       propertyPath: FarClippingPlane
-      value: 28
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
@@ -36570,7 +36570,7 @@ PrefabInstance:
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
       propertyPath: FarClippingPlane
-      value: 28
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
@@ -39512,7 +39512,7 @@ PrefabInstance:
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
       propertyPath: FarClippingPlane
-      value: 28
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
@@ -39903,7 +39903,7 @@ PrefabInstance:
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
       propertyPath: FarClippingPlane
-      value: 28
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
@@ -42399,7 +42399,7 @@ PrefabInstance:
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
       propertyPath: FarClippingPlane
-      value: 28
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
@@ -43470,7 +43470,7 @@ PrefabInstance:
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
       propertyPath: FarClippingPlane
-      value: 28
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
@@ -53632,7 +53632,7 @@ PrefabInstance:
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
       propertyPath: FarClippingPlane
-      value: 28
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
@@ -58246,7 +58246,7 @@ PrefabInstance:
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
       propertyPath: FarClippingPlane
-      value: 28
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
@@ -59262,7 +59262,7 @@ PrefabInstance:
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
       propertyPath: FarClippingPlane
-      value: 28
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
@@ -59997,7 +59997,7 @@ PrefabInstance:
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
       propertyPath: FarClippingPlane
-      value: 28
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
@@ -60525,7 +60525,7 @@ PrefabInstance:
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
       propertyPath: FarClippingPlane
-      value: 28
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
@@ -60627,89 +60627,6 @@ GameObject:
     type: 3}
   m_PrefabInstance: {fileID: 4362789101225005290}
   m_PrefabAsset: {fileID: 0}
---- !u!1 &1375149631
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1375149634}
-  - component: {fileID: 1375149633}
-  m_Layer: 0
-  m_Name: Camera
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!20 &1375149633
-Camera:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1375149631}
-  m_Enabled: 1
-  serializedVersion: 2
-  m_ClearFlags: 1
-  m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
-  m_projectionMatrixMode: 1
-  m_GateFitMode: 2
-  m_FOVAxisMode: 0
-  m_Iso: 200
-  m_ShutterSpeed: 0.005
-  m_Aperture: 16
-  m_FocusDistance: 10
-  m_FocalLength: 50
-  m_BladeCount: 5
-  m_Curvature: {x: 2, y: 11}
-  m_BarrelClipping: 0.25
-  m_Anamorphism: 0
-  m_SensorSize: {x: 36, y: 24}
-  m_LensShift: {x: 0, y: 0}
-  m_NormalizedViewPortRect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1
-    height: 1
-  near clip plane: 0.3
-  far clip plane: 1000
-  field of view: 60
-  orthographic: 0
-  orthographic size: 5
-  m_Depth: 0
-  m_CullingMask:
-    serializedVersion: 2
-    m_Bits: 4294967295
-  m_RenderingPath: -1
-  m_TargetTexture: {fileID: 0}
-  m_TargetDisplay: 0
-  m_TargetEye: 3
-  m_HDR: 1
-  m_AllowMSAA: 1
-  m_AllowDynamicResolution: 0
-  m_ForceIntoRT: 0
-  m_OcclusionCulling: 1
-  m_StereoConvergence: 10
-  m_StereoSeparation: 0.022
---- !u!4 &1375149634
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1375149631}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0, y: -0.59267277, z: -0, w: 0.8054434}
-  m_LocalPosition: {x: 3.2, y: 2.57, z: 13.05}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: -72.694, z: 0}
 --- !u!1 &1377320496
 GameObject:
   m_ObjectHideFlags: 0
@@ -86151,7 +86068,7 @@ PrefabInstance:
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
       propertyPath: FarClippingPlane
-      value: 28
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
@@ -86804,7 +86721,7 @@ PrefabInstance:
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
       propertyPath: FarClippingPlane
-      value: 28
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
@@ -91871,7 +91788,7 @@ PrefabInstance:
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
       propertyPath: FarClippingPlane
-      value: 28
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
@@ -92936,7 +92853,7 @@ PrefabInstance:
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
       propertyPath: FarClippingPlane
-      value: 28
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
@@ -95256,7 +95173,7 @@ PrefabInstance:
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
       propertyPath: FarClippingPlane
-      value: 28
+      value: 30
       objectReference: {fileID: 0}
     - target: {fileID: 1360612188282181879, guid: b7be9e74a7f7fe24cb526bc367e85829,
         type: 3}
@@ -112711,14 +112628,6 @@ MonoBehaviour:
     ID: 1345
     SerializedTypeNames:
     - VRC.Udon.UdonBehaviour
-  - gameObject: {fileID: 0}
-    ID: 1346
-    SerializedTypeNames:
-    - VRC.Udon.UdonBehaviour
-  - gameObject: {fileID: 0}
-    ID: 1347
-    SerializedTypeNames:
-    - VRC.Udon.UdonBehaviour
   portraitCameraPositionOffset: {x: 0, y: 0, z: 0}
   portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139}
   PlayerPersistence: []
@@ -113606,4 +113515,3 @@ SceneRoots:
   - {fileID: 1027471609}
   - {fileID: 1276291775}
   - {fileID: 1855771788}
-  - {fileID: 1375149634}

Assets/Shaders/SDF Map Marker Spokes.shader

@@ -1,129 +0,0 @@
-Shader "Carmen/SDF/Map Marker Spokes"
-{
-	Properties
-	{
-		_MainTex("Albedo(RGB)", 2D) = "white" {}
-		_Color("Color", Color) = (1.0, 1.0, 1.0, 1.0)
-		_SDFCutoff("SDF Cutoff", Range(0.0, 1.0)) = 1.0
-
-		[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
-	}
-
-	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;
-		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"
-}

Assets/Shaders/SDF Map Marker Spokes.shader.meta

@@ -1,9 +0,0 @@
-fileFormatVersion: 2
-guid: ee8714d3a4c72874697299893a31f79a
-ShaderImporter:
-  externalObjects: {}
-  defaultTextures: []
-  nonModifiableTextures: []
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/UdonSharp/Maps/FloorMapMarker.cs

@@ -118,7 +118,7 @@ public class FloorMapMarker : UdonSharpBehaviour
 	private void SwapLampMaterial()
 	{
 		Material[] Materials = _MarkerMesh.materials;
-		Materials[2] = IsLit ? _LitLampMaterial : _UnlitLampMaterial;
+		Materials[1] = IsLit ? _LitLampMaterial : _UnlitLampMaterial;
 		_MarkerMesh.materials = Materials;
 	}