--- ray/src/util/do_scene3.6.tcl 1994/10/28 10:43:32 2.2 +++ ray/src/util/do_scene3.6.tcl 1996/05/17 13:53:04 2.9 @@ -3,11 +3,6 @@ # Track octree and scene files # -set myglob(materials) *.mat -set myglob(illum) *.rad -set myglob(scene) *.rad -set myglob(objects) *.rad - proc newfent f { # add file to our list global rifname radvar mybox myvar set rd [file dirname $rifname] @@ -25,7 +20,7 @@ proc lbgetf nm { # get list box files global myglob radvar mybox myvar curpat curmess set myvar $nm set oldnum [llength $radvar($nm)] - if [getfile -perm -glob $myglob($nm) -view view_txt -send newfent] { + if [getfile -grab -perm -glob $myglob($nm) -view view_txt -send newfent] { set curmess "Added [expr [llength $radvar($nm)] - $oldnum] entries." } elseif {[llength $radvar($nm)] > $oldnum} { set radvar($nm) [lreplace $radvar($nm) $oldnum end] @@ -39,13 +34,13 @@ proc lbgetf nm { # get list box files proc oct_delete {} { # delete octree file global radvar curmess - if {"$radvar(OCTREE)" == {} || ! [file exists $radvar(OCTREE)]} { + if {"$radvar(OCTREE)" == {} || ! [file isfile $radvar(OCTREE)]} { set curmess {No octree file.} return } if [tk_dialog .dlg {Verification} \ "Really delete octree file $radvar(OCTREE)?" \ - questhead 1 {Delete} {Cancel}] { + questhead 0 {Delete} {Cancel}] { return 0 } if [catch {exec rm $radvar(OCTREE) < /dev/null} curmess] {return 0} @@ -56,7 +51,7 @@ proc oct_delete {} { # delete octree file proc getdepend {} { # get object dependencies global radvar curmess mybox set curmess "Please wait..." - update idletasks + update foreach newf [eval exec raddepend $radvar(illum) $radvar(scene)] { if {[lsearch -exact $radvar(objects) $newf] < 0} { lappend radvar(objects) $newf @@ -142,7 +137,7 @@ proc do_scene w { # Create scene screen place $w.oct -relwidth .5714 -relheight .0610 -relx .2143 -rely .0610 helplink $w.oct trad scene octree button $w.odel -text Delete -relief raised -command oct_delete - place $w.odel -relwidth .1071 -relheight .0610 -relx .8214 -rely .0610 + place $w.odel -relwidth .1071 -relheight .0610 -relx .8000 -rely .0610 helplink $w.odel trad scene octdelete # Materials listbox button $w.matb -text Materials -relief raised \ @@ -216,7 +211,7 @@ proc do_scene w { # Create scene screen place $w.revert -relwidth .1071 -relheight .0610 -relx .98 -rely .98 \ -anchor se helplink $w.revert trad scene revert - button $w.copy -text Copy -relief raised -command {getfile \ + button $w.copy -text Copy -relief raised -command {getfile -grab \ -send copyscene -view view_txt -glob $rif_glob} place $w.copy -relwidth .1071 -relheight .0610 -relx .98 -rely .90 \ -anchor se