moved GLTFSerialization code into the package to improve platform sup…

…port (no separate compilation needed for each platform)
KhronosGroup · Oct 5, 2021 · 0694c5b · 0694c5b
1 parent 0247d6f
commit 0694c5b
Show file tree

Hide file tree

Showing 152 changed files with 851 additions and 121 deletions.
diff --git a/.gitignore b/.gitignore
@@ -152,11 +152,13 @@ _pkginfo.txt
 
 # Current_Package folder
 current-package/
-UnityGLTF/Assets/UnityGLTF/Runtime/Plugins/uap10.0.10586
-UnityGLTF/Assets/UnityGLTF/Runtime/Plugins/uap10.0.10586.meta
+**/Plugins/uap10.0.10586
+**/Plugins/uap10.0.10586.meta
 TestProjects/*/Library/
 TestProjects/*/Temp/
 .vscode/
 TestProjects/*/*.sln
 TestProjects/*/*.csproj
-GLTFSerialization/.idea
+**/GLTFSerialization/.idea
+**/GLTFSerialization/bin~
+**/GLTFSerialization/obj~
diff --git a/GLTFSerialization/GLTFSerialization/GLTFSerialization.csproj b/GLTFSerialization/GLTFSerialization/GLTFSerialization.csproj
diff --git a/UnityGLTF/Assets/UnityGLTF/Editor/UnityGLTFEditor.asmdef b/UnityGLTF/Assets/UnityGLTF/Editor/UnityGLTFEditor.asmdef
@@ -1,6 +1,8 @@
 {
     "name": "UnityGLTFEditor",
+    "rootNamespace": "",
     "references": [
+        "GLTFSerialization",
         "UnityGLTFScripts"
     ],
     "includePlatforms": [
@@ -14,5 +16,6 @@
     ],
     "autoReferenced": false,
     "defineConstraints": [],
-    "versionDefines": []
+    "versionDefines": [],
+    "noEngineReferences": false
 }
