diff --git a/core/src/com/mygdx/game/GameScreens/GameIntro.java b/core/src/com/mygdx/game/GameScreens/GameIntro.java index b9c836afcad4528eeb292953c5d998e4c114b24e..970757ac2ccec628370e4f823be3bf7c2a41a20a 100644 --- a/core/src/com/mygdx/game/GameScreens/GameIntro.java +++ b/core/src/com/mygdx/game/GameScreens/GameIntro.java @@ -1,12 +1,28 @@ package com.mygdx.game.GameScreens; +import com.badlogic.gdx.graphics.Color; +import com.badlogic.gdx.scenes.scene2d.ui.Label; +import com.mygdx.game.singletons.FontManager; + /** * Intro screen showing a preview of the game for a few seconds */ public class GameIntro extends GameScreen { + @Override public void buildStage() { + /*Label l = new Label("Intro screen", FontManager.getInstance().getLabelStyle(Color.BLACK)); + l.setPosition(50, 50); + addActor(l);*/ + } + + @Override + public void render(float delta) { + + // Add logic + // Call the drawing methods of the parent to render the screen + super.render(delta); } } diff --git a/core/src/com/mygdx/game/GameScreens/GameScreen.java b/core/src/com/mygdx/game/GameScreens/GameScreen.java index ee4b330593cdde3a88c594fa13233934751da853..cf9454a375502486e718f94ef6a1c6a047aed5a9 100644 --- a/core/src/com/mygdx/game/GameScreens/GameScreen.java +++ b/core/src/com/mygdx/game/GameScreens/GameScreen.java @@ -22,11 +22,11 @@ public abstract class GameScreen extends Stage implements Screen { public abstract void buildStage(); @Override - public void render(float delta) { + public void render(float delta) + { // Clear screen - Gdx.gl.glClearColor(1, 0, 0, 1); + Gdx.gl.glClearColor(255, 0, 0, 1); Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); - // Calling to Stage methods super.act(delta); super.draw(); diff --git a/core/src/com/mygdx/game/GameScreens/GameScreenManager.java b/core/src/com/mygdx/game/GameScreens/GameScreenManager.java index 83785a3c192f29256a88f0b6d74c8c96f6e572cf..802b8e783cd1d1bf8fbd96507e22debea64f29fd 100644 --- a/core/src/com/mygdx/game/GameScreens/GameScreenManager.java +++ b/core/src/com/mygdx/game/GameScreens/GameScreenManager.java @@ -45,9 +45,11 @@ public class GameScreenManager { public void showGameScreen(GameScreenEnum gameScreen, Object... args) { Screen oldScreen = game.getScreen(); + if(oldScreen != null) oldScreen.hide(); GameScreen newScreen = gameScreen.getScreen(args); newScreen.buildStage(); game.setScreen(newScreen); + newScreen.show(); if(oldScreen != null) oldScreen.dispose(); } diff --git a/core/src/com/mygdx/game/TableFootball.java b/core/src/com/mygdx/game/TableFootball.java index 91c8268ad734d56bfcb55b8cef78ff18b51e6033..30a8f5ced6894887d65df39b06dabe706431d234 100644 --- a/core/src/com/mygdx/game/TableFootball.java +++ b/core/src/com/mygdx/game/TableFootball.java @@ -22,10 +22,11 @@ public class TableFootball extends Game { @Override public void render () { + if(screen != null) screen.render(Gdx.graphics.getDeltaTime()); } @Override public void dispose () { - + int a = 10; } } diff --git a/core/src/com/mygdx/game/singletons/FontManager.java b/core/src/com/mygdx/game/singletons/FontManager.java new file mode 100644 index 0000000000000000000000000000000000000000..6f34b9f47aba7dc8e7fafebda1ad37c490856f4e --- /dev/null +++ b/core/src/com/mygdx/game/singletons/FontManager.java @@ -0,0 +1,49 @@ +package com.mygdx.game.singletons; + +import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.assets.AssetManager; +import com.badlogic.gdx.graphics.Color; +import com.badlogic.gdx.graphics.g2d.BitmapFont; +import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator; +import com.badlogic.gdx.scenes.scene2d.ui.Label; + +public class FontManager +{ + private static FontManager fm = new FontManager(); + + private AssetManager am; + + private FontManager() + { + am = new AssetManager(); + } + + public static FontManager getInstance() + { + return fm; + } + + public BitmapFont generateFont() + { + FreeTypeFontGenerator generator = new FreeTypeFontGenerator(Gdx.files.internal("HFF Ice Bergman.ttf")); + FreeTypeFontGenerator.FreeTypeFontParameter parameter = new FreeTypeFontGenerator.FreeTypeFontParameter(); + parameter.size = 30; + parameter.borderWidth = 1; + parameter.color = Color.BLUE; + parameter.shadowOffsetX = 3; + parameter.shadowOffsetY = 3; + parameter.shadowColor = new Color(0, 0.5f, 0, 0.75f); + BitmapFont font = generator.generateFont(parameter); // font size 24 pixels + generator.dispose(); + + return font; + } + + public Label.LabelStyle getLabelStyle(Color fontColor) + { + Label.LabelStyle l = new Label.LabelStyle(); + l.font = generateFont(); + l.fontColor = fontColor; + return l; + } +}