Version 0.3.3

Fixed issues with loading models
De-Panther · Feb 6, 2021 · 812345e · 812345e
1 parent 7536f8a
commit 812345e
Show file tree

Hide file tree

Showing 8 changed files with 32 additions and 4 deletions.
diff --git a/Build/Build/Build.data.unityweb b/Build/Build/Build.data.unityweb
diff --git a/Build/Build/Build.wasm b/Build/Build/Build.wasm
diff --git a/Build/Build/Build.wasm.framework.unityweb b/Build/Build/Build.wasm.framework.unityweb
diff --git a/Packages/webxr-input-profiles-loader/CHANGELOG.md b/Packages/webxr-input-profiles-loader/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.3.3] - 2020-02-06
+### Fixed
+- Issues with loading models.
+
 ## [0.3.2] - 2020-02-06
 ### Changed
 - Updated glTFast package to 3.0.1.

diff --git a/Packages/webxr-input-profiles-loader/Runtime/Scripts/InputProfileModel.cs b/Packages/webxr-input-profiles-loader/Runtime/Scripts/InputProfileModel.cs
@@ -26,7 +26,7 @@ public async void Init(LayoutRouting layoutRouting, string url, System.Action<bo
       gltfAsset.loadOnStartup = false;
       gltfAsset.url = url;
       var deferAgent = gameObject.AddComponent<TimeBudgetDeferAgent>();
-      deferAgent.timeBudget = 0.001f;
+      deferAgent.timeBudget = 0.009f;
       var loadResult = await gltfAsset.Load(gltfAsset.url, null, deferAgent);
       OnGltfLoaded(loadResult);
     }

diff --git a/Packages/webxr-input-profiles-loader/Runtime/Scripts/TimeBudgetDeferAgent.cs b/Packages/webxr-input-profiles-loader/Runtime/Scripts/TimeBudgetDeferAgent.cs
@@ -7,7 +7,7 @@ namespace WebXRInputProfile
   [DefaultExecutionOrder(-10)]
   public class TimeBudgetDeferAgent : MonoBehaviour, IDeferAgent
   {
-    public float timeBudget = 0.001f;
+    public float timeBudget = 0.009f;
     float lastTime;
 
     void Awake()

diff --git a/...ages/webxr-input-profiles-loader/Runtime/ShaderVariants/GLTFShaderVariants.shadervariants b/...ages/webxr-input-profiles-loader/Runtime/ShaderVariants/GLTFShaderVariants.shadervariants
@@ -11,16 +11,40 @@ ShaderVariantCollection:
   - first: {fileID: 4800000, guid: 99fa998bbbed3408aafa652b466d261d, type: 3}
     second:
       variants:
+      - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN
+        passType: 4
+      - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _NORMALMAP
+        passType: 4
+      - keywords: DIRECTIONAL LIGHTPROBE_SH _METALLICGLOSSMAP
+        passType: 4
       - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _METALLICGLOSSMAP
         passType: 4
+      - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _EMISSION _METALLICGLOSSMAP
+        passType: 4
+      - keywords: BILLBOARD_FACE_CAMERA_POS DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN
+          SHADOWS_SOFT SHADOWS_SPLIT_SPHERES SOFTPARTICLES_ON UNITY_HDR_ON _METALLICGLOSSMAP
+        passType: 4
       - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _METALLICGLOSSMAP _NORMALMAP
           _OCCLUSION
         passType: 4
+      - keywords: DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN _EMISSION _METALLICGLOSSMAP
+          _NORMALMAP _OCCLUSION
+        passType: 4
+      - keywords: BILLBOARD_FACE_CAMERA_POS DIRECTIONAL LIGHTPROBE_SH SHADOWS_SCREEN
+          SHADOWS_SOFT SHADOWS_SPLIT_SPHERES SOFTPARTICLES_ON UNITY_HDR_ON _METALLICGLOSSMAP
+          _NORMALMAP _OCCLUSION
+        passType: 4
+      - keywords: DIRECTIONAL _METALLICGLOSSMAP
+        passType: 5
       - keywords: 
         passType: 8
       - keywords: SHADOWS_DEPTH
         passType: 8
+      - keywords: _METALLICGLOSSMAP
+        passType: 8
       - keywords: SHADOWS_DEPTH _METALLICGLOSSMAP
         passType: 8
       - keywords: SHADOWS_DEPTH _METALLICGLOSSMAP _OCCLUSION
         passType: 8
+      - keywords: _METALLICGLOSSMAP _NORMALMAP _OCCLUSION
+        passType: 8
diff --git a/Packages/webxr-input-profiles-loader/package.json b/Packages/webxr-input-profiles-loader/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.de-panther.webxr-input-profiles-loader",
   "displayName": "WebXR Input Profiles Loader",
-  "version": "0.3.2",
+  "version": "0.3.3",
   "unity": "2019.4",
   "description": "Load WebXR Input Profiles in Unity",
   "keywords": [