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

catch up

Browse Source
This commit is contained in:
Vladislav Khorev 2013-02-10 12:44:00 +00:00
parent 9da15411a1
commit 46015b9dc8
7 changed files with 31 additions and 331 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

169
jni/android_api.cpp
View File

@ -2,176 +2,9 @@
#include "main_code.h" #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) JNIEXPORT void JNICALL Java_fishrungames_doublehitballs_JniWrapper_Init(JNIEnv * env, jobject obj, jint width, jint height)
{ {
try JniInitApp<TAndroidApplication>(width, height, 480.f, 320.f);
{
App->OuterInit(width, height, 480.f, 320.f);
}
catch (ErrorCommon e)
{
throw;
}
} }
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;
}
}

21
jni/android_api.h
View File

@ -10,24 +10,15 @@
#include "boost/shared_ptr.hpp" #include "boost/shared_ptr.hpp"
#include "main_code.h"
#include "include/Engine.h"
using namespace SE; using namespace SE;
extern "C"
class TAndroidApplication; {
extern boost::shared_ptr<TAndroidApplication> App;
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_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);
}; };

26
jni/main_code.cpp
View File

@ -127,8 +127,6 @@ void TAndroidApplication::InnerDeinit()
} }
#ifdef TARGET_WIN32
void TAndroidApplication::InnerOnTapDown(vec2 p) void TAndroidApplication::InnerOnTapDown(vec2 p)
{ {
OnTapDownSignal(vec2(p.v[0], p.v[1])); 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() void TAndroidApplication::ApplySignalsToMenu()
{ {

11
jni/main_code.h
View File

@ -1,5 +1,5 @@
#ifndef GL_CODE_H_INCLUDED #ifndef MAIN_CODE_H_INCLUDED
#define GL_CODE_H_INCLUDED #define MAIN_CODE_H_INCLUDED
#ifdef TARGET_ANDROID #ifdef TARGET_ANDROID
#include "android_api.h" #include "android_api.h"
@ -32,10 +32,6 @@
using namespace SE; using namespace SE;
class TAndroidApplication;
extern TAndroidApplication* Application;
extern boost::signal<void (vec2)> OnTapUpSignal; extern boost::signal<void (vec2)> OnTapUpSignal;
extern boost::signal<void (vec2)> OnTapDownSignal; extern boost::signal<void (vec2)> OnTapDownSignal;
extern boost::signal<void (vec2)> OnFlingSignal; extern boost::signal<void (vec2)> OnFlingSignal;
@ -150,5 +146,8 @@ public:
}; };
extern TAndroidApplication* Application;
#endif #endif

114
src/fishrungames/doublehitballs/GL2JNIActivity.java
View File

@ -1,6 +1,6 @@
package fishrungames.doublehitballs; package fishrungames.doublehitballs;
import fishrungames.engine.FileWrapper; import fishrungames.engine.EngineWrapper;
//Deprecated //Deprecated
//import fishrungames.doublehitballs.R; //import fishrungames.doublehitballs.R;
@ -11,6 +11,7 @@ import android.content.pm.PackageManager;
import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.PackageManager.NameNotFoundException;
import android.os.Bundle; import android.os.Bundle;
import android.view.GestureDetector; import android.view.GestureDetector;
import android.view.KeyEvent;
import android.view.GestureDetector.SimpleOnGestureListener; import android.view.GestureDetector.SimpleOnGestureListener;
import android.view.MotionEvent; import android.view.MotionEvent;
@ -23,40 +24,15 @@ public class GL2JNIActivity extends Activity
GLView mView; GLView mView;
boolean IsScrolling = false;
private GestureDetector gestureDetector;
@Override @Override
protected void onCreate(Bundle icicle) protected void onCreate(Bundle icicle)
{ {
super.onCreate(icicle); super.onCreate(icicle);
gestureDetector = new GestureDetector(new MyGestureListener()); EngineWrapper.LoadSalmonEngineLibrary();
EngineWrapper.SetActivityInstance(this);
FileWrapper.LoadHalibutEngineLibrary(); EngineWrapper.SetupEnviroment();
FileWrapper.SetActivityInstance(this);
FileWrapper.SetupEnviroment();
/*
* Deprecated
try
{
for (Field f : R.raw.class.getFields())
{
FileWrapper.AddToFileMap(f.getName(), f.getInt(null));
}
} catch (IllegalArgumentException e)
{
FileWrapper.ConsoleOut("IllegalArgumentException\n");
onStop();
} catch (IllegalAccessException e)
{
FileWrapper.ConsoleOut("IllegalAccessException\n");
onStop();
}*/
String apkFilePath = null; String apkFilePath = null;
ApplicationInfo appInfo = null; ApplicationInfo appInfo = null;
@ -66,23 +42,25 @@ public class GL2JNIActivity extends Activity
} catch (NameNotFoundException e) { } catch (NameNotFoundException e) {
e.printStackTrace(); e.printStackTrace();
throw new RuntimeException("Unable to locate assets, aborting..."); throw new RuntimeException("Unable to locate assets, aborting...");
} }
apkFilePath = appInfo.sourceDir; apkFilePath = appInfo.sourceDir;
FileWrapper.SetupApkFilePath(apkFilePath); EngineWrapper.SetupApkFilePath(apkFilePath);
mView = new GLView(getApplication()); mView = new GLView(getApplication());
setContentView(mView); setContentView(mView);
EngineWrapper.SetView(mView);
} }
@Override @Override
protected void onPause() protected void onPause()
{ {
FileWrapper.ConsoleOut("OnPause\n"); EngineWrapper.CallDestroy();
JniWrapper.StopSounds();
super.onPause(); super.onPause();
mView.onPause(); mView.onPause();
} }
@ -97,82 +75,18 @@ public class GL2JNIActivity extends Activity
@Override @Override
protected void onStop() protected void onStop()
{ {
//FileWrapper.ConsoleOut("OnStop\n");
//StopSounds();
super.onStop(); super.onStop();
} }
public boolean onTouchEvent (MotionEvent event) public boolean onTouchEvent (MotionEvent event)
{ {
if (gestureDetector.onTouchEvent(event)) EngineWrapper.ProcessTouchEvent(event);
{
return true;
}
/*
if (event.getAction() == MotionEvent.ACTION_MOVE)
{
float x = event.getX();
float y = (float)mView.getHeight()-event.getY();
float shiftX = x - event.getHistoricalX(0, event.getHistorySize()-2);
if(IsScrolling)
{
IsScrolling = false;
}
JniWrapper.OnScroll(x, y, event.getEventTime());
}*/
if (event.getAction() == MotionEvent.ACTION_UP)
{
float x = event.getX();
float y = (float)mView.getHeight()-event.getY();
if(IsScrolling)
{
IsScrolling = false;
}
JniWrapper.OnTapUp(x, y, event.getEventTime());
}
return true; return true;
} }
class MyGestureListener extends SimpleOnGestureListener public boolean onKeyDown(int keyCode, KeyEvent event)
{ {
@Override EngineWrapper.ProcessKeyDown(keyCode, event);
public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) return super.onKeyDown(keyCode, event);
{
JniWrapper.OnFling(velocityX, velocityY, e2.getEventTime());
return true;
}
public boolean onScroll(MotionEvent e1, MotionEvent e2, float distanceX, float distanceY)
{
JniWrapper.OnScroll(distanceX, distanceY, e2.getEventTime());
IsScrolling = true;
return true;
}
public boolean onDown(MotionEvent event)
{
float x = event.getX();
float y = (float)mView.getHeight()-event.getY();
JniWrapper.OnTapDown(x, y, event.getEventTime());
return true;
}
} }
} }

10
src/fishrungames/doublehitballs/GLView.java
View File

@ -11,6 +11,8 @@ import javax.microedition.khronos.opengles.GL10;
import fishrungames.engine.GLViewAncestor; import fishrungames.engine.GLViewAncestor;
import fishrungames.engine.EngineWrapper;
class GLView extends GLViewAncestor class GLView extends GLViewAncestor
{ {
static long lastTimeStamp; static long lastTimeStamp;
@ -49,7 +51,7 @@ class GLView extends GLViewAncestor
long currentTimeStamp = c.getTimeInMillis(); long currentTimeStamp = c.getTimeInMillis();
JniWrapper.Update(currentTimeStamp - lastTimeStamp); EngineWrapper.Update(currentTimeStamp - lastTimeStamp);
lastTimeStamp = currentTimeStamp; lastTimeStamp = currentTimeStamp;
} }
@ -57,13 +59,9 @@ class GLView extends GLViewAncestor
public void onSurfaceChanged(GL10 gl, int width, int height) public void onSurfaceChanged(GL10 gl, int width, int height)
{ {
if (JniWrapper.IsInited() == 1)
{
JniWrapper.Destroy();
}
JniWrapper.Init(width,height); JniWrapper.Init(width,height);
} }
public void onSurfaceCreated(GL10 gl, EGLConfig config) public void onSurfaceCreated(GL10 gl, EGLConfig config)
{ {
//Do nothing. //Do nothing.

11
src/fishrungames/doublehitballs/JniWrapper.java
View File

@ -8,14 +8,5 @@ public class JniWrapper
public static native void Init(int width, int height); public static native void Init(int width, int height);
public static native void Update(long dt);
public static native void StopSounds();
public static native void Destroy();
public static native int IsInited();
public static native void OnTapDown(float x, float y, long time);
public static native void OnTapUp(float x, float y, long time);
public static native void OnTapMove(float x, float y, long time);
public static native void OnFling(float velocityX, float velocityY, long time);
public static native void OnScroll(float distanceX, float distanceY, long time);
} }