From d533766061b866d391ef80607a58d1e4b81643bf Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Thu, 1 Nov 2012 15:34:32 +0100 Subject: [PATCH] Move from turboviking to henrikrydgard as base namespace --- android/app-android.cpp | 30 +++++++++---------- .../libnative/NativeActivity.java | 2 +- .../libnative/NativeApp.java | 2 +- .../libnative/NativeAudioPlayer.java | 2 +- .../libnative/NativeGLView.java | 2 +- .../libnative/NativeRenderer.java | 2 +- 6 files changed, 20 insertions(+), 20 deletions(-) rename android/src/com/{turboviking => henrikrydgard}/libnative/NativeActivity.java (99%) rename android/src/com/{turboviking => henrikrydgard}/libnative/NativeApp.java (96%) rename android/src/com/{turboviking => henrikrydgard}/libnative/NativeAudioPlayer.java (98%) rename android/src/com/{turboviking => henrikrydgard}/libnative/NativeGLView.java (98%) rename android/src/com/{turboviking => henrikrydgard}/libnative/NativeRenderer.java (97%) diff --git a/android/app-android.cpp b/android/app-android.cpp index 3310cea888..2751ad69df 100644 --- a/android/app-android.cpp +++ b/android/app-android.cpp @@ -88,7 +88,7 @@ std::string GetJavaString(JNIEnv *env, jstring jstr) return cpp_string; } -extern "C" jboolean Java_com_turboviking_libnative_NativeApp_isLandscape(JNIEnv *env, jclass) +extern "C" jboolean Java_com_henrikrydgard_libnative_NativeApp_isLandscape(JNIEnv *env, jclass) { std::string app_name, app_nice_name; bool landscape; @@ -97,11 +97,11 @@ extern "C" jboolean Java_com_turboviking_libnative_NativeApp_isLandscape(JNIEnv } // For the Back button to work right. -extern "C" jboolean Java_com_turboviking_libnative_NativeApp_isAtTopLevel(JNIEnv *env, jclass) { +extern "C" jboolean Java_com_henrikrydgard_libnative_NativeApp_isAtTopLevel(JNIEnv *env, jclass) { return NativeIsAtTopLevel(); } -extern "C" void Java_com_turboviking_libnative_NativeApp_init +extern "C" void Java_com_henrikrydgard_libnative_NativeApp_init (JNIEnv *env, jclass, jint xxres, jint yyres, jint dpi, jstring japkpath, jstring jdataDir, jstring jexternalDir, jstring jlibraryDir, jstring jinstallID, jboolean juseNativeAudio) { jniEnvUI = env; @@ -146,21 +146,21 @@ extern "C" void Java_com_turboviking_libnative_NativeApp_init } } -extern "C" void Java_com_turboviking_libnative_NativeApp_resume(JNIEnv *, jclass) { +extern "C" void Java_com_henrikrydgard_libnative_NativeApp_resume(JNIEnv *, jclass) { ILOG("NativeResume"); if (use_native_audio) { AndroidAudio_Resume(); } } -extern "C" void Java_com_turboviking_libnative_NativeApp_pause(JNIEnv *, jclass) { +extern "C" void Java_com_henrikrydgard_libnative_NativeApp_pause(JNIEnv *, jclass) { ILOG("NativePause"); if (use_native_audio) { AndroidAudio_Pause(); } } -extern "C" void Java_com_turboviking_libnative_NativeApp_shutdown(JNIEnv *, jclass) { +extern "C" void Java_com_henrikrydgard_libnative_NativeApp_shutdown(JNIEnv *, jclass) { ILOG("NativeShutdown."); if (use_native_audio) { AndroidAudio_Shutdown(); @@ -177,7 +177,7 @@ extern "C" void Java_com_turboviking_libnative_NativeApp_shutdown(JNIEnv *, jcla static jmethodID postCommand; -extern "C" void Java_com_turboviking_libnative_NativeRenderer_displayInit(JNIEnv * env, jobject obj) { +extern "C" void Java_com_henrikrydgard_libnative_NativeRenderer_displayInit(JNIEnv * env, jobject obj) { ILOG("displayInit()"); if (!renderer_inited) { @@ -202,11 +202,11 @@ extern "C" void Java_com_turboviking_libnative_NativeRenderer_displayInit(JNIEnv ILOG("MethodID: %i", (int)postCommand); } -extern "C" void Java_com_turboviking_libnative_NativeRenderer_displayResize(JNIEnv *, jobject clazz, jint w, jint h) { +extern "C" void Java_com_henrikrydgard_libnative_NativeRenderer_displayResize(JNIEnv *, jobject clazz, jint w, jint h) { ILOG("displayResize (%i, %i)!", w, h); } -extern "C" void Java_com_turboviking_libnative_NativeRenderer_displayRender(JNIEnv *env, jobject obj) { +extern "C" void Java_com_henrikrydgard_libnative_NativeRenderer_displayRender(JNIEnv *env, jobject obj) { if (renderer_inited) { { lock_guard guard(input_state.lock); @@ -237,7 +237,7 @@ extern "C" void Java_com_turboviking_libnative_NativeRenderer_displayRender(JNIE } } -extern "C" void Java_com_turboviking_libnative_NativeApp_audioRender(JNIEnv* env, jclass clazz, jshortArray array) { +extern "C" void Java_com_henrikrydgard_libnative_NativeApp_audioRender(JNIEnv* env, jclass clazz, jshortArray array) { // The audio thread can pretty safely enable Flush-to-Zero mode on the FPU. EnableFZ(); @@ -250,7 +250,7 @@ extern "C" void Java_com_turboviking_libnative_NativeApp_audioRender(JNIEnv* env } } -extern "C" void JNICALL Java_com_turboviking_libnative_NativeApp_touch +extern "C" void JNICALL Java_com_henrikrydgard_libnative_NativeApp_touch (JNIEnv *, jclass, float x, float y, int code, int pointerId) { lock_guard guard(input_state.lock); @@ -274,7 +274,7 @@ extern "C" void JNICALL Java_com_turboviking_libnative_NativeApp_touch input_state.mouse_valid = true; } -extern "C" void Java_com_turboviking_libnative_NativeApp_keyDown(JNIEnv *, jclass, jint key) { +extern "C" void Java_com_henrikrydgard_libnative_NativeApp_keyDown(JNIEnv *, jclass, jint key) { switch (key) { case 1: // Back pad_buttons_async_set |= PAD_BUTTON_BACK; @@ -291,7 +291,7 @@ extern "C" void Java_com_turboviking_libnative_NativeApp_keyDown(JNIEnv *, jclas } } -extern "C" void Java_com_turboviking_libnative_NativeApp_keyUp(JNIEnv *, jclass, jint key) { +extern "C" void Java_com_henrikrydgard_libnative_NativeApp_keyUp(JNIEnv *, jclass, jint key) { switch (key) { case 1: // Back pad_buttons_async_set &= ~PAD_BUTTON_BACK; @@ -308,7 +308,7 @@ extern "C" void Java_com_turboviking_libnative_NativeApp_keyUp(JNIEnv *, jclass, } } -extern "C" void JNICALL Java_com_turboviking_libnative_NativeApp_accelerometer +extern "C" void JNICALL Java_com_henrikrydgard_libnative_NativeApp_accelerometer (JNIEnv *, jclass, float x, float y, float z) { // Theoretically this needs locking but I doubt it matters. Worst case, the X // from one "sensor frame" will be used together with Y from the next. @@ -319,7 +319,7 @@ extern "C" void JNICALL Java_com_turboviking_libnative_NativeApp_accelerometer input_state.acc.z = z; } -extern "C" void Java_com_turboviking_libnative_NativeApp_sendMessage +extern "C" void Java_com_henrikrydgard_libnative_NativeApp_sendMessage (JNIEnv *env, jclass, jstring message, jstring param) { jboolean isCopy; std::string msg = GetJavaString(env, message); diff --git a/android/src/com/turboviking/libnative/NativeActivity.java b/android/src/com/henrikrydgard/libnative/NativeActivity.java similarity index 99% rename from android/src/com/turboviking/libnative/NativeActivity.java rename to android/src/com/henrikrydgard/libnative/NativeActivity.java index 33e5affebc..ed9eff8f6e 100644 --- a/android/src/com/turboviking/libnative/NativeActivity.java +++ b/android/src/com/henrikrydgard/libnative/NativeActivity.java @@ -1,4 +1,4 @@ -package com.turboviking.libnative; +package com.henrikrydgard.libnative; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; diff --git a/android/src/com/turboviking/libnative/NativeApp.java b/android/src/com/henrikrydgard/libnative/NativeApp.java similarity index 96% rename from android/src/com/turboviking/libnative/NativeApp.java rename to android/src/com/henrikrydgard/libnative/NativeApp.java index ee403238b2..9c016f0ada 100644 --- a/android/src/com/turboviking/libnative/NativeApp.java +++ b/android/src/com/henrikrydgard/libnative/NativeApp.java @@ -1,4 +1,4 @@ -package com.turboviking.libnative; +package com.henrikrydgard.libnative; public class NativeApp { public static native void init( diff --git a/android/src/com/turboviking/libnative/NativeAudioPlayer.java b/android/src/com/henrikrydgard/libnative/NativeAudioPlayer.java similarity index 98% rename from android/src/com/turboviking/libnative/NativeAudioPlayer.java rename to android/src/com/henrikrydgard/libnative/NativeAudioPlayer.java index c15ef0a91b..d6fd249407 100644 --- a/android/src/com/turboviking/libnative/NativeAudioPlayer.java +++ b/android/src/com/henrikrydgard/libnative/NativeAudioPlayer.java @@ -1,4 +1,4 @@ -package com.turboviking.libnative; +package com.henrikrydgard.libnative; import android.media.AudioFormat; import android.media.AudioManager; diff --git a/android/src/com/turboviking/libnative/NativeGLView.java b/android/src/com/henrikrydgard/libnative/NativeGLView.java similarity index 98% rename from android/src/com/turboviking/libnative/NativeGLView.java rename to android/src/com/henrikrydgard/libnative/NativeGLView.java index 2aec39856a..3d2dec1fce 100644 --- a/android/src/com/turboviking/libnative/NativeGLView.java +++ b/android/src/com/henrikrydgard/libnative/NativeGLView.java @@ -1,4 +1,4 @@ -package com.turboviking.libnative; +package com.henrikrydgard.libnative; // Touch- and sensor-enabled GLSurfaceView. // Supports simple multitouch and pressure. diff --git a/android/src/com/turboviking/libnative/NativeRenderer.java b/android/src/com/henrikrydgard/libnative/NativeRenderer.java similarity index 97% rename from android/src/com/turboviking/libnative/NativeRenderer.java rename to android/src/com/henrikrydgard/libnative/NativeRenderer.java index 232204c183..ea5573eb9a 100644 --- a/android/src/com/turboviking/libnative/NativeRenderer.java +++ b/android/src/com/henrikrydgard/libnative/NativeRenderer.java @@ -1,4 +1,4 @@ -package com.turboviking.libnative; +package com.henrikrydgard.libnative; import javax.microedition.khronos.egl.EGLConfig; import javax.microedition.khronos.opengles.GL10;