Changeset 3009 for branches/nanovis2

Timestamp:

May 17, 2012 11:42:25 AM (12 years ago)

Author:

ldelgass

Message:

Fix clients to use new protocol for specular shading and opacity scaling.

Location:

branches/nanovis2/gui/scripts

Files:

• flowvisviewer.tcl (modified) (2 diffs)
• nanovisviewer.tcl (modified) (2 diffs)

branches/nanovis2/gui/scripts/flowvisviewer.tcl

@@ -1652 +1652 @@
                 set specularLevel 0.3
                 set specularExp 90.0
-                SendCmd "$tag configure -ambient $ambient -diffuse $diffuse -specular {$specularLevel $specularExp}"
+                SendCmd "$tag configure -ambient $ambient -diffuse $diffuse -specularLevel $specularLevel -specularExp $specularExp"
             }
         }
@@ -1659 +1659 @@
                 set comp [lindex [$_first components] 0]
                 set tag $_first-$comp
-                set opacity [expr {0.2*$_settings($this-transp)+1}]
+                set opacity [expr { 0.01 * double($_settings($this-transp)) }]
                 SendCmd "$tag configure -opacity $opacity"
             }

branches/nanovis2/gui/scripts/nanovisviewer.tcl

@@ -1217 +1217 @@
                 SendCmd "volume shading ambient $ambient"
                 SendCmd "volume shading diffuse $diffuse"
-                SendCmd "volume shading specular {$specularLevel $specularExp}"
+                SendCmd "volume shading specularLevel $specularLevel"
+                SendCmd "volume shading specularExp $specularExp"
             }
         }
@@ -1223 +1224 @@
             if {[isconnected]} {
                 set val $_settings($this-transp)
-                set sval [expr {0.2*$val+1}]
+                set sval [expr { 0.01 * double($val) }]
                 SendCmd "volume shading opacity $sval"
             }