Revision: 41860
http://brlcad.svn.sourceforge.net/brlcad/?rev=41860&view=rev
Author: erikgreenwald
Date: 2010-12-30 18:58:04 +0000 (Thu, 30 Dec 2010)
Log Message:
-----------
change from automake hackery to C #include hackery
Modified Paths:
--------------
brlcad/trunk/misc/win32-msvc8/libtie/libtie.vcproj
brlcad/trunk/src/adrt/Makefile.am
brlcad/trunk/src/adrt/libtie/tie.c
Added Paths:
-----------
brlcad/trunk/src/adrt/libtie/tie0.c
brlcad/trunk/src/adrt/libtie/tie1.c
brlcad/trunk/src/adrt/libtie/tie_kdtree0.c
brlcad/trunk/src/adrt/libtie/tie_kdtree1.c
Modified: brlcad/trunk/misc/win32-msvc8/libtie/libtie.vcproj
===================================================================
--- brlcad/trunk/misc/win32-msvc8/libtie/libtie.vcproj 2010-12-30 18:42:39 UTC
(rev 41859)
+++ brlcad/trunk/misc/win32-msvc8/libtie/libtie.vcproj 2010-12-30 18:58:04 UTC
(rev 41860)
@@ -229,13 +229,21 @@
Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat;f90;for;f;fpp"
>
<File
- RelativePath="..\..\..\src\tie\libtie\tie.c"
+ RelativePath="..\..\..\src\tie\libtie\tie0.c"
>
</File>
<File
-
RelativePath="..\..\..\src\tie\libtie\tie_kdtree.c"
+ RelativePath="..\..\..\src\tie\libtie\tie1.c"
>
</File>
+ <File
+
RelativePath="..\..\..\src\tie\libtie\tie_kdtree0.c"
+ >
+ </File>
+ <File
+
RelativePath="..\..\..\src\tie\libtie\tie_kdtree1.c"
+ >
+ </File>
</Filter>
<Filter
Name="Header Files"
Modified: brlcad/trunk/src/adrt/Makefile.am
===================================================================
--- brlcad/trunk/src/adrt/Makefile.am 2010-12-30 18:42:39 UTC (rev 41859)
+++ brlcad/trunk/src/adrt/Makefile.am 2010-12-30 18:58:04 UTC (rev 41860)
@@ -10,18 +10,13 @@
lib_LTLIBRARIES = libtie.la librender.la
-libtie_la_LIBADD = libtie0.la libtie1.la ${BU} ${BU_LIBS}
-libtie_la_SOURCES =
+libtie_la_LIBADD = ${BU} ${BU_LIBS}
+libtie_la_SOURCES = \
+ libtie/tie0.c \
+ libtie/tie1.c \
+ libtie/tie_kdtree0.c \
+ libtie/tie_kdtree1.c
-SOURCES = libtie/tie.c libtie/tie_kdtree.c
-libtie0_la_SOURCES = $(SOURCES)
-libtie1_la_SOURCES = $(SOURCES)
-
-libtie0_la_CFLAGS = -DTIE_PRECISION=0
-libtie1_la_CFLAGS = -DTIE_PRECISION=1
-
-noinst_LTLIBRARIES = libtie0.la libtie1.la
-
librender_la_SOURCES = \
load.c \
load_g.c \
@@ -96,6 +91,8 @@
isst.h \
isst.tcl \
isst_tcltk.c \
+ libtie/tie.c \
+ libtie/tie_kdtree.c \
master/compnet.h \
master/master.h \
master/tienet_master.c \
Modified: brlcad/trunk/src/adrt/libtie/tie.c
===================================================================
--- brlcad/trunk/src/adrt/libtie/tie.c 2010-12-30 18:42:39 UTC (rev 41859)
+++ brlcad/trunk/src/adrt/libtie/tie.c 2010-12-30 18:58:04 UTC (rev 41860)
@@ -47,13 +47,13 @@
#endif
#define TIE_DEGENERATE_THRESHOLD 0.0001
-TIE_VAL(int tie_check_degenerate) = 1;
/*************************************************************
**************** PRIVATE FUNCTIONS **************************
*************************************************************/
-static void tie_tri_prep(tie_t *tie)
+static void
+TIE_VAL(tie_tri_prep)(tie_t *tie)
{
TIE_3 v1, v2, u, v;
unsigned int i, i1, i2;
@@ -170,7 +170,7 @@
tie_kdtree_prep (tie);
/* Prep all the triangles */
- tie_tri_prep (tie);
+ TIE_VAL(tie_tri_prep) (tie);
bu_log("total tri: %ld\n", tie->tri_num);
}
Added: brlcad/trunk/src/adrt/libtie/tie0.c
===================================================================
--- brlcad/trunk/src/adrt/libtie/tie0.c (rev 0)
+++ brlcad/trunk/src/adrt/libtie/tie0.c 2010-12-30 18:58:04 UTC (rev 41860)
@@ -0,0 +1,28 @@
+/* T I E 0 . C
+ * BRL-CAD
+ *
+ * Copyright (c) 2008-2010 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; see the file named COPYING for more
+ * information.
+ */
+
+/** @file tie0.c
+ * tie0.c
+ *
+ */
+
+#define TIE_PRECISION 0
+#include "./tie.c"
+#undef TIE_PRECISION
Property changes on: brlcad/trunk/src/adrt/libtie/tie0.c
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: brlcad/trunk/src/adrt/libtie/tie1.c
===================================================================
--- brlcad/trunk/src/adrt/libtie/tie1.c (rev 0)
+++ brlcad/trunk/src/adrt/libtie/tie1.c 2010-12-30 18:58:04 UTC (rev 41860)
@@ -0,0 +1,29 @@
+/* T I E 1 . C
+ * BRL-CAD
+ *
+ * Copyright (c) 2008-2010 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; see the file named COPYING for more
+ * information.
+ */
+/** @file tie1.c
+ * tie1.c
+ *
+ */
+
+#define TIE_PRECISION 1
+#include "./tie.c"
+#undef TIE_PRECISION
+
+
Property changes on: brlcad/trunk/src/adrt/libtie/tie1.c
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: brlcad/trunk/src/adrt/libtie/tie_kdtree0.c
===================================================================
--- brlcad/trunk/src/adrt/libtie/tie_kdtree0.c (rev 0)
+++ brlcad/trunk/src/adrt/libtie/tie_kdtree0.c 2010-12-30 18:58:04 UTC (rev
41860)
@@ -0,0 +1,28 @@
+/* T I E _ K D T R E E 0 . C
+ * BRL-CAD
+ *
+ * Copyright (c) 2008-2010 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; see the file named COPYING for more
+ * information.
+ */
+/** @file tie_kdtree0.c
+ * tie_kdtree0.c
+ *
+ */
+
+#define TIE_PRECISION 0
+#include "./tie_kdtree.c"
+#undef TIE_PRECISION
+
Property changes on: brlcad/trunk/src/adrt/libtie/tie_kdtree0.c
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Added: brlcad/trunk/src/adrt/libtie/tie_kdtree1.c
===================================================================
--- brlcad/trunk/src/adrt/libtie/tie_kdtree1.c (rev 0)
+++ brlcad/trunk/src/adrt/libtie/tie_kdtree1.c 2010-12-30 18:58:04 UTC (rev
41860)
@@ -0,0 +1,28 @@
+/* T I E _ K D T R E E 1 . C
+ * BRL-CAD
+ *
+ * Copyright (c) 2008-2010 United States Government as represented by
+ * the U.S. Army Research Laboratory.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public License
+ * version 2.1 as published by the Free Software Foundation.
+ *
+ * This library is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this file; see the file named COPYING for more
+ * information.
+ */
+/** @file tie_kdtree1.c
+ * tie_kdtree1.c
+ *
+ */
+
+#define TIE_PRECISION 1
+#include "./tie_kdtree.c"
+#undef TIE_PRECISION
+
Property changes on: brlcad/trunk/src/adrt/libtie/tie_kdtree1.c
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Learn how Oracle Real Application Clusters (RAC) One Node allows customers
to consolidate database storage, standardize their database environment, and,
should the need arise, upgrade to a full multi-node Oracle RAC database
without downtime or disruption
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
