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

Corrected makefile (for server to start) and re-enabled collisions

This commit is contained in:
Thomas FORGIONE 2016-01-11 16:45:05 +01:00
parent f338e4006b
commit d904a4a472
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
js/Makefile
View File

@ -35,6 +35,7 @@ L3D:
--js l3d/src/cameras/FixedCamera.js \ --js l3d/src/cameras/FixedCamera.js \
--js l3d/src/cameras/PointerCamera.js \ --js l3d/src/cameras/PointerCamera.js \
--js l3d/src/scenes/createCoins.js \ --js l3d/src/scenes/createCoins.js \
--js l3d/src/scenes/initScene.js \
--js_output_file ../static/js/l3d.min.js --js_output_file ../static/js/l3d.min.js
TestList: TestList:

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

@ -164,6 +164,7 @@ function initThreeElements() {
scene.addCoins(GLOB.coinConfig); scene.addCoins(GLOB.coinConfig);
camera1.collidableObjects = scene.collidableObjects; camera1.collidableObjects = scene.collidableObjects;
camera1.collisions = true;
// Get default param for camera lock // Get default param for camera lock
document.getElementById('lock').checked = GLOB.locked; document.getElementById('lock').checked = GLOB.locked;