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

revert back to Assimp 2.x for all builds, since there seems to be some issues building 3.x on OSX (and 3.x isn't in Homebrew yet either)

Browse source
This commit is contained in:
gered 2012-09-23 12:40:28 -04:00
parent a7e7463110
commit 10d11a5a65
8 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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 <assimp/types.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/Importer.hpp> #include <assimp/assimp.hpp>
#include <assimp/scene.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 <assimp/scene.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 <assimp/types.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 <assimp/vector3.h> #include <assimp/aiVector3D.h>
#include <assimp/quaternion.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 <assimp/material.h> #include <assimp/aiMaterial.h>
struct MeshMaterial struct MeshMaterial
{ {

6
src/main.cpp
View file

@ -2,9 +2,9 @@
#include <string> #include <string>
#include <stdexcept> #include <stdexcept>
#include <assimp/Importer.hpp> #include <assimp/assimp.hpp>
#include <assimp/scene.h> #include <assimp/aiScene.h>
#include <assimp/postprocess.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 <assimp/scene.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);