v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #423 from enkore/master 

Fix some issues in jassimp
pull/427/head
Alexander Gessler 2014-12-06 23:56:45 +01:00
parent 06f80024cb fdf78fc13b
commit 585e7c69fb
4 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
port/jassimp/README
View File

@ -15,7 +15,12 @@ application examples using this wrapper
How To Build How To Build
------------ ------------
I) native library I) native library, for example by issuing this command in jassimp-native/src:
$ gcc jassimp.cpp -I/usr/lib/jvm/default/include/ \
-I/usr/lib/jvm/default/include/linux -lassimp -shared -fPIC -o libjassimp.so
libjassimp.so is required at runtime and must be located in java.library.path.
II) Java binding II) Java binding
The java library is built using ant. Executing "ant" in the port/jassimp The java library is built using ant. Executing "ant" in the port/jassimp

2
port/jassimp/jassimp-native/src/jassimp.cpp
View File

@ -1379,6 +1379,7 @@ JNIEXPORT jobject JNICALL Java_jassimp_Jassimp_aiImportFile
goto end; goto end;
error: error:
{
jclass exception = env->FindClass("java/io/IOException"); jclass exception = env->FindClass("java/io/IOException");
if (NULL == exception) if (NULL == exception)
@ -1390,6 +1391,7 @@ error:
env->ThrowNew(exception, aiGetErrorString()); env->ThrowNew(exception, aiGetErrorString());
lprintf("problem detected\n"); lprintf("problem detected\n");
}
end: end:
/* /*

2
port/jassimp/jassimp-native/src/jassimp.h
View File

@ -7,8 +7,6 @@
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
/* Inaccessible static: BUILTIN */
/* Inaccessible static: s_wrapperProvider */
/* /*
* Class: jassimp_Jassimp * Class: jassimp_Jassimp
* Method: getErrorString * Method: getErrorString

6
port/jassimp/jassimp/src/jassimp/JaiDebug.java
View File

@ -67,7 +67,7 @@ public final class JaiDebug {
return; return;
} }
for (int i = 0; i < mesh.getNumVertives(); i++) { for (int i = 0; i < mesh.getNumVertices(); i++) {
System.out.println("[" + System.out.println("[" +
mesh.getPositionX(i) + ", " + mesh.getPositionX(i) + ", " +
mesh.getPositionY(i) + ", " + mesh.getPositionY(i) + ", " +
@ -119,7 +119,7 @@ public final class JaiDebug {
return; return;
} }
for (int i = 0; i < mesh.getNumVertives(); i++) { for (int i = 0; i < mesh.getNumVertices(); i++) {
System.out.println("[" + System.out.println("[" +
mesh.getColorR(i, colorset) + ", " + mesh.getColorR(i, colorset) + ", " +
mesh.getColorG(i, colorset) + ", " + mesh.getColorG(i, colorset) + ", " +
@ -142,7 +142,7 @@ public final class JaiDebug {
return; return;
} }
for (int i = 0; i < mesh.getNumVertives(); i++) { for (int i = 0; i < mesh.getNumVertices(); i++) {
int numComponents = mesh.getNumUVComponents(coords); int numComponents = mesh.getNumUVComponents(coords);
System.out.print("[" + mesh.getTexCoordU(i, coords)); System.out.print("[" + mesh.getTexCoordU(i, coords));