diff --git a/Scripts/Format/VRMImporter.cs b/Scripts/Format/VRMImporter.cs index 62a23643c..860b2874e 100644 --- a/Scripts/Format/VRMImporter.cs +++ b/Scripts/Format/VRMImporter.cs @@ -164,7 +164,7 @@ namespace VRM LoadHumanoidObsolete(context); Debug.LogWarning("LoadHumanoidObsolete"); } - catch (Exception ex) + catch (Exception) { LoadHumanoid(context); } @@ -213,7 +213,7 @@ namespace VRM firstPerson.TraverseRenderers(context); // LookAt - var lookAtHead = context.Root.AddComponent(); + /*var lookAtHead =*/ context.Root.AddComponent(); switch(gltfFirstPerson.lookAtType) { diff --git a/Shaders/VRMUnlitTransparentZWrite.shader b/Shaders/VRMUnlitTransparentZWrite.shader index 1e95e40c9..bcbe165a5 100644 --- a/Shaders/VRMUnlitTransparentZWrite.shader +++ b/Shaders/VRMUnlitTransparentZWrite.shader @@ -1,57 +1,60 @@ -Shader "VRM/UnlitTransparentZWrite" { Properties { - _MainTex ("Base (RGB) Trans (A)", 2D) = "white" {} -} - -SubShader { - Tags {"Queue"="AlphaTest+150" "IgnoreProjector"="True" "RenderType"="Transparent"} - LOD 100 - - ZWrite On - Blend SrcAlpha OneMinusSrcAlpha - - Pass { - CGPROGRAM - #pragma vertex vert - #pragma fragment frag - #pragma target 2.0 - #pragma multi_compile_fog - - #include "UnityCG.cginc" - - struct appdata_t { - float4 vertex : POSITION; - float2 texcoord : TEXCOORD0; - UNITY_VERTEX_INPUT_INSTANCE_ID - }; - - struct v2f { - float4 vertex : SV_POSITION; - float2 texcoord : TEXCOORD0; - UNITY_FOG_COORDS(1) - UNITY_VERTEX_OUTPUT_STEREO - }; - - sampler2D _MainTex; - float4 _MainTex_ST; - - v2f vert (appdata_t v) - { - v2f o; - UNITY_SETUP_INSTANCE_ID(v); - UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o); - o.vertex = UnityObjectToClipPos(v.vertex); - o.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex); - UNITY_TRANSFER_FOG(o,o.vertex); - return o; - } - - fixed4 frag (v2f i) : SV_Target - { - fixed4 col = tex2D(_MainTex, i.texcoord); - UNITY_APPLY_FOG(i.fogCoord, col); - return col; - } - ENDCG - } -} - } \ No newline at end of file +Shader "VRM/UnlitTransparentZWrite" +{ +Properties { + _MainTex ("Base (RGB) Trans (A)", 2D) = "white" {} +} + +SubShader { + Tags {"Queue"="AlphaTest+150" "IgnoreProjector"="True" "RenderType"="Transparent"} + LOD 100 + + ZWrite On + Blend SrcAlpha OneMinusSrcAlpha + + Pass { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #pragma target 2.0 + #pragma multi_compile_fog + + #include "UnityCG.cginc" + + struct appdata_t { + float4 vertex : POSITION; + float2 texcoord : TEXCOORD0; + UNITY_VERTEX_INPUT_INSTANCE_ID + }; + + struct v2f { + float4 vertex : SV_POSITION; + float2 texcoord : TEXCOORD0; + UNITY_FOG_COORDS(1) + UNITY_VERTEX_OUTPUT_STEREO + }; + + sampler2D _MainTex; + float4 _MainTex_ST; + + v2f vert (appdata_t v) + { + v2f o; + UNITY_SETUP_INSTANCE_ID(v); + UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o); + o.vertex = UnityObjectToClipPos(v.vertex); + o.texcoord = TRANSFORM_TEX(v.texcoord, _MainTex); + UNITY_TRANSFER_FOG(o,o.vertex); + return o; + } + + fixed4 frag (v2f i) : SV_Target + { + fixed4 col = tex2D(_MainTex, i.texcoord); + UNITY_APPLY_FOG(i.fogCoord, col); + return col; + } + ENDCG + } +} + +}