Android Log fixed

android/jni/Android.mk

@@ -78,6 +78,8 @@ LOCAL_SRC_FILES :=\
 	Skybox.cpp\
 	FPSSystem.cpp\
 \
+	samples/android/triangle.cpp\
+\
 
 LOCAL_C_INCLUDES	:=\
 	$(LOCAL_PATH)/core\
@@ -97,37 +99,10 @@ LOCAL_C_INCLUDES	:=\
 	$(LOCAL_PATH)/renderers/gles\
 	$(LOCAL_PATH)/renderers/gles/egl\
 	$(LOCAL_PATH)/input\
-
-LOCAL_CPPFLAGS	:= -g -fexceptions
-LOCAL_LDLIBS	:= -llog -landroid -lGLESv1_CM
-include $(BUILD_SHARED_LIBRARY)
-
-include $(CLEAR_VARS)
-
-LOCAL_MODULE    := triangle
-LOCAL_SRC_FILES := samples/android/triangle.cpp
-
-LOCAL_C_INCLUDES	:=\
-	$(LOCAL_PATH)/core\
-	$(LOCAL_PATH)/core/math\
-	$(LOCAL_PATH)/core/containers\
-	$(LOCAL_PATH)/core/bv\
-	$(LOCAL_PATH)/core/mem\
-	$(LOCAL_PATH)/core/streams\
-	$(LOCAL_PATH)/loaders\
-	$(LOCAL_PATH)/os\
-	$(LOCAL_PATH)/os/android\
-	$(LOCAL_PATH)/renderers\
-	$(LOCAL_PATH)/filesystem\
-	$(LOCAL_PATH)/renderers/gles\
-	$(LOCAL_PATH)/renderers/gles/egl\
-	$(LOCAL_PATH)/input\
 	$(LOCAL_PATH)/samples\
 
+
 LOCAL_CPPFLAGS	:= -g -fexceptions
-LOCAL_LDLIBS	:= -llog -landroid -lGLESv1_CM -lz
-LOCAL_STATIC_LIBRARIES := crown
-#LOCAL_STATIC_LIBRARIES := android_native_app_glue
+LOCAL_LDLIBS	:= -llog -landroid -lGLESv1_CM
 include $(BUILD_SHARED_LIBRARY)
-#(call import-module, android/native_app_glue)
-
+#(call import-module, android/native_app_glue)

android/src/crown/android/CrownAccelerometer.java

