ohzi-core 8.0.2 → 8.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ohzi-core",
-  "version": "8.0.2",
+  "version": "8.1.0",
   "description": "OHZI Core Library",
   "source": "src/index.js",
   "module": "build/index.module.js",

package/src/CameraManager.js

@@ -3,6 +3,8 @@ class CameraManager
   init()
   {
     this._current = undefined;
+    // VR Spectator
+    this._spectator = undefined;
   }
 
   set current(camera)
@@ -14,6 +16,16 @@ class CameraManager
   {
     return this._current;
   }
+
+  set spectator(camera)
+  {
+    this._spectator = camera;
+  }
+
+  get spectator()
+  {
+    return this._spectator;
+  }
 }
 
 export default new CameraManager();

package/src/Graphics.js

@@ -77,8 +77,10 @@ class Graphics
     {
       this._renderer.xr.enabled = true;
     }
-
-    this._renderer.autoClear = false;
+    else
+    {
+      this._renderer.autoClear = false;
+    }
 
     this._renderer.setPixelRatio(1);
 

package/src/index.js

@@ -20,6 +20,7 @@ import Input from './Input';
 import Initializer from './Initializer';
 import NormalAORender from './render_mode/NormalAORender';
 import NormalRender from './render_mode/NormalRender';
+import VRRender from './render_mode/VRRender';
 import UnrealBloomRender from './render_mode/UnrealBloomRender';
 import OrthographicCamera from './OrthographicCamera';
 import OS from './OS';
@@ -131,6 +132,7 @@ export {
   Initializer,
   NormalAORender,
   NormalRender,
+  VRRender,
   UnrealBloomRender,
   OrthographicCamera,
   OS,

package/src/render_mode/VRRender.js

@@ -0,0 +1,69 @@
+import CameraManager from '../CameraManager';
+import SceneManager from '../SceneManager';
+import BaseRender from '../render_mode/BaseRender';
+import Graphics from '../Graphics';
+
+export default class VRRender extends BaseRender
+{
+  constructor()
+  {
+    super();
+  }
+
+  render()
+  {
+    // Graphics.clear(undefined, CameraManager.current, true, true);
+
+    if (SceneManager.current.on_pre_render)
+    {
+      SceneManager.current.on_pre_render();
+    }
+
+    if (SceneManager.current.render)
+    {
+      SceneManager.current.render();
+    }
+    else
+    {
+      Graphics.render(SceneManager.current, CameraManager.current, Graphics._renderer.getRenderTarget());
+    }
+
+    this.render_spectator_camera();
+
+    if (SceneManager.current.on_post_render)
+    {
+      SceneManager.current.on_post_render();
+    }
+  }
+
+  render_spectator_camera()
+  {
+    const spectator_camera = CameraManager.spectator;
+
+    if (spectator_camera && Graphics._renderer.xr.isPresenting)
+    {
+      // Copy the XR Camera's position and rotation, but use your
+      // main camera's projection matrix
+      const xrCam = Graphics._renderer.xr.getCamera(CameraManager.current);
+
+      spectator_camera.projectionMatrix.copy(CameraManager.current.projectionMatrix);
+
+      spectator_camera.position.copy(xrCam.position);
+      spectator_camera.quaternion.copy(xrCam.quaternion);
+
+      // we'll restore this later
+      const currentRenderTarget = Graphics._renderer.getRenderTarget();
+
+      // turn off the WebXR rendering
+      Graphics._renderer.xr.isPresenting = false;
+
+      // render to the canvas on our main display
+      Graphics._renderer.setRenderTarget(null);
+      Graphics._renderer.render(SceneManager.current, spectator_camera);
+
+      // reset back to enable WebXR
+      Graphics._renderer.setRenderTarget(currentRenderTarget);
+      Graphics._renderer.xr.isPresenting = true;
+    }
+  }
+}