Merge pull request #23 from slo248/hotfix/feat/CCR-20

hotfix/feat/CCR-20

Class-Diagrams/Lane.drawio

@@ -75,6 +75,9 @@
                 <mxCell id="279" value="- &amp;lt;&amp;lt;virtual&amp;gt;&amp;gt; updateCurrent(sf::Time): void" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="261" vertex="1">
                     <mxGeometry y="506" width="361.94" height="26" as="geometry"/>
                 </mxCell>
+                <mxCell id="279" value="- &amp;lt;&amp;lt;virtual&amp;gt;&amp;gt; updateCurrent(sf::Time): void" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="261" vertex="1">
+                    <mxGeometry y="476" width="361.94" height="26" as="geometry"/>
+                </mxCell>
                 <mxCell id="280" value="- &amp;lt;&amp;lt;virtual, const&amp;gt;&amp;gt; drawCurrent(sf::RenderTarget&amp;amp;, &lt;br&gt;&lt;span style=&quot;white-space: pre;&quot;&gt;&#9;&lt;/span&gt;&lt;span style=&quot;white-space: pre;&quot;&gt;&#9;&lt;/span&gt;&lt;span style=&quot;white-space: pre;&quot;&gt;&#9;&lt;/span&gt;&lt;span style=&quot;white-space: pre;&quot;&gt;&#9;&lt;span style=&quot;white-space: pre;&quot;&gt;&#9;&lt;span style=&quot;white-space: pre;&quot;&gt;&#9;&lt;/span&gt; &lt;/span&gt; &lt;/span&gt;&amp;nbsp; &amp;nbsp;sf::RenderStates): void" style="text;strokeColor=none;fillColor=none;align=left;verticalAlign=top;spacingLeft=4;spacingRight=4;overflow=hidden;rotatable=0;points=[[0,0.5],[1,0.5]];portConstraint=eastwest;whiteSpace=wrap;html=1;" parent="261" vertex="1">
                     <mxGeometry y="532" width="361.94" height="38" as="geometry"/>
                 </mxCell>

data/ranking.txt

@@ -0,0 +1 @@
+

data/setting.txt

@@ -0,0 +1,4 @@
+22
+18
+0
+3

include/Animation.hpp

