Skip to content

Commit

Permalink
Reformat files using pnpm dprint fmt
Browse files Browse the repository at this point in the history
  • Loading branch information
yiskang committed Apr 23, 2024
1 parent 3122bbe commit 14f9972
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 17 deletions.
28 changes: 14 additions & 14 deletions types/forge-viewer/forge-viewer-tests.ts
Original file line number Diff line number Diff line change
Expand Up @@ -672,12 +672,12 @@ async function selectiveLoadingTest(viewer: Autodesk.Viewing.GuiViewer3D): Promi
const viewable = doc.getRoot().getDefaultGeometry();

let query = [{
$like: ['?Name', "'%2%'"]
$like: ["?Name", "'%2%'"],
}];
let fakeLoadedModel = await viewer.loadDocumentNode(doc, viewable, {
filter: {
property_query: query
}
property_query: query,
},
});

await viewer.waitForLoadDone();
Expand All @@ -691,16 +691,15 @@ async function selectiveLoadingTest(viewer: Autodesk.Viewing.GuiViewer3D): Promi
query = propHashes.filter(propHash => propHash[1] === attributeSearchString)
.map(propHash => {
return {
$like: [`s.props.${propHash[0]}`, query[0]['$like'][1]]
$like: [`s.props.${propHash[0]}`, query[0]["$like"][1]],
};
});
}


let model = await viewer.loadDocumentNode(doc, viewable, {
filter: {
property_query: query
}
property_query: query,
},
});

await viewer.waitForLoadDone();
Expand All @@ -723,7 +722,8 @@ async function cameraMappingTest(viewer: Autodesk.Viewing.GuiViewer3D): Promise<
const originPosition = currentPosition.clone().applyMatrix4(invTransform);
// {x: -15.12436009332275, y: -8.984616232971192, z: 4.921260089050291}

let data = '{"aspect":1.7963206307490145,"isPerspective":true,"fov":90.6808770984145,"position":[-15.165047992449978,-8.997701015094862,4.916143307734757],"target":[-15.02430824140946,-8.997131602441378,4.916143307734757],"up":[0,0,1],"orthoScale":1}';
let data =
"{\"aspect\":1.7963206307490145,\"isPerspective\":true,\"fov\":90.6808770984145,\"position\":[-15.165047992449978,-8.997701015094862,4.916143307734757],\"target\":[-15.02430824140946,-8.997131602441378,4.916143307734757],\"up\":[0,0,1],\"orthoScale\":1}";
const viewData = JSON.parse(data);
let view = new Autodesk.Viewing.UnifiedCamera();
view = Object.assign(view, {
Expand All @@ -733,7 +733,7 @@ async function cameraMappingTest(viewer: Autodesk.Viewing.GuiViewer3D): Promise<
position: new THREE.Vector3().fromArray(viewData.position),
target: new THREE.Vector3().fromArray(viewData.target),
up: new THREE.Vector3().fromArray(viewData.up),
orthoScale: viewData.orthoScale
orthoScale: viewData.orthoScale,
});

const offsetMatrix = model.getModelToViewerTransform();
Expand All @@ -746,15 +746,15 @@ async function cameraMappingTest(viewer: Autodesk.Viewing.GuiViewer3D): Promise<
async function dbIdRemappingTest(viewer: Autodesk.Viewing.GuiViewer3D): Promise<void> {
// Override `PropDbLoader#load` so that the svf1/svf2 dbid mapping is always loaded.
const _load = Autodesk.Viewing.Private.PropDbLoader.prototype.load;
Autodesk.Viewing.Private.PropDbLoader.prototype.load = function () {
Autodesk.Viewing.Private.PropDbLoader.prototype.load = function() {
this.needsDbIdRemap = true;
_load.call(this);
}
};

// Override `PropDbLoader#processLoadResult` so that the dbid mapping is stored within all models (by default it is only stored in 2D models).
const _processLoadResult = Autodesk.Viewing.Private.PropDbLoader.prototype.processLoadResult;
Autodesk.Viewing.Private.PropDbLoader.prototype.processLoadResult = function (result) {
Autodesk.Viewing.Private.PropDbLoader.prototype.processLoadResult = function(result) {
_processLoadResult.call(this, result);
this.model.idRemap = result.dbidOldToNew;
}
}
};
}
10 changes: 7 additions & 3 deletions types/forge-viewer/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ declare namespace Autodesk {

interface LoadModelOptions {
fileLoader?: FileLoader | undefined;
keepCurrentModels?: boolean,
keepCurrentModels?: boolean;
loadOptions?: object | undefined;
sharedPropertyDbPath?: string | undefined;
ids?: number[] | undefined;
Expand Down Expand Up @@ -1202,7 +1202,11 @@ declare namespace Autodesk {
onErrorCallback?: (errorCode: number, errorMessage: string, errorArgs: any) => void,
): any;
unloadModel(model: Model): void;
loadDocumentNode(avDocument: Document, manifestNode: any, /*BubbleNode*/ options?: LoadModelOptions): Promise<Model>;
loadDocumentNode(
avDocument: Document,
manifestNode: any,
/*BubbleNode*/ options?: LoadModelOptions,
): Promise<Model>;
unloadDocumentNode(manifestNode: any /*BubbleNode*/): boolean;
getDimensions(): Private.Dimensions;
resize(): void;
Expand Down Expand Up @@ -1907,7 +1911,7 @@ declare namespace Autodesk {
},
successCallback?: (r: PropertyResult[]) => void,
errorCallback?: (err: any) => void,
ignoreHidden?: boolean
ignoreHidden?: boolean,
): void;
getBulkProperties2(
dbIds: number[],
Expand Down

0 comments on commit 14f9972

Please sign in to comment.