haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3d-viewer/3d_cache/3d_cache.cpp
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" )

2
3d-viewer/3d_cache/3d_cache.h
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;

2
3d-viewer/3d_cache/3d_info.h
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

6
3d-viewer/3d_cache/3d_plugin_manager.cpp
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
{

6
3d-viewer/3d_cache/dialogs/3d_cache_dialogs.cpp
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"

2
3d-viewer/3d_cache/dialogs/dialog_config_3dpath.cpp
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

2
3d-viewer/3d_cache/dialogs/dialog_select_3dmodel.cpp
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"

8
3d-viewer/3d_cache/dialogs/panel_prev_model.cpp
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"

4
3d-viewer/3d_cache/dialogs/panel_prev_model.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;

28
3d-viewer/3d_cache/sg/ifsg_api.cpp
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";

4
3d-viewer/3d_cache/sg/ifsg_appearance.cpp
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[];

6
3d-viewer/3d_cache/sg/ifsg_colorindex.cpp
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[];

4
3d-viewer/3d_cache/sg/ifsg_colors.cpp
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[];

6
3d-viewer/3d_cache/sg/ifsg_coordindex.cpp
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[];

4
3d-viewer/3d_cache/sg/ifsg_coords.cpp
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[];

4
3d-viewer/3d_cache/sg/ifsg_faceset.cpp
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[];

6
3d-viewer/3d_cache/sg/ifsg_index.cpp
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[];

6
3d-viewer/3d_cache/sg/ifsg_node.cpp
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)";

6
3d-viewer/3d_cache/sg/ifsg_normalindex.cpp
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[];

4
3d-viewer/3d_cache/sg/ifsg_normals.cpp
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[];

4
3d-viewer/3d_cache/sg/ifsg_shape.cpp
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[];

4
3d-viewer/3d_cache/sg/ifsg_transform.cpp
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[];

6
3d-viewer/3d_cache/sg/scenegraph.cpp
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 )
{

2
3d-viewer/3d_cache/sg/scenegraph.h
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;

4
3d-viewer/3d_cache/sg/sg_appearance.cpp
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)
{

2
3d-viewer/3d_cache/sg/sg_appearance.h
View File

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

2
3d-viewer/3d_cache/sg/sg_base.cpp
View File

@ -24,7 +24,7 @@
#include <iostream>
#include <cmath>
#include <3d_cache/sg/sg_base.h>
#include "plugins/3dapi/sg_base.h"
SGCOLOR::SGCOLOR()

2
3d-viewer/3d_cache/sg/sg_colorindex.cpp
View File

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

2
3d-viewer/3d_cache/sg/sg_colorindex.h
View File

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

4
3d-viewer/3d_cache/sg/sg_colors.cpp
View File

@ -22,8 +22,8 @@
*/
#include <iostream>
#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 )
{

2
3d-viewer/3d_cache/sg/sg_colors.h
View File

@ -30,7 +30,7 @@
#define SG_COLORS_H
#include <vector>
#include <3d_cache/sg/sg_node.h>
#include "3d_cache/sg/sg_node.h"
class SGCOLORS : public SGNODE
{

2
3d-viewer/3d_cache/sg/sg_coordindex.cpp
View File

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

2
3d-viewer/3d_cache/sg/sg_coordindex.h
View File

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

4
3d-viewer/3d_cache/sg/sg_coords.cpp
View File

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

2
3d-viewer/3d_cache/sg/sg_coords.h
View File

@ -30,7 +30,7 @@
#define SG_COORDS_H
#include <vector>
#include <3d_cache/sg/sg_node.h>
#include "3d_cache/sg/sg_node.h"
class SGCOORDS : public SGNODE
{

14
3d-viewer/3d_cache/sg/sg_faceset.cpp
View File

@ -23,13 +23,13 @@
#include <iostream>
#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 )
{

8
3d-viewer/3d_cache/sg/sg_faceset.h
View File

@ -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 <vector>
#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
{

6
3d-viewer/3d_cache/sg/sg_helpers.cpp
View File

@ -27,8 +27,10 @@
#include <streambuf>
#include <iomanip>
#include <string>
#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 )

4
3d-viewer/3d_cache/sg/sg_helpers.h
View File

@ -35,8 +35,8 @@
#include <fstream>
#include <string>
#include <algorithm>
#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

2
3d-viewer/3d_cache/sg/sg_index.cpp
View File

@ -23,7 +23,7 @@
#include <iostream>
#include <fstream>
#include <3d_cache/sg/sg_index.h>
#include "3d_cache/sg/sg_index.h"
SGINDEX::SGINDEX( SGNODE* aParent ) : SGNODE( aParent )

2
3d-viewer/3d_cache/sg/sg_index.h
View File

@ -30,7 +30,7 @@
#define SG_INDEX_H
#include <vector>
#include <3d_cache/sg/sg_node.h>
#include "3d_cache/sg/sg_node.h"
class SGINDEX : public SGNODE
{

5
3d-viewer/3d_cache/sg/sg_node.cpp
View File

@ -26,8 +26,9 @@
#include <cmath>
#include <cstring>
#include <algorithm>
#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",

6
3d-viewer/3d_cache/sg/sg_node.h
View File

@ -37,9 +37,9 @@
#include <map>
#include <glm/glm.hpp>
#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;

4
3d-viewer/3d_cache/sg/sg_normals.cpp
View File

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

2
3d-viewer/3d_cache/sg/sg_normals.h
View File

@ -30,7 +30,7 @@
#define SG_NORMALS_H
#include <vector>
#include <3d_cache/sg/sg_node.h>
#include "3d_cache/sg/sg_node.h"
class SGNORMALS : public SGNODE
{

18
3d-viewer/3d_cache/sg/sg_shape.cpp
View File

@ -24,15 +24,15 @@
#include <iostream>
#include <fstream>
#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 )

2
3d-viewer/3d_cache/sg/sg_shape.h
View File

@ -31,7 +31,7 @@
#define SG_SHAPE_H
#include <vector>
#include <3d_cache/sg/sg_node.h>
#include "3d_cache/sg/sg_node.h"
class SGAPPEARANCE;
class SGFACESET;

22
3d-viewer/3d_cache/sg/sg_types.h
View File

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

63
3d-viewer/3d_cache/testmd5.cpp
View File

@ -1,63 +0,0 @@
#include <iostream>
#include <fstream>
#include <cstdio>
#include <iomanip>
#include <stdint.h>
#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;
}

2
3d-viewer/3d_math/3d_math.h
View File

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

3
3d-viewer/3d_model_viewer/c3d_model_viewer.cpp
View File

@ -32,6 +32,9 @@
#include "3d_rendering/3d_render_ogl_legacy/ogl_legacy_utils.h"
#include "common_ogl/ogl_utils.h"
#include <wx/dcclient.h>
#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.

2
3d-viewer/3d_rendering/3d_render_ogl_legacy/c_ogl_3dmodel.h
View File

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

2
3d-viewer/3d_rendering/3d_render_ogl_legacy/clayer_triangles.h
View File

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

2
3d-viewer/3d_rendering/3d_render_ogl_legacy/ogl_legacy_utils.h
View File

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

2
3d-viewer/3d_rendering/3d_render_raytracing/cfrustum.h
View File

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

2
3d-viewer/3d_rendering/3d_render_raytracing/hitinfo.h
View File

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

2
3d-viewer/3d_rendering/3d_render_raytracing/ray.h
View File

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

2
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cbbox2d.h
View File

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

2
3d-viewer/3d_rendering/3d_render_raytracing/shapes2D/cobject2d.h
View File

@ -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 <string.h>

2
3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cbbox.h
View File

@ -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 <fctsys.h> // For the DBG(

2
3d-viewer/3d_rendering/3d_render_raytracing/shapes3D/cobject.h
View File

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

4
3d-viewer/3d_rendering/ccamera.h
View File

@ -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 <wx/gdicmn.h> // for wxSize
#include <vector>

2
3d-viewer/common_ogl/cogl_att_list.h
View File

@ -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 <macros.h>
#include <wx/glcanvas.h>

2
3d-viewer/common_ogl/ogl_utils.h
View File

@ -32,7 +32,7 @@
#include <wx/image.h>
#include "3d_rendering/cimage.h"
#include "3d_rendering/c3dmodel.h"
#include "plugins/3dapi/c3dmodel.h"
void OGL_SetMaterial(const SMATERIAL & aMaterial);

9
3d-viewer/3d_rendering/c3dmodel.h → include/plugins/3dapi/c3dmodel.h
View File

@ -31,14 +31,7 @@
#ifndef C3DMODEL_H
#define C3DMODEL_H
#include "3d_xv3d/xv3d_types.h"
#include <base_units.h>
//#include <wx/string.h>
/**
* Scale convertion from 3d model units to pcb units
*/
#define UNITS3D_TO_UNITSPCB (IU_PER_MM)
#include "plugins/3dapi/xv3d_types.h"
typedef struct

20
3d-viewer/3d_cache/sg/ifsg_all.h → include/plugins/3dapi/ifsg_all.h
View File

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

8
3d-viewer/3d_cache/sg/ifsg_api.h → include/plugins/3dapi/ifsg_api.h
View File

@ -32,11 +32,9 @@
#include <wx/string.h>
#include <glm.hpp>
#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;

2
3d-viewer/3d_cache/sg/ifsg_appearance.h → include/plugins/3dapi/ifsg_appearance.h
View File

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

2
3d-viewer/3d_cache/sg/ifsg_colorindex.h → include/plugins/3dapi/ifsg_colorindex.h
View File

@ -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"
/**

2
3d-viewer/3d_cache/sg/ifsg_colors.h → include/plugins/3dapi/ifsg_colors.h
View File

@ -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"
/**

2
3d-viewer/3d_cache/sg/ifsg_coordindex.h → include/plugins/3dapi/ifsg_coordindex.h
View File

@ -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"
/**

2
3d-viewer/3d_cache/sg/ifsg_coords.h → include/plugins/3dapi/ifsg_coords.h
View File

@ -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"
/**

0
3d-viewer/3d_cache/sg/ifsg_defs.h → include/plugins/3dapi/ifsg_defs.h
View File

2
3d-viewer/3d_cache/sg/ifsg_faceset.h → include/plugins/3dapi/ifsg_faceset.h
View File

@ -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"
/**

2
3d-viewer/3d_cache/sg/ifsg_index.h → include/plugins/3dapi/ifsg_index.h
View File

@ -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"
/**

5
3d-viewer/3d_cache/sg/ifsg_node.h → include/plugins/3dapi/ifsg_node.h
View File

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

2
3d-viewer/3d_cache/sg/ifsg_normalindex.h → include/plugins/3dapi/ifsg_normalindex.h
View File

@ -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"
/**

2
3d-viewer/3d_cache/sg/ifsg_normals.h → include/plugins/3dapi/ifsg_normals.h
View File

@ -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"
/**

2
3d-viewer/3d_cache/sg/ifsg_shape.h → include/plugins/3dapi/ifsg_shape.h
View File

@ -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"
/**

2
3d-viewer/3d_cache/sg/ifsg_transform.h → include/plugins/3dapi/ifsg_transform.h
View File

@ -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"
/**

2
3d-viewer/3d_cache/sg/sg_base.h → include/plugins/3dapi/sg_base.h
View File

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

49
include/plugins/3dapi/sg_types.h Normal file
View File

@ -0,0 +1,49 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2015 Cirilo Bernardo <cirilo.bernardo@gmail.com>
*
* 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

0
3d-viewer/3d_xv3d/xv3d_types.h → include/plugins/3dapi/xv3d_types.h
View File

2
plugins/3d/s3d_plugin_tetra.cpp
View File

@ -31,7 +31,7 @@
#include <iostream>
#include <cmath>
#include <s3d_plugin_tetra.h>
#include <3d_cache/sg/ifsg_all.h>
#include <plugins/3dapi/ifsg_all.h>
S3D_PLUGIN_TETRA::S3D_PLUGIN_TETRA()