Revision: 73126
http://sourceforge.net/p/brlcad/code/73126
Author: brlcad
Date: 2019-05-22 11:39:36 +0000 (Wed, 22 May 2019)
Log Message:
-----------
the last two rtedge tests now work, using -F instead of -o and making sure to
rm our output only once... also needed benchmark flag to avoid off-by-1
lighting differences. references updated.
Modified Paths:
--------------
brlcad/trunk/regress/rtedge.ref4.pix.gz
brlcad/trunk/regress/rtedge.ref5.pix.gz
brlcad/trunk/regress/rtedge.sh
Modified: brlcad/trunk/regress/rtedge.ref4.pix.gz
===================================================================
(Binary files differ)
Modified: brlcad/trunk/regress/rtedge.ref5.pix.gz
===================================================================
(Binary files differ)
Modified: brlcad/trunk/regress/rtedge.sh
===================================================================
--- brlcad/trunk/regress/rtedge.sh 2019-05-22 02:21:45 UTC (rev 73125)
+++ brlcad/trunk/regress/rtedge.sh 2019-05-22 11:39:36 UTC (rev 73126)
@@ -76,11 +76,17 @@
# make our database
rm -f rtedge.havoc.g
+
log "... running rtedge.havoc.g gzip decompress"
$GZIP -d -c "$PATH_TO_THIS/tgms/havoc.g.gz" > rtedge.havoc.g
# get our references
-rm -f rtedge.ref.pix rtedge.2.ref.pix
+rm -f rtedge.ref.pix
+rm -f rtedge.ref2.pix
+rm -f rtedge.ref3.pix
+rm -f rtedge.ref4.pix
+rm -f rtedge.ref5.pix
+
log "... running rtedge reference gzip decompressions"
$GZIP -d -c "$PATH_TO_THIS/rtedge.ref.pix.gz" > rtedge.ref.pix 2>> $LOGFILE
$GZIP -d -c "$PATH_TO_THIS/rtedge.ref2.pix.gz" > rtedge.ref2.pix 2>> $LOGFILE
@@ -90,16 +96,16 @@
# === #1 ===
-
-cmd="$RTEDGE -s 1024 -o rtedge.pix rtedge.havoc.g havoc"
-log "... rendering rtedge #1: $cmd"
rm -f rtedge.pix
-$cmd 2>> $LOGFILE
+rm -f rtedge.diff.pix
-cmd="$PIXDIFF rtedge.pix rtedge.ref.pix"
-log "... comparing rtedge #1: $cmd"
-rm -f rtedge.diff.pix
-$cmd > rtedge.diff.pix 2>> $LOGFILE
+cmd='echo $RTEDGE -s 1024 -o rtedge.pix rtedge.havoc.g havoc'
+log "... rendering rtedge #1: `eval $cmd`"
+`eval $cmd` 2>> $LOGFILE
+
+cmd='echo $PIXDIFF rtedge.pix rtedge.ref.pix'
+log "... comparing rtedge #1: `eval $cmd`"
+`eval $cmd` > rtedge.diff.pix 2>> $LOGFILE
NUMBER_WRONG=`tail -n1 $LOGFILE | tr , '\012' | awk '/many/ {print $1}'`
if [ "X$NUMBER_WRONG" = "X0" ] ; then
@@ -111,16 +117,16 @@
# === #2 ===
+rm -f rtedge.2.pix
+rm -f rtedge.diff2.pix
-cmd="$RTEDGE -s 1024 -o rtedge.2.pix -c\"set fg=0/255/0 bg=255/0/0\"
rtedge.havoc.g havoc"
+cmd="$RTEDGE -s 1024 -o rtedge.2.pix -c \"set fg=0/255/0 bg=255/0/0\"
rtedge.havoc.g havoc"
log "... rendering rtedge #2: $cmd"
-rm -f rtedge.2.pix
-eval $cmd 2>> $LOGFILE
+eval "$cmd" 2>> $LOGFILE
cmd="$PIXDIFF rtedge.2.pix rtedge.ref2.pix"
log "... comparing rtedge #2: $cmd"
-rm -f rtedge.diff2.pix
-$cmd > rtedge.diff2.pix 2>> $LOGFILE
+eval $cmd > rtedge.diff2.pix 2>> $LOGFILE
NUMBER_WRONG=`tail -n1 $LOGFILE | tr , '\012' | awk '/many/ {print $1}'`
if [ "X$NUMBER_WRONG" = "X0" ] ; then
@@ -132,16 +138,16 @@
# === #3 ===
+rm -f rtedge.3.pix
+rm -f rtedge.diff3.pix
cmd="$RTEDGE -s 1024 -o rtedge.3.pix -c\"set rc=1 dr=1\" rtedge.havoc.g havoc"
log "... rendering rtedge #3: $cmd"
-rm -f rtedge.3.pix
eval $cmd 2>> $LOGFILE
cmd="$PIXDIFF rtedge.3.pix rtedge.ref3.pix"
log "... comparing rtedge #3: $cmd"
-rm -f rtedge.diff3.pix
-$cmd > rtedge.diff3.pix 2>> $LOGFILE
+eval $cmd > rtedge.diff3.pix 2>> $LOGFILE
NUMBER_WRONG=`tail -n1 $LOGFILE | tr , '\012' | awk '/many/ {print $1}'`
if [ "X$NUMBER_WRONG" = "X0" ] ; then
@@ -153,6 +159,8 @@
# === #4 ===
+rm -f rtedge.4.pix
+rm -f rtedge.diff4.pix
view="
viewsize 8.000e+03;
@@ -162,16 +170,14 @@
end;
"
-cmd="$RT -M -o rtedge.4.pix -C255/255/255 rtedge.havoc.g havoc"
+cmd="$RT -B -M -F rtedge.4.pix -C255/255/255 rtedge.havoc.g havoc"
log "... rendering rt #4: $cmd"
-rm -f rtedge.4.pix
eval $cmd 2>> $LOGFILE <<EOF
$view
EOF
-cmd="$RTEDGE -M -o rtedge.4.pix -c\"set dr=1 dn=1 ov=1\" -c\"set
fg=255,200,0\" rtedge.havoc.g havoc"
+cmd="$RTEDGE -B -M -F rtedge.4.pix -c\"set dr=1 dn=1 ov=1\" -c\"set
fg=255,200,0\" rtedge.havoc.g havoc"
log "... rendering rtedge #4: $cmd"
-rm -f rtedge.4.pix
eval $cmd 2>> $LOGFILE <<EOF
$view
EOF
@@ -178,8 +184,7 @@
cmd="$PIXDIFF rtedge.4.pix rtedge.ref4.pix"
log "... comparing rtedge #4: $cmd"
-rm -f rtedge.diff4.pix
-$cmd > rtedge.diff4.pix 2>> $LOGFILE
+eval $cmd > rtedge.diff4.pix 2>> $LOGFILE
NUMBER_WRONG=`tail -n1 $LOGFILE | tr , '\012' | awk '/many/ {print $1}'`
if [ "X$NUMBER_WRONG" = "X0" ] ; then
@@ -191,6 +196,8 @@
# === #5 ===
+rm -f rtedge.5.pix
+rm -f rtedge.diff5.pix
view="
viewsize 8.000e+03;
@@ -200,16 +207,14 @@
end;
"
-cmd="$RT -M -o rtedge.5.pix -C255/255/255 rtedge.havoc.g weapons"
+cmd="$RT -B -M -F rtedge.5.pix -C255/255/255 rtedge.havoc.g weapons"
log "... rendering rt #5: $cmd"
-rm -f rtedge.5.pix
eval $cmd 2>> $LOGFILE <<EOF
$view
EOF
-cmd="$RTEDGE -M -o rtedge.5.pix -c\"set dr=1 dn=1 om=3\" -c\"set fg=0,0,0
bg=200,200,200\" -c\"set oo=\\\"weapons\\\" \" rtedge.havoc.g havoc_front
havoc_middle havoc_tail landing_gear main_rotor"
+cmd="$RTEDGE -B -M -F rtedge.5.pix -c\"set dr=1 dn=1 om=3\" -c\"set fg=0,0,0
bg=200,200,200\" -c\"set oo=\\\"weapons\\\" \" rtedge.havoc.g havoc_front
havoc_middle havoc_tail landing_gear main_rotor"
log "... rendering rtedge #5: $cmd"
-rm -f rtedge.5.pix
eval $cmd 2>> $LOGFILE <<EOF
$view
EOF
@@ -216,8 +221,7 @@
cmd="$PIXDIFF rtedge.5.pix rtedge.ref5.pix"
log "... comparing rtedge #5: $cmd"
-rm -f rtedge.diff5.pix
-$cmd > rtedge.diff5.pix 2>> $LOGFILE
+eval $cmd > rtedge.diff5.pix 2>> $LOGFILE
NUMBER_WRONG=`tail -n1 $LOGFILE | tr , '\012' | awk '/many/ {print $1}'`
if [ "X$NUMBER_WRONG" = "X0" ] ; then
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
