- corrected all local include paths so that there are no "additional include paths" necessary in the build configuration anymore

- wrote some further documentation text
- moved ObjFileParser.h to the code directory

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

code/3DSSpatialSort.cpp

@@ -46,7 +46,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <algorithm>
 #include "3DSSpatialSort.h"
 
-#include "aiAssert.h"
+#include "../include/aiAssert.h"
 
 using namespace Assimp;
 using namespace Assimp::Dot3DS;

code/BaseImporter.cpp

@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include "BaseImporter.h"
 #include "DefaultLogger.h"
 #include "../include/aiScene.h"
-#include "aiAssert.h"
+#include "../include/aiAssert.h"
 using namespace Assimp;
 
 // ------------------------------------------------------------------------------------------------

code/DefaultIOStream.cpp

@@ -41,7 +41,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 /** @file Default File I/O implementation for #Importer */
 
 #include "DefaultIOStream.h"
-#include "aiAssert.h"
+#include "../include/aiAssert.h"
 #include <sys/types.h> 
 #include <sys/stat.h> 
 

code/DefaultIOStream.h

@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <string>
 #include <stdio.h>
-#include "IOStream.h"
+#include "../include/IOStream.h"
 
 namespace Assimp
 {

code/DefaultIOSystem.h

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

code/DefaultLogger.cpp

@@ -40,10 +40,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
 #include "DefaultLogger.h"
-#include "aiAssert.h"
+#include "../include/aiAssert.h"
 #include "DefaultIOSystem.h"
 #include "Win32DebugLogStream.h"
-#include "IOStream.h"
+#include "../include/IOStream.h"
 #include "FileLogStream.h"
 
 #include <iostream>

code/DefaultLogger.h

@@ -38,7 +38,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ----------------------------------------------------------------------
 */
 
-#include "Logger.h"
+#include "../include/Logger.h"
 #include <vector>
 
 namespace Assimp

code/FileLogStream.h

@@ -1,8 +1,8 @@
 #ifndef ASSIMP_FILELOGSTREAM_H_INC
 #define ASSIMP_FILELOGSTREAM_H_INC
 
-#include "LogStream.h"
+#include "../include/LogStream.h"
-#include "IOStream.h"
+#include "../include/IOStream.h"
 
 namespace Assimp
 {

code/MaterialSystem.cpp

@@ -38,9 +38,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 ----------------------------------------------------------------------
 */
 
-#include "assimp.h"
+#include "../include/aiMaterial.h"
-#include "aiMaterial.h"
-#include "assimp.hpp"
 #include "MaterialSystem.h"
 
 

code/ObjFileData.h

@@ -43,7 +43,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <vector>
 #include <map>
-#include "aiTypes.h"
+#include "../include/aiTypes.h"
 
 namespace Assimp
 {

code/ObjFileImporter.cpp

@@ -1,11 +1,11 @@
 #include "ObjFileImporter.h"
 #include "ObjFileParser.h"
 #include "ObjFileData.h"
-#include "IOStream.h"
+#include "../include/IOStream.h"
-#include "IOSystem.h"
+#include "../include/IOSystem.h"
-#include "aiMesh.h"
+#include "../include/aiMesh.h"
-#include "aiScene.h"
+#include "../include/aiScene.h"
-#include "aiAssert.h"
+#include "../include/aiAssert.h"
 #include "MaterialSystem.h"
 #include "DefaultLogger.h"
 

code/ObjFileMtlImporter.cpp

@@ -1,8 +1,8 @@
 #include "ObjFileMtlImporter.h"
-#include "aiTypes.h"
+#include "../include/aiTypes.h"
+#include "../include/aiAssert.h"
 #include "ObjTools.h"
 #include "ObjFileData.h"
-#include "aiAssert.h"
 #include "fast_atof.h"
 
 

code/ObjFileParser.cpp

@@ -2,10 +2,9 @@
 #include "ObjTools.h"
 #include "ObjFileData.h"
 #include "DefaultIOSystem.h"
-#include "IOStream.h"
+#include "../include/IOStream.h"
-#include "aiTypes.h"
+#include "../include/aiTypes.h"
-#include "aiVector3D.h"
+#include "../include/aiAssert.h"
-#include "aiAssert.h"
 #include "fast_atof.h"
 
 #include <iostream>

code/ObjFileParser.h

@@ -44,7 +44,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 #include <vector>
 #include <string>
-#include "aiTypes.h"
+#include "../include/aiTypes.h"
 
 /*struct aiVector2D_t;
 struct aiVector3D_t;*/

code/Win32DebugLogStream.h

@@ -1,7 +1,7 @@
 #ifndef AI_WIN32DEBUGLOGSTREAM_H_INC
 #define AI_WIN32DEBUGLOGSTREAM_H_INC
 
-#include "LogStream.h"
+#include "../include/LogStream.h"
 
 //#ifdef _MSC_VER
 #ifdef WIN32

code/aiAssert.cpp

@@ -1,5 +1,5 @@
 #include <iostream>
-#include "aiAssert.h"
+#include "../include/aiAssert.h"
 #ifdef _WIN32
 #ifndef __GNUC__
 #  include "crtdbg.h"

doc/dox.h

@@ -73,6 +73,24 @@ the ASSIMP linker lib accordingly.
 
 @section install_own Building the library from scratch
 
+To build the library on your own you first have to get hold of the dependencies. Fortunately, special attention was paid to 
+keep the list of dependencies short. Unfortunately, the only dependency is <a href="http://www.boost.org">boost</a> which 
+can be a bit painful to set up for certain development environments. Boost is a widely used collection of classes and 
+functions for various purposes. Chances are that it was already installed along with your compiler. If not, you have to install 
+it for yourself. Read the "Getting Started" section of the Boost documentation for how to setup boost. VisualStudio users 
+can use a comfortable installer from <a href="http://www.boost-consulting.com/products/free">
+http://www.boost-consulting.com/products/free</a>. Choose the appropriate version of boost for your runtime of choice.
+
+Once boost is working, you have to set up a project for the ASSIMP library in your favourite IDE. If you use VC2005 or
+VC2008, you can simply load the solution or project files in the workspaces/ folder, otherwise you have to create a new 
+package and add all the headers and source files from the include/ and code/ directories. Set the temporary output folder
+to obj/, for example, and redirect the output folder to bin/. The build the library - it should compile and link fine.
+
+The last step is to integrate the library into your project. This is basically the same task as described in the 
+"Using prebuild libs" section above: add the include/ and bin/ directories to your IDE's paths so that the compiler can find
+the library files. Alternatively you can simply add the ASSIMP project to your project's overall solution and build it inside
+your solution.
+
 */
 
 /** 

workspaces/vc8/assimp.vcproj

@@ -38,7 +38,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../code"
+				AdditionalIncludeDirectories=""
 				PreprocessorDefinitions="DEBUG, _SCL_SECURE_NO_WARNINGS, _CRT_SECURE_NO_WARNINGS,WIN32"
 				BasicRuntimeChecks="3"
 				SmallerTypeCheck="true"
@@ -102,7 +102,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="../../include;../../code"
+				AdditionalIncludeDirectories=""
 				PreprocessorDefinitions="NDEBUG, _SCL_SECURE_NO_WARNINGS, _CRT_SECURE_NO_WARNINGS,WIN32"
 				StringPooling="true"
 				BufferSecurityCheck="false"
@@ -164,7 +164,7 @@
 				InlineFunctionExpansion="2"
 				EnableIntrinsicFunctions="true"
 				FavorSizeOrSpeed="1"
-				AdditionalIncludeDirectories="../../include;../../code"
+				AdditionalIncludeDirectories=""
 				PreprocessorDefinitions="NDEBUG, _SCL_SECURE_NO_WARNINGS, _CRT_SECURE_NO_WARNINGS,WIN32"
 				StringPooling="true"
 				BufferSecurityCheck="false"
@@ -233,7 +233,7 @@
 			<Tool
 				Name="VCCLCompilerTool"
 				Optimization="0"
-				AdditionalIncludeDirectories="../../include;../../code"
+				AdditionalIncludeDirectories=""
 				PreprocessorDefinitions="DEBUG, _SCL_SECURE_NO_WARNINGS, _CRT_SECURE_NO_WARNINGS,WIN32"
 				BasicRuntimeChecks="3"
 				SmallerTypeCheck="true"
@@ -471,7 +471,7 @@
 					>
 				</File>
 				<File
-					RelativePath="..\..\include\ObjFileParser.h"
+					RelativePath="..\..\code\ObjFileParser.h"
 					>
 				</File>
 				<File