Some stuff
This commit is contained in:
parent
5ba5f57261
commit
6242e6f122
|
@ -239,14 +239,15 @@ geo.MeshStreamer.prototype.start = function(socket) {
|
|||
console.log('Asking for ' + path);
|
||||
|
||||
var regex = /.*\.\..*/;
|
||||
var filePath = path.substring(1, path.length);
|
||||
|
||||
if (regex.test(path)) {
|
||||
if (regex.test(filePath)) {
|
||||
socket.emit('refused');
|
||||
socket.disconnect();
|
||||
return;
|
||||
}
|
||||
|
||||
self.loadFromFile(path, function() {
|
||||
self.loadFromFile(filePath, function() {
|
||||
socket.emit('ok');
|
||||
});
|
||||
|
||||
|
|
|
@ -166,8 +166,8 @@ PointerCamera.prototype.normalMotion = function(time) {
|
|||
if (this.motion.decreaseTheta) {this.theta -= this.sensitivity * time / 20; this.changed = true; }
|
||||
|
||||
if ( this.pointerLocked || this.dragging) {
|
||||
this.theta += this.mouseMove.x * time / 20;
|
||||
this.phi -= this.mouseMove.y * time / 20;
|
||||
this.theta += this.mouseMove.x * 20 / time;
|
||||
this.phi -= this.mouseMove.y * 20 / time;
|
||||
|
||||
this.mouseMove.x = 0;
|
||||
this.mouseMove.y = 0;
|
||||
|
|
|
@ -67,7 +67,7 @@ var _parseList2 = function(arr) {
|
|||
var ProgressiveLoaderGeometry = function(path, scene, camera, callback) {
|
||||
|
||||
// Init attributes
|
||||
this.objPath = path.substring(1, path.length);
|
||||
this.objPath = path;
|
||||
this.texturesPath = path.substring(0, path.lastIndexOf('/')) + '/';
|
||||
this.mtlPath = path.replace('.obj', '.mtl');
|
||||
this.scene = scene;
|
||||
|
|
Loading…
Reference in New Issue