7
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-18 18:48:56 +00:00

Moving headers to facilitate support for building 3D plugins out-of-tree

This commit is contained in:
Cirilo Bernardo 2015-12-09 18:30:48 +11:00
parent a0597c4614
commit ac3acb0061
84 changed files with 209 additions and 255 deletions

View File

@ -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" )

View File

@ -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;

View File

@ -34,7 +34,7 @@
#define INFO_3D_H
#include <wx/string.h>
#include <3d_cache/sg/sg_base.h>
#include <plugins/3dapi/sg_base.h>
struct S3D_INFO

View File

@ -41,9 +41,9 @@
#include <pwd.h>
#endif
#include <3d_plugin_manager.h>
#include <plugins/3d/3d_plugin.h>
#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
{

View File

@ -22,10 +22,10 @@
*/
#include <wx/filename.h>
#include <3d_info.h>
#include <3d_cache.h>
#include <sg/ifsg_api.h>
#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"

View File

@ -25,8 +25,8 @@
#include <cstdlib>
#include <list>
#include <wx/filename.h>
#include <3d_cache.h>
#include "3d_cache.h"
#include "dialog_config_3dpath.h"
enum

View File

@ -22,7 +22,7 @@
*/
#include <iostream>
#include <3d_cache.h>
#include "3d_cache.h"
#include "dialog_select_3dmodel.h"
#include "panel_prev_model.h"

View File

@ -33,10 +33,10 @@
#include <wx/glcanvas.h>
#include <glm/gtx/transform.hpp>
#include <glm/gtc/matrix_transform.hpp>
#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"

View File

@ -37,8 +37,8 @@
#include <wx/wx.h>
#include <wx/panel.h>
#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;

View File

@ -27,20 +27,20 @@
#include <locale.h>
#include <wx/filename.h>
#include <wx/string.h>
#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";

View File

@ -23,8 +23,8 @@
#include <iostream>
#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[];

View File

@ -23,9 +23,9 @@
#include <iostream>
#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[];

View File

@ -22,8 +22,8 @@
*/
#include <iostream>
#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[];

View File

@ -23,9 +23,9 @@
#include <iostream>
#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[];

View File

@ -22,8 +22,8 @@
*/
#include <iostream>
#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[];

View File

@ -23,8 +23,8 @@
#include <iostream>
#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[];

View File

@ -23,9 +23,9 @@
#include <iostream>
#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[];

View File

@ -23,9 +23,9 @@
#include <iostream>
#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)";

View File

@ -23,9 +23,9 @@
#include <iostream>
#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[];

View File

@ -23,8 +23,8 @@
#include <iostream>
#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[];

View File

@ -23,8 +23,8 @@
#include <iostream>
#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[];

View File

@ -23,8 +23,8 @@
#include <iostream>
#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[];

View File

@ -27,9 +27,9 @@
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/type_ptr.hpp>
#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 )
{

View File

@ -34,7 +34,7 @@
#define SCENE_GRAPH_H
#include <vector>
#include <3d_cache/sg/sg_node.h>
#include "3d_cache/sg/sg_node.h"
class SGSHAPE;

View File

@ -24,8 +24,8 @@
#include <iostream>
#include <utility>
#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)
{

Some files were not shown because too many files have changed in this diff Show More