Merge branch 'master' into mp_main

CHANGELOG.md

@@ -4,12 +4,19 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## Unreleased
+## [0.3.6] - 2022-01-29
+### Fixed
+- "onPreprocessUrl" is now called for initial Tileset URL.
+
+## [0.3.5] - 2022-01-06
 ### Added
 - `TilesRenderer.onTileVisibilityChange` callback.
+- Support for GLTF in tilesets (`3DTILES_content_gltf` extension).
 
 ### Changed
 - Improved type definitions.
+- `PNTSLoader.parse` now returns a promise.
+- All model loaders on inherit from a common type.
 
 ## [0.3.4] - 2021-11-15
 ### Added

README.md

@@ -56,7 +56,7 @@ function renderLoop() {
 	// before calling tilesRenderer.update
 	camera.updateMatrixWorld();
 	tilesRenderer.update();
-	renderer.render( camera, scene );
+	renderer.render( scene, camera );
 
 }
 ```
@@ -197,7 +197,7 @@ function renderLoop() {
 		needsRerender = false;
 		camera.updateMatrixWorld();
 		tilesRenderer.update();
-		renderer.render( camera, scene );
+		renderer.render( scene, camera );
 
 	}
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "3d-tiles-renderer",
-  "version": "0.3.4",
+  "version": "0.3.6",
   "description": "https://github.com/AnalyticalGraphicsInc/3d-tiles/tree/master/specification",
   "keywords": [
     "3d-tiles",

src/base/TileBase.d.ts

@@ -59,4 +59,6 @@ export interface TileBase {
 
 	refine?: 'REPLACE' | 'ADD';
 
+	transform?: number[];
+
 }

src/base/TilesRendererBase.js

@@ -337,7 +337,7 @@ export class TilesRendererBase {
 		if ( ! ( url in tileSets ) ) {
 
 			const pr = this
-				.fetchTileSet( url, this.fetchOptions )
+				.fetchTileSet( this.preprocessURL ? this.preprocessURL( url ) : url, this.fetchOptions )
 				.then( json => {
 
 					tileSets[ url ] = json;

src/three/GLTFExtensionLoader.d.ts

@@ -1,8 +1,9 @@
 
 import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader.js';
+import { LoaderBase } from '../base/LoaderBase';
 import { LoadingManager } from 'three';
 
-export class GLTFExtensionLoader {
+export class GLTFExtensionLoader extends LoaderBase {
 
 	constructor( manager : LoadingManager );
 	parse( buffer : ArrayBuffer ) : Promise< GLTF >;

src/three/GLTFExtensionLoader.js

@@ -16,13 +16,30 @@ export class GLTFExtensionLoader extends LoaderBase {
 		return new Promise( ( resolve, reject ) => {
 
 			const manager = this.manager;
+			const fetchOptions = this.fetchOptions;
 			let loader = manager.getHandler( 'path.gltf' ) || manager.getHandler( 'path.glb' );
 
 			if ( ! loader ) {
 
 				loader = new GLTFLoader( manager );
-				loader.crossOrigin = this.crossOrigin;
-				loader.withCredentials = this.withCredentials;
+				if ( fetchOptions.credentials === 'include' && fetchOptions.mode === 'cors' ) {
+
+					loader.setCrossOrigin( 'use-credentials' );
+
+				}
+
+				if ( 'credentials' in fetchOptions ) {
+
+					loader.setWithCredentials( fetchOptions.credentials === 'include' );
+
+				}
+
+				if ( fetchOptions.headers ) {
+
+					loader.setRequestHeader( fetchOptions.headers );
+
+				}
+
 
 			}