rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-18 03:52:11 +01:00
Code Issues Releases Activity

AndroidGCS OSG: Force inclusion of the 3DS plugin and use a 3DS model. Also include the jpeg and png libraries and plugins to load the textures. However they currently aren't visible.

Browse Source
This commit is contained in:
James Cotton 2012-08-23 09:26:07 -05:00
parent 08bb355749
commit f37433e280
3 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
androidgcs/jni/Android.mk
View File

@ -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 \

4
androidgcs/jni/OsgMainApp.hpp
View File

@ -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)

2
androidgcs/src/org/openpilot/androidgcs/OsgViewer.java
View File

@ -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);
}