Merge pull request #10 from PoChang007/restore_vrmviewer_0.xx

Restore vrmviewer 0.xx
vrm-c · Aug 28, 2020 · 1d29599 · 1d29599
2 parents 571a199 + 5488b31
commit 1d29599
Show file tree

Hide file tree

Showing 755 changed files with 4,355 additions and 59,829 deletions.
diff --git a/Assets/GridStage/GridGround.shader b/Assets/GridStage/GridGround.shader
@@ -1,5 +1,7 @@
 // Upgrade NOTE: upgraded instancing buffer 'Props' to new syntax.
 
+// Upgrade NOTE: upgraded instancing buffer 'Props' to new syntax.
+
 Shader "Custom/GridGround" {
 	Properties {
 		_Color ("Color", Color) = (1,1,1,1)
@@ -34,9 +36,9 @@ Shader "Custom/GridGround" {
 		// Add instancing support for this shader. You need to check 'Enable Instancing' on materials that use the shader.
 		// See https://docs.unity3d.com/Manual/GPUInstancing.html for more information about instancing.
 		// #pragma instancing_options assumeuniformscaling
-		UNITY_INSTANCING_CBUFFER_START(Props)
+		UNITY_INSTANCING_BUFFER_START(Props)
 			// put more per-instance properties here
-			UNITY_INSTANCING_CBUFFER_END
+			UNITY_INSTANCING_BUFFER_END(Props)
 
 		half getLattice(float3 worldPos, float scale, float lineWidth)
 		{

diff --git a/Assets/GridStage/GroundTexture.mat b/Assets/GridStage/GroundTexture.mat
@@ -4,8 +4,9 @@
 Material:
   serializedVersion: 6
   m_ObjectHideFlags: 0
-  m_PrefabParentObject: {fileID: 0}
-  m_PrefabInternal: {fileID: 0}
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
   m_Name: GroundTexture
   m_Shader: {fileID: 4800000, guid: a4022e67bc5e1ad4a9383addff2f421a, type: 3}
   m_ShaderKeywords: _EMISSION

diff --git a/Assets/VRM.meta b/Assets/VRM.meta
diff --git a/Assets/VRM/DepthFirstScheduler.meta b/Assets/VRM/DepthFirstScheduler.meta
diff --git a/Assets/VRM/DepthFirstScheduler/Editor.meta b/Assets/VRM/DepthFirstScheduler/Editor.meta
diff --git a/Assets/VRM/DepthFirstScheduler/Editor/Tests.meta b/Assets/VRM/DepthFirstScheduler/Editor/Tests.meta
diff --git a/Assets/VRM/DepthFirstScheduler/Editor/Tests/DepthFirstScheduler.cs b/Assets/VRM/DepthFirstScheduler/Editor/Tests/DepthFirstScheduler.cs
diff --git a/Assets/VRM/DepthFirstScheduler/Editor/Tests/DepthFirstScheduler.cs.meta b/Assets/VRM/DepthFirstScheduler/Editor/Tests/DepthFirstScheduler.cs.meta
diff --git a/Assets/VRM/DepthFirstScheduler/Functor.cs b/Assets/VRM/DepthFirstScheduler/Functor.cs
diff --git a/Assets/VRM/DepthFirstScheduler/Functor.cs.meta b/Assets/VRM/DepthFirstScheduler/Functor.cs.meta
diff --git a/Assets/VRM/DepthFirstScheduler/IEnumeratorExtensions.cs b/Assets/VRM/DepthFirstScheduler/IEnumeratorExtensions.cs
diff --git a/Assets/VRM/DepthFirstScheduler/IEnumeratorExtensions.cs.meta b/Assets/VRM/DepthFirstScheduler/IEnumeratorExtensions.cs.meta
diff --git a/Assets/VRM/DepthFirstScheduler/LICENSE b/Assets/VRM/DepthFirstScheduler/LICENSE
diff --git a/Assets/VRM/DepthFirstScheduler/LICENSE.meta b/Assets/VRM/DepthFirstScheduler/LICENSE.meta