Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Various updates #272

Merged
merged 5 commits into from
Oct 24, 2024
Merged

Various updates #272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7d4064a
Re-run importAll.sh to pick up changes to Iridescence.
emackey Oct 22, 2024
1fd9269
Update to glTF-Validator to 2.0.0-dev.3.10.
emackey Oct 22, 2024
6782691
Merge remote-tracking branch 'origin/master' into updates
emackey Oct 23, 2024
347cdf9
CHANGELOG.md
emackey Oct 23, 2024
4dae3d2
Fix meshopt in Babylon and ThreeJS
emackey Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# Change Log

### 2.5.1 - UNRELEASED

* Fixed an issue with BabylonJS mesh debugging. [#268](https://github.com/AnalyticalGraphicsInc/gltf-vscode/issues/268)
* Fixed Meshopt decompression in BabylonJS and ThreeJS.
* Update Khronos glTF-Validator to 2.0.0-dev.3.10. [KhronosGroup/glTF-Validator#240](https://github.com/KhronosGroup/glTF-Validator/pull/240)
* Update JSON schema for `KHR_materials_iridescence` to latest.

### 2.5.0 - 2024-08-02

* Update Babylon to 7.17.2.
Expand Down
14 changes: 7 additions & 7 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -404,7 +404,7 @@
"draco3dgltf": "1.5.7",
"filament": "1.53.1",
"gltf-import-export": "1.0.22",
"gltf-validator": "2.0.0-dev.3.9",
"gltf-validator": "2.0.0-dev.3.10",
"gltumble": "^1.0.1",
"json-source-map": "0.6.1",
"sprintf-js": "1.1.3",
Expand Down
7 changes: 4 additions & 3 deletions pages/babylonView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,9 +83,10 @@
var babylonPath = extensionRootPath + '/engines/Babylon/';
var basisPath = extensionRootPath + '/engines/Basis/';

// via https://github.com/BabylonJS/Babylon.js/blob/cfde2ef094705213bf95547b5d1a2ef0adae79ec/localDev/index-views.html#L127-L138
BABYLON.GLTF2.Loader.Extensions.EXT_meshopt_compression.DecoderPath =
babylonPath + "meshopt_decoder.js";
// via https://github.com/BabylonJS/Babylon.js/blob/89160087d244a7b64bb559b444bcc2ca13fafd4e/packages/tools/tests/test/playwright/visualizationPlaywright.utils.ts#L168-L170
BABYLON.MeshoptCompression.Configuration.decoder = {
url: babylonPath + "meshopt_decoder.js"
};

BABYLON.KhronosTextureContainer2.URLConfig = {
jsDecoderModule: babylonPath + "babylon.ktx2Decoder.js",
Expand Down
2 changes: 2 additions & 0 deletions pages/threeView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { RGBELoader } from '../node_modules/three/examples/jsm/loaders/RGBELoade
import { KTX2Loader } from '../node_modules/three/examples/jsm/loaders/KTX2Loader.js';
import { DRACOLoader } from '../node_modules/three/examples/jsm/loaders/DRACOLoader.js';
import { OrbitControls } from '../node_modules/three/examples/jsm/controls/OrbitControls.js';
import { MeshoptDecoder } from '../node_modules/three/examples/jsm/libs/meshopt_decoder.module.js';

export class ThreeView {
constructor() {
Expand Down Expand Up @@ -63,6 +64,7 @@ export class ThreeView {
dracoLoader.setDecoderPath(dracoLoaderPath);

loader.setDRACOLoader( dracoLoader );
loader.setMeshoptDecoder( MeshoptDecoder );

var extensionRootPath = document.getElementById('extensionRootPath').textContent;
var basisPath = extensionRootPath + '/node_modules/three/examples/jsm/libs/basis/';
Expand Down
4 changes: 2 additions & 2 deletions ...f-2.0/extensions/KHR_materials_iridescence/material.KHR_materials_iridescence.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,14 +33,14 @@
},
"iridescenceThicknessMinimum" : {
"type" : "number",
"description" : "The minimum thickness of the thin-film layer given in nanometers. The value **MUST** be less than or equal to the value of `iridescenceThicknessMaximum`.",
"description" : "The minimum thickness of the thin-film layer given in nanometers.",
"default" : 100,
"minimum" : 0,
"short_description" : "The minimum thickness of the thin-film layer given in nanometers."
},
"iridescenceThicknessMaximum" : {
"type" : "number",
"description" : "The maximum thickness of the thin-film layer given in nanometers. The value **MUST** be greater than or equal to the value of `iridescenceThicknessMinimum`.",
"description" : "The maximum thickness of the thin-film layer given in nanometers.",
"default" : 400,
"minimum" : 0,
"short_description" : "The maximum thickness of the thin-film layer given in nanometers."
Expand Down
8 changes: 4 additions & 4 deletions server/package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"url": "https://github.com/AnalyticalGraphicsInc/gltf-vscode"
},
"dependencies": {
"gltf-validator": "2.0.0-dev.3.9",
"gltf-validator": "2.0.0-dev.3.10",
"json-source-map": "0.6.1",
"vscode-languageserver": "^5.2.1",
"vscode-uri": "^3.0.8"
Expand Down