Changeset 2219 for trunk

Timestamp:

Apr 21, 2011 7:24:19 PM (13 years ago)

Author:

gah

Message:

add changes to drawing3d and vtkviewer for vtk render server

File:

• trunk/gui/scripts/vtkviewer2.tcl (modified) (6 diffs)

trunk/gui/scripts/vtkviewer2.tcl

@@ -91 +91 @@
     private method IsValidObject { dataobj } 
 
+    private variable _arcball ""
     private variable _outbuf       ;# buffer for outgoing commands
 
@@ -159 +160 @@
         y2 -1
     }
+    set _arcball [blt::arcball create 100 100]
+    $_arcball matrix { 1.0 0.0 0.0 0.0 1.0 0.0 0.0 0.0 1.0 }
+    puts stderr start=[$_arcball quaternion]
 
     # Initialize the view to some default parameters.
@@ -341 +345 @@
     image delete $_image(download)
     array unset _settings $this-*
+    blt::arcball destroy $_arcball
 }
 
@@ -357 +362 @@
     set _width $w
     set _height $h
+    $_arcball resize $w $h
     if { !$_resizePending } {
         $_dispatcher event -after 100 !resize
@@ -923 +929 @@
             set _settings($this-zoom)  $_view(zoom)
             SendCmd "camera reset all"
+            $_arcball reset
         }
     }
@@ -973 +980 @@
                     return
                 }
-                set q [blt::arcball rotate $w $h $_click(x) $_click(y) $x $y]
-                if { [info exists _click(q1)] } {
-                    set _click(q1) [blt::arcball combine $_click(q1) $q]
-                } else {
-                    set _click(q1) $q
+                if { $dx == 0 && $dy == 0 } {
+                    return
                 }
-                SendCmd "camera orient $_click(q1)" 
+                set q [$_arcball rotate $x $y $_click(x) $_click(y)]
+                SendCmd "camera orient $q" 
                 #SendCmd "camera orient $q" 
+                puts stderr "rotate q=$q"
+                puts stderr "arcball matrix=[$_arcball matrix]"
+                puts stderr "arcball quaternion=[$_arcball quaternion]"
                 set _click(x) $x
                 set _click(y) $y
-                puts stderr q=$_click(q1)
-                puts stderr m1=[blt::arcball matrix $_click(q1)]
-                puts stderr m2=[blt::arcball matrix $q]
             }
         }