Permalink
Browse files

Merge branch 'creation-screen' into ingame

Conflicts:
	Tamagotchi/src/com/redditandroiddevelopers/tamagotchi/screens/CreatureCreationScreen.java
	Tamagotchi/src/com/redditandroiddevelopers/tamagotchi/utils/FontHelper.java
  • Loading branch information...
2 parents 7616253 + 3811c90 commit ca18ff9aa5736cff50cc71fea4c2bb3aee215334 @member68 member68 committed May 13, 2012
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
@@ -17,3 +17,36 @@ PetDefault
orig: 249, 181
offset: 0, 0
index: -1
+
+CCButtons1.png
+format: RGBA8888
+filter: Nearest,Nearest
+repeat: none
+MainButtonRemove
+ rotate: false
+ xy: 2, 2
+ size: 55, 55
+ orig: 55, 55
+ offset: 0, 0
+ index: -1
+MainButtonAccept
+ rotate: false
+ xy: 59, 2
+ size: 55, 55
+ orig: 55, 55
+ offset: 0, 0
+ index: -1
+CreateButtonGirl
+ rotate: false
+ xy: 2, 59
+ size: 55, 55
+ orig: 55, 55
+ offset: 0, 0
+ index: -1
+CreateButtonBoy
+ rotate: false
+ xy: 59, 59
+ size: 55, 55
+ orig: 55, 55
+ offset: 0, 0
+ index: -1
@@ -25,7 +25,8 @@
public int logLevel = Application.LOG_DEBUG;
public float stageWidth = 800;
public float stageHeight = 480;
- public Color backgroundColor = new Color((226f / 255), (232f / 255), (254f / 255), 1f);
+ public Color defaultBackgroundColor = new Color(226f / 255f, 232f / 255f, 254f / 255f, 1f);
+ public Color creatureCreationBackgroundColor = new Color(42f / 255f, 42f / 255f, 42f / 255f, 1f);
// Persistence
public CreatureDao creatureDao;
@@ -10,6 +10,7 @@
import com.badlogic.gdx.graphics.OrthographicCamera;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.scenes.scene2d.Stage;
+import com.redditandroiddevelopers.tamagotchi.TamagotchiConfiguration;
import com.redditandroiddevelopers.tamagotchi.TamagotchiGame;
/**
@@ -138,9 +139,15 @@ public void show() {
*/
protected abstract Stage createStage(SpriteBatch batch);
+ /**
+ * Called at the start of every {@code render()}, before {@code update()}
+ * and {@code draw()}. By default, dispatch a {@code gl} call to render a
+ * background color as specified in
+ * {@link TamagotchiConfiguration#defaultBackgroundColor}.
+ */
protected void drawBackground() {
- final Color bgColor = game.config.backgroundColor;
- Gdx.gl.glClearColor(bgColor.r, bgColor.g, bgColor.b, 1);
+ final Color bgc = game.config.defaultBackgroundColor;
+ Gdx.gl.glClearColor(bgc.r, bgc.g, bgc.b, bgc.a);
}
@Override
Oops, something went wrong.

0 comments on commit ca18ff9

Please sign in to comment.