From 3af1efb82d36e742a222c4aa9d0fc4914c56c2ad Mon Sep 17 00:00:00 2001 From: Anna Wall Date: Mon, 31 May 2021 17:35:34 -0400 Subject: [PATCH] Lots of fixes --- ExampleMaterials/FlatColorTrail.mat | 103 ---- ExampleMaterials/GradientTrail.mat | 84 --- ExampleMaterials/GradientTrail.shader | 57 -- .../{RainbowTrail.mat => Marker.mat} | 12 +- ...{RainbowTrail.mat.meta => Marker.mat.meta} | 0 ExampleMaterials/Marker.shader | 98 ++++ ...ntTrail.shader.meta => Marker.shader.meta} | 2 +- ExampleMaterials/RainbowTrail.shader | 62 --- ExampleMaterials/RainbowTrail.shader.meta | 9 - Help.md.meta | 7 + Marker.prefab | 6 +- .../SnailMarker3AnimationCreatorEditor.cs | 124 +++-- Marker3.0/Generated/Jelly.meta | 8 + .../DefaultAnimatorController.controller | 522 ++++++++++++++++++ .../DefaultAnimatorController.controller.meta | 4 +- Marker3.0/Generated/Jelly/DefaultMenu.asset | 25 + .../Generated/Jelly/DefaultMenu.asset.meta | 8 + Marker3.0/Generated/Jelly/DefaultParams.asset | 79 +++ .../Generated/Jelly/DefaultParams.asset.meta | 8 + Marker3.0/Generated/Jelly/DrawingOn.anim | 81 +++ .../Generated/Jelly/DrawingOn.anim.meta | 4 +- Marker3.0/Generated/Jelly/EraseAll.anim | 81 +++ Marker3.0/Generated/Jelly/EraseAll.anim.meta | 8 + Marker3.0/Generated/Jelly/Idle.anim | 109 ++++ Marker3.0/Generated/Jelly/Idle.anim.meta | 8 + Marker3.0/Generated/Jelly/MarkerOff.anim | 81 +++ Marker3.0/Generated/Jelly/MarkerOff.anim.meta | 8 + Marker3.0/Generated/Jelly/MarkerOn.anim | 81 +++ Marker3.0/Generated/Jelly/MarkerOn.anim.meta | 8 + marker3.0.unitypackage.meta | 7 + 30 files changed, 1323 insertions(+), 371 deletions(-) delete mode 100644 ExampleMaterials/FlatColorTrail.mat delete mode 100644 ExampleMaterials/GradientTrail.mat delete mode 100644 ExampleMaterials/GradientTrail.shader rename ExampleMaterials/{RainbowTrail.mat => Marker.mat} (90%) rename ExampleMaterials/{RainbowTrail.mat.meta => Marker.mat.meta} (100%) create mode 100644 ExampleMaterials/Marker.shader rename ExampleMaterials/{GradientTrail.shader.meta => Marker.shader.meta} (80%) delete mode 100644 ExampleMaterials/RainbowTrail.shader delete mode 100644 ExampleMaterials/RainbowTrail.shader.meta create mode 100644 Help.md.meta create mode 100644 Marker3.0/Generated/Jelly.meta create mode 100644 Marker3.0/Generated/Jelly/DefaultAnimatorController.controller rename ExampleMaterials/FlatColorTrail.mat.meta => Marker3.0/Generated/Jelly/DefaultAnimatorController.controller.meta (64%) create mode 100644 Marker3.0/Generated/Jelly/DefaultMenu.asset create mode 100644 Marker3.0/Generated/Jelly/DefaultMenu.asset.meta create mode 100644 Marker3.0/Generated/Jelly/DefaultParams.asset create mode 100644 Marker3.0/Generated/Jelly/DefaultParams.asset.meta create mode 100644 Marker3.0/Generated/Jelly/DrawingOn.anim rename ExampleMaterials/GradientTrail.mat.meta => Marker3.0/Generated/Jelly/DrawingOn.anim.meta (64%) create mode 100644 Marker3.0/Generated/Jelly/EraseAll.anim create mode 100644 Marker3.0/Generated/Jelly/EraseAll.anim.meta create mode 100644 Marker3.0/Generated/Jelly/Idle.anim create mode 100644 Marker3.0/Generated/Jelly/Idle.anim.meta create mode 100644 Marker3.0/Generated/Jelly/MarkerOff.anim create mode 100644 Marker3.0/Generated/Jelly/MarkerOff.anim.meta create mode 100644 Marker3.0/Generated/Jelly/MarkerOn.anim create mode 100644 Marker3.0/Generated/Jelly/MarkerOn.anim.meta create mode 100644 marker3.0.unitypackage.meta diff --git a/ExampleMaterials/FlatColorTrail.mat b/ExampleMaterials/FlatColorTrail.mat deleted file mode 100644 index 1db3b71..0000000 --- a/ExampleMaterials/FlatColorTrail.mat +++ /dev/null @@ -1,103 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: FlatColorTrail - m_Shader: {fileID: 4800000, guid: 1384d4a9608e5d64d94dfda5538c3792, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 0 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _texcoord: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BlendOp: 0 - - _BumpScale: 1 - - _CameraFadingEnabled: 0 - - _CameraFarFadeDistance: 2 - - _CameraNearFadeDistance: 1 - - _ColorMode: 0 - - _Cull: 2 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DistortionBlend: 0.5 - - _DistortionEnabled: 0 - - _DistortionStrength: 1 - - _DistortionStrengthScaled: 0 - - _DstBlend: 0 - - _EmissionEnabled: 0 - - _FlipbookMode: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _LightingEnabled: 0 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SoftParticlesEnabled: 0 - - _SoftParticlesFarFadeDistance: 1 - - _SoftParticlesNearFadeDistance: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - - __dirty: 1 - m_Colors: - - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 0.72404456, g: 0, b: 0.7924528, a: 1} - - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _From: {r: 0, g: 0, b: 0, a: 0} - - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} - - _To: {r: 0, g: 0, b: 0, a: 0} diff --git a/ExampleMaterials/GradientTrail.mat b/ExampleMaterials/GradientTrail.mat deleted file mode 100644 index ab6f2d9..0000000 --- a/ExampleMaterials/GradientTrail.mat +++ /dev/null @@ -1,84 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: GradientTrail - m_Shader: {fileID: 4800000, guid: 1384d4a9608e5d64d94dfda5538c3792, type: 3} - m_ShaderKeywords: - m_LightmapFlags: 0 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _texcoord: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - - __dirty: 0 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _From: {r: 0, g: 0.0377028, b: 1, a: 0} - - _To: {r: 0.7924528, g: 0, b: 0.6955474, a: 0} diff --git a/ExampleMaterials/GradientTrail.shader b/ExampleMaterials/GradientTrail.shader deleted file mode 100644 index 2b1b65b..0000000 --- a/ExampleMaterials/GradientTrail.shader +++ /dev/null @@ -1,57 +0,0 @@ -// Made with Amplify Shader Editor -// Available at the Unity Asset Store - http://u3d.as/y3X -Shader "GradientTrail" -{ - Properties - { - _From("From", Color) = (0,0,0,0) - _To("To", Color) = (0,0,0,0) - [HideInInspector] _texcoord( "", 2D ) = "white" {} - [HideInInspector] __dirty( "", Int ) = 1 - } - - SubShader - { - Tags{ "RenderType" = "Opaque" "Queue" = "Geometry+0" "IsEmissive" = "true" } - Cull Back - CGPROGRAM - #pragma target 3.0 - #pragma surface surf Unlit keepalpha noshadow - struct Input - { - float2 uv_texcoord; - }; - - uniform float4 _From; - uniform float4 _To; - - inline half4 LightingUnlit( SurfaceOutput s, half3 lightDir, half atten ) - { - return half4 ( 0, 0, 0, s.Alpha ); - } - - void surf( Input i , inout SurfaceOutput o ) - { - float4 lerpResult4 = lerp( _From , _To , i.uv_texcoord.x); - o.Emission = lerpResult4.rgb; - o.Alpha = 1; - } - - ENDCG - } - CustomEditor "ASEMaterialInspector" -} -/*ASEBEGIN -Version=18200 -1920;0;1920;1018;960;504.5;1;True;False -Node;AmplifyShaderEditor.TextureCoordinatesNode;5;-746,234.5;Inherit;False;0;-1;2;3;2;SAMPLER2D;;False;0;FLOAT2;1,1;False;1;FLOAT2;0,0;False;5;FLOAT2;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 -Node;AmplifyShaderEditor.ColorNode;2;-726,-89.5;Inherit;False;Property;_From;From;0;0;Create;True;0;0;False;0;False;0,0,0,0;0,0,0,0;True;0;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 -Node;AmplifyShaderEditor.ColorNode;3;-722,72.5;Inherit;False;Property;_To;To;1;0;Create;True;0;0;False;0;False;0,0,0,0;0,0,0,0;True;0;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 -Node;AmplifyShaderEditor.LerpOp;4;-403,148.5;Inherit;False;3;0;COLOR;0,0,0,0;False;1;COLOR;0,0,0,0;False;2;FLOAT;0;False;1;COLOR;0 -Node;AmplifyShaderEditor.StandardSurfaceOutputNode;0;0,0;Float;False;True;-1;2;ASEMaterialInspector;0;0;Unlit;GradientTrail;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;Back;0;False;-1;0;False;-1;False;0;False;-1;0;False;-1;False;0;Opaque;0.5;True;False;0;False;Opaque;;Geometry;All;14;all;True;True;True;True;0;False;-1;False;0;False;-1;255;False;-1;255;False;-1;0;False;-1;0;False;-1;0;False;-1;0;False;-1;0;False;-1;0;False;-1;0;False;-1;0;False;-1;False;2;15;10;25;False;0.5;False;0;0;False;-1;0;False;-1;0;0;False;-1;0;False;-1;0;False;-1;0;False;-1;0;False;0;0,0,0,0;VertexOffset;True;False;Cylindrical;False;Relative;0;;-1;-1;-1;-1;0;False;0;0;False;-1;-1;0;False;-1;0;0;0;False;0.1;False;-1;0;False;-1;15;0;FLOAT3;0,0,0;False;1;FLOAT3;0,0,0;False;2;FLOAT3;0,0,0;False;3;FLOAT;0;False;4;FLOAT;0;False;6;FLOAT3;0,0,0;False;7;FLOAT3;0,0,0;False;8;FLOAT;0;False;9;FLOAT;0;False;10;FLOAT;0;False;13;FLOAT3;0,0,0;False;11;FLOAT3;0,0,0;False;12;FLOAT3;0,0,0;False;14;FLOAT4;0,0,0,0;False;15;FLOAT3;0,0,0;False;0 -WireConnection;4;0;2;0 -WireConnection;4;1;3;0 -WireConnection;4;2;5;1 -WireConnection;0;2;4;0 -ASEEND*/ -//CHKSM=BED6C90BB9383B05BF2CAAD7F2065D1999648B0C \ No newline at end of file diff --git a/ExampleMaterials/RainbowTrail.mat b/ExampleMaterials/Marker.mat similarity index 90% rename from ExampleMaterials/RainbowTrail.mat rename to ExampleMaterials/Marker.mat index ad705a7..b7267ec 100644 --- a/ExampleMaterials/RainbowTrail.mat +++ b/ExampleMaterials/Marker.mat @@ -7,13 +7,13 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: RainbowTrail - m_Shader: {fileID: 10755, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: + m_Name: Marker + m_Shader: {fileID: 4800000, guid: 62fedb3dd4a69b4429fc3b7e2031dfa9, type: 3} + m_ShaderKeywords: _MODE_RAINBOW m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 2000 stringTagMap: {} disabledShaderPasses: [] m_SavedProperties: @@ -68,7 +68,7 @@ Material: - _Glossiness: 0.5 - _GlossyReflections: 1 - _Metallic: 0 - - _Mode: 0 + - _Mode: 2 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 @@ -78,7 +78,7 @@ Material: - _ZWrite: 1 - __dirty: 0 m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _From: {r: 0, g: 0, b: 0, a: 0} - _To: {r: 0, g: 0, b: 0, a: 0} diff --git a/ExampleMaterials/RainbowTrail.mat.meta b/ExampleMaterials/Marker.mat.meta similarity index 100% rename from ExampleMaterials/RainbowTrail.mat.meta rename to ExampleMaterials/Marker.mat.meta diff --git a/ExampleMaterials/Marker.shader b/ExampleMaterials/Marker.shader new file mode 100644 index 0000000..9942f87 --- /dev/null +++ b/ExampleMaterials/Marker.shader @@ -0,0 +1,98 @@ +Shader "Skuld/Skuld's Marker" +{ + Properties + { + [HDR]_Color("Color",Color) = (.5,0,1,1) + [KeywordEnum(TrailColor,SolidColor,Rainbow)] _Mode("Mode:", Int) = 2 + } + SubShader + { + Tags { "RenderType"="Opaque" } + LOD 100 + cull Off + + Pass + { + CGPROGRAM + #include "UnityCG.cginc" + #include "UnityLightingCommon.cginc" + #include "AutoLight.cginc" + #include "UnityPBSLighting.cginc" + + #pragma target 3.5 + #pragma vertex vert + #pragma fragment frag + // make fog work + #pragma multi_compile + + #include "UnityCG.cginc" + float4 _Color; + int _Mode; + sampler2D _MainTex; + + + struct appdata + { + float2 uv : TEXCOORD0; + float4 vertex : POSITION; + float4 color : COLOR; + }; + + struct v2f + { + float2 uv : TEXCOORD0; + float4 vertex : SV_POSITION; + float3 color : VCOLOR; + }; + + v2f vert (appdata v) + { + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + o.uv = v.uv; + o.color = v.color; + return o; + } + + float3 shiftColor(float3 inColor, float shift) + { + float r = shift * 0.01745329251994329576923690768489; + float u = cos(r); + float w = sin(r); + float3 ret; + ret.r = (.299 + .701 * u + .168 * w)*inColor.r + + (.587 - .587 * u + .330 * w)*inColor.g + + (.114 - .114 * u - .497 * w)*inColor.b; + ret.g = (.299 - .299 * u - .328 * w)*inColor.r + + (.587 + .413 * u + .035 * w)*inColor.g + + (.114 - .114 * u + .292 * w)*inColor.b; + ret.b = (.299 - .3 * u + 1.25 * w)*inColor.r + + (.587 - .588 * u - 1.05 * w)*inColor.g + + (.114 + .886 * u - .203 * w)*inColor.b; + return ret; + } + + float4 frag (v2f i) : SV_Target + { + // sample the texture + float4 col = _Color; + switch (_Mode) { + case 0: + col.rgb = i.color; + break; + case 1: + col = _Color; + break; + case 2: + col.rgb = float3(1, 0, 0); + float n = (i.uv.x * 2000.0f) + (_Time.z * 25.0f); + col.rgb = shiftColor(col.rgb, n); + break; + } + + return col; + } + ENDCG + } + } +} diff --git a/ExampleMaterials/GradientTrail.shader.meta b/ExampleMaterials/Marker.shader.meta similarity index 80% rename from ExampleMaterials/GradientTrail.shader.meta rename to ExampleMaterials/Marker.shader.meta index b7dfcab..8775aef 100644 --- a/ExampleMaterials/GradientTrail.shader.meta +++ b/ExampleMaterials/Marker.shader.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1384d4a9608e5d64d94dfda5538c3792 +guid: 62fedb3dd4a69b4429fc3b7e2031dfa9 ShaderImporter: externalObjects: {} defaultTextures: [] diff --git a/ExampleMaterials/RainbowTrail.shader b/ExampleMaterials/RainbowTrail.shader deleted file mode 100644 index 133f02f..0000000 --- a/ExampleMaterials/RainbowTrail.shader +++ /dev/null @@ -1,62 +0,0 @@ -// Made with Amplify Shader Editor -// Available at the Unity Asset Store - http://u3d.as/y3X -Shader "Unlit/RainbowTrail" -{ - Properties - { - [HideInInspector] _texcoord( "", 2D ) = "white" {} - [HideInInspector] __dirty( "", Int ) = 1 - } - - SubShader - { - Tags{ "RenderType" = "Opaque" "Queue" = "Geometry+0" "IsEmissive" = "true" } - Cull Back - CGPROGRAM - #pragma target 3.0 - #pragma surface surf Unlit keepalpha addshadow fullforwardshadows - struct Input - { - float2 uv_texcoord; - }; - - - float3 HSVToRGB( float3 c ) - { - float4 K = float4( 1.0, 2.0 / 3.0, 1.0 / 3.0, 3.0 ); - float3 p = abs( frac( c.xxx + K.xyz ) * 6.0 - K.www ); - return c.z * lerp( K.xxx, saturate( p - K.xxx ), c.y ); - } - - - inline half4 LightingUnlit( SurfaceOutput s, half3 lightDir, half atten ) - { - return half4 ( 0, 0, 0, s.Alpha ); - } - - void surf( Input i , inout SurfaceOutput o ) - { - float2 _Vector0 = float2(1,1); - float3 hsvTorgb1 = HSVToRGB( float3(i.uv_texcoord.x,_Vector0.x,_Vector0.y) ); - o.Emission = hsvTorgb1; - o.Alpha = 1; - } - - ENDCG - } - Fallback "Diffuse" - CustomEditor "ASEMaterialInspector" -} -/*ASEBEGIN -Version=18200 -1920;0;1920;1018;1160;501.5;1;False;False -Node;AmplifyShaderEditor.TextureCoordinatesNode;2;-424,-64.5;Inherit;False;0;-1;2;3;2;SAMPLER2D;;False;0;FLOAT2;1,1;False;1;FLOAT2;0,0;False;5;FLOAT2;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4 -Node;AmplifyShaderEditor.Vector2Node;3;-433,87.5;Inherit;False;Constant;_Vector0;Vector 0;0;0;Create;True;0;0;False;0;False;1,1;0,0;0;3;FLOAT2;0;FLOAT;1;FLOAT;2 -Node;AmplifyShaderEditor.HSVToRGBNode;1;-202,-34.5;Inherit;False;3;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;0;False;4;FLOAT3;0;FLOAT;1;FLOAT;2;FLOAT;3 -Node;AmplifyShaderEditor.StandardSurfaceOutputNode;0;1,-81;Float;False;True;-1;2;ASEMaterialInspector;0;0;Unlit;Unlit/RainbowTrail;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;Back;0;False;-1;0;False;-1;False;0;False;-1;0;False;-1;False;0;Opaque;0.5;True;True;0;False;Opaque;;Geometry;All;14;all;True;True;True;True;0;False;-1;False;0;False;-1;255;False;-1;255;False;-1;0;False;-1;0;False;-1;0;False;-1;0;False;-1;0;False;-1;0;False;-1;0;False;-1;0;False;-1;False;2;15;10;25;False;0.5;True;0;0;False;-1;0;False;-1;0;0;False;-1;0;False;-1;0;False;-1;0;False;-1;0;False;0;0,0,0,0;VertexOffset;True;False;Cylindrical;False;Relative;0;;-1;-1;-1;-1;0;False;0;0;False;-1;-1;0;False;-1;0;0;0;False;0.1;False;-1;0;False;-1;15;0;FLOAT3;0,0,0;False;1;FLOAT3;0,0,0;False;2;FLOAT3;0,0,0;False;3;FLOAT;0;False;4;FLOAT;0;False;6;FLOAT3;0,0,0;False;7;FLOAT3;0,0,0;False;8;FLOAT;0;False;9;FLOAT;0;False;10;FLOAT;0;False;13;FLOAT3;0,0,0;False;11;FLOAT3;0,0,0;False;12;FLOAT3;0,0,0;False;14;FLOAT4;0,0,0,0;False;15;FLOAT3;0,0,0;False;0 -WireConnection;1;0;2;1 -WireConnection;1;1;3;1 -WireConnection;1;2;3;2 -WireConnection;0;2;1;0 -ASEEND*/ -//CHKSM=8E8C2C7B9179771A616C198932F4702F5F12FFB1 \ No newline at end of file diff --git a/ExampleMaterials/RainbowTrail.shader.meta b/ExampleMaterials/RainbowTrail.shader.meta deleted file mode 100644 index 1d27391..0000000 --- a/ExampleMaterials/RainbowTrail.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: 12134baa25ba0f7469880130180abec4 -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: diff --git a/Help.md.meta b/Help.md.meta new file mode 100644 index 0000000..02f1484 --- /dev/null +++ b/Help.md.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 834bc5ecf6b4b4b438f57e964f488d89 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Marker.prefab b/Marker.prefab index 7748694..3dec7ce 100644 --- a/Marker.prefab +++ b/Marker.prefab @@ -73,7 +73,7 @@ TrailRenderer: m_Time: 120 m_Parameters: serializedVersion: 3 - widthMultiplier: 0.01 + widthMultiplier: 0.003 widthCurve: serializedVersion: 2 m_Curve: @@ -91,8 +91,8 @@ TrailRenderer: m_RotationOrder: 4 colorGradient: serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} + key0: {r: 0, g: 0.7202115, b: 1, a: 1} + key1: {r: 0, g: 1, b: 0.30410218, a: 1} key2: {r: 0, g: 0, b: 0, a: 0} key3: {r: 0, g: 0, b: 0, a: 0} key4: {r: 0, g: 0, b: 0, a: 0} diff --git a/Marker3.0/AnimationGenerator/Editor/SnailMarker3AnimationCreatorEditor.cs b/Marker3.0/AnimationGenerator/Editor/SnailMarker3AnimationCreatorEditor.cs index 98ef8df..03da793 100644 --- a/Marker3.0/AnimationGenerator/Editor/SnailMarker3AnimationCreatorEditor.cs +++ b/Marker3.0/AnimationGenerator/Editor/SnailMarker3AnimationCreatorEditor.cs @@ -22,11 +22,18 @@ public class SnailMarker3AnimationCreatorEditor : Editor private VRCExpressionParameters expressionParams; //animation stuff - private AnimationClip eraseClip; - private AnimationClip drawClip; + private AnimationClip idleClip; + private AnimationClip eraseOnClip; + private AnimationClip drawOnClip; private AnimationClip toggleOnClip; private AnimationClip toggleOffClip; + //paths: + private string scriptPath = "Assets\\Snail\\Marker3.0\\AnimationGenerator\\Editor"; + private string rootPath = "Assets\\Snail\\Marker3.0\\"; + private string generatedPath = "Assets\\Snail\\Marker3.0\\Generated\\"; + private string templatesPath = "Assets\\Snail\\Marker3.0\\Templates\\"; + //Configuration Paramters: public enum Hand { Left, Right } public enum VRCGesture { Neutral, Fist, HandOpen, FingerPoint, Victory, RockNRoll, HandGun, ThumbsUp } @@ -55,6 +62,7 @@ public override void OnInspectorGUI() GUILayout.Label("Avatar is missing some 3.0 stuff."); if (GUILayout.Button("Setup 3.0 defaults")) { + updatePaths(); ensureDefaults(); } } @@ -88,7 +96,6 @@ private void ShowMenuFoldout(VRCExpressionsMenu menu, string title) EditorGUILayout.BeginVertical(); GUILayout.BeginHorizontal(); GUILayout.Space(EditorGUI.indentLevel * 17); - Debug.Log(expressionParams.parameters.Length+":"+ menu.controls.Count); int size = 0; for (int i = 0; i < expressionParams.parameters.Length; i++) @@ -100,6 +107,7 @@ private void ShowMenuFoldout(VRCExpressionsMenu menu, string title) { if (GUILayout.Button("Add Marker Here", GUILayout.Width(130))) { + updatePaths(); InstallMarker(ref menu); } } @@ -109,6 +117,7 @@ private void ShowMenuFoldout(VRCExpressionsMenu menu, string title) { if (GUILayout.Button("enlarge parameters", GUILayout.Width(130))) { + updatePaths(); if (size < VRCExpressionParameters.MAX_PARAMETER_COST) { VRCExpressionParameters.Parameter[] newParams = new VRCExpressionParameters.Parameter[expressionParams.parameters.Length + 1]; @@ -162,6 +171,7 @@ private void AddParameter() expressionParams.parameters[i].name.Trim().Length == 0) { expressionParams.parameters[i].name = "ToggleMarker"; + expressionParams.parameters[i].valueType = VRCExpressionParameters.ValueType.Bool; EditorUtility.SetDirty(expressionParams); return; } @@ -281,22 +291,29 @@ private void ensureDefaults() OnEnable(); } - - private string generatedAssetPath(string name) - { - return Path.Combine("Assets\\Snail\\Marker3.0\\Generated", avatarTransform.name, name); - } - private string generatedFilePath(string name) + /******************************* + * Path and Asset Generation. + *******************************/ + private void updatePaths() { - return Path.Combine(generatedFolderPath(), name); + MonoScript ms = MonoScript.FromScriptableObject(this); + scriptPath = AssetDatabase.GetAssetPath(ms).Replace("SnailMarker3AnimationCreatorEditor.cs", ""); + rootPath = scriptPath.Replace("AnimationGenerator/Editor/", ""); + generatedPath = rootPath + "Generated/" + avatarTransform.name; + templatesPath = rootPath + "Templates"; + + scriptPath = scriptPath.Replace("/", "\\"); + rootPath = rootPath.Replace("/", "\\"); + generatedPath = generatedPath.Replace("/", "\\"); + templatesPath = templatesPath.Replace("/", "\\"); } - private string generatedFolderPath() + private string generatedAssetPath(string name) { - return Path.Combine(Application.dataPath, "Snail\\Marker3.0\\Generated\\", avatarDescriptor.name); + return Path.Combine( generatedPath, name); } private string templateAssetPath(string name) { - return Path.Combine("Assets\\Snail\\Marker3.0\\Templates", name); + return Path.Combine( templatesPath, name); } private string generatedGestureName() { @@ -306,7 +323,7 @@ private string generatedGestureName() private Object CreateAsset(Object asset, string name) { ensureGeneratedDirectory(); - string diskFile = generatedFilePath(name); + string diskFile = generatedAssetPath(name); if (File.Exists(diskFile)) { if (!EditorUtility.DisplayDialog("Existing files", "Overwrite\n" + diskFile, "Yes", "No")) @@ -332,9 +349,9 @@ private T CreateAssetFromTemplate(string name) where T : Object private void ensureGeneratedDirectory() { - if (!Directory.Exists(generatedFolderPath())) + if (!Directory.Exists(generatedPath)) { - Directory.CreateDirectory(generatedFolderPath()); + Directory.CreateDirectory(generatedPath); } } @@ -347,7 +364,7 @@ private void Cleanup() /******************************* * Animations *******************************/ - private void ConfigureAnimationController() + private void ConfigureAnimationController() { //Check and build the animation controller: CreateParameters(); @@ -370,6 +387,7 @@ private void CreateParameters() { fxController.AddParameter(generatedGestureName(), AnimatorControllerParameterType.Int); } + //find or create markerToggle bool toggleMarkerParamFound = false; for (int i = 0; i < fxController.parameters.Length; i++) @@ -381,7 +399,7 @@ private void CreateParameters() } if (!toggleMarkerParamFound) { - fxController.AddParameter("ToggleMarker", AnimatorControllerParameterType.Int); + fxController.AddParameter("ToggleMarker", AnimatorControllerParameterType.Bool); } } private AnimatorControllerLayer FindLayer(string name) @@ -396,6 +414,15 @@ private AnimatorControllerLayer FindLayer(string name) } return layer; } + + private void SetGestureTransitionDefaults(AnimatorStateTransition transition) + { + transition.hasExitTime = false; + transition.hasFixedDuration = false; + transition.duration = .01f; + transition.interruptionSource = TransitionInterruptionSource.Destination; + transition.canTransitionToSelf = false; + } private void CreateGestureLayer() { string layerName = generatedGestureName() + "Maker"; @@ -414,33 +441,38 @@ private void CreateGestureLayer() AnimatorState idleState = layer.stateMachine.AddState("Idle"); AnimatorState activateMarkerState = layer.stateMachine.AddState("Activate Marker"); AnimatorState eraseAllState = layer.stateMachine.AddState("Erase All"); + + //set the idle transition for (int i = 0; i < 8; i++) { - AnimatorStateTransition transition; if (i == (int)activateGesture) { + AnimatorStateTransition transition; transition = layer.stateMachine.AddAnyStateTransition(activateMarkerState); + SetGestureTransitionDefaults(transition); + transition.AddCondition(AnimatorConditionMode.Equals, i, generatedGestureName()); } else if (i == (int)resetGesture) { + AnimatorStateTransition transition; transition = layer.stateMachine.AddAnyStateTransition(eraseAllState); + SetGestureTransitionDefaults(transition); + transition.AddCondition(AnimatorConditionMode.Equals, i, generatedGestureName()); } else { + AnimatorStateTransition transition; transition = layer.stateMachine.AddAnyStateTransition(idleState); + SetGestureTransitionDefaults(transition); + transition.AddCondition(AnimatorConditionMode.Equals, i, generatedGestureName()); } - transition.AddCondition(AnimatorConditionMode.Equals, i, generatedGestureName()); - transition.hasExitTime = false; - transition.hasFixedDuration = false; - transition.duration = .1f; - transition.interruptionSource = TransitionInterruptionSource.Destination; - transition.canTransitionToSelf = false; - } WriteGestureAnimations(); - activateMarkerState.motion = drawClip; - eraseAllState.motion = eraseClip; + idleState.motion = idleClip; + activateMarkerState.motion = drawOnClip; + eraseAllState.motion = eraseOnClip; + fxController.AddLayer(layer); } } @@ -466,7 +498,7 @@ private void CreateToggleLayer() AnimatorState MarkerOnState = layer.stateMachine.AddState("MarkerOn"); AnimatorStateTransition transition = MarkerOffState.AddTransition(MarkerOnState); - transition.AddCondition(AnimatorConditionMode.Equals, 1, "ToggleMarker"); + transition.AddCondition(AnimatorConditionMode.If, 0, "ToggleMarker"); transition.hasExitTime = false; transition.hasFixedDuration = false; transition.duration = 0; @@ -474,7 +506,7 @@ private void CreateToggleLayer() transition.canTransitionToSelf = false; transition = MarkerOnState.AddTransition(MarkerOffState); - transition.AddCondition(AnimatorConditionMode.Equals, 0, "ToggleMarker"); + transition.AddCondition(AnimatorConditionMode.IfNot, 0, "ToggleMarker"); transition.hasExitTime = false; transition.hasFixedDuration = false; transition.duration = 0; @@ -509,20 +541,28 @@ private void WriteGestureAnimations() { float keyframe = 1F / 60; - // Curve that sets a property to 1 over the course of 1 frame. - AnimationCurve zeroCurve = AnimationCurve.Linear(0, 0, keyframe, 0); - AnimationClip erase = new AnimationClip(); - erase.SetCurve(animationPath, typeof(TrailRenderer), "m_Time", zeroCurve); - CreateAsset(erase, "EraseAll.anim"); - // Curve that sets a property to 0 over the course of 1 frame. - AnimationCurve drawCurve = AnimationCurve.Linear(0, 1, keyframe, 1); - AnimationClip draw = new AnimationClip(); - draw.SetCurve(animationPath, typeof(TrailRenderer), "m_Emitting", drawCurve); - CreateAsset(draw, "Drawing.anim"); + AnimationCurve eraseOnCurve = AnimationCurve.Linear(0, 0, keyframe, 0); + AnimationClip eraseOn = new AnimationClip(); + eraseOn.SetCurve(animationPath, typeof(TrailRenderer), "m_Time", eraseOnCurve); + CreateAsset(eraseOn, "EraseAll.anim"); - eraseClip = erase; - drawClip = draw; + // Curve that sets a property to 1 over the course of 1 frame. + AnimationCurve drawOnCurve = AnimationCurve.Linear(0, 1, keyframe, 1); + AnimationClip drawOn = new AnimationClip(); + drawOn.SetCurve(animationPath, typeof(TrailRenderer), "m_Emitting", drawOnCurve); + CreateAsset(drawOn, "DrawingOn.anim"); + + AnimationCurve drawOffCurve = AnimationCurve.Linear(0, 0, keyframe, 0); + AnimationCurve eraseOffCurve = AnimationCurve.Linear(0, 120, keyframe, 120); + AnimationClip idle = new AnimationClip(); + idle.SetCurve(animationPath, typeof(TrailRenderer), "m_Emitting", drawOffCurve); + idle.SetCurve(animationPath, typeof(TrailRenderer), "m_Time", eraseOffCurve); + CreateAsset(idle, "Idle.anim"); + + eraseOnClip = eraseOn; + drawOnClip = drawOn; + idleClip = idle; } /************************ End Animations diff --git a/Marker3.0/Generated/Jelly.meta b/Marker3.0/Generated/Jelly.meta new file mode 100644 index 0000000..5bdfd9a --- /dev/null +++ b/Marker3.0/Generated/Jelly.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d7c01996f184ce14686b169c3aa30abd +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Marker3.0/Generated/Jelly/DefaultAnimatorController.controller b/Marker3.0/Generated/Jelly/DefaultAnimatorController.controller new file mode 100644 index 0000000..425d894 --- /dev/null +++ b/Marker3.0/Generated/Jelly/DefaultAnimatorController.controller @@ -0,0 +1,522 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DefaultAnimatorController + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: GestureRight + m_Type: 3 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + - m_Name: ToggleMarker + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 9100000} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1107147732129565998} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} + - serializedVersion: 5 + m_Name: GestureRightMaker + m_StateMachine: {fileID: 1107483571455570430} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 1 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} + - serializedVersion: 5 + m_Name: ToggleMarker + m_StateMachine: {fileID: 1107735389723830190} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 1 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1101 &1101061989773605872 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: GestureRight + m_EventTreshold: 3 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102038798676934988} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.01 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 2 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 +--- !u!1101 &1101116841394620934 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: GestureRight + m_EventTreshold: 7 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102571690189670714} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.01 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 2 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 +--- !u!1101 &1101362251853447844 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: GestureRight + m_EventTreshold: 5 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102571690189670714} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.01 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 2 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 +--- !u!1101 &1101522529863008170 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: GestureRight + m_EventTreshold: 6 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102571690189670714} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.01 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 2 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 +--- !u!1101 &1101534248231278780 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: GestureRight + m_EventTreshold: 2 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102392861490178340} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.01 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 2 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 +--- !u!1101 &1101627613762151250 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: ToggleMarker + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102024791459918968} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.9 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 2 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 +--- !u!1101 &1101788160907168886 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: GestureRight + m_EventTreshold: 4 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102571690189670714} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.01 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 2 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 +--- !u!1101 &1101867191024190504 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: ToggleMarker + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102696363427273118} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.9 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 2 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 +--- !u!1101 &1101936260946161082 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: GestureRight + m_EventTreshold: 1 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102571690189670714} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.01 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 2 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 +--- !u!1101 &1101955359328863556 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 6 + m_ConditionEvent: GestureRight + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1102571690189670714} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.01 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 0 + m_InterruptionSource: 2 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 +--- !u!1102 &1102024791459918968 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: MarkerOff + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101867191024190504} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 620b368ffb465504e9188dd36dacaac8, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102038798676934988 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Activate Marker + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: f2ff76b08158cbc4eaf30e393e9faf43, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102392861490178340 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Erase All + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 3fa2ccd6becb3bf4c828193271a05dd4, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102571690189670714 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 2a5e832648274ff4fb45ca37806cfe51, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &1102696363427273118 +AnimatorState: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: MarkerOn + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 1101627613762151250} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 18915d28495b12e42a76fc48da4b90d2, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &1107147732129565998 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: [] + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 0} +--- !u!1107 &1107483571455570430 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: GestureRightMaker + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1102571690189670714} + m_Position: {x: 200, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102038798676934988} + m_Position: {x: 235, y: 65, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102392861490178340} + m_Position: {x: 270, y: 130, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: + - {fileID: 1101955359328863556} + - {fileID: 1101936260946161082} + - {fileID: 1101534248231278780} + - {fileID: 1101061989773605872} + - {fileID: 1101788160907168886} + - {fileID: 1101362251853447844} + - {fileID: 1101522529863008170} + - {fileID: 1101116841394620934} + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1102571690189670714} +--- !u!1107 &1107735389723830190 +AnimatorStateMachine: + serializedVersion: 5 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ToggleMarker + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 1102024791459918968} + m_Position: {x: 200, y: 0, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1102696363427273118} + m_Position: {x: 235, y: 65, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 1102024791459918968} diff --git a/ExampleMaterials/FlatColorTrail.mat.meta b/Marker3.0/Generated/Jelly/DefaultAnimatorController.controller.meta similarity index 64% rename from ExampleMaterials/FlatColorTrail.mat.meta rename to Marker3.0/Generated/Jelly/DefaultAnimatorController.controller.meta index b370b64..7701267 100644 --- a/ExampleMaterials/FlatColorTrail.mat.meta +++ b/Marker3.0/Generated/Jelly/DefaultAnimatorController.controller.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 12a8bc8a9b30268478ae60753d7b8423 +guid: 7ae390ecc88561f47b7e173648e8d3b8 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 2100000 + mainObjectFileID: 9100000 userData: assetBundleName: assetBundleVariant: diff --git a/Marker3.0/Generated/Jelly/DefaultMenu.asset b/Marker3.0/Generated/Jelly/DefaultMenu.asset new file mode 100644 index 0000000..6141122 --- /dev/null +++ b/Marker3.0/Generated/Jelly/DefaultMenu.asset @@ -0,0 +1,25 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !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: -340790334, guid: 67cc4cb7839cd3741b63733d5adf0442, type: 3} + m_Name: DefaultMenu + m_EditorClassIdentifier: + controls: + - name: Toggle Marker + icon: {fileID: 0} + type: 102 + parameter: + name: ToggleMarker + value: 1 + style: 0 + subMenu: {fileID: 0} + subParameters: [] + labels: [] diff --git a/Marker3.0/Generated/Jelly/DefaultMenu.asset.meta b/Marker3.0/Generated/Jelly/DefaultMenu.asset.meta new file mode 100644 index 0000000..a922f36 --- /dev/null +++ b/Marker3.0/Generated/Jelly/DefaultMenu.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7de41b539df638b4da41bf20e5d2b2ba +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Marker3.0/Generated/Jelly/DefaultParams.asset b/Marker3.0/Generated/Jelly/DefaultParams.asset new file mode 100644 index 0000000..f2f1ae5 --- /dev/null +++ b/Marker3.0/Generated/Jelly/DefaultParams.asset @@ -0,0 +1,79 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !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: -1506855854, guid: 67cc4cb7839cd3741b63733d5adf0442, type: 3} + m_Name: DefaultParams + m_EditorClassIdentifier: + parameters: + - name: VRCEmote + valueType: 0 + saved: 1 + defaultValue: 0 + - name: VRCFaceBlendH + valueType: 1 + saved: 1 + defaultValue: 0 + - name: VRCFaceBlendV + valueType: 1 + saved: 1 + defaultValue: 0 + - name: ToggleMarker + valueType: 2 + saved: 1 + defaultValue: 0 + - name: + valueType: 0 + saved: 1 + defaultValue: 0 + - name: + valueType: 0 + saved: 1 + defaultValue: 0 + - name: + valueType: 0 + saved: 1 + defaultValue: 0 + - name: + valueType: 0 + saved: 1 + defaultValue: 0 + - name: + valueType: 0 + saved: 1 + defaultValue: 0 + - name: + valueType: 0 + saved: 1 + defaultValue: 0 + - name: + valueType: 0 + saved: 1 + defaultValue: 0 + - name: + valueType: 0 + saved: 1 + defaultValue: 0 + - name: + valueType: 0 + saved: 1 + defaultValue: 0 + - name: + valueType: 0 + saved: 1 + defaultValue: 0 + - name: + valueType: 0 + saved: 1 + defaultValue: 0 + - name: + valueType: 0 + saved: 1 + defaultValue: 0 diff --git a/Marker3.0/Generated/Jelly/DefaultParams.asset.meta b/Marker3.0/Generated/Jelly/DefaultParams.asset.meta new file mode 100644 index 0000000..6ac083b --- /dev/null +++ b/Marker3.0/Generated/Jelly/DefaultParams.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6069c7c3a5f51ca418af44c4de705504 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Marker3.0/Generated/Jelly/DrawingOn.anim b/Marker3.0/Generated/Jelly/DrawingOn.anim new file mode 100644 index 0000000..5238c86 --- /dev/null +++ b/Marker3.0/Generated/Jelly/DrawingOn.anim @@ -0,0 +1,81 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: DrawingOn + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Emitting + path: Armature/Hips/Spine/Chest/Right shoulder/Right arm/Right elbow/Right wrist/IndexFinger1_R/IndexFinger2_R/IndexFinger3_R/Marker + classID: 96 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/ExampleMaterials/GradientTrail.mat.meta b/Marker3.0/Generated/Jelly/DrawingOn.anim.meta similarity index 64% rename from ExampleMaterials/GradientTrail.mat.meta rename to Marker3.0/Generated/Jelly/DrawingOn.anim.meta index 3d2636a..2e2c0fd 100644 --- a/ExampleMaterials/GradientTrail.mat.meta +++ b/Marker3.0/Generated/Jelly/DrawingOn.anim.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 73e570ffa6d7528428bf90266e4ad7ff +guid: f2ff76b08158cbc4eaf30e393e9faf43 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 2100000 + mainObjectFileID: 7400000 userData: assetBundleName: assetBundleVariant: diff --git a/Marker3.0/Generated/Jelly/EraseAll.anim b/Marker3.0/Generated/Jelly/EraseAll.anim new file mode 100644 index 0000000..fcda50f --- /dev/null +++ b/Marker3.0/Generated/Jelly/EraseAll.anim @@ -0,0 +1,81 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: EraseAll + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Time + path: Armature/Hips/Spine/Chest/Right shoulder/Right arm/Right elbow/Right wrist/IndexFinger1_R/IndexFinger2_R/IndexFinger3_R/Marker + classID: 96 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Marker3.0/Generated/Jelly/EraseAll.anim.meta b/Marker3.0/Generated/Jelly/EraseAll.anim.meta new file mode 100644 index 0000000..b853b91 --- /dev/null +++ b/Marker3.0/Generated/Jelly/EraseAll.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3fa2ccd6becb3bf4c828193271a05dd4 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Marker3.0/Generated/Jelly/Idle.anim b/Marker3.0/Generated/Jelly/Idle.anim new file mode 100644 index 0000000..407b679 --- /dev/null +++ b/Marker3.0/Generated/Jelly/Idle.anim @@ -0,0 +1,109 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Emitting + path: Armature/Hips/Spine/Chest/Right shoulder/Right arm/Right elbow/Right wrist/IndexFinger1_R/IndexFinger2_R/IndexFinger3_R/Marker + classID: 96 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 120 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 120 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Time + path: Armature/Hips/Spine/Chest/Right shoulder/Right arm/Right elbow/Right wrist/IndexFinger1_R/IndexFinger2_R/IndexFinger3_R/Marker + classID: 96 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Marker3.0/Generated/Jelly/Idle.anim.meta b/Marker3.0/Generated/Jelly/Idle.anim.meta new file mode 100644 index 0000000..776d063 --- /dev/null +++ b/Marker3.0/Generated/Jelly/Idle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2a5e832648274ff4fb45ca37806cfe51 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Marker3.0/Generated/Jelly/MarkerOff.anim b/Marker3.0/Generated/Jelly/MarkerOff.anim new file mode 100644 index 0000000..b0afe74 --- /dev/null +++ b/Marker3.0/Generated/Jelly/MarkerOff.anim @@ -0,0 +1,81 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: MarkerOff + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: Armature/Hips/Spine/Chest/Right shoulder/Right arm/Right elbow/Right wrist/IndexFinger1_R/IndexFinger2_R/IndexFinger3_R/Marker + classID: 96 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Marker3.0/Generated/Jelly/MarkerOff.anim.meta b/Marker3.0/Generated/Jelly/MarkerOff.anim.meta new file mode 100644 index 0000000..8224641 --- /dev/null +++ b/Marker3.0/Generated/Jelly/MarkerOff.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 620b368ffb465504e9188dd36dacaac8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Marker3.0/Generated/Jelly/MarkerOn.anim b/Marker3.0/Generated/Jelly/MarkerOn.anim new file mode 100644 index 0000000..13cfcd7 --- /dev/null +++ b/Marker3.0/Generated/Jelly/MarkerOn.anim @@ -0,0 +1,81 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: MarkerOn + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.016666668 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Enabled + path: Armature/Hips/Spine/Chest/Right shoulder/Right arm/Right elbow/Right wrist/IndexFinger1_R/IndexFinger2_R/IndexFinger3_R/Marker + classID: 96 + script: {fileID: 0} + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: [] + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Marker3.0/Generated/Jelly/MarkerOn.anim.meta b/Marker3.0/Generated/Jelly/MarkerOn.anim.meta new file mode 100644 index 0000000..57d61ae --- /dev/null +++ b/Marker3.0/Generated/Jelly/MarkerOn.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 18915d28495b12e42a76fc48da4b90d2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/marker3.0.unitypackage.meta b/marker3.0.unitypackage.meta new file mode 100644 index 0000000..9207b47 --- /dev/null +++ b/marker3.0.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 71f72bbb7967f16409b5e769961ee32a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: