Android examples

.gitignore

@@ -140,6 +140,28 @@ Desktop.ini
 .csettings
 /libs/openFrameworksCompiled/project/android/paths.make
 
+/libs/openFrameworksCompiled/project/android/**/build/
+/libs/openFrameworksCompiled/project/android/**/.cxx/
+/libs/openFrameworksCompiled/project/android/build*
+
+examples/android/**/build.gradle
+examples/android/**/gradle.properties
+examples/android/**/proguard.cfg
+examples/android/**/proguard-rules.pro
+examples/android/**/template.config
+examples/android/**/AndroidManifest.xml
+examples/android/**/OFActivity.java
+
+# Ignore compiled output or build dirs
+examples/android/**/build/
+examples/android/**/.cxx/
+
+# Ignore launcher icons or PNGs
+examples/android/**/*.png
+
+# Ignore CMake files if autogenerated
+examples/android/**/CMakeLists.txt
+
 # Android Studio
 *.iml
 
@@ -170,3 +192,5 @@ libs/openFrameworksCompiled/project/vs2019/openframeworksLib.vcxproj.user
 scripts/templates/vs/bin/emptyExample_debug.exe
 scripts/templates/vs2019/emptyExample.vcxproj.user
 libs/openFrameworksCompiled/project/android/build-*/
+
+

examples/android/androidAccelerometerExample/src/main.cpp

@@ -1,26 +1,49 @@
 #include "ofMain.h"
 #include "ofApp.h"
 
-int main(){
-	ofSetupOpenGL(1024,768, OF_WINDOW);			// <-------- setup the GL context
-
-	// this kicks off the running of my app
-	// can be OF_WINDOW or OF_FULLSCREEN
-	// pass in width and height too:
-	ofRunApp( new ofApp() );
-	return 0;
-}
+#ifdef TARGET_ANDROID
 
+#include "ofWindowSettings.h"
+#include "ofGLProgrammableRenderer.h"
+
+shared_ptr<ofApp> *ofapp;
+std::shared_ptr<ofAppBaseWindow> baseWindow;
+
+//--------------------------------------------------------------
+int main(int argc, char **argv) {
+    baseWindow = std::make_shared<ofAppAndroidWindow>();
+    ofxAndroidWindowSettings settings;
+    settings.glesVersion = 2;
+    settings.setSize(1920, 1080);
+    settings.windowMode = OF_WINDOW;
+    settings.preserveContextOnPause = true;
+    baseWindow = ofCreateWindow(settings);
+    ofapp = new shared_ptr<ofApp>(new ofApp());
+    ofRunApp(baseWindow, *ofapp);
+    return 0;
+}
 
-#ifdef TARGET_ANDROID
 void ofAndroidApplicationInit()
 {
-	//application scope init
+    //application scope init
 }
-
 void ofAndroidActivityInit()
 {
-	//activity scope init
-	main();
+    //activity scope init - call main
+    main(0, nullptr);
 }
+
+// Callbacks from Android Layer
+extern "C" JNIEXPORT void JNICALL
+Java_cc_openframeworks_OFAndroid_init( JNIEnv*  env, jclass  clazz)
+{
+    ofAndroidApplicationInit();
+}
+
+extern "C" JNIEXPORT void JNICALL
+Java_cc_openframeworks_OFAndroid_onCreate( JNIEnv*  env, jclass  clazz)
+{
+    ofAndroidActivityInit();
+}
+
 #endif

examples/android/androidAdvanced3DExample/src/main.cpp

@@ -1,28 +1,49 @@
 #include "ofMain.h"
 #include "ofApp.h"
 
+#ifdef TARGET_ANDROID
 
+#include "ofWindowSettings.h"
+#include "ofGLProgrammableRenderer.h"
 
