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

Did stuff

This commit is contained in:
Thomas FORGIONE 2015-07-07 10:42:37 +02:00
parent edffd21eb7
commit 8fac6f9f9d
6 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
js/l3d/apps/prototype/Coin.js vendored
View File

@ -89,7 +89,8 @@ Coin.prototype.update = function() {
var self = this;
if (this.ready && this.rotating)
this.mesh.rotation.y += 0.1;
else if (this.got) {
if (this.got) {
if (this.mesh.material.opacity > 0.02) {
// First update
@ -115,12 +116,9 @@ Coin.prototype.get = function() {
if (this.callback)
this.callback();
if (this.mesh) {
this.mesh.material = this.mesh.material.clone();
this.mesh.material.transparent = true;
this.mesh.material.opacity = 1;
}
this.mesh.material = this.mesh.material.clone();
this.mesh.material.transparent = true;
this.mesh.material.opacity = 1;
Coin.total ++;
Coin.nextSound.play();

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

@ -68,12 +68,14 @@ function init() {
stats.domElement.style.cssFloat = "top-left";
// Add elements to page
container.appendChild(Coin.domElement);
container.appendChild( stats.domElement );
container.appendChild(renderer.domElement);
// Initialize pointer camera
camera1 = new L3D.ReplayCamera(50, container_size.width() / container_size.height(), 0.01, 100000, coins);
cameras = initMainScene(camera1, scene, coins);
camera1.cameras = cameras;
// Add listeners
initListeners();

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

@ -148,7 +148,7 @@ TutorialSteps.prototype.nextStep = function() {
});
break;
case 14:
var cam = L3D.createPeachCameras(this.container_size.width(), this.container_size.height())[2];
var cam = L3D.createPeachRecommendations(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 = L3D.createPeachCameras(this.container_size.width(), this.container_size.height());
var cams = L3D.createPeachRecommendations(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);

14
js/l3d/src/cameras/ReplayCamera.js
View File

@ -81,7 +81,7 @@ L3D.ReplayCamera.prototype.cameraMotion = function(time) {
L3D.ReplayCamera.prototype.hermiteMotion = function(time) {
var e = this.hermitePosition.eval(this.t);
this.position.copy(tmp);
this.position.copy(e);
this.target = L3D.Tools.sum(this.position, this.hermiteAngles.eval(this.t));
@ -114,7 +114,7 @@ L3D.ReplayCamera.prototype.nextEvent = function() {
},500);
})(this);
} else if (this.event.type == 'arrow') {
this.moveHermite(this.cameras.cameras[this.event.id]);
this.moveHermite(this.cameras[this.event.id]);
} else if (this.event.type == 'reset') {
this.reset();
(function (self) {
@ -164,7 +164,10 @@ L3D.ReplayCamera.prototype.anglesFromVectors = function() {
this.theta = Math.atan2(forward.x, forward.z);
};
L3D.ReplayCamera.prototype.move = function(otherCamera) {
L3D.ReplayCamera.prototype.move = function(recommendation) {
var otherCamera = recommendation.camera || recommendation;
this.moving = true;
this.old_target = this.target.clone();
this.old_position = this.position.clone();
@ -174,7 +177,10 @@ L3D.ReplayCamera.prototype.move = function(otherCamera) {
};
L3D.ReplayCamera.prototype.moveHermite = function(otherCamera) {
L3D.ReplayCamera.prototype.moveHermite = function(recommendation) {
var otherCamera = recommendation.camera || recommendation;
this.movingHermite = true;
this.t = 0;

5
js/l3d/src/scenes/initScene.js
View File

@ -57,7 +57,6 @@ L3D.initPeach = function(recommendation, scene, coins) {
Coin.init(0.001);
var recommendations = [];
var recommendations = recommendations;
return recommendations;
};
@ -286,7 +285,6 @@ L3D.initBobomb = function(recommendation, scene, coins) {
}
var recommendations = L3D.createBobombRecommendations(container_size.width(), container_size.height());
var recommendations = recommendations;
recommendations.forEach(function(reco) {reco.addToScene(scene);});
@ -458,7 +456,6 @@ L3D.initWhomp = function(recommendation, scene, coins) {
}
var recommendations = L3D.createWhompRecommendations(container_size.width(), container_size.height());
var recommendations = recommendations;
recommendations.forEach(function(reco) {reco.addToScene(scene);});
@ -610,7 +607,6 @@ L3D.initMountain = function(recommendation, scene, coins) {
}
var recommendations = L3D.createMountainRecommendations(container_size.width(), container_size.height());
var recommendations = recommendations;
recommendations.forEach(function(reco) {reco.addToScene(scene);});
@ -725,7 +721,6 @@ L3D.initSponza = function(recommendation, scene, coins) {
}
var recommendations = L3D.createSponzaRecommendations(container_size.width(), container_size.height());
var recommendations = recommendations;
recommendations.forEach(function(reco) {reco.addToScene(scene);});

6
js/l3d/src/utils/CameraSelecter.js
View File

@ -40,9 +40,9 @@ L3D.CameraSelecter.prototype.pointedCamera = function() {
// Looking for cameras
for (var i in intersects) {
if (intersects[i].object.raycastable && !(intersects[i].object instanceof THREE.Line)) {
if ((intersects[i].distance > 0.5 && minDistance === undefined) || (intersects[i].distance < minDistance )) {
if (!(intersects[i].object instanceof THREE.Mesh && intersects[i].object.material.opacity < 0.1)) {
if (intersects[i].object.raycastable) {
if ( minDistance === undefined || intersects[i].distance < minDistance ) {
if (intersects[i].object instanceof THREE.Mesh) {
minDistance = intersects[i].distance;
bestIndex = i;
}