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

Added animation on coin got

This commit is contained in:
Thomas FORGIONE 2015-07-07 10:19:49 +02:00
parent 24765a4687
commit edffd21eb7
4 changed files with 156 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,6 +89,22 @@ Coin.prototype.update = function() {
var self = this;
if (this.ready && this.rotating)
this.mesh.rotation.y += 0.1;
else if (this.got) {
if (this.mesh.material.opacity > 0.02) {
// First update
this.mesh.rotation.y += 0.3;
this.mesh.position.y += 0.05;
this.mesh.material.opacity -= 0.05;
} else {
this.mesh.visible = false;
}
}
};
Coin.prototype.get = function() {
@ -100,9 +116,12 @@ Coin.prototype.get = function() {
this.callback();
if (this.mesh) {
this.mesh.visible = false;
this.mesh.raycastable = false;
this.mesh.material = this.mesh.material.clone();
this.mesh.material.transparent = true;
this.mesh.material.opacity = 1;
}
Coin.total ++;
Coin.nextSound.play();
if (Coin.total === 9) {

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

@ -74,7 +74,6 @@ function init() {
// 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/src/cameras/PointerCamera.js
View File

@ -439,7 +439,7 @@ L3D.PointerCamera.prototype.move = function(recommendation, toSave) {
if (toSave === undefined)
toSave = true;
var otherCamera = recommendation.camera;
var otherCamera = recommendation.camera || recommendation;
this.moving = true;
this.new_target = otherCamera.target.clone();
@ -468,7 +468,7 @@ L3D.PointerCamera.prototype.moveHermite = function(recommendation, toSave) {
if (toSave === undefined)
toSave = true;
var otherCamera = recommendation.camera;
var otherCamera = recommendation.camera || recommendation;
this.movingHermite = true;
this.t = 0;

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

@ -8,7 +8,7 @@ L3D.addLight = function(scene) {
scene.add(ambient_light);
};
L3D.initPeachCastle = function(scene, collidableObjects, camera) {
L3D.initPeachCastle = function(scene, collidableObjects, recommendation) {
var loader = new L3D.ProgressiveLoader(
'/static/data/castle/princess peaches castle (outside).obj',
@ -40,26 +40,26 @@ L3D.resetPeachElements = function() {
};
};
L3D.initPeach = function(camera, scene, coins) {
L3D.initPeach = function(recommendation, scene, coins) {
L3D.addLight(scene);
var collidableObjects = [];
L3D.initPeachCastle(scene, collidableObjects, camera);
L3D.initPeachCastle(scene, collidableObjects, recommendation);
camera.resetElements = L3D.resetPeachElements();
camera.collidableObjects = collidableObjects;
recommendation.resetElements = L3D.resetPeachElements();
recommendation.collidableObjects = collidableObjects;
camera.speed = 0.001;
camera.reset();
camera.save();
recommendation.speed = 0.001;
recommendation.reset();
recommendation.save();
scene.add(camera);
scene.add(recommendation);
Coin.init(0.001);
var otherCams = [];
var cameras = otherCams;
var recommendations = [];
var recommendations = recommendations;
return cameras;
return recommendations;
};
L3D.initZeldaScene = function(scene, collidableObjects, loader) {
@ -91,10 +91,10 @@ L3D.initZeldaScene = function(scene, collidableObjects, loader) {
};
L3D.createPeachCameras = function(width, height) {
var cams = [];
L3D.createPeachRecommendations = function(width, height) {
var recos = [];
var createCamera = function(position, target) {
var createRecommendation = function(position, target) {
return new Recommendation(
50,
width / height,
@ -105,52 +105,52 @@ L3D.createPeachCameras = function(width, height) {
);
};
cams.push(createCamera(
recos.push(createRecommendation(
new THREE.Vector3(-3.349895207953063, 5.148106346852601, 0.3365943929701533),
new THREE.Vector3(13.114421714865292, -7.783476327687569, -33.74713248359852)
));
cams.push(createCamera(
recos.push(createRecommendation(
new THREE.Vector3(4.659399030971226, 1.018674883050052597, -2.578139604982815),
new THREE.Vector3(-16.08800293200113, -28.8795632312717, -19.165379404919797)
));
cams.push(createCamera(
recos.push(createRecommendation(
new THREE.Vector3(2.625389073616235, 1.2252620948239699, -4.818718135555419),
new THREE.Vector3(-19.756833131355208, -16.20027570329664, -33.02132017177813)
));
// cams.push(createCamera(
// recos.push(createRecommendation(
// new THREE.Vector3(1.3304975149911331, 0.4836093721106701, -8.60618907952783),
// new THREE.Vector3(-1.7713635815431914, 6.271997833695163, -48.06341930106774)
// ));
// cams.push(createCamera(
// recos.push(createRecommendation(
// new THREE.Vector3(1.2976081760482443, 1.1520399813234647, -10.258148122402845),
// new THREE.Vector3(-26.00651734173549, -9.19681009597505, -37.596510029925945)
// ));
cams.push(createCamera(
recos.push(createRecommendation(
new THREE.Vector3(0.15727187830660858, 2.7251137440572855, -5.84333603646124),
new THREE.Vector3(19.33738702531091, -13.614383891308975, -36.91010284556961)
));
cams.push(createCamera(
recos.push(createRecommendation(
new THREE.Vector3(-3.912436457101955,1.4571795397310319,-7.361700012948173),
new THREE.Vector3(26.60153755572943,-12.280244389383581,-29.274722938506393)
));
cams.push(createCamera(
recos.push(createRecommendation(
new THREE.Vector3(4.734058048040269,0.9171350442568073,0.12604632828978296),
new THREE.Vector3(25.163187055614348,-27.08137327531798,-19.842284094421995)
));
cams.forEach(function(cam) {cam.setSize(0.2);});
recos.forEach(function(reco) {reco.setSize(0.2);});
return cams;
return recos;
};
L3D.initBobombScene = function(scene, collidableObjects, camera) {
L3D.initBobombScene = function(scene, collidableObjects, recommendation) {
var loader = new L3D.ProgressiveLoader(
'/static/data/bobomb/bobomb battlefeild.obj',
@ -198,10 +198,10 @@ L3D.createBobombCoins = function() {
return coins;
};
L3D.createBobombCameras = function(width, height) {
var cams = [];
L3D.createBobombRecommendations = function(width, height) {
var recos = [];
var createCamera = function(position, target) {
var createRecommendation = function(position, target) {
return new Recommendation(
50,
width / height,
@ -212,71 +212,71 @@ L3D.createBobombCameras = function(width, height) {
);
};
cams.push(
createCamera(
recos.push(
createRecommendation(
new THREE.Vector3(37.24445046448742,17.56004329173052,-13.432945825465112),
new THREE.Vector3(15.446296842638255,0.7142524861838169,15.568085721947512)
),
createCamera(
createRecommendation(
new THREE.Vector3(-24.10987782946019,26.75997424452833,-24.7814217620827),
new THREE.Vector3(-13.724964120740987,14.939165978074758,11.993869660150779)
),
createCamera(
createRecommendation(
new THREE.Vector3(7.162458619916293,18.414234017280627,-10.871480453809644),
new THREE.Vector3(-27.47061192698706,3.9199238382137196,2.9294396939998144)
),
createCamera(
createRecommendation(
new THREE.Vector3(19.741775033926334,14.132046557015727,-25.338452829449857),
new THREE.Vector3(-18.0898892760213,1.5191520612050162,-28.449733590966297)
),
createCamera(
createRecommendation(
new THREE.Vector3(-13.484471970922971,20.25938194278451,-30.850247430073622),
new THREE.Vector3(-42.04654352929252,-7.608886431102082,-28.099304657929874)
),
createCamera(
createRecommendation(
new THREE.Vector3(23.58849177613168,18.628351213754488,31.516769692916675),
new THREE.Vector3(8.319765065757787,-0.5486703304136178,-0.09189730426033549)
),
createCamera(
createRecommendation(
new THREE.Vector3(5.068708131530766,11.201320390433953,9.77462743108436),
new THREE.Vector3(9.20744154720096,3.8549750522404134,48.87580511010085)
),
createCamera(
createRecommendation(
new THREE.Vector3(4.18086580540298,16.54831275414988,29.96253548469186),
new THREE.Vector3(-17.059296481928556,3.408610856102113,-1.2817238286325505)
),
createCamera(
createRecommendation(
new THREE.Vector3(-44.56340663230823,22.567957426093283,14.856920056929788),
new THREE.Vector3(-20.052660826451827,7.556450599683849,42.67558290835663)
),
createCamera(
createRecommendation(
new THREE.Vector3(11.29580093093769,15.03666008708929,31.377195488571406),
new THREE.Vector3(-28.288314738873957,13.648654387264967,25.794075678265735)
),
createCamera(
createRecommendation(
new THREE.Vector3(28.438969076366728,18.888756501203087,26.694456000440766),
new THREE.Vector3(-5.369166248035665,2.54925886583683,12.909289954623416)
)
);
return cams;
return recos;
};
L3D.initBobomb = function(camera, scene, coins) {
L3D.initBobomb = function(recommendation, scene, coins) {
L3D.addLight(scene);
var collidableObjects = [];
L3D.initBobombScene(scene, collidableObjects, camera);
L3D.initBobombScene(scene, collidableObjects, recommendation);
camera.resetElements = L3D.resetBobombElements();
camera.collidableObjects = collidableObjects;
recommendation.resetElements = L3D.resetBobombElements();
recommendation.collidableObjects = collidableObjects;
camera.speed = 0.005;
camera.reset();
camera.save();
recommendation.speed = 0.005;
recommendation.reset();
recommendation.save();
scene.add(camera);
scene.add(recommendation);
Coin.init();
var tmp = L3D.createBobombCoins();
@ -285,17 +285,17 @@ L3D.initBobomb = function(camera, scene, coins) {
coins.push(tmp[i]);
}
var otherCams = L3D.createBobombCameras(container_size.width(), container_size.height());
var cameras = otherCams;
var recommendations = L3D.createBobombRecommendations(container_size.width(), container_size.height());
var recommendations = recommendations;
otherCams.forEach(function(cam) {cam.addToScene(scene);});
recommendations.forEach(function(reco) {reco.addToScene(scene);});
setTimeout(function() { coins.forEach(function(coin) { coin.addToScene(scene); });}, 1000);
return cameras;
return recommendations;
};
L3D.initWhompScene = function(scene, collidableObjects, camera) {
L3D.initWhompScene = function(scene, collidableObjects, recommendation) {
var loader = new L3D.ProgressiveLoader(
'/static/data/whomp/Whomps Fortress.obj',
@ -325,8 +325,8 @@ L3D.initWhompScene = function(scene, collidableObjects, camera) {
loader.obj.rotation.z = Math.PI/2;
loader.obj.scale.set(0.1,0.1,0.1);
// loader.getCamera = function() {
// var ret = loader.camera.toList();
// loader.getRecommendation = function() {
// var ret = loader.recommendation.toList();
// ret[0][0] *= 10;
// ret[0][1] *= 10;
// ret[0][2] *= 10;
@ -349,10 +349,10 @@ L3D.initWhompScene = function(scene, collidableObjects, camera) {
loader.obj.raycastable = true;
};
L3D.createWhompCameras = function(width, height) {
var cams = [];
L3D.createWhompRecommendations = function(width, height) {
var recos = [];
var createCamera = function(position, target) {
var createRecommendation = function(position, target) {
return new Recommendation(
50,
width / height,
@ -363,56 +363,56 @@ L3D.createWhompCameras = function(width, height) {
);
};
cams.push(
createCamera(
recos.push(
createRecommendation(
new THREE.Vector3(-5.4336754204569345,3.1392444908865986,-2.5523620854280967),
new THREE.Vector3(-5.284005453263061, 2.9591143163290674, 1.440776031533807)
),
createCamera(
createRecommendation(
new THREE.Vector3(-6.1753139246999424,3.1460450777755153, 8.89776989593906),
new THREE.Vector3(-2.7026837603414037,3.365743354536376, 6.924809579871983)
),
createCamera(
createRecommendation(
new THREE.Vector3(-5.4975217973818246,7.726911253355844, 2.805487210952553),
new THREE.Vector3(-2.262483559754942, 5.4847179687372005, 2.0933798626524435)
),
createCamera(
createRecommendation(
new THREE.Vector3(767.5978415761134, 3.641765617950047, -6.734909128840316),
new THREE.Vector3(800.1643232028776, 2.192334600043356, -3.0210038861375168)
),
createCamera(
createRecommendation(
new THREE.Vector3(-4.521868295112849, 4.598285007581405, -7.186164895937964),
new THREE.Vector3(-1.2890361546656827,2.964335244044779, -5.489401941978159)
),
createCamera(
createRecommendation(
new THREE.Vector3(7.669185389234946,3.470810613964853,-7.254996785427332),
new THREE.Vector3(11.103044107444248,-8.414196017364398,30.78386796730468)
),
createCamera(
createRecommendation(
new THREE.Vector3(-5.00642950829277,7.5887626003253095,-5.785306379113327),
new THREE.Vector3(30.922081744183423,1.5447833064028265,10.725671589357493)
),
createCamera(
createRecommendation(
new THREE.Vector3(10.73348160390988,7.384861575888838,-5.156956944727774),
new THREE.Vector3(-17.904597948771446,1.3408822819663548,22.107135078094704)
),
createCamera(
createRecommendation(
new THREE.Vector3(6.571383420547652,6.592495890455599,8.530692470963302),
new THREE.Vector3(-17.04673536396069,6.525278678835147,-23.752119471730232)
),
createCamera(
createRecommendation(
new THREE.Vector3(-2.658378348430724,9.934059833300438,4.832483419920441),
new THREE.Vector3(31.687909225501116,1.921420479172772,-14.038927244612823)
),
createCamera(
createRecommendation(
new THREE.Vector3(0.32263636932421563,14.77110426329107,-4.846281929349468),
new THREE.Vector3(13.444429209246985,-2.688018079059324,28.664874417470223)
)
);
cams.forEach(function(cam) {cam.setSize(0.2);});
return cams;
recos.forEach(function(reco) {reco.setSize(0.2);});
return recos;
};
L3D.createWhompCoins = function() {
@ -435,20 +435,20 @@ L3D.resetWhompElements = function() {
};
};
L3D.initWhomp = function(camera, scene, coins) {
L3D.initWhomp = function(recommendation, scene, coins) {
L3D.addLight(scene);
var collidableObjects = [];
L3D.initWhompScene(scene, collidableObjects, camera);
L3D.initWhompScene(scene, collidableObjects, recommendation);
camera.resetElements = L3D.resetWhompElements();
camera.collidableObjects = collidableObjects;
recommendation.resetElements = L3D.resetWhompElements();
recommendation.collidableObjects = collidableObjects;
camera.speed = 0.002;
camera.reset();
camera.save();
recommendation.speed = 0.002;
recommendation.reset();
recommendation.save();
scene.add(camera);
scene.add(recommendation);
Coin.init(0.002);
var tmp = L3D.createWhompCoins();
@ -457,17 +457,17 @@ L3D.initWhomp = function(camera, scene, coins) {
coins.push(tmp[i]);
}
var otherCams = L3D.createWhompCameras(container_size.width(), container_size.height());
var cameras = otherCams;
var recommendations = L3D.createWhompRecommendations(container_size.width(), container_size.height());
var recommendations = recommendations;
otherCams.forEach(function(cam) {cam.addToScene(scene);});
recommendations.forEach(function(reco) {reco.addToScene(scene);});
setTimeout(function() { coins.forEach(function(coin) { coin.addToScene(scene); });}, 1000);
return cameras;
return recommendations;
};
L3D.initMountainScene = function(scene, collidableObjects, camera) {
L3D.initMountainScene = function(scene, collidableObjects, recommendation) {
var loader = new L3D.ProgressiveLoader(
'/static/data/mountain/coocoolmountain.obj',
@ -512,10 +512,10 @@ L3D.createMountainCoins = function() {
];
};
L3D.createMountainCameras = function(width, height) {
var cams = [];
L3D.createMountainRecommendations = function(width, height) {
var recos = [];
var createCamera = function(position, target) {
var createRecommendation = function(position, target) {
return new Recommendation(
50,
width / height,
@ -526,58 +526,58 @@ L3D.createMountainCameras = function(width, height) {
);
};
cams.push(
createCamera(
recos.push(
createRecommendation(
new THREE.Vector3(6.390950470631724,17.280677948120072,-10.027673035476619),
new THREE.Vector3(3.407145269707846,3.751012364771242,27.496253407869986)
),
createCamera(
createRecommendation(
new THREE.Vector3(1.8218030281265742,12.868464705566172,23.225042509186405),
new THREE.Vector3(-35.819191507045865,-0.6612008777826581,22.903049332448994)
),
createCamera(
createRecommendation(
new THREE.Vector3(-16.540494685269973,13.110251646113246,22.542769963619342),
new THREE.Vector3(-27.881799604553773,-2.2838398465862237,-12.59121287126898)
),
createCamera(
createRecommendation(
new THREE.Vector3(-22.09255502589394,7.505905597711714,-15.23412829383532),
new THREE.Vector3(14.823279525934556,-4.1255169584417315,-5.138031589552474)
),
createCamera(
createRecommendation(
new THREE.Vector3(-21.665778251110755,4.241815926756635,40.76683432842355),
new THREE.Vector3(2.62922954212112,-7.389606629396811,11.19552043054259)
),
createCamera(
createRecommendation(
new THREE.Vector3(14.384899444452842,4.759647095537105,30.122662109900055),
new THREE.Vector3(25.246471433793317,-6.871775460616339,-6.575243324069596)
),
createCamera(
createRecommendation(
new THREE.Vector3(20.6728438093429,-14.408979127185429,18.889993476410144),
new THREE.Vector3(-13.929780518638935,-26.04040168333887,35.241397053374556)
),
createCamera(
createRecommendation(
new THREE.Vector3(-26.825730322260814,-17.21406097233303,33.188195206615795),
new THREE.Vector3(-12.326126408723896,-17.015972902810617,-4.090783420316271)
),
createCamera(
createRecommendation(
new THREE.Vector3(-41.2311561559715,-11.714721125315961,2.070220579408691),
new THREE.Vector3(-2.2066012462800373,-15.510910369724881,9.986852522420207)
),
createCamera(
createRecommendation(
new THREE.Vector3(24.92926976320075,-11.374119469227288,-21.440813349326792),
new THREE.Vector3(-7.328902834025087,-24.90378505257612,-2.040853300647978)
),
createCamera(
createRecommendation(
new THREE.Vector3(-18.733128013636136,-12.129585933653297,-31.983290996466735),
new THREE.Vector3(-1.6636179852017818,-25.659251517002126,1.566373332583197)
),
createCamera(
createRecommendation(
new THREE.Vector3(-20.627345017019206,22.028686074349515,20.541790520954777),
new THREE.Vector3(14.150384161446272,11.731784408247087,3.6751557271398525)
)
);
return cams;
return recos;
};
L3D.resetMountainElements = function() {
@ -587,20 +587,20 @@ L3D.resetMountainElements = function() {
};
};
L3D.initMountain = function(camera, scene, coins) {
L3D.initMountain = function(recommendation, scene, coins) {
L3D.addLight(scene);
var collidableObjects = [];
L3D.initMountainScene(scene, collidableObjects, camera);
L3D.initMountainScene(scene, collidableObjects, recommendation);
camera.resetElements = L3D.resetMountainElements();
camera.collidableObjects = collidableObjects;
recommendation.resetElements = L3D.resetMountainElements();
recommendation.collidableObjects = collidableObjects;
camera.speed = 0.005;
camera.reset();
camera.save();
recommendation.speed = 0.005;
recommendation.reset();
recommendation.save();
scene.add(camera);
scene.add(recommendation);
Coin.init();
var tmp = L3D.createMountainCoins();
@ -609,21 +609,21 @@ L3D.initMountain = function(camera, scene, coins) {
coins.push(tmp[i]);
}
var otherCams = L3D.createMountainCameras(container_size.width(), container_size.height());
var cameras = otherCams;
var recommendations = L3D.createMountainRecommendations(container_size.width(), container_size.height());
var recommendations = recommendations;
otherCams.forEach(function(cam) {cam.addToScene(scene);});
recommendations.forEach(function(reco) {reco.addToScene(scene);});
setTimeout(function() { coins.forEach(function(coin) { coin.addToScene(scene); });}, 1000);
return cameras;
return recommendations;
};
L3D.initSponzaScene = function(scene, collidableObjects, camera) {
L3D.initSponzaScene = function(scene, collidableObjects, recommendation) {
var loader = new L3D.ProgressiveLoader(
'/static/data/sponza/sponza.obj',
scene,
camera,
recommendation,
function(obj) {
if (obj.material.name === 'chain' ||
obj.material.name === 'leaf' ||
@ -642,8 +642,8 @@ L3D.initSponzaScene = function(scene, collidableObjects, camera) {
loader.load();
loader.getCamera = function() {
var ret = loader.camera.toList();
loader.getRecommendation = function() {
var ret = loader.recommendation.toList();
ret[0][0] *= 10;
ret[0][1] *= 10;
ret[0][2] *= 10;
@ -690,7 +690,7 @@ L3D.createSponzaCoins = function() {
return [];
};
L3D.createSponzaCameras = function() {
L3D.createSponzaRecommendations = function() {
return [];
};
@ -701,21 +701,21 @@ L3D.resetSponzaElements = function() {
};
};
L3D.initSponza = function(camera, scene, coins) {
L3D.initSponza = function(recommendation, scene, coins) {
L3D.addLight(scene);
var collidableObjects = [];
L3D.initSponzaScene(scene, collidableObjects, camera);
L3D.initSponzaScene(scene, collidableObjects, recommendation);
camera.resetElements = L3D.resetSponzaElements();
camera.collidableObjects = collidableObjects;
recommendation.resetElements = L3D.resetSponzaElements();
recommendation.collidableObjects = collidableObjects;
camera.speed = 0.05;
camera.reset();
camera.save();
recommendation.speed = 0.05;
recommendation.reset();
recommendation.save();
scene.add(camera);
scene.add(recommendation);
Coin.init();
var tmp = L3D.createSponzaCoins();
@ -724,14 +724,14 @@ L3D.initSponza = function(camera, scene, coins) {
coins.push(tmp[i]);
}
var otherCams = L3D.createSponzaCameras(container_size.width(), container_size.height());
var cameras = otherCams;
var recommendations = L3D.createSponzaRecommendations(container_size.width(), container_size.height());
var recommendations = recommendations;
otherCams.forEach(function(cam) {cam.addToScene(scene);});
recommendations.forEach(function(reco) {reco.addToScene(scene);});
setTimeout(function() { coins.forEach(function(coin) { coin.addToScene(scene); });}, 1000);
return cameras;
return recommendations;
};