Update build + small fix when switching between camera pivot mode.

haramakoto · Sep 12, 2013 · 5ae8d6e · 5ae8d6e
1 parent 47273fb
commit 5ae8d6e
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 46 deletions.
diff --git a/build/cache.manifest b/build/cache.manifest
@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# 16-08-2013 04:50
+# 12-09-2013 08:05
 
 index.html
 

diff --git a/build/sculptgl/cache.manifest b/build/sculptgl/cache.manifest
@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# 16-08-2013 04:50
+# 12-09-2013 08:00
 
 index.html
 

diff --git a/build/sculptgl/sculptgl.min.js b/build/sculptgl/sculptgl.min.js
diff --git a/gui/gui.js b/gui/gui.js
@@ -128,9 +128,8 @@ Gui.prototype = {
  var ctrlPivot = cameraFold.add(main.camera_, 'usePivot_').name('Picking pivot');
  ctrlPivot.onChange(function ()
  {
- main.camera_.center_ = [0, 0, 0];
- main.camera_.transX_ = 0;
- main.camera_.transY_ = 0;
+ if (main.mesh_)
+ main.camera_.reset(main.mesh_);
  main.render();
  });
  cameraFold.open();

diff --git a/math3d/camera.js b/math3d/camera.js
@@ -156,13 +156,16 @@ Camera.prototype = {
  },
 
  /** Reset camera */
- reset: function ()
+ reset: function (mesh)
  {
  this.rot_ = quat.create();
  this.zoom_ = 0;
  this.center_ = [0, 0, 0];
  this.transX_ = 0;
  this.transY_ = 0;
+ var length = vec3.dist(mesh.octree_.aabbLoose_.max_, mesh.octree_.aabbLoose_.min_);
+ this.speed_ = length;
+ this.zoom(-0.4);
  },
 
  /** Reset view front */

diff --git a/sculptgl.js b/sculptgl.js
@@ -582,10 +582,7 @@ SculptGL.prototype = {
 
  mesh.initMesh(this.textures_, this.shaders_);
  mesh.moveTo([0, 0, 0]);
- var length = vec3.dist(mesh.octree_.aabbLoose_.max_, mesh.octree_.aabbLoose_.min_);
- this.camera_.reset();
- this.camera_.speed_ = length;
- this.camera_.zoom(-0.4);
+ this.camera_.reset(mesh);
  this.gui_.updateMesh(mesh);
  this.render();
  },