From e2a355f2c145f8780716beb743d63485da02ba8b Mon Sep 17 00:00:00 2001 From: ousttrue Date: Mon, 29 Mar 2021 14:46:37 +0900 Subject: [PATCH 1/2] Merge pull request #826 from amamagi/fix/single-pass-instanced-issue Add support for single pass instanced stereo rendering to UniUnlit shader --- Assets/VRMShaders/UniUnlit/Resources/UniUnlit.shader | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Assets/VRMShaders/UniUnlit/Resources/UniUnlit.shader b/Assets/VRMShaders/UniUnlit/Resources/UniUnlit.shader index 2e2466a15..0bca38232 100644 --- a/Assets/VRMShaders/UniUnlit/Resources/UniUnlit.shader +++ b/Assets/VRMShaders/UniUnlit/Resources/UniUnlit.shader @@ -44,6 +44,7 @@ #if defined(_VERTEXCOL_MUL) fixed4 color : COLOR; #endif + UNITY_VERTEX_INPUT_INSTANCE_ID }; struct v2f @@ -54,6 +55,7 @@ #if defined(_VERTEXCOL_MUL) fixed4 color : COLOR; #endif + UNITY_VERTEX_OUTPUT_STEREO }; sampler2D _MainTex; @@ -64,6 +66,8 @@ v2f vert (appdata v) { v2f o; + UNITY_SETUP_INSTANCE_ID(v); + UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o); o.vertex = UnityObjectToClipPos(v.vertex); o.uv = TRANSFORM_TEX(v.uv, _MainTex); UNITY_TRANSFER_FOG(o,o.vertex); From aa94e5fe90d3c7d89b0ce443390562c5f82e9578 Mon Sep 17 00:00:00 2001 From: Masataka SUMI Date: Thu, 1 Jul 2021 16:06:07 +0900 Subject: [PATCH 2/2] update version v0.67.9 --- Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs | 4 ++-- Assets/UniGLTF/package.json | 4 ++-- Assets/VRM/Runtime/Format/VRMVersion.cs | 4 ++-- Assets/VRM/package.json | 6 +++--- Assets/VRMShaders/package.json | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs b/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs index 7efe42b17..84399b963 100644 --- a/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs +++ b/Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs @@ -5,7 +5,7 @@ namespace UniGLTF { public const int MAJOR = 2; public const int MINOR = 3; - public const int PATCH = 8; - public const string VERSION = "2.3.8"; + public const int PATCH = 9; + public const string VERSION = "2.3.9"; } } diff --git a/Assets/UniGLTF/package.json b/Assets/UniGLTF/package.json index 75bf162de..bec7d861f 100644 --- a/Assets/UniGLTF/package.json +++ b/Assets/UniGLTF/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.unigltf", - "version": "2.3.8", + "version": "2.3.9", "displayName": "UniGLTF", "description": "GLTF importer and exporter", "unity": "2018.4", @@ -11,6 +11,6 @@ "name": "VRM Consortium" }, "dependencies": { - "com.vrmc.vrmshaders": "0.67.8" + "com.vrmc.vrmshaders": "0.67.9" } } \ No newline at end of file diff --git a/Assets/VRM/Runtime/Format/VRMVersion.cs b/Assets/VRM/Runtime/Format/VRMVersion.cs index da151f3c1..154c0582f 100644 --- a/Assets/VRM/Runtime/Format/VRMVersion.cs +++ b/Assets/VRM/Runtime/Format/VRMVersion.cs @@ -5,7 +5,7 @@ namespace VRM { public const int MAJOR = 0; public const int MINOR = 67; - public const int PATCH = 8; - public const string VERSION = "0.67.8"; + public const int PATCH = 9; + public const string VERSION = "0.67.9"; } } diff --git a/Assets/VRM/package.json b/Assets/VRM/package.json index 624f307e6..988952588 100644 --- a/Assets/VRM/package.json +++ b/Assets/VRM/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.univrm", - "version": "0.67.8", + "version": "0.67.9", "displayName": "VRM", "description": "VRM importer", "unity": "2018.4", @@ -14,7 +14,7 @@ "name": "VRM Consortium" }, "dependencies": { - "com.vrmc.vrmshaders": "0.67.8", - "com.vrmc.unigltf": "2.3.8" + "com.vrmc.vrmshaders": "0.67.9", + "com.vrmc.unigltf": "2.3.9" } } diff --git a/Assets/VRMShaders/package.json b/Assets/VRMShaders/package.json index 5571e14a9..91bf9362e 100644 --- a/Assets/VRMShaders/package.json +++ b/Assets/VRMShaders/package.json @@ -1,6 +1,6 @@ { "name": "com.vrmc.vrmshaders", - "version": "0.67.8", + "version": "0.67.9", "displayName": "VRM Shaders", "description": "VRM Shaders", "unity": "2018.4",