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

Some stuff

This commit is contained in:
Thomas FORGIONE 2015-06-23 14:05:40 +02:00
parent 5ba5f57261
commit 6242e6f122
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
geo/MeshStreamer.js
View File

@ -239,14 +239,15 @@ geo.MeshStreamer.prototype.start = function(socket) {
console.log('Asking for ' + path); console.log('Asking for ' + path);
var regex = /.*\.\..*/; var regex = /.*\.\..*/;
var filePath = path.substring(1, path.length);
if (regex.test(path)) { if (regex.test(filePath)) {
socket.emit('refused'); socket.emit('refused');
socket.disconnect(); socket.disconnect();
return; return;
} }
self.loadFromFile(path, function() { self.loadFromFile(filePath, function() {
socket.emit('ok'); socket.emit('ok');
}); });

4
js/PointerCamera.js
View File

@ -166,8 +166,8 @@ PointerCamera.prototype.normalMotion = function(time) {
if (this.motion.decreaseTheta) {this.theta -= this.sensitivity * time / 20; this.changed = true; } if (this.motion.decreaseTheta) {this.theta -= this.sensitivity * time / 20; this.changed = true; }
if ( this.pointerLocked || this.dragging) { if ( this.pointerLocked || this.dragging) {
this.theta += this.mouseMove.x * time / 20; this.theta += this.mouseMove.x * 20 / time;
this.phi -= this.mouseMove.y * time / 20; this.phi -= this.mouseMove.y * 20 / time;
this.mouseMove.x = 0; this.mouseMove.x = 0;
this.mouseMove.y = 0; this.mouseMove.y = 0;

2
js/ProgressiveLoaderGeometry.js
View File

@ -67,7 +67,7 @@ var _parseList2 = function(arr) {
var ProgressiveLoaderGeometry = function(path, scene, camera, callback) { var ProgressiveLoaderGeometry = function(path, scene, camera, callback) {
// Init attributes // Init attributes
this.objPath = path.substring(1, path.length); this.objPath = path;
this.texturesPath = path.substring(0, path.lastIndexOf('/')) + '/'; this.texturesPath = path.substring(0, path.lastIndexOf('/')) + '/';
this.mtlPath = path.replace('.obj', '.mtl'); this.mtlPath = path.replace('.obj', '.mtl');
this.scene = scene; this.scene = scene;