salmon-engine-projects/double-hit-balls
14
0 Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

catch up

Browse Source
This commit is contained in:
vladislav.khorev committed 2013-02-10 12:44:00 +00:00
1 parent 9da15411a1
commit 46015b9dc8
7 files changed
+31 -331
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

jni/android_api.cpp
+1 -168
View File
@@ -2,176 +2,9 @@
#include "main_code.h"
boost::shared_ptr<TAndroidApplication> App(new TAndroidApplication);
JNIEXPORT void JNICALL Java_fishrungames_doublehitballs_JniWrapper_Init(JNIEnv * env, jobject obj, jint width, jint height)
{
try
{
App->OuterInit(width, height, 480.f, 320.f);
}
catch (ErrorCommon e)
{
throw;
}
JniInitApp<TAndroidApplication>(width, height, 480.f, 320.f);
}
JNIEXPORT void JNICALL Java_fishrungames_doublehitballs_JniWrapper_StopSounds(JNIEnv * env, jobject obj)
{
try
{
App->OuterDeinit(); //Clean up what is left at previous launch (if applicable)
}
catch (ErrorCommon e)
{
throw;
}
}
JNIEXPORT void JNICALL Java_fishrungames_doublehitballs_JniWrapper_Update(JNIEnv * env, jobject obj, long dt)
{
try
{
if (!App->IsInited())
{
return;
}
App->OuterDraw();
App->OuterUpdate(dt);
}
catch (ErrorCommon e)
{
throw;
}
}
JNIEXPORT int JNICALL Java_fishrungames_doublehitballs_JniWrapper_IsInited(JNIEnv * env, jobject obj)
{
try
{
if (App->IsInited())
{
return 1;
}
else
{
return 0;
}
}
catch (ErrorCommon e)
{
throw;
}
}
JNIEXPORT void JNICALL Java_fishrungames_doublehitballs_JniWrapper_Destroy(JNIEnv * env, jobject obj)
{
try
{
*Console<<"Destroy!!!\n";
}
catch (ErrorCommon e)
{
throw;
}
}
JNIEXPORT void JNICALL Java_fishrungames_doublehitballs_JniWrapper_OnTapDown(JNIEnv * env, jobject obj, float x, float y, long time)
{
try
{
if (!App->IsInited())
{
return;
}
x = x * 480.f / Renderer->GetScreenWidth();
y = y * 320.f / Renderer->GetScreenHeight();
//*Console<<"Tap down "<<tostr(Renderer->GetScreenHeight())<<" "<<tostr(y)<<endl;
OnTapDownSignal(vec2(x, y));
}
catch (ErrorCommon e)
{
throw;
}
}
JNIEXPORT void JNICALL Java_fishrungames_doublehitballs_JniWrapper_OnTapUp(JNIEnv * env, jobject obj, float x, float y, long time)
{
try
{
if (!App->IsInited())
{
return;
}
x = x * 480.f / Renderer->GetScreenWidth();
y = y * 320.f / Renderer->GetScreenHeight();
OnTapUpSignal(vec2(x, y));
}
catch (ErrorCommon e)
{
throw;
}
}
JNIEXPORT void JNICALL Java_fishrungames_doublehitballs_JniWrapper_OnTapMove(JNIEnv * env, jobject obj, float x, float y, long time)
{
}
JNIEXPORT void JNICALL Java_fishrungames_doublehitballs_JniWrapper_OnFling(JNIEnv * env, jobject obj, jfloat velocityX, jfloat velocityY, long time)
{
try
{
if (!App->IsInited())
{
return;
}
velocityX = velocityX * 480.f / Renderer->GetScreenWidth();
velocityY = velocityY * 320.f / Renderer->GetScreenHeight();
OnFlingSignal(vec2(velocityX, velocityY));
}
catch (ErrorCommon e)
{
throw;
}
}
JNIEXPORT void JNICALL Java_fishrungames_doublehitballs_JniWrapper_OnScroll(JNIEnv * env, jobject obj, jfloat distanceX, jfloat distanceY, long time)
{
try
{
if (!App->IsInited())
{
return;
}
distanceX = distanceX * 480.f / Renderer->GetScreenWidth();
distanceY = distanceY * 320.f / Renderer->GetScreenHeight();
OnScrollSignal(vec2(distanceX, distanceY));
}
catch (ErrorCommon e)
{
throw;
}
}
jni/android_api.h
+6 -15
View File
@@ -10,24 +10,15 @@
#include "boost/shared_ptr.hpp"
#include "main_code.h"
#include "include/Engine.h"
using namespace SE;
class TAndroidApplication;
extern boost::shared_ptr<TAndroidApplication> App;
extern "C" {
extern "C"
{
JNIEXPORT void JNICALL Java_fishrungames_doublehitballs_JniWrapper_Init(JNIEnv * env, jobject obj, jint width, jint height);
JNIEXPORT void JNICALL Java_fishrungames_doublehitballs_JniWrapper_StopSounds(JNIEnv * env, jobject obj);
JNIEXPORT void JNICALL Java_fishrungames_doublehitballs_JniWrapper_Update(JNIEnv * env, jobject obj, long dt);
JNIEXPORT void JNICALL Java_fishrungames_doublehitballs_JniWrapper_Destroy(JNIEnv * env, jobject obj);
JNIEXPORT int JNICALL Java_fishrungames_doublehitballs_JniWrapper_IsInited(JNIEnv * env, jobject obj);
JNIEXPORT void JNICALL Java_fishrungames_doublehitballs_JniWrapper_OnTapDown(JNIEnv * env, jobject obj, jfloat x, jfloat y, long time);
JNIEXPORT void JNICALL Java_fishrungames_doublehitballs_JniWrapper_OnTapUp(JNIEnv * env, jobject obj, jfloat x, jfloat y, long time);
JNIEXPORT void JNICALL Java_fishrungames_doublehitballs_JniWrapper_OnTapMove(JNIEnv * env, jobject obj, jfloat x, jfloat y, long time);
JNIEXPORT void JNICALL Java_fishrungames_doublehitballs_JniWrapper_OnFling(JNIEnv * env, jobject obj, jfloat velocityX, jfloat velocityY, long time);
JNIEXPORT void JNICALL Java_fishrungames_doublehitballs_JniWrapper_OnScroll(JNIEnv * env, jobject obj, jfloat distanceX, jfloat distanceY, long time);
};
jni/main_code.cpp
-26
View File
@@ -127,8 +127,6 @@ void TAndroidApplication::InnerDeinit()
}
#ifdef TARGET_WIN32
void TAndroidApplication::InnerOnTapDown(vec2 p)
{
OnTapDownSignal(vec2(p.v[0], p.v[1]));
@@ -148,30 +146,6 @@ void TAndroidApplication::OnFling(vec2 v)
{
}
#endif
#ifdef TARGET_IOS
void TAndroidApplication::InnerOnTapDown(vec2 p)
{
OnTapDownSignal(vec2(p.v[0], p.v[1]));
}
void TAndroidApplication::InnerOnTapUp(vec2 p)
{
OnTapUpSignal(vec2(p.v[0], p.v[1]));
}
void TAndroidApplication::InnerOnMove(vec2 shift)
{
OnScrollSignal(shift);
}
void TAndroidApplication::OnFling(vec2 v)
{
}
#endif
void TAndroidApplication::ApplySignalsToMenu()
{
jni/main_code.h
+5 -6
View File
@@ -1,5 +1,5 @@
#ifndef GL_CODE_H_INCLUDED
#define GL_CODE_H_INCLUDED
#ifndef MAIN_CODE_H_INCLUDED
#define MAIN_CODE_H_INCLUDED
#ifdef TARGET_ANDROID
#include "android_api.h"
@@ -32,10 +32,6 @@
using namespace SE;
class TAndroidApplication;
extern TAndroidApplication* Application;
extern boost::signal<void (vec2)> OnTapUpSignal;
extern boost::signal<void (vec2)> OnTapDownSignal;
extern boost::signal<void (vec2)> OnFlingSignal;
@@ -150,5 +146,8 @@ public:
};
extern TAndroidApplication* Application;
#endif