Browse Source

Don't use assimp/ prefix when including assimp files

rdb 9 years ago
parent
commit
758cd523e2

+ 1 - 1
pandatool/src/assimp/assimpLoader.cxx

@@ -39,7 +39,7 @@
 #include "pandaIOSystem.h"
 #include "pandaIOSystem.h"
 #include "pandaLogger.h"
 #include "pandaLogger.h"
 
 
-#include "assimp/postprocess.h"
+#include "postprocess.h"
 
 
 struct BoneWeight {
 struct BoneWeight {
   CPT(JointVertexTransform) joint_vertex_xform;
   CPT(JointVertexTransform) joint_vertex_xform;

+ 2 - 2
pandatool/src/assimp/assimpLoader.h

@@ -20,8 +20,8 @@
 #include "texture.h"
 #include "texture.h"
 #include "pmap.h"
 #include "pmap.h"
 
 
-#include "assimp/scene.h"
-#include "assimp/Importer.hpp"
+#include "scene.h"
+#include "Importer.hpp"
 
 
 class Character;
 class Character;
 class CharacterJointBundle;
 class CharacterJointBundle;

+ 1 - 1
pandatool/src/assimp/pandaIOStream.h

@@ -16,7 +16,7 @@
 
 
 #include "config_assimp.h"
 #include "config_assimp.h"
 
 
-#include "assimp/IOStream.hpp"
+#include "IOStream.hpp"
 
 
 class PandaIOSystem;
 class PandaIOSystem;
 
 

+ 1 - 1
pandatool/src/assimp/pandaIOSystem.h

@@ -17,7 +17,7 @@
 #include "config_assimp.h"
 #include "config_assimp.h"
 #include "virtualFileSystem.h"
 #include "virtualFileSystem.h"
 
 
-#include "assimp/IOSystem.hpp"
+#include "IOSystem.hpp"
 
 
 /**
 /**
  * Custom implementation of Assimp::IOSystem.
  * Custom implementation of Assimp::IOSystem.

+ 1 - 1
pandatool/src/assimp/pandaLogger.cxx

@@ -13,7 +13,7 @@
 
 
 #include "pandaLogger.h"
 #include "pandaLogger.h"
 
 
-#include "assimp/DefaultLogger.hpp"
+#include "DefaultLogger.hpp"
 
 
 PandaLogger *PandaLogger::_ptr = NULL;
 PandaLogger *PandaLogger::_ptr = NULL;
 
 

+ 1 - 1
pandatool/src/assimp/pandaLogger.h

@@ -16,7 +16,7 @@
 
 
 #include "config_assimp.h"
 #include "config_assimp.h"
 
 
-#include "assimp/Logger.hpp"
+#include "Logger.hpp"
 
 
 /**
 /**
  * Custom implementation of Assimp::Logger.  It simply wraps around the
  * Custom implementation of Assimp::Logger.  It simply wraps around the