Skip to content

Commit

Permalink
Snapshot build
Browse files Browse the repository at this point in the history
  • Loading branch information
xeolabs committed Feb 22, 2016
1 parent 7eb55e9 commit db2541c
Show file tree
Hide file tree
Showing 7 changed files with 45 additions and 57 deletions.
8 changes: 3 additions & 5 deletions api/latest/plugins/node/cameras/orbit.js
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,9 @@ SceneJS.Types.addType("cameras/orbit", {
var eye = params.eye || { x: 0, y: 0, z: 0 };
var look = params.look || { x: 0, y: 0, z: 0};

lookat.set({
eye: { x: eye.x, y: eye.y, z: -zoom },
look: { x: look.x, y: look.y, z: look.z },
up: { x: 0, y: 1, z: 0 }
});
lookat.setEye({ x: eye.x, y: eye.y, z: -zoom });
lookat.setLook({ x: look.x, y: look.y, z: look.z });
lookat.setUp({ x: 0, y: 1, z: 0 });

var spin = params.spin;

Expand Down
4 changes: 3 additions & 1 deletion api/latest/plugins/node/cameras/pickFlyOrbit.js
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,9 @@ require([
look: { x: look.x, y: look.y, z: look.z },
up: { x: 0, y: 1, z: 0 }
};
lookat.set(lookatArgs);
lookat.setEye(lookatArgs.eye);
lookat.setLook(lookatArgs.look);
lookat.setUp(lookatArgs.up);
this.publish("updated", lookatArgs);

var canvas = this.getScene().getCanvas();
Expand Down
24 changes: 10 additions & 14 deletions api/latest/plugins/node/effects/anaglyph.js
Original file line number Diff line number Diff line change
Expand Up @@ -174,13 +174,11 @@ SceneJS.Types.addType("effects/anaglyph", {
self._localLookat.setEye(rightEye);
self._localLookat.setLook(rightLook);

self._camera.set({
optics: {
left: -ratio * wd2 - 0.5 * self._eyeSep * ndfl,
right: ratio * wd2 - 0.5 * self._eyeSep * ndfl,
top: wd2,
bottom: -wd2
}
self._camera.setOptics({
left: -ratio * wd2 - 0.5 * self._eyeSep * ndfl,
right: ratio * wd2 - 0.5 * self._eyeSep * ndfl,
top: wd2,
bottom: -wd2
});

self._colorBuffer.setColorMask({
Expand All @@ -206,13 +204,11 @@ SceneJS.Types.addType("effects/anaglyph", {
self._localLookat.setEye(leftEye);
self._localLookat.setLook(leftLook);

self._camera.set({
optics: {
left: -ratio * wd2 + 0.5 * self._eyeSep * ndfl,
right: ratio * wd2 + 0.5 * self._eyeSep * ndfl,
top: wd2,
bottom: -wd2
}
self._camera.setOptics({
left: -ratio * wd2 + 0.5 * self._eyeSep * ndfl,
right: ratio * wd2 + 0.5 * self._eyeSep * ndfl,
top: wd2,
bottom: -wd2
});

self._colorBuffer.setColorMask({
Expand Down
24 changes: 10 additions & 14 deletions api/latest/plugins/node/effects/oculusRift.js
Original file line number Diff line number Diff line change
Expand Up @@ -314,13 +314,11 @@ SceneJS.Types.addType("effects/oculusRift", {
self._localLookat.setEye(rightEye);
self._localLookat.setLook(rightLook);

self._camera.set({
optics: {
left: -self._aspect * wd2 - 0.5 * eyeSep * ndfl,
right: self._aspect * wd2 - 0.5 * eyeSep * ndfl,
top: wd2,
bottom: -wd2
}
self._camera.setOptics({
left: -self._aspect * wd2 - 0.5 * eyeSep * ndfl,
right: self._aspect * wd2 - 0.5 * eyeSep * ndfl,
top: wd2,
bottom: -wd2
});

self._shader.setParams({
Expand All @@ -343,13 +341,11 @@ SceneJS.Types.addType("effects/oculusRift", {
self._localLookat.setEye(leftEye);
self._localLookat.setLook(leftLook);

self._camera.set({
optics: {
left: -self._aspect * wd2 + 0.5 * eyeSep * ndfl,
right: self._aspect * wd2 + 0.5 * eyeSep * ndfl,
top: wd2,
bottom: -wd2
}
self._camera.setOptics({
left: -self._aspect * wd2 + 0.5 * eyeSep * ndfl,
right: self._aspect * wd2 + 0.5 * eyeSep * ndfl,
top: wd2,
bottom: -wd2
});

self._shader.setParams({
Expand Down
24 changes: 10 additions & 14 deletions api/latest/plugins/node/effects/stereo.js
Original file line number Diff line number Diff line change
Expand Up @@ -215,13 +215,11 @@ SceneJS.Types.addType("effects/stereo", {
self._localLookat.setEye(rightEye);
self._localLookat.setLook(rightLook);

self._camera.set({
optics: {
left: -ratio * wd2 - 0.5 * self._eyeSep * ndfl,
right: ratio * wd2 - 0.5 * self._eyeSep * ndfl,
top: wd2,
bottom: -wd2
}
self._camera.setOptics({
left: -ratio * wd2 - 0.5 * self._eyeSep * ndfl,
right: ratio * wd2 - 0.5 * self._eyeSep * ndfl,
top: wd2,
bottom: -wd2
});

//
Expand All @@ -246,13 +244,11 @@ SceneJS.Types.addType("effects/stereo", {
self._localLookat.setEye(leftEye);
self._localLookat.setLook(leftLook);

self._camera.set({
optics: {
left: -ratio * wd2 + 0.5 * self._eyeSep * ndfl,
right: ratio * wd2 + 0.5 * self._eyeSep * ndfl,
top: wd2,
bottom: -wd2
}
self._camera.setOptics({
left: -ratio * wd2 + 0.5 * self._eyeSep * ndfl,
right: ratio * wd2 + 0.5 * self._eyeSep * ndfl,
top: wd2,
bottom: -wd2
});

//
Expand Down
2 changes: 1 addition & 1 deletion api/latest/scenejs.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* A WebGL-based 3D scene graph from xeoLabs
* http://scenejs.org/
*
* Built on 2016-01-12
* Built on 2016-02-22
*
* MIT License
* Copyright 2016, Lindsay Kay
Expand Down
16 changes: 8 additions & 8 deletions api/latest/scenejs.min.js

Large diffs are not rendered by default.

0 comments on commit db2541c

Please sign in to comment.