Skip to content
This repository was archived by the owner on Dec 21, 2025. It is now read-only.

Commit 3107bef

Browse files
GitHubDragonFlyGitHubDragonFly
authored
Update multiple mobile viewers
1 parent 51476ed commit 3107bef

25 files changed

+111
-108
lines changed

‎viewers/templates/Mobile/M3DM Viewer.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<script type="importmap">
1212
{
1313
"imports": {
14-
"three": "https://cdn.jsdelivr.net/npm/three@0.169.0/build/three.module.min.js",
15-
"three/addons/": "https://cdn.jsdelivr.net/npm/three@0.169.0/examples/jsm/"
14+
"three": "https://cdn.jsdelivr.net/npm/three@0.170.0/build/three.module.min.js",
15+
"three/addons/": "https://cdn.jsdelivr.net/npm/three@0.170.0/examples/jsm/"
1616
}
1717
}
1818
</script>
@@ -196,7 +196,7 @@
196196

197197
<!-- mouse_wheel variable is used throughout as a trigger for rendering -->
198198

199-
<title>3DM Viewer (r169)</title>
199+
<title>3DM Viewer (r170)</title>
200200
</head>
201201
<body onload="reset_all(); document_ready(); disabled_changed();" onresize="resize();">
202202
<div id="fixed_menu" class="fixed-menu">

‎viewers/templates/Mobile/M3DS Viewer.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<script type="importmap">
1212
{
1313
"imports": {
14-
"three": "https://cdn.jsdelivr.net/npm/three@0.169.0/build/three.module.min.js",
15-
"three/addons/": "https://cdn.jsdelivr.net/npm/three@0.169.0/examples/jsm/"
14+
"three": "https://cdn.jsdelivr.net/npm/three@0.170.0/build/three.module.min.js",
15+
"three/addons/": "https://cdn.jsdelivr.net/npm/three@0.170.0/examples/jsm/"
1616
}
1717
}
1818
</script>
@@ -180,7 +180,7 @@
180180

181181
<!-- mouse_wheel variable is used throughout as a trigger for rendering -->
182182

183-
<title>3DS Viewer (r169)</title>
183+
<title>3DS Viewer (r170)</title>
184184
</head>
185185
<body onload="reset_all(); document_ready(); disabled_changed();" onresize="resize();">
186186
<div id="fixed_menu" class="fixed-menu">

‎viewers/templates/Mobile/M3MF Viewer.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<script type="importmap">
1212
{
1313
"imports": {
14-
"three": "https://cdn.jsdelivr.net/npm/three@0.169.0/build/three.module.min.js",
15-
"three/addons/": "https://cdn.jsdelivr.net/npm/three@0.169.0/examples/jsm/"
14+
"three": "https://cdn.jsdelivr.net/npm/three@0.170.0/build/three.module.min.js",
15+
"three/addons/": "https://cdn.jsdelivr.net/npm/three@0.170.0/examples/jsm/"
1616
}
1717
}
1818
</script>
@@ -179,7 +179,7 @@
179179

180180
<!-- mouse_wheel variable is used throughout as a trigger for rendering -->
181181

182-
<title>3MF Viewer (r169)</title>
182+
<title>3MF Viewer (r170)</title>
183183
</head>
184184
<body onload="reset_all(); document_ready(); disabled_changed();" onresize="resize();">
185185
<div id="fixed_menu" class="fixed-menu">

‎viewers/templates/Mobile/MAMF Viewer.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<script type="importmap">
1212
{
1313
"imports": {
14-
"three": "https://cdn.jsdelivr.net/npm/three@0.169.0/build/three.module.min.js",
15-
"three/addons/": "https://cdn.jsdelivr.net/npm/three@0.169.0/examples/jsm/"
14+
"three": "https://cdn.jsdelivr.net/npm/three@0.170.0/build/three.module.min.js",
15+
"three/addons/": "https://cdn.jsdelivr.net/npm/three@0.170.0/examples/jsm/"
1616
}
1717
}
1818
</script>
@@ -179,7 +179,7 @@
179179

180180
<!-- mouse_wheel variable is used throughout as a trigger for rendering -->
181181

182-
<title>AMF Viewer (r169)</title>
182+
<title>AMF Viewer (r170)</title>
183183
</head>
184184
<body onload="reset_all(); document_ready(); disabled_changed();" onresize="resize();">
185185
<div id="fixed_menu" class="fixed-menu">

‎viewers/templates/Mobile/MASSIMP Viewer.html‎

Lines changed: 23 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<script type="importmap">
1212
{
1313
"imports": {
14-
"three": "https://cdn.jsdelivr.net/npm/three@0.169.0/build/three.module.min.js",
15-
"three/addons/": "https://cdn.jsdelivr.net/npm/three@0.169.0/examples/jsm/",
14+
"three": "https://cdn.jsdelivr.net/npm/three@0.170.0/build/three.module.min.js",
15+
"three/addons/": "https://cdn.jsdelivr.net/npm/three@0.170.0/examples/jsm/",
1616
"meshoptimizer_decoder": "https://cdn.jsdelivr.net/npm/[email protected]/meshopt_decoder.module.min.js"
1717
}
1818
}
@@ -59,12 +59,12 @@
5959
gltf_VideoTextureExtension = GLTFVideoTextureExtension;
6060

6161
ktx2_loader = new KTX2Loader();
62-
ktx2_loader.setTranscoderPath( "https://cdn.jsdelivr.net/npm/three@0.169.0/examples/jsm/libs/basis/" );
62+
ktx2_loader.setTranscoderPath( "https://cdn.jsdelivr.net/npm/three@0.170.0/examples/jsm/libs/basis/" );
6363

6464
manager.addHandler( /\.ktx2$/i, ktx2_loader );
6565

6666
draco_loader = new DRACOLoader();
67-
draco_loader.setDecoderPath( "https://cdn.jsdelivr.net/npm/three@0.169.0/examples/jsm/libs/draco/" );
67+
draco_loader.setDecoderPath( "https://cdn.jsdelivr.net/npm/three@0.170.0/examples/jsm/libs/draco/" );
6868
draco_loader.setDecoderConfig( { type: 'js' } );
6969
draco_loader.preload();
7070

@@ -212,7 +212,7 @@
212212

213213
<!-- mouse_wheel variable is used throughout as a trigger for rendering -->
214214

215-
<title>ASSIMP Viewer (r169)</title>
215+
<title>ASSIMP Viewer (r170)</title>
216216
</head>
217217
<body id="body" onload="reset_all(); document_ready(); disabled_changed();" onresize="resize();">
218218
<div id="fixed_menu" class="fixed-menu">
@@ -598,6 +598,24 @@
598598
assimp_files.push( i );
599599
};
600600

601+
if (local_bin_files.length > 0) {
602+
local_bin_files.forEach( file_index => {
603+
let url = URL.createObjectURL( local_files[ file_index ] );
604+
URL.revokeObjectURL( local_files[ file_index ] );
605+
606+
resource_path += local_files[ file_index ].name + ',' + url + ',';
607+
});
608+
}
609+
610+
if (local_files_indexes.length > 0) {
611+
local_files_indexes.forEach( file_index => {
612+
let url = URL.createObjectURL( local_files[ file_index ] );
613+
URL.revokeObjectURL( local_files[ file_index ] );
614+
615+
resource_path += local_files[ file_index ].name + ',' + url + ',';
616+
});
617+
}
618+
601619
if (selected_gltf_file === null && selected_draco_file === null) {
602620
load_with_assimp( local_files, false );
603621
} else {
@@ -729,20 +747,6 @@
729747
}
730748

731749
async function load_components( from_url = false ) {
732-
if (local_bin_files.length > 0) {
733-
local_bin_files.forEach( file_index => {
734-
resource_path += local_files[ file_index ].name + ',' + URL.createObjectURL( local_files[ file_index ] ) + ',';
735-
URL.revokeObjectURL( local_files[ file_index ] );
736-
});
737-
}
738-
739-
if (local_files_indexes.length > 0) {
740-
local_files_indexes.forEach( file_index => {
741-
resource_path += local_files[ file_index ].name + ',' + URL.createObjectURL( local_files[ file_index ] ) + ',';
742-
URL.revokeObjectURL( local_files[ file_index ] );
743-
});
744-
}
745-
746750
if (renderer === undefined) {
747751
renderer = new THREE.WebGLRenderer( { antialias: true, alpha: true } );
748752
renderer.setPixelRatio( window.devicePixelRatio );

‎viewers/templates/Mobile/MDAE Viewer.html‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<script type="importmap">
1212
{
1313
"imports": {
14-
"three": "https://cdn.jsdelivr.net/npm/three@0.169.0/build/three.module.min.js",
15-
"three/addons/": "https://cdn.jsdelivr.net/npm/three@0.169.0/examples/jsm/",
14+
"three": "https://cdn.jsdelivr.net/npm/three@0.170.0/build/three.module.min.js",
15+
"three/addons/": "https://cdn.jsdelivr.net/npm/three@0.170.0/examples/jsm/",
1616
"@tweenjs": "https://esm.sh/@tweenjs/[email protected]"
1717
}
1818
}
@@ -48,14 +48,14 @@
4848
manager.onLoad = function() { mouse_wheel = true; }
4949

5050
ktx2_loader = new KTX2Loader( manager );
51-
ktx2_loader.setTranscoderPath( "https://cdn.jsdelivr.net/npm/three@0.169.0/examples/jsm/libs/basis/" );
51+
ktx2_loader.setTranscoderPath( "https://cdn.jsdelivr.net/npm/three@0.170.0/examples/jsm/libs/basis/" );
5252

5353
manager.addHandler( /\.ktx2$/i, ktx2_loader );
5454

5555
dae_loader = new ColladaLoader( manager );
5656

5757
basis_loader = new BasisTextureLoader( manager );
58-
basis_loader.setTranscoderPath( 'https://cdn.jsdelivr.net/npm/three@0.169.0/examples/jsm/libs/basis/' );
58+
basis_loader.setTranscoderPath( 'https://cdn.jsdelivr.net/npm/three@0.170.0/examples/jsm/libs/basis/' );
5959

6060
manager.addHandler( /\.basis$/i, basis_loader );
6161

@@ -199,7 +199,7 @@
199199

200200
<!-- mouse_wheel variable is used throughout as a trigger for rendering -->
201201

202-
<title>Collada DAE Viewer (r169)</title>
202+
<title>Collada DAE Viewer (r170)</title>
203203
</head>
204204
<body onload="reset_all(); document_ready(); disabled_changed();" onresize="resize();">
205205
<div id="fixed_menu" class="fixed-menu">

‎viewers/templates/Mobile/MDST Viewer.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<script type="importmap">
1212
{
1313
"imports": {
14-
"three": "https://cdn.jsdelivr.net/npm/three@0.169.0/build/three.module.min.js",
15-
"three/addons/": "https://cdn.jsdelivr.net/npm/three@0.169.0/examples/jsm/"
14+
"three": "https://cdn.jsdelivr.net/npm/three@0.170.0/build/three.module.min.js",
15+
"three/addons/": "https://cdn.jsdelivr.net/npm/three@0.170.0/examples/jsm/"
1616
}
1717
}
1818
</script>
@@ -201,7 +201,7 @@
201201

202202
<!-- mouse_wheel variable is used throughout as a trigger for rendering -->
203203

204-
<title>DST Viewer (r169)</title>
204+
<title>DST Viewer (r170)</title>
205205
</head>
206206
<body onload="reset_all(); document_ready(); disabled_changed();" onresize="resize();">
207207
<div id="fixed_menu" class="fixed-menu">

‎viewers/templates/Mobile/MFBX Viewer.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<script type="importmap">
1212
{
1313
"imports": {
14-
"three": "https://cdn.jsdelivr.net/npm/three@0.169.0/build/three.module.min.js",
15-
"three/addons/": "https://cdn.jsdelivr.net/npm/three@0.169.0/examples/jsm/"
14+
"three": "https://cdn.jsdelivr.net/npm/three@0.170.0/build/three.module.min.js",
15+
"three/addons/": "https://cdn.jsdelivr.net/npm/three@0.170.0/examples/jsm/"
1616
}
1717
}
1818
</script>
@@ -182,7 +182,7 @@
182182

183183
<!-- mouse_wheel variable is used throughout as a trigger for rendering -->
184184

185-
<title>FBX Viewer (r169)</title>
185+
<title>FBX Viewer (r170)</title>
186186
</head>
187187
<body onload="reset_all(); document_ready(); disabled_changed();" onresize="resize();">
188188
<div id="fixed_menu" class="fixed-menu">

‎viewers/templates/Mobile/MGCODE Viewer.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<script type="importmap">
1212
{
1313
"imports": {
14-
"three": "https://cdn.jsdelivr.net/npm/three@0.169.0/build/three.module.min.js",
15-
"three/addons/": "https://cdn.jsdelivr.net/npm/three@0.169.0/examples/jsm/"
14+
"three": "https://cdn.jsdelivr.net/npm/three@0.170.0/build/three.module.min.js",
15+
"three/addons/": "https://cdn.jsdelivr.net/npm/three@0.170.0/examples/jsm/"
1616
}
1717
}
1818
</script>
@@ -150,7 +150,7 @@
150150

151151
<!-- mouse_wheel variable is used throughout as a trigger for rendering -->
152152

153-
<title>GCODE Viewer (r169)</title>
153+
<title>GCODE Viewer (r170)</title>
154154
</head>
155155
<body onload="reset_all(); document_ready(); disabled_changed();" onresize="resize();">
156156
<div id="fixed_menu" class="fixed-menu">

‎viewers/templates/Mobile/MGLTF WebGPU.html‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@
1111
<script type="importmap">
1212
{
1313
"imports": {
14-
"three": "https://cdn.jsdelivr.net/npm/[email protected]/build/three.webgpu.min.js",
15-
"three/addons/": "https://cdn.jsdelivr.net/npm/[email protected]/examples/jsm/",
14+
"three": "https://cdn.jsdelivr.net/npm/[email protected]/build/three.webgpu.min.js",
15+
"three/tsl": "https://cdn.jsdelivr.net/npm/[email protected]/build/three.webgpu.min.js",
16+
"three/addons/": "https://cdn.jsdelivr.net/npm/[email protected]/examples/jsm/",
1617
"meshoptimizer_decoder": "https://cdn.jsdelivr.net/npm/[email protected]/meshopt_decoder.module.min.js"
1718
}
1819
}
@@ -56,12 +57,12 @@
5657
manager.onLoad = function() { mouse_wheel = true; }
5758

5859
ktx2_loader = new KTX2Loader( manager );
59-
ktx2_loader.setTranscoderPath( "https://cdn.jsdelivr.net/npm/three@0.169.0/examples/jsm/libs/basis/" );
60+
ktx2_loader.setTranscoderPath( "https://cdn.jsdelivr.net/npm/three@0.170.0/examples/jsm/libs/basis/" );
6061

6162
manager.addHandler( /\.ktx2$/i, ktx2_loader );
6263

6364
draco_loader = new DRACOLoader( manager );
64-
draco_loader.setDecoderPath( "https://cdn.jsdelivr.net/npm/three@0.169.0/examples/jsm/libs/draco/" );
65+
draco_loader.setDecoderPath( "https://cdn.jsdelivr.net/npm/three@0.170.0/examples/jsm/libs/draco/" );
6566
draco_loader.setDecoderConfig( { type: 'js' } );
6667
draco_loader.preload();
6768

@@ -211,7 +212,7 @@
211212

212213
<!-- mouse_wheel variable is used throughout as a trigger for rendering -->
213214

214-
<title>GLTF WebGPU (r169)</title>
215+
<title>GLTF WebGPU (r170)</title>
215216
</head>
216217
<body onload="reset_all(); document_ready(); disabled_changed();" onresize="resize();">
217218
<div id="fixed_menu" class="fixed-menu">

0 commit comments

Comments
 (0)