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

Some commits

Browse Source
This commit is contained in:
Thomas FORGIONE
2016-01-04 09:29:13 +01:00
parent 9c1aca171f
commit fa1636ac8e
14 changed files with 706 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files
js/l3d/apps/prototype/GlobalFunctions.js
Vendored
+2 -1
View File
@@ -100,12 +100,13 @@ function objectClickerOnClick(camera1, buttonManager, recommendations, coins) {
} else if (obj instanceof L3D.BaseRecommendation) {
obj.check();
camera1.moveHermite(obj);
// Send event to DB
event = new L3D.DB.Event.ArrowClicked();
event.arrowId = recommendations.indexOf(obj);
event.send();
camera1.moveHermite(obj, undefined, event.arrowId);
}
// Update the button manager
js/l3d/apps/prototype/interactive/main.js
Vendored
+36 -10
View File
@@ -38,15 +38,15 @@ var pointer;
var startCanvas;
var loadingCanvas;
window.onbeforeunload = function() {
if (initMainScene !== L3D.initPeach && initMainScene !== L3D.initSponza && !($('#next').is(":visible"))) {
return 'Warning : you are going to leave the page and abort the current test !';
}
};
// window.onbeforeunload = function() {
//
// if (initMainScene !== L3D.initPeach && initMainScene !== L3D.initSponza && !($('#next').is(":visible"))) {
//
// return 'Warning : you are going to leave the page and abort the current test !';
//
// }
//
// };
var nextPage = '/prototype/play';
@@ -69,7 +69,7 @@ function main() {
initModels();
initListeners();
appendTo(container)(stats, Coin, startCanvas, pointer, previewer, loadingCanvas, renderer);
appendTo(container)(stats, Coin, startCanvas, pointer, previewer, /*loadingCanvas,*/ renderer);
// appendTo(container)(startCanvas, pointer, previewer, renderer);
// Set the good size of cameras
@@ -117,6 +117,32 @@ function initThreeElements() {
renderer = new THREE.WebGLRenderer({alpha:true, antialias:true});
renderer.setClearColor(0x87ceeb);
var loader = new THREE.OBJLoader();
loader.load(
'/static/data/coin/Coin.obj',
function(object) {
object.traverse(function (mesh) {
if (mesh instanceof THREE.Mesh) {
mesh.scale.set(0.01,0.01,0.01);
mesh.material.color.setHex(0xffff00);
mesh.geometry.computeVertexNormals();
mesh.raycastable = true;
mesh.position.copy(new THREE.Vector3(-23.85237224023958,12.30017484578007,2.883526209796364));
scene.add(mesh);
newMesh = mesh.clone();
newMesh.position.copy(new THREE.Vector3(-8.225753727064939,11.932703941399415,8.637544772060489));
scene.add(newMesh);
newMesh.position.copy(new THREE.Vector3(18.198980821370327,2.5219742652442885,10.741621475827422));
scene.add(newMesh);
}
});
}
);
// Initialize pointer camera
camera1 = new L3D.PointerCamera(
50,