From 0d951674df57981e187cbebaf0732d18098bc48c Mon Sep 17 00:00:00 2001 From: ul-sanjeev Date: Fri, 11 Jan 2019 03:04:09 +0530 Subject: [PATCH] fix(layout): Refinement of menu state and playstate for splash screen, lives left and score --- .../sanjeev/storklight/states/MenuState.java | 26 +++++--------- .../sanjeev/storklight/states/PlayState.java | 36 ++++++------------- .../sanjeev/storklight/states/State.java | 2 +- 3 files changed, 20 insertions(+), 44 deletions(-) diff --git a/core/src/com/studio/sanjeev/storklight/states/MenuState.java b/core/src/com/studio/sanjeev/storklight/states/MenuState.java index 611ed4b..a162e91 100644 --- a/core/src/com/studio/sanjeev/storklight/states/MenuState.java +++ b/core/src/com/studio/sanjeev/storklight/states/MenuState.java @@ -8,6 +8,7 @@ import com.badlogic.gdx.scenes.scene2d.Stage; import com.badlogic.gdx.utils.viewport.StretchViewport; import com.badlogic.gdx.utils.viewport.Viewport; +import com.studio.sanjeev.storklight.StorkLightGameClass; /** @@ -24,20 +25,15 @@ public class MenuState extends State { public MenuState(GameStateManager gsm, OrthographicCamera cam, Viewport viewport, Stage stage) { super(gsm,cam, viewport, stage); -// float aspectRatio = (float)Gdx.graphics.getHeight()/(float)Gdx.graphics.getWidth(); -// cam = new OrthographicCamera(); -// viewport = new StretchViewport(100 * aspectRatio,100,cam); -// viewport.apply(); -// cam.position.set(cam.viewportWidth/2,cam.viewportHeight/2,0); - - font = new BitmapFont(Gdx.files.internal("fonts/abel.fnt"),Gdx.files.internal("fonts/abel.png"),false); + font.getData().setScale(0.2f); + background = new Texture("n0.png"); playStork = new Texture("storkmenu.png"); playBtn = new Texture("play.png"); - font.getData().setScale(3); + font.getData().setScale(0.3f); font.setColor(0,0,1,0); font.getRegion().getTexture().setFilter(Texture.TextureFilter.Linear, Texture.TextureFilter.Linear); @@ -51,11 +47,6 @@ public void dispose() { font.dispose(); } - @Override - public void resize(int width, int height) { - cam.position.set(width,height,0); - cam.update(); - } @Override public void handleInput() { @@ -75,13 +66,12 @@ public void update(float dt) { public void render(SpriteBatch sb) { sb.setProjectionMatrix(cam.combined); sb.begin(); - sb.draw(background,0,0, cam.viewportWidth/2,cam.viewportHeight/2); + sb.draw(background,0,0, StorkLightGameClass.WIDTH,StorkLightGameClass.HEIGHT); - sb.draw(playStork,(cam.viewportWidth/2) - (playStork.getWidth()/2),(cam.viewportHeight/2) - (playStork.getHeight()/2) + 120); + sb.draw(playStork,10,10,80,80); sb.draw(playBtn,(cam.viewportWidth/2) - (playBtn.getWidth()/2),(cam.viewportHeight/2) - (playBtn.getHeight()/2) - 150); - sb.end(); - sb.begin(); - font.draw(sb, "StorkLight", cam.viewportWidth/2 - 200, cam.viewportHeight/10); + +// font.draw(sb, "Stork Light", 50, 50); sb.end(); } } diff --git a/core/src/com/studio/sanjeev/storklight/states/PlayState.java b/core/src/com/studio/sanjeev/storklight/states/PlayState.java index dbb578b..55b0707 100644 --- a/core/src/com/studio/sanjeev/storklight/states/PlayState.java +++ b/core/src/com/studio/sanjeev/storklight/states/PlayState.java @@ -5,10 +5,8 @@ import com.badlogic.gdx.graphics.Texture; import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.graphics.g2d.SpriteBatch; -import com.badlogic.gdx.graphics.glutils.ShapeRenderer; import com.badlogic.gdx.scenes.scene2d.Stage; import com.badlogic.gdx.utils.Array; -import com.badlogic.gdx.utils.viewport.StretchViewport; import com.badlogic.gdx.utils.viewport.Viewport; import com.studio.sanjeev.storklight.elements.CollectibleOrbs; import com.studio.sanjeev.storklight.sprites.Stork; @@ -21,7 +19,6 @@ public class PlayState extends State { private Stork stork; private CollectibleOrbs orbs; Array textures = new Array(); - private ShapeRenderer shapeRenderer; private BitmapFont font; private Texture lifeTex; private int score = 0; @@ -30,23 +27,11 @@ public class PlayState extends State { public PlayState(GameStateManager gsm, OrthographicCamera cam, Viewport viewport,Stage stage) { super(gsm,cam,viewport,stage); -// float aspectRatio = (float)Gdx.graphics.getHeight()/(float)Gdx.graphics.getWidth(); -// cam = new OrthographicCamera(); -// viewport = new StretchViewport(100 * aspectRatio,100,cam); -// viewport.apply(); -// cam.position.set(cam.viewportWidth/2,cam.viewportHeight/2,0); - - Gdx.app.debug("Display",Gdx.graphics.getWidth() + " : " + Gdx.graphics.getHeight()); - Gdx.app.debug("CamViewport",cam.viewportWidth + " : " + cam.viewportHeight); - stork = new Stork(0, 50); - -// stage = new Stage(); - shapeRenderer = new ShapeRenderer(); - shapeRenderer.setProjectionMatrix(cam.combined); lifeTex = new Texture(Gdx.files.internal("lifes.png")); orbs = new CollectibleOrbs(cam); font = new BitmapFont(Gdx.files.internal("fonts/abel.fnt"),Gdx.files.internal("fonts/abel.png"),false); + font.getData().setScale(0.15f); textures.add(new Texture("n0.png")); textures.get(textures.size - 1).setWrap(Texture.TextureWrap.ClampToEdge, Texture.TextureWrap.ClampToEdge); @@ -55,7 +40,7 @@ public PlayState(GameStateManager gsm, OrthographicCamera cam, Viewport viewport textures.get(textures.size - 1).setWrap(Texture.TextureWrap.MirroredRepeat, Texture.TextureWrap.MirroredRepeat); } - ParallaxBackground parallaxBackground = new ParallaxBackground(textures); + ParallaxBackground parallaxBackground = new ParallaxBackground(textures,cam); parallaxBackground.setSize(cam.viewportWidth,cam.viewportHeight); parallaxBackground.setSpeed(1); stage.addActor(parallaxBackground); @@ -79,23 +64,25 @@ public void update(float dt) { @Override public void render(SpriteBatch sb) { - stage.getViewport().apply(); - stage.draw(); sb.setProjectionMatrix(cam.combined); + + stage.draw(); + sb.begin(); - sb.draw(stork.getTextureRegion(),stork.getPosition().x,stork.getPosition().y); + sb.draw(stork.getTextureRegion(),stork.getPosition().x,stork.getPosition().y,10,10); orbs.render(sb); sb.end(); + sb.begin(); - font.draw(sb,"Score : "+ getScore(), 100 - 100/6 , 100 - 100/10); + font.draw(sb," S c o r e : "+ getScore(), 55 , 95); sb.end(); + sb.begin(); for(int i =1; i <= lives; i++){ - sb.draw(lifeTex, lifeTex.getWidth()*i - lifeTex.getWidth() + 20 , 100 - lifeTex.getHeight() - Gdx.graphics.getHeight()/10,lifeTex.getWidth(),lifeTex.getHeight()); + sb.draw(lifeTex, 4*i - 4 + 2 , 100 - 10,4,6); } sb.end(); - } @Override @@ -105,11 +92,10 @@ public void dispose() { font.dispose(); } - - public void CollisionCheckMain(){ int temp; temp = orbs.checkCollision(stork.getBoundingRectangle()); +// Gdx.app.debug("collision",temp + ":" + stork.getBoundingRectangle()); if(temp==1){ score +=temp; if (score%20==0){ diff --git a/core/src/com/studio/sanjeev/storklight/states/State.java b/core/src/com/studio/sanjeev/storklight/states/State.java index bb4cfc3..165c65f 100644 --- a/core/src/com/studio/sanjeev/storklight/states/State.java +++ b/core/src/com/studio/sanjeev/storklight/states/State.java @@ -10,7 +10,7 @@ * Created by sanjeev309 on 3/18/18. */ -public abstract class State extends ApplicationAdapter { +public abstract class State{ protected GameStateManager gsm; protected OrthographicCamera cam;