Revision: 60074 http://sourceforge.net/p/brlcad/code/60074 Author: bob1961 Date: 2014-03-06 12:58:15 +0000 (Thu, 06 Mar 2014) Log Message: ----------- Update Archer::raytracePlus to include ghost objects when computing the eye_pt for the calls to rtwizard.
Modified Paths: -------------- brlcad/trunk/src/tclscripts/archer/Archer.tcl Modified: brlcad/trunk/src/tclscripts/archer/Archer.tcl =================================================================== --- brlcad/trunk/src/tclscripts/archer/Archer.tcl 2014-03-06 11:54:03 UTC (rev 60073) +++ brlcad/trunk/src/tclscripts/archer/Archer.tcl 2014-03-06 12:58:15 UTC (rev 60074) @@ -1137,7 +1137,25 @@ -w $w -n $n -p $port -c $mColorObjects -g $mGhostObjects -l $mEdgeObjects \ -G $mRtWizardGhostIntensity -O $mRtWizardOccMode } else { + $itk_component(ged) refresh_off + if {$mGhostObjects != ""} { + set wlist [$itk_component(ged) who] + set size [$itk_component(ged) size] + set center [$itk_component(ged) center] + eval $itk_component(ged) draw $mGhostObjects + } + set vparams [split [$itk_component(ged) get_eyemodel] "\n"] + if {$mGhostObjects != ""} { + eval $itk_component(ged) erase $mGhostObjects + eval $itk_component(ged) draw $wlist + $itk_component(ged) size $size + $itk_component(ged) center $center + } + set eye_pt [lrange [concat [regsub {;$} [lindex $vparams 2] ""]] 1 end] + $itk_component(ged) refresh_on + set ret [eval $itk_component(ged) rtwizard \ + --eye_pt [list $eye_pt] \ -C [list $bcolor] --line-color [list $ecolor] \ --non-line-color [list $necolor] \ -w $w -n $n -p $port -c $mColorObjects -g $mGhostObjects -l $mEdgeObjects \ @@ -1152,7 +1170,25 @@ -w $w -n $n -p $port -c $mColorObjects -g $mGhostObjects -l $mEdgeObjects \ -G $mRtWizardGhostIntensity -O $mRtWizardOccMode } { + $itk_component(ged) refresh_off + if {$mGhostObjects != ""} { + set wlist [$itk_component(ged) who] + set size [$itk_component(ged) size] + set center [$itk_component(ged) center] + eval $itk_component(ged) draw $mGhostObjects + } + set vparams [split [$itk_component(ged) get_eyemodel] "\n"] + if {$mGhostObjects != ""} { + eval $itk_component(ged) erase $mGhostObjects + eval $itk_component(ged) draw $wlist + $itk_component(ged) size $size + $itk_component(ged) center $center + } + set eye_pt [lrange [concat [regsub {;$} [lindex $vparams 2] ""]] 1 end] + $itk_component(ged) refresh_on + eval $itk_component(ged) rtwizard \ + --eye_pt [list $eye_pt] \ -C [list $bcolor] --line-color [list $ecolor] \ -w $w -n $n -p $port -c $mColorObjects -g $mGhostObjects -l $mEdgeObjects \ -G $mRtWizardGhostIntensity -O $mRtWizardOccMode This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. ------------------------------------------------------------------------------ Subversion Kills Productivity. Get off Subversion & Make the Move to Perforce. With Perforce, you get hassle-free workflows. Merge that actually works. Faster operations. Version large binaries. Built-in WAN optimization and the freedom to use Git, Perforce or both. Make the move to Perforce. http://pubads.g.doubleclick.net/gampad/clk?id=122218951&iu=/4140/ostg.clktrk _______________________________________________ BRL-CAD Source Commits mailing list brlcad-commits@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/brlcad-commits