diff --git a/Assets/Materials/accelerating.mat b/Assets/Materials/accelerating.mat index d9a92a3..901b78d 100644 --- a/Assets/Materials/accelerating.mat +++ b/Assets/Materials/accelerating.mat @@ -8,7 +8,7 @@ m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: accelerating - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 10762, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -57,6 +57,7 @@ m_Offset: {x: 0, y: 0} m_Floats: - _BumpScale: 1 + - _ColorMask: 15 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 @@ -70,7 +71,13 @@ - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 - _UVSec: 0 + - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: - _Color: {r: 0.20784314, g: 0.90588236, b: 0.11372549, a: 1} diff --git a/Assets/Materials/accelerating.mat b/Assets/Materials/accelerating.mat index d9a92a3..901b78d 100644 --- a/Assets/Materials/accelerating.mat +++ b/Assets/Materials/accelerating.mat @@ -8,7 +8,7 @@ m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: accelerating - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 10762, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -57,6 +57,7 @@ m_Offset: {x: 0, y: 0} m_Floats: - _BumpScale: 1 + - _ColorMask: 15 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 @@ -70,7 +71,13 @@ - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 - _UVSec: 0 + - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: - _Color: {r: 0.20784314, g: 0.90588236, b: 0.11372549, a: 1} diff --git a/Assets/Materials/highlight.mat b/Assets/Materials/highlight.mat index fd961e8..a6d3ad6 100644 --- a/Assets/Materials/highlight.mat +++ b/Assets/Materials/highlight.mat @@ -8,7 +8,7 @@ m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: highlight - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 10762, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -57,6 +57,7 @@ m_Offset: {x: 0, y: 0} m_Floats: - _BumpScale: 1 + - _ColorMask: 15 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 @@ -70,10 +71,16 @@ - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 - _UVSec: 0 + - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.67058825, g: 0.22745098, b: 0.11372549, a: 1} + - _Color: {r: 1, g: 0.13315529, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MainColor: {r: 0.67058825, g: 0.22745098, b: 0.11372549, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Materials/accelerating.mat b/Assets/Materials/accelerating.mat index d9a92a3..901b78d 100644 --- a/Assets/Materials/accelerating.mat +++ b/Assets/Materials/accelerating.mat @@ -8,7 +8,7 @@ m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: accelerating - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 10762, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -57,6 +57,7 @@ m_Offset: {x: 0, y: 0} m_Floats: - _BumpScale: 1 + - _ColorMask: 15 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 @@ -70,7 +71,13 @@ - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 - _UVSec: 0 + - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: - _Color: {r: 0.20784314, g: 0.90588236, b: 0.11372549, a: 1} diff --git a/Assets/Materials/highlight.mat b/Assets/Materials/highlight.mat index fd961e8..a6d3ad6 100644 --- a/Assets/Materials/highlight.mat +++ b/Assets/Materials/highlight.mat @@ -8,7 +8,7 @@ m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: highlight - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 10762, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -57,6 +57,7 @@ m_Offset: {x: 0, y: 0} m_Floats: - _BumpScale: 1 + - _ColorMask: 15 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 @@ -70,10 +71,16 @@ - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 - _UVSec: 0 + - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.67058825, g: 0.22745098, b: 0.11372549, a: 1} + - _Color: {r: 1, g: 0.13315529, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MainColor: {r: 0.67058825, g: 0.22745098, b: 0.11372549, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 416d25d..0b9ae6c 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -396,7 +396,7 @@ - component: {fileID: 267250015} - component: {fileID: 267250014} m_Layer: 0 - m_Name: Cube (2) + m_Name: y-marker m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -898,7 +898,7 @@ - component: {fileID: 978069797} - component: {fileID: 978069801} m_Layer: 6 - m_Name: Plane + m_Name: ground m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1295,7 +1295,7 @@ - component: {fileID: 1331646754} - component: {fileID: 1331646753} m_Layer: 0 - m_Name: Cube (3) + m_Name: x-marker m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Materials/accelerating.mat b/Assets/Materials/accelerating.mat index d9a92a3..901b78d 100644 --- a/Assets/Materials/accelerating.mat +++ b/Assets/Materials/accelerating.mat @@ -8,7 +8,7 @@ m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: accelerating - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 10762, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -57,6 +57,7 @@ m_Offset: {x: 0, y: 0} m_Floats: - _BumpScale: 1 + - _ColorMask: 15 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 @@ -70,7 +71,13 @@ - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 - _UVSec: 0 + - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: - _Color: {r: 0.20784314, g: 0.90588236, b: 0.11372549, a: 1} diff --git a/Assets/Materials/highlight.mat b/Assets/Materials/highlight.mat index fd961e8..a6d3ad6 100644 --- a/Assets/Materials/highlight.mat +++ b/Assets/Materials/highlight.mat @@ -8,7 +8,7 @@ m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: highlight - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 10762, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -57,6 +57,7 @@ m_Offset: {x: 0, y: 0} m_Floats: - _BumpScale: 1 + - _ColorMask: 15 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 @@ -70,10 +71,16 @@ - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 - _UVSec: 0 + - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.67058825, g: 0.22745098, b: 0.11372549, a: 1} + - _Color: {r: 1, g: 0.13315529, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MainColor: {r: 0.67058825, g: 0.22745098, b: 0.11372549, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 416d25d..0b9ae6c 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -396,7 +396,7 @@ - component: {fileID: 267250015} - component: {fileID: 267250014} m_Layer: 0 - m_Name: Cube (2) + m_Name: y-marker m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -898,7 +898,7 @@ - component: {fileID: 978069797} - component: {fileID: 978069801} m_Layer: 6 - m_Name: Plane + m_Name: ground m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1295,7 +1295,7 @@ - component: {fileID: 1331646754} - component: {fileID: 1331646753} m_Layer: 0 - m_Name: Cube (3) + m_Name: x-marker m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Scripts/Roads/Node/Node.cs b/Assets/Scripts/Roads/Node/Node.cs index 10fe8b2..954a843 100644 --- a/Assets/Scripts/Roads/Node/Node.cs +++ b/Assets/Scripts/Roads/Node/Node.cs @@ -8,7 +8,7 @@ public Vector3 position; public List roads = new List(); - public GameObject gameObject, circleObject, roadObject; + public GameObject gameObject, circleObject, roadObject, textObject; public Vector3 direction; public Config config; private Transform parent; @@ -40,7 +40,15 @@ roadObject.AddComponent().material = config.roadMaterial; roadObject.AddComponent().mesh = fullCircle.mesh; roadObject.transform.parent = gameObject.transform; - roadObject.transform.localPosition = Vector3.zero; + roadObject.transform.localPosition = new Vector3(0f, 0f, 0f); + + textObject = new GameObject(); + textObject.AddComponent(); + TextMesh text = textObject.AddComponent(); + text.text = ""; + text.anchor = TextAnchor.MiddleCenter; + textObject.transform.parent = gameObject.transform; + textObject.transform.localPosition = new Vector3(0f, 4f, 0f); update(); return this; } diff --git a/Assets/Materials/accelerating.mat b/Assets/Materials/accelerating.mat index d9a92a3..901b78d 100644 --- a/Assets/Materials/accelerating.mat +++ b/Assets/Materials/accelerating.mat @@ -8,7 +8,7 @@ m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: accelerating - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 10762, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -57,6 +57,7 @@ m_Offset: {x: 0, y: 0} m_Floats: - _BumpScale: 1 + - _ColorMask: 15 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 @@ -70,7 +71,13 @@ - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 - _UVSec: 0 + - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: - _Color: {r: 0.20784314, g: 0.90588236, b: 0.11372549, a: 1} diff --git a/Assets/Materials/highlight.mat b/Assets/Materials/highlight.mat index fd961e8..a6d3ad6 100644 --- a/Assets/Materials/highlight.mat +++ b/Assets/Materials/highlight.mat @@ -8,7 +8,7 @@ m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: highlight - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 10762, guid: 0000000000000000f000000000000000, type: 0} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -57,6 +57,7 @@ m_Offset: {x: 0, y: 0} m_Floats: - _BumpScale: 1 + - _ColorMask: 15 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - _DstBlend: 0 @@ -70,10 +71,16 @@ - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 - _UVSec: 0 + - _UseUIAlphaClip: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.67058825, g: 0.22745098, b: 0.11372549, a: 1} + - _Color: {r: 1, g: 0.13315529, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _MainColor: {r: 0.67058825, g: 0.22745098, b: 0.11372549, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 416d25d..0b9ae6c 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -396,7 +396,7 @@ - component: {fileID: 267250015} - component: {fileID: 267250014} m_Layer: 0 - m_Name: Cube (2) + m_Name: y-marker m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -898,7 +898,7 @@ - component: {fileID: 978069797} - component: {fileID: 978069801} m_Layer: 6 - m_Name: Plane + m_Name: ground m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1295,7 +1295,7 @@ - component: {fileID: 1331646754} - component: {fileID: 1331646753} m_Layer: 0 - m_Name: Cube (3) + m_Name: x-marker m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/Assets/Scripts/Roads/Node/Node.cs b/Assets/Scripts/Roads/Node/Node.cs index 10fe8b2..954a843 100644 --- a/Assets/Scripts/Roads/Node/Node.cs +++ b/Assets/Scripts/Roads/Node/Node.cs @@ -8,7 +8,7 @@ public Vector3 position; public List roads = new List(); - public GameObject gameObject, circleObject, roadObject; + public GameObject gameObject, circleObject, roadObject, textObject; public Vector3 direction; public Config config; private Transform parent; @@ -40,7 +40,15 @@ roadObject.AddComponent().material = config.roadMaterial; roadObject.AddComponent().mesh = fullCircle.mesh; roadObject.transform.parent = gameObject.transform; - roadObject.transform.localPosition = Vector3.zero; + roadObject.transform.localPosition = new Vector3(0f, 0f, 0f); + + textObject = new GameObject(); + textObject.AddComponent(); + TextMesh text = textObject.AddComponent(); + text.text = ""; + text.anchor = TextAnchor.MiddleCenter; + textObject.transform.parent = gameObject.transform; + textObject.transform.localPosition = new Vector3(0f, 4f, 0f); update(); return this; } diff --git a/Assets/Scripts/Roads/Node/NodeData.cs b/Assets/Scripts/Roads/Node/NodeData.cs index d923cbc..5ed603e 100644 --- a/Assets/Scripts/Roads/Node/NodeData.cs +++ b/Assets/Scripts/Roads/Node/NodeData.cs @@ -20,6 +20,8 @@ } CustomNode customNode = (CustomNode) node; if (customNode.lightPhase == 0) { + node.circleObject.GetComponent().material = config.roadEditMaterial; + node.textObject.GetComponent().text = ""; return; } if (customNode.isPassable) { @@ -27,5 +29,8 @@ } else { node.circleObject.GetComponent().material = config.carBrakingMaterial; } + node.textObject.GetComponent().text = string.Format("phase: {0}", customNode.lightPhase); + Vector3 target = Camera.main.transform.position; + node.textObject.transform.LookAt(-target, Vector3.up); } }