diff --git a/UnityGLTF/Assets/UnityGLTF/Runtime/Plugins.meta b/UnityGLTF/Assets/UnityGLTF/Runtime/Plugins.meta
diff --git a/...sets/UnityGLTF/Runtime/Plugins/net35.meta → ...TF/Runtime/Plugins/GLTFSerialization.meta b/...sets/UnityGLTF/Runtime/Plugins/net35.meta → ...TF/Runtime/Plugins/GLTFSerialization.meta
diff --git a/...on/GLTFSerialization/AttributeAccessor.cs → ...ns/GLTFSerialization/AttributeAccessor.cs b/...on/GLTFSerialization/AttributeAccessor.cs → ...ns/GLTFSerialization/AttributeAccessor.cs
diff --git a/UnityGLTF/Assets/UnityGLTF/Runtime/Plugins/GLTFSerialization/AttributeAccessor.cs.meta b/UnityGLTF/Assets/UnityGLTF/Runtime/Plugins/GLTFSerialization/AttributeAccessor.cs.meta
diff --git a/...alization/GLTFSerialization/Exceptions.cs → ...e/Plugins/GLTFSerialization/Exceptions.cs b/...alization/GLTFSerialization/Exceptions.cs → ...e/Plugins/GLTFSerialization/Exceptions.cs
diff --git a/UnityGLTF/Assets/UnityGLTF/Runtime/Plugins/GLTFSerialization/Exceptions.cs.meta b/UnityGLTF/Assets/UnityGLTF/Runtime/Plugins/GLTFSerialization/Exceptions.cs.meta
diff --git a/UnityGLTF/Assets/UnityGLTF/Runtime/Plugins/GLTFSerialization/Extensions.meta b/UnityGLTF/Assets/UnityGLTF/Runtime/Plugins/GLTFSerialization/Extensions.meta
diff --git a/...xtensions/ExtTextureTransformExtension.cs → ...xtensions/ExtTextureTransformExtension.cs b/...xtensions/ExtTextureTransformExtension.cs → ...xtensions/ExtTextureTransformExtension.cs
diff --git a/...ityGLTF/Runtime/Plugins/GLTFSerialization/Extensions/ExtTextureTransformExtension.cs.meta b/...ityGLTF/Runtime/Plugins/GLTFSerialization/Extensions/ExtTextureTransformExtension.cs.meta
diff --git a/...ns/ExtTextureTransformExtensionFactory.cs → ...ns/ExtTextureTransformExtensionFactory.cs b/...ns/ExtTextureTransformExtensionFactory.cs → ...ns/ExtTextureTransformExtensionFactory.cs
diff --git a/.../Runtime/Plugins/GLTFSerialization/Extensions/ExtTextureTransformExtensionFactory.cs.meta b/.../Runtime/Plugins/GLTFSerialization/Extensions/ExtTextureTransformExtensionFactory.cs.meta
diff --git a/...lization/Extensions/GLTFJsonExtensions.cs → ...lization/Extensions/GLTFJsonExtensions.cs b/...lization/Extensions/GLTFJsonExtensions.cs → ...lization/Extensions/GLTFJsonExtensions.cs
diff --git a/.../Assets/UnityGLTF/Runtime/Plugins/GLTFSerialization/Extensions/GLTFJsonExtensions.cs.meta b/.../Assets/UnityGLTF/Runtime/Plugins/GLTFSerialization/Extensions/GLTFJsonExtensions.cs.meta
diff --git a/...Extensions/KHR_LightsPunctualExtension.cs → ...Extensions/KHR_LightsPunctualExtension.cs b/...Extensions/KHR_LightsPunctualExtension.cs → ...Extensions/KHR_LightsPunctualExtension.cs
diff --git a/...nityGLTF/Runtime/Plugins/GLTFSerialization/Extensions/KHR_LightsPunctualExtension.cs.meta b/...nityGLTF/Runtime/Plugins/GLTFSerialization/Extensions/KHR_LightsPunctualExtension.cs.meta
diff --git a/...ons/KHR_LightsPunctualExtensionFactory.cs → ...ons/KHR_LightsPunctualExtensionFactory.cs b/...ons/KHR_LightsPunctualExtensionFactory.cs → ...ons/KHR_LightsPunctualExtensionFactory.cs
diff --git a/...F/Runtime/Plugins/GLTFSerialization/Extensions/KHR_LightsPunctualExtensionFactory.cs.meta b/...F/Runtime/Plugins/GLTFSerialization/Extensions/KHR_LightsPunctualExtensionFactory.cs.meta
diff --git a/...terials_pbrSpecularGlossinessExtension.cs → ...terials_pbrSpecularGlossinessExtension.cs b/...terials_pbrSpecularGlossinessExtension.cs → ...terials_pbrSpecularGlossinessExtension.cs
diff --git a/...Plugins/GLTFSerialization/Extensions/KHR_materials_pbrSpecularGlossinessExtension.cs.meta b/...Plugins/GLTFSerialization/Extensions/KHR_materials_pbrSpecularGlossinessExtension.cs.meta
diff --git a/..._pbrSpecularGlossinessExtensionFactory.cs → ..._pbrSpecularGlossinessExtensionFactory.cs b/..._pbrSpecularGlossinessExtensionFactory.cs → ..._pbrSpecularGlossinessExtensionFactory.cs
diff --git a/.../GLTFSerialization/Extensions/KHR_materials_pbrSpecularGlossinessExtensionFactory.cs.meta b/.../GLTFSerialization/Extensions/KHR_materials_pbrSpecularGlossinessExtensionFactory.cs.meta
diff --git a/...xtensions/KHR_materials_unlitExtension.cs → ...xtensions/KHR_materials_unlitExtension.cs b/...xtensions/KHR_materials_unlitExtension.cs → ...xtensions/KHR_materials_unlitExtension.cs
diff --git a/...ityGLTF/Runtime/Plugins/GLTFSerialization/Extensions/KHR_materials_unlitExtension.cs.meta b/...ityGLTF/Runtime/Plugins/GLTFSerialization/Extensions/KHR_materials_unlitExtension.cs.meta
diff --git a/...ns/KHR_materials_unlitExtensionFactory.cs → ...ns/KHR_materials_unlitExtensionFactory.cs b/...ns/KHR_materials_unlitExtensionFactory.cs → ...ns/KHR_materials_unlitExtensionFactory.cs
diff --git a/.../Runtime/Plugins/GLTFSerialization/Extensions/KHR_materials_unlitExtensionFactory.cs.meta b/.../Runtime/Plugins/GLTFSerialization/Extensions/KHR_materials_unlitExtensionFactory.cs.meta
diff --git a/...alization/Extensions/MSFT_LODExtension.cs → ...alization/Extensions/MSFT_LODExtension.cs b/...alization/Extensions/MSFT_LODExtension.cs → ...alization/Extensions/MSFT_LODExtension.cs
diff --git a/...F/Assets/UnityGLTF/Runtime/Plugins/GLTFSerialization/Extensions/MSFT_LODExtension.cs.meta b/...F/Assets/UnityGLTF/Runtime/Plugins/GLTFSerialization/Extensions/MSFT_LODExtension.cs.meta
diff --git a/...on/Extensions/MSFT_LODExtensionFactory.cs → ...on/Extensions/MSFT_LODExtensionFactory.cs b/...on/Extensions/MSFT_LODExtensionFactory.cs → ...on/Extensions/MSFT_LODExtensionFactory.cs
diff --git a/...s/UnityGLTF/Runtime/Plugins/GLTFSerialization/Extensions/MSFT_LODExtensionFactory.cs.meta b/...s/UnityGLTF/Runtime/Plugins/GLTFSerialization/Extensions/MSFT_LODExtensionFactory.cs.meta
diff --git a/...alization/GLTFSerialization/GLBBuilder.cs → ...e/Plugins/GLTFSerialization/GLBBuilder.cs b/...alization/GLTFSerialization/GLBBuilder.cs → ...e/Plugins/GLTFSerialization/GLBBuilder.cs
diff --git a/UnityGLTF/Assets/UnityGLTF/Runtime/Plugins/GLTFSerialization/GLBBuilder.cs.meta b/UnityGLTF/Assets/UnityGLTF/Runtime/Plugins/GLTFSerialization/GLBBuilder.cs.meta
diff --git a/...ialization/GLTFSerialization/GLBObject.cs → ...me/Plugins/GLTFSerialization/GLBObject.cs b/...ialization/GLTFSerialization/GLBObject.cs → ...me/Plugins/GLTFSerialization/GLBObject.cs
diff --git a/UnityGLTF/Assets/UnityGLTF/Runtime/Plugins/GLTFSerialization/GLBObject.cs.meta b/UnityGLTF/Assets/UnityGLTF/Runtime/Plugins/GLTFSerialization/GLBObject.cs.meta
diff --git a/...lization/GLTFSerialization/GLTFHelpers.cs → .../Plugins/GLTFSerialization/GLTFHelpers.cs b/...lization/GLTFSerialization/GLTFHelpers.cs → .../Plugins/GLTFSerialization/GLTFHelpers.cs
diff --git a/UnityGLTF/Assets/UnityGLTF/Runtime/Plugins/GLTFSerialization/GLTFHelpers.cs.meta b/UnityGLTF/Assets/UnityGLTF/Runtime/Plugins/GLTFSerialization/GLTFHelpers.cs.meta
diff --git a/...alization/GLTFSerialization/GLTFObject.cs → ...e/Plugins/GLTFSerialization/GLTFObject.cs b/...alization/GLTFSerialization/GLTFObject.cs → ...e/Plugins/GLTFSerialization/GLTFObject.cs
diff --git a/UnityGLTF/Assets/UnityGLTF/Runtime/Plugins/GLTFSerialization/GLTFObject.cs.meta b/UnityGLTF/Assets/UnityGLTF/Runtime/Plugins/GLTFSerialization/GLTFObject.cs.meta
diff --git a/...alization/GLTFSerialization/GLTFParser.cs → ...e/Plugins/GLTFSerialization/GLTFParser.cs b/...alization/GLTFSerialization/GLTFParser.cs → ...e/Plugins/GLTFSerialization/GLTFParser.cs
diff --git a/UnityGLTF/Assets/UnityGLTF/Runtime/Plugins/GLTFSerialization/GLTFParser.cs.meta b/UnityGLTF/Assets/UnityGLTF/Runtime/Plugins/GLTFSerialization/GLTFParser.cs.meta
diff --git a/UnityGLTF/Assets/UnityGLTF/Runtime/Plugins/GLTFSerialization/GLTFSerialization.asmdef b/UnityGLTF/Assets/UnityGLTF/Runtime/Plugins/GLTFSerialization/GLTFSerialization.asmdef
@@ -0,0 +1,16 @@
+{
+    "name": "GLTFSerialization",
+    "rootNamespace": "",
+    "references": [],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": true,
+    "overrideReferences": true,
+    "precompiledReferences": [
+        "Newtonsoft.Json.dll"
+    ],
+    "autoReferenced": false,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": true
+}
diff --git a/UnityGLTF/Assets/UnityGLTF/Runtime/Plugins/GLTFSerialization/GLTFSerialization.asmdef.meta b/UnityGLTF/Assets/UnityGLTF/Runtime/Plugins/GLTFSerialization/GLTFSerialization.asmdef.meta