Added interface headers generated by javah

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

code/Importer.cpp

@@ -44,7 +44,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #include <string>
 
 #include "../include/assimp.hpp"
+#include "../include/aiAssert.h"
 #include "../include/aiScene.h"
+#include "../include/aiPostProcess.h"
 #include "BaseImporter.h"
 #include "BaseProcess.h"
 #include "DefaultIOStream.h"
@@ -177,11 +179,27 @@ void Importer::SetIOHandler( IOSystem* pIOHandler)
 	}
 	return;
 }
+// ------------------------------------------------------------------------------------------------
+// Validate post process step flags 
+bool ValidateFlags(unsigned int pFlags)
+{
+	if (pFlags & aiProcess_GenSmoothNormals &&
+		pFlags & aiProcess_GenNormals)
+	{
+		DefaultLogger::get()->error("aiProcess_GenSmoothNormals and aiProcess_GenNormals "
+			"may not be specified together");
+		return false;
+	}
 
+	return true;
+}
 // ------------------------------------------------------------------------------------------------
 // Reads the given file and returns its contents if successful. 
 const aiScene* Importer::ReadFile( const std::string& pFile, unsigned int pFlags)
 {
+	// validate the flags
+	ai_assert(ValidateFlags(pFlags));
+
 	// first check if the file is accessable at all
 	if( !mIOHandler->Exists( pFile))
 	{

code/SplitLargeMeshes.h

@@ -54,6 +54,15 @@ namespace Assimp
 class SplitLargeMeshesProcess_Triangle; 
 class SplitLargeMeshesProcess_Vertex; 
 
+// NOTE: If you change these limits, don't forget to also change the
+// corresponding values in the Assimp ports
+
+// **********************************************************
+// Java: PostProcessStep.java, 
+//  PostProcessStep.DEFAULT_VERTEX_SPLIT_LIMIT
+//  PostProcessStep.DEFAULT_TRIANGLE_SPLIT_LIMIT
+// **********************************************************
+
 // default limit for vertices
 #define AI_SLM_DEFAULT_MAX_VERTICES		1000000
 

code/jAssimp/BuildHeader.bat

@@ -0,0 +1,6 @@
+javah -classpath ".\..\..\port\jAssimp\classes" -d "." "assimp.Importer"
+javah -classpath ".\..\..\port\jAssimp\classes" -d "." "assimp.Material"
+javah -classpath ".\..\..\port\jAssimp\classes" -d "." "assimp.Node"
+javah -classpath ".\..\..\port\jAssimp\classes" -d "." "assimp.Scene"
+javah -classpath ".\..\..\port\jAssimp\classes" -d "." "assimp.Mesh"
+javah -classpath ".\..\..\port\jAssimp\classes" -d "." "assimp.Texture"

code/jAssimp/assimp_Importer.h

@@ -0,0 +1,37 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class assimp_Importer */
+
+#ifndef _Included_assimp_Importer
+#define _Included_assimp_Importer
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     assimp_Importer
+ * Method:    _NativeInitContext
+ * Signature: ()I
+ */
+JNIEXPORT jint JNICALL Java_assimp_Importer__1NativeInitContext
+  (JNIEnv *, jobject);
+
+/*
+ * Class:     assimp_Importer
+ * Method:    _NativeFreeContext
+ * Signature: (I)I
+ */
+JNIEXPORT jint JNICALL Java_assimp_Importer__1NativeFreeContext
+  (JNIEnv *, jobject, jint);
+
+/*
+ * Class:     assimp_Importer
+ * Method:    _NativeLoad
+ * Signature: (Ljava/lang/String;II)I
+ */
+JNIEXPORT jint JNICALL Java_assimp_Importer__1NativeLoad
+  (JNIEnv *, jobject, jstring, jint, jint);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

code/jAssimp/assimp_Material.h

@@ -0,0 +1,13 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class assimp_Material */
+
+#ifndef _Included_assimp_Material
+#define _Included_assimp_Material
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif

code/jAssimp/assimp_Mesh.h

@@ -0,0 +1,17 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class assimp_Mesh */
+
+#ifndef _Included_assimp_Mesh
+#define _Included_assimp_Mesh
+#ifdef __cplusplus
+extern "C" {
+#endif
+#undef assimp_Mesh_MAX_NUMBER_OF_TEXTURECOORDS
+#define assimp_Mesh_MAX_NUMBER_OF_TEXTURECOORDS 4L
+#undef assimp_Mesh_MAX_NUMBER_OF_COLOR_SETS
+#define assimp_Mesh_MAX_NUMBER_OF_COLOR_SETS 4L
+#ifdef __cplusplus
+}
+#endif
+#endif

code/jAssimp/assimp_Node.h

@@ -0,0 +1,13 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class assimp_Node */
+
+#ifndef _Included_assimp_Node
+#define _Included_assimp_Node
+#ifdef __cplusplus
+extern "C" {
+#endif
+#ifdef __cplusplus
+}
+#endif
+#endif

code/jAssimp/assimp_Scene.h

@@ -0,0 +1,45 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class assimp_Scene */
+
+#ifndef _Included_assimp_Scene
+#define _Included_assimp_Scene
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     assimp_Scene
+ * Method:    _NativeGetNumMeshes
+ * Signature: (I)I
+ */
+JNIEXPORT jint JNICALL Java_assimp_Scene__1NativeGetNumMeshes
+  (JNIEnv *, jobject, jint);
+
+/*
+ * Class:     assimp_Scene
+ * Method:    _NativeGetNumAnimations
+ * Signature: (I)I
+ */
+JNIEXPORT jint JNICALL Java_assimp_Scene__1NativeGetNumAnimations
+  (JNIEnv *, jobject, jint);
+
+/*
+ * Class:     assimp_Scene
+ * Method:    _NativeGetNumTextures
+ * Signature: (I)I
+ */
+JNIEXPORT jint JNICALL Java_assimp_Scene__1NativeGetNumTextures
+  (JNIEnv *, jobject, jint);
+
+/*
+ * Class:     assimp_Scene
+ * Method:    _NativeGetNumMaterials
+ * Signature: (I)I
+ */
+JNIEXPORT jint JNICALL Java_assimp_Scene__1NativeGetNumMaterials
+  (JNIEnv *, jobject, jint);
+
+#ifdef __cplusplus
+}
+#endif
+#endif

code/jAssimp/assimp_Texture.h

@@ -0,0 +1,21 @@
+/* DO NOT EDIT THIS FILE - it is machine generated */
+#include <jni.h>
+/* Header for class assimp_Texture */
+
+#ifndef _Included_assimp_Texture
+#define _Included_assimp_Texture
+#ifdef __cplusplus
+extern "C" {
+#endif
+/*
+ * Class:     assimp_Texture
+ * Method:    _NativeMapColorData
+ * Signature: ([B)I
+ */
+JNIEXPORT jint JNICALL Java_assimp_Texture__1NativeMapColorData
+  (JNIEnv *, jobject, jbyteArray);
+
+#ifdef __cplusplus
+}
+#endif
+#endif