CMake Fix adding src cpp and Android Swarm

Author: danoli3

examples/android/androidAdvanced3DExample/src/Swarm.cpp

@@ -12,7 +12,7 @@
 Swarm::Swarm()
 {
 	//constructor, let's set some defaults
-	nParticles = 0;	
+	nParticles = 0;
 	light.setAmbientColor(ofColor(0,0,0));
 }
 
@@ -24,23 +24,23 @@ void Swarm::init(int _nParticles, float positionDispersion, float velocityDisper
 	//
 	if (nParticles > 0)
 	{
-		ofLog(OF_LOG_WARNING, "Swarm: Already initialised");
-		
+		ofLog(OF_LOG_WARNING) << "Swarm: Already initialised";
+
 		//delete[] = delete array from memory
 		delete[] positions;
 		delete[] velocities;
 		delete[] colors;
-		
+
 		//superfluous line of code..
 		nParticles = 0;
 	}
 	///////////////////////////////////////////
-	
-	
+
+
 	//Swarm's internal variable set from argument
-	nParticles = _nParticles;	
-	
-	
+	nParticles = _nParticles;
+
+
 	///////////////////////////////////////////
 	// SETUP ARRAYS
 	///////////////////////////////////////////
@@ -50,8 +50,8 @@ void Swarm::init(int _nParticles, float positionDispersion, float velocityDisper
 	colors = new ofColor[nParticles];
 	//
 	///////////////////////////////////////////
-	
-	
+
+
 	///////////////////////////////////////////
 	// INITIALISE VALUES
 	///////////////////////////////////////////
@@ -61,26 +61,26 @@ void Swarm::init(int _nParticles, float positionDispersion, float velocityDisper
 		positions[i].x = (ofRandom(1.0f)-0.5f)  * positionDispersion;
 		positions[i].y = (ofRandom(1.0f)-0.5f)  * positionDispersion;
 		positions[i].z = (ofRandom(1.0f)-0.5f)  * positionDispersion;
-		
+
 		velocities[i].x = (ofRandom(1.0f)-0.5f)  * velocityDispersion;
 		velocities[i].y = (ofRandom(1.0f)-0.5f)  * velocityDispersion;
 		velocities[i].z = (ofRandom(1.0f)-0.5f)  * velocityDispersion;
-		
+
 		colors[i].r = ofRandom(255.0f);
 		colors[i].g = ofRandom(255.0f);
 		colors[i].b = 150.0f;
 		colors[i].a = 255.0f;
 	}
 	//
 	///////////////////////////////////////////
-	
+
 }
 
 void Swarm::customDraw()
 {
 	///we run the update ourselves manually
 	update();
-	
+
 	//we use the position of the first
 	//particle as the position of the
 	//light
@@ -97,17 +97,17 @@ void Swarm::customDraw()
 	{
 		ofPushStyle();
 		ofSetColor(colors[i]);
-		
+
 		ofDrawSphere(positions[i], 1.0);
-		
+
 		ofPopStyle();
 	}
 	//
 	///////////////////////////////////////////
-	
+
 	light.disable();
 	ofDisableLighting();
-	
+
 	//render light as white sphere
 	ofSetColor(255, 255, 255);
 	ofDrawSphere(positions[0], 2.0);
@@ -118,16 +118,16 @@ void Swarm::customDraw()
 
 void Swarm::update()
 {
-	
+
 	//calculate time past per frame
 	float dt = ofGetElapsedTimef() - timeLastUpdate;
 	timeLastUpdate = ofGetElapsedTimef();
-	
+
 	//update positions, velocities
 	for (int i=0; i< nParticles; i++)
 	{
 		////////////////////////////////
-		// 
+		//
 		//	MOTION MATHS
 		//
 		//		'Simple Harmonic Motion'
@@ -159,7 +159,7 @@ void Swarm::update()
 		//v = v + (dt * a)
 		//v = v + (dt * -k * x)
 		//
-		velocities[i] += - SPRING_CONSTANT * positions[i] * dt;		
+		velocities[i] += - SPRING_CONSTANT * positions[i] * dt;
 		//
 		/////////////////////////////////
 

examples/android/androidAdvanced3DExample/src/main.cpp

@@ -13,7 +13,7 @@ std::shared_ptr<ofAppBaseWindow> baseWindow;
 int main(int argc, char **argv) {
     baseWindow = std::make_shared<ofAppAndroidWindow>();
     ofxAndroidWindowSettings settings;
-    settings.glesVersion = 2;
+    settings.glesVersion = 1;
     settings.setSize(1920, 1080);
     settings.windowMode = OF_WINDOW;
     settings.preserveContextOnPause = true;

scripts/templates/android/ofApp/src/CMakeLists.txt

@@ -69,6 +69,9 @@ add_library( ${PROJECT_NAME}
         ${OF_APP_SRC_PATH}/ofApp.cpp
 )
 
+file(GLOB_RECURSE APP_SRC CONFIGURE_DEPENDS "${OF_APP_SRC_PATH}/*.cpp")
+target_sources(${PROJECT_NAME} PRIVATE ${APP_SRC})
+
 include_directories(
         ${PRJ_SOURCE_PATH}/3d
         ${PRJ_SOURCE_PATH}/app