michael/pathfinder
michael
/
pathfinder
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move VR stuff to ThreeDView

This commit is contained in:
Manish Goregaokar 2018-03-09 17:45:19 -08:00
parent 2b0b699fa0
commit 0751da81a4
3 changed files with 94 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
demo/client/src/3d-demo.ts
View File

@ -44,8 +44,8 @@ const FONT: string = 'open-sans';
const PIXELS_PER_UNIT: number = 1.0;
const FOV: number = 45.0;
export const NEAR_CLIP_PLANE: number = 0.1;
export const FAR_CLIP_PLANE: number = 100000.0;
const NEAR_CLIP_PLANE: number = 0.1;
const FAR_CLIP_PLANE: number = 100000.0;
const ATLAS_FONT_SIZE: number = 48;
@ -311,7 +311,6 @@ class ThreeDController extends DemoAppController<ThreeDView> {
class ThreeDView extends DemoView implements TextRenderContext {
cameraView: CameraView;
get atlas(): Atlas {
return this.appController.atlas;
}
@ -348,6 +347,10 @@ class ThreeDView extends DemoView implements TextRenderContext {
appController: ThreeDController;
private vrDisplay: VRDisplay | null;
private vrFrameData: VRFrameData | null;
private inVRRAF: boolean;
protected get camera(): PerspectiveCamera {
return this.renderer.camera;
}
@ -364,10 +367,85 @@ class ThreeDView extends DemoView implements TextRenderContext {
this.appController = appController;
this.renderer = new ThreeDRenderer(this);
this.inVRRAF = false;
this.vrDisplay = null;
if ("VRFrameData" in window) {
this.vrFrameData = new VRFrameData;
} else {
this.vrFrameData = null;
}
this.vrSetup();
this.resizeToFit(true);
}
newTimingsReceived(timings: Timings): void {}
vrSetup(): void {
if (navigator.getVRDisplays) {
navigator.getVRDisplays().then((displays) => {
if (displays.length > 0) {
this.vrDisplay = displays[displays.length - 1];
// It's heighly reccommended that you set the near and far planes to
// something appropriate for your scene so the projection matricies
// WebVR produces have a well scaled depth buffer.
this.renderer.setClipPlanes(this.vrDisplay);
unwrapNull(document.getElementById('pf-vr')).style.display = "initial";
} else {
// no vr displays
}
});
} else {
// no vr support
}
window.addEventListener('vrdisplaypresentchange', () => {
if (this.vrDisplay == null)
return;
if (this.vrDisplay.isPresenting) {
const that = this;
this.resized();
function vrCallback(): void {
if (that.vrDisplay == null || !that.renderer.inVR) {
return;
}
that.vrDisplay.requestAnimationFrame(vrCallback);
that.inVRRAF = true;
that.redraw();
that.inVRRAF = false;
}
this.vrDisplay.requestAnimationFrame(vrCallback);
} else {
this.renderer.inVR = false;
this.resized();
}
});
}
enterVR(): void {
if (this.vrDisplay != null) {
this.renderer.inVR = true;
this.vrDisplay.requestPresent([{ source: this.canvas }]);
}
}
redrawVR(): void {
if (this.vrDisplay == null ||
this.vrFrameData == null) {
this.renderer.redraw();
return;
}
if (!this.inVRRAF) {
// redraw() called outside of vr RAF, will get drawn later
return;
}
this.vrDisplay.getFrameData(this.vrFrameData);
this.renderer.redrawVR(this.vrFrameData);
this.vrDisplay.submitFrame();
}
}
class ThreeDRenderer extends Renderer {
@ -510,6 +588,11 @@ class ThreeDRenderer extends Renderer {
gl.viewport(offset, 0, this.destAllocatedSize[0], this.destAllocatedSize[1]);
}
setClipPlanes(display: VRDisplay) {
display.depthNear = NEAR_CLIP_PLANE;
display.depthFar = FAR_CLIP_PLANE;
}
pathTransformsForObject(objectIndex: number): PathTransformBuffers<Float32Array> {
const meshDescriptor = this.renderContext.appController.meshDescriptors[objectIndex];
const pathCount = this.pathCountForObject(objectIndex);

3
demo/client/src/renderer.ts
View File

@ -149,6 +149,9 @@ export abstract class Renderer {
gl.viewport(0, 0, this.destAllocatedSize[0], this.destAllocatedSize[1]);
}
setClipPlanes(display: VRDisplay) {
}
redraw(): void {
const renderContext = this.renderContext;

77
demo/client/src/view.ts
View File

@ -10,7 +10,6 @@
import * as glmatrix from 'gl-matrix';
import {FAR_CLIP_PLANE, NEAR_CLIP_PLANE} from './3d-demo';
import {AntialiasingStrategy, AntialiasingStrategyName, NoAAStrategy} from "./aa-strategy";
import {StemDarkeningMode, SubpixelAAType} from "./aa-strategy";
import {AAOptions} from './app-controller';
@ -175,9 +174,6 @@ export abstract class DemoView extends PathfinderView implements RenderContext {
protected colorBufferHalfFloatExt: any;
private wantsScreenshot: boolean;
private vrDisplay: VRDisplay | null;
private vrFrameData: VRFrameData | null;
private inVRRAF: boolean;
/// NB: All subclasses are responsible for creating a renderer in their constructors.
constructor(areaLUT: HTMLImageElement,
@ -199,60 +195,6 @@ export abstract class DemoView extends PathfinderView implements RenderContext {
this.wantsScreenshot = false;
this.inVRRAF = false;
this.vrDisplay = null;
if ("VRFrameData" in window) {
this.vrFrameData = new VRFrameData;
} else {
this.vrFrameData = null;
}
this.vrSetup();
}
vrSetup(): void {
if (navigator.getVRDisplays) {
navigator.getVRDisplays().then((displays) => {
if (displays.length > 0) {
this.vrDisplay = displays[displays.length - 1];
// It's heighly reccommended that you set the near and far planes to
// something appropriate for your scene so the projection matricies
// WebVR produces have a well scaled depth buffer.
this.vrDisplay.depthNear = NEAR_CLIP_PLANE;
this.vrDisplay.depthFar = FAR_CLIP_PLANE;
unwrapNull(document.getElementById('pf-vr')).style.display = "initial";
} else {
// no vr displays
}
});
} else {
// no vr support
}
window.addEventListener('vrdisplaypresentchange', () => {
if (this.vrDisplay == null)
return;
if (this.vrDisplay.isPresenting) {
const that = this;
this.resized();
function vrCallback(): void {
if (that.vrDisplay == null || !that.renderer.inVR) {
return;
}
that.vrDisplay.requestAnimationFrame(vrCallback);
that.inVRRAF = true;
that.redraw();
that.inVRRAF = false;
}
this.vrDisplay.requestAnimationFrame(vrCallback);
} else {
this.renderer.inVR = false;
this.resized();
}
});
}
attachMeshes(meshes: PathfinderPackedMeshes[]): void {
@ -304,11 +246,9 @@ export abstract class DemoView extends PathfinderView implements RenderContext {
return buffer;
}
enterVR(): void {
if (this.vrDisplay != null) {
this.renderer.inVR = true;
this.vrDisplay.requestPresent([{ source: this.canvas }]);
}
enterVR(): void {}
redrawVR(): void {
this.renderer.redraw();
}
redraw(): void {
@ -317,17 +257,10 @@ export abstract class DemoView extends PathfinderView implements RenderContext {
if (!this.renderer.meshesAttached)
return;
if (!this.renderer.inVR || this.vrDisplay == null ||
this.vrFrameData == null) {
if (!this.renderer.inVR) {
this.renderer.redraw();
} else {
if (!this.inVRRAF) {
// redraw() called outside of vr RAF, will get drawn later
return;
}
this.vrDisplay.getFrameData(this.vrFrameData);
this.renderer.redrawVR(this.vrFrameData);
this.vrDisplay.submitFrame();
this.redrawVR();
}
// Invoke the post-render hook.