Bläddra i källkod

Merge pull request #7698 from RaananW/inspector-change

inspector should show freecamera-based cameras
David Catuhe 5 år sedan
förälder
incheckning
f1668c2fcc

+ 2 - 1
inspector/src/components/actionTabs/tabs/propertyGridTabComponent.tsx

@@ -149,7 +149,8 @@ export class PropertyGridTabComponent extends PaneComponent {
                 }
             }
 
-            if (className.indexOf("FreeCamera") !== -1 || className.indexOf("UniversalCamera") !== -1) {
+            if (className.indexOf("FreeCamera") !== -1 || className.indexOf("UniversalCamera") !== -1
+            || className.indexOf("WebXRCamera") !== -1  || className.indexOf("DeviceOrientationCamera") !== -1) {
                 const freeCamera = entity as FreeCamera;
                 return (<FreeCameraPropertyGridComponent globalState={this.props.globalState} camera={freeCamera}
                     lockObject={this._lockObject}

+ 8 - 0
src/XR/webXRCamera.ts

@@ -103,6 +103,14 @@ export class WebXRCamera extends FreeCamera {
         }
     }
 
+    /**
+     * Gets the current instance class name ("WebXRCamera").
+     * @returns the class name
+     */
+    public getClassName(): string {
+        return "WebXRCamera";
+    }
+
     private _updateFromXRSession() {
         const pose = this._xrSessionManager.currentFrame && this._xrSessionManager.currentFrame.getViewerPose(this._xrSessionManager.referenceSpace);