--- ray/src/util/trad.wsh 1995/10/05 13:16:22 2.12 +++ ray/src/util/trad.wsh 2019/05/01 16:47:54 2.17 @@ -1,5 +1,7 @@ -#!/usr/local/bin/wish4.0 -# SCCSid "$SunId$ LBL" +#!/usr/bin/wish +# RCSid: $Id: trad.wsh,v 2.17 2019/05/01 16:47:54 greg Exp $ +# the next line restarts using wish in case of shell execution \ +exec wish "$0" "$@" # # TCL/TK-based Rad Input File Editor # @@ -11,6 +13,14 @@ set helplib $radlib set auto_path [linsert $auto_path 0 $radlib] +# Assign global globbing variables + +set myglob(rif) *.rif +set myglob(materials) *.mat +set myglob(illum) *.rad +set myglob(scene) *.rad +set myglob(objects) * + # Create required procedures proc modified {} { # check for radvar modification @@ -119,7 +129,7 @@ pack .upper.right.title -side top -pady 10 proc setbutt v { radiobutton .$v -text [string toupper $v] \ -variable curmode -value $v \ - -width 9 -relief groove -anchor w \ + -width 10 -relief groove -anchor w \ -command changescreen pack .$v -in .upper.right -side top -pady 5 helplink .$v trad $v intro @@ -176,9 +186,12 @@ if {[llength $argv] == 0} { } elseif {[llength $argv] == 1} { cd [file dirname $argv] set curfile [file tail $argv] - if {! [file exists $curfile]} { - newnew $curfile - .scene invoke + if {! [file isfile $curfile]} { + if [newnew $curfile] { + .scene invoke + } else { + .file invoke + } } elseif {[newload $curfile]} { if $alldone { set curmess "All renderings are finished."