Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Haakon Gunleiksrud
TDT4240_v20_haakon
Commits
afa53a2d
Commit
afa53a2d
authored
Apr 26, 2020
by
Turid Cecilie Dahl
Browse files
Moves GSM out of states
parent
8c5a57f4
Changes
21
Hide whitespace changes
Inline
Side-by-side
frontend/core/src/com/gameware/game/
states/
GameStateManager.java
→
frontend/core/src/com/gameware/game/GameStateManager.java
View file @
afa53a2d
package
com.gameware.game
.states
;
package
com.gameware.game
;
import
com.badlogic.gdx.graphics.g2d.SpriteBatch
;
import
com.gameware.game.states.State
;
import
java.util.Stack
;
...
...
frontend/core/src/com/gameware/game/GameWare.java
View file @
afa53a2d
...
...
@@ -13,7 +13,6 @@ import com.badlogic.gdx.utils.JsonValue;
import
com.gameware.game.models.Game
;
import
com.gameware.game.models.LocalStorage
;
import
com.gameware.game.models.Player
;
import
com.gameware.game.states.GameStateManager
;
import
com.gameware.game.states.menus.LoginState
;
import
com.gameware.game.states.menus.MenuState
;
import
com.gameware.game.states.games.PlayStateUnion
;
...
...
frontend/core/src/com/gameware/game/states/PauseState.java
View file @
afa53a2d
...
...
@@ -4,6 +4,7 @@ import com.badlogic.gdx.Gdx;
import
com.badlogic.gdx.graphics.Color
;
import
com.badlogic.gdx.graphics.Texture
;
import
com.badlogic.gdx.graphics.g2d.SpriteBatch
;
import
com.gameware.game.GameStateManager
;
import
com.gameware.game.GameWare
;
import
com.gameware.game.sprites.pauseStateSprites.ConfirmationBox
;
import
com.gameware.game.sprites.LoadingText
;
...
...
frontend/core/src/com/gameware/game/states/State.java
View file @
afa53a2d
...
...
@@ -5,6 +5,7 @@ import com.badlogic.gdx.audio.Sound;
import
com.badlogic.gdx.graphics.g2d.SpriteBatch
;
import
com.badlogic.gdx.scenes.scene2d.Stage
;
import
com.badlogic.gdx.scenes.scene2d.ui.Skin
;
import
com.gameware.game.GameStateManager
;
import
com.gameware.game.GameWare
;
/*
...
...
frontend/core/src/com/gameware/game/states/games/BubbleWrapState.java
View file @
afa53a2d
...
...
@@ -4,7 +4,7 @@ import com.badlogic.gdx.Gdx;
import
com.badlogic.gdx.graphics.Texture
;
import
com.badlogic.gdx.graphics.g2d.SpriteBatch
;
import
com.gameware.game.sprites.bubbleWrapSprites.Bubble
;
import
com.gameware.game.
states.
GameStateManager
;
import
com.gameware.game.GameStateManager
;
import
java.util.ArrayList
;
...
...
frontend/core/src/com/gameware/game/states/games/ColorRushState.java
View file @
afa53a2d
...
...
@@ -4,7 +4,7 @@ import com.badlogic.gdx.graphics.Texture;
import
com.badlogic.gdx.graphics.g2d.SpriteBatch
;
import
com.gameware.game.sprites.colorRushSprites.ColorRushButton
;
import
com.gameware.game.sprites.colorRushSprites.ColorRushTarget
;
import
com.gameware.game.
states.
GameStateManager
;
import
com.gameware.game.GameStateManager
;
import
java.util.ArrayList
;
import
java.util.Collections
;
...
...
frontend/core/src/com/gameware/game/states/games/FruitSlicerState.java
View file @
afa53a2d
...
...
@@ -8,7 +8,7 @@ import com.badlogic.gdx.math.Vector3;
import
com.gameware.game.GameWare
;
import
com.gameware.game.sprites.fruitSlicerSprites.Fruit
;
import
com.gameware.game.sprites.fruitSlicerSprites.SlicingCircle
;
import
com.gameware.game.
states.
GameStateManager
;
import
com.gameware.game.GameStateManager
;
import
java.util.ArrayList
;
import
java.util.List
;
...
...
frontend/core/src/com/gameware/game/states/games/PlayStateUnion.java
View file @
afa53a2d
...
...
@@ -15,7 +15,7 @@ import com.gameware.game.models.Tournament;
import
com.gameware.game.sprites.LoadingText
;
import
com.gameware.game.sprites.PauseButton
;
import
com.gameware.game.states.menus.FinishedTournamentState
;
import
com.gameware.game.
states.
GameStateManager
;
import
com.gameware.game.GameStateManager
;
import
com.gameware.game.states.PauseState
;
import
com.gameware.game.states.menus.ScoreState
;
import
com.gameware.game.states.menus.SinglePlayerSelectGameState
;
...
...
frontend/core/src/com/gameware/game/states/menus/CreateJoinTournamentState.java
View file @
afa53a2d
...
...
@@ -21,7 +21,7 @@ import com.gameware.game.models.Alert;
import
com.gameware.game.models.Round
;
import
com.gameware.game.models.Tournament
;
import
com.gameware.game.sprites.LoadingText
;
import
com.gameware.game.
states.
GameStateManager
;
import
com.gameware.game.GameStateManager
;
import
java.io.IOException
;
import
java.util.ArrayList
;
...
...
frontend/core/src/com/gameware/game/states/menus/CreateNewTournamentState.java
View file @
afa53a2d
...
...
@@ -22,7 +22,7 @@ import com.gameware.game.models.Game;
import
com.gameware.game.models.Round
;
import
com.gameware.game.models.Tournament
;
import
com.gameware.game.sprites.LoadingText
;
import
com.gameware.game.
states.
GameStateManager
;
import
com.gameware.game.GameStateManager
;
import
java.io.IOException
;
import
java.util.ArrayList
;
...
...
frontend/core/src/com/gameware/game/states/menus/FinishedTournamentState.java
View file @
afa53a2d
...
...
@@ -14,7 +14,7 @@ import com.gameware.game.GameWare;
import
com.gameware.game.QueryIntermediate
;
import
com.gameware.game.models.Point
;
import
com.gameware.game.models.Tournament
;
import
com.gameware.game.
states.
GameStateManager
;
import
com.gameware.game.GameStateManager
;
import
java.util.ArrayList
;
import
java.util.List
;
...
...
frontend/core/src/com/gameware/game/states/menus/LoginState.java
View file @
afa53a2d
...
...
@@ -14,7 +14,7 @@ import com.gameware.game.GameWare;
import
com.gameware.game.QueryIntermediate
;
import
com.gameware.game.models.Player
;
import
com.gameware.game.sprites.LoadingText
;
import
com.gameware.game.
states.
GameStateManager
;
import
com.gameware.game.GameStateManager
;
import
java.io.IOException
;
import
java.util.NoSuchElementException
;
...
...
frontend/core/src/com/gameware/game/states/menus/MenuState.java
View file @
afa53a2d
...
...
@@ -14,7 +14,7 @@ import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
import
com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable
;
import
com.gameware.game.GameWare
;
import
com.gameware.game.sprites.LoadingText
;
import
com.gameware.game.
states.
GameStateManager
;
import
com.gameware.game.GameStateManager
;
/*
The main menu state, where players can either choose sinple-player, multiplayer, high scores,
...
...
frontend/core/src/com/gameware/game/states/menus/MenuStateUnion.java
View file @
afa53a2d
...
...
@@ -17,7 +17,7 @@ import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
import
com.badlogic.gdx.scenes.scene2d.utils.TextureRegionDrawable
;
import
com.badlogic.gdx.utils.Align
;
import
com.gameware.game.GameWare
;
import
com.gameware.game.
states.
GameStateManager
;
import
com.gameware.game.GameStateManager
;
import
com.gameware.game.states.State
;
...
...
frontend/core/src/com/gameware/game/states/menus/OptionsState.java
View file @
afa53a2d
...
...
@@ -10,7 +10,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
import
com.badlogic.gdx.scenes.scene2d.utils.ClickListener
;
import
com.badlogic.gdx.utils.Scaling
;
import
com.gameware.game.GameWare
;
import
com.gameware.game.
states.
GameStateManager
;
import
com.gameware.game.GameStateManager
;
/*
State where players can edit the options of the game
...
...
frontend/core/src/com/gameware/game/states/menus/ScoreState.java
View file @
afa53a2d
...
...
@@ -10,7 +10,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Label;
import
com.badlogic.gdx.scenes.scene2d.ui.Table
;
import
com.badlogic.gdx.utils.Align
;
import
com.gameware.game.GameWare
;
import
com.gameware.game.
states.
GameStateManager
;
import
com.gameware.game.GameStateManager
;
import
com.gameware.game.states.State
;
/*
...
...
frontend/core/src/com/gameware/game/states/menus/SinglePlayerSelectGameState.java
View file @
afa53a2d
...
...
@@ -11,8 +11,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.TextButton;
import
com.badlogic.gdx.scenes.scene2d.utils.ClickListener
;
import
com.gameware.game.GameWare
;
import
com.gameware.game.models.Game
;
import
com.gameware.game.states.GameStateManager
;
import
com.gameware.game.states.State
;
import
com.gameware.game.GameStateManager
;
import
com.gameware.game.states.games.PlayStateUnion
;
import
java.io.IOException
;
...
...
@@ -117,7 +116,7 @@ public class SinglePlayerSelectGameState extends MenuStateUnion {
return
backBtn
;
}
private
void
handleGameBtnClick
(
State
state
){
private
void
handleGameBtnClick
(
Play
State
Union
state
){
if
(
GameWare
.
getInstance
().
isSoundEffectsOn
()){
buttonPressSound
.
play
();
}
gsm
.
set
(
state
);
}
...
...
@@ -137,7 +136,7 @@ public class SinglePlayerSelectGameState extends MenuStateUnion {
@Override
public
void
clicked
(
InputEvent
event
,
float
x
,
float
y
)
{
Map
<
String
,
PlayStateUnion
>
map
=
GameWare
.
getInstance
().
getGameIdToPlayState
();
State
s
=
map
.
get
(
game
.
getId
());
Play
State
Union
s
=
map
.
get
(
game
.
getId
());
handleGameBtnClick
(
s
);
};
}
...
...
frontend/core/src/com/gameware/game/states/menus/TournamentHighScoreState.java
View file @
afa53a2d
...
...
@@ -13,7 +13,7 @@ import com.gameware.game.QueryIntermediate;
import
com.gameware.game.models.Point
;
import
com.gameware.game.models.Round
;
import
com.gameware.game.models.Tournament
;
import
com.gameware.game.
states.
GameStateManager
;
import
com.gameware.game.GameStateManager
;
import
java.util.ArrayList
;
import
java.util.List
;
...
...
frontend/core/src/com/gameware/game/states/menus/ViewHighScoreForGameState.java
View file @
afa53a2d
...
...
@@ -12,7 +12,7 @@ import com.gameware.game.GameWare;
import
com.gameware.game.QueryIntermediate
;
import
com.gameware.game.models.Game
;
import
com.gameware.game.models.Highscore
;
import
com.gameware.game.
states.
GameStateManager
;
import
com.gameware.game.GameStateManager
;
import
java.io.IOException
;
import
java.util.ArrayList
;
...
...
frontend/core/src/com/gameware/game/states/menus/ViewHighScoreState.java
View file @
afa53a2d
...
...
@@ -17,7 +17,7 @@ import com.badlogic.gdx.scenes.scene2d.utils.ClickListener;
import
com.gameware.game.GameWare
;
import
com.gameware.game.models.Game
;
import
com.gameware.game.sprites.LoadingText
;
import
com.gameware.game.
states.
GameStateManager
;
import
com.gameware.game.GameStateManager
;
import
java.io.IOException
;
...
...
Prev
1
2
Next
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment