tforgione/3d-interface
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added namespaces

Browse Source
This commit is contained in:
Thomas FORGIONE
2015-07-01 16:31:43 +02:00
parent 5e0551179e
commit 9c7350d41b
38 changed files with 552 additions and 556 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/l3d/apps/bouncing-cube/BouncingCube.js
View File

@@ -1,12 +1,12 @@
var BouncingCube = function(size, style) {
Cube.call(this, size, style);
L3D.Cube.call(this, size, style);
this.fixed_center = new THREE.Vector3();
this.center = new THREE.Vector3();
this.speed = new THREE.Vector3(0,0,300);
};
BouncingCube.prototype = Object.create(Cube.prototype);
BouncingCube.prototype = Object.create(L3D.Cube.prototype);
BouncingCube.prototype.constructor = BouncingCube;
BouncingCube.prototype.update = function() {

4
js/l3d/apps/bouncing-cube/main.js
View File

@@ -33,7 +33,7 @@ function init() {
scene.add(ambient_light);
// on initialise la camera que l’on place ensuite sur la scène
camera = new Camera(50, container_size.width / container_size.height, 1, 10000);
camera = new L3D.Camera(50, container_size.width / container_size.height, 1, 10000);
scene.add(camera);
window.addEventListener('resize', onWindowResize, false);
@@ -42,7 +42,7 @@ function init() {
// on créé un cube au quel on définie un matériau puis on l’ajoute à la scène
cube = new BouncingCube(200, {color: "red"});
plane = new Plane(1000,1000);
plane = new L3D.Plane(1000,1000);
plane.translate(0,0,-100);
cube.addToScene(scene);

5
js/l3d/apps/multisphere/main.js
View File

@@ -55,7 +55,7 @@ function init() {
scene.add(ambient_light);
// on initialise la camera que l’on place ensuite sur la scène
camera = new Camera(50, container_size.width / container_size.height, 1, 10000);
camera = new L3D.Camera(50, container_size.width / container_size.height, 1, 10000);
scene.add(camera);
window.addEventListener('resize', onWindowResize, false);
@@ -71,8 +71,7 @@ function init() {
}
plane = new Plane(1000,1000);
plane = new L3D.Plane(1000,1000);
plane.translate(0,0,-100);
plane.addToScene(scene);
}

30
js/l3d/apps/prototype/interactive/main.js vendored
View File

@@ -44,7 +44,7 @@ var previousTime;
window.onbeforeunload = function() {
if (initMainScene !== initPeach && initMainScene !== initSponza && Coin.total !== 9) {
if (initMainScene !== L3D.initPeach && initMainScene !== L3D.initSponza && Coin.total !== 9) {
return 'Warning : you are going to leave the page and abort the current test !';
@@ -54,7 +54,7 @@ window.onbeforeunload = function() {
init();
if (initMainScene !== initPeach && initMainScene !== initSponza)
if (initMainScene !== L3D.initPeach && initMainScene !== L3D.initSponza)
logfps();
animate();
@@ -63,7 +63,7 @@ function logfps() {
// Log fps
if (stats !== undefined) {
var event = new BD.Event.Fps();
var event = new L3D.BD.Event.Fps();
event.fps = stats.getFps();
event.send();
@@ -90,10 +90,10 @@ function init() {
renderer.setClearColor(0x87ceeb);
// Initialize pointer camera
camera1 = new PointerCamera(50, container_size.width() / container_size.height(), 0.01, 100000, renderer, container);
camera1 = new L3D.PointerCamera(50, container_size.width() / container_size.height(), 0.01, 100000, renderer, container);
// Initialize previewer
previewer = new Previewer(renderer, scene);
previewer = new L3D.Previewer(renderer, scene);
previewer.domElement.style.position ="absolute";
previewer.domElement.style.cssFloat = 'top-left';
previewer.domElement.width = container_size.width();
@@ -106,12 +106,12 @@ function init() {
stats.domElement.style.cssFloat = "top-left";
// Initialize pointer for pointer lock
var pointer = new MousePointer(camera1);
var pointer = new L3D.MousePointer(camera1);
pointer.domElement.width = container_size.width();
pointer.domElement.height = container_size.height();
//
var startCanvas = new StartCanvas(camera1);
var startCanvas = new L3D.StartCanvas(camera1);
startCanvas.domElement.width = container_size.width();
startCanvas.domElement.height = container_size.height();
@@ -126,11 +126,11 @@ function init() {
startCanvas.render();
cameras = initMainScene(camera1, scene, coins);
// cameras = initPeach(camera1, scene, coins);
// cameras = initBobomb(camera1, scene, coins);
// cameras = initWhomp(camera1, scene, , coins);
// cameras = initMountain(camera1, scene, coins);
// cameras = initSponza(camera1, scene, coins);
// cameras = L3D.initPeach(camera1, scene, coins);
// cameras = L3D.initBobomb(camera1, scene, coins);
// cameras = L3D.initWhomp(camera1, scene, , coins);
// cameras = L3D.initMountain(camera1, scene, coins);
// cameras = L3D.initSponza(camera1, scene, coins);
// Add listeners
initListeners();
@@ -168,7 +168,7 @@ function initListeners() {
buttonManager = new ButtonManager(cameras, previewer);
// Camera selecter for hover and clicking recommendations
cameraSelecter = new CameraSelecter(renderer, scene, cameras, coins, buttonManager);
cameraSelecter = new L3D.CameraSelecter(renderer, scene, cameras, coins, buttonManager);
}
function render() {
@@ -177,7 +177,7 @@ function render() {
// Update recommendations (set raycastable if shown)
var transform = buttonManager.showArrows ? show : hide;
cameras.map(function(camera) {
if (camera instanceof RecommendedCamera) {
if (camera instanceof Recommendation) {
transform(camera);
camera.traverse(function(elt) {
@@ -211,7 +211,7 @@ function render() {
previewer.clear();
// Hide arrows in recommendation
cameras.map(function(camera) { if (camera instanceof RecommendedCamera) hide(camera); });
cameras.map(function(camera) { if (camera instanceof Recommendation) hide(camera); });
// Update transparent elements
THREEx.Transparency.update(cameras.mainCamera());

2
js/l3d/apps/prototype/replay/main.js vendored
View File

@@ -71,7 +71,7 @@ function init() {
container.appendChild(renderer.domElement);
// Initialize pointer camera
var camera1 = new ReplayCamera(50, container_size.width() / container_size.height(), 0.01, 100000, coins);
var camera1 = new L3D.ReplayCamera(50, container_size.width() / container_size.height(), 0.01, 100000, coins);
cameras = initMainScene(camera1, scene, coins);
camera1.cameras = cameras;

58
js/l3d/apps/prototype/tutorial/TutoCamera.js vendored
View File

@@ -41,7 +41,7 @@ var TutoCamera = function() {
this.raycaster = new THREE.Raycaster();
// Create history object
this.history = new History();
this.history = new L3D.History();
// Set events from the document
var self = this;
@@ -75,8 +75,6 @@ var TutoCamera = function() {
this.collisions = true;
this.resetElements = resetBobombElements();
// Create tutorial
this.tutorial = new TutorialSteps(this, scene, coins, this.onWindowResize, container_size);
@@ -169,14 +167,14 @@ TutoCamera.prototype.update = function(time) {
};
TutoCamera.prototype.linearMotion = function(time) {
var position_direction = Tools.diff(this.new_position, this.position);
var target_direction = Tools.diff(this.new_target, this.target);
var position_direction = L3D.Tools.diff(this.new_position, this.position);
var target_direction = L3D.Tools.diff(this.new_target, this.target);
this.position.add(Tools.mul(position_direction, 0.05 * time / 20));
this.target.add(Tools.mul(target_direction, 0.05 * time / 20));
this.position.add(L3D.Tools.mul(position_direction, 0.05 * time / 20));
this.target.add(L3D.Tools.mul(target_direction, 0.05 * time / 20));
if (Tools.norm2(Tools.diff(this.position, this.new_position)) < 0.01 &&
Tools.norm2(Tools.diff(this.target, this.new_target)) < 0.01) {
if (L3D.Tools.norm2(L3D.Tools.diff(this.position, this.new_position)) < 0.01 &&
L3D.Tools.norm2(L3D.Tools.diff(this.target, this.new_target)) < 0.01) {
this.moving = false;
this.anglesFromVectors();
}
@@ -188,7 +186,7 @@ TutoCamera.prototype.hermiteMotion = function(time) {
this.position.y = e.y;
this.position.z = e.z;
this.target = Tools.sum(this.position, this.hermiteAngles.eval(this.t));
this.target = L3D.Tools.sum(this.position, this.hermiteAngles.eval(this.t));
this.t += 0.01 * time / 20;
@@ -238,18 +236,18 @@ TutoCamera.prototype.normalMotion = function(time) {
var direction = new THREE.Vector3();
if (this.motion.boost) speed *= 10;
if (this.motion.moveForward) {direction.add(Tools.mul(forward, speed)); this.changed = true;}
if (this.motion.moveBackward) {direction.sub(Tools.mul(forward, speed)); this.changed = true;}
if (this.motion.moveLeft) {direction.add(Tools.mul(left, speed)); this.changed = true;}
if (this.motion.moveRight) {direction.sub(Tools.mul(left, speed)); this.changed = true;}
if (this.motion.moveForward) {direction.add(L3D.Tools.mul(forward, speed)); this.changed = true;}
if (this.motion.moveBackward) {direction.sub(L3D.Tools.mul(forward, speed)); this.changed = true;}
if (this.motion.moveLeft) {direction.add(L3D.Tools.mul(left, speed)); this.changed = true;}
if (this.motion.moveRight) {direction.sub(L3D.Tools.mul(left, speed)); this.changed = true;}
var collide = this.isColliding(direction);
if (this.collisions && collide) {
var face = collide.face;
var vertices = collide.object.geometry.vertices;
var normal = Tools.cross(Tools.diff(vertices[face.b], vertices[face.a]), Tools.diff(vertices[face.c], vertices[face.a])).normalize();
var normal = L3D.Tools.cross(L3D.Tools.diff(vertices[face.b], vertices[face.a]), L3D.Tools.diff(vertices[face.c], vertices[face.a])).normalize();
if (Tools.dot(normal, direction) > 0) {
if (L3D.Tools.dot(normal, direction) > 0) {
normal.multiplyScalar(-1);
}
@@ -272,7 +270,7 @@ TutoCamera.prototype.reset = function() {
this.resetPosition();
this.moving = false;
this.movingHermite = false;
(new BD.Event.ResetClicked()).send();
(new L3D.BD.Event.ResetClicked()).send();
this.previousTheta = this.theta;
this.previousPhi = this.phi;
@@ -296,7 +294,7 @@ TutoCamera.prototype.vectorsFromAngles = function() {
};
TutoCamera.prototype.anglesFromVectors = function() {
var forward = Tools.diff(this.target, this.position);
var forward = L3D.Tools.diff(this.target, this.position);
forward.normalize();
this.phi = Math.asin(forward.y);
@@ -315,8 +313,8 @@ TutoCamera.prototype.move = function(otherCamera, toSave) {
this.new_position = otherCamera.position.clone();
var t = [0,1];
var f = [this.position.clone(), this.new_position];
var fp = [Tools.diff(this.target, this.position), Tools.diff(this.new_target, this.new_position)];
this.hermite = new Hermite.Polynom(t,f,fp);
var fp = [L3D.Tools.diff(this.target, this.position), L3D.Tools.diff(this.new_target, this.new_position)];
this.hermite = new L3D.Hermite.Polynom(t,f,fp);
this.t = 0;
if (toSave) {
@@ -339,15 +337,15 @@ TutoCamera.prototype.moveHermite = function(otherCamera, toSave) {
this.movingHermite = true;
this.t = 0;
this.hermitePosition = new Hermite.special.Polynom(
this.hermitePosition = new L3D.Hermite.special.Polynom(
this.position.clone(),
otherCamera.position.clone(),
Tools.mul(Tools.diff(otherCamera.target, otherCamera.position).normalize(),4)
L3D.Tools.mul(L3D.Tools.diff(otherCamera.target, otherCamera.position).normalize(),4)
);
this.hermiteAngles = new Hermite.special.Polynom(
Tools.diff(this.target, this.position),
Tools.diff(otherCamera.target, otherCamera.position),
this.hermiteAngles = new L3D.Hermite.special.Polynom(
L3D.Tools.diff(this.target, this.position),
L3D.Tools.diff(otherCamera.target, otherCamera.position),
new THREE.Vector3()
);
@@ -365,7 +363,7 @@ TutoCamera.prototype.isColliding = function(direction) {
var intersects = this.raycaster.intersectObjects(this.collidableObjects, true);
for (var i in intersects) {
if (intersects[i].distance < Tools.norm(direction) + this.speed * 300 &&
if (intersects[i].distance < L3D.Tools.norm(direction) + this.speed * 300 &&
intersects[i].object.raycastable) {
return intersects[i];
}
@@ -430,7 +428,7 @@ TutoCamera.prototype.onKeyEvent = function(event, toSet) {
if (motionJsonCopy != JSON.stringify(this.motion)) {
// Log any change
var e = new BD.Event.KeyboardEvent();
var e = new L3D.BD.Event.KeyboardEvent();
e.camera = this;
e.send();
}
@@ -498,7 +496,7 @@ TutoCamera.prototype.onMouseUp = function(event) {
// Send log to DB
if (this.dragging && this.mouseMoved && !this.moving && !this.movingHermite) {
var e = new BD.Event.KeyboardEvent();
var e = new L3D.BD.Event.KeyboardEvent();
e.camera = this;
e.send();
}
@@ -521,7 +519,7 @@ TutoCamera.prototype.save = function() {
TutoCamera.prototype.undo = function() {
var move = this.history.undo();
if (move !== undefined) {
var event = new BD.Event.PreviousNextClicked();
var event = new L3D.BD.Event.PreviousNextClicked();
event.previous = true;
event.camera = move;
event.send();
@@ -533,7 +531,7 @@ TutoCamera.prototype.undo = function() {
TutoCamera.prototype.redo = function() {
var move = this.history.redo();
if (move !== undefined) {
var event = new BD.Event.PreviousNextClicked();
var event = new L3D.BD.Event.PreviousNextClicked();
event.previous = false;
event.camera = move;
event.send();

4
js/l3d/apps/prototype/tutorial/TutorialSteps.js vendored
View File

@@ -148,7 +148,7 @@ TutorialSteps.prototype.nextStep = function() {
});
break;
case 14:
var cam = createPeachCameras(this.container_size.width(), this.container_size.height())[2];
var cam = L3D.createPeachCameras(this.container_size.width(), this.container_size.height())[2];
this.cameras.push(cam);
cam.addToScene(this.scene);
this.camera.move({
@@ -157,7 +157,7 @@ TutorialSteps.prototype.nextStep = function() {
});
break;
case 16:
var cams = createPeachCameras(this.container_size.width(), this.container_size.height());
var cams = L3D.createPeachCameras(this.container_size.width(), this.container_size.height());
for (var i = 0; i < cams.length; i == 1 ? i+=2 : i++) {
this.cameras.push(cams[i]);
cams[i].addToScene(this.scene);

18
js/l3d/apps/prototype/tutorial/main.js vendored
View File

@@ -36,7 +36,7 @@ function init() {
scene = new THREE.Scene();
// Disable log for this time
BD.disable();
L3D.BD.disable();
// Collidable objects to prevent camera from traversing objects
var collidableObjects = [];
@@ -52,7 +52,7 @@ function init() {
renderer.setClearColor(0x87ceeb);
// Initialize previewer
previewer = new Previewer(renderer, scene);
previewer = new L3D.Previewer(renderer, scene);
previewer.domElement.style.position ="absolute";
previewer.domElement.style.cssFloat = 'top-left';
previewer.domElement.width = container_size.width();
@@ -67,12 +67,12 @@ function init() {
var camera1 = new TutoCamera(50, container_size.width() / container_size.height(), 0.01, 100000, renderer, scene, onWindowResize, container_size, coins, container);
// Initialize pointer for pointer lock
var pointer = new MousePointer(camera1);
var pointer = new L3D.MousePointer(camera1);
pointer.domElement.width = container_size.width();
pointer.domElement.height = container_size.height();
//
var startCanvas = new StartCanvas(camera1);
var startCanvas = new L3D.StartCanvas(camera1);
startCanvas.domElement.width = container_size.width();
startCanvas.domElement.height = container_size.height();
startCanvas.render();
@@ -88,11 +88,11 @@ function init() {
// Initialize pointer camera
tutorial = camera1.tutorial;
cameras = new CameraContainer(camera1, []);
cameras = new L3D.CameraContainer(camera1, []);
tutorial.setCameras(cameras);
// Load peach scene
initPeach(camera1, scene);
L3D.initPeach(camera1, scene);
initListeners();
@@ -124,7 +124,7 @@ function initListeners() {
buttonManager = new ButtonManager(cameras, previewer);
// Camera selecter for hover and clicking recommendations
cameraSelecter = new CameraSelecter(renderer, scene, cameras, coins, buttonManager);
cameraSelecter = new L3D.CameraSelecter(renderer, scene, cameras, coins, buttonManager);
}
@@ -134,7 +134,7 @@ function render() {
// Update recommendations (set raycastable if shown)
var transform = buttonManager.showArrows ? show : hide;
cameras.map(function(camera) {
if (camera instanceof RecommendedCamera) {
if (camera instanceof Recommendation) {
transform(camera);
camera.traverse(function(elt) {
@@ -168,7 +168,7 @@ function render() {
previewer.clear();
// Hide arrows in recommendation
cameras.map(function(camera) { if (camera instanceof RecommendedCamera) hide(camera); });
cameras.map(function(camera) { if (camera instanceof Recommendation) hide(camera); });
// Render preview
previewer.render(cameraSelecter.prev, container_size.width(), container_size.height());

6
js/l3d/apps/stream-demo/main.js
View File

@@ -38,18 +38,18 @@ function init() {
scene.add(ambient_light);
// on initialise la camera que l’on place ensuite sur la scène
camera = new Camera(50, container_size.width / container_size.height, 1, 100000);
camera = new L3D.Camera(50, container_size.width / container_size.height, 1, 100000);
scene.add(camera);
window.addEventListener('resize', onWindowResize, false);
// Load the scene
// loader = new THREE.OBJLoader();
sphereLoader = new ProgressiveLoaderGeometry('/static/data/spheres/' + params.get.res + '.obj', scene, null);
sphereLoader = new L3D.ProgressiveLoaderGeometry('/static/data/spheres/' + params.get.res + '.obj', scene, null);
sphereLoader.load();
sphere = sphereLoader.obj;
plane = new Plane(1000,1000);
plane = new L3D.Plane(1000,1000);
plane.translate(0,0,-100);
plane.addToScene(scene);