diff --git a/androidgcs/jni/Android.mk b/androidgcs/jni/Android.mk index 1379684c9..6d45d27b1 100644 --- a/androidgcs/jni/Android.mk +++ b/androidgcs/jni/Android.mk @@ -18,7 +18,7 @@ LOCAL_C_INCLUDES:= $(OSG_ANDROID_DIR)/include LOCAL_CFLAGS := -Werror -fno-short-enums LOCAL_CPPFLAGS := -DOSG_LIBRARY_STATIC -LOCAL_LDLIBS := -llog -lGLESv2 -ldl -lz -lgnustl_static +LOCAL_LDLIBS := -llog -lGLESv2 -ldl -lz -lgnustl_static -ljpeg -lpng LOCAL_SRC_FILES := osgNativeLib.cpp OsgMainApp.cpp OsgAndroidNotifyHandler.cpp LOCAL_LDFLAGS := -L $(LIBDIR) \ -losgdb_dds \ @@ -29,6 +29,8 @@ LOCAL_LDFLAGS := -L $(LIBDIR) \ -losgdb_osg \ -losgdb_ive \ -losgdb_3ds \ +-losgdb_jpeg \ +-losgdb_png \ -losgdb_deprecated_osgviewer \ -losgdb_deprecated_osgvolume \ -losgdb_deprecated_osgtext \ diff --git a/androidgcs/jni/OsgMainApp.hpp b/androidgcs/jni/OsgMainApp.hpp index a1a974659..5f9ef0ab1 100644 --- a/androidgcs/jni/OsgMainApp.hpp +++ b/androidgcs/jni/OsgMainApp.hpp @@ -59,6 +59,10 @@ USE_OSGPLUGIN(terrain) USE_OSGPLUGIN(rgb) USE_OSGPLUGIN(OpenFlight) USE_OSGPLUGIN(dds) +USE_OSGPLUGIN(3ds) +USE_OSGPLUGIN(jpeg) +USE_OSGPLUGIN(png) + //Static DOTOSG USE_DOTOSGWRAPPER_LIBRARY(osg) USE_DOTOSGWRAPPER_LIBRARY(osgFX) diff --git a/androidgcs/src/org/openpilot/androidgcs/OsgViewer.java b/androidgcs/src/org/openpilot/androidgcs/OsgViewer.java index 95db9619f..9928b19cf 100644 --- a/androidgcs/src/org/openpilot/androidgcs/OsgViewer.java +++ b/androidgcs/src/org/openpilot/androidgcs/OsgViewer.java @@ -85,7 +85,7 @@ public class OsgViewer extends ObjectManagerActivity implements View.OnTouchList msgUiLightOn = Toast.makeText(getApplicationContext(), "toast3", Toast.LENGTH_SHORT); msgUiLightOff = Toast.makeText(getApplicationContext(), "toast4", Toast.LENGTH_SHORT); - String address = Environment.getExternalStorageDirectory().getPath() + "/Models/quad.osg"; + String address = Environment.getExternalStorageDirectory().getPath() + "/Models/J14-QT_X.3DS"; //quad.osg"; Log.d(TAG, "Address: " + address); osgNativeLib.loadObject(address); }