Merge pull request #10 from z3y/dev

Dev

Material/Marker 2.mat

@@ -0,0 +1,160 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Marker 2
+  m_Shader: {fileID: 4800000, guid: 5f663610cc73b4f4ca8761c64e7659fe, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 1
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _AudioTexture:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ColorMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DFG:
+        m_Texture: {fileID: 2800000, guid: f1abba94ba8e3b94bb5b81081239ca0d, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Data:
+        m_Texture: {fileID: 2800000, guid: c4c5c5a43b346f5419ac399c3ff76b7d, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Decal:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1.92, y: 6.82}
+        m_Offset: {x: -0.41, y: -1.21}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailHeightBlend:
+        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: 557d5faf1374af845b09630d3bd089eb, 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}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _WindNoise:
+        m_Texture: {fileID: 2800000, guid: 2edb9ad22bcacba4985b6e9606b8d0c4, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - Bakery: 0
+    - Foldout_AvancedSettings: 0
+    - Foldout_DetailFoldout: 0
+    - Foldout_Emission: 0
+    - Foldout_RenderingOptions: 0
+    - Foldout_SurfaceInputs: 1
+    - Foldout_WindFoldout: 0
+    - ResetFix: 1
+    - SSS_Foldout: 0
+    - _ACES: 0
+    - _AccentSaturation: 0.789
+    - _AlbedoSaturation: 1
+    - _Allow_LPPV_Toggle: 0
+    - _AlphaToMask: 0
+    - _AudioLinkEmissionBand: 0
+    - _AudioLinkEmissionToggle: 0
+    - _BAKERY_SHNONLINEAR: 1
+    - _BicubicLightmap: 0
+    - _BlendReflectionProbes: 1
+    - _BumpScale: 1
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _CutoutSharpness: 0.0001
+    - _DetailBlendMode: 0
+    - _DetailGlossiness: 0.5
+    - _DetailMap_UV: 0
+    - _DetailMask_UV: 0
+    - _DetailMetallic: 0
+    - _DetailNormalScale: 1
+    - _Dithering: 0
+    - _DstBlend: 0
+    - _EmissionGIMultiplier: 1
+    - _EmissionIntensity: 1
+    - _EmissionMap_UV: 0
+    - _EmissionMultBase: 0
+    - _EmissionToggle: 0
+    - _ForceBoxProjection: 0
+    - _GSAA: 0
+    - _Glossiness: 1
+    - _GlossyReflections: 1
+    - _HeightBlend: 5
+    - _HeightBlendInvert: 0
+    - _IsDecal: 0
+    - _LTCGI: 0
+    - _LTCGI_DIFFUSE_OFF: 0
+    - _LightmappedSpecular: 0
+    - _Ltcgi: 0
+    - _Metallic: 0
+    - _Mode: 0
+    - _NonLinearLightProbeSH: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _ParallaxOffset: 0
+    - _ParallaxSteps: 16
+    - _Reflectance: 0.5
+    - _SSSToggle: 0
+    - _Saturation: 0.5
+    - _SmoothnessAlbedoAlpha: 0
+    - _SpecularHighlights: 1
+    - _SpecularOcclusion: 0
+    - _SrcBlend: 1
+    - _UseEmissionIntensity: 0
+    - _WindScale: 0.02
+    - _WindSpeed: 0.05
+    - _WindToggle: 0
+    - _ZWrite: 1
+    - _specularAntiAliasingThreshold: 0.1
+    - _specularAntiAliasingVariance: 0.15
+    - _toggle: 0
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 0}
+    - _DetailColor: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _EmissionColorLDR: {r: 1, g: 1, b: 1, a: 1}
+    - _GlossinessRange: {r: 0, g: 1, b: 0, a: 1}
+    - _GlossinessRemapping: {r: 0, g: 1, b: 0, a: 1}
+    - _MetallicRemapping: {r: 0, g: 1, b: 0, a: 1}
+    - _WindIntensity: {r: 0.1, g: 0.1, b: 0.1, a: 0}

Scripts/MarkerSettings.cs

@@ -32,7 +32,7 @@ private void Start()
             UpdateMarkerSettings();
         }
 
-        private void UpdateMarkerSettings()
+        public void UpdateMarkerSettings()
         {
             if (marker is null || markerTrail is null)
             {
@@ -68,6 +68,7 @@ public override void OnInspectorGUI()
             {
                 markerSettings.OnValidate();
                 markerSettings.color = Random.ColorHSV();
+                markerSettings.UpdateMarkerSettings();
             }
         }
     }