Skip to content

Commit

Permalink
Add support for ellipsoid
Browse files Browse the repository at this point in the history
  • Loading branch information
gkjohnson committed Oct 15, 2024
1 parent 604efcc commit 25ae63a
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 3 deletions.
1 change: 1 addition & 0 deletions src/three/TilesRenderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -647,6 +647,7 @@ export class TilesRenderer extends TilesRendererBase {
loader.fetchOptions = fetchOptions;

loader.adjustmentTransform.copy( upRotationMatrix );
loader.ellipsoid.copy( this.ellipsoid );

promise = loader
.parse( buffer )
Expand Down
8 changes: 5 additions & 3 deletions src/three/loaders/CMPTLoader.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import { CMPTLoaderBase } from '../../base/loaders/CMPTLoaderBase.js';
import { B3DMLoader } from './B3DMLoader.js';
import { PNTSLoader } from './PNTSLoader.js';
import { I3DMLoader } from './I3DMLoader.js';
import { WGS84_ELLIPSOID } from '../math/GeoConstants.js';

export class CMPTLoader extends CMPTLoaderBase {

Expand All @@ -11,14 +12,14 @@ export class CMPTLoader extends CMPTLoaderBase {
super();
this.manager = manager;
this.adjustmentTransform = new Matrix4();
this.ellipsoid = WGS84_ELLIPSOID.clone();

}

parse( buffer ) {

const result = super.parse( buffer );
const manager = this.manager;
const adjustmentTransform = this.adjustmentTransform;
const { manager, ellipsoid, adjustmentTransform } = this;
const promises = [];

for ( const i in result.tiles ) {
Expand All @@ -32,7 +33,6 @@ export class CMPTLoader extends CMPTLoaderBase {
const loader = new B3DMLoader( manager );
loader.workingPath = this.workingPath;
loader.fetchOptions = this.fetchOptions;

loader.adjustmentTransform.copy( adjustmentTransform );

const promise = loader.parse( slicedBuffer.buffer );
Expand All @@ -47,6 +47,7 @@ export class CMPTLoader extends CMPTLoaderBase {
const loader = new PNTSLoader( manager );
loader.workingPath = this.workingPath;
loader.fetchOptions = this.fetchOptions;

const promise = loader.parse( slicedBuffer.buffer );
promises.push( promise );
break;
Expand All @@ -60,6 +61,7 @@ export class CMPTLoader extends CMPTLoaderBase {
loader.workingPath = this.workingPath;
loader.fetchOptions = this.fetchOptions;

loader.ellipsoid.copy( ellipsoid );
loader.adjustmentTransform.copy( adjustmentTransform );

const promise = loader.parse( slicedBuffer.buffer );
Expand Down

0 comments on commit 25ae63a

Please sign in to comment.