Merge pull request #334 from helblazer811/master

Bug Fixes
3dmol · Aug 14, 2017 · dd6e291 · dd6e291
2 parents c8ccd21 + 63c7885
commit dd6e291
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 16 deletions.
diff --git a/3Dmol/WebGL/renderer.js b/3Dmol/WebGL/renderer.js
@@ -1103,6 +1103,8 @@ $3Dmol.Renderer = function(parameters) {
         _currentHeight = _viewportHeight;
         this.setViewport();
         if (this.autoClear || forceClear) {
+            _gl.clearColor(_clearColor.r, _clearColor.g, _clearColor.b,
+                _clearAlpha);
             this.clear(this.autoClearColor, this.autoClearDepth,
                     this.autoClearStencil);
 
@@ -1155,7 +1157,6 @@ $3Dmol.Renderer = function(parameters) {
 
         this.setDepthTest(true);
         this.setDepthWrite(true);
-
         // _gl.finish();
 
     };

diff --git a/3Dmol/glviewer.js b/3Dmol/glviewer.js
@@ -469,7 +469,6 @@ $3Dmol.GLViewer = (function() {
 
                 if(r != row || c != col)
                     return;
-
             }
 
             var scaleFactor = (CAMERA_Z - rotationGroup.position.z) * 0.85;
@@ -1207,29 +1206,29 @@ $3Dmol.GLViewer = (function() {
             return ret;
         };
         var spinInterval;
-        this.spin = function(spin,axis,interval){
-
-
-            spin = spin != undefined ? spin : true;
-            axis = axis != undefined ? axis : [1,0,0];
-            interval = interval != undefined ? interval : 50;
+        this.spin = function(axis){
             clearInterval(spinInterval)
-            if(!spin)
-                return
+            if(typeof axis == 'undefined')
+                axis = 'y';
+            if(typeof axis == "boolean"){
+                if(!axis)
+                    return
+                else
+                    axis = 'y'
+            }
 
             if(Array.isArray(axis)){
                axis = {x:axis[0],y:axis[1],z:axis[2]} 
             }
+            //out of bounds check
 
             var viewer = this;
 
-
             spinInterval = setInterval(
                 function(){
-                    console.log("rotating")
                     viewer.rotate(1,axis)
                 }
-            ,interval);            
+            ,25);            
 
         }
 

diff --git a/tests/splitviewer.html b/tests/splitviewer.html
@@ -31,13 +31,12 @@
 
            $3Dmol.download("pdb:1YCR",viewers[0][2],{},function(){
               viewers[0][2].setStyle({},{line:{}});
-              viewers[0][2].spin(true,{x:0,y:1,z:1},50);
+              viewers[0][2].spin(true,{x:0,y:1,z:1});
+              viewers[0][2].setBackgroundColor("000000");
               viewers[0][2].render();
            });
 
           /*
-          
-          
           var viewer = $3Dmol.createViewer($("#test38"),{});
 
           $3Dmol.download("pdb:1MO8",viewer,{},function(){