Skip to content

Commit c376131

Browse files
committed
Update the game framework
1 parent d16d2f8 commit c376131

File tree

6 files changed

+6
-19
lines changed

6 files changed

+6
-19
lines changed

snap-android-game/.classpath

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
44
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
55
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
6-
<classpathentry kind="lib" path="libs/snap-agent-1.0.2-jar-with-dependencies.jar" sourcepath="/snap-agent"/>
76
<classpathentry kind="src" path="src"/>
87
<classpathentry kind="src" path="gen"/>
8+
<classpathentry kind="lib" path="libs/snapa.jar"/>
99
<classpathentry kind="output" path="bin/classes"/>
1010
</classpath>

snap-android-game/src/org/snapscript/android/game/Agent.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class Agent {
2828
private final Activity activity;
2929
private final Executor executor;
3030

31-
public Agent(Activity activity) {
31+
public Agent(GameActivity activity) {
3232
this.configuration = new Configuration(activity);
3333
this.executor = new ThreadPool(1);
3434
this.game = new GameAgent(activity);

snap-android-game/src/org/snapscript/android/game/Frame.java

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,13 +46,6 @@ public void onUpdate(Frame frame, Canvas canvas) {
4646
}
4747
}
4848

49-
@Override
50-
public void onCreated(Frame frame) {
51-
if (panel != null) {
52-
panel.onCreated(frame);
53-
}
54-
}
55-
5649
@Override
5750
public void onChanged(Frame frame, int format, int width, int height) {
5851
if (panel != null) {

snap-android-game/src/org/snapscript/android/game/FrameAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ public FrameAdapter(FrameThread thread, Frame frame) {
1515

1616
@Override
1717
public void surfaceCreated(SurfaceHolder holder) {
18-
frame.onCreated(frame);
18+
frame.onStart(frame);
1919
thread.start();
2020
}
2121

snap-android-game/src/org/snapscript/android/game/GameAgent.java

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,21 @@
11
package org.snapscript.android.game;
22

3-
import java.util.concurrent.BlockingQueue;
4-
import java.util.concurrent.SynchronousQueue;
5-
6-
import android.app.Activity;
73
import android.os.Handler;
84
import android.util.Log;
95

106
public class GameAgent implements Game {
117

128
private static final String TAG = GameAgent.class.getSimpleName();
139

14-
private final BlockingQueue<Panel> queue;
1510
private final GameController controller;
11+
private final GameActivity activity;
1612
private final FrameAdapter listener;
1713
private final FrameThread thread;
18-
private final Activity activity;
1914
private final Handler handler;
2015
private final Frame frame;
2116

22-
public GameAgent(Activity activity){
17+
public GameAgent(GameActivity activity){
2318
this.handler = new Handler(activity.getMainLooper());
24-
this.queue = new SynchronousQueue<Panel>();
2519
this.frame = new Frame(activity);
2620
this.thread = new FrameThread(frame.getHolder(), frame);
2721
this.controller = new GameController(frame);
@@ -37,6 +31,7 @@ public void start(final Panel panel) {
3731
public void run() {
3832
Log.i(TAG, "Posting creation");
3933
activity.setContentView(frame);
34+
activity.onStart(frame);
4035
frame.getHolder().addCallback(listener);
4136
frame.setOnTouchListener(controller);
4237
frame.setFocusable(true);

snap-android-game/src/org/snapscript/android/game/Panel.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ public interface Panel {
77
void onPause(Frame frame);
88
void onRender(Frame frame, Canvas canvas);
99
void onUpdate(Frame frame, Canvas canvas);
10-
void onCreated(Frame frame);
1110
void onChanged(Frame frame, int format, int width, int height);
1211
void onDestroyed(Frame frame);
1312
void onRightToLeftSwipe(Frame frame);

0 commit comments

Comments
 (0)