Skip to content

Commit 131a3ba

Browse files
authored
Merge pull request #16510 from Mugen87/dev30
JSM: More modules and TS files for loaders.
2 parents eed8f50 + 24e27cc commit 131a3ba

File tree

12 files changed

+1829
-4
lines changed

12 files changed

+1829
-4
lines changed

docs/manual/en/introduction/Import-via-modules.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@ <h2>Importable Examples</h2>
116116
</li>
117117
<li>loaders
118118
<ul>
119+
<li>3MFLoader</li>
120+
<li>AMFLoader</li>
119121
<li>AssimpJSONLoader</li>
120122
<li>AssimpLoader</li>
121123
<li>BabylonLoader</li>
@@ -126,6 +128,8 @@ <h2>Importable Examples</h2>
126128
<li>FBXLoader</li>
127129
<li>GCodeLoader</li>
128130
<li>GLTFLoader</li>
131+
<li>KMZLoader</li>
132+
<li>KTXLoader</li>
129133
<li>MTLLoader</li>
130134
<li>OBJLoader</li>
131135
<li>PCDLoader</li>

examples/js/loaders/KTXLoader.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ var KhronosTextureContainer = ( function () {
4242
* @param {boolean} threeDExpected- provision for indicating that data should be a 3D texture, not implemented
4343
* @param {boolean} textureArrayExpected- provision for indicating that data should be a texture array, not implemented
4444
*/
45-
function KhronosTextureContainer( arrayBuffer, facesExpected, threeDExpected, textureArrayExpected ) {
45+
function KhronosTextureContainer( arrayBuffer, facesExpected /*, threeDExpected, textureArrayExpected */ ) {
4646

4747
this.arrayBuffer = arrayBuffer;
4848

@@ -138,13 +138,13 @@ var KhronosTextureContainer = ( function () {
138138

139139
var imageSize = new Int32Array( this.arrayBuffer, dataOffset, 1 )[ 0 ]; // size per face, since not supporting array cubemaps
140140
dataOffset += 4; // size of the image + 4 for the imageSize field
141-
141+
142142
for ( var face = 0; face < this.numberOfFaces; face ++ ) {
143143

144144
var byteArray = new Uint8Array( this.arrayBuffer, dataOffset, imageSize );
145145

146146
mipmaps.push( { "data": byteArray, "width": width, "height": height } );
147-
147+
148148
dataOffset += imageSize;
149149
dataOffset += 3 - ( ( imageSize + 3 ) % 4 ); // add padding for odd sized image
150150

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
import {
2+
LoadingManager,
3+
Group
4+
} from '../../../src/Three';
5+
6+
export class ThreeMFLoader {
7+
constructor(manager?: LoadingManager);
8+
manager: LoadingManager;
9+
path: string;
10+
availableExtensions: object[];
11+
12+
load(url: string, onLoad: (object: Group) => void, onProgress?: (event: ProgressEvent) => void, onError?: (event: ErrorEvent) => void): void;
13+
setPath(value: string): this;
14+
parse(data: ArrayBuffer): Group;
15+
addExtension(extension: object):void
16+
}

0 commit comments

Comments
 (0)