Merge pull request #120 from NASA-AMMOS/dts-upates

Update d.ts files for loaders

src/base/I3DMLoaderBase.d.ts

@@ -1,6 +1,6 @@
 import { FeatureTable, BatchTable } from '../utilities/FeatureTable';
 
-export interface I3DMLoaderBaseResult {
+export interface I3DMBaseResult {
 
 	version : String;
 	featureTable: FeatureTable;
@@ -9,9 +9,9 @@ export interface I3DMLoaderBaseResult {
 
 }
 
-export class I3DMLoaderLoaderBase {
+export class I3DMLoaderBase {
 
-	load( url : string ) : Promise< I3DMLoaderBaseResult >;
-	parse( buffer : ArrayBuffer ) : Promise< I3DMLoaderBaseResult >;
+	load( url : string ) : Promise< I3DMBaseResult >;
+	parse( buffer : ArrayBuffer ) : Promise< I3DMBaseResult >;
 
 }

src/index.d.ts

@@ -11,9 +11,15 @@ import {
 } from './three/DebugTilesRenderer';
 import { TilesRenderer } from './three/TilesRenderer';
 import { B3DMLoader } from './three/B3DMLoader';
+import { I3DMLoader } from './three/I3DMLoader';
+import { PNTSLoader } from './three/PNTSLoader';
+import { CMPTLoader } from './three/CMPTLoader';
 
 import { TilesRendererBase } from './base/TilesRendererBase';
 import { B3DMLoaderBase } from './base/B3DMLoaderBase';
+import { I3DMLoaderBase } from './base/I3DMLoaderBase';
+import { PNTSLoaderBase } from './base/PNTSLoaderBase';
+import { CMPTLoaderBase } from './base/CMPTLoaderBase';
 
 import { LRUCache } from './utilities/LRUCache';
 import { PriorityQueue } from './utilities/PriorityQueue';

src/three/B3DMLoader.d.ts

@@ -12,7 +12,7 @@ interface B3DMScene extends Group {
 
 export interface B3DMResult extends GLTF, B3DMBaseResult {
 
-	model : B3DMScene;
+	scene : B3DMScene;
 	
 }
 

src/three/CMPTLoader.d.ts

@@ -1,11 +1,11 @@
 import { B3DMBaseResult } from '../base/B3DMLoaderBase';
 import { I3DMBaseResult } from '../base/I3DMLoaderBase';
-import { PNTSBaseResult } from '../base/B3DMLoaderBase';
-import { Group } from 'three';
+import { PNTSBaseResult } from '../base/PNTSLoaderBase';
+import { Group, LoadingManager } from 'three';
 
 export interface CMPTResult {
 
-	tiles : Array< B3DMBaseResult, I3DMBaseResult, PNTSBaseResult >;
+	tiles : Array< B3DMBaseResult|I3DMBaseResult|PNTSBaseResult >;
 	scene : Group;
 
 }

src/three/I3DMLoader.d.ts

@@ -1,10 +1,18 @@
 import { I3DMBaseResult } from '../base/I3DMLoaderBase';
+import { FeatureTable, BatchTable } from '../utilities/FeatureTable';
 import { GLTF } from 'three/examples/jsm/loaders/GLTFLoader';
+import { Group, LoadingManager } from 'three';
+
+interface I3DMScene extends Group {
+
+	batchTable : BatchTable;
+	featureTable : FeatureTable;
+	
+}
 
 export interface I3DMResult extends GLTF, I3DMBaseResult {
 
-	batchTable : Object;
-	featureTable : Object;
+	scene : I3DMScene;
 
 }
 

src/three/PNTSLoader.d.ts

@@ -1,9 +1,16 @@
 import { PNTSBaseResult } from '../base/PNTSLoaderBase';
-import { Points } from 'three';
+import { FeatureTable } from '../utilities/FeatureTable';
+import { Points, LoadingManager } from 'three';
+
+interface PNTSScene extends Points {
+
+	featureTable : FeatureTable;
+	
+}
 
 export interface PNTSResult extends PNTSBaseResult {
 
-	scene: Points;
+	scene : PNTSScene;
 
 }