@@ -19,30 +19,33 @@ import crown.android.CrownEnum;
 */
 public class CrownAccelerometer
 {
-    private static final float MIN_VALUE = -1.0f;
-    private static final float MAX_VALUE = 1.0f;
-
-    private static SensorManager sensorManager;
-    private static Sensor sensor;
-    private static SensorEventListener sensorEventListener;
-    private static float x;
-    private static float y;
-    private static float z; 
-    private static float lastX;
-    private static float lastY;
-    private static float lastZ;
-
-    private float lastAccel[] = new float[3];
-    private float accelFilter[] = new float[3];
+    private final float MIN_VALUE = -1.0f;
+    private final float MAX_VALUE = 1.0f;
+
+    private SensorManager sensorManager;
+    private Sensor sensor;
+    private SensorEventListener sensorEventListener;
+
+    private float x;
+    private float y;
+    private float z; 
+    private float lastX;
+    private float lastY;
+    private float lastZ;
 
 //-----------------------------------------------------------------------------------
-    private static boolean initAccelerometer(Context context)
+    public CrownAccelerometer()
+    {
+    }
+
+//-----------------------------------------------------------------------------------
+    private boolean initAccelerometer(Context context)
     {
     	// already initialized!
-    	// if (sensorEventListener != null)
-    	// {
-    	// 	return true;
-    	// }
+    	if (sensorEventListener != null)
+    	{
+    	    return true;
+    	}
 
     	sensorManager = (SensorManager)context.getSystemService(Context.SENSOR_SERVICE);
 
@@ -70,58 +73,58 @@ public class CrownAccelerometer
     }
 
 //-----------------------------------------------------------------------------------
-    public static boolean startListening(Context context)
+    public boolean startListening(Context context)
     {
     	return initAccelerometer(context); 
     }
 
 //-----------------------------------------------------------------------------------
-    public static void stopListening()
+    public void stopListening()
     {
     	sensorManager.unregisterListener(sensorEventListener);
     }
 
 //-----------------------------------------------------------------------------------
-    public static float getX()
+    public float getX()
     {
     	return x;
     }
 
 //-----------------------------------------------------------------------------------
-    public static float getY()
+    public float getY()
     {
     	return y;
     }
 
 //-----------------------------------------------------------------------------------
-    public static float getZ()
+    public float getZ()
     {
     	return z;
     }
 
 //-----------------------------------------------------------------------------------
-    public static float getLastX()
+    public float getLastX()
     {
     	return lastX;
     }
 
 //-----------------------------------------------------------------------------------
-    public static float getLastY()
+    public float getLastY()
     {
     	return lastY;
     }
 
 //-----------------------------------------------------------------------------------
-    public static float getLastZ()
+    public float getLastZ()
     {
     	return lastZ;
     }
 
 //-----------------------------------------------------------------------------------
-    private static void lowPassFiltering(float uX, float uY, float uZ)
+    private void lowPassFiltering(float uX, float uY, float uZ)
     {
         float updateFreq = 30; // match this to your update speed
-        float cutOffFreq = 50.0f;
+        float cutOffFreq = 0.9f;
         float timeRC = 1.0f / cutOffFreq;
         float dt = 1.0f / updateFreq;
         float filterConstant = timeRC / (dt + timeRC);
@@ -143,7 +146,7 @@ public class CrownAccelerometer
     }
 
 //-----------------------------------------------------------------------------------
-    private static float clamp(float v, float min, float max)
+    private float clamp(float v, float min, float max)
     {
         if (v < min)
         {
@@ -158,7 +161,7 @@ public class CrownAccelerometer
     }
 
 //-----------------------------------------------------------------------------------
-    private static float norm(float x, float y, float z)
+    private float norm(float x, float y, float z)
     {
         float v = (float)Math.pow(x, 2) + (float)Math.pow(y, 2) + (float)Math.pow(z, 2);
         return (float)Math.sqrt(v);

android/src/crown/android/CrownActivity.java

@@ -23,13 +23,14 @@ public class CrownActivity extends Activity
 	public static String TAG = "CrownActivity";
 
 	// Resource attributes
-    static AssetManager assetManager;
+    static AssetManager 		mAssetManager;
 
 	// Graphic attributes
-	private CrownView mView;
+	private CrownView 			mView;
 
 	// Input attributes
-	private CrownTouch mTouchListener;
+	private CrownTouch 			mTouchListener;
+	private CrownAccelerometer	mAccelerometerListener;
 
 	/**
 	*
@@ -39,8 +40,8 @@ public class CrownActivity extends Activity
         super.onCreate(savedInstanceState);
 
 		// init AssetManager
-		assetManager = getAssets();
-		CrownLib.initAssetManager(assetManager);
+		mAssetManager = getAssets();
+		CrownLib.initAssetManager(mAssetManager);
 
         // Init GLSurfaceView for rendering
         mView = new CrownView(getApplication());
@@ -48,6 +49,7 @@ public class CrownActivity extends Activity
 
 		// Init Input
 		mTouchListener = new CrownTouch();
+		mAccelerometerListener = new CrownAccelerometer();
 
 		Log.i(TAG, "onCreate called.");
     }
@@ -81,7 +83,7 @@ public class CrownActivity extends Activity
 		Log.i(TAG, "onResume called.");
 
 		// init accelerometer
-		if (!CrownAccelerometer.startListening(this))
+		if (!mAccelerometerListener.startListening(this))
 		{
 			Log.i(TAG, "Device has no accelerometer. App terminated.");
 			finish();
@@ -107,7 +109,7 @@ public class CrownActivity extends Activity
 		Log.i(TAG, "onStop called.");
 
 		// stop accelerometer
-		CrownAccelerometer.stopListening();
+		mAccelerometerListener.stopListening();
 	}
 
 	/**

android/src/crown/android/CrownLib.java

@@ -7,10 +7,9 @@ public class CrownLib
 	static 
 	{
 		System.loadLibrary("crown");
-		System.loadLibrary("triangle");
 	}
 	
-//	// Device functions
+	// Device functions
 	public static native void init();
 	public static native void frame();
 	public static native void shutdown();

android/src/crown/android/CrownTouch.java

@@ -5,10 +5,11 @@ import android.view.MotionEvent;
 
 public class CrownTouch
 {
+	private boolean isListening;
+
 //-----------------------------------------------------------------------------------
 	public CrownTouch()
 	{
-
 	}
 
 //-----------------------------------------------------------------------------------

samples/android/triangle.cpp

@@ -23,7 +23,7 @@ public:
 	{
 		get_input_manager()->register_accelerometer_listener(this);
 
-		cam = new MovableCamera(Vec3::ZERO, true, 90.0f, 1.6f, true, 0.1, 2.5);
+		cam = new MovableCamera(Vec3::ZERO, true, 90.0f, 1.6f, true, 0.1f, 2.5f);
 
 		if (cam)
 		{

src/FPSSystem.cpp

@@ -1,4 +1,3 @@
-#pragma once
 #include "InputManager.h"
 #include "MovableCamera.h"
 #include "FPSSystem.h"

src/FPSSystem.h

@@ -1,4 +1,5 @@
 #pragma once
+
 #include "Types.h"
 #include "Camera.h"
 #include "Vec2.h"

src/Log.h

@@ -63,7 +63,7 @@ public:
 private:
 
 	static LogLevel		mThreshold;
-	static int32_t			mIndentCount;
+	static int32_t		mIndentCount;
 };
 
 } // namespace crown

src/os/android/AndroidDevice.cpp

@@ -27,10 +27,4 @@ JNIEXPORT void JNICALL Java_crown_android_CrownLib_shutdown(JNIEnv* env, jobject
 	device->Shutdown();
 }
 
-//------------------------------------------------------------------------------------
-//JNIEXPORT void JNICALL Java_crown_android_CrownLib_frame(JNIEnv* env, jobject obj)
-//{
-//	GetDevice()->Frame();
-//}
-
-} // namspace crown
+} // namespace crown

src/os/android/AndroidOS.cpp

@@ -79,25 +79,25 @@ void vprintf(const char* string, va_list arg)
 //-----------------------------------------------------------------------------
 void log_debug(const char* string, va_list arg)
 {
-	LOGI(string, arg);
+	__android_log_vprint(ANDROID_LOG_DEBUG, "crown", string, arg);
 }
 
 //-----------------------------------------------------------------------------
 void log_error(const char* string, va_list arg)
 {
-	LOGI(string, arg);
+	__android_log_vprint(ANDROID_LOG_ERROR, "crown", string, arg);
 }
 
 //-----------------------------------------------------------------------------
 void log_warning(const char* string, va_list arg)
 {
-	LOGI(string, arg);
+	__android_log_vprint(ANDROID_LOG_WARN, "crown", string, arg);
 }
 
 //-----------------------------------------------------------------------------
 void log_info(const char* string, va_list arg)
 {
-	LOGI(string, arg);
+	__android_log_vprint(ANDROID_LOG_INFO, "crown", string, arg);
 }
 
 //-----------------------------------------------------------------------------