Ver Fonte

os/android cleaned

mikymod há 13 anos atrás
pai
commit
735935bd78

+ 6 - 6
src/os/OS.h

@@ -56,13 +56,13 @@ const size_t	MAX_EVENTS = 512;
 #endif
 
 //-----------------------------------------------------------------------------
-void			printf(const char* string, ...);				//!< Print32_tf wrapper
-void			vprintf(const char* string, va_list arg);		//!< VPrint32_tf wrapper
+void			printf(const char* string, ...);				//!< Printf wrapper
+void			vprintf(const char* string, va_list arg);		//!< VPrintf wrapper
 
-void			log_debug(const char* string, va_list arg);		//!< Print32_t debug message
-void			log_error(const char* string, va_list arg);		//!< Print32_t error message
-void			log_warning(const char* string, va_list arg);	//!< Print32_t warning message
-void			log_info(const char* string, va_list arg);		//!< Print32_t info message
+void			log_debug(const char* string, va_list arg);		//!< Print debug message
+void			log_error(const char* string, va_list arg);		//!< Print error message
+void			log_warning(const char* string, va_list arg);	//!< Print warning message
+void			log_info(const char* string, va_list arg);		//!< Print info message
 
 bool			exists(const char* path);		//!< Returns whether the path is a file or directory on the disk
 

+ 6 - 0
src/os/android/AndroidDevice.cpp

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

+ 5 - 0
src/os/android/AndroidDevice.h

@@ -6,9 +6,14 @@ namespace crown
 
 extern "C" 
 {
+	//!< Device init() jni bind
 	JNIEXPORT bool JNICALL Java_crown_android_CrownLib_init(JNIEnv* env, jobject obj, jint argc, jobjectArray argv);
+	//!< Device is_running() jni bind	
 	JNIEXPORT bool JNICALL Java_crown_android_CrownLib_isRunning(JNIEnv* env, jobject obj);
+	//!< Device shutdown() jni bind
 	JNIEXPORT void JNICALL Java_crown_android_CrownLib_shutdown(JNIEnv* env, jobject obj);
+	//!< Device frame() jni bind
+	JNIEXPORT void JNICALL Java_crown_android_CrownLib_frame(JNIEnv* env, jobject obj);
 };
 
 } // namespace crown

+ 7 - 5
src/os/android/AndroidInput.cpp

@@ -9,14 +9,10 @@ namespace os
 
 extern "C" 
 {
+	//!< OS push_event() jni bind
     JNIEXPORT void JNICALL Java_crown_android_CrownLib_pushEvent(JNIEnv * env, jobject obj, jint type, jint a, jint b, jint c, jint d);
 };
 
-JNIEXPORT void JNICALL Java_crown_android_CrownLib_pushEvent(JNIEnv * env, jobject obj, jint type, jint a, jint b, jint c, jint d)
-{
-	push_event((OSEventType)type, a, b, c, d);
-}
-
 //-----------------------------------------------------------------------------
 void init_input()
 {
@@ -53,5 +49,11 @@ void show_cursor()
 	// not necessary
 }
 
+//-----------------------------------------------------------------------------
+JNIEXPORT void JNICALL Java_crown_android_CrownLib_pushEvent(JNIEnv * env, jobject obj, jint type, jint a, jint b, jint c, jint d)
+{
+	push_event((OSEventType)type, a, b, c, d);
+}
+
 } // namespace os
 } // namespace crown

+ 0 - 18
src/os/android/AndroidRenderer.cpp

@@ -1,18 +0,0 @@
-#include "AndroidRenderer.h"
-#include "Device.h"
-#include "Renderer.h"
-
-namespace crown
-{
-
-JNIEXPORT void JNICALL Java_crown_android_CrownLib_beginFrame(JNIEnv* env, jobject obj)
-{
-	GetDevice()->GetRenderer()->_BeginFrame();
-}
-
-JNIEXPORT void JNICALL Java_crown_android_CrownLib_endFrame(JNIEnv* env, jobject obj)
-{
-	GetDevice()->GetRenderer()->_EndFrame();
-}
-
-} // namespace crown

+ 0 - 13
src/os/android/AndroidRenderer.h

@@ -1,13 +0,0 @@
-#include <jni.h>
-#include <sys/types.h>
-
-namespace crown
-{
-
-extern "C" 
-{
-	JNIEXPORT void JNICALL Java_crown_android_CrownLib_beginFrame(JNIEnv* env, jobject obj);
-	JNIEXPORT void JNICALL Java_crown_android_CrownLib_endFrame(JNIEnv* env, jobject obj);
-};
-
-} // namespace crown