@@ -11,7 +11,10 @@ class Animation : public sf::Transformable, public sf::Drawable {
     typedef std::unique_ptr<Animation> Ptr;
 
    public:
-    Animation(const sf::Texture& texture, sf::Vector2i frameSize, int numFrame);
+    Animation(
+        const sf::Texture& texture, sf::Vector2i frameSize,
+        bool isTransparent = false
+    );
 
     void setRepeat(bool flag);
     void setDuration(sf::Time t);
@@ -33,6 +36,7 @@ class Animation : public sf::Transformable, public sf::Drawable {
    private:
     sf::Sprite mSprite;
     sf::IntRect mStartRect;
+    sf::IntRect mDefaultRect;
     sf::Time mElapsedTime;
     sf::Time mTotalElapsedTime;
     sf::Time mDuration;

include/AnimationList.hpp

@@ -24,10 +24,9 @@ class AnimationList : public sf::Transformable, public sf::Drawable {
     void draw(sf::RenderTarget& target, sf::RenderStates states) const;
 
    private:
+    bool mRepeat;
     int mCurAnimation;
     std::vector<Animation::Ptr> mAnimations;
-
-    bool mRepeat;
 };
 
 #endif  // ANIMATION_LIST_HPP

include/Application.hpp

@@ -0,0 +1,41 @@
+#ifndef APPLICATION_HPP
+#define APPLICATION_HPP
+
+#include "MusicPlayer.hpp"
+#include "Player.hpp"
+#include "ResourceHolder.hpp"
+#include "ResourceIdentifiers.hpp"
+#include "SoundEffectPlayer.hpp"
+#include <SFML/Graphics/RenderWindow.hpp>
+#include <SFML/System/Time.hpp>
+
+#include "StateStack.hpp"
+
+class Application {
+   public:
+    Application();
+    ~Application();
+    void run();
+
+   private:
+    void processInput();
+    void update(sf::Time dt);
+    void render();
+
+    void registerStates();
+    State::Context initContext();
+
+   private:
+    const sf::Time TimePerFrame = DEFAULT_TIME_PER_FRAME;
+
+    sf::RenderWindow mWindow;
+    TextureHolder mTextures;
+    FontHolder mFonts;
+    MusicPlayer mMusics;
+    SoundEffectPlayer mSoundEffects;
+    Player mPlayer;
+    std::vector<int> mHighScores;
+    StateStack mStateStack;
+};
+
+#endif

include/Button.hpp

@@ -20,31 +20,38 @@ class Button : public Component {
 
    public:
     Button(
-        State::Context context, Textures::ID button,
+        State::Context& context, Textures::ID button,
         sf::Vector2f position = sf::Vector2f(0.f, 0.f), bool is2Mode = false
     );
     void setCallback(Callback callback);
-    void setToggle(bool flag);
+    void setText(
+        const std::string& text, const std::string& hexCode, int characterSize,
+        sf::Vector2f position, Fonts::ID font = Fonts::Main
+    );
 
-    virtual bool isMouseOver(const sf::RenderWindow& window) const;
-    virtual void select();
-    virtual void deselect();
+    virtual void select() override;
+    virtual void deselect() override;
 
-    virtual void handleEvent(const sf::Event& event);
+    virtual void handleEvent(const sf::Event& event) override;
 
    private:
     virtual void draw(sf::RenderTarget& target, sf::RenderStates states) const;
+    void callBack();
     void changeSize(Size buttonSize);
     void changeTexture(Mode buttonMode);
+    bool isMouseOver(const sf::RenderWindow& window) const;
 
    private:
     Callback mCallback;
     sf::Sprite mSprite;
+    sf::Text mText;
+    sf::Vector2f originalPosition;
+    sf::Vector2f textOriginalPosition;
+    sf::FloatRect originalSize;
+    State::Context* mContext;
     bool mIsToggle;
     bool mIsOn;
     bool mIs2Mode;
-    State::Context mContext;
-    sf::Vector2f originalPosition;
 };
 
 #endif

include/ChooseModeState.hpp

@@ -1,20 +1,20 @@
 #ifndef CHOOSE_MODE_STATE_HPP
 #define CHOOSE_MODE_STATE_HPP
 
-
 #include "Button.hpp"
 #include "State.hpp"
 
 class ChooseModeState : public State {
    public:
-    ChooseModeState(StateStack& stack, Context context, int mode = 0);
+    ChooseModeState(StateStack& stack, Context& context);
 
-    virtual void draw();
-    virtual bool update(sf::Time dt);
+    virtual void draw() override;
+    virtual bool update(sf::Time dt) override;
     virtual bool handleEvent(const sf::Event& event);
 
    private:
     sf::Sprite mBackgroundSprite;
+    Config::ChooseModeState::Mode mMode;
 };
 
 #endif

include/Component.hpp

@@ -33,7 +33,6 @@ class Component : public sf::Drawable,
     virtual void deselect();
 
     virtual bool isActive() const;
-    virtual bool isMouseOver(const sf::RenderWindow& window) const;
     virtual void handleEvent(const sf::Event& event) = 0;
 
    protected:

include/Config.hpp

@@ -1,23 +1,41 @@
 #ifndef CONFIG_HPP
 #define CONFIG_HPP
 
+#define SAVED_GAME_SURVIVAL_PATH "data/survival.txt"
+#define SAVED_GAME_L1_PATH "data/level1.txt"
+#define SAVED_GAME_L2_PATH "data/level2.txt"
+#define SAVED_GAME_L3_PATH "data/level3.txt"
+#define SAVED_GAME_L4_PATH "data/level4.txt"
+#define SAVED_GAME_L5_PATH "data/level5.txt"
+
+#define RANKING_PATH "data/ranking.txt"
+#define SETTING_PATH "data/setting.txt"
+
+#define DEFAULT_PLAYER_SLOT 6
+#define DEFAULT_RANKING_SLOTS 5
+#define NUMBER_OF_SKINS 6
+
 #define DEFAULT_CELLS_PER_LANE 14
 #define DEFAULT_CELL_LENGTH 64.f
 #define DEFAULT_HALF_CELL_LENGTH 32.f
+#define DEFAULT_SCREEN_WIDTH 896.f
+#define DEFAULT_SCREEN_HEIGHT 640.f
 #define DEFAULT_CELL_RECT \
     sf::IntRect(0, 0, DEFAULT_CELL_LENGTH, DEFAULT_CELL_LENGTH)
 #define DEFAULT_LANE_RECT                                                      \
     sf::IntRect(                                                               \
         0, 0, DEFAULT_CELL_LENGTH* DEFAULT_CELLS_PER_LANE, DEFAULT_CELL_LENGTH \
     )
 
-#define DEFAULT_SPAWN_INTERVAL sf::seconds(3.5)
-#define DEFAULT_PLAYER_SLOT 6
 #define DEFAULT_AIR_ENEMY_SPEED 450.f
 #define DEFAULT_GROUND_ENEMY_SPEED 150.f
 #define DEFAULT_PLAYER_SPEED 500.f
 #define DEFAULT_LOG_SPEED 100.f
 
+#define DEFAULT_TIME_PER_FRAME sf::seconds(1.f / 60.f)
+#define DEFAULT_ANIMATION_DURATION sf::seconds(1.5)
+#define DEFAULT_COUNTDOWN_DURATION sf::seconds(3)
+#define DEFAULT_SPAWN_INTERVAL sf::seconds(3.5)
 #define GREEN_LIGHT_INTERVAL sf::seconds(3.0)
 #define YELLOW_LIGHT_INTERVAL sf::seconds(1.0)
 #define RED_LIGHT_INTERVAL sf::seconds(2.0)
@@ -27,13 +45,31 @@
 #define LEVEL_THREE_COEFFICIENT 1.2
 #define LEVEL_FOUR_COEFFICIENT 1.3
 #define LEVEL_FIVE_COEFFICIENT 1.4
+#define SURVIVAL_COEFFICIENT 1.15
 
-#define NUMBER_OF_BUFFER_LANE 5
+#define WEATHER_NORMAL_FACTOR 1.f
+#define WEATHER_RAIN_FACTOR 0.6
+#define WEATHER_SNOW_FACTOR 0.4
 
 namespace Config {
-namespace GameLevel {
-enum Type { L1, L2, L3, L4, L5, Endless, Count };
-}  // namespace GameLevel
+namespace Game {
+enum Level { L1, L2, L3, L4, L5, Survival, Count };
+enum Weather { Rain, Snow, Normal };
+}  // namespace Game
+namespace WinState {
+enum Mode { Win, HighScore };
+}
+namespace LoseState {
+enum Mode { Lose, Survival };
+}
+namespace ChooseModeState {
+enum Mode { NewGame, Continue };
+}
+namespace LevelState {
+enum Mode { NewGame, Continue };
+}
+namespace SettingState {
+enum Mode { NonSkin, Skin };
+}
 }  // namespace Config
-
 #endif  // CONFIG_HPP

include/Container.hpp

@@ -22,9 +22,6 @@ class Container : public Component {
    private:
     virtual void draw(sf::RenderTarget& target, sf::RenderStates states) const;
 
-    // bool hasSelection() const;
-    // void select(std::size_t index);
-
    private:
     std::vector<Component::Ptr> mChildren;
 };

include/CreditState.hpp

@@ -1,16 +1,15 @@
 #ifndef CREDIT_STATE_HPP
 #define CREDIT_STATE_HPP
 
-
 #include "Button.hpp"
 #include "State.hpp"
 
 class CreditState : public State {
    public:
-    CreditState(StateStack& stack, Context context, int mode = 0);
+    CreditState(StateStack& stack, Context& context);
 
-    virtual void draw();
-    virtual bool update(sf::Time dt);
+    virtual void draw() override;
+    virtual bool update(sf::Time dt) override;
     virtual bool handleEvent(const sf::Event& event);
 
    private:

include/DataTables.hpp

@@ -24,7 +24,6 @@ struct CharacterData {
     float normalSpeed;
     std::vector<Textures::ID> textures;
     sf::Vector2i frameSize;
-    size_t numFrames;
 };
 
 struct ObstacleData {

include/Dialog.hpp

@@ -5,22 +5,24 @@
 #include "Container.hpp"
 #include "State.hpp"
 
+// potentially problematic?
 using namespace GUI;
 
 class Dialog : public Component {
    public:
     typedef std::shared_ptr<Dialog> Ptr;
 
    public:
-    Dialog(const sf::Texture& texture, State::Context context);
+    Dialog(const sf::Texture& texture, State::Context& context);
+    virtual void update(sf::Time dt){};
     virtual void handleEvent(const sf::Event& event){};
 
    protected:
     virtual void draw(sf::RenderTarget& target, sf::RenderStates states) const;
 
    protected:
+    State::Context* mContext;
     Container mGUIContainer;
-    State::Context mContext;
     const sf::Texture& mTexture;
     sf::Sprite mSprite;
 };

include/DialogGeneral.hpp

@@ -8,23 +8,30 @@
 #include "Label.hpp"
 #include "Player.hpp"
 #include "State.hpp"
+#include "VolumeBar.hpp"
 
 class DialogGeneral : public Dialog {
    public:
-    DialogGeneral(const sf::Texture& texture, State::Context context);
-    virtual void draw(sf::RenderTarget& target, sf::RenderStates states) const;
+    DialogGeneral(const sf::Texture& texture, State::Context& context);
+    virtual void draw(sf::RenderTarget& target, sf::RenderStates states) const override;
     virtual void handleEvent(const sf::Event& event);
+
+   private:
     void updateLabels();
-    void addButtonLabel(
-        Player::Action action, float y, Textures::ID Button,
-        State::Context context
-    );
+    void addButtonLabel(Player::Action action, float y, Textures::ID Button);
+    void addListMusic();
 
    private:
     sf::Sprite mLabelTextKeys;
     sf::Sprite mLabelTextSounds;
+    VolumeBar mVolumeBar;
     std::array<Button::Ptr, Player::Count> mBindingButtons;
     std::array<Label::Ptr, Player::Count> mBindingLabels;
+    std::array<Button::Ptr, Musics::MusicCount - 1> mListMusics;
+    Button::Ptr mChosenMusic;
+
+    int volume = 50;
+    bool isChoosingMusic = false;
 };
 
 #endif

include/DialogSkin.hpp

@@ -1,6 +1,40 @@
 #ifndef DIALOG_SKIN_HPP
 #define DIALOG_SKIN_HPP
 
-class DialogSkin {};
+#include <array>
+
+#include "Animation.hpp"
+#include "Button.hpp"
+#include "Dialog.hpp"
+#include "Label.hpp"
+#include "State.hpp"
+
+class DialogSkin : public Dialog {
+   public:
+    DialogSkin(const sf::Texture& texture, State::Context& context);
+    virtual void draw(sf::RenderTarget& target, sf::RenderStates states)
+        const override;
+    virtual void handleEvent(const sf::Event& event);
+    virtual void update(sf::Time dt) override;
+
+   private:
+    void addSkins(
+        int skinNumber, sf::Vector2f position, sf::Vector2i frameSize,
+        Textures::ID skin
+    );
+    void addChosenSkins(
+        int skinNumber, sf::Vector2f position, sf::Vector2i frameSize,
+        Textures::ID skin
+    );
+    void changeSkin(int skinNumber);
+
+   private:
+    const int mNumSkins = NUMBER_OF_SKINS;
+    int mCurrentSkin;
+    Button::Ptr mButtonLeft;
+    Button::Ptr mButtonRight;
+    std::array<Animation::Ptr, NUMBER_OF_SKINS> mSkins;
+    std::array<Animation::Ptr, NUMBER_OF_SKINS> mChosenSkins;
+};
 
 #endif