Pārlūkot izejas kodu

Rearrange into base and utilities

Garrett Johnson 5 gadi atpakaļ
vecāks
revīzija
bfac56e376

+ 7 - 1
src/B3DMLoader.js

@@ -16,9 +16,15 @@ function arrayToString( array ) {
 
 class B3DMLoader {
 
+	constructor() {
+
+		this.fetchOptions = {};
+
+	}
+
 	load( url ) {
 
-		return fetch( url, { credentials: 'same-origin' } )
+		return fetch( url, this.fetchOptions )
 			.then( res => res.arrayBuffer() )
 			.then( buffer => this.parse( buffer ) );
 

+ 2 - 2
src/TilesRenderer.js

@@ -1,6 +1,6 @@
 import path from 'path';
-import { LRUCache } from './LRUCache.js';
-import { PriorityQueue } from './PriorityQueue.js';
+import { LRUCache } from '../utilities/LRUCache.js';
+import { PriorityQueue } from '../utilities/PriorityQueue.js';
 
 // TODO: find out why tiles are left dangling in the hierarchy
 // TODO: Address the issue of too many promises, garbage collection

+ 6 - 3
src/index.js

@@ -1,7 +1,10 @@
 import { ThreeTilesRenderer } from './three/ThreeTilesRenderer.js';
 import { ThreeB3DMLoader } from './three/ThreeB3DMLoader';
 
-import { TilesRenderer } from './TilesRenderer.js';
-import { B3DMLoader } from './B3DMLoader';
+import { TilesRenderer } from './base/TilesRenderer.js';
+import { B3DMLoader } from './base/B3DMLoader';
 
-export { ThreeTilesRenderer, ThreeB3DMLoader, TilesRenderer, B3DMLoader };
+import { LRUCache } from './utilities/LRUCache.js';
+import { PriorityQueue } from './utilities/PriorityQueue.js';
+
+export { ThreeTilesRenderer, ThreeB3DMLoader, TilesRenderer, B3DMLoader, LRUCache, PriorityQueue };

+ 1 - 1
src/three/ThreeB3DMLoader.js

@@ -1,4 +1,4 @@
-import { B3DMLoader } from '../B3DMLoader.js';
+import { B3DMLoader } from '../base/B3DMLoader.js';
 import { GLTFLoader } from 'three/examples/jsm/loaders/GLTFLoader.js';
 
 class ThreeB3DMLoader extends B3DMLoader {

+ 1 - 1
src/three/ThreeTilesRenderer.js

@@ -1,4 +1,4 @@
-import { TilesRenderer } from '../TilesRenderer.js';
+import { TilesRenderer } from '../base/TilesRenderer.js';
 import { ThreeB3DMLoader } from './ThreeB3DMLoader.js';
 import { TilesGroup } from './TilesGroup.js';
 import {

src/LRUCache.js → src/utilities/LRUCache.js


src/PriorityQueue.js → src/utilities/PriorityQueue.js


+ 1 - 1
test/LRUCache.test.js

@@ -1,4 +1,4 @@
-import { LRUCache } from '../src/LRUCache.js';
+import { LRUCache } from '../src/utilities/LRUCache.js';
 
 describe( 'LRUCache', () => {
 

+ 1 - 1
test/PriorityQueue.test.js

@@ -1,4 +1,4 @@
-import { PriorityQueue } from '../src/PriorityQueue.js';
+import { PriorityQueue } from '../src/utilities/PriorityQueue.js';
 
 const nextFrame = () => new Promise( resolve => requestAnimationFrame( resolve ) );
 const nextTick = () => new Promise( resolve => process.nextTick( resolve ) );