Revision: 43146
http://brlcad.svn.sourceforge.net/brlcad/?rev=43146&view=rev
Author: starseeker
Date: 2011-02-08 21:46:48 +0000 (Tue, 08 Feb 2011)
Log Message:
-----------
MFC 43145
Modified Paths:
--------------
brlcad/branches/cmake/BUGS
brlcad/branches/cmake/sh/make_deb.sh
brlcad/branches/cmake/sh/make_rpm.sh
brlcad/branches/cmake/src/librt/primitives/bot/g_bot_include.c
brlcad/branches/cmake/src/tclscripts/archer/Archer.tcl
Property Changed:
----------------
brlcad/branches/cmake/misc/debian/application-x-brlcad-extension.xml
Modified: brlcad/branches/cmake/BUGS
===================================================================
--- brlcad/branches/cmake/BUGS 2011-02-08 21:38:02 UTC (rev 43145)
+++ brlcad/branches/cmake/BUGS 2011-02-08 21:46:48 UTC (rev 43146)
@@ -15,6 +15,17 @@
Recent Bugs
-----------
+* run make to create all primitives at the origin. there are raytrace
+ differences, crashes, and overall bad behavior between default
+ ungrouped "e *" view and adding all of those primitives to a single
+ region. Script for creating all primitives via make command:
+
+ for i in `mged -c test.g make asdf asdf 2>&1 | awk '{print $12}' | sed
's/[<>|]/ /g'` ; do mged -c test.g make $i $i ; done
+ mged -c test.g "g primitives *"
+ mged -c test.g r primitives.r u primitives
+ rt -a 35 -e 25 test.g primitives
+ rt -a 35 -e 25 test.g primitives.r
+
* MGED on Mac OS X 10.6 mouse bindings fail to zoom in incrementally.
Pan, zoom out, and interactive zoom work. Shift-grip bindings need
to be verified.
Property changes on:
brlcad/branches/cmake/misc/debian/application-x-brlcad-extension.xml
___________________________________________________________________
Modified: svn:mime-type
- application/xml
+ text/xml
Modified: brlcad/branches/cmake/sh/make_deb.sh
===================================================================
--- brlcad/branches/cmake/sh/make_deb.sh 2011-02-08 21:38:02 UTC (rev
43145)
+++ brlcad/branches/cmake/sh/make_deb.sh 2011-02-08 21:46:48 UTC (rev
43146)
@@ -72,7 +72,7 @@
# test if in project root
if test ! -f misc/debian/control ; then
- ferror "\"make_deb.sh\" should run from project root directory."
"Exiting..."
+ ferror "\"make_deb.sh\" should be run from project root directory."
"Exiting..."
fi
# test if in debian like system
Modified: brlcad/branches/cmake/sh/make_rpm.sh
===================================================================
--- brlcad/branches/cmake/sh/make_rpm.sh 2011-02-08 21:38:02 UTC (rev
43145)
+++ brlcad/branches/cmake/sh/make_rpm.sh 2011-02-08 21:46:48 UTC (rev
43146)
@@ -47,7 +47,7 @@
# test if in project root
if test ! -f misc/debian/control ; then
- ferror "\"make_rpm.sh\" should run from project root directory."
"Exiting..."
+ ferror "\"make_rpm.sh\" should be run from project root directory."
"Exiting..."
fi
# get distribution name
@@ -59,34 +59,19 @@
}
fdist fedora
-#fdist opensuse
+fdist openSUSE
if test "$DNAME" = "" ;then
- ferror "only \"fedora\" suported at this moment" "Exiting..."
+ ferror "Only \"fedora\" and \"openSUSE\" suported at this time"
"Exiting..."
fi
-# set variables
-BVERSION=`cat include/conf/MAJOR`"."`cat include/conf/MINOR`"."`cat
include/conf/PATCH`
-BVERSION=`echo $BVERSION | sed 's/[^0-9.]//g'`
-TMPDIR="misc/$DNAME-tmp"
-RELEASE="0"
-
-if test `uname -m | grep -iwE "i[3-6]86" | wc -l` -eq 1 ;then
- ARCH=`uname -m`
- SARCH="i[3-6]86"
- FARCH="x86-32"
-fi
-if test `uname -m | grep -iwE "x86_64" | wc -l` -eq 1 ;then
- ARCH=`uname -m`
- SARCH=$ARCH
- FARCH="x86-64"
-fi
-
# check needed packages
-echo "checking system..."
E=0
+if test ! -x "`which rpm 2>/dev/null`" ; then
+ ferror "Missing \"rpm\" command" "Exiting..."
+fi
fcheck(){
- if test `yum list installed | grep -i "\<$1\.$SARCH" | wc -l` -eq 0 ; then
+ if ! `rpm -q $1 &>/dev/null` ; then
LLIST=$LLIST" "$1
E=1
fi
@@ -106,10 +91,41 @@
fcheck ncurses-devel
fi
+if test "$DNAME" = "openSUSE" ;then
+ fcheck rpm
+ fcheck fakeroot
+ fcheck gcc-c++
+ fcheck make
+ fcheck bison
+ fcheck flex
+ fcheck libXi6-devel
+ fcheck libxslt
+ fcheck Mesa-devel
+ fcheck pango-devel
+ fcheck ncurses-devel
+fi
+
if [ $E -eq 1 ]; then
ferror "Mandatory to install these packages first:" "$LLIST"
fi
+# set variables
+BVERSION=`cat include/conf/MAJOR | sed 's/[^0-9]//g'`"."`cat
include/conf/MINOR | sed 's/[^0-9]//g'`"."`cat include/conf/PATCH | sed
's/[^0-9]//g'`
+TMPDIR="misc/$DNAME-tmp"
+RELEASE="0"
+
+if test `gcc -dumpmachine | grep -iE "i[3-6]86" | wc -l` -eq 1 ;then
+ ARCH="i386"
+ SARCH="i[3-6]86"
+ FARCH="x86-32"
+elif test `gcc -dumpmachine | grep -iE "x86_64" | wc -l` -eq 1 ;then
+ ARCH=`uname -m`
+ SARCH=$ARCH
+ FARCH="x86-64"
+else
+ ferror "Unknown architecture. \"`gcc -dumpmachine`\"" "Exiting..."
+fi
+
# #
rm -Rf $TMPDIR
mkdir -p $TMPDIR/tmp
@@ -224,6 +240,10 @@
update-mime-database /usr/share/mime
fi
+if [ -x "`which SuSEconfig 2>/dev/null`" ]; then
+ SuSEconfig
+fi
+
%postun
set -e
@@ -235,6 +255,10 @@
update-mime-database /usr/share/mime
fi
+if [ -x "`which SuSEconfig 2>/dev/null`" ]; then
+ SuSEconfig
+fi
+
%files' > $TMPDIR/brlcad.spec
find $TMPDIR/tmp/ -type d | sed 's:'$TMPDIR'/tmp:%dir ":' | sed 's:$:":' >>
$TMPDIR/brlcad.spec
Modified: brlcad/branches/cmake/src/librt/primitives/bot/g_bot_include.c
===================================================================
--- brlcad/branches/cmake/src/librt/primitives/bot/g_bot_include.c
2011-02-08 21:38:02 UTC (rev 43145)
+++ brlcad/branches/cmake/src/librt/primitives/bot/g_bot_include.c
2011-02-08 21:46:48 UTC (rev 43146)
@@ -983,7 +983,6 @@
}
if ((nhits&1)) {
-#if 1
/* XXX This consumes an extra hit structure in the array */
if (psp) {
(void)rt_htbl_get(&psp->htab); /* make sure space exists in
the hit array */
@@ -997,9 +996,6 @@
hits[nhits].hit_vpriv[X] = -hits[nhits].hit_vpriv[X];
nhits++;
}
-#else
- nhits--;
-#endif
}
/* nhits is even, build segments */
Modified: brlcad/branches/cmake/src/tclscripts/archer/Archer.tcl
===================================================================
--- brlcad/branches/cmake/src/tclscripts/archer/Archer.tcl 2011-02-08
21:38:02 UTC (rev 43145)
+++ brlcad/branches/cmake/src/tclscripts/archer/Archer.tcl 2011-02-08
21:46:48 UTC (rev 43146)
@@ -226,6 +226,7 @@
method track {args}
method units {args}
method vmake {args}
+ method zap {args}
method initImages {}
method initFbImages {}
method setDefaultBindingMode {_mode}
@@ -1794,7 +1795,11 @@
# eval ArcherCore::gedWrapper vmake 0 0 1 1 $args
}
+::itcl::body Archer::zap {args} {
+ eval ArcherCore::gedWrapper zap 0 0 0 1 $args
+}
+
::itcl::body Archer::initImages {} {
if {$mInstanceInit} {
return
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
The ultimate all-in-one performance toolkit: Intel(R) Parallel Studio XE:
Pinpoint memory and threading errors before they happen.
Find and fix more than 250 security defects in the development cycle.
Locate bottlenecks in serial and parallel code that limit performance.
http://p.sf.net/sfu/intel-dev2devfeb
_______________________________________________
BRL-CAD Source Commits mailing list
brlcad-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
