Revision: 75530
http://sourceforge.net/p/brlcad/code/75530
Author: starseeker
Date: 2020-04-22 14:22:16 +0000 (Wed, 22 Apr 2020)
Log Message:
-----------
Add dm util header
Modified Paths:
--------------
brlcad/branches/dm-fb-merge/include/dm/CMakeLists.txt
brlcad/branches/dm-fb-merge/include/dm/defines.h
brlcad/branches/dm-fb-merge/include/dm.h
Added Paths:
-----------
brlcad/branches/dm-fb-merge/include/dm/util.h
Modified: brlcad/branches/dm-fb-merge/include/dm/CMakeLists.txt
===================================================================
--- brlcad/branches/dm-fb-merge/include/dm/CMakeLists.txt 2020-04-22
14:14:33 UTC (rev 75529)
+++ brlcad/branches/dm-fb-merge/include/dm/CMakeLists.txt 2020-04-22
14:22:16 UTC (rev 75530)
@@ -1,6 +1,7 @@
set(dm_headers
bview.h
defines.h
+ util.h
)
BRLCAD_MANAGE_FILES(dm_headers ${INCLUDE_DIR}/brlcad/dm)
Modified: brlcad/branches/dm-fb-merge/include/dm/defines.h
===================================================================
--- brlcad/branches/dm-fb-merge/include/dm/defines.h 2020-04-22 14:14:33 UTC
(rev 75529)
+++ brlcad/branches/dm-fb-merge/include/dm/defines.h 2020-04-22 14:22:16 UTC
(rev 75530)
@@ -22,6 +22,10 @@
/** @file dm/defines.h
*
*/
+
+#ifndef DM_DEFINES_H
+#define DM_DEFINES_H
+
#ifndef DM_EXPORT
# if defined(DM_DLL_EXPORTS) && defined(DM_DLL_IMPORTS)
# error "Only DM_DLL_EXPORTS or DM_DLL_IMPORTS can be defined, not both."
@@ -46,6 +50,18 @@
# endif
#endif
+/* The internals of the dm structure are hidden using the PImpl pattern*/
+struct dm_impl;
+struct dm {
+ struct dm_impl *i;
+};
+
+struct dm_plugin {
+ const struct dm * const p;
+};
+
+#endif /* DM_DEFINES_H */
+
/** @} */
/*
* Local Variables:
Added: brlcad/branches/dm-fb-merge/include/dm/util.h
===================================================================
--- brlcad/branches/dm-fb-merge/include/dm/util.h
(rev 0)
+++ brlcad/branches/dm-fb-merge/include/dm/util.h 2020-04-22 14:22:16 UTC
(rev 75530)
@@ -0,0 +1,49 @@
+/* U T I L . H
+ * BRL-CAD
+ *
+ * Copyright (c) 1993-2020 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 libdm */
+/** @{ */
+/** @file dm/util.h
+ *
+ */
+
+#include "common.h"
+#include "./dm/defines.h"
+
+#ifndef DM_UTIL_H
+#define DM_UTIL_H
+
+__BEGIN_DECLS
+
+DM_EXPORT int drawLine3D(struct dm *dmp, point_t pt1, point_t pt2, const char
*log_bu, float *wireColor);
+
+__END_DECLS
+
+#endif /* DM_UTIL_H */
+
+/** @} */
+/*
+ * 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/branches/dm-fb-merge/include/dm/util.h
___________________________________________________________________
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
Modified: brlcad/branches/dm-fb-merge/include/dm.h
===================================================================
--- brlcad/branches/dm-fb-merge/include/dm.h 2020-04-22 14:14:33 UTC (rev
75529)
+++ brlcad/branches/dm-fb-merge/include/dm.h 2020-04-22 14:22:16 UTC (rev
75530)
@@ -34,6 +34,7 @@
#include "raytrace.h"
#include "./dm/defines.h"
+#include "./dm/util.h"
__BEGIN_DECLS
@@ -75,16 +76,6 @@
void *dmh_data;
};
-/* The internals of the dm structure are hidden using the PImpl pattern*/
-struct dm_impl;
-struct dm {
- struct dm_impl *i;
-};
-
-struct dm_plugin {
- const struct dm * const p;
-};
-
/* TODO - after plugins are established, these should be movable to
* the private subheaders */
DM_EXPORT extern struct dm dm_null;
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
