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

Optimization attempt

Browse Source
This commit is contained in:
Thomas FORGIONE 2015-06-10 14:48:11 +02:00
parent 0272477503
commit 34b312ae3b
2 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
js/ProgressiveLoader.js
View File

@ -26,6 +26,10 @@ var ProgressiveLoader = function(res, scene) {
// When receiving elements // When receiving elements
socket.on('elements', function(arr) { socket.on('elements', function(arr) {
if (!finished) {
socket.emit('next');
}
// Launch this code in async // Launch this code in async
setTimeout(function() { setTimeout(function() {
@ -78,34 +82,19 @@ var ProgressiveLoader = function(res, scene) {
} }
mesh.geometry.computeFaceNormals(); mesh.geometry.computeFaceNormals();
mesh.geometry.groupsNeedUpdate = true; mesh.geometry.groupsNeedUpdate = true;
mesh.geometry.elementsNeedUpdate = true; mesh.geometry.elementsNeedUpdate = true;
mesh.geometry.normalsNeedUpdate = true; mesh.geometry.normalsNeedUpdate = true;
if (!finished) {
socket.emit('next');
} else {
console.log("Finished");
}
},0); },0);
}); });
socket.on('finished', function(arg) { socket.on('disconnect', function() {
console.log("Finished");
finished = true; finished = true;
mesh.faceNumber = arg;
//mesh.geometry.computeFaceNormals();
mesh.geometry.verticesNeedUpdate = true;
mesh.geometry.groupsNeedUpdate = true;
mesh.geometry.elementsNeedUpdate = true;
mesh.geometry.morphTargetsNeedUpdate = true;
mesh.geometry.uvsNeedUpdate = true;
mesh.geometry.normalsNeedUpdate = true;
mesh.geometry.colorsNeedUpdate = true;
mesh.geometry.tangentsNeedUpdate = true;
// scene.add(mesh);
}); });
return mesh; return mesh;

15
socket.js
View File

@ -39,9 +39,9 @@ module.exports = function(io) {
// console.log(socket.conn.remoteAddress + " connected !"); // console.log(socket.conn.remoteAddress + " connected !");
// socket.on('disconnect', function() { socket.on('disconnect', function() {
// console.log(socket.conn.remoteAddress + " disconnected !"); console.log(socket.conn.remoteAddress + " disconnected !");
// }); });
socket.on("request", function(res) { socket.on("request", function(res) {
// console.log('Asking for static/data/spheres/' + res + '.obj'); // console.log('Asking for static/data/spheres/' + res + '.obj');
@ -70,12 +70,15 @@ module.exports = function(io) {
line = lines[++index]; line = lines[++index];
} }
} }
if (!line) {
socket.emit('finished');
}
socket.emit('elements', toSend); socket.emit('elements', toSend);
if (!line) {
// socket.emit('finished');
socket.disconnect();
}
}); });
}); });
}); });