heckyel/mediagoblin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disabled auto rotate

Browse Source
This commit is contained in:
Aeva Ntsc 2012-10-15 10:10:04 -05:00 committed by Christopher Allan Webber
parent 76918e52e0
commit 171dcbe3a8
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mediagoblin/static/js/thingiview.js/thingiview.js
View File

@ -391,6 +391,13 @@ Thingiview = function(containerId) {
return rotateTimer !== null; return rotateTimer !== null;
} }
this.resetRotation = function () {
if (rotate) {
this.setRotation(false);
this.setRotation(true);
}
}
this.setRotation = function(rotate) { this.setRotation = function(rotate) {
rotation = rotate; rotation = rotate;
@ -606,8 +613,7 @@ Thingiview = function(containerId) {
log("loading array..."); log("loading array...");
geometry = new STLGeometry(array); geometry = new STLGeometry(array);
loadObjectGeometry(); loadObjectGeometry();
scope.setRotation(false); scope.resetRotation();
scope.setRotation(true);
scope.centerCamera(); scope.centerCamera();
log("finished loading " + geometry.faces.length + " faces."); log("finished loading " + geometry.faces.length + " faces.");
} }
@ -626,8 +632,7 @@ Thingiview = function(containerId) {
progressBar.innerHTML = ''; progressBar.innerHTML = '';
progressBar.style.display = 'none'; progressBar.style.display = 'none';
scope.setRotation(false); scope.resetRotation();
scope.setRotation(true);
log("finished loading " + geometry.faces.length + " faces."); log("finished loading " + geometry.faces.length + " faces.");
scope.centerCamera(); scope.centerCamera();
} else if (event.data.status == "complete_points") { } else if (event.data.status == "complete_points") {
@ -657,8 +662,7 @@ Thingiview = function(containerId) {
progressBar.innerHTML = ''; progressBar.innerHTML = '';
progressBar.style.display = 'none'; progressBar.style.display = 'none';
scope.setRotation(false); scope.resetRotation();
scope.setRotation(true);
log("finished loading " + event.data.content[0].length + " points."); log("finished loading " + event.data.content[0].length + " points.");
// scope.centerCamera(); // scope.centerCamera();
} else if (event.data.status == "progress") { } else if (event.data.status == "progress") {