Преглед изворни кода

- removed implementation headers from the public interface
- corrected a few places that did not include those headers by other means
- Bugfix: SkeletonMeshBuilder should now finally work correctly when skipping invalid node connections

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@203 67173fc5-114c-0410-ac8e-9d2fd5bffc1f

ulfjorensen пре 17 година
родитељ
комит
730b77c68e
5 измењених фајлова са 5 додато и 6 уклоњено
  1. 1 0
      code/AssimpPCH.h
  2. 1 0
      code/DXFLoader.h
  3. 1 0
      code/IRRMeshLoader.h
  4. 1 1
      code/SkeletonMeshBuilder.cpp
  5. 1 5
      include/assimp.hpp

+ 1 - 0
code/AssimpPCH.h

@@ -94,6 +94,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 // *******************************************************************
 // internal headers that are nearly always required
 // *******************************************************************
+#include "BaseImporter.h"
 #include "MaterialSystem.h"
 #include "StringComparison.h"
 #include "StreamReader.h"

+ 1 - 0
code/DXFLoader.h

@@ -42,6 +42,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #ifndef AI_DXFLOADER_H_INCLUDED
 #define AI_DXFLOADER_H_INCLUDED
 
+#include "BaseImporter.h"
 
 namespace Assimp	{
 

+ 1 - 0
code/IRRMeshLoader.h

@@ -44,6 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define AI_IRRMESHLOADER_H_INCLUDED
 
 #include "./irrXML/irrXMLWrapper.h"
+#include "BaseImporter.h"
 
 namespace Assimp	{
 

+ 1 - 1
code/SkeletonMeshBuilder.cpp

@@ -101,6 +101,7 @@ void SkeletonMeshBuilder::CreateGeometry( const aiNode* pNode)
 			aiVector3D front = (up ^ orth).Normalize();
 			aiVector3D side = (front ^ up).Normalize();
 
+	  		unsigned int localVertexStart = mVertices.size();
 			mVertices.push_back( -front * distanceToChild * 0.1f);
 			mVertices.push_back( childpos);
 			mVertices.push_back( -side * distanceToChild * 0.1f);
@@ -114,7 +115,6 @@ void SkeletonMeshBuilder::CreateGeometry( const aiNode* pNode)
 			mVertices.push_back( childpos);
 			mVertices.push_back( -front * distanceToChild * 0.1f);
 
-			unsigned localVertexStart = vertexStartIndex + a * 12;
 			mFaces.push_back( Face( localVertexStart + 0, localVertexStart + 1, localVertexStart + 2));
 			mFaces.push_back( Face( localVertexStart + 3, localVertexStart + 4, localVertexStart + 5));
 			mFaces.push_back( Face( localVertexStart + 6, localVertexStart + 7, localVertexStart + 8));

+ 1 - 5
include/assimp.hpp

@@ -65,15 +65,11 @@ namespace Assimp
 	class SharedPostProcessInfo;
 }
 
-// internal ASSIMP headers - for plugin development
-#include "./../code/BaseImporter.h"
-#include "./../code/BaseProcess.h"
-
 #define AI_PROPERTY_WAS_NOT_EXISTING 0xffffffff
 
 struct aiScene;
 struct aiFileIO;
-extern "C" ASSIMP_API const aiScene* aiImportFileEx( const char*, unsigned int, aiFileIO*);
+extern "C" const aiScene* aiImportFileEx( const char*, unsigned int, aiFileIO*);
 
 namespace Assimp
 {