Doni/ModelHandle
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into dev

Browse Source
This commit is contained in:
kovacsv 2025-05-24 09:08:28 +02:00
commit 2148143379
4 changed files with 2196 additions and 948 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3115
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

21
package.json
View File

@ -56,25 +56,24 @@
"update_engine_exports": "run-python3 tools/update_engine_exports.py"
},
"devDependencies": {
"@types/node": "^20.1.0",
"esbuild": "^0.20.0",
"eslint": "^8.29.0",
"eslint-plugin-unused-imports": "^3.0.0",
"@types/node": "^22.15.0",
"esbuild": "^0.25.4",
"eslint": "^8.57.0",
"eslint-plugin-unused-imports": "^4.1.0",
"fantasticon": "^1.2.2",
"http-server": "^14.0.0",
"jsdoc": "^4.0.0",
"mocha": "^10.2.0",
"jsdoc": "^4.0.4",
"mocha": "^11.5.0",
"oslllo-svg-fixer": "^3.0.0",
"rollup": "^4.0.2",
"rollup": "^4.41.0",
"run-python3": "^0.0.5",
"svgo": "^3.0.2",
"typescript": "^5.0.4",
"web-ifc": "0.0.44"
"svgo": "^3.3.2",
"typescript": "^5.0.4"
},
"dependencies": {
"@simonwep/pickr": "1.9.0",
"fflate": "0.8.2",
"three": "0.163.0"
"three": "0.176.0"
},
"eslintConfig": {
"env": {

4
source/engine/import/importerthree.js
View File

@ -6,7 +6,7 @@ import { Base64DataURIToArrayBuffer, CreateObjectUrl, GetFileExtensionFromMimeTy
import { GetFileExtension, GetFileName } from '../io/fileutils.js';
import { PhongMaterial, TextureMap } from '../model/material.js';
import { Node } from '../model/node.js';
import { ConvertThreeColorToColor, ConvertThreeGeometryToMesh, ThreeLinearToSRGBColorConverter, ThreeSRGBToLinearColorConverter } from '../threejs/threeutils.js';
import { ConvertThreeColorToColor, ConvertThreeGeometryToMesh, ThreeSRGBToLinearColorConverter } from '../threejs/threeutils.js';
import { ImporterBase } from './importerbase.js';
import * as THREE from 'three';
@ -288,7 +288,6 @@ export class ImporterThreeFbx extends ImporterThreeBase
constructor ()
{
super ();
this.colorConverter = new ThreeLinearToSRGBColorConverter ();
}
CanImportExtension (extension)
@ -347,7 +346,6 @@ export class ImporterThreeWrl extends ImporterThreeBase
constructor ()
{
super ();
this.colorConverter = new ThreeLinearToSRGBColorConverter ();
}
CanImportExtension (extension)

4
source/engine/import/importerutils.js
View File

@ -134,9 +134,9 @@ export function CreateOcctWorker (worker)
export function LoadExternalLibrary (libraryName)
{
if (libraryName === 'rhino3dm') {
return LoadExternalLibraryFromUrl ('https://cdn.jsdelivr.net/npm/rhino3dm@8.4.0/rhino3dm.min.js');
return LoadExternalLibraryFromUrl ('https://cdn.jsdelivr.net/npm/rhino3dm@8.17.0/rhino3dm.min.js');
} else if (libraryName === 'webifc') {
return LoadExternalLibraryFromUrl ('https://cdn.jsdelivr.net/npm/web-ifc@0.0.55/web-ifc-api-iife.js');
return LoadExternalLibraryFromUrl ('https://cdn.jsdelivr.net/npm/web-ifc@0.0.68/web-ifc-api-iife.js');
} else if (libraryName === 'draco3d') {
return LoadExternalLibraryFromUrl ('https://cdn.jsdelivr.net/npm/draco3d@1.5.7/draco_decoder_nodejs.min.js');
} else {