gered/AssimpToMesh
Archived
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

assimp includes now referenced with "assimp/"

Browse source
This commit is contained in:
gered 2011-06-07 10:48:53 -04:00
parent f98e905450
commit ee3975406e
9 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -48,7 +48,7 @@ endif
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
ifeq ("$(BUILD)","Debug") ifeq ("$(BUILD)","Debug")
DEFINES := -DDEBUG -DDEBUG_ASSERT_BREAK DEFINES := -DDEBUG -DDEBUG_ASSERT_BREAK
CFLAGS := $(DEFINES) -g -Wall -I/usr/include/assimp CFLAGS := $(DEFINES) -g -Wall
CXXFLAGS := $(CFLAGS) CXXFLAGS := $(CFLAGS)
LDFLAGS := $(PLATFORM_LD_FLAGS) LDFLAGS := $(PLATFORM_LD_FLAGS)
LIBS := -g -lassimp LIBS := -g -lassimp
@ -56,7 +56,7 @@ endif
#------------------------------------------------------------------------------- #-------------------------------------------------------------------------------
ifeq ("$(BUILD)","Release") ifeq ("$(BUILD)","Release")
DEFINES := DEFINES :=
CFLAGS := $(DEFINES) -O2 -Wall -I/usr/include/assimp CFLAGS := $(DEFINES) -O2 -Wall
CXXFLAGS := $(CFLAGS) CXXFLAGS := $(CFLAGS)
LDFLAGS := -O2 $(PLATFORM_LD_FLAGS) LDFLAGS := -O2 $(PLATFORM_LD_FLAGS)
LIBS := -lassimp LIBS := -lassimp

2
src/assimputils/types.h
View file

@ -1,7 +1,7 @@
#ifndef __ASSIMPUTILS_TYPES_H_INCLUDED__ #ifndef __ASSIMPUTILS_TYPES_H_INCLUDED__
#define __ASSIMPUTILS_TYPES_H_INCLUDED__ #define __ASSIMPUTILS_TYPES_H_INCLUDED__
#include <aiTypes.h> #include <assimp/aiTypes.h>
#include <vector> #include <vector>
#include <map> #include <map>

4
src/assimputils/utils.h
View file

@ -1,8 +1,8 @@
#ifndef __ASSIMPUTILS_UTILS_H_INCLUDED__ #ifndef __ASSIMPUTILS_UTILS_H_INCLUDED__
#define __ASSIMPUTILS_UTILS_H_INCLUDED__ #define __ASSIMPUTILS_UTILS_H_INCLUDED__
#include <assimp.hpp> #include <assimp/assimp.hpp>
#include <aiScene.h> #include <assimp/aiScene.h>
#include <map> #include <map>
#include <vector> #include <vector>

2
src/convert/convert.h
View file

@ -2,7 +2,7 @@
#define __CONVERT_CONVERT_H_INCLUDED__ #define __CONVERT_CONVERT_H_INCLUDED__
#include <string> #include <string>
#include <aiScene.h> #include <assimp/aiScene.h>
void ConvertStatic(const std::string &outfile, const aiScene *scene); void ConvertStatic(const std::string &outfile, const aiScene *scene);
void ConvertSkeletalAnimated(const std::string &outfile, const aiScene *scene); void ConvertSkeletalAnimated(const std::string &outfile, const aiScene *scene);

2
src/convert/mesh.h
View file

@ -3,7 +3,7 @@
#include <stdio.h> #include <stdio.h>
#include <vector> #include <vector>
#include <aiTypes.h> #include <assimp/aiTypes.h>
#include "../assimputils/types.h" #include "../assimputils/types.h"
#include "meshmaterial.h" #include "meshmaterial.h"
#include "meshtriangle.h" #include "meshtriangle.h"

4
src/convert/meshjoint.h
View file

@ -3,8 +3,8 @@
#include <stdint.h> #include <stdint.h>
#include <string> #include <string>
#include <aiVector3D.h> #include <assimp/aiVector3D.h>
#include <aiQuaternion.h> #include <assimp/aiQuaternion.h>
#include <vector> #include <vector>
struct MeshJoint struct MeshJoint

2
src/convert/meshmaterial.h
View file

@ -2,7 +2,7 @@
#define __CONVERT_MESHMATERIAL_H_INCLUDED__ #define __CONVERT_MESHMATERIAL_H_INCLUDED__
#include <string> #include <string>
#include <aiMaterial.h> #include <assimp/aiMaterial.h>
struct MeshMaterial struct MeshMaterial
{ {

6
src/main.cpp
View file

@ -2,9 +2,9 @@
#include <string> #include <string>
#include <exception> #include <exception>
#include <assimp.hpp> #include <assimp/assimp.hpp>
#include <aiScene.h> #include <assimp/aiScene.h>
#include <aiPostProcess.h> #include <assimp/aiPostProcess.h>
#include "utils/utils.h" #include "utils/utils.h"
#include "assimputils/utils.h" #include "assimputils/utils.h"

2
src/nodetree/nodetree.h
View file

@ -1,7 +1,7 @@
#ifndef __NODETREE_NODETREE_H_INCLUDED__ #ifndef __NODETREE_NODETREE_H_INCLUDED__
#define __NODETREE_NODETREE_H_INCLUDED__ #define __NODETREE_NODETREE_H_INCLUDED__
#include <aiScene.h> #include <assimp/aiScene.h>
#include <string> #include <string>
void Walk(const aiScene *scene, const std::string &filename); void Walk(const aiScene *scene, const std::string &filename);