Skip to content
Snippets Groups Projects
Commit 1cd7c9c1 authored by Petter Selfors Rølvåg's avatar Petter Selfors Rølvåg
Browse files

Merge branch 'Pipe-and-Filter' into 'dev'

Pipe and filter

See merge request !12
parents 1f0ef87d 73d810e0
No related branches found
No related tags found
2 merge requests!13Dev,!12Pipe and filter
CheckersClient/android/assets/Game/1x/StarPiece_BaseBrd.png

16.9 KiB | W: | H:

CheckersClient/android/assets/Game/1x/StarPiece_BaseBrd.png

17.2 KiB | W: | H:

CheckersClient/android/assets/Game/1x/StarPiece_BaseBrd.png
CheckersClient/android/assets/Game/1x/StarPiece_BaseBrd.png
CheckersClient/android/assets/Game/1x/StarPiece_BaseBrd.png
CheckersClient/android/assets/Game/1x/StarPiece_BaseBrd.png
  • 2-up
  • Swipe
  • Onion skin
CheckersClient/android/assets/Game/1x/StarPiece_HeadBrd.png

10.9 KiB | W: | H:

CheckersClient/android/assets/Game/1x/StarPiece_HeadBrd.png

10.1 KiB | W: | H:

CheckersClient/android/assets/Game/1x/StarPiece_HeadBrd.png
CheckersClient/android/assets/Game/1x/StarPiece_HeadBrd.png
CheckersClient/android/assets/Game/1x/StarPiece_HeadBrd.png
CheckersClient/android/assets/Game/1x/StarPiece_HeadBrd.png
  • 2-up
  • Swipe
  • Onion skin
CheckersClient/android/assets/Game/1x/StarPiece_MastBrd.png

1.74 KiB | W: | H:

CheckersClient/android/assets/Game/1x/StarPiece_MastBrd.png

1.67 KiB | W: | H:

CheckersClient/android/assets/Game/1x/StarPiece_MastBrd.png
CheckersClient/android/assets/Game/1x/StarPiece_MastBrd.png
CheckersClient/android/assets/Game/1x/StarPiece_MastBrd.png
CheckersClient/android/assets/Game/1x/StarPiece_MastBrd.png
  • 2-up
  • Swipe
  • Onion skin
......@@ -14,6 +14,7 @@ import com.mygdx.game.controllers.NetworkController;
import com.mygdx.game.controllers.PlayerController;
import com.mygdx.game.views.GameViewManager;
import com.mygdx.game.views.LoadingView;
import com.mygdx.game.views.PlayView;
import java.util.ArrayList;
......@@ -34,7 +35,7 @@ public class UniCheckersClient extends ApplicationAdapter {
@Override
public void create () {
Gdx.gl.glClearColor(1, 1, 1, 1);
Gdx.gl.glClearColor(0, 0, 1, 1);
viewport = new FitViewport(Gdx.graphics.getWidth(), Gdx.graphics.getHeight());
stage = new Stage(viewport);
......@@ -53,7 +54,10 @@ public class UniCheckersClient extends ApplicationAdapter {
skin = new Skin(Gdx.files.internal("UISkins/glassy/skin/glassy-ui.json"));
gvm = new GameViewManager();
gvm.push(new LoadingView(gvm, playerController, assetManager, stage, skin));
//gvm.push(new PlayView(gvm, playerController, assetManager, stage, skin));
}
......
......@@ -4,13 +4,18 @@ import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.Input;
import com.badlogic.gdx.assets.AssetManager;
import com.badlogic.gdx.audio.Sound;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.BitmapFont;
import com.badlogic.gdx.graphics.g2d.Sprite;
import com.badlogic.gdx.graphics.g2d.SpriteBatch;
import com.badlogic.gdx.scenes.scene2d.Stage;
import com.badlogic.gdx.scenes.scene2d.ui.Skin;
import com.mygdx.game.controllers.PlayerController;
import com.mygdx.game.views.enums.MenuAssets;
import com.mygdx.game.views.enums.PlayAssets;
import com.mygdx.game.views.tokens.PlayerAvatar;
import com.mygdx.game.views.tokens.StarPiece;
import java.util.ArrayList;
......@@ -19,12 +24,40 @@ public class PlayView extends View{
private Texture background;
protected PlayView(GameViewManager gvm, PlayerController playerController, AssetManager assetManager, Stage stage, Skin skin, ArrayList<PlayerAvatar> availableAvatars) {
public PlayView(GameViewManager gvm, PlayerController playerController, AssetManager assetManager, Stage stage, Skin skin, ArrayList<PlayerAvatar> availableAvatars) {
super(gvm, playerController, assetManager, stage, skin);
background = new Texture ("Game/GameBoard/1x/GameBoard@1x.png");
}
public PlayView(GameViewManager gvm, PlayerController playerController, AssetManager assetManager, Stage stage, Skin skin) {
super(gvm, playerController, assetManager, stage, skin);
for(PlayAssets asset : PlayAssets.values()) {
assetManager.load(asset.path, asset.classType);
}
assetManager.finishLoading();
starPieceBase = (Texture) assetManager.get(PlayAssets.STAR_PIECE_BASE.path, PlayAssets.STAR_PIECE_BASE.classType);
starPieceBaseBorder = (Texture) assetManager.get(PlayAssets.STAR_PIECE_BASE_BORDER.path, PlayAssets.STAR_PIECE_BASE_BORDER.classType);
starPieceMast = (Texture) assetManager.get(PlayAssets.STAR_PIECE_MAST.path, PlayAssets.STAR_PIECE_MAST.classType);
starPieceMastBorder = (Texture) assetManager.get(PlayAssets.STAR_PIECE_MAST_BORDER.path, PlayAssets.STAR_PIECE_MAST_BORDER.classType);
starPieceHead = (Texture) assetManager.get(PlayAssets.STAR_PIECE_HEAD.path, PlayAssets.STAR_PIECE_HEAD.classType);
starPieceHeadBorder = (Texture) assetManager.get(PlayAssets.STAR_PIECE_HEAD_BORDER.path, PlayAssets.STAR_PIECE_HEAD_BORDER.classType);
piece = new StarPiece(0 , 0, Color.RED, starPieceBase, starPieceBaseBorder, starPieceMast, starPieceMastBorder, starPieceHead, starPieceHeadBorder);
piece.setRotateHead(true);
}
StarPiece piece;
Texture starPieceBase;
Texture starPieceBaseBorder;
Texture starPieceMast;
Texture starPieceMastBorder;
Texture starPieceHead;
Texture starPieceHeadBorder;
private void isGameOver(){
boolean someCondition = false;
if (someCondition){
......@@ -45,11 +78,15 @@ public class PlayView extends View{
@Override
public void render(float dt) {
stage.getBatch().begin();
stage.getBatch().draw(background, 0, 0);
stage.getBatch().end();
stage.draw();
piece.draw(stage.getBatch());
piece.setPosition(Gdx.input.getX(), Gdx.input.getY());
}
@Override
......
......@@ -6,10 +6,12 @@ import com.badlogic.gdx.graphics.Texture;
public enum PlayAssets {
GAME_BOARD("Game/GameBoard/1x/GameBoard@1x.png", Texture.class),
BALL("Game/1x/Ball.png", Texture.class),
LOOP_AUDIO("Game/Audio/GameLoop.mp3",Sound.class),
TRANSITION_AUDIO("Game/Audio/TransitionFX.mp3",Sound.class);
STAR_PIECE_BASE("Game/1x/StarPiece_Base.png", Texture.class),
STAR_PIECE_BASE_BORDER("Game/1x/StarPiece_BaseBrd.png", Texture.class),
STAR_PIECE_HEAD("Game/1x/StarPiece_Head.png", Texture.class),
STAR_PIECE_HEAD_BORDER("Game/1x/StarPiece_HeadBrd.png", Texture.class),
STAR_PIECE_MAST("Game/1x/StarPiece_Mast.png", Texture.class),
STAR_PIECE_MAST_BORDER("Game/1x/StarPiece_MastBrd.png", Texture.class);
public final String path;
public final Class classType;
......
package com.mygdx.game.views.tokens;
import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.Texture;
import com.badlogic.gdx.graphics.g2d.Batch;
import com.badlogic.gdx.graphics.g2d.Sprite;
public class StarPiece {
private final Color color;
private Texture base;
private Texture baseBorder;
private float xPos;
private float yPos;
private Texture mast;
private Texture mastBorder;
private Texture head;
private Texture headBorder;
private boolean rotateHead;
private float headRotation = 1;
public StarPiece (float xPos, float yPos, Color color, Texture base, Texture baseBorder, Texture mast, Texture mastBorder, Texture head, Texture headBorder){
this.xPos = xPos;
this.yPos = yPos;
this.color = color;
this.base = base;
this.baseBorder = baseBorder;
this.mast = mast;
this.mastBorder = mastBorder;
this.head = head;
this.headBorder = headBorder;
this.rotateHead=false;
}
public void draw(Batch sb){
Color sbColor = sb.getColor();
sb.begin();
sb.setColor(color);
sb.draw(base, xPos, yPos);
sb.setColor(Color.BLACK);
sb.draw(baseBorder, xPos, yPos);
sb.setColor(color);
sb.draw(mast, xPos+base.getWidth()/2-mast.getWidth()/2, yPos+base.getHeight()*0.35f);
sb.setColor(Color.BLACK);
sb.draw(mastBorder, xPos+base.getWidth()/2-mast.getWidth()/2, yPos+base.getHeight()*0.35f);
if(rotateHead){
sb.setColor(color);
sb.draw(head,
xPos+base.getWidth()/2-head.getWidth()/2,
yPos+base.getHeight()-head.getWidth()/2,
head.getWidth()/2,
head.getHeight()/2,
head.getWidth(),
head.getHeight(),
1f,
1f,
headRotation++,
0,
0,
head.getWidth(),
head.getHeight(),
false,
false);
sb.setColor(Color.BLACK);
sb.draw(headBorder,
xPos+base.getWidth()/2-head.getWidth()/2,
yPos+base.getHeight()-head.getWidth()/2,
head.getWidth()/2,
head.getHeight()/2,
head.getWidth(),
head.getHeight(),
1f,
1f,
headRotation++,
0,
0,
head.getWidth(),
head.getHeight(),
false,
false);
}
else{
sb.setColor(color);
sb.draw(head, xPos+base.getWidth()/2-head.getWidth()/2, yPos+base.getHeight()-head.getWidth()/2);
sb.setColor(Color.BLACK);
sb.draw(headBorder, xPos+base.getWidth()/2-head.getWidth()/2, yPos+base.getHeight()-head.getWidth()/2);
}
sb.setColor(sbColor);
sb.end();
}
public void setRotateHead(boolean rotateHead){
this.rotateHead = rotateHead;
}
public void setX(float xPos){
this.xPos = xPos;
}
public void setY(float yPos){
this.yPos = yPos;
}
public float getX(){
return xPos;
}
public float getY(){
return yPos;
}
public void setPosition(float xPos, float yPos){
this.xPos = xPos;
this.yPos = yPos;
}
}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment