Skip to content

Commit

Permalink
Merge pull request #8 from De-Panther/gltfast_5_1_0
Browse files Browse the repository at this point in the history
Updated glTFast package to 5.1.0
  • Loading branch information
De-Panther authored Jan 11, 2024
2 parents 13c092a + e01e54e commit 13bcefb
Show file tree
Hide file tree
Showing 6 changed files with 23 additions and 14 deletions.
4 changes: 2 additions & 2 deletions Packages/manifest.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
}
],
"dependencies": {
"com.atteneder.gltfast": "4.4.8",
"com.atteneder.gltfast": "5.1.0",
"com.unity.collab-proxy": "1.14.1",
"com.unity.ide.rider": "1.2.1",
"com.unity.ide.visualstudio": "2.0.11",
"com.unity.ide.vscode": "1.2.3",
"com.unity.ide.vscode": "1.2.5",
"com.unity.nuget.newtonsoft-json": "2.0.0",
"com.unity.test-framework": "1.1.29",
"com.unity.textmeshpro": "2.1.4",
Expand Down
13 changes: 6 additions & 7 deletions Packages/packages-lock.json
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
{
"dependencies": {
"com.atteneder.gltfast": {
"version": "4.4.8",
"version": "5.1.0",
"depth": 0,
"source": "registry",
"dependencies": {
"com.unity.modules.jsonserialize": "1.0.0",
"com.unity.modules.unitywebrequest": "1.0.0",
"com.unity.modules.unitywebrequesttexture": "1.0.0",
"com.unity.mathematics": "1.2.1",
"com.unity.burst": "1.4.11"
"com.unity.mathematics": "1.2.6",
"com.unity.burst": "1.6.6"
},
"url": "https://package.openupm.com"
},
Expand All @@ -23,7 +22,7 @@
}
},
"com.unity.burst": {
"version": "1.4.11",
"version": "1.6.6",
"depth": 1,
"source": "registry",
"dependencies": {
Expand Down Expand Up @@ -64,14 +63,14 @@
"url": "https://packages.unity.com"
},
"com.unity.ide.vscode": {
"version": "1.2.3",
"version": "1.2.5",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.mathematics": {
"version": "1.2.1",
"version": "1.2.6",
"depth": 1,
"source": "registry",
"dependencies": {},
Expand Down
3 changes: 3 additions & 0 deletions Packages/webxr-input-profiles-loader/CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

### Changed
- Updated glTFast package to 5.1.0.

## [0.4.0] - 2021-12-12
### Changed
- Updated glTFast package to 4.4.8.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,10 +26,10 @@ public async void Init(LayoutRouting layoutRouting, string url, System.Action<bo
{
gltfAsset = gameObject.AddComponent<GLTFast.GltfAsset>();
}
gltfAsset.loadOnStartup = false;
gltfAsset.url = url;
gltfAsset.LoadOnStartup = false;
gltfAsset.Url = url;
var deferAgent = gameObject.AddComponent<WebGLDeferAgent>();
var loadResult = await gltfAsset.Load(gltfAsset.url, null, deferAgent);
var loadResult = await gltfAsset.Load(gltfAsset.Url, null, deferAgent);
OnGltfLoaded(loadResult);
}

Expand Down
5 changes: 3 additions & 2 deletions ProjectSettings/BurstAotSettings_WebGL.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
{
"MonoBehaviour": {
"Version": 3,
"Version": 4,
"EnableBurstCompilation": true,
"EnableOptimisations": true,
"EnableSafetyChecks": false,
"EnableDebugInAllBuilds": false,
"CpuMinTargetX32": 0,
"CpuMaxTargetX32": 0,
"CpuMinTargetX64": 0,
"CpuMaxTargetX64": 0
"CpuMaxTargetX64": 0,
"OptimizeFor": 0
}
}
6 changes: 6 additions & 0 deletions ProjectSettings/CommonBurstAotSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{
"MonoBehaviour": {
"Version": 4,
"DisabledWarnings": ""
}
}

0 comments on commit 13bcefb

Please sign in to comment.