From 05ddf70dfac0638f3e2b73dd7e2a5ad6707bb00c Mon Sep 17 00:00:00 2001
From: Bryan Huang <dukedhx@hotmail.com>
Date: Fri, 20 Mar 2020 23:15:35 +0800
Subject: [PATCH] Add missing members and properties (#43258)

* Upgrade to Viewer v7.2

Release notes: https://forge.autodesk.com/blog/viewer-release-notes-v-72

* Upgrade to Viewer v7.4

Release notes: https://forge.autodesk.com/blog/viewer-release-notes-v-74

* Added getDefaultGeometry method

* Added missing methods to Navigation class:
- getWorldPoint
- screenToViewport

* Added missing method to Viewer3DImpl class:
- viewportToRay

* getDocumentNode returns any rather than object

* added interface to specify API endpoint

* move properties to top of the class

Co-authored-by: Jan Liska <jan.liska@autodesk.com>
---
 types/forge-viewer/index.d.ts | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/types/forge-viewer/index.d.ts b/types/forge-viewer/index.d.ts
index 5a6a27a077..8138d2f407 100644
--- a/types/forge-viewer/index.d.ts
+++ b/types/forge-viewer/index.d.ts
@@ -351,6 +351,13 @@ declare namespace Autodesk {
           useAsDefault(): boolean;
         }
 
+        interface Endpoint {
+            getApiEndpoint(): string;
+            getEndpointAndApi(): string;
+            setEndpointAndApi(endpoint: string, api: string): void;
+        }
+
+        let endpoint: Endpoint;
         let theExtensionManager: ExtensionManager;
 
         interface InitializerOptions {
@@ -487,7 +494,7 @@ declare namespace Autodesk {
             geomPolyCount(): number;
             getDefaultCamera(): THREE.Camera;
             getDisplayUnit(): string;
-            getDocumentNode(): object;
+            getDocumentNode(): any;
             getExternalIdMapping(onSuccessCallback: (idMapping: { [key: string]: number; }) => void, onErrorCallback: () => void): any;
             getFastLoadList(): any;
             getFragmentMap(): any;
@@ -565,6 +572,8 @@ declare namespace Autodesk {
             setVerticalFov(fov: number, adjustPosition: boolean): void;
             setUseLeftHandedInput(value: boolean): any;
             setZoomTowardsPivot(value: boolean): any;
+            getWorldPoint(x: number, y: number): THREE.Vector3;
+            screenToViewport(x: number, y: number): THREE.Vector3;
         }
 
         interface Properties {
@@ -963,6 +972,12 @@ declare namespace Autodesk {
             class Viewer3DImpl {
                 constructor(thecanvas: any, theapi: any);
 
+                camera: THREE.Camera;
+                canvas: HTMLCanvasElement;
+                model: any;
+                scene: THREE.Scene;
+                sceneAfter: THREE.Scene;
+                selector: any;
                 visibilityManager: VisibilityManager;
 
                 addOverlay(overlayName: string, mesh: any): void;
@@ -973,10 +988,6 @@ declare namespace Autodesk {
                 initialize(needsClear: boolean, needsRender: boolean, overlayDirty: boolean): void;
                 invalidate(needsClear: boolean, needsRender?: boolean, overlayDirty?: boolean): void;
                 setLightPreset(index: number, force?: boolean): void;
-                selector: any;
-                model: any;
-                scene: THREE.Scene;
-                sceneAfter: THREE.Scene;
                 viewportToClient(viewportX: number, viewportY: number): THREE.Vector3;
                 modelqueue(): any;
                 matman(): any;
@@ -986,10 +997,10 @@ declare namespace Autodesk {
                 removeOverlay(name: string, mesh: any): any;
                 getFitBounds(p: boolean): THREE.Box3;
                 rayIntersect(ray: THREE.Ray): HitTestResult;
-
                 getRenderProxy(model: Model, fragId: number): any;
                 sceneUpdated(param: boolean): void;
                 setViewFromCamera(camera: THREE.Camera, skipTransition?: boolean, useExactCamera?: boolean): void;
+                viewportToRay(vpVec: THREE.Vector3, ray: THREE.Ray): THREE.Ray;
             }
 
             class VisibilityManager {