update #includes to match assimp include renames in v3.0
This commit is contained in:
parent
64258697da
commit
670889f469
|
@ -1,7 +1,7 @@
|
|||
#ifndef __ASSIMPUTILS_TYPES_H_INCLUDED__
|
||||
#define __ASSIMPUTILS_TYPES_H_INCLUDED__
|
||||
|
||||
#include <assimp/aiTypes.h>
|
||||
#include <assimp/types.h>
|
||||
#include <vector>
|
||||
#include <map>
|
||||
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
#ifndef __ASSIMPUTILS_UTILS_H_INCLUDED__
|
||||
#define __ASSIMPUTILS_UTILS_H_INCLUDED__
|
||||
|
||||
#include <assimp/assimp.hpp>
|
||||
#include <assimp/aiScene.h>
|
||||
#include <assimp/Importer.hpp>
|
||||
#include <assimp/scene.h>
|
||||
|
||||
#include <map>
|
||||
#include <vector>
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
#define __CONVERT_CONVERT_H_INCLUDED__
|
||||
|
||||
#include <string>
|
||||
#include <assimp/aiScene.h>
|
||||
#include <assimp/scene.h>
|
||||
|
||||
void ConvertStatic(const std::string &outfile, const aiScene *scene);
|
||||
void ConvertSkeletalAnimated(const std::string &outfile, const aiScene *scene);
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
#include <stdio.h>
|
||||
#include <vector>
|
||||
#include <assimp/aiTypes.h>
|
||||
#include <assimp/types.h>
|
||||
#include "../assimputils/types.h"
|
||||
#include "meshmaterial.h"
|
||||
#include "meshtriangle.h"
|
||||
|
|
|
@ -3,8 +3,8 @@
|
|||
|
||||
#include <stdint.h>
|
||||
#include <string>
|
||||
#include <assimp/aiVector3D.h>
|
||||
#include <assimp/aiQuaternion.h>
|
||||
#include <assimp/vector3.h>
|
||||
#include <assimp/quaternion.h>
|
||||
#include <vector>
|
||||
|
||||
struct MeshJoint
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
#define __CONVERT_MESHMATERIAL_H_INCLUDED__
|
||||
|
||||
#include <string>
|
||||
#include <assimp/aiMaterial.h>
|
||||
#include <assimp/material.h>
|
||||
|
||||
struct MeshMaterial
|
||||
{
|
||||
|
|
|
@ -2,9 +2,9 @@
|
|||
#include <string>
|
||||
#include <stdexcept>
|
||||
|
||||
#include <assimp/assimp.hpp>
|
||||
#include <assimp/aiScene.h>
|
||||
#include <assimp/aiPostProcess.h>
|
||||
#include <assimp/Importer.hpp>
|
||||
#include <assimp/scene.h>
|
||||
#include <assimp/postprocess.h>
|
||||
|
||||
#include "utils/utils.h"
|
||||
#include "assimputils/utils.h"
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
#ifndef __NODETREE_NODETREE_H_INCLUDED__
|
||||
#define __NODETREE_NODETREE_H_INCLUDED__
|
||||
|
||||
#include <assimp/aiScene.h>
|
||||
#include <assimp/scene.h>
|
||||
#include <string>
|
||||
|
||||
void Walk(const aiScene *scene, const std::string &filename);
|
||||
|
|
Reference in a new issue