Revision: 76371
http://sourceforge.net/p/brlcad/code/76371
Author: starseeker
Date: 2020-07-17 18:40:13 +0000 (Fri, 17 Jul 2020)
Log Message:
-----------
Move moss and dsp tests to subdirs
Modified Paths:
--------------
brlcad/branches/bioh/regress/CMakeLists.txt
brlcad/branches/bioh/regress/asc/CMakeLists.txt
Added Paths:
-----------
brlcad/branches/bioh/regress/dsp/CMakeLists.txt
brlcad/branches/bioh/regress/dsp/dsp.sh
brlcad/branches/bioh/regress/moss/
brlcad/branches/bioh/regress/moss/moss.ref.pix
brlcad/branches/bioh/regress/moss/moss.sh
Removed Paths:
-------------
brlcad/branches/bioh/regress/dsp.sh
brlcad/branches/bioh/regress/moss.ref.pix
brlcad/branches/bioh/regress/moss.sh
Modified: brlcad/branches/bioh/regress/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/regress/CMakeLists.txt 2020-07-17 18:23:05 UTC (rev
76370)
+++ brlcad/branches/bioh/regress/CMakeLists.txt 2020-07-17 18:40:13 UTC (rev
76371)
@@ -18,6 +18,9 @@
# ASC file Conversion Tests
add_subdirectory(asc)
+# DSP Regression Tests
+add_subdirectory(dsp)
+
# Image Conversion Regression Tests
add_subdirectory(icv)
@@ -27,6 +30,9 @@
# Geometry Conversion Regression Tests
add_subdirectory(gcv)
+# moss.g Regression Tests
+add_subdirectory(moss)
+
# NURBS Regression Tests
add_subdirectory(nurbs)
@@ -64,8 +70,6 @@
if(SH_EXEC)
if (TARGET mged AND TARGET asc2g)
- add_test(NAME regress-moss COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/moss.sh" ${CMAKE_SOURCE_DIR})
- BRLCAD_REGRESSION_TEST(regress-moss "rt;asc2g;pixdiff;pix-png;png-pix"
TEST_DEFINED)
add_test(NAME regress-lights COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/lights.sh" ${CMAKE_SOURCE_DIR})
BRLCAD_REGRESSION_TEST(regress-lights "rt;asc2g;pixdiff" TEST_DEFINED)
@@ -106,9 +110,6 @@
add_test(NAME regress-comgeom COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/comgeom.sh" ${CMAKE_SOURCE_DIR})
BRLCAD_REGRESSION_TEST(regress-comgeom "mged;asc2g;vdeck;comgeom-g"
TEST_DEFINED)
- add_test(NAME regress-dsp COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/dsp.sh" ${CMAKE_SOURCE_DIR})
- BRLCAD_REGRESSION_TEST(regress-dsp "mged;cv;asc2pix;rt;pix-bw"
TEST_DEFINED)
-
endif (TARGET mged AND TARGET asc2g)
add_test(NAME regress-usage COMMAND ${SH_EXEC}
"${CMAKE_SOURCE_DIR}/regress/usage.sh" ${CMAKE_SOURCE_DIR})
@@ -123,29 +124,6 @@
CMAKEFILES(
bots.sh
comgeom.sh
- dsp.sh
- dsp/asc2dsp-new.asc
- dsp/asc2dsp-old.asc
- dsp/dsp-1-1.asc
- dsp/dsp-1-2.asc
- dsp/dsp-2-1.asc
- dsp/dsp-2-2.asc
- dsp/dsp-2-3.asc
- dsp/dsp-2-4.asc
- dsp/dsp-2-5.asc
- dsp/dsp-3-1.asc
- dsp/dsp-3-2.asc
- dsp/dsp-3-3.asc
- dsp/dsp-3-4.asc
- dsp/dsp-3-5.asc
- dsp/dsp-3-6.asc
- dsp/dsp-3-7.asc
- dsp/dsp-3-8.asc
- dsp/dsp-common.sh
- dsp/run-dsp-case-set-0.sh
- dsp/run-dsp-case-set-1.sh
- dsp/run-dsp-case-set-2.sh
- dsp/run-dsp-case-set-3.sh
flawfinder.sh
fuzz/CMakeLists.txt
fuzz/fuzz_ged.cpp
@@ -161,8 +139,6 @@
lights.sh
mged.sh
mged_test.sh
- moss.ref.pix
- moss.sh
nirt.sh
nirt/ovlps.g
red.sh
@@ -217,85 +193,6 @@
comgeom.t-v4.g
comgeom.t-v5.g
density_table.txt
- dsp-2-1.bw
- dsp-2-1.dsp
- dsp-2-1.g
- dsp-2-1.log
- dsp-2-1.pix
- dsp-2-1.rt.pix
- dsp-2-2.bw
- dsp-2-2.dsp
- dsp-2-2.g
- dsp-2-2.log
- dsp-2-2.pix
- dsp-2-2.rt.pix
- dsp-2-3.bw
- dsp-2-3.dsp
- dsp-2-3.g
- dsp-2-3.log
- dsp-2-3.pix
- dsp-2-3.rt.pix
- dsp-2-4.bw
- dsp-2-4.dsp
- dsp-2-4.g
- dsp-2-4.log
- dsp-2-4.pix
- dsp-2-4.rt.pix
- dsp-2-5.bw
- dsp-2-5.dsp
- dsp-2-5.g
- dsp-2-5.log
- dsp-2-5.pix
- dsp-2-5.rt.pix
- dsp-3-1.bw
- dsp-3-1.dsp
- dsp-3-1.g
- dsp-3-1.log
- dsp-3-1.pix
- dsp-3-1.rt.pix
- dsp-3-2.bw
- dsp-3-2.dsp
- dsp-3-2.g
- dsp-3-2.log
- dsp-3-2.pix
- dsp-3-2.rt.pix
- dsp-3-3.bw
- dsp-3-3.dsp
- dsp-3-3.g
- dsp-3-3.log
- dsp-3-3.pix
- dsp-3-3.rt.pix
- dsp-3-4.bw
- dsp-3-4.dsp
- dsp-3-4.g
- dsp-3-4.log
- dsp-3-4.pix
- dsp-3-4.rt.pix
- dsp-3-5.bw
- dsp-3-5.dsp
- dsp-3-5.g
- dsp-3-5.log
- dsp-3-5.pix
- dsp-3-5.rt.pix
- dsp-3-6.bw
- dsp-3-6.dsp
- dsp-3-6.g
- dsp-3-6.log
- dsp-3-6.pix
- dsp-3-6.rt.pix
- dsp-3-7.bw
- dsp-3-7.dsp
- dsp-3-7.g
- dsp-3-7.log
- dsp-3-7.pix
- dsp-3-7.rt.pix
- dsp-3-8.bw
- dsp-3-8.dsp
- dsp-3-8.g
- dsp-3-8.log
- dsp-3-8.pix
- dsp-3-8.rt.pix
- dsp.log
gqa.adj_air.plot3
gqa.exp_air.plot3
gqa.g
@@ -325,14 +222,6 @@
mged.g
mged.log
asc.log
- moss.asc
- moss.g
- moss.log
- moss.pix
- moss.pix.diff
- moss.pix.png
- moss.pix.png.pix
- moss.roundtrip.diff
nirt.g
nirt.log
nirt.mged
Modified: brlcad/branches/bioh/regress/asc/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/regress/asc/CMakeLists.txt 2020-07-17 18:23:05 UTC
(rev 76370)
+++ brlcad/branches/bioh/regress/asc/CMakeLists.txt 2020-07-17 18:40:13 UTC
(rev 76371)
@@ -1,11 +1,11 @@
if(SH_EXEC)
- if (TARGET asc2g AND TARGET asc2g)
+ if (TARGET asc2g)
add_test(NAME regress-asc COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/asc.sh" ${CMAKE_SOURCE_DIR})
BRLCAD_REGRESSION_TEST(regress-asc "asc2g;g2asc;gdiff;dbupgrade"
TEST_DEFINED)
- endif (TARGET asc2g AND TARGET asc2g)
+ endif (TARGET asc2g)
add_test(NAME regress-asc2dsp COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/asc2dsp.sh" ${CMAKE_SOURCE_DIR})
BRLCAD_REGRESSION_TEST(regress-asc2dsp "cv;asc2pix;pix-bw;asc2dsp"
TEST_DEFINED)
Added: brlcad/branches/bioh/regress/dsp/CMakeLists.txt
===================================================================
--- brlcad/branches/bioh/regress/dsp/CMakeLists.txt
(rev 0)
+++ brlcad/branches/bioh/regress/dsp/CMakeLists.txt 2020-07-17 18:40:13 UTC
(rev 76371)
@@ -0,0 +1,128 @@
+
+if (SH_EXEC AND TARGET mged)
+
+ add_test(NAME regress-dsp COMMAND ${SH_EXEC}
"${CMAKE_CURRENT_SOURCE_DIR}/dsp.sh" ${CMAKE_SOURCE_DIR})
+ BRLCAD_REGRESSION_TEST(regress-dsp "mged;cv;asc2pix;rt;pix-bw" TEST_DEFINED)
+
+endif (SH_EXEC AND TARGET mged)
+
+CMAKEFILES(
+ dsp.sh
+ asc2dsp-new.asc
+ asc2dsp-old.asc
+ dsp-1-1.asc
+ dsp-1-2.asc
+ dsp-2-1.asc
+ dsp-2-2.asc
+ dsp-2-3.asc
+ dsp-2-4.asc
+ dsp-2-5.asc
+ dsp-3-1.asc
+ dsp-3-2.asc
+ dsp-3-3.asc
+ dsp-3-4.asc
+ dsp-3-5.asc
+ dsp-3-6.asc
+ dsp-3-7.asc
+ dsp-3-8.asc
+ dsp-common.sh
+ run-dsp-case-set-0.sh
+ run-dsp-case-set-1.sh
+ run-dsp-case-set-2.sh
+ run-dsp-case-set-3.sh
+ )
+
+# list of temporary files
+set(dsp_outfiles
+ dsp-2-1.bw
+ dsp-2-1.dsp
+ dsp-2-1.g
+ dsp-2-1.log
+ dsp-2-1.pix
+ dsp-2-1.rt.pix
+ dsp-2-2.bw
+ dsp-2-2.dsp
+ dsp-2-2.g
+ dsp-2-2.log
+ dsp-2-2.pix
+ dsp-2-2.rt.pix
+ dsp-2-3.bw
+ dsp-2-3.dsp
+ dsp-2-3.g
+ dsp-2-3.log
+ dsp-2-3.pix
+ dsp-2-3.rt.pix
+ dsp-2-4.bw
+ dsp-2-4.dsp
+ dsp-2-4.g
+ dsp-2-4.log
+ dsp-2-4.pix
+ dsp-2-4.rt.pix
+ dsp-2-5.bw
+ dsp-2-5.dsp
+ dsp-2-5.g
+ dsp-2-5.log
+ dsp-2-5.pix
+ dsp-2-5.rt.pix
+ dsp-3-1.bw
+ dsp-3-1.dsp
+ dsp-3-1.g
+ dsp-3-1.log
+ dsp-3-1.pix
+ dsp-3-1.rt.pix
+ dsp-3-2.bw
+ dsp-3-2.dsp
+ dsp-3-2.g
+ dsp-3-2.log
+ dsp-3-2.pix
+ dsp-3-2.rt.pix
+ dsp-3-3.bw
+ dsp-3-3.dsp
+ dsp-3-3.g
+ dsp-3-3.log
+ dsp-3-3.pix
+ dsp-3-3.rt.pix
+ dsp-3-4.bw
+ dsp-3-4.dsp
+ dsp-3-4.g
+ dsp-3-4.log
+ dsp-3-4.pix
+ dsp-3-4.rt.pix
+ dsp-3-5.bw
+ dsp-3-5.dsp
+ dsp-3-5.g
+ dsp-3-5.log
+ dsp-3-5.pix
+ dsp-3-5.rt.pix
+ dsp-3-6.bw
+ dsp-3-6.dsp
+ dsp-3-6.g
+ dsp-3-6.log
+ dsp-3-6.pix
+ dsp-3-6.rt.pix
+ dsp-3-7.bw
+ dsp-3-7.dsp
+ dsp-3-7.g
+ dsp-3-7.log
+ dsp-3-7.pix
+ dsp-3-7.rt.pix
+ dsp-3-8.bw
+ dsp-3-8.dsp
+ dsp-3-8.g
+ dsp-3-8.log
+ dsp-3-8.pix
+ dsp-3-8.rt.pix
+ dsp.log
+ )
+
+set_property(DIRECTORY APPEND PROPERTY ADDITIONAL_MAKE_CLEAN_FILES
"${dsp_outfiles}")
+DISTCLEAN(${dsp_outfiles})
+
+CMAKEFILES(CMakeLists.txt)
+
+# Local Variables:
+# tab-width: 8
+# mode: cmake
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=2 tabstop=8
Property changes on: brlcad/branches/bioh/regress/dsp/CMakeLists.txt
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Copied: brlcad/branches/bioh/regress/dsp/dsp.sh (from rev 76370,
brlcad/branches/bioh/regress/dsp.sh)
===================================================================
--- brlcad/branches/bioh/regress/dsp/dsp.sh (rev 0)
+++ brlcad/branches/bioh/regress/dsp/dsp.sh 2020-07-17 18:40:13 UTC (rev
76371)
@@ -0,0 +1,101 @@
+#!/bin/sh
+# D S P . S H
+# BRL-CAD
+#
+# Copyright (c) 2010-2020 United States Government as represented by
+# the U.S. Army Research Laboratory.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following
+# disclaimer in the documentation and/or other materials provided
+# with the distribution.
+#
+# 3. The name of the author may not be used to endorse or promote
+# products derived from this software without specific prior written
+# permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+###
+
+# Ensure /bin/sh
+export PATH || (echo "This isn't sh."; sh $0 $*; kill $$)
+
+# source common library functionality, setting ARGS, NAME_OF_THIS,
+# PATH_TO_THIS, and THIS.
+. "$1/regress/library.sh"
+
+if test "x$LOGFILE" = "x" ; then
+ LOGFILE=`pwd`/dsp.log
+ rm -f $LOGFILE
+fi
+log "=== TESTING dsp primitive ==="
+
+MGED="`ensearch mged`"
+if test ! -f "$MGED" ; then
+ log "Unable to find mged, aborting"
+ exit 1
+fi
+
+CV="`ensearch cv`"
+if test ! -f "$CV" ; then
+ log "Unable to find cv, aborting"
+ exit 1
+fi
+
+A2P="`ensearch asc2pix`"
+if test ! -f "$A2P" ; then
+ log "Unable to find asc2pix, aborting"
+ exit 1
+fi
+
+FAILED=0
+
+# note that cases 0 and 1 are not functional yet
+#CASES='0 1 2 3'
+CASES='2 3'
+
+for i in $CASES ; do
+ run "$PATH_TO_THIS/run-dsp-case-set-$i.sh" "$1"
+ ret=$?
+ if [ $ret -gt 0 ] ; then
+ FAILED="`expr $FAILED + 1`"
+ fi
+done
+
+# TODO: create random 10x10 datasets
+
+
+if [ $FAILED = 0 ] ; then
+ log "-> dsp.sh succeeded"
+else
+ log "-> dsp.sh FAILED, see $LOGFILE"
+fi
+
+exit $FAILED
+
+# Local Variables:
+# mode: sh
+# tab-width: 8
+# sh-indentation: 4
+# sh-basic-offset: 4
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=4 tabstop=8
Deleted: brlcad/branches/bioh/regress/dsp.sh
===================================================================
--- brlcad/branches/bioh/regress/dsp.sh 2020-07-17 18:23:05 UTC (rev 76370)
+++ brlcad/branches/bioh/regress/dsp.sh 2020-07-17 18:40:13 UTC (rev 76371)
@@ -1,101 +0,0 @@
-#!/bin/sh
-# D S P . S H
-# BRL-CAD
-#
-# Copyright (c) 2010-2020 United States Government as represented by
-# the U.S. Army Research Laboratory.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-#
-# 3. The name of the author may not be used to endorse or promote
-# products derived from this software without specific prior written
-# permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-###
-
-# Ensure /bin/sh
-export PATH || (echo "This isn't sh."; sh $0 $*; kill $$)
-
-# source common library functionality, setting ARGS, NAME_OF_THIS,
-# PATH_TO_THIS, and THIS.
-. "$1/regress/library.sh"
-
-if test "x$LOGFILE" = "x" ; then
- LOGFILE=`pwd`/dsp.log
- rm -f $LOGFILE
-fi
-log "=== TESTING dsp primitive ==="
-
-MGED="`ensearch mged`"
-if test ! -f "$MGED" ; then
- log "Unable to find mged, aborting"
- exit 1
-fi
-
-CV="`ensearch cv`"
-if test ! -f "$CV" ; then
- log "Unable to find cv, aborting"
- exit 1
-fi
-
-A2P="`ensearch asc2pix`"
-if test ! -f "$A2P" ; then
- log "Unable to find asc2pix, aborting"
- exit 1
-fi
-
-FAILED=0
-
-# note that cases 0 and 1 are not functional yet
-#CASES='0 1 2 3'
-CASES='2 3'
-
-for i in $CASES ; do
- run "$PATH_TO_THIS/dsp/run-dsp-case-set-$i.sh" "$1"
- ret=$?
- if [ $ret -gt 0 ] ; then
- FAILED="`expr $FAILED + 1`"
- fi
-done
-
-# TODO: create random 10x10 datasets
-
-
-if [ $FAILED = 0 ] ; then
- log "-> dsp.sh succeeded"
-else
- log "-> dsp.sh FAILED, see $LOGFILE"
-fi
-
-exit $FAILED
-
-# Local Variables:
-# mode: sh
-# tab-width: 8
-# sh-indentation: 4
-# sh-basic-offset: 4
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=4 tabstop=8
Copied: brlcad/branches/bioh/regress/moss/moss.ref.pix (from rev 76370,
brlcad/branches/bioh/regress/moss.ref.pix)
===================================================================
(Binary files differ)
Copied: brlcad/branches/bioh/regress/moss/moss.sh (from rev 76370,
brlcad/branches/bioh/regress/moss.sh)
===================================================================
--- brlcad/branches/bioh/regress/moss/moss.sh (rev 0)
+++ brlcad/branches/bioh/regress/moss/moss.sh 2020-07-17 18:40:13 UTC (rev
76371)
@@ -0,0 +1,175 @@
+#!/bin/sh
+# M O S S . S H
+# BRL-CAD
+#
+# Copyright (c) 2010-2020 United States Government as represented by
+# the U.S. Army Research Laboratory.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+#
+# 2. Redistributions in binary form must reproduce the above
+# copyright notice, this list of conditions and the following
+# disclaimer in the documentation and/or other materials provided
+# with the distribution.
+#
+# 3. The name of the author may not be used to endorse or promote
+# products derived from this software without specific prior written
+# permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
+# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+###
+
+# Ensure /bin/sh
+export PATH || (echo "This isn't sh."; sh $0 $*; kill $$)
+
+# source common library functionality, setting ARGS, NAME_OF_THIS,
+# PATH_TO_THIS, and THIS.
+. "$1/regress/library.sh"
+
+if test "x$LOGFILE" = "x" ; then
+ LOGFILE=`pwd`/moss.log
+ rm -f $LOGFILE
+fi
+log "=== TESTING moss rendering ==="
+
+RT="`ensearch rt`"
+if test ! -f "$RT" ; then
+ log "Unable to find rt, aborting"
+ exit 1
+fi
+A2G="`ensearch asc2g`"
+if test ! -f "$A2G" ; then
+ log "Unable to find asc2g, aborting"
+ exit 1
+fi
+PIXDIFF="`ensearch pixdiff`"
+if test ! -f "$PIXDIFF" ; then
+ log "Unable to find pixdiff, aborting"
+ exit 1
+fi
+PIX2PNG="`ensearch pix-png`"
+if test ! -f "$PIX2PNG" ; then
+ log "Unable to find pix-png, aborting"
+ exit 1
+fi
+PNG2PIX="`ensearch png-pix`"
+if test ! -f "$PNG2PIX" ; then
+ log "Unable to find png-pix, aborting"
+ exit 1
+fi
+
+
+rm -f moss.asc
+cat > moss.asc << EOF
+I 0 v4
+Gary Moss's "World on a Platter"
+S 16 tor 6 4.916235923767e+00 -3.280223083496e+01 3.171177673340e+01
0.000000000000e+00 5.079999923706e+00 0.000000000000e+00 -1.796051025391e+01
0.000000000000e+00 1.796051025391e+01 -1.796051025391e+01 0.000000000000e+00
-1.796051025391e+01 -1.436841011047e+01 0.000000000000e+00 1.436841011047e+01
-1.436840915680e+01 0.000000000000e+00 -1.436840915680e+01 -2.155261230469e+01
0.000000000000e+00 2.155261230469e+01 -2.155261230469e+01 0.000000000000e+00
-2.155261230469e+01
+S 20 platform.s 1 8.971723937988e+01 -6.957164001465e+01 -2.376846313477e+01
0.000000000000e+00 1.390160369873e+02 0.000000000000e+00 0.000000000000e+00
1.390160369873e+02 6.950803756714e+00 0.000000000000e+00 0.000000000000e+00
6.950803756714e+00 -1.390160369873e+02 0.000000000000e+00 0.000000000000e+00
-1.390160369873e+02 1.390160369873e+02 0.000000000000e+00 -1.390160369873e+02
1.390160369873e+02 6.950803756714e+00 -1.390160369873e+02 0.000000000000e+00
6.950803756714e+00
+S 20 box.s 1 3.002833557129e+01 -5.211529731750e+00 -1.637908935547e+01
0.000000000000e+00 2.679275512695e+01 0.000000000000e+00 0.000000000000e+00
2.679275512695e+01 2.679275512695e+01 0.000000000000e+00 0.000000000000e+00
2.679275512695e+01 -2.679275512695e+01 0.000000000000e+00 0.000000000000e+00
-2.679275512695e+01 2.679275512695e+01 0.000000000000e+00 -2.679275512695e+01
2.679275512695e+01 2.679275512695e+01 -2.679275512695e+01 0.000000000000e+00
2.679275512695e+01
+S 18 cone.s 5 1.687542724609e+01 -3.474353027344e+01 -1.637908935547e+01
0.000000000000e+00 0.000000000000e+00 2.644671630859e+01 9.350327491760e+00
-9.350327491760e+00 0.000000000000e+00 9.350327491760e+00 9.350327491760e+00
0.000000000000e+00 4.339659690857e+00 -4.339659690857e+00 0.000000000000e+00
1.453863143921e+00 1.453863143921e+00 0.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
0.000000000000e+00
+S 19 ellipse.s 4 1.613092041016e+01 4.665559387207e+01 -3.722520828247e+00
1.487607192993e+01 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
8.980256080627e+00 -8.980256080627e+00 0.000000000000e+00 8.980256080627e+00
8.980256080627e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
0.000000000000e+00
+C Y platform.r 1000 0 1 -16081 0 0 1 80 150 230 0 0 0
+M + platform.s 1.000000000000e+00 0.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 1.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 1.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
1.000000000000e+00 16268
+C Y box.r 2000 0 1 -16558 0 0 1 100 190 190 0 0 0
+M + box.s 1.000000000000e+00 0.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 1.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 1.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
1.000000000000e+00 16519
+C Y ellipse.r 4000 0 1 16619 0 0 1 100 210 100 0 0 0
+M + ellipse.s 1.000000000000e+00 0.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 1.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 1.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
1.000000000000e+00 0
+C Y cone.r 3000 0 1 -16209 0 0 1 255 100 255 0 0 0
+M + cone.s 1.000000000000e+00 0.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 1.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 1.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
1.000000000000e+00 0
+C Y tor.r 6000 0 1 -16219 0 0 1 240 240 0 0 0 0
+M + tor 1.000000000000e+00 0.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 1.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 1.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
1.000000000000e+00 16473
+S 19 LIGHT 11 2.015756225586e+01 -1.352595329285e+01 5.034742355347e+00
2.539999961853e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
2.539999961853e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
2.539999961853e+00 6.652935973394e-32 -1.768683290104e-12 -4.437394240169e-21
0.000000000000e+00 -5.077455353676e-19 -2.153920654297e+03 0.000000000000e+00
0.000000000000e+00 -5.077455353676e-19 -5.400174699785e-19 0.000000000000e+00
0.000000000000e+00
+C Y light.r 1000 0 1 0 1 100 1 255 255 255 1 0 0
+light
+M u LIGHT 1.000000000000e+00 0.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 1.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 1.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
1.000000000000e+00 0
+C N all.g -1 0 6 16619 0 0 0 0 0 0 0 0 0
+M u platform.r 1.000000000000e+00 0.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 1.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 1.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
1.000000000000e+00 0
+M u box.r 1.000000000000e+00 0.000000000000e+00 0.000000000000e+00
-2.369892883301e+01 0.000000000000e+00 1.000000000000e+00 0.000000000000e+00
1.340998744965e+01 0.000000000000e+00 0.000000000000e+00 1.000000000000e+00
8.023991584778e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
1.000000000000e+00 0
+M u cone.r 1.000000000000e+00 0.000000000000e+00 0.000000000000e+00
2.204924011230e+01 0.000000000000e+00 1.000000000000e+00 0.000000000000e+00
1.223486709595e+01 0.000000000000e+00 0.000000000000e+00 1.000000000000e+00
2.111249841619e-07 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
1.000000000000e+00 0
+M u ellipse.r 1.000000000000e+00 0.000000000000e+00 0.000000000000e+00
1.467929267883e+01 0.000000000000e+00 1.000000000000e+00 0.000000000000e+00
-4.160771179199e+01 0.000000000000e+00 0.000000000000e+00 1.000000000000e+00
3.879878234863e+01 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
1.000000000000e+00 0
+M u tor.r 1.000000000000e+00 0.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 1.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 1.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
1.000000000000e+00 0
+M u light.r 1.000000000000e+00 0.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 1.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 1.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
1.000000000000e+00 0
+EOF
+
+rm -f moss.g
+run $A2G moss.asc moss.g
+
+log "... rendering moss"
+rm -f moss.pix
+$RT -P 1 -B -C0/0/50 -M -s 512 -o moss.pix moss.g all.g >> $LOGFILE 2>&1 << EOF
+viewsize 1.572026215e+02;
+eye_pt 6.379990387e+01 3.271768951e+01 3.366661453e+01;
+viewrot -5.735764503e-01 8.191520572e-01 0.000000000e+00
+0.000000000e+00 -3.461886346e-01 -2.424038798e-01 9.063078165e-01
+0.000000000e+00 7.424039245e-01 5.198368430e-01 4.226182699e-01
+0.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00
+1.000000000e+00 ;
+start 0;
+end;
+EOF
+
+
+if [ ! -f moss.pix ] ; then
+ log "raytrace failed to create moss.pix"
+ NUMBER_WRONG=-1
+else
+ if [ ! -f "$PATH_TO_THIS/moss.ref.pix" ] ; then
+ log "No reference file for moss.pix"
+ else
+ log "... running $PIXDIFF moss.pix $PATH_TO_THIS/moss.ref.pix >
moss.pix.diff"
+ rm -f moss.pix.diff
+ $PIXDIFF moss.pix $PATH_TO_THIS/moss.ref.pix > moss.pix.diff 2>>
$LOGFILE
+ different="`tail -n1 $LOGFILE | tr , '\012' | grep many`"
+ log "moss.pix vs $PATH_TO_THIS/moss.ref.pix differences:"
+ log "$different"
+ fi
+
+ log "... running $PIX2PNG -s 512 moss.pix > moss.pix.png"
+ rm -f moss.pix.png
+ $PIX2PNG -s 512 moss.pix > moss.pix.png 2>> $LOGFILE
+
+ log "... running $PNG2PIX moss.pix.png > moss.pix.png.pix"
+ rm -f moss.pix.png.pix
+ $PNG2PIX moss.pix.png > moss.pix.png.pix 2>> $LOGFILE
+
+ log "... running $PIXDIFF moss.pix moss.pix.png.pix > moss.roundtrip.diff"
+ rm -f moss.roundtrip.diff
+ $PIXDIFF moss.pix moss.pix.png.pix > moss.roundtrip.diff 2>> $LOGFILE
+
+ NUMBER_WRONG=`tail -n1 $LOGFILE | tr , '\012' | awk '/many/ {print $1}'`
+ log "moss.pix $NUMBER_WRONG off by many"
+fi
+
+
+if [ X$NUMBER_WRONG = X0 ] ; then
+ log "-> moss.sh succeeded"
+else
+ log "-> moss.sh FAILED, see $LOGFILE"
+fi
+
+exit $NUMBER_WRONG
+
+# Local Variables:
+# mode: sh
+# tab-width: 8
+# sh-indentation: 4
+# sh-basic-offset: 4
+# indent-tabs-mode: t
+# End:
+# ex: shiftwidth=4 tabstop=8
Deleted: brlcad/branches/bioh/regress/moss.ref.pix
===================================================================
(Binary files differ)
Deleted: brlcad/branches/bioh/regress/moss.sh
===================================================================
--- brlcad/branches/bioh/regress/moss.sh 2020-07-17 18:23:05 UTC (rev
76370)
+++ brlcad/branches/bioh/regress/moss.sh 2020-07-17 18:40:13 UTC (rev
76371)
@@ -1,175 +0,0 @@
-#!/bin/sh
-# M O S S . S H
-# BRL-CAD
-#
-# Copyright (c) 2010-2020 United States Government as represented by
-# the U.S. Army Research Laboratory.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-#
-# 3. The name of the author may not be used to endorse or promote
-# products derived from this software without specific prior written
-# permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
-# OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
-# GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-# NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-###
-
-# Ensure /bin/sh
-export PATH || (echo "This isn't sh."; sh $0 $*; kill $$)
-
-# source common library functionality, setting ARGS, NAME_OF_THIS,
-# PATH_TO_THIS, and THIS.
-. "$1/regress/library.sh"
-
-if test "x$LOGFILE" = "x" ; then
- LOGFILE=`pwd`/moss.log
- rm -f $LOGFILE
-fi
-log "=== TESTING moss rendering ==="
-
-RT="`ensearch rt`"
-if test ! -f "$RT" ; then
- log "Unable to find rt, aborting"
- exit 1
-fi
-A2G="`ensearch asc2g`"
-if test ! -f "$A2G" ; then
- log "Unable to find asc2g, aborting"
- exit 1
-fi
-PIXDIFF="`ensearch pixdiff`"
-if test ! -f "$PIXDIFF" ; then
- log "Unable to find pixdiff, aborting"
- exit 1
-fi
-PIX2PNG="`ensearch pix-png`"
-if test ! -f "$PIX2PNG" ; then
- log "Unable to find pix-png, aborting"
- exit 1
-fi
-PNG2PIX="`ensearch png-pix`"
-if test ! -f "$PNG2PIX" ; then
- log "Unable to find png-pix, aborting"
- exit 1
-fi
-
-
-rm -f moss.asc
-cat > moss.asc << EOF
-I 0 v4
-Gary Moss's "World on a Platter"
-S 16 tor 6 4.916235923767e+00 -3.280223083496e+01 3.171177673340e+01
0.000000000000e+00 5.079999923706e+00 0.000000000000e+00 -1.796051025391e+01
0.000000000000e+00 1.796051025391e+01 -1.796051025391e+01 0.000000000000e+00
-1.796051025391e+01 -1.436841011047e+01 0.000000000000e+00 1.436841011047e+01
-1.436840915680e+01 0.000000000000e+00 -1.436840915680e+01 -2.155261230469e+01
0.000000000000e+00 2.155261230469e+01 -2.155261230469e+01 0.000000000000e+00
-2.155261230469e+01
-S 20 platform.s 1 8.971723937988e+01 -6.957164001465e+01 -2.376846313477e+01
0.000000000000e+00 1.390160369873e+02 0.000000000000e+00 0.000000000000e+00
1.390160369873e+02 6.950803756714e+00 0.000000000000e+00 0.000000000000e+00
6.950803756714e+00 -1.390160369873e+02 0.000000000000e+00 0.000000000000e+00
-1.390160369873e+02 1.390160369873e+02 0.000000000000e+00 -1.390160369873e+02
1.390160369873e+02 6.950803756714e+00 -1.390160369873e+02 0.000000000000e+00
6.950803756714e+00
-S 20 box.s 1 3.002833557129e+01 -5.211529731750e+00 -1.637908935547e+01
0.000000000000e+00 2.679275512695e+01 0.000000000000e+00 0.000000000000e+00
2.679275512695e+01 2.679275512695e+01 0.000000000000e+00 0.000000000000e+00
2.679275512695e+01 -2.679275512695e+01 0.000000000000e+00 0.000000000000e+00
-2.679275512695e+01 2.679275512695e+01 0.000000000000e+00 -2.679275512695e+01
2.679275512695e+01 2.679275512695e+01 -2.679275512695e+01 0.000000000000e+00
2.679275512695e+01
-S 18 cone.s 5 1.687542724609e+01 -3.474353027344e+01 -1.637908935547e+01
0.000000000000e+00 0.000000000000e+00 2.644671630859e+01 9.350327491760e+00
-9.350327491760e+00 0.000000000000e+00 9.350327491760e+00 9.350327491760e+00
0.000000000000e+00 4.339659690857e+00 -4.339659690857e+00 0.000000000000e+00
1.453863143921e+00 1.453863143921e+00 0.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
0.000000000000e+00
-S 19 ellipse.s 4 1.613092041016e+01 4.665559387207e+01 -3.722520828247e+00
1.487607192993e+01 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
8.980256080627e+00 -8.980256080627e+00 0.000000000000e+00 8.980256080627e+00
8.980256080627e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
0.000000000000e+00
-C Y platform.r 1000 0 1 -16081 0 0 1 80 150 230 0 0 0
-M + platform.s 1.000000000000e+00 0.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 1.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 1.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
1.000000000000e+00 16268
-C Y box.r 2000 0 1 -16558 0 0 1 100 190 190 0 0 0
-M + box.s 1.000000000000e+00 0.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 1.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 1.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
1.000000000000e+00 16519
-C Y ellipse.r 4000 0 1 16619 0 0 1 100 210 100 0 0 0
-M + ellipse.s 1.000000000000e+00 0.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 1.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 1.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
1.000000000000e+00 0
-C Y cone.r 3000 0 1 -16209 0 0 1 255 100 255 0 0 0
-M + cone.s 1.000000000000e+00 0.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 1.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 1.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
1.000000000000e+00 0
-C Y tor.r 6000 0 1 -16219 0 0 1 240 240 0 0 0 0
-M + tor 1.000000000000e+00 0.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 1.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 1.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
1.000000000000e+00 16473
-S 19 LIGHT 11 2.015756225586e+01 -1.352595329285e+01 5.034742355347e+00
2.539999961853e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
2.539999961853e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
2.539999961853e+00 6.652935973394e-32 -1.768683290104e-12 -4.437394240169e-21
0.000000000000e+00 -5.077455353676e-19 -2.153920654297e+03 0.000000000000e+00
0.000000000000e+00 -5.077455353676e-19 -5.400174699785e-19 0.000000000000e+00
0.000000000000e+00
-C Y light.r 1000 0 1 0 1 100 1 255 255 255 1 0 0
-light
-M u LIGHT 1.000000000000e+00 0.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 1.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 1.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
1.000000000000e+00 0
-C N all.g -1 0 6 16619 0 0 0 0 0 0 0 0 0
-M u platform.r 1.000000000000e+00 0.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 1.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 1.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
1.000000000000e+00 0
-M u box.r 1.000000000000e+00 0.000000000000e+00 0.000000000000e+00
-2.369892883301e+01 0.000000000000e+00 1.000000000000e+00 0.000000000000e+00
1.340998744965e+01 0.000000000000e+00 0.000000000000e+00 1.000000000000e+00
8.023991584778e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
1.000000000000e+00 0
-M u cone.r 1.000000000000e+00 0.000000000000e+00 0.000000000000e+00
2.204924011230e+01 0.000000000000e+00 1.000000000000e+00 0.000000000000e+00
1.223486709595e+01 0.000000000000e+00 0.000000000000e+00 1.000000000000e+00
2.111249841619e-07 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
1.000000000000e+00 0
-M u ellipse.r 1.000000000000e+00 0.000000000000e+00 0.000000000000e+00
1.467929267883e+01 0.000000000000e+00 1.000000000000e+00 0.000000000000e+00
-4.160771179199e+01 0.000000000000e+00 0.000000000000e+00 1.000000000000e+00
3.879878234863e+01 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
1.000000000000e+00 0
-M u tor.r 1.000000000000e+00 0.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 1.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 1.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
1.000000000000e+00 0
-M u light.r 1.000000000000e+00 0.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 1.000000000000e+00 0.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 1.000000000000e+00
0.000000000000e+00 0.000000000000e+00 0.000000000000e+00 0.000000000000e+00
1.000000000000e+00 0
-EOF
-
-rm -f moss.g
-run $A2G moss.asc moss.g
-
-log "... rendering moss"
-rm -f moss.pix
-$RT -P 1 -B -C0/0/50 -M -s 512 -o moss.pix moss.g all.g >> $LOGFILE 2>&1 << EOF
-viewsize 1.572026215e+02;
-eye_pt 6.379990387e+01 3.271768951e+01 3.366661453e+01;
-viewrot -5.735764503e-01 8.191520572e-01 0.000000000e+00
-0.000000000e+00 -3.461886346e-01 -2.424038798e-01 9.063078165e-01
-0.000000000e+00 7.424039245e-01 5.198368430e-01 4.226182699e-01
-0.000000000e+00 0.000000000e+00 0.000000000e+00 0.000000000e+00
-1.000000000e+00 ;
-start 0;
-end;
-EOF
-
-
-if [ ! -f moss.pix ] ; then
- log "raytrace failed to create moss.pix"
- NUMBER_WRONG=-1
-else
- if [ ! -f "$PATH_TO_THIS/moss.ref.pix" ] ; then
- log "No reference file for moss.pix"
- else
- log "... running $PIXDIFF moss.pix $PATH_TO_THIS/moss.ref.pix >
moss.pix.diff"
- rm -f moss.pix.diff
- $PIXDIFF moss.pix $PATH_TO_THIS/moss.ref.pix > moss.pix.diff 2>>
$LOGFILE
- different="`tail -n1 $LOGFILE | tr , '\012' | grep many`"
- log "moss.pix vs $PATH_TO_THIS/moss.ref.pix differences:"
- log "$different"
- fi
-
- log "... running $PIX2PNG -s 512 moss.pix > moss.pix.png"
- rm -f moss.pix.png
- $PIX2PNG -s 512 moss.pix > moss.pix.png 2>> $LOGFILE
-
- log "... running $PNG2PIX moss.pix.png > moss.pix.png.pix"
- rm -f moss.pix.png.pix
- $PNG2PIX moss.pix.png > moss.pix.png.pix 2>> $LOGFILE
-
- log "... running $PIXDIFF moss.pix moss.pix.png.pix > moss.roundtrip.diff"
- rm -f moss.roundtrip.diff
- $PIXDIFF moss.pix moss.pix.png.pix > moss.roundtrip.diff 2>> $LOGFILE
-
- NUMBER_WRONG=`tail -n1 $LOGFILE | tr , '\012' | awk '/many/ {print $1}'`
- log "moss.pix $NUMBER_WRONG off by many"
-fi
-
-
-if [ X$NUMBER_WRONG = X0 ] ; then
- log "-> moss.sh succeeded"
-else
- log "-> moss.sh FAILED, see $LOGFILE"
-fi
-
-exit $NUMBER_WRONG
-
-# Local Variables:
-# mode: sh
-# tab-width: 8
-# sh-indentation: 4
-# sh-basic-offset: 4
-# indent-tabs-mode: t
-# End:
-# ex: shiftwidth=4 tabstop=8
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
