Revision: 54591
http://brlcad.svn.sourceforge.net/brlcad/?rev=54591&view=rev
Author: starseeker
Date: 2013-03-08 22:19:25 +0000 (Fri, 08 Mar 2013)
Log Message:
-----------
Move brep_specific down into librt - not part of the public api. Will need to
look into the libged brep command and see what needs encapsulating
Modified Paths:
--------------
brlcad/trunk/include/brep.h
brlcad/trunk/src/libged/brep.c
brlcad/trunk/src/librt/primitives/brep/brep.cpp
brlcad/trunk/src/librt/primitives/brep/brep_debug.cpp
Added Paths:
-----------
brlcad/trunk/src/librt/primitives/brep/brep_local.h
Modified: brlcad/trunk/include/brep.h
===================================================================
--- brlcad/trunk/include/brep.h 2013-03-08 22:06:03 UTC (rev 54590)
+++ brlcad/trunk/include/brep.h 2013-03-08 22:19:25 UTC (rev 54591)
@@ -107,16 +107,6 @@
int dummy; /* MS Visual C hack which can be removed if the struct contains
something meaningful */
} brep_cdbitem;
-/**
- * The b-rep specific data structure for caching the prepared
- * acceleration data structure.
- */
-struct brep_specific {
- ON_Brep* brep;
- BrepBoundingVolume* bvh;
-};
-
-
__END_DECLS
#ifdef __cplusplus
Modified: brlcad/trunk/src/libged/brep.c
===================================================================
--- brlcad/trunk/src/libged/brep.c 2013-03-08 22:06:03 UTC (rev 54590)
+++ brlcad/trunk/src/libged/brep.c 2013-03-08 22:19:25 UTC (rev 54591)
@@ -35,6 +35,8 @@
#include "./ged_private.h"
+/* TODO - get rid of the need for brep_specific at this level */
+#include "../librt/primitives/brep/brep_local.h"
#if 1
RT_EXPORT extern int brep_command(struct bu_vls *vls, struct brep_specific*
bs, struct rt_brep_internal* bi, struct bn_vlblock *vbp, int argc, const char
*argv[], char *commtag);
Modified: brlcad/trunk/src/librt/primitives/brep/brep.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/brep/brep.cpp 2013-03-08 22:06:03 UTC
(rev 54590)
+++ brlcad/trunk/src/librt/primitives/brep/brep.cpp 2013-03-08 22:19:25 UTC
(rev 54591)
@@ -46,6 +46,7 @@
#include "raytrace.h"
#include "rtgeom.h"
+#include "brep_local.h"
#include "brep_debug.h"
/* undefine "min" and "max" macros, if they exist, to prevent
@@ -65,7 +66,6 @@
/* uncomment to enable debug plotting */
/* #define PLOTTING 1 */
-
#ifdef __cplusplus
extern "C" {
#endif
Modified: brlcad/trunk/src/librt/primitives/brep/brep_debug.cpp
===================================================================
--- brlcad/trunk/src/librt/primitives/brep/brep_debug.cpp 2013-03-08
22:06:03 UTC (rev 54590)
+++ brlcad/trunk/src/librt/primitives/brep/brep_debug.cpp 2013-03-08
22:19:25 UTC (rev 54591)
@@ -45,6 +45,7 @@
#include "rtgeom.h"
#include "wdb.h"
+#include "brep_local.h"
#ifdef __cplusplus
extern "C" {
Added: brlcad/trunk/src/librt/primitives/brep/brep_local.h
===================================================================
--- brlcad/trunk/src/librt/primitives/brep/brep_local.h
(rev 0)
+++ brlcad/trunk/src/librt/primitives/brep/brep_local.h 2013-03-08 22:19:25 UTC
(rev 54591)
@@ -0,0 +1,42 @@
+/* B R E P _ L O C A L . H
+ * BRL-CAD
+ *
+ * Copyright (c) 2013 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 brep_local.h
+ *
+ * Local data structures for brep primitive
+ */
+
+/**
+ * The b-rep specific data structure for caching the prepared
+ * acceleration data structure.
+ */
+struct brep_specific {
+ ON_Brep* brep;
+ BrepBoundingVolume* bvh;
+};
+
+/*
+ * Local Variables:
+ * tab-width: 8
+ * mode: C
+ * indent-tabs-mode: t
+ * c-file-style: "stroustrup"
+ * End:
+ * ex: shiftwidth=4 tabstop=8
+ */
Property changes on: brlcad/trunk/src/librt/primitives/brep/brep_local.h
___________________________________________________________________
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.
------------------------------------------------------------------------------
Symantec Endpoint Protection 12 positioned as A LEADER in The Forrester
Wave(TM): Endpoint Security, Q1 2013 and "remains a good choice" in the
endpoint security space. For insight on selecting the right partner to
tackle endpoint security challenges, access the full report.
http://p.sf.net/sfu/symantec-dev2dev
_______________________________________________
BRL-CAD Source Commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/brlcad-commits