-int main(){
-	ofSetupOpenGL(1024,768, OF_WINDOW);			// <-------- setup the GL context
+shared_ptr<ofApp> *ofapp;
+std::shared_ptr<ofAppBaseWindow> baseWindow;
 
-	// this kicks off the running of my app
-	// can be OF_WINDOW or OF_FULLSCREEN
-	// pass in width and height too:
-	ofRunApp( new ofApp() );
-	return 0;
+//--------------------------------------------------------------
+int main(int argc, char **argv) {
+    baseWindow = std::make_shared<ofAppAndroidWindow>();
+    ofxAndroidWindowSettings settings;
+    settings.glesVersion = 2;
+    settings.setSize(1920, 1080);
+    settings.windowMode = OF_WINDOW;
+    settings.preserveContextOnPause = true;
+    baseWindow = ofCreateWindow(settings);
+    ofapp = new shared_ptr<ofApp>(new ofApp());
+    ofRunApp(baseWindow, *ofapp);
+    return 0;
 }
 
-
-#ifdef TARGET_ANDROID
 void ofAndroidApplicationInit()
 {
-	//application scope init
+    //application scope init
 }
-
 void ofAndroidActivityInit()
 {
-	//activity scope init
-	main();
+    //activity scope init - call main
+    main(0, nullptr);
 }
+
+// Callbacks from Android Layer
+extern "C" JNIEXPORT void JNICALL
+Java_cc_openframeworks_OFAndroid_init( JNIEnv*  env, jclass  clazz)
+{
+    ofAndroidApplicationInit();
+}
+
+extern "C" JNIEXPORT void JNICALL
+Java_cc_openframeworks_OFAndroid_onCreate( JNIEnv*  env, jclass  clazz)
+{
+    ofAndroidActivityInit();
+}
+
 #endif

examples/android/androidAssimpExample/src/main.cpp

@@ -1,26 +1,49 @@
 #include "ofMain.h"
 #include "ofApp.h"
 
-int main(){
-	ofSetupOpenGL(1024,768, OF_WINDOW);			// <-------- setup the GL context
-
-	// this kicks off the running of my app
-	// can be OF_WINDOW or OF_FULLSCREEN
-	// pass in width and height too:
-	ofRunApp( new ofApp() );
-	return 0;
-}
+#ifdef TARGET_ANDROID
 
+#include "ofWindowSettings.h"
+#include "ofGLProgrammableRenderer.h"
+
+shared_ptr<ofApp> *ofapp;
+std::shared_ptr<ofAppBaseWindow> baseWindow;
+
+//--------------------------------------------------------------
+int main(int argc, char **argv) {
+    baseWindow = std::make_shared<ofAppAndroidWindow>();
+    ofxAndroidWindowSettings settings;
+    settings.glesVersion = 2;
+    settings.setSize(1920, 1080);
+    settings.windowMode = OF_WINDOW;
+    settings.preserveContextOnPause = true;
+    baseWindow = ofCreateWindow(settings);
+    ofapp = new shared_ptr<ofApp>(new ofApp());
+    ofRunApp(baseWindow, *ofapp);
+    return 0;
+}
 
-#ifdef TARGET_ANDROID
 void ofAndroidApplicationInit()
 {
-	//application scope init
+    //application scope init
 }
-
 void ofAndroidActivityInit()
 {
-	//activity scope init
-	main();
+    //activity scope init - call main
+    main(0, nullptr);
 }
+
+// Callbacks from Android Layer
+extern "C" JNIEXPORT void JNICALL
+Java_cc_openframeworks_OFAndroid_init( JNIEnv*  env, jclass  clazz)
+{
+    ofAndroidApplicationInit();
+}
+
+extern "C" JNIEXPORT void JNICALL
+Java_cc_openframeworks_OFAndroid_onCreate( JNIEnv*  env, jclass  clazz)
+{
+    ofAndroidActivityInit();
+}
+
 #endif

examples/android/androidAudioExample/src/main.cpp

@@ -1,26 +1,49 @@
 #include "ofMain.h"
 #include "ofApp.h"
 
-int main(){
-	ofSetupOpenGL(1024,768, OF_WINDOW);			// <-------- setup the GL context
-
-	// this kicks off the running of my app
-	// can be OF_WINDOW or OF_FULLSCREEN
-	// pass in width and height too:
-	ofRunApp( new ofApp() );
-	return 0;
-}
+#ifdef TARGET_ANDROID
 
+#include "ofWindowSettings.h"
+#include "ofGLProgrammableRenderer.h"
+
+shared_ptr<ofApp> *ofapp;
+std::shared_ptr<ofAppBaseWindow> baseWindow;
+
+//--------------------------------------------------------------
+int main(int argc, char **argv) {
+    baseWindow = std::make_shared<ofAppAndroidWindow>();
+    ofxAndroidWindowSettings settings;
+    settings.glesVersion = 2;
+    settings.setSize(1920, 1080);
+    settings.windowMode = OF_WINDOW;
+    settings.preserveContextOnPause = true;
+    baseWindow = ofCreateWindow(settings);
+    ofapp = new shared_ptr<ofApp>(new ofApp());
+    ofRunApp(baseWindow, *ofapp);
+    return 0;
+}
 
-#ifdef TARGET_ANDROID
 void ofAndroidApplicationInit()
 {
-	//application scope init
+    //application scope init
 }
-
 void ofAndroidActivityInit()
 {
-	//activity scope init
-	main();
+    //activity scope init - call main
+    main(0, nullptr);
 }
+
+// Callbacks from Android Layer
+extern "C" JNIEXPORT void JNICALL
+Java_cc_openframeworks_OFAndroid_init( JNIEnv*  env, jclass  clazz)
+{
+    ofAndroidApplicationInit();
+}
+
+extern "C" JNIEXPORT void JNICALL
+Java_cc_openframeworks_OFAndroid_onCreate( JNIEnv*  env, jclass  clazz)
+{
+    ofAndroidActivityInit();
+}
+
 #endif