[brlcad-commits] SF.net SVN: brlcad:[47333] brlcad/trunk/src/tclscripts/archer

[<bo...@us...>]

Revision: 47333
          http://brlcad.svn.sourceforge.net/brlcad/?rev=47333&view=rev
Author:   bob1961
Date:     2011-10-26 15:38:32 +0000 (Wed, 26 Oct 2011)
Log Message:
-----------
Added lighting mode preferences to Archer

Modified Paths:
--------------
    brlcad/trunk/src/tclscripts/archer/Archer.tcl
    brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl

Modified: brlcad/trunk/src/tclscripts/archer/Archer.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/archer/Archer.tcl	2011-10-26 14:36:34 UTC (rev 47332)
+++ brlcad/trunk/src/tclscripts/archer/Archer.tcl	2011-10-26 15:38:32 UTC (rev 47333)
@@ -2363,7 +2363,51 @@
     grid $itk_component(zclipFrontMaxB) -column 1 -row 0 -sticky nse
     grid columnconfigure $itk_component(zclipFrontMaxF) 0 -weight 1
 
+    itk_component add lightModeL {
+	::ttk::label $parent.lightModeL \
+	    -anchor e \
+	    -text "Light Mode:"
+    } {}
+    itk_component add lightModeF {
+	::ttk::frame $parent.lightModeF \
+	    -relief sunken \
+	    -borderwidth 1
+    } {}
+    itk_component add lightModeFrontRB {
+	::ttk::radiobutton $itk_component(lightModeF).lightModeFrontRB \
+	    -text "Front" \
+	    -value $LIGHT_MODE_FRONT \
+	    -variable [::itcl::scope mLightingModePref]
+    } {}
+    itk_component add lightModeFrontBackRB {
+	::ttk::radiobutton $itk_component(lightModeF).lightModeFrontBackRB \
+	    -text "Front and Back" \
+	    -value $LIGHT_MODE_FRONT_AND_BACK \
+	    -variable [::itcl::scope mLightingModePref]
+    } {}
+    itk_component add lightModeFrontBackDarkRB {
+	::ttk::radiobutton $itk_component(lightModeF).lightModeFrontBackDarkRB \
+	    -text "Front and Back (Dark Back)" \
+	    -value $LIGHT_MODE_FRONT_AND_BACK_DARK \
+	    -variable [::itcl::scope mLightingModePref]
+    } {}
+    itk_component add lightModeFrontBackLightRB {
+	::ttk::radiobutton $itk_component(lightModeF).lightModeFrontBackLightRB \
+	    -text "Front and Back (Light Back)" \
+	    -value $LIGHT_MODE_FRONT_AND_BACK_LIGHT \
+	    -variable [::itcl::scope mLightingModePref]
+    } {}
     set i 0
+    grid $itk_component(lightModeFrontRB) -row $i -sticky nsew
+    incr i
+    grid $itk_component(lightModeFrontBackRB) -row $i -sticky nsew
+    incr i
+    grid $itk_component(lightModeFrontBackDarkRB) -row $i -sticky nsew
+    incr i
+    grid $itk_component(lightModeFrontBackLightRB) -row $i -sticky nsew
+    grid columnconfigure $itk_component(lightModeF) 0 -weight 1
+
+    set i 0
     grid $itk_component(zclipBackL) -column 0 -row $i -sticky se
     grid $itk_component(zclipBackS) -column 1 -row $i -sticky ew
     incr i
@@ -2375,6 +2419,9 @@
     incr i
     grid $itk_component(zclipFrontMaxL) -column 0 -row $i -sticky e
     grid $itk_component(zclipFrontMaxF) -column 1 -row $i -sticky ew
+    incr i
+    grid $itk_component(lightModeL) -column 0 -row $i -sticky ne
+    grid $itk_component(lightModeF) -column 1 -row $i -sticky ew
 
     incr i
     grid rowconfigure $parent $i -weight 1
@@ -4924,7 +4971,7 @@
 	-state disabled
     $itk_component(menubar) menuconfigure .modes.light \
 	-offvalue 0 \
-	-onvalue 2 \
+	-onvalue 1 \
 	-variable [::itcl::scope mLighting] \
 	-command [::itcl::code $this doLighting] \
 	-state disabled
@@ -5160,7 +5207,7 @@
     $itk_component(${_prefix}modesmenu) add checkbutton \
 	-label "Lighting" \
 	-offvalue 0 \
-	-onvalue 2 \
+	-onvalue 1 \
 	-variable [::itcl::scope mLighting] \
 	-command [::itcl::code $this doLighting] \
 	-state disabled
@@ -7279,6 +7326,7 @@
 
 ::itcl::body Archer::applyDisplayPreferences {} {
     updateDisplaySettings
+    doLighting
 }
 
 
@@ -7293,6 +7341,11 @@
 	set mZClipFront $mZClipFrontPref
 	updateDisplaySettings
     }
+
+    if {$mLightingModePref != $mLightingMode} {
+	set mLightingMode $mLightingModePref
+	doLighting
+    }
 }
 
 
@@ -7912,6 +7965,7 @@
     set mZClipFrontMaxPref $mZClipFrontMax
     set mZClipBackPref $mZClipBack
     set mZClipFrontPref $mZClipFront
+    set mLightingModePref $mLightingMode
 
     $itk_component(preferencesDialog) center [namespace tail $this]
     ::update
@@ -8059,6 +8113,7 @@
     puts $_pfile "set mZClipFrontMax $mZClipFrontMax"
     puts $_pfile "set mZClipBack $mZClipBack"
     puts $_pfile "set mZClipFront $mZClipFront"
+    puts $_pfile "set mLightingMode $mLightingMode"
 
     puts $_pfile "set mHPaneFraction1 $mHPaneFraction1"
     puts $_pfile "set mHPaneFraction2 $mHPaneFraction2"

Modified: brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl
===================================================================
--- brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl	2011-10-26 14:36:34 UTC (rev 47332)
+++ brlcad/trunk/src/tclscripts/archer/ArcherCore.tcl	2011-10-26 15:38:32 UTC (rev 47333)
@@ -80,6 +80,11 @@
 	common COMP_PICK_BOT_SYNC_MODE 4
 	common COMP_PICK_BOT_FLIP_MODE 5
 
+	common LIGHT_MODE_FRONT 1
+	common LIGHT_MODE_FRONT_AND_BACK 2
+	common LIGHT_MODE_FRONT_AND_BACK_DARK 3
+	common LIGHT_MODE_FRONT_AND_BACK_LIGHT 4
+
 	common SystemWindowFont
 	common SystemWindowText
 	common SystemWindow
@@ -290,7 +295,9 @@
 	variable mTargetCopy ""
 	variable mTargetOldCopy ""
 	variable mDisplayType
-	variable mLighting 2
+	variable mLightingMode 1
+	variable mLightingModePref ""
+	variable mLighting 1
 	variable mRenderMode -1
 	variable mActivePane
 	variable mActivePaneName
@@ -3277,8 +3284,13 @@
     gedCmd zclip_all 0
 
     gedCmd zbuffer_all $mLighting
-    gedCmd light_all $mLighting
 
+    if {$mLighting} {
+	gedCmd light_all $mLightingMode
+    } else {
+	gedCmd light_all $mLighting
+    }
+
     SetNormalCursor $this
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.