Leahnaya/UniVRM
1
0
Fork 0
mirror of https://github.com/vrm-c/UniVRM.git synced 2026-09-12 05:48:47 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #1088 from Santarh/updateInstanced

Browse Source 
[Branch v0.67.0] Update version v0.67.9
This commit is contained in:
ousttrue
2021-07-01 16:08:01 +09:00
committed by GitHub
parent 1663fd851d aa94e5fe90
commit dee13ed9e0
6 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/UniGLTF/Runtime/UniGLTF/UniGLTFVersion.cs
View File

@@ -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";
}
}

4
Assets/UniGLTF/package.json
View File

@@ -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"
}
}

4
Assets/VRM/Runtime/Format/VRMVersion.cs
View File

@@ -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";
}
}

6
Assets/VRM/package.json
View File

@@ -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"
}
}

4
Assets/VRMShaders/UniUnlit/Resources/UniUnlit.shader
View File

@@ -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);

2
Assets/VRMShaders/package.json
View File

@@ -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",