From ac3acb00617bc7540b86b8bde82b4f32df6f388a Mon Sep 17 00:00:00 2001 From: Cirilo Bernardo Date: Wed, 9 Dec 2015 18:30:48 +1100 Subject: [PATCH] Moving headers to facilitate support for building 3D plugins out-of-tree --- 3d-viewer/3d_cache/3d_cache.cpp | 2 +- 3d-viewer/3d_cache/3d_cache.h | 2 +- 3d-viewer/3d_cache/3d_info.h | 2 +- 3d-viewer/3d_cache/3d_plugin_manager.cpp | 6 +- .../3d_cache/dialogs/3d_cache_dialogs.cpp | 6 +- .../3d_cache/dialogs/dialog_config_3dpath.cpp | 2 +- .../dialogs/dialog_select_3dmodel.cpp | 2 +- .../3d_cache/dialogs/panel_prev_model.cpp | 8 +-- 3d-viewer/3d_cache/dialogs/panel_prev_model.h | 4 +- 3d-viewer/3d_cache/sg/ifsg_api.cpp | 28 ++++----- 3d-viewer/3d_cache/sg/ifsg_appearance.cpp | 4 +- 3d-viewer/3d_cache/sg/ifsg_colorindex.cpp | 6 +- 3d-viewer/3d_cache/sg/ifsg_colors.cpp | 4 +- 3d-viewer/3d_cache/sg/ifsg_coordindex.cpp | 6 +- 3d-viewer/3d_cache/sg/ifsg_coords.cpp | 4 +- 3d-viewer/3d_cache/sg/ifsg_faceset.cpp | 4 +- 3d-viewer/3d_cache/sg/ifsg_index.cpp | 6 +- 3d-viewer/3d_cache/sg/ifsg_node.cpp | 6 +- 3d-viewer/3d_cache/sg/ifsg_normalindex.cpp | 6 +- 3d-viewer/3d_cache/sg/ifsg_normals.cpp | 4 +- 3d-viewer/3d_cache/sg/ifsg_shape.cpp | 4 +- 3d-viewer/3d_cache/sg/ifsg_transform.cpp | 4 +- 3d-viewer/3d_cache/sg/scenegraph.cpp | 6 +- 3d-viewer/3d_cache/sg/scenegraph.h | 2 +- 3d-viewer/3d_cache/sg/sg_appearance.cpp | 4 +- 3d-viewer/3d_cache/sg/sg_appearance.h | 2 +- 3d-viewer/3d_cache/sg/sg_base.cpp | 2 +- 3d-viewer/3d_cache/sg/sg_colorindex.cpp | 2 +- 3d-viewer/3d_cache/sg/sg_colorindex.h | 2 +- 3d-viewer/3d_cache/sg/sg_colors.cpp | 4 +- 3d-viewer/3d_cache/sg/sg_colors.h | 2 +- 3d-viewer/3d_cache/sg/sg_coordindex.cpp | 2 +- 3d-viewer/3d_cache/sg/sg_coordindex.h | 2 +- 3d-viewer/3d_cache/sg/sg_coords.cpp | 4 +- 3d-viewer/3d_cache/sg/sg_coords.h | 2 +- 3d-viewer/3d_cache/sg/sg_faceset.cpp | 14 ++--- 3d-viewer/3d_cache/sg/sg_faceset.h | 8 +-- 3d-viewer/3d_cache/sg/sg_helpers.cpp | 6 +- 3d-viewer/3d_cache/sg/sg_helpers.h | 4 +- 3d-viewer/3d_cache/sg/sg_index.cpp | 2 +- 3d-viewer/3d_cache/sg/sg_index.h | 2 +- 3d-viewer/3d_cache/sg/sg_node.cpp | 5 +- 3d-viewer/3d_cache/sg/sg_node.h | 6 +- 3d-viewer/3d_cache/sg/sg_normals.cpp | 4 +- 3d-viewer/3d_cache/sg/sg_normals.h | 2 +- 3d-viewer/3d_cache/sg/sg_shape.cpp | 18 +++--- 3d-viewer/3d_cache/sg/sg_shape.h | 2 +- 3d-viewer/3d_cache/sg/sg_types.h | 22 ------- 3d-viewer/3d_cache/testmd5.cpp | 63 ------------------- 3d-viewer/3d_math/3d_math.h | 2 +- .../3d_model_viewer/c3d_model_viewer.cpp | 3 + .../3d_render_ogl_legacy/c_ogl_3dmodel.h | 2 +- .../3d_render_ogl_legacy/clayer_triangles.h | 2 +- .../3d_render_ogl_legacy/ogl_legacy_utils.h | 2 +- .../3d_render_raytracing/cfrustum.h | 2 +- .../3d_render_raytracing/hitinfo.h | 2 +- .../3d_rendering/3d_render_raytracing/ray.h | 2 +- .../3d_render_raytracing/shapes2D/cbbox2d.h | 2 +- .../3d_render_raytracing/shapes2D/cobject2d.h | 2 +- .../3d_render_raytracing/shapes3D/cbbox.h | 2 +- .../3d_render_raytracing/shapes3D/cobject.h | 2 +- 3d-viewer/3d_rendering/ccamera.h | 4 +- 3d-viewer/common_ogl/cogl_att_list.h | 2 +- 3d-viewer/common_ogl/ogl_utils.h | 2 +- .../plugins/3dapi}/c3dmodel.h | 9 +-- .../sg => include/plugins/3dapi}/ifsg_all.h | 20 +++--- .../sg => include/plugins/3dapi}/ifsg_api.h | 8 +-- .../plugins/3dapi}/ifsg_appearance.h | 2 +- .../plugins/3dapi}/ifsg_colorindex.h | 2 +- .../plugins/3dapi}/ifsg_colors.h | 2 +- .../plugins/3dapi}/ifsg_coordindex.h | 2 +- .../plugins/3dapi}/ifsg_coords.h | 2 +- .../sg => include/plugins/3dapi}/ifsg_defs.h | 0 .../plugins/3dapi}/ifsg_faceset.h | 2 +- .../sg => include/plugins/3dapi}/ifsg_index.h | 2 +- .../sg => include/plugins/3dapi}/ifsg_node.h | 5 +- .../plugins/3dapi}/ifsg_normalindex.h | 2 +- .../plugins/3dapi}/ifsg_normals.h | 2 +- .../sg => include/plugins/3dapi}/ifsg_shape.h | 2 +- .../plugins/3dapi}/ifsg_transform.h | 2 +- .../sg => include/plugins/3dapi}/sg_base.h | 2 +- include/plugins/3dapi/sg_types.h | 49 +++++++++++++++ .../plugins/3dapi}/xv3d_types.h | 0 plugins/3d/s3d_plugin_tetra.cpp | 2 +- 84 files changed, 209 insertions(+), 255 deletions(-) delete mode 100644 3d-viewer/3d_cache/sg/sg_types.h delete mode 100644 3d-viewer/3d_cache/testmd5.cpp rename {3d-viewer/3d_rendering => include/plugins/3dapi}/c3dmodel.h (92%) rename {3d-viewer/3d_cache/sg => include/plugins/3dapi}/ifsg_all.h (73%) rename {3d-viewer/3d_cache/sg => include/plugins/3dapi}/ifsg_api.h (98%) rename {3d-viewer/3d_cache/sg => include/plugins/3dapi}/ifsg_appearance.h (98%) rename {3d-viewer/3d_cache/sg => include/plugins/3dapi}/ifsg_colorindex.h (97%) rename {3d-viewer/3d_cache/sg => include/plugins/3dapi}/ifsg_colors.h (97%) rename {3d-viewer/3d_cache/sg => include/plugins/3dapi}/ifsg_coordindex.h (97%) rename {3d-viewer/3d_cache/sg => include/plugins/3dapi}/ifsg_coords.h (97%) rename {3d-viewer/3d_cache/sg => include/plugins/3dapi}/ifsg_defs.h (100%) rename {3d-viewer/3d_cache/sg => include/plugins/3dapi}/ifsg_faceset.h (97%) rename {3d-viewer/3d_cache/sg => include/plugins/3dapi}/ifsg_index.h (98%) rename {3d-viewer/3d_cache/sg => include/plugins/3dapi}/ifsg_node.h (98%) rename {3d-viewer/3d_cache/sg => include/plugins/3dapi}/ifsg_normalindex.h (97%) rename {3d-viewer/3d_cache/sg => include/plugins/3dapi}/ifsg_normals.h (98%) rename {3d-viewer/3d_cache/sg => include/plugins/3dapi}/ifsg_shape.h (97%) rename {3d-viewer/3d_cache/sg => include/plugins/3dapi}/ifsg_transform.h (98%) rename {3d-viewer/3d_cache/sg => include/plugins/3dapi}/sg_base.h (98%) create mode 100644 include/plugins/3dapi/sg_types.h rename {3d-viewer/3d_xv3d => include/plugins/3dapi}/xv3d_types.h (100%) diff --git a/3d-viewer/3d_cache/3d_cache.cpp b/3d-viewer/3d_cache/3d_cache.cpp index 96cd8c39d2..d42027fea3 100644 --- a/3d-viewer/3d_cache/3d_cache.cpp +++ b/3d-viewer/3d_cache/3d_cache.cpp @@ -42,7 +42,7 @@ #include "sg/scenegraph.h" #include "3d_filename_resolver.h" #include "3d_plugin_manager.h" -#include "sg/ifsg_api.h" +#include "plugins/3dapi/ifsg_api.h" #define CACHE_CONFIG_NAME wxT( "cache.cfg" ) diff --git a/3d-viewer/3d_cache/3d_cache.h b/3d-viewer/3d_cache/3d_cache.h index 1961a4e16c..1895d02fc6 100644 --- a/3d-viewer/3d_cache/3d_cache.h +++ b/3d-viewer/3d_cache/3d_cache.h @@ -35,7 +35,7 @@ #include "str_rsort.h" #include "3d_filename_resolver.h" #include "3d_info.h" -#include <3d_rendering/c3dmodel.h> +#include "plugins/3dapi/c3dmodel.h" class S3D_CACHE; diff --git a/3d-viewer/3d_cache/3d_info.h b/3d-viewer/3d_cache/3d_info.h index ad901be95b..c0ddd4bfde 100644 --- a/3d-viewer/3d_cache/3d_info.h +++ b/3d-viewer/3d_cache/3d_info.h @@ -34,7 +34,7 @@ #define INFO_3D_H #include -#include <3d_cache/sg/sg_base.h> +#include struct S3D_INFO diff --git a/3d-viewer/3d_cache/3d_plugin_manager.cpp b/3d-viewer/3d_cache/3d_plugin_manager.cpp index b90f9e1258..282572fe61 100644 --- a/3d-viewer/3d_cache/3d_plugin_manager.cpp +++ b/3d-viewer/3d_cache/3d_plugin_manager.cpp @@ -41,9 +41,9 @@ #include #endif -#include <3d_plugin_manager.h> -#include -#include <3d_cache/sg/scenegraph.h> +#include "3d_plugin_manager.h" +#include "plugins/3d/3d_plugin.h" +#include "3d_cache/sg/scenegraph.h" class S3D_PLUGIN_ITEM { diff --git a/3d-viewer/3d_cache/dialogs/3d_cache_dialogs.cpp b/3d-viewer/3d_cache/dialogs/3d_cache_dialogs.cpp index 13e78bc0f6..b60863d344 100644 --- a/3d-viewer/3d_cache/dialogs/3d_cache_dialogs.cpp +++ b/3d-viewer/3d_cache/dialogs/3d_cache_dialogs.cpp @@ -22,10 +22,10 @@ */ #include -#include <3d_info.h> -#include <3d_cache.h> -#include +#include "3d_info.h" +#include "3d_cache.h" +#include "plugins/3dapi/ifsg_api.h" #include "3d_cache_dialogs.h" #include "dialog_config_3dpath.h" #include "dialog_select_3dmodel.h" diff --git a/3d-viewer/3d_cache/dialogs/dialog_config_3dpath.cpp b/3d-viewer/3d_cache/dialogs/dialog_config_3dpath.cpp index 0f4f39271c..7f21908a78 100644 --- a/3d-viewer/3d_cache/dialogs/dialog_config_3dpath.cpp +++ b/3d-viewer/3d_cache/dialogs/dialog_config_3dpath.cpp @@ -25,8 +25,8 @@ #include #include #include -#include <3d_cache.h> +#include "3d_cache.h" #include "dialog_config_3dpath.h" enum diff --git a/3d-viewer/3d_cache/dialogs/dialog_select_3dmodel.cpp b/3d-viewer/3d_cache/dialogs/dialog_select_3dmodel.cpp index b9999bc1a0..80a4010154 100644 --- a/3d-viewer/3d_cache/dialogs/dialog_select_3dmodel.cpp +++ b/3d-viewer/3d_cache/dialogs/dialog_select_3dmodel.cpp @@ -22,7 +22,7 @@ */ #include -#include <3d_cache.h> +#include "3d_cache.h" #include "dialog_select_3dmodel.h" #include "panel_prev_model.h" diff --git a/3d-viewer/3d_cache/dialogs/panel_prev_model.cpp b/3d-viewer/3d_cache/dialogs/panel_prev_model.cpp index 41a009148a..e0a2b68821 100644 --- a/3d-viewer/3d_cache/dialogs/panel_prev_model.cpp +++ b/3d-viewer/3d_cache/dialogs/panel_prev_model.cpp @@ -33,10 +33,10 @@ #include #include #include -#include <3d_cache.h> -#include <3d_info.h> -#include <3d_filename_resolver.h> -#include <3d_cache/sg/ifsg_api.h> +#include "3d_cache.h" +#include "3d_info.h" +#include "3d_filename_resolver.h" +#include "plugins/3dapi/ifsg_api.h" #include "panel_prev_model.h" #include "dialog_select_3dmodel.h" diff --git a/3d-viewer/3d_cache/dialogs/panel_prev_model.h b/3d-viewer/3d_cache/dialogs/panel_prev_model.h index 371e52b0df..8815c49f9c 100644 --- a/3d-viewer/3d_cache/dialogs/panel_prev_model.h +++ b/3d-viewer/3d_cache/dialogs/panel_prev_model.h @@ -37,8 +37,8 @@ #include #include -#include <3d_rendering/c3dmodel.h> -#include <3d_cache/3d_info.h> +#include "plugins/3dapi/c3dmodel.h" +#include "3d_cache/3d_info.h" class S3D_CACHE; class C3D_MODEL_VIEWER; diff --git a/3d-viewer/3d_cache/sg/ifsg_api.cpp b/3d-viewer/3d_cache/sg/ifsg_api.cpp index 00e4161748..6c88dea9f7 100644 --- a/3d-viewer/3d_cache/sg/ifsg_api.cpp +++ b/3d-viewer/3d_cache/sg/ifsg_api.cpp @@ -27,20 +27,20 @@ #include #include #include -#include <3d_cache/sg/ifsg_api.h> -#include <3d_cache/sg/sg_types.h> -#include <3d_cache/sg/sg_node.h> -#include <3d_cache/sg/scenegraph.h> -#include <3d_cache/sg/sg_appearance.h> -#include <3d_cache/sg/sg_colorindex.h> -#include <3d_cache/sg/sg_colors.h> -#include <3d_cache/sg/sg_coordindex.h> -#include <3d_cache/sg/sg_coords.h> -#include <3d_cache/sg/sg_faceset.h> -#include <3d_cache/sg/sg_normals.h> -#include <3d_cache/sg/sg_shape.h> -#include <3d_info.h> -#include <3d_rendering/c3dmodel.h> +#include "plugins/3dapi/ifsg_api.h" +#include "plugins/3dapi/sg_types.h" +#include "3d_cache/sg/sg_node.h" +#include "3d_cache/sg/scenegraph.h" +#include "3d_cache/sg/sg_appearance.h" +#include "3d_cache/sg/sg_colorindex.h" +#include "3d_cache/sg/sg_colors.h" +#include "3d_cache/sg/sg_coordindex.h" +#include "3d_cache/sg/sg_coords.h" +#include "3d_cache/sg/sg_faceset.h" +#include "3d_cache/sg/sg_normals.h" +#include "3d_cache/sg/sg_shape.h" +#include "3d_info.h" +#include "plugins/3dapi/c3dmodel.h" static char BadNode[] = " * [BUG] NULL pointer passed for aNode\n"; diff --git a/3d-viewer/3d_cache/sg/ifsg_appearance.cpp b/3d-viewer/3d_cache/sg/ifsg_appearance.cpp index 01f3c9cd21..7ac60c449e 100644 --- a/3d-viewer/3d_cache/sg/ifsg_appearance.cpp +++ b/3d-viewer/3d_cache/sg/ifsg_appearance.cpp @@ -23,8 +23,8 @@ #include -#include <3d_cache/sg/ifsg_appearance.h> -#include <3d_cache/sg/sg_appearance.h> +#include "plugins/3dapi/ifsg_appearance.h" +#include "3d_cache/sg/sg_appearance.h" extern char BadObject[]; diff --git a/3d-viewer/3d_cache/sg/ifsg_colorindex.cpp b/3d-viewer/3d_cache/sg/ifsg_colorindex.cpp index 51a7181e41..0e64bbad40 100644 --- a/3d-viewer/3d_cache/sg/ifsg_colorindex.cpp +++ b/3d-viewer/3d_cache/sg/ifsg_colorindex.cpp @@ -23,9 +23,9 @@ #include -#include <3d_cache/sg/ifsg_colorindex.h> -#include <3d_cache/sg/sg_colorindex.h> -#include <3d_cache/sg/sg_types.h> +#include "plugins/3dapi/ifsg_colorindex.h" +#include "3d_cache/sg/sg_colorindex.h" +#include "plugins/3dapi/sg_types.h" extern char BadObject[]; diff --git a/3d-viewer/3d_cache/sg/ifsg_colors.cpp b/3d-viewer/3d_cache/sg/ifsg_colors.cpp index 520aa937f1..d267bb239d 100644 --- a/3d-viewer/3d_cache/sg/ifsg_colors.cpp +++ b/3d-viewer/3d_cache/sg/ifsg_colors.cpp @@ -22,8 +22,8 @@ */ #include -#include <3d_cache/sg/ifsg_colors.h> -#include <3d_cache/sg/sg_colors.h> +#include "plugins/3dapi/ifsg_colors.h" +#include "3d_cache/sg/sg_colors.h" extern char BadObject[]; diff --git a/3d-viewer/3d_cache/sg/ifsg_coordindex.cpp b/3d-viewer/3d_cache/sg/ifsg_coordindex.cpp index 19aaa7dbe0..bad3c2631c 100644 --- a/3d-viewer/3d_cache/sg/ifsg_coordindex.cpp +++ b/3d-viewer/3d_cache/sg/ifsg_coordindex.cpp @@ -23,9 +23,9 @@ #include -#include <3d_cache/sg/ifsg_coordindex.h> -#include <3d_cache/sg/sg_coordindex.h> -#include <3d_cache/sg/sg_types.h> +#include "plugins/3dapi/ifsg_coordindex.h" +#include "3d_cache/sg/sg_coordindex.h" +#include "plugins/3dapi/sg_types.h" extern char BadObject[]; diff --git a/3d-viewer/3d_cache/sg/ifsg_coords.cpp b/3d-viewer/3d_cache/sg/ifsg_coords.cpp index 6375fdbe1d..356f1fb1e7 100644 --- a/3d-viewer/3d_cache/sg/ifsg_coords.cpp +++ b/3d-viewer/3d_cache/sg/ifsg_coords.cpp @@ -22,8 +22,8 @@ */ #include -#include <3d_cache/sg/ifsg_coords.h> -#include <3d_cache/sg/sg_coords.h> +#include "plugins/3dapi/ifsg_coords.h" +#include "3d_cache/sg/sg_coords.h" extern char BadObject[]; diff --git a/3d-viewer/3d_cache/sg/ifsg_faceset.cpp b/3d-viewer/3d_cache/sg/ifsg_faceset.cpp index 130f412a3f..144c3d14d3 100644 --- a/3d-viewer/3d_cache/sg/ifsg_faceset.cpp +++ b/3d-viewer/3d_cache/sg/ifsg_faceset.cpp @@ -23,8 +23,8 @@ #include -#include <3d_cache/sg/ifsg_faceset.h> -#include <3d_cache/sg/sg_faceset.h> +#include "plugins/3dapi/ifsg_faceset.h" +#include "3d_cache/sg/sg_faceset.h" extern char BadObject[]; diff --git a/3d-viewer/3d_cache/sg/ifsg_index.cpp b/3d-viewer/3d_cache/sg/ifsg_index.cpp index 45b777d420..7609ec52a3 100644 --- a/3d-viewer/3d_cache/sg/ifsg_index.cpp +++ b/3d-viewer/3d_cache/sg/ifsg_index.cpp @@ -23,9 +23,9 @@ #include -#include <3d_cache/sg/ifsg_index.h> -#include <3d_cache/sg/sg_coordindex.h> -#include <3d_cache/sg/sg_colorindex.h> +#include "plugins/3dapi/ifsg_index.h" +#include "3d_cache/sg/sg_coordindex.h" +#include "3d_cache/sg/sg_colorindex.h" extern char BadObject[]; diff --git a/3d-viewer/3d_cache/sg/ifsg_node.cpp b/3d-viewer/3d_cache/sg/ifsg_node.cpp index 485b3c4e2d..746cebb337 100644 --- a/3d-viewer/3d_cache/sg/ifsg_node.cpp +++ b/3d-viewer/3d_cache/sg/ifsg_node.cpp @@ -23,9 +23,9 @@ #include -#include <3d_cache/sg/ifsg_node.h> -#include <3d_cache/sg/sg_node.h> -#include <3d_cache/sg/ifsg_api.h> +#include "plugins/3dapi/ifsg_node.h" +#include "3d_cache/sg/sg_node.h" +#include "plugins/3dapi/ifsg_api.h" // collection of common error strings used by the wrappers char BadObject[] = " * [BUG] operating on an invalid wrapper (object may have been deleted)"; diff --git a/3d-viewer/3d_cache/sg/ifsg_normalindex.cpp b/3d-viewer/3d_cache/sg/ifsg_normalindex.cpp index 9e72e62f1e..884aefe9fd 100644 --- a/3d-viewer/3d_cache/sg/ifsg_normalindex.cpp +++ b/3d-viewer/3d_cache/sg/ifsg_normalindex.cpp @@ -23,9 +23,9 @@ #include -#include <3d_cache/sg/ifsg_normalindex.h> -#include <3d_cache/sg/sg_normalindex.h> -#include <3d_cache/sg/sg_types.h> +#include "plugins/3dapi/ifsg_normalindex.h" +#include "3d_cache/sg/sg_normalindex.h" +#include "plugins/3dapi/sg_types.h" extern char BadObject[]; diff --git a/3d-viewer/3d_cache/sg/ifsg_normals.cpp b/3d-viewer/3d_cache/sg/ifsg_normals.cpp index 5715518bdb..c2d1cc0c81 100644 --- a/3d-viewer/3d_cache/sg/ifsg_normals.cpp +++ b/3d-viewer/3d_cache/sg/ifsg_normals.cpp @@ -23,8 +23,8 @@ #include -#include <3d_cache/sg/ifsg_normals.h> -#include <3d_cache/sg/sg_normals.h> +#include "plugins/3dapi/ifsg_normals.h" +#include "3d_cache/sg/sg_normals.h" extern char BadObject[]; diff --git a/3d-viewer/3d_cache/sg/ifsg_shape.cpp b/3d-viewer/3d_cache/sg/ifsg_shape.cpp index 106d92ded9..712f7b2006 100644 --- a/3d-viewer/3d_cache/sg/ifsg_shape.cpp +++ b/3d-viewer/3d_cache/sg/ifsg_shape.cpp @@ -23,8 +23,8 @@ #include -#include <3d_cache/sg/ifsg_shape.h> -#include <3d_cache/sg/sg_shape.h> +#include "plugins/3dapi/ifsg_shape.h" +#include "3d_cache/sg/sg_shape.h" extern char BadObject[]; diff --git a/3d-viewer/3d_cache/sg/ifsg_transform.cpp b/3d-viewer/3d_cache/sg/ifsg_transform.cpp index 68fa1223ef..17a9f0c6d0 100644 --- a/3d-viewer/3d_cache/sg/ifsg_transform.cpp +++ b/3d-viewer/3d_cache/sg/ifsg_transform.cpp @@ -23,8 +23,8 @@ #include -#include <3d_cache/sg/ifsg_transform.h> -#include <3d_cache/sg/scenegraph.h> +#include "plugins/3dapi/ifsg_transform.h" +#include "3d_cache/sg/scenegraph.h" extern char BadObject[]; diff --git a/3d-viewer/3d_cache/sg/scenegraph.cpp b/3d-viewer/3d_cache/sg/scenegraph.cpp index 1b7275f9e7..6ae4054817 100644 --- a/3d-viewer/3d_cache/sg/scenegraph.cpp +++ b/3d-viewer/3d_cache/sg/scenegraph.cpp @@ -27,9 +27,9 @@ #include #include -#include <3d_cache/sg/scenegraph.h> -#include <3d_cache/sg/sg_shape.h> -#include <3d_cache/sg/sg_helpers.h> +#include "3d_cache/sg/scenegraph.h" +#include "3d_cache/sg/sg_shape.h" +#include "3d_cache/sg/sg_helpers.h" SCENEGRAPH::SCENEGRAPH( SGNODE* aParent ) : SGNODE( aParent ) { diff --git a/3d-viewer/3d_cache/sg/scenegraph.h b/3d-viewer/3d_cache/sg/scenegraph.h index ac48188a3f..1ba7467584 100644 --- a/3d-viewer/3d_cache/sg/scenegraph.h +++ b/3d-viewer/3d_cache/sg/scenegraph.h @@ -34,7 +34,7 @@ #define SCENE_GRAPH_H #include -#include <3d_cache/sg/sg_node.h> +#include "3d_cache/sg/sg_node.h" class SGSHAPE; diff --git a/3d-viewer/3d_cache/sg/sg_appearance.cpp b/3d-viewer/3d_cache/sg/sg_appearance.cpp index 1dd95c6ee6..26cfd1d65f 100644 --- a/3d-viewer/3d_cache/sg/sg_appearance.cpp +++ b/3d-viewer/3d_cache/sg/sg_appearance.cpp @@ -24,8 +24,8 @@ #include #include -#include <3d_cache/sg/sg_appearance.h> -#include <3d_cache/sg/sg_helpers.h> +#include "3d_cache/sg/sg_appearance.h" +#include "3d_cache/sg/sg_helpers.h" SGAPPEARANCE::SGAPPEARANCE( SGNODE* aParent ) : SGNODE( aParent) { diff --git a/3d-viewer/3d_cache/sg/sg_appearance.h b/3d-viewer/3d_cache/sg/sg_appearance.h index 43994ff544..2bf548bffe 100644 --- a/3d-viewer/3d_cache/sg/sg_appearance.h +++ b/3d-viewer/3d_cache/sg/sg_appearance.h @@ -29,7 +29,7 @@ #ifndef SG_APPEARANCE_H #define SG_APPEARANCE_H -#include <3d_cache/sg/sg_node.h> +#include "3d_cache/sg/sg_node.h" class SGAPPEARANCE : public SGNODE { diff --git a/3d-viewer/3d_cache/sg/sg_base.cpp b/3d-viewer/3d_cache/sg/sg_base.cpp index 3122f1284d..3fad7c0241 100644 --- a/3d-viewer/3d_cache/sg/sg_base.cpp +++ b/3d-viewer/3d_cache/sg/sg_base.cpp @@ -24,7 +24,7 @@ #include #include -#include <3d_cache/sg/sg_base.h> +#include "plugins/3dapi/sg_base.h" SGCOLOR::SGCOLOR() diff --git a/3d-viewer/3d_cache/sg/sg_colorindex.cpp b/3d-viewer/3d_cache/sg/sg_colorindex.cpp index 6610bebd2e..686663a358 100644 --- a/3d-viewer/3d_cache/sg/sg_colorindex.cpp +++ b/3d-viewer/3d_cache/sg/sg_colorindex.cpp @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <3d_cache/sg/sg_colorindex.h> +#include "3d_cache/sg/sg_colorindex.h" SGCOLORINDEX::SGCOLORINDEX( SGNODE* aParent ) : SGINDEX( aParent ) { diff --git a/3d-viewer/3d_cache/sg/sg_colorindex.h b/3d-viewer/3d_cache/sg/sg_colorindex.h index 937b957f9e..d042b7e4f9 100644 --- a/3d-viewer/3d_cache/sg/sg_colorindex.h +++ b/3d-viewer/3d_cache/sg/sg_colorindex.h @@ -29,7 +29,7 @@ #ifndef SG_COLORINDEX_H #define SG_COLORINDEX_H -#include <3d_cache/sg/sg_index.h> +#include "3d_cache/sg/sg_index.h" class SGCOLORINDEX : public SGINDEX { diff --git a/3d-viewer/3d_cache/sg/sg_colors.cpp b/3d-viewer/3d_cache/sg/sg_colors.cpp index d58b2206b8..2bb0be3872 100644 --- a/3d-viewer/3d_cache/sg/sg_colors.cpp +++ b/3d-viewer/3d_cache/sg/sg_colors.cpp @@ -22,8 +22,8 @@ */ #include -#include <3d_cache/sg/sg_colors.h> -#include <3d_cache/sg/sg_helpers.h> +#include "3d_cache/sg/sg_colors.h" +#include "3d_cache/sg/sg_helpers.h" SGCOLORS::SGCOLORS( SGNODE* aParent ) : SGNODE( aParent ) { diff --git a/3d-viewer/3d_cache/sg/sg_colors.h b/3d-viewer/3d_cache/sg/sg_colors.h index b23332399e..fde105c354 100644 --- a/3d-viewer/3d_cache/sg/sg_colors.h +++ b/3d-viewer/3d_cache/sg/sg_colors.h @@ -30,7 +30,7 @@ #define SG_COLORS_H #include -#include <3d_cache/sg/sg_node.h> +#include "3d_cache/sg/sg_node.h" class SGCOLORS : public SGNODE { diff --git a/3d-viewer/3d_cache/sg/sg_coordindex.cpp b/3d-viewer/3d_cache/sg/sg_coordindex.cpp index 0888cbff4d..2ca17ffb72 100644 --- a/3d-viewer/3d_cache/sg/sg_coordindex.cpp +++ b/3d-viewer/3d_cache/sg/sg_coordindex.cpp @@ -21,7 +21,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA */ -#include <3d_cache/sg/sg_coordindex.h> +#include "3d_cache/sg/sg_coordindex.h" SGCOORDINDEX::SGCOORDINDEX( SGNODE* aParent ) : SGINDEX( aParent ) diff --git a/3d-viewer/3d_cache/sg/sg_coordindex.h b/3d-viewer/3d_cache/sg/sg_coordindex.h index 5813d7caec..6044b3b18a 100644 --- a/3d-viewer/3d_cache/sg/sg_coordindex.h +++ b/3d-viewer/3d_cache/sg/sg_coordindex.h @@ -29,7 +29,7 @@ #ifndef SG_COORDINDEX_H #define SG_COORDINDEX_H -#include <3d_cache/sg/sg_index.h> +#include "3d_cache/sg/sg_index.h" /** * Class SGCOORDINDEX diff --git a/3d-viewer/3d_cache/sg/sg_coords.cpp b/3d-viewer/3d_cache/sg/sg_coords.cpp index 9236ca0e1f..9e0c6b1fe5 100644 --- a/3d-viewer/3d_cache/sg/sg_coords.cpp +++ b/3d-viewer/3d_cache/sg/sg_coords.cpp @@ -22,8 +22,8 @@ */ #include -#include <3d_cache/sg/sg_coords.h> -#include <3d_cache/sg/sg_helpers.h> +#include "3d_cache/sg/sg_coords.h" +#include "3d_cache/sg/sg_helpers.h" SGCOORDS::SGCOORDS( SGNODE* aParent ) : SGNODE( aParent ) diff --git a/3d-viewer/3d_cache/sg/sg_coords.h b/3d-viewer/3d_cache/sg/sg_coords.h index 1b263489f1..2afc7db245 100644 --- a/3d-viewer/3d_cache/sg/sg_coords.h +++ b/3d-viewer/3d_cache/sg/sg_coords.h @@ -30,7 +30,7 @@ #define SG_COORDS_H #include -#include <3d_cache/sg/sg_node.h> +#include "3d_cache/sg/sg_node.h" class SGCOORDS : public SGNODE { diff --git a/3d-viewer/3d_cache/sg/sg_faceset.cpp b/3d-viewer/3d_cache/sg/sg_faceset.cpp index afae6494f5..a99884cb6f 100644 --- a/3d-viewer/3d_cache/sg/sg_faceset.cpp +++ b/3d-viewer/3d_cache/sg/sg_faceset.cpp @@ -23,13 +23,13 @@ #include -#include <3d_cache/sg/sg_faceset.h> -#include <3d_cache/sg/sg_colors.h> -#include <3d_cache/sg/sg_coords.h> -#include <3d_cache/sg/sg_normals.h> -#include <3d_cache/sg/sg_colorindex.h> -#include <3d_cache/sg/sg_coordindex.h> -#include <3d_cache/sg/sg_helpers.h> +#include "3d_cache/sg/sg_faceset.h" +#include "3d_cache/sg/sg_colors.h" +#include "3d_cache/sg/sg_coords.h" +#include "3d_cache/sg/sg_normals.h" +#include "3d_cache/sg/sg_colorindex.h" +#include "3d_cache/sg/sg_coordindex.h" +#include "3d_cache/sg/sg_helpers.h" SGFACESET::SGFACESET( SGNODE* aParent ) : SGNODE( aParent ) { diff --git a/3d-viewer/3d_cache/sg/sg_faceset.h b/3d-viewer/3d_cache/sg/sg_faceset.h index fa21ef3bb1..6cb3eee29d 100644 --- a/3d-viewer/3d_cache/sg/sg_faceset.h +++ b/3d-viewer/3d_cache/sg/sg_faceset.h @@ -26,25 +26,19 @@ * defines an indexed face set for a scenegraph */ -// BUG: -// 1. Since we always use Normal Per Vertex we can deprecate SGNORMALINDEX -// 2. There is no such thing as a Referenced Index so deprecate these #ifndef SG_FACESET_H #define SG_FACESET_H #include -#include <3d_cache/sg/sg_node.h> +#include "3d_cache/sg/sg_node.h" -// BUG: eliminate NormalIndices; they are not necessary since -// we use per-vertex normals class SGCOLORS; class SGCOORDS; class SGNORMALS; class SGCOLORINDEX; class SGCOORDINDEX; -class SGNORMALINDEX; class SGFACESET : public SGNODE { diff --git a/3d-viewer/3d_cache/sg/sg_helpers.cpp b/3d-viewer/3d_cache/sg/sg_helpers.cpp index a738b5adf9..dbc475006d 100644 --- a/3d-viewer/3d_cache/sg/sg_helpers.cpp +++ b/3d-viewer/3d_cache/sg/sg_helpers.cpp @@ -27,8 +27,10 @@ #include #include #include -#include <3d_cache/sg/sg_helpers.h> -#include <3d_cache/sg/sg_node.h> + +#include "3d_cache/sg/sg_helpers.h" +#include "3d_cache/sg/sg_node.h" + // formats a floating point number for text output to a VRML file void S3D::FormatFloat( std::string& result, double value ) diff --git a/3d-viewer/3d_cache/sg/sg_helpers.h b/3d-viewer/3d_cache/sg/sg_helpers.h index 14309181dd..15d55d3283 100644 --- a/3d-viewer/3d_cache/sg/sg_helpers.h +++ b/3d-viewer/3d_cache/sg/sg_helpers.h @@ -35,8 +35,8 @@ #include #include #include -#include <3d_cache/sg/sg_base.h> -#include "sg_types.h" +#include "plugins/3dapi/sg_base.h" +#include "plugins/3dapi/sg_types.h" // Function to drop references within an SGNODE // The node being destroyed must remove itself from the object reference's diff --git a/3d-viewer/3d_cache/sg/sg_index.cpp b/3d-viewer/3d_cache/sg/sg_index.cpp index 076c5fb8d8..51015138eb 100644 --- a/3d-viewer/3d_cache/sg/sg_index.cpp +++ b/3d-viewer/3d_cache/sg/sg_index.cpp @@ -23,7 +23,7 @@ #include #include -#include <3d_cache/sg/sg_index.h> +#include "3d_cache/sg/sg_index.h" SGINDEX::SGINDEX( SGNODE* aParent ) : SGNODE( aParent ) diff --git a/3d-viewer/3d_cache/sg/sg_index.h b/3d-viewer/3d_cache/sg/sg_index.h index a82ed9eff2..ee4484af3f 100644 --- a/3d-viewer/3d_cache/sg/sg_index.h +++ b/3d-viewer/3d_cache/sg/sg_index.h @@ -30,7 +30,7 @@ #define SG_INDEX_H #include -#include <3d_cache/sg/sg_node.h> +#include "3d_cache/sg/sg_node.h" class SGINDEX : public SGNODE { diff --git a/3d-viewer/3d_cache/sg/sg_node.cpp b/3d-viewer/3d_cache/sg/sg_node.cpp index dc1054c4a5..198433322d 100644 --- a/3d-viewer/3d_cache/sg/sg_node.cpp +++ b/3d-viewer/3d_cache/sg/sg_node.cpp @@ -26,8 +26,9 @@ #include #include #include -#include <3d_cache/sg/sg_node.h> -#include <3d_rendering/c3dmodel.h> + +#include "3d_cache/sg/sg_node.h" +#include "plugins/3dapi/c3dmodel.h" static const std::string node_names[S3D::SGTYPE_END + 1] = { "TXFM", diff --git a/3d-viewer/3d_cache/sg/sg_node.h b/3d-viewer/3d_cache/sg/sg_node.h index 264602f384..01b3938b88 100644 --- a/3d-viewer/3d_cache/sg/sg_node.h +++ b/3d-viewer/3d_cache/sg/sg_node.h @@ -37,9 +37,9 @@ #include #include -#include <3d_rendering/c3dmodel.h> -#include <3d_cache/sg/sg_base.h> -#include <3d_cache/sg/sg_types.h> +#include "plugins/3dapi/c3dmodel.h" +#include "plugins/3dapi/sg_base.h" +#include "plugins/3dapi/sg_types.h" class SGNODE; class SGAPPEARANCE; diff --git a/3d-viewer/3d_cache/sg/sg_normals.cpp b/3d-viewer/3d_cache/sg/sg_normals.cpp index cab5729c42..3d028d70c3 100644 --- a/3d-viewer/3d_cache/sg/sg_normals.cpp +++ b/3d-viewer/3d_cache/sg/sg_normals.cpp @@ -22,8 +22,8 @@ */ #include -#include <3d_cache/sg/sg_normals.h> -#include <3d_cache/sg/sg_helpers.h> +#include "3d_cache/sg/sg_normals.h" +#include "3d_cache/sg/sg_helpers.h" SGNORMALS::SGNORMALS( SGNODE* aParent ) : SGNODE( aParent ) diff --git a/3d-viewer/3d_cache/sg/sg_normals.h b/3d-viewer/3d_cache/sg/sg_normals.h index 777ae80676..356072dbfd 100644 --- a/3d-viewer/3d_cache/sg/sg_normals.h +++ b/3d-viewer/3d_cache/sg/sg_normals.h @@ -30,7 +30,7 @@ #define SG_NORMALS_H #include -#include <3d_cache/sg/sg_node.h> +#include "3d_cache/sg/sg_node.h" class SGNORMALS : public SGNODE { diff --git a/3d-viewer/3d_cache/sg/sg_shape.cpp b/3d-viewer/3d_cache/sg/sg_shape.cpp index 71db77528d..805a28029f 100644 --- a/3d-viewer/3d_cache/sg/sg_shape.cpp +++ b/3d-viewer/3d_cache/sg/sg_shape.cpp @@ -24,15 +24,15 @@ #include #include -#include <3d_cache/sg/sg_shape.h> -#include <3d_cache/sg/sg_faceset.h> -#include <3d_cache/sg/sg_appearance.h> -#include <3d_cache/sg/sg_helpers.h> -#include <3d_cache/sg/sg_coordindex.h> -#include <3d_cache/sg/sg_colorindex.h> -#include <3d_cache/sg/sg_coords.h> -#include <3d_cache/sg/sg_colors.h> -#include <3d_cache/sg/sg_normals.h> +#include "3d_cache/sg/sg_shape.h" +#include "3d_cache/sg/sg_faceset.h" +#include "3d_cache/sg/sg_appearance.h" +#include "3d_cache/sg/sg_helpers.h" +#include "3d_cache/sg/sg_coordindex.h" +#include "3d_cache/sg/sg_colorindex.h" +#include "3d_cache/sg/sg_coords.h" +#include "3d_cache/sg/sg_colors.h" +#include "3d_cache/sg/sg_normals.h" SGSHAPE::SGSHAPE( SGNODE* aParent ) : SGNODE( aParent ) diff --git a/3d-viewer/3d_cache/sg/sg_shape.h b/3d-viewer/3d_cache/sg/sg_shape.h index 8239c7232c..281042ea1c 100644 --- a/3d-viewer/3d_cache/sg/sg_shape.h +++ b/3d-viewer/3d_cache/sg/sg_shape.h @@ -31,7 +31,7 @@ #define SG_SHAPE_H #include -#include <3d_cache/sg/sg_node.h> +#include "3d_cache/sg/sg_node.h" class SGAPPEARANCE; class SGFACESET; diff --git a/3d-viewer/3d_cache/sg/sg_types.h b/3d-viewer/3d_cache/sg/sg_types.h deleted file mode 100644 index 5a4dc6e4be..0000000000 --- a/3d-viewer/3d_cache/sg/sg_types.h +++ /dev/null @@ -1,22 +0,0 @@ - -#ifndef SG_TYPES_H -#define SG_TYPES_H - -namespace S3D -{ - enum SGTYPES - { - SGTYPE_TRANSFORM = 0, - SGTYPE_APPEARANCE, - SGTYPE_COLORS, - SGTYPE_COLORINDEX, - SGTYPE_FACESET, - SGTYPE_COORDS, - SGTYPE_COORDINDEX, - SGTYPE_NORMALS, - SGTYPE_SHAPE, - SGTYPE_END - }; -}; - -#endif // SG_TYPES_H diff --git a/3d-viewer/3d_cache/testmd5.cpp b/3d-viewer/3d_cache/testmd5.cpp deleted file mode 100644 index 027ba93956..0000000000 --- a/3d-viewer/3d_cache/testmd5.cpp +++ /dev/null @@ -1,63 +0,0 @@ -#include -#include -#include -#include -#include - -#include "md5.h" - - -using namespace std; - -int main( int argc, char** argv ) -{ - if( argc != 2 ) - { - cerr << "No filename given\n"; - return 0; - } - - FILE* fp = fopen( argv[1], "rb" ); - - if( !fp ) - { - cout << "Could not open file '" << argv[1] << "'\n"; - return 0; - } - - struct md5_ctx msum; - md5_init_ctx( &msum ); - unsigned char rb[16]; - int res = md5_stream( fp, rb ); - - cout << "Result: " << res << "\n"; - cout << "md5sum:\n"; - for( int i = 0; i < 16; ++i ) - { - cout << setfill( '0' ) << setw(2) << nouppercase << hex << ((int)rb[i] & 0xff); - } - cout << "\n"; - - fclose( fp ); - - /* - ifstream afile; - afile.open( argv[1], ios::in | ios::binary | ios::ate ); - streampos fsize; - - if( !afile.is_open() ) - { - cout << "Could not open file '" << argv[1] << "'\n"; - return 0; - } - - fsize = afile.tellg(); - afile.seekg( 0, ios::beg ); - - - - afile.close(); - */ - - return 0; -} \ No newline at end of file diff --git a/3d-viewer/3d_math/3d_math.h b/3d-viewer/3d_math/3d_math.h index af3ca2a5b7..02ee6ce4e1 100644 --- a/3d-viewer/3d_math/3d_math.h +++ b/3d-viewer/3d_math/3d_math.h @@ -30,7 +30,7 @@ #ifndef _3D_MATH_H #define _3D_MATH_H -#include "3d_xv3d/xv3d_types.h" +#include "plugins/3dapi/xv3d_types.h" // https://en.wikipedia.org/wiki/Spherical_coordinate_system diff --git a/3d-viewer/3d_model_viewer/c3d_model_viewer.cpp b/3d-viewer/3d_model_viewer/c3d_model_viewer.cpp index 871f9c32bb..d2b0854e7c 100644 --- a/3d-viewer/3d_model_viewer/c3d_model_viewer.cpp +++ b/3d-viewer/3d_model_viewer/c3d_model_viewer.cpp @@ -32,6 +32,9 @@ #include "3d_rendering/3d_render_ogl_legacy/ogl_legacy_utils.h" #include "common_ogl/ogl_utils.h" #include +#include "convert_to_biu.h" + +#define UNITS3D_TO_UNITSPCB (IU_PER_MM) /** * Trace mask used to enable or disable the trace output of this class. diff --git a/3d-viewer/3d_rendering/3d_render_ogl_legacy/c_ogl_3dmodel.h b/3d-viewer/3d_rendering/3d_render_ogl_legacy/c_ogl_3dmodel.h index 26ba5a8e8e..5f7da4cad9 100644 --- a/3d-viewer/3d_rendering/3d_render_ogl_legacy/c_ogl_3dmodel.h +++ b/3d-viewer/3d_rendering/3d_render_ogl_legacy/c_ogl_3dmodel.h @@ -30,7 +30,7 @@ #ifndef _C_OGL_3DMODEL_H_ #define _C_OGL_3DMODEL_H_ -#include "3d_rendering/c3dmodel.h" +#include "plugins/3dapi/c3dmodel.h" #include "common_ogl/openGL_includes.h" #include "3d_rendering/3d_render_raytracing/shapes3D/cbbox.h" diff --git a/3d-viewer/3d_rendering/3d_render_ogl_legacy/clayer_triangles.h b/3d-viewer/3d_rendering/3d_render_ogl_legacy/clayer_triangles.h index 9709a00eb4..c230bc044e 100644 --- a/3d-viewer/3d_rendering/3d_render_ogl_legacy/clayer_triangles.h +++ b/3d-viewer/3d_rendering/3d_render_ogl_legacy/clayer_triangles.h @@ -31,7 +31,7 @@ #define CLAYER_TRIANGLES_H_ #include "common_ogl/openGL_includes.h" -#include "3d_xv3d/xv3d_types.h" +#include "plugins/3dapi/xv3d_types.h" #include diff --git a/3d-viewer/3d_rendering/3d_render_ogl_legacy/ogl_legacy_utils.h b/3d-viewer/3d_rendering/3d_render_ogl_legacy/ogl_legacy_utils.h index cc619b7b69..8cb0a1232e 100644 --- a/3d-viewer/3d_rendering/3d_render_ogl_legacy/ogl_legacy_utils.h +++ b/3d-viewer/3d_rendering/3d_render_ogl_legacy/ogl_legacy_utils.h @@ -30,7 +30,7 @@ #ifndef OGL_LEGACY_UTILS_H_ #define OGL_LEGACY_UTILS_H_ -#include "3d_xv3d/xv3d_types.h" +#include "plugins/3dapi/xv3d_types.h" #include "3d_render_raytracing/shapes3D/cbbox.h" #include "3d_render_raytracing/shapes2D/croundsegment2d.h" diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/cfrustum.h b/3d-viewer/3d_rendering/3d_render_raytracing/cfrustum.h index d777f791ea..a8d994785c 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/cfrustum.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/cfrustum.h @@ -30,7 +30,7 @@ #ifndef _CFRUSTUM_H_ #define _CFRUSTUM_H_ -#include "../../3d_xv3d/xv3d_types.h" +#include "plugins/3dapi/xv3d_types.h" #include "shapes3D/cbbox.h" #include "ray.h" diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/hitinfo.h b/3d-viewer/3d_rendering/3d_render_raytracing/hitinfo.h index b500fb1cc9..c1f6c7c9e8 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/hitinfo.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/hitinfo.h @@ -30,7 +30,7 @@ #ifndef _HITINFO_H_ #define _HITINFO_H_ -#include "../../3d_xv3d/xv3d_types.h" +#include "plugins/3dapi/xv3d_types.h" #include "raypacket.h" //#define RAYTRACING_RAY_STATISTICS diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/ray.h b/3d-viewer/3d_rendering/3d_render_raytracing/ray.h index e7a990ca87..2091ff2dfe 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/ray.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/ray.h @@ -30,7 +30,7 @@ #ifndef _RAY_H_ #define _RAY_H_ -#include "3d_xv3d/xv3d_types.h" +#include "plugins/3dapi/xv3d_types.h" enum RAY_CLASSIFICATION diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cbbox2d.h b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cbbox2d.h index 4ad88c5ab8..aa83e1973c 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cbbox2d.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cbbox2d.h @@ -30,7 +30,7 @@ #ifndef _CBBOX2D_H_ #define _CBBOX2D_H_ -#include "3d_xv3d/xv3d_types.h" +#include "plugins/3dapi/xv3d_types.h" #include "3d_rendering/3d_render_raytracing/ray.h" diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cobject2d.h b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cobject2d.h index a129bd04ef..8458870325 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cobject2d.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cobject2d.h @@ -30,7 +30,7 @@ #ifndef _COBJECT2D_H_ #define _COBJECT2D_H_ -#include "3d_xv3d/xv3d_types.h" +#include "plugins/3dapi/xv3d_types.h" #include "cbbox2d.h" #include diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cbbox.h b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cbbox.h index ccd2840185..c0d56d5f48 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cbbox.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cbbox.h @@ -30,7 +30,7 @@ #ifndef _CBBOX_H_ #define _CBBOX_H_ -#include "3d_xv3d/xv3d_types.h" +#include "plugins/3dapi/xv3d_types.h" #include "3d_rendering/3d_render_raytracing/ray.h" #include // For the DBG( diff --git a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cobject.h b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cobject.h index 897a914905..aa0577b332 100644 --- a/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cobject.h +++ b/3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cobject.h @@ -30,7 +30,7 @@ #ifndef _COBJECT_H_ #define _COBJECT_H_ -#include "../../../3d_xv3d/xv3d_types.h" +#include "plugins/3dapi/xv3d_types.h" #include "cbbox.h" #include "../hitinfo.h" #include "../cmaterial.h" diff --git a/3d-viewer/3d_rendering/ccamera.h b/3d-viewer/3d_rendering/ccamera.h index 32436a187d..cd2e838fe3 100644 --- a/3d-viewer/3d_rendering/ccamera.h +++ b/3d-viewer/3d_rendering/ccamera.h @@ -30,8 +30,8 @@ #ifndef CCAMERA_H #define CCAMERA_H -#include "../3d_xv3d/xv3d_types.h" -#include "../3d_rendering/3d_render_raytracing/ray.h" +#include "plugins/3dapi/xv3d_types.h" +#include "3d_rendering/3d_render_raytracing/ray.h" #include // for wxSize #include diff --git a/3d-viewer/common_ogl/cogl_att_list.h b/3d-viewer/common_ogl/cogl_att_list.h index 88e97a9a9c..8df580e882 100644 --- a/3d-viewer/common_ogl/cogl_att_list.h +++ b/3d-viewer/common_ogl/cogl_att_list.h @@ -30,7 +30,7 @@ #ifndef _COGL_ATT_LIST_H #define _COGL_ATT_LIST_H -//#include <3d_xv3d/xv3d_types.h> +//#include "plugins/3dapi/xv3d_types.h" #include #include diff --git a/3d-viewer/common_ogl/ogl_utils.h b/3d-viewer/common_ogl/ogl_utils.h index 560ddde516..638921692f 100644 --- a/3d-viewer/common_ogl/ogl_utils.h +++ b/3d-viewer/common_ogl/ogl_utils.h @@ -32,7 +32,7 @@ #include #include "3d_rendering/cimage.h" -#include "3d_rendering/c3dmodel.h" +#include "plugins/3dapi/c3dmodel.h" void OGL_SetMaterial(const SMATERIAL & aMaterial); diff --git a/3d-viewer/3d_rendering/c3dmodel.h b/include/plugins/3dapi/c3dmodel.h similarity index 92% rename from 3d-viewer/3d_rendering/c3dmodel.h rename to include/plugins/3dapi/c3dmodel.h index e17af15dbf..f94a7e537a 100644 --- a/3d-viewer/3d_rendering/c3dmodel.h +++ b/include/plugins/3dapi/c3dmodel.h @@ -31,14 +31,7 @@ #ifndef C3DMODEL_H #define C3DMODEL_H -#include "3d_xv3d/xv3d_types.h" -#include -//#include - -/** - * Scale convertion from 3d model units to pcb units - */ -#define UNITS3D_TO_UNITSPCB (IU_PER_MM) +#include "plugins/3dapi/xv3d_types.h" typedef struct diff --git a/3d-viewer/3d_cache/sg/ifsg_all.h b/include/plugins/3dapi/ifsg_all.h similarity index 73% rename from 3d-viewer/3d_cache/sg/ifsg_all.h rename to include/plugins/3dapi/ifsg_all.h index 4a24251f80..b64f66b475 100644 --- a/3d-viewer/3d_cache/sg/ifsg_all.h +++ b/include/plugins/3dapi/ifsg_all.h @@ -26,13 +26,13 @@ * collects header files for all SG* wrappers and the API */ -#include "3d_cache/sg/ifsg_transform.h" -#include "3d_cache/sg/ifsg_appearance.h" -#include "3d_cache/sg/ifsg_colors.h" -#include "3d_cache/sg/ifsg_coords.h" -#include "3d_cache/sg/ifsg_faceset.h" -#include "3d_cache/sg/ifsg_colorindex.h" -#include "3d_cache/sg/ifsg_coordindex.h" -#include "3d_cache/sg/ifsg_normals.h" -#include "3d_cache/sg/ifsg_shape.h" -#include "3d_cache/sg/ifsg_api.h" +#include "plugins/3dapi/ifsg_transform.h" +#include "plugins/3dapi/ifsg_appearance.h" +#include "plugins/3dapi/ifsg_colors.h" +#include "plugins/3dapi/ifsg_coords.h" +#include "plugins/3dapi/ifsg_faceset.h" +#include "plugins/3dapi/ifsg_colorindex.h" +#include "plugins/3dapi/ifsg_coordindex.h" +#include "plugins/3dapi/ifsg_normals.h" +#include "plugins/3dapi/ifsg_shape.h" +#include "plugins/3dapi/ifsg_api.h" diff --git a/3d-viewer/3d_cache/sg/ifsg_api.h b/include/plugins/3dapi/ifsg_api.h similarity index 98% rename from 3d-viewer/3d_cache/sg/ifsg_api.h rename to include/plugins/3dapi/ifsg_api.h index c8f6894646..ddd551f232 100644 --- a/3d-viewer/3d_cache/sg/ifsg_api.h +++ b/include/plugins/3dapi/ifsg_api.h @@ -32,11 +32,9 @@ #include #include -#include "3d_cache/sg/sg_types.h" -#include "3d_cache/sg/sg_base.h" -#include "3d_rendering/c3dmodel.h" - -#include "ifsg_defs.h" +#include "plugins/3dapi/sg_types.h" +#include "plugins/3dapi/sg_base.h" +#include "plugins/3dapi/c3dmodel.h" class SGNODE; class SCENEGRAPH; diff --git a/3d-viewer/3d_cache/sg/ifsg_appearance.h b/include/plugins/3dapi/ifsg_appearance.h similarity index 98% rename from 3d-viewer/3d_cache/sg/ifsg_appearance.h rename to include/plugins/3dapi/ifsg_appearance.h index 570f26b2a7..48e2341af2 100644 --- a/3d-viewer/3d_cache/sg/ifsg_appearance.h +++ b/include/plugins/3dapi/ifsg_appearance.h @@ -29,7 +29,7 @@ #ifndef IFSG_APPEARANCE_H #define IFSG_APPEARANCE_H -#include <3d_cache/sg/ifsg_node.h> +#include "plugins/3dapi/ifsg_node.h" class SGLIB_API IFSG_APPEARANCE : public IFSG_NODE { diff --git a/3d-viewer/3d_cache/sg/ifsg_colorindex.h b/include/plugins/3dapi/ifsg_colorindex.h similarity index 97% rename from 3d-viewer/3d_cache/sg/ifsg_colorindex.h rename to include/plugins/3dapi/ifsg_colorindex.h index 4b4593faaa..95efa4015f 100644 --- a/3d-viewer/3d_cache/sg/ifsg_colorindex.h +++ b/include/plugins/3dapi/ifsg_colorindex.h @@ -30,7 +30,7 @@ #ifndef IFSG_COLORINDEX_H #define IFSG_COLORINDEX_H -#include <3d_cache/sg/ifsg_index.h> +#include "plugins/3dapi/ifsg_index.h" /** diff --git a/3d-viewer/3d_cache/sg/ifsg_colors.h b/include/plugins/3dapi/ifsg_colors.h similarity index 97% rename from 3d-viewer/3d_cache/sg/ifsg_colors.h rename to include/plugins/3dapi/ifsg_colors.h index f3b3417b17..9c1632fce8 100644 --- a/3d-viewer/3d_cache/sg/ifsg_colors.h +++ b/include/plugins/3dapi/ifsg_colors.h @@ -30,7 +30,7 @@ #ifndef IFSG_COLORS_H #define IFSG_COLORS_H -#include <3d_cache/sg/ifsg_node.h> +#include "plugins/3dapi/ifsg_node.h" /** diff --git a/3d-viewer/3d_cache/sg/ifsg_coordindex.h b/include/plugins/3dapi/ifsg_coordindex.h similarity index 97% rename from 3d-viewer/3d_cache/sg/ifsg_coordindex.h rename to include/plugins/3dapi/ifsg_coordindex.h index 78b10e909d..ab6ca86fef 100644 --- a/3d-viewer/3d_cache/sg/ifsg_coordindex.h +++ b/include/plugins/3dapi/ifsg_coordindex.h @@ -30,7 +30,7 @@ #ifndef IFSG_COORDINDEX_H #define IFSG_COORDINDEX_H -#include <3d_cache/sg/ifsg_index.h> +#include "plugins/3dapi/ifsg_index.h" /** diff --git a/3d-viewer/3d_cache/sg/ifsg_coords.h b/include/plugins/3dapi/ifsg_coords.h similarity index 97% rename from 3d-viewer/3d_cache/sg/ifsg_coords.h rename to include/plugins/3dapi/ifsg_coords.h index 17d7ab2d25..8eba8df502 100644 --- a/3d-viewer/3d_cache/sg/ifsg_coords.h +++ b/include/plugins/3dapi/ifsg_coords.h @@ -30,7 +30,7 @@ #ifndef IFSG_COORDS_H #define IFSG_COORDS_H -#include <3d_cache/sg/ifsg_node.h> +#include "plugins/3dapi/ifsg_node.h" /** diff --git a/3d-viewer/3d_cache/sg/ifsg_defs.h b/include/plugins/3dapi/ifsg_defs.h similarity index 100% rename from 3d-viewer/3d_cache/sg/ifsg_defs.h rename to include/plugins/3dapi/ifsg_defs.h diff --git a/3d-viewer/3d_cache/sg/ifsg_faceset.h b/include/plugins/3dapi/ifsg_faceset.h similarity index 97% rename from 3d-viewer/3d_cache/sg/ifsg_faceset.h rename to include/plugins/3dapi/ifsg_faceset.h index fbb18d100f..85be5370b3 100644 --- a/3d-viewer/3d_cache/sg/ifsg_faceset.h +++ b/include/plugins/3dapi/ifsg_faceset.h @@ -30,7 +30,7 @@ #ifndef IFSG_FACESET_H #define IFSG_FACESET_H -#include <3d_cache/sg/ifsg_node.h> +#include "plugins/3dapi/ifsg_node.h" /** diff --git a/3d-viewer/3d_cache/sg/ifsg_index.h b/include/plugins/3dapi/ifsg_index.h similarity index 98% rename from 3d-viewer/3d_cache/sg/ifsg_index.h rename to include/plugins/3dapi/ifsg_index.h index cebfd535ba..a72cbdb5c8 100644 --- a/3d-viewer/3d_cache/sg/ifsg_index.h +++ b/include/plugins/3dapi/ifsg_index.h @@ -30,7 +30,7 @@ #ifndef IFSG_INDEX_H #define IFSG_INDEX_H -#include <3d_cache/sg/ifsg_node.h> +#include "plugins/3dapi/ifsg_node.h" /** diff --git a/3d-viewer/3d_cache/sg/ifsg_node.h b/include/plugins/3dapi/ifsg_node.h similarity index 98% rename from 3d-viewer/3d_cache/sg/ifsg_node.h rename to include/plugins/3dapi/ifsg_node.h index 76172a2061..30847ea4cd 100644 --- a/3d-viewer/3d_cache/sg/ifsg_node.h +++ b/include/plugins/3dapi/ifsg_node.h @@ -42,9 +42,8 @@ #ifndef IFSG_NODE_H #define IFSG_NODE_H -#include "3d_cache/sg/sg_base.h" -#include "3d_cache/sg/sg_types.h" -#include "3d_cache/sg/ifsg_defs.h" +#include "plugins/3dapi/sg_base.h" +#include "plugins/3dapi/sg_types.h" class SGNODE; diff --git a/3d-viewer/3d_cache/sg/ifsg_normalindex.h b/include/plugins/3dapi/ifsg_normalindex.h similarity index 97% rename from 3d-viewer/3d_cache/sg/ifsg_normalindex.h rename to include/plugins/3dapi/ifsg_normalindex.h index f08ea7b4f4..57d8f8972b 100644 --- a/3d-viewer/3d_cache/sg/ifsg_normalindex.h +++ b/include/plugins/3dapi/ifsg_normalindex.h @@ -30,7 +30,7 @@ #ifndef IFSG_NORMALINDEX_H #define IFSG_NORMALINDEX_H -#include <3d_cache/sg/ifsg_index.h> +#include "plugins/3dapi/ifsg_index.h" /** diff --git a/3d-viewer/3d_cache/sg/ifsg_normals.h b/include/plugins/3dapi/ifsg_normals.h similarity index 98% rename from 3d-viewer/3d_cache/sg/ifsg_normals.h rename to include/plugins/3dapi/ifsg_normals.h index 676172989d..4befd15f31 100644 --- a/3d-viewer/3d_cache/sg/ifsg_normals.h +++ b/include/plugins/3dapi/ifsg_normals.h @@ -30,7 +30,7 @@ #ifndef IFSG_NORMALS_H #define IFSG_NORMALS_H -#include <3d_cache/sg/ifsg_node.h> +#include "plugins/3dapi/ifsg_node.h" /** diff --git a/3d-viewer/3d_cache/sg/ifsg_shape.h b/include/plugins/3dapi/ifsg_shape.h similarity index 97% rename from 3d-viewer/3d_cache/sg/ifsg_shape.h rename to include/plugins/3dapi/ifsg_shape.h index 398adb4833..0d9ba2f220 100644 --- a/3d-viewer/3d_cache/sg/ifsg_shape.h +++ b/include/plugins/3dapi/ifsg_shape.h @@ -30,7 +30,7 @@ #ifndef IFSG_SHAPE_H #define IFSG_SHAPE_H -#include <3d_cache/sg/ifsg_node.h> +#include "plugins/3dapi/ifsg_node.h" /** diff --git a/3d-viewer/3d_cache/sg/ifsg_transform.h b/include/plugins/3dapi/ifsg_transform.h similarity index 98% rename from 3d-viewer/3d_cache/sg/ifsg_transform.h rename to include/plugins/3dapi/ifsg_transform.h index 6cbf79d283..42bf1e643a 100644 --- a/3d-viewer/3d_cache/sg/ifsg_transform.h +++ b/include/plugins/3dapi/ifsg_transform.h @@ -30,7 +30,7 @@ #ifndef IFSG_TRANSFORM_H #define IFSG_TRANSFORM_H -#include <3d_cache/sg/ifsg_node.h> +#include "plugins/3dapi/ifsg_node.h" /** diff --git a/3d-viewer/3d_cache/sg/sg_base.h b/include/plugins/3dapi/sg_base.h similarity index 98% rename from 3d-viewer/3d_cache/sg/sg_base.h rename to include/plugins/3dapi/sg_base.h index 30dded8550..dcd7f3d4cb 100644 --- a/3d-viewer/3d_cache/sg/sg_base.h +++ b/include/plugins/3dapi/sg_base.h @@ -30,7 +30,7 @@ #ifndef SG_BASE_H #define SG_BASE_H -#include "import_export.h" +#include "plugins/3dapi/ifsg_defs.h" #ifndef SGLIB_API #if defined (COMPILE_SGLIB) diff --git a/include/plugins/3dapi/sg_types.h b/include/plugins/3dapi/sg_types.h new file mode 100644 index 0000000000..db4cadfc3e --- /dev/null +++ b/include/plugins/3dapi/sg_types.h @@ -0,0 +1,49 @@ +/* + * This program source code file is part of KiCad, a free EDA CAD application. + * + * Copyright (C) 2015 Cirilo Bernardo + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program 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 General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, you may find one here: + * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html + * or you may search the http://www.gnu.org website for the version 2 license, + * or you may write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA + */ + +/** + * @file sg_types.h + * defines the types of intermediate scene graph objects + */ + +#ifndef SG_TYPES_H +#define SG_TYPES_H + +namespace S3D +{ + enum SGTYPES + { + SGTYPE_TRANSFORM = 0, + SGTYPE_APPEARANCE, + SGTYPE_COLORS, + SGTYPE_COLORINDEX, + SGTYPE_FACESET, + SGTYPE_COORDS, + SGTYPE_COORDINDEX, + SGTYPE_NORMALS, + SGTYPE_SHAPE, + SGTYPE_END + }; +}; + +#endif // SG_TYPES_H diff --git a/3d-viewer/3d_xv3d/xv3d_types.h b/include/plugins/3dapi/xv3d_types.h similarity index 100% rename from 3d-viewer/3d_xv3d/xv3d_types.h rename to include/plugins/3dapi/xv3d_types.h diff --git a/plugins/3d/s3d_plugin_tetra.cpp b/plugins/3d/s3d_plugin_tetra.cpp index 005534038e..d4b6890a23 100644 --- a/plugins/3d/s3d_plugin_tetra.cpp +++ b/plugins/3d/s3d_plugin_tetra.cpp @@ -31,7 +31,7 @@ #include #include #include -#include <3d_cache/sg/ifsg_all.h> +#include S3D_PLUGIN_TETRA::S3D_PLUGIN_TETRA()