From 3e1ccbdb5afa9b1225cf694324111a603299fb53 Mon Sep 17 00:00:00 2001 From: z3y Date: Tue, 25 Oct 2022 01:25:08 +0200 Subject: [PATCH 1/5] increase HoldDelay --- Marker.unity | 6 +++--- Scripts/EraseHandler.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Marker.unity b/Marker.unity index fa8015c..10a102b 100644 --- a/Marker.unity +++ b/Marker.unity @@ -218,17 +218,17 @@ PrefabInstance: type: 3} propertyPath: DynamicMaterials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 7948a8a92ff13ba4eb2325ddc8339b74, type: 2} + objectReference: {fileID: 2100000, guid: c140e04943058f14595009983640dc93, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} propertyPath: DynamicMaterials.Array.data[1] value: - objectReference: {fileID: 2100000, guid: c140e04943058f14595009983640dc93, type: 2} + objectReference: {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} propertyPath: DynamicMaterials.Array.data[2] value: - objectReference: {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + objectReference: {fileID: 2100000, guid: 7948a8a92ff13ba4eb2325ddc8339b74, type: 2} - target: {fileID: 6759095419728963412, guid: 8894fa7e4588a5c4fab98453e558847d, type: 3} propertyPath: DynamicMaterials.Array.data[3] diff --git a/Scripts/EraseHandler.cs b/Scripts/EraseHandler.cs index bd4839d..d65707c 100644 --- a/Scripts/EraseHandler.cs +++ b/Scripts/EraseHandler.cs @@ -15,7 +15,7 @@ public class EraseHandler : UdonSharpBehaviour public EraseUndo eraseUndo; - public const float HoldDelay = 0.1f; + public const float HoldDelay = 0.2f; private float _heldTime = 0; private float _lastTime = 0; From 900d89324bf6268647b41b3786e13dd8033938d7 Mon Sep 17 00:00:00 2001 From: z3y Date: Sat, 5 Nov 2022 18:30:29 +0100 Subject: [PATCH 2/5] add ltcgi to marker shader --- Marker.unity | 430 +++++++++++++++++++++---------------------- Shader/Marker.shader | 63 ++++++- 2 files changed, 276 insertions(+), 217 deletions(-) diff --git a/Marker.unity b/Marker.unity index 10a102b..bf0804b 100644 --- a/Marker.unity +++ b/Marker.unity @@ -2458,6 +2458,220 @@ Transform: type: 3} m_PrefabInstance: {fileID: 685096599} m_PrefabAsset: {fileID: 0} +--- !u!1001 &709977451 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1259924953} + m_Modifications: + - target: {fileID: 247781027315986262, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 247781027315986262, guid: d623141a231a48e43b02346883eea70d, + type: 3} + - target: {fileID: 1414984924803784699, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: color.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1414984924803784699, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: color.b + value: 0.9113151 + objectReference: {fileID: 0} + - target: {fileID: 1414984924803784699, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: color.g + value: 0.43877992 + objectReference: {fileID: 0} + - target: {fileID: 1414984924803784699, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: color.r + value: 0.8921848 + objectReference: {fileID: 0} + - target: {fileID: 1414984924803784699, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1414984924803784699, guid: d623141a231a48e43b02346883eea70d, + type: 3} + - target: {fileID: 1907624226987691128, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2522616194857629913, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: m_Name + value: Marker (21) + objectReference: {fileID: 0} + - target: {fileID: 2522616194857629913, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2675414647648267488, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: m_RootOrder + value: 19 + objectReference: {fileID: 0} + - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.3774 + objectReference: {fileID: 0} + - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.0115 + objectReference: {fileID: 0} + - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.011899948 + objectReference: {fileID: 0} + - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2970190112737462616, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2970190112737462616, guid: d623141a231a48e43b02346883eea70d, + type: 3} + - target: {fileID: 3049154557044589514, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 3049154557044589514, guid: d623141a231a48e43b02346883eea70d, + type: 3} + - target: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: color.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: color.g + value: 0.56868994 + objectReference: {fileID: 0} + - target: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: color.r + value: 0.9811321 + objectReference: {fileID: 0} + - target: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, + type: 3} + - target: {fileID: 4792583903492655960, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 4792583903492655960, guid: d623141a231a48e43b02346883eea70d, + type: 3} + - target: {fileID: 6663509051561858909, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6972791105902807666, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7128519893122357875, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 7128519893122357875, guid: d623141a231a48e43b02346883eea70d, + type: 3} + - target: {fileID: 7926863938251667743, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 7926863938251667743, guid: d623141a231a48e43b02346883eea70d, + type: 3} + - target: {fileID: 8199654377595289253, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8199654377595289253, guid: d623141a231a48e43b02346883eea70d, + type: 3} + - target: {fileID: 8550257781792610365, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: color.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8550257781792610365, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8550257781792610365, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: color.g + value: 0.56868994 + objectReference: {fileID: 0} + - target: {fileID: 8550257781792610365, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: color.r + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d623141a231a48e43b02346883eea70d, type: 3} +--- !u!4 &709977452 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, + type: 3} + m_PrefabInstance: {fileID: 709977451} + m_PrefabAsset: {fileID: 0} --- !u!1001 &711194675 PrefabInstance: m_ObjectHideFlags: 0 @@ -3797,220 +4011,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &998653990 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1259924953} - m_Modifications: - - target: {fileID: 247781027315986262, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 247781027315986262, guid: d623141a231a48e43b02346883eea70d, - type: 3} - - target: {fileID: 1414984924803784699, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: color.a - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1414984924803784699, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: color.b - value: 0.8590249 - objectReference: {fileID: 0} - - target: {fileID: 1414984924803784699, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: color.g - value: 0.7957796 - objectReference: {fileID: 0} - - target: {fileID: 1414984924803784699, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: color.r - value: 0.85024786 - objectReference: {fileID: 0} - - target: {fileID: 1414984924803784699, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 1414984924803784699, guid: d623141a231a48e43b02346883eea70d, - type: 3} - - target: {fileID: 1907624226987691128, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: _syncMethod - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 2522616194857629913, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: m_Name - value: Marker (4) - objectReference: {fileID: 0} - - target: {fileID: 2522616194857629913, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2675414647648267488, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: _syncMethod - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: m_LocalPosition.x - value: 0.37699997 - objectReference: {fileID: 0} - - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: m_LocalPosition.y - value: 0.0115 - objectReference: {fileID: 0} - - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: m_LocalPosition.z - value: -0.011899948 - objectReference: {fileID: 0} - - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2970190112737462616, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 2970190112737462616, guid: d623141a231a48e43b02346883eea70d, - type: 3} - - target: {fileID: 3049154557044589514, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 3049154557044589514, guid: d623141a231a48e43b02346883eea70d, - type: 3} - - target: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: color.a - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: color.b - value: 0.8590249 - objectReference: {fileID: 0} - - target: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: color.g - value: 0.7957796 - objectReference: {fileID: 0} - - target: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: color.r - value: 0.85024786 - objectReference: {fileID: 0} - - target: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, - type: 3} - - target: {fileID: 4792583903492655960, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 4792583903492655960, guid: d623141a231a48e43b02346883eea70d, - type: 3} - - target: {fileID: 6663509051561858909, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: _syncMethod - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6972791105902807666, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: _syncMethod - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7128519893122357875, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 7128519893122357875, guid: d623141a231a48e43b02346883eea70d, - type: 3} - - target: {fileID: 7926863938251667743, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 7926863938251667743, guid: d623141a231a48e43b02346883eea70d, - type: 3} - - target: {fileID: 8199654377595289253, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: serializationData.Prefab - value: - objectReference: {fileID: 8199654377595289253, guid: d623141a231a48e43b02346883eea70d, - type: 3} - - target: {fileID: 8550257781792610365, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: color.a - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8550257781792610365, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: color.b - value: 0.8590249 - objectReference: {fileID: 0} - - target: {fileID: 8550257781792610365, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: color.g - value: 0.7957796 - objectReference: {fileID: 0} - - target: {fileID: 8550257781792610365, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: color.r - value: 0.85024786 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d623141a231a48e43b02346883eea70d, type: 3} ---- !u!4 &998653991 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, - type: 3} - m_PrefabInstance: {fileID: 998653990} - m_PrefabAsset: {fileID: 0} --- !u!1 &1070976277 GameObject: m_ObjectHideFlags: 0 @@ -4337,7 +4337,6 @@ Transform: - {fileID: 1447122078} - {fileID: 1330515283} - {fileID: 711194676} - - {fileID: 998653991} - {fileID: 2059209798} - {fileID: 1101927095} - {fileID: 759311733} @@ -4354,6 +4353,7 @@ Transform: - {fileID: 581782800} - {fileID: 304176508} - {fileID: 883812959} + - {fileID: 709977452} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Shader/Marker.shader b/Shader/Marker.shader index 077b5e1..ed3fbfe 100644 --- a/Shader/Marker.shader +++ b/Shader/Marker.shader @@ -2,6 +2,7 @@ { Properties { + _Color ("Color", Color) = (1,1,1,1) [NoScaleOffset] _MainTex ("Desaturated Albedo (R), Color Mask B, Smoothness A", 2D) = "white" {} @@ -10,16 +11,33 @@ //[NoScaleOffset] _Data("Occlusion G, Color Mask B, Smoothness A", 2D) = "white" {} //_Glossiness ("Smoothness", Range(0,1)) = 0.5 //_Saturation ("Saturation", Range(0,1)) = 0.5 + + [Space(10)] + [ToggleUI] _toggle ("LTCGI: To enable open the shader file", Float) = 0 // line 31 + } + SubShader { - Tags { "RenderType"="Opaque" } + Tags { "RenderType"="Opaque" "LTCGI"="_LTCGI"} LOD 200 CGPROGRAM #pragma surface surf Standard addshadow #pragma target 4.5 + // shader feature was causing issues and didnt want to compile + // uncomment to enable LTCGI: + //#define LTCGI + + #ifdef SHADER_API_MOBILE + #undef LTCGI + #endif + + #ifdef LTCGI + #include "Assets/_pi_/_LTCGI/Shaders/LTCGI.cginc" + #endif + float GSAA(float3 worldNormal, float perceptualRoughness) { // Kaplanyan 2016, "Stable specular highlights" @@ -45,10 +63,15 @@ return sqrt(sqrt(squareRoughness)); } + struct Input { float2 uv_MainTex; - float3 worldNormal; + float3 worldNormal; INTERNAL_DATA + #ifdef LTCGI + float2 uv2_LightMap; + float3 worldPos; + #endif }; sampler2D _MainTex; @@ -64,6 +87,19 @@ UNITY_DEFINE_INSTANCED_PROP(half3, _Color) UNITY_INSTANCING_BUFFER_END(Props) + float3 get_camera_pos() { + float3 worldCam; + worldCam.x = unity_CameraToWorld[0][3]; + worldCam.y = unity_CameraToWorld[1][3]; + worldCam.z = unity_CameraToWorld[2][3]; + return worldCam; + } + + float3 F_Schlick(float u, float3 f0, float f90) + { + return f0 + (f90 - f0) * pow(1.0 - u, 5.0); + } + void surf (Input IN, inout SurfaceOutputStandard o) { half4 dataTex = tex2D(_MainTex, IN.uv_MainTex); @@ -80,8 +116,31 @@ o.Albedo = albedo; o.Metallic = 0; + float rawSmoothness = dataTex.a; o.Smoothness = 1.0f - GSAA(IN.worldNormal, 1.0f - dataTex.a); o.Alpha = 1; + + #ifdef LTCGI + { + float3 normal = WorldNormalVector(IN, o.Normal); + float3 spec = 0, diff = 0; + float3 viewDir = normalize(get_camera_pos() - IN.worldPos); + float NoV = saturate(dot(normal, viewDir)); + float f0 = 0.16 * 0.5 * 0.5; + float fr = F_Schlick(NoV, f0, 1); + LTCGI_Contribution( + IN.worldPos, + normalize(normal), + viewDir, + 1 - o.Smoothness, + IN.uv2_LightMap, + diff, + spec + ); + o.Emission += spec * fr * UNITY_PI * dataTex.a; + o.Emission += diff * o.Albedo; + } + #endif } ENDCG } From cb32ea353043885a41b3e73cb7dd54b09914debc Mon Sep 17 00:00:00 2001 From: z3y Date: Sat, 5 Nov 2022 18:57:11 +0100 Subject: [PATCH 3/5] allow emissive trail --- Marker.prefab | 2 + Marker.unity | 482 ++++++++++++++++++++++++-- Marker_Profiles.meta | 8 + Marker_Profiles/PP Profile.asset | 63 ++++ Marker_Profiles/PP Profile.asset.meta | 8 + Material/Marker.mat | 2 + Scripts/MarkerSettings.cs | 6 + Scripts/MarkerTrail.asset | 282 ++++++++------- Scripts/MarkerTrail.cs | 8 + 9 files changed, 711 insertions(+), 150 deletions(-) create mode 100644 Marker_Profiles.meta create mode 100644 Marker_Profiles/PP Profile.asset create mode 100644 Marker_Profiles/PP Profile.asset.meta diff --git a/Marker.prefab b/Marker.prefab index 4ac55dc..985af3c 100644 --- a/Marker.prefab +++ b/Marker.prefab @@ -394,6 +394,7 @@ MonoBehaviour: marker: {fileID: 247781027315986262} markerTrail: {fileID: 3968491154304474225} color: {r: 1, g: 1, b: 1, a: 0} + trailEmission: 1 width: 0.003 smoothing: 0.67 updateRate: 0.03 @@ -617,6 +618,7 @@ MonoBehaviour: marker: {fileID: 247781027315986262} trailPosition: {fileID: 1403787091852531294} color: {r: 1, g: 1, b: 1, a: 0} + emission: 1 minDistance: 0.002 width: 0.003 updateRate: 0.03 diff --git a/Marker.unity b/Marker.unity index bf0804b..adafa65 100644 --- a/Marker.unity +++ b/Marker.unity @@ -406,7 +406,7 @@ PrefabInstance: - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: m_RootOrder - value: 13 + value: 12 objectReference: {fileID: 0} - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} @@ -490,6 +490,11 @@ PrefabInstance: propertyPath: color.r value: 0.8154176 objectReference: {fileID: 0} + - target: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: emission + value: 5 + objectReference: {fileID: 0} - target: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: serializationData.Prefab @@ -550,6 +555,11 @@ PrefabInstance: propertyPath: color.r value: 0.8154176 objectReference: {fileID: 0} + - target: {fileID: 8550257781792610365, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: emission + value: 5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d623141a231a48e43b02346883eea70d, type: 3} --- !u!4 &261413215 stripped @@ -620,12 +630,12 @@ PrefabInstance: - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: m_RootOrder - value: 18 + value: 17 objectReference: {fileID: 0} - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: m_LocalPosition.x - value: 0.0020000339 + value: 0.0266 objectReference: {fileID: 0} - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} @@ -834,7 +844,7 @@ PrefabInstance: - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: m_RootOrder - value: 11 + value: 10 objectReference: {fileID: 0} - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} @@ -1222,7 +1232,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 358063555} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.009675537, y: 0.696, z: -4.033} + m_LocalPosition: {x: 0.009675537, y: 0.696, z: 3.4580002} m_LocalScale: {x: 1, y: 0.39072338, z: 1} m_Children: [] m_Father: {fileID: 0} @@ -1409,7 +1419,7 @@ RectTransform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 440833312} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -4.031} + m_LocalPosition: {x: 0, y: 0, z: 3.46} m_LocalScale: {x: 0.002, y: 0.002, z: 0.002} m_Children: - {fileID: 548224164} @@ -1654,27 +1664,27 @@ PrefabInstance: - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: m_RootOrder - value: 17 + value: 16 objectReference: {fileID: 0} - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: m_LocalPosition.x - value: 0.02700004 + value: -0.526 objectReference: {fileID: 0} - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: m_LocalPosition.y - value: 0.0115 + value: -0.2005 objectReference: {fileID: 0} - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: m_LocalPosition.z - value: -0.011899948 + value: 6.874 objectReference: {fileID: 0} - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: -0.0000002533197 objectReference: {fileID: 0} - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} @@ -1684,7 +1694,7 @@ PrefabInstance: - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} @@ -1699,7 +1709,7 @@ PrefabInstance: - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: -540 objectReference: {fileID: 0} - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} @@ -1878,7 +1888,7 @@ PrefabInstance: - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: m_RootOrder - value: 15 + value: 14 objectReference: {fileID: 0} - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} @@ -2030,6 +2040,240 @@ Transform: type: 3} m_PrefabInstance: {fileID: 582225736} m_PrefabAsset: {fileID: 0} +--- !u!1001 &582880128 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1259924953} + m_Modifications: + - target: {fileID: 247781027315986262, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 247781027315986262, guid: d623141a231a48e43b02346883eea70d, + type: 3} + - target: {fileID: 1414984924803784699, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: color.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1414984924803784699, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: color.b + value: 0.61691767 + objectReference: {fileID: 0} + - target: {fileID: 1414984924803784699, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: color.g + value: 0.029491572 + objectReference: {fileID: 0} + - target: {fileID: 1414984924803784699, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: color.r + value: 0.5583202 + objectReference: {fileID: 0} + - target: {fileID: 1414984924803784699, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1414984924803784699, guid: d623141a231a48e43b02346883eea70d, + type: 3} + - target: {fileID: 1907624226987691128, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2522616194857629913, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: m_Name + value: Marker (22) + objectReference: {fileID: 0} + - target: {fileID: 2522616194857629913, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2675414647648267488, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: _syncMethod + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: m_RootOrder + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.5035 + objectReference: {fileID: 0} + - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.2005 + objectReference: {fileID: 0} + - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: m_LocalPosition.z + value: 6.874 + objectReference: {fileID: 0} + - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.0000002533197 + objectReference: {fileID: 0} + - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: m_LocalRotation.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -540 + objectReference: {fileID: 0} + - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2970190112737462616, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2970190112737462616, guid: d623141a231a48e43b02346883eea70d, + type: 3} + - target: {fileID: 3049154557044589514, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 3049154557044589514, guid: d623141a231a48e43b02346883eea70d, + type: 3} + - target: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: color.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: color.b + value: 0.990566 + objectReference: {fileID: 0} + - target: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: color.g + value: 0.65605515 + objectReference: {fileID: 0} + - target: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: color.r + value: 0.25943398 + objectReference: {fileID: 0} + - target: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: emission + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: vertexLimit + value: 1000 + objectReference: {fileID: 0} + - target: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, + type: 3} + - target: {fileID: 4792583903492655960, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 4792583903492655960, guid: d623141a231a48e43b02346883eea70d, + type: 3} + - target: {fileID: 6663509051561858909, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6972791105902807666, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: _syncMethod + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7128519893122357875, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 7128519893122357875, guid: d623141a231a48e43b02346883eea70d, + type: 3} + - target: {fileID: 7926863938251667743, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 7926863938251667743, guid: d623141a231a48e43b02346883eea70d, + type: 3} + - target: {fileID: 8199654377595289253, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8199654377595289253, guid: d623141a231a48e43b02346883eea70d, + type: 3} + - target: {fileID: 8550257781792610365, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: color.a + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8550257781792610365, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: color.b + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8550257781792610365, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: color.g + value: 0.65605515 + objectReference: {fileID: 0} + - target: {fileID: 8550257781792610365, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: color.r + value: 0.25943398 + objectReference: {fileID: 0} + - target: {fileID: 8550257781792610365, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: vertexLimit + value: 1000 + objectReference: {fileID: 0} + - target: {fileID: 8550257781792610365, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: trailEmission + value: 6 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d623141a231a48e43b02346883eea70d, type: 3} +--- !u!4 &582880129 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, + type: 3} + m_PrefabInstance: {fileID: 582880128} + m_PrefabAsset: {fileID: 0} --- !u!1001 &610115592 PrefabInstance: m_ObjectHideFlags: 0 @@ -2092,7 +2336,7 @@ PrefabInstance: - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: m_RootOrder - value: 9 + value: 8 objectReference: {fileID: 0} - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} @@ -2306,7 +2550,7 @@ PrefabInstance: - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: m_RootOrder - value: 14 + value: 13 objectReference: {fileID: 0} - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} @@ -2818,6 +3062,11 @@ PrefabInstance: propertyPath: color.r value: 0.63736176 objectReference: {fileID: 0} + - target: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: emission + value: 1.27 + objectReference: {fileID: 0} - target: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: serializationData.Prefab @@ -2878,6 +3127,11 @@ PrefabInstance: propertyPath: color.r value: 0.63736176 objectReference: {fileID: 0} + - target: {fileID: 8550257781792610365, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: trailEmission + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d623141a231a48e43b02346883eea70d, type: 3} --- !u!4 &711194676 stripped @@ -3121,7 +3375,7 @@ PrefabInstance: - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: m_RootOrder - value: 6 + value: 5 objectReference: {fileID: 0} - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} @@ -3335,7 +3589,7 @@ PrefabInstance: - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: m_RootOrder - value: 7 + value: 6 objectReference: {fileID: 0} - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} @@ -3544,27 +3798,27 @@ PrefabInstance: - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: m_RootOrder - value: 19 + value: 18 objectReference: {fileID: 0} - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: m_LocalPosition.x - value: -0.022999972 + value: -0.548 objectReference: {fileID: 0} - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: m_LocalPosition.y - value: 0.0115 + value: -0.2002 objectReference: {fileID: 0} - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: m_LocalPosition.z - value: -0.011899948 + value: 6.8726 objectReference: {fileID: 0} - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: -0.0000002533197 objectReference: {fileID: 0} - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} @@ -3574,7 +3828,7 @@ PrefabInstance: - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} @@ -3589,7 +3843,7 @@ PrefabInstance: - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: -540 objectReference: {fileID: 0} - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} @@ -3633,10 +3887,15 @@ PrefabInstance: propertyPath: color.r value: 0.107645065 objectReference: {fileID: 0} + - target: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: emission + value: 1.05 + objectReference: {fileID: 0} - target: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: updateRate - value: 0.01 + value: 0.02 objectReference: {fileID: 0} - target: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, type: 3} @@ -3711,7 +3970,7 @@ PrefabInstance: - target: {fileID: 8550257781792610365, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: m_Enabled - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8550257781792610365, guid: d623141a231a48e43b02346883eea70d, type: 3} @@ -3723,6 +3982,11 @@ PrefabInstance: propertyPath: minDistance value: 0.001 objectReference: {fileID: 0} + - target: {fileID: 8550257781792610365, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: trailEmission + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d623141a231a48e43b02346883eea70d, type: 3} --- !u!4 &883812959 stripped @@ -3793,7 +4057,7 @@ PrefabInstance: - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: m_RootOrder - value: 10 + value: 9 objectReference: {fileID: 0} - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} @@ -4155,7 +4419,7 @@ PrefabInstance: - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: m_RootOrder - value: 5 + value: 4 objectReference: {fileID: 0} - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} @@ -4354,6 +4618,7 @@ Transform: - {fileID: 304176508} - {fileID: 883812959} - {fileID: 709977452} + - {fileID: 582880129} m_Father: {fileID: 0} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -4556,6 +4821,54 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1330515282} m_PrefabAsset: {fileID: 0} +--- !u!1 &1334145135 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1334145137} + - component: {fileID: 1334145136} + m_Layer: 22 + m_Name: PP + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1334145136 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1334145135} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3} + m_Name: + m_EditorClassIdentifier: + sharedProfile: {fileID: 11400000, guid: 2c71cbfc864c1e0478ad9cec87aa07ef, type: 2} + isGlobal: 1 + blendDistance: 0 + weight: 1 + priority: 0 +--- !u!4 &1334145137 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1334145135} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.029485296, y: 0.98048085, z: -2.9651186} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 13 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1447122078 stripped Transform: m_CorrespondingSourceObject: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, @@ -4624,7 +4937,7 @@ PrefabInstance: - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: m_RootOrder - value: 16 + value: 15 objectReference: {fileID: 0} - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} @@ -5082,7 +5395,7 @@ PrefabInstance: - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: m_RootOrder - value: 12 + value: 11 objectReference: {fileID: 0} - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} @@ -5296,7 +5609,7 @@ PrefabInstance: - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: m_RootOrder - value: 4 + value: 3 objectReference: {fileID: 0} - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} @@ -5380,6 +5693,11 @@ PrefabInstance: propertyPath: color.r value: 0.8921848 objectReference: {fileID: 0} + - target: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: emission + value: 2.21 + objectReference: {fileID: 0} - target: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: serializationData.Prefab @@ -5440,6 +5758,11 @@ PrefabInstance: propertyPath: color.r value: 0.8921848 objectReference: {fileID: 0} + - target: {fileID: 8550257781792610365, guid: d623141a231a48e43b02346883eea70d, + type: 3} + propertyPath: trailEmission + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d623141a231a48e43b02346883eea70d, type: 3} --- !u!4 &2059209798 stripped @@ -5448,6 +5771,99 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2059209797} m_PrefabAsset: {fileID: 0} +--- !u!1 &2089584690 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2089584694} + - component: {fileID: 2089584693} + - component: {fileID: 2089584692} + - component: {fileID: 2089584691} + m_Layer: 0 + m_Name: Cube (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 4294967295 + m_IsActive: 1 +--- !u!65 &2089584691 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2089584690} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &2089584692 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2089584690} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: fc00e5b4e2616a846a548061f9651f08, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 +--- !u!33 &2089584693 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2089584690} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!4 &2089584694 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2089584690} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: 3.746} + m_LocalScale: {x: 2, y: 2, z: 0.5} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 14 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2100676473 PrefabInstance: m_ObjectHideFlags: 0 @@ -5510,7 +5926,7 @@ PrefabInstance: - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: m_RootOrder - value: 8 + value: 7 objectReference: {fileID: 0} - target: {fileID: 2903118327533707875, guid: d623141a231a48e43b02346883eea70d, type: 3} diff --git a/Marker_Profiles.meta b/Marker_Profiles.meta new file mode 100644 index 0000000..2fb5202 --- /dev/null +++ b/Marker_Profiles.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bbef179c8a327d548848d33c13f3852c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Marker_Profiles/PP Profile.asset b/Marker_Profiles/PP Profile.asset new file mode 100644 index 0000000..4677dc6 --- /dev/null +++ b/Marker_Profiles/PP Profile.asset @@ -0,0 +1,63 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-8062753143331841654 +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: 0.33333334 + threshold: + overrideState: 1 + 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: PP Profile + m_EditorClassIdentifier: + settings: + - {fileID: -8062753143331841654} diff --git a/Marker_Profiles/PP Profile.asset.meta b/Marker_Profiles/PP Profile.asset.meta new file mode 100644 index 0000000..66abfd3 --- /dev/null +++ b/Marker_Profiles/PP Profile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2c71cbfc864c1e0478ad9cec87aa07ef +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Material/Marker.mat b/Material/Marker.mat index 57d11e9..c1e98bb 100644 --- a/Material/Marker.mat +++ b/Material/Marker.mat @@ -125,6 +125,7 @@ Material: - _LTCGI: 0 - _LTCGI_DIFFUSE_OFF: 0 - _LightmappedSpecular: 0 + - _Ltcgi: 0 - _Metallic: 0 - _Mode: 0 - _NonLinearLightProbeSH: 0 @@ -146,6 +147,7 @@ Material: - _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} diff --git a/Scripts/MarkerSettings.cs b/Scripts/MarkerSettings.cs index 0953e63..1d1b6ef 100644 --- a/Scripts/MarkerSettings.cs +++ b/Scripts/MarkerSettings.cs @@ -15,8 +15,13 @@ public class MarkerSettings : MonoBehaviour [Header("Settings")] [ColorUsage(false, false)] public Color color = Color.white; + [Tooltip("Color multiplier to allow HDR values for trail emission")] + [Range(1f, 6f)] public float trailEmission = 1f; + [Range(0.001f, 0.01f)] public float width = 0.003f; [Range(0f, 1f)] public float smoothing = 0.67f; + + [Tooltip("Min time before new lines are added")][Range(0.02f, 0.2f)] public float updateRate = 0.03f; [Tooltip("Min distance before new lines are added")][Range(0.001f, 0.01f)] public float minDistance = 0.002f; @@ -40,6 +45,7 @@ private void UpdateMarkerSettings() markerTrail.updateRate = updateRate; markerTrail.minDistance = minDistance; markerTrail.vertexLimit = vertexLimit; + markerTrail.emission = trailEmission; } public void OnValidate() diff --git a/Scripts/MarkerTrail.asset b/Scripts/MarkerTrail.asset index 5150195..7625bb0 100644 --- a/Scripts/MarkerTrail.asset +++ b/Scripts/MarkerTrail.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 35 + Data: 36 - Name: Entry: 7 Data: @@ -218,13 +218,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: minDistance + Data: emission - Name: $v Entry: 7 Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: minDistance + Data: emission - Name: k__BackingField Entry: 7 Data: 13|System.RuntimeType, mscorlib @@ -272,13 +272,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: width + Data: minDistance - Name: $v Entry: 7 Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: width + Data: minDistance - Name: k__BackingField Entry: 9 Data: 13 @@ -320,13 +320,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: updateRate + Data: width - Name: $v Entry: 7 Data: 17|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: updateRate + Data: width - Name: k__BackingField Entry: 9 Data: 13 @@ -368,13 +368,13 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: smoothing + Data: updateRate - Name: $v Entry: 7 Data: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: smoothing + Data: updateRate - Name: k__BackingField Entry: 9 Data: 13 @@ -416,10 +416,58 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _smoothingCached + Data: smoothing - Name: $v Entry: 7 Data: 21|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: smoothing + - Name: k__BackingField + Entry: 9 + Data: 13 + - Name: k__BackingField + Entry: 9 + Data: 13 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 22|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: _smoothingCached + - Name: $v + Entry: 7 + Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _smoothingCached @@ -443,7 +491,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -467,13 +515,13 @@ MonoBehaviour: Data: _vertices - Name: $v Entry: 7 - Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _vertices - Name: k__BackingField Entry: 7 - Data: 24|System.RuntimeType, mscorlib + Data: 26|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Vector3[], UnityEngine.CoreModule @@ -482,7 +530,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 24 + Data: 26 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -497,7 +545,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -521,13 +569,13 @@ MonoBehaviour: Data: _triangles - Name: $v Entry: 7 - Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _triangles - Name: k__BackingField Entry: 7 - Data: 27|System.RuntimeType, mscorlib + Data: 29|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32[], mscorlib @@ -536,7 +584,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 27 + Data: 29 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -551,7 +599,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -575,16 +623,16 @@ MonoBehaviour: Data: _normals - Name: $v Entry: 7 - Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _normals - Name: k__BackingField Entry: 9 - Data: 24 + Data: 26 - Name: k__BackingField Entry: 9 - Data: 24 + Data: 26 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -599,7 +647,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 30|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -623,13 +671,13 @@ MonoBehaviour: Data: _uv - Name: $v Entry: 7 - Data: 31|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _uv - Name: k__BackingField Entry: 7 - Data: 32|System.RuntimeType, mscorlib + Data: 34|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Vector2[], UnityEngine.CoreModule @@ -638,7 +686,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 32 + Data: 34 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -653,7 +701,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 35|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -677,13 +725,13 @@ MonoBehaviour: Data: vertexLimit - Name: $v Entry: 7 - Data: 34|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: vertexLimit - Name: k__BackingField Entry: 7 - Data: 35|System.RuntimeType, mscorlib + Data: 37|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Int32, mscorlib @@ -692,7 +740,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 35 + Data: 37 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -707,7 +755,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 36|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -731,16 +779,16 @@ MonoBehaviour: Data: _verticesUsed - Name: $v Entry: 7 - Data: 37|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _verticesUsed - Name: k__BackingField Entry: 9 - Data: 35 + Data: 37 - Name: k__BackingField Entry: 9 - Data: 35 + Data: 37 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -755,7 +803,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 40|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -779,16 +827,16 @@ MonoBehaviour: Data: _lastVerticesUsed - Name: $v Entry: 7 - Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _lastVerticesUsed - Name: k__BackingField Entry: 9 - Data: 35 + Data: 37 - Name: k__BackingField Entry: 9 - Data: 35 + Data: 37 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -803,7 +851,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 40|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -827,16 +875,16 @@ MonoBehaviour: Data: _trianglesUsed - Name: $v Entry: 7 - Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _trianglesUsed - Name: k__BackingField Entry: 9 - Data: 35 + Data: 37 - Name: k__BackingField Entry: 9 - Data: 35 + Data: 37 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -851,7 +899,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -875,16 +923,16 @@ MonoBehaviour: Data: _lastTrianglesUsed - Name: $v Entry: 7 - Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _lastTrianglesUsed - Name: k__BackingField Entry: 9 - Data: 35 + Data: 37 - Name: k__BackingField Entry: 9 - Data: 35 + Data: 37 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -899,7 +947,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 46|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -923,13 +971,13 @@ MonoBehaviour: Data: _mesh - Name: $v Entry: 7 - Data: 45|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 47|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _mesh - Name: k__BackingField Entry: 7 - Data: 46|System.RuntimeType, mscorlib + Data: 48|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Mesh, UnityEngine.CoreModule @@ -938,7 +986,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 46 + Data: 48 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -953,7 +1001,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 47|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -977,16 +1025,16 @@ MonoBehaviour: Data: _trailing - Name: $v Entry: 7 - Data: 48|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _trailing - Name: k__BackingField Entry: 9 - Data: 46 + Data: 48 - Name: k__BackingField Entry: 9 - Data: 46 + Data: 48 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1001,7 +1049,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 49|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1025,13 +1073,13 @@ MonoBehaviour: Data: trailingMesh - Name: $v Entry: 7 - Data: 50|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: trailingMesh - Name: k__BackingField Entry: 7 - Data: 51|System.RuntimeType, mscorlib + Data: 53|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.MeshFilter, UnityEngine.CoreModule @@ -1040,7 +1088,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 51 + Data: 53 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1055,7 +1103,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 52|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1079,16 +1127,16 @@ MonoBehaviour: Data: trailStorage - Name: $v Entry: 7 - Data: 53|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: trailStorage - Name: k__BackingField Entry: 9 - Data: 51 + Data: 53 - Name: k__BackingField Entry: 9 - Data: 51 + Data: 53 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1103,7 +1151,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 54|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1127,7 +1175,7 @@ MonoBehaviour: Data: _time - Name: $v Entry: 7 - Data: 55|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _time @@ -1151,7 +1199,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 56|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 58|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1175,13 +1223,13 @@ MonoBehaviour: Data: _previousPosition - Name: $v Entry: 7 - Data: 57|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 59|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _previousPosition - Name: k__BackingField Entry: 7 - Data: 58|System.RuntimeType, mscorlib + Data: 60|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Vector3, UnityEngine.CoreModule @@ -1190,7 +1238,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 58 + Data: 60 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1205,7 +1253,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 59|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1229,16 +1277,16 @@ MonoBehaviour: Data: _previousSmoothingPosition - Name: $v Entry: 7 - Data: 60|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _previousSmoothingPosition - Name: k__BackingField Entry: 9 - Data: 58 + Data: 60 - Name: k__BackingField Entry: 9 - Data: 58 + Data: 60 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1253,7 +1301,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 61|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1277,16 +1325,16 @@ MonoBehaviour: Data: _smoothingPosition - Name: $v Entry: 7 - Data: 62|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _smoothingPosition - Name: k__BackingField Entry: 9 - Data: 58 + Data: 60 - Name: k__BackingField Entry: 9 - Data: 58 + Data: 60 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1301,7 +1349,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 63|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 65|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1325,13 +1373,13 @@ MonoBehaviour: Data: isLocal - Name: $v Entry: 7 - Data: 64|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 66|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: isLocal - Name: k__BackingField Entry: 7 - Data: 65|System.RuntimeType, mscorlib + Data: 67|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Boolean, mscorlib @@ -1340,7 +1388,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 65 + Data: 67 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1355,7 +1403,7 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 66|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1379,16 +1427,16 @@ MonoBehaviour: Data: _syncLines - Name: $v Entry: 7 - Data: 67|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _syncLines - Name: k__BackingField Entry: 9 - Data: 24 + Data: 26 - Name: k__BackingField Entry: 9 - Data: 24 + Data: 26 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1403,7 +1451,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 68|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1427,16 +1475,16 @@ MonoBehaviour: Data: _syncLinesUsed - Name: $v Entry: 7 - Data: 69|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _syncLinesUsed - Name: k__BackingField Entry: 9 - Data: 35 + Data: 37 - Name: k__BackingField Entry: 9 - Data: 35 + Data: 37 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1451,7 +1499,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1475,13 +1523,13 @@ MonoBehaviour: Data: _UV_0 - Name: $v Entry: 7 - Data: 71|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 73|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _UV_0 - Name: k__BackingField Entry: 7 - Data: 72|System.RuntimeType, mscorlib + Data: 74|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Vector2, UnityEngine.CoreModule @@ -1490,7 +1538,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 72 + Data: 74 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1505,7 +1553,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 73|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 75|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1529,16 +1577,16 @@ MonoBehaviour: Data: _UV_1 - Name: $v Entry: 7 - Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _UV_1 - Name: k__BackingField Entry: 9 - Data: 72 + Data: 74 - Name: k__BackingField Entry: 9 - Data: 72 + Data: 74 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1553,7 +1601,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 75|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1577,16 +1625,16 @@ MonoBehaviour: Data: _UV_2 - Name: $v Entry: 7 - Data: 76|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _UV_2 - Name: k__BackingField Entry: 9 - Data: 72 + Data: 74 - Name: k__BackingField Entry: 9 - Data: 72 + Data: 74 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1601,7 +1649,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 79|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1625,16 +1673,16 @@ MonoBehaviour: Data: _UV_3 - Name: $v Entry: 7 - Data: 78|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _UV_3 - Name: k__BackingField Entry: 9 - Data: 72 + Data: 74 - Name: k__BackingField Entry: 9 - Data: 72 + Data: 74 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1649,7 +1697,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 79|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 81|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1673,16 +1721,16 @@ MonoBehaviour: Data: _UV_4 - Name: $v Entry: 7 - Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _UV_4 - Name: k__BackingField Entry: 9 - Data: 72 + Data: 74 - Name: k__BackingField Entry: 9 - Data: 72 + Data: 74 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1697,7 +1745,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 81|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1721,16 +1769,16 @@ MonoBehaviour: Data: _UV_5 - Name: $v Entry: 7 - Data: 82|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _UV_5 - Name: k__BackingField Entry: 9 - Data: 72 + Data: 74 - Name: k__BackingField Entry: 9 - Data: 72 + Data: 74 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1745,7 +1793,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 @@ -1769,16 +1817,16 @@ MonoBehaviour: Data: _UV_6 - Name: $v Entry: 7 - Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 86|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _UV_6 - Name: k__BackingField Entry: 9 - Data: 72 + Data: 74 - Name: k__BackingField Entry: 9 - Data: 72 + Data: 74 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1793,7 +1841,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 85|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 87|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Scripts/MarkerTrail.cs b/Scripts/MarkerTrail.cs index 05fa5b5..b628f44 100644 --- a/Scripts/MarkerTrail.cs +++ b/Scripts/MarkerTrail.cs @@ -12,6 +12,7 @@ public class MarkerTrail : UdonSharpBehaviour public Marker marker; public Transform trailPosition; public Color color = Color.white; + public float emission = 1f; public float minDistance = 0.002f; public float width = 0.003f; public float updateRate = 0.03f; @@ -59,8 +60,15 @@ private void Start() trailingMesh.sharedMesh = _trailing; var propertyBlock = new MaterialPropertyBlock(); + +#if UNITY_ANDROID propertyBlock.SetColor("_Color", color); +#else + propertyBlock.SetColor("_Color", color * emission); +#endif + propertyBlock.SetFloat("_Scale", width); + trailStorage.GetComponent().SetPropertyBlock(propertyBlock); trailingMesh.GetComponent().SetPropertyBlock(propertyBlock); From d19e92a312f4db5d1462efbc6bf19f52ac499c6d Mon Sep 17 00:00:00 2001 From: z3y Date: Sat, 5 Nov 2022 20:05:27 +0100 Subject: [PATCH 4/5] change demo scene --- Marker.prefab | 6 ++-- Marker.unity | 65 +++++++++++++++++++++------------------- Material/Decal.psd.meta | 6 ++-- Material/Scene/floor.mat | 4 +-- 4 files changed, 42 insertions(+), 39 deletions(-) diff --git a/Marker.prefab b/Marker.prefab index 985af3c..aabc936 100644 --- a/Marker.prefab +++ b/Marker.prefab @@ -205,8 +205,8 @@ MonoBehaviour: allowManipulationWhenEquipped: 0 orientation: 0 AutoHold: 1 - InteractionText: - UseText: Use + InteractionText: Marker + UseText: Write useEventBroadcastType: 0 UseDownEventName: UseUpEventName: @@ -330,7 +330,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: interactTextPlacement: {fileID: 0} - interactText: Erase + interactText: Clear/Undo interactTextGO: {fileID: 0} proximity: 0.2 SynchronizePosition: 0 diff --git a/Marker.unity b/Marker.unity index adafa65..03c1118 100644 --- a/Marker.unity +++ b/Marker.unity @@ -342,7 +342,7 @@ Transform: m_LocalScale: {x: 0.1, y: 1, z: 0.1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &261413214 PrefabInstance: @@ -1231,12 +1231,12 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 358063555} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.009675537, y: 0.696, z: 3.4580002} - m_LocalScale: {x: 1, y: 0.39072338, z: 1} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -54.7, y: -143.9, z: -0.9999275} + m_LocalScale: {x: 385.55273, y: 150.64447, z: 385.55273} m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 9 + m_Father: {fileID: 440833316} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &414114674 PrefabInstance: @@ -1248,7 +1248,7 @@ PrefabInstance: - target: {fileID: 2958517746811294840, guid: 70279d83763c0d745a4e513a75053671, type: 3} propertyPath: m_RootOrder - value: 12 + value: 11 objectReference: {fileID: 0} - target: {fileID: 2958517746811294840, guid: 70279d83763c0d745a4e513a75053671, type: 3} @@ -1389,7 +1389,7 @@ MonoBehaviour: m_PhysicalUnit: 3 m_FallbackScreenDPI: 96 m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 2 + m_DynamicPixelsPerUnit: 3 --- !u!223 &440833315 Canvas: m_ObjectHideFlags: 0 @@ -1424,12 +1424,13 @@ RectTransform: m_Children: - {fileID: 548224164} - {fileID: 1070976278} + - {fileID: 358063559} m_Father: {fileID: 0} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 1.021} + m_AnchoredPosition: {x: 0.116, y: 1.108} m_SizeDelta: {x: 500, y: 500} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &449002593 @@ -1558,7 +1559,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 13.6, y: -243.1} m_SizeDelta: {x: 500, y: 500} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &548224165 @@ -1582,12 +1583,12 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 39 - m_FontStyle: 0 + m_FontSize: 24 + m_FontStyle: 1 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 2 m_MaxSize: 40 - m_Alignment: 4 + m_Alignment: 3 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 @@ -2191,11 +2192,6 @@ PrefabInstance: propertyPath: emission value: 6 objectReference: {fileID: 0} - - target: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: vertexLimit - value: 1000 - objectReference: {fileID: 0} - target: {fileID: 3968491154304474225, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: serializationData.Prefab @@ -2256,11 +2252,6 @@ PrefabInstance: propertyPath: color.r value: 0.25943398 objectReference: {fileID: 0} - - target: {fileID: 8550257781792610365, guid: d623141a231a48e43b02346883eea70d, - type: 3} - propertyPath: vertexLimit - value: 1000 - objectReference: {fileID: 0} - target: {fileID: 8550257781792610365, guid: d623141a231a48e43b02346883eea70d, type: 3} propertyPath: trailEmission @@ -4333,7 +4324,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 16 + m_FontSize: 14 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -4344,11 +4335,23 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: '- Rounded Trail on PC and Quest + m_Text: '- Custom Trail Renderer written in Udon + + - Very Optimized. No overhead + while idle, 1 draw call + + - Rounded Trail on PC and Quest + + - Trail Sync + + - + Trail Smoothing - Vertex Limit - - Trail Smoothing' + - Trail Emission + + - LTCGI' --- !u!222 &1070976280 CanvasRenderer: m_ObjectHideFlags: 0 @@ -4863,11 +4866,11 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1334145135} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.029485296, y: 0.98048085, z: -2.9651186} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1447122078 stripped Transform: @@ -5182,7 +5185,7 @@ Transform: m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1633360930 MonoBehaviour: @@ -5862,7 +5865,7 @@ Transform: m_LocalScale: {x: 2, y: 2, z: 0.5} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2100676473 PrefabInstance: diff --git a/Material/Decal.psd.meta b/Material/Decal.psd.meta index 51d9f37..a4719fb 100644 --- a/Material/Decal.psd.meta +++ b/Material/Decal.psd.meta @@ -85,14 +85,14 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Android - maxTextureSize: 2048 + maxTextureSize: 1024 resizeAlgorithm: 0 - textureFormat: -1 + textureFormat: 47 textureCompression: 1 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 - overridden: 0 + overridden: 1 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: diff --git a/Material/Scene/floor.mat b/Material/Scene/floor.mat index fc0159e..c8c870f 100644 --- a/Material/Scene/floor.mat +++ b/Material/Scene/floor.mat @@ -52,7 +52,7 @@ Material: m_Scale: {x: 100, y: 100} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 0080deae3a566a54abc9ca40f038439b, type: 3} + m_Texture: {fileID: 2800000, guid: 1d50805597ae3674f9267fafbce3733a, type: 3} m_Scale: {x: 1000, y: 1000} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -111,7 +111,7 @@ Material: - _ForceBoxProjection: 0 - _GSAA: 0 - _GlossMapScale: 1 - - _Glossiness: 0.5 + - _Glossiness: 1 - _GlossyReflections: 1 - _HeightBlend: 5 - _HeightBlendInvert: 0 From 1373ef22ca72b13b5d949f66d5d50e67b36f94b1 Mon Sep 17 00:00:00 2001 From: z3y Date: Sat, 5 Nov 2022 20:05:49 +0100 Subject: [PATCH 5/5] Update package.json --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 94bc292..d3d0e5b 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "com.z3y.vrcmarker", "description": "Markers for VRChat with a custom trail renderer written in udon with rounded trail on both PC and Quest", - "version": "2.0.4", + "version": "2.0.5", "unity": "2019.4", "displayName": "z3y - VRCMarker", "hideInEditor": false