Android/Tetris
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cleanup

Browse Source
This commit is contained in:
Administrator
2014-04-17 14:32:25 +02:00
parent c4cc0517f6
commit fa997fb77a
2 changed files with 5 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mangavalk/tetris/CanvasView.java
+5 -21
View File
@@ -13,7 +13,6 @@ public class CanvasView extends View // Dev2
Resources r;
GameStateInterface Foreground = null;
GameStateInterface Gamemenu = null;
GameStateInterface Gameplay = null;
// Score.
@@ -32,18 +31,15 @@ public class CanvasView extends View // Dev2
public void SetActivity(Activity activity)
{
Gameplay = new GamePlay(activity);
Gamemenu = new GameMenu(activity);
Gamemenu.SetCanvas(this);
Gamemenu.SetPayedVersion(PayedVersion);
Gamemenu.Load();
Gamemenu.Start();
Gameplay.SetCanvas(this);
Gameplay.SetPayedVersion(PayedVersion);
Foreground = Gamemenu;
((GamePlay)Gameplay).SetStartLevel(startLevel);
Gameplay.Load();
Gameplay.Start();
Foreground = Gameplay;
}
@Override
@@ -79,24 +75,12 @@ public class CanvasView extends View // Dev2
Foreground = Gameplay;
break;
}
case GameStateInterface.GS_PAUSED:
{
Gamemenu.SetGameState(Foreground.GetGameState(), true);
Foreground = Gamemenu;
break;
}
case GameStateInterface.GS_RESUME:
{
Gameplay.SetGameState(Foreground.GetGameState(), true);
Foreground = Gameplay;
break;
}
case GameStateInterface.GS_GAMEOVER:
{
Gamemenu.SetGameState(Foreground.GetGameState(), true);
Foreground = Gamemenu;
break;
}
}
}
src/mangavalk/tetris/GameMenu.java
-172
View File
@@ -1,172 +0,0 @@
package mangavalk.tetris;
import android.app.Activity;
import android.graphics.Canvas;
import android.graphics.Color;
import android.media.MediaPlayer;
public class GameMenu extends GameStateInterface
{
// GameState.
protected int GameState = GS_STOPPED;
public GameMenu(Activity activity)
{
super(activity);
}
// Methods.
@Override
public void DrawFrame(Canvas canvas)
{
switch(GameState)
{
case GS_MENU_READY:
{
ShowMenu(canvas);
break;
}
case GS_PAUSED:
{
ShowPauseMenu(canvas);
break;
}
case GS_GAMEOVER:
{
ShowGameOverMenu(canvas);
break;
}
}
}
@Override
public void SendMove(float x, float y, boolean pointerUp)
{
switch(GameState)
{
case GS_MENU_READY:
{
if (!pointerUp)
{
SetGameState(GS_MENU_START, false);
}
break;
}
case GS_PAUSED:
{
if (!pointerUp)
{
SetGameState(GS_RESUME, false);
}
break;
}
case GS_GAMEOVER:
{
SetGameState(GS_MENU_READY, false);
canvasView.postInvalidate();
break;
}
}
}
@Override
public void SetGameState(int gameState, boolean isPostBack)
{
GameState = gameState;
switch(GameState)
{
/*case GS_LOAD:
{
Load();
break;
}*/
/*case GS_READY:
{
canvasView.postInvalidate();
break;
}*/
case GS_PAUSED:
{
canvasView.postInvalidate();
break;
}
case GS_GAMEOVER:
{
canvasView.postInvalidate();
break;
}
}
if (!isPostBack)
canvasView.OnGameStateChanged(GameState);
}
@Override
public void onPause() {
// TODO Auto-generated method stub
}
// Set
@Override
public int GetGameState()
{
return GameState;
}
@Override
public void SetPayedVersion(boolean payedVersion) {
// TODO Auto-generated method stub
}
// Internal.
// Audio.
MediaPlayer mp;
// TODO game state
@Override
public void Load()
{
// Load Bitmap's.
//LoadSprites();
//LoadFont();
// Initlialize.
// Audio
mp = MediaPlayer.create(activity, R.raw.tetris_a);
}
@Override
public void Start()
{
GameState = GS_MENU_READY;
canvasView.postInvalidate();
}
// Draw functions.
private void ShowMenu(Canvas canvas)
{
Rect(canvas, 0f, 160f, 0f, 90f, Color.BLUE);
}
private void ShowPauseMenu(Canvas canvas)
{
Rect(canvas, 0f, 160f, 0f, 90f, Color.RED);
}
private void ShowGameOverMenu(Canvas canvas)
{
Rect(canvas, 0f, 160f, 0f, 90f, Color.parseColor("lime"));
}
@Override
public void SendMove(int angle, int speed) {
// TODO Auto-generated method stub
}
}