Revision: 42269
http://brlcad.svn.sourceforge.net/brlcad/?rev=42269&view=rev
Author: brlcad
Date: 2011-01-14 19:26:24 +0000 (Fri, 14 Jan 2011)
Log Message:
-----------
separate out the v4 database conversion routines that were oddly in tree.c out
into their own db_float.c (since they mostly deal with converting to/from the
dbfloat_t type).
Modified Paths:
--------------
brlcad/trunk/misc/win32-msvc8/librt/librt.vcproj
brlcad/trunk/src/librt/CMakeLists.txt
brlcad/trunk/src/librt/Makefile.am
brlcad/trunk/src/librt/tree.c
Added Paths:
-----------
brlcad/trunk/src/librt/db_float.c
Modified: brlcad/trunk/misc/win32-msvc8/librt/librt.vcproj
===================================================================
--- brlcad/trunk/misc/win32-msvc8/librt/librt.vcproj 2011-01-14 19:12:52 UTC
(rev 42268)
+++ brlcad/trunk/misc/win32-msvc8/librt/librt.vcproj 2011-01-14 19:26:24 UTC
(rev 42269)
@@ -372,6 +372,10 @@
>
</File>
<File
+ RelativePath="..\..\..\src\librt\db_float.c"
+ >
+ </File>
+ <File
RelativePath="..\..\..\src\librt\db_inmem.c"
>
</File>
Modified: brlcad/trunk/src/librt/CMakeLists.txt
===================================================================
--- brlcad/trunk/src/librt/CMakeLists.txt 2011-01-14 19:12:52 UTC (rev
42268)
+++ brlcad/trunk/src/librt/CMakeLists.txt 2011-01-14 19:26:24 UTC (rev
42269)
@@ -18,6 +18,7 @@
db_alloc.c
db_anim.c
db_flags.c
+ db_float.c
db_inmem.c
db_io.c
db_lookup.c
Modified: brlcad/trunk/src/librt/Makefile.am
===================================================================
--- brlcad/trunk/src/librt/Makefile.am 2011-01-14 19:12:52 UTC (rev 42268)
+++ brlcad/trunk/src/librt/Makefile.am 2011-01-14 19:26:24 UTC (rev 42269)
@@ -53,6 +53,7 @@
db_alloc.c \
db_anim.c \
db_flags.c \
+ db_float.c \
db_inmem.c \
db_io.c \
db_lookup.c \
Added: brlcad/trunk/src/librt/db_float.c
===================================================================
--- brlcad/trunk/src/librt/db_float.c (rev 0)
+++ brlcad/trunk/src/librt/db_float.c 2011-01-14 19:26:24 UTC (rev 42269)
@@ -0,0 +1,122 @@
+/* D B _ F L O A T . C
+ * BRL-CAD
+ *
+ * Copyright (c) 1995-2011 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.
+ */
+/** @addtogroup librt */
+/** @{ */
+/** @file db_float.c
+ *
+ * v4 geometry database serialization routines.
+ *
+ */
+/** @} */
+
+#include "common.h"
+
+#include "vmath.h"
+#include "db.h"
+
+
+/**
+ * R T _ F A S T F _ F L O A T
+ *
+ * Convert TO fastf_t FROM 3xfloats (for database)
+ */
+void
+rt_fastf_float(fastf_t *ff, const dbfloat_t *fp, int n)
+{
+ while (n--) {
+ *ff++ = *fp++;
+ *ff++ = *fp++;
+ *ff++ = *fp++;
+ ff += ELEMENTS_PER_VECT-3;
+ }
+}
+
+
+/**
+ * R T _ M A T _ D B M A T
+ *
+ * Convert TO fastf_t matrix FROM dbfloats (for database)
+ */
+void
+rt_mat_dbmat(fastf_t *ff, const dbfloat_t *dbp)
+{
+
+ *ff++ = *dbp++;
+ *ff++ = *dbp++;
+ *ff++ = *dbp++;
+ *ff++ = *dbp++;
+
+ *ff++ = *dbp++;
+ *ff++ = *dbp++;
+ *ff++ = *dbp++;
+ *ff++ = *dbp++;
+
+ *ff++ = *dbp++;
+ *ff++ = *dbp++;
+ *ff++ = *dbp++;
+ *ff++ = *dbp++;
+
+ *ff++ = *dbp++;
+ *ff++ = *dbp++;
+ *ff++ = *dbp++;
+ *ff++ = *dbp++;
+}
+
+
+/**
+ * R T _ D B M A T _ M A T
+ *
+ * Convert FROM fastf_t matrix TO dbfloats (for updating database)
+ */
+void
+rt_dbmat_mat(dbfloat_t *dbp, const fastf_t *ff)
+{
+
+ *dbp++ = (dbfloat_t) *ff++;
+ *dbp++ = (dbfloat_t) *ff++;
+ *dbp++ = (dbfloat_t) *ff++;
+ *dbp++ = (dbfloat_t) *ff++;
+
+ *dbp++ = (dbfloat_t) *ff++;
+ *dbp++ = (dbfloat_t) *ff++;
+ *dbp++ = (dbfloat_t) *ff++;
+ *dbp++ = (dbfloat_t) *ff++;
+
+ *dbp++ = (dbfloat_t) *ff++;
+ *dbp++ = (dbfloat_t) *ff++;
+ *dbp++ = (dbfloat_t) *ff++;
+ *dbp++ = (dbfloat_t) *ff++;
+
+ *dbp++ = (dbfloat_t) *ff++;
+ *dbp++ = (dbfloat_t) *ff++;
+ *dbp++ = (dbfloat_t) *ff++;
+ *dbp++ = (dbfloat_t) *ff++;
+}
+
+
+/*
+ * Local Variables:
+ * mode: C
+ * tab-width: 8
+ * indent-tabs-mode: t
+ * c-file-style: "stroustrup"
+ * End:
+ * ex: shiftwidth=4 tabstop=8
+ */
Property changes on: brlcad/trunk/src/librt/db_float.c
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: svn:eol-style
+ native
Modified: brlcad/trunk/src/librt/tree.c
===================================================================
--- brlcad/trunk/src/librt/tree.c 2011-01-14 19:12:52 UTC (rev 42268)
+++ brlcad/trunk/src/librt/tree.c 2011-01-14 19:26:24 UTC (rev 42269)
@@ -1237,85 +1237,6 @@
/**
- * R T _ F A S T F _ F L O A T
- *
- * Convert TO fastf_t FROM 3xfloats (for database)
- */
-void
-rt_fastf_float(fastf_t *ff, const dbfloat_t *fp, int n)
-{
- while (n--) {
- *ff++ = *fp++;
- *ff++ = *fp++;
- *ff++ = *fp++;
- ff += ELEMENTS_PER_VECT-3;
- }
-}
-
-
-/**
- * R T _ M A T _ D B M A T
- *
- * Convert TO fastf_t matrix FROM dbfloats (for database)
- */
-void
-rt_mat_dbmat(fastf_t *ff, const dbfloat_t *dbp)
-{
-
- *ff++ = *dbp++;
- *ff++ = *dbp++;
- *ff++ = *dbp++;
- *ff++ = *dbp++;
-
- *ff++ = *dbp++;
- *ff++ = *dbp++;
- *ff++ = *dbp++;
- *ff++ = *dbp++;
-
- *ff++ = *dbp++;
- *ff++ = *dbp++;
- *ff++ = *dbp++;
- *ff++ = *dbp++;
-
- *ff++ = *dbp++;
- *ff++ = *dbp++;
- *ff++ = *dbp++;
- *ff++ = *dbp++;
-}
-
-
-/**
- * R T _ D B M A T _ M A T
- *
- * Convert FROM fastf_t matrix TO dbfloats (for updating database)
- */
-void
-rt_dbmat_mat(dbfloat_t *dbp, const fastf_t *ff)
-{
-
- *dbp++ = (dbfloat_t) *ff++;
- *dbp++ = (dbfloat_t) *ff++;
- *dbp++ = (dbfloat_t) *ff++;
- *dbp++ = (dbfloat_t) *ff++;
-
- *dbp++ = (dbfloat_t) *ff++;
- *dbp++ = (dbfloat_t) *ff++;
- *dbp++ = (dbfloat_t) *ff++;
- *dbp++ = (dbfloat_t) *ff++;
-
- *dbp++ = (dbfloat_t) *ff++;
- *dbp++ = (dbfloat_t) *ff++;
- *dbp++ = (dbfloat_t) *ff++;
- *dbp++ = (dbfloat_t) *ff++;
-
- *dbp++ = (dbfloat_t) *ff++;
- *dbp++ = (dbfloat_t) *ff++;
- *dbp++ = (dbfloat_t) *ff++;
- *dbp++ = (dbfloat_t) *ff++;
-}
-
-
-/**
* R T _ F I N D _ S O L I D
*
* Given the (leaf) name of a solid, find the first occurance of it in
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
