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

Did stuff

Browse Source
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
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);