add optional onOpen function to game states

Hopson97 · Jun 5, 2018 · a086bd0 · a086bd0
1 parent e3f7978
commit a086bd0
Show file tree

Hide file tree

Showing 9 changed files with 235 additions and 50 deletions.
diff --git a/HopsonArcade.sln b/HopsonArcade.sln
diff --git a/HopsonArcade.vcxproj b/HopsonArcade.vcxproj
@@ -0,0 +1,206 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{0b07dad7-ad02-4c09-ba90-a636b7f6dd8d}</ProjectGuid>
+    <RootNamespace>HopsonArcade</RootNamespace>
+    <WindowsTargetPlatformVersion>10.0.16299.0</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v141</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup />
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>D:\_Programming_Libraries\C++\SFML\MSVC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <LanguageStandard>stdcpp17</LanguageStandard>
+    </ClCompile>
+    <Link>
+      <AdditionalLibraryDirectories>D:\_Programming_Libraries\C++\SFML\MSVC\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>sfml-graphics-d.lib;sfml-audio-d.lib;sfml-network-d.lib;sfml-window-d.lib;sfml-system-d.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+      <AdditionalIncludeDirectories>D:\_Programming Libraries\C++\SFML\MSVC\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <AdditionalLibraryDirectories>D:\_Programming Libraries\C++\SFML\MSVC\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <AdditionalDependencies>sfml-graphics.lib;sfml-audio.lib;sfml-network.lib;sfml-window.lib;sfml-system.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <SDLCheck>true</SDLCheck>
+      <ConformanceMode>true</ConformanceMode>
+    </ClCompile>
+    <Link>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <None Include="openal32.dll" />
+    <None Include="sfml-audio-2.dll" />
+    <None Include="sfml-audio-d-2.dll" />
+    <None Include="sfml-graphics-2.dll" />
+    <None Include="sfml-graphics-d-2.dll" />
+    <None Include="sfml-network-2.dll" />
+    <None Include="sfml-network-d-2.dll" />
+    <None Include="sfml-system-2.dll" />
+    <None Include="sfml-system-d-2.dll" />
+    <None Include="sfml-window-2.dll" />
+    <None Include="sfml-window-d-2.dll" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="Source\Arcade\Game.cpp" />
+    <ClCompile Include="Source\Arcade\Main.cpp" />
+    <ClCompile Include="Source\Arcade\StateGameSelect.cpp" />
+    <ClCompile Include="Source\Framework\GUI\Button.cpp" />
+    <ClCompile Include="Source\Framework\GUI\StackMenu.cpp" />
+    <ClCompile Include="Source\Framework\GUI\Textbox.cpp" />
+    <ClCompile Include="Source\Framework\GUI\Widget.cpp" />
+    <ClCompile Include="Source\Framework\ResourceManager\ResourceHolder.cpp" />
+    <ClCompile Include="Source\Framework\States\StateBase.cpp" />
+    <ClCompile Include="Source\Framework\Util\Animation.cpp" />
+    <ClCompile Include="Source\Framework\Util\FileUtil.cpp" />
+    <ClCompile Include="Source\Framework\Util\FPSCounter.cpp" />
+    <ClCompile Include="Source\Framework\Util\Maths.cpp" />
+    <ClCompile Include="Source\Framework\Util\ToggleKey.cpp" />
+    <ClCompile Include="Source\SpaceInvaders\AnimationRenderer.cpp" />
+    <ClCompile Include="Source\SpaceInvaders\Collidable.cpp" />
+    <ClCompile Include="Source\SpaceInvaders\Entity\Explosion.cpp" />
+    <ClCompile Include="Source\SpaceInvaders\Entity\Invader.cpp" />
+    <ClCompile Include="Source\SpaceInvaders\Entity\Player.cpp" />
+    <ClCompile Include="Source\SpaceInvaders\Entity\Projectile.cpp" />
+    <ClCompile Include="Source\SpaceInvaders\Entity\Shield.cpp" />
+    <ClCompile Include="Source\SpaceInvaders\Entity\UFO.cpp" />
+    <ClCompile Include="Source\SpaceInvaders\InvaderManager.cpp" />
+    <ClCompile Include="Source\SpaceInvaders\StarryBackground.cpp" />
+    <ClCompile Include="Source\SpaceInvaders\States\StateHighscores.cpp" />
+    <ClCompile Include="Source\SpaceInvaders\States\StateMainMenu.cpp" />
+    <ClCompile Include="Source\SpaceInvaders\States\StatePlaying.cpp" />
+    <ClCompile Include="Source\SpaceInvaders\World.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="Source\Arcade\Game.h" />
+    <ClInclude Include="Source\Arcade\StateGameSelect.h" />
+    <ClInclude Include="Source\Framework\GUI\Button.h" />
+    <ClInclude Include="Source\Framework\GUI\StackMenu.h" />
+    <ClInclude Include="Source\Framework\GUI\Textbox.h" />
+    <ClInclude Include="Source\Framework\GUI\Widget.h" />
+    <ClInclude Include="Source\Framework\ResourceManager\ResourceHolder.h" />
+    <ClInclude Include="Source\Framework\ResourceManager\ResourceManager.h" />
+    <ClInclude Include="Source\Framework\States\StateBase.h" />
+    <ClInclude Include="Source\Framework\Util\Animation.h" />
+    <ClInclude Include="Source\Framework\Util\FileUtil.h" />
+    <ClInclude Include="Source\Framework\Util\FPSCounter.h" />
+    <ClInclude Include="Source\Framework\Util\Maths.h" />
+    <ClInclude Include="Source\Framework\Util\NonCopyable.h" />
+    <ClInclude Include="Source\Framework\Util\NonMoveable.h" />
+    <ClInclude Include="Source\Framework\Util\Random.h" />
+    <ClInclude Include="Source\Framework\Util\ToggleKey.h" />
+    <ClInclude Include="Source\SpaceInvaders\AnimationRenderer.h" />
+    <ClInclude Include="Source\SpaceInvaders\Collidable.h" />
+    <ClInclude Include="Source\SpaceInvaders\DisplayInfo.h" />
+    <ClInclude Include="Source\SpaceInvaders\Entity\Explosion.h" />
+    <ClInclude Include="Source\SpaceInvaders\Entity\Invader.h" />
+    <ClInclude Include="Source\SpaceInvaders\Entity\Player.h" />
+    <ClInclude Include="Source\SpaceInvaders\Entity\Projectile.h" />
+    <ClInclude Include="Source\SpaceInvaders\Entity\Shield.h" />
+    <ClInclude Include="Source\SpaceInvaders\Entity\UFO.h" />
+    <ClInclude Include="Source\SpaceInvaders\InvaderManager.h" />
+    <ClInclude Include="Source\SpaceInvaders\StarryBackground.h" />
+    <ClInclude Include="Source\SpaceInvaders\States\StateHighscores.h" />
+    <ClInclude Include="Source\SpaceInvaders\States\StateMainMenu.h" />
+    <ClInclude Include="Source\SpaceInvaders\States\StatePlaying.h" />
+    <ClInclude Include="Source\SpaceInvaders\World.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff --git a/Source/Arcade/Game.cpp b/Source/Arcade/Game.cpp
@@ -81,6 +81,9 @@ void Game::tryPop()
         }
 
         m_states.pop_back();
+        if (!m_states.empty()) {
+            getCurrentState().onOpen();
+        }
     }
 }
 
@@ -112,6 +115,7 @@ StateBase& Game::getCurrentState()
 void Game::pushState(std::unique_ptr<StateBase> state)
 {
     m_states.push_back(std::move(state));
+    getCurrentState().onOpen();
 }
 
 //Flags a boolean for the game to pop state

diff --git a/Source/Arcade/Game.h b/Source/Arcade/Game.h
@@ -16,7 +16,6 @@
 */
 class Game : public NonCopyable, public NonMovable
 {
-    friend class StateBase;
     public:
         Game();
 
@@ -32,10 +31,9 @@ class Game : public NonCopyable, public NonMovable
 
         const sf::RenderWindow& getWindow() const;
 
-
+        void resizeWindow(unsigned width, unsigned height);
 
     private:
-        void resizeWindow(unsigned width, unsigned height);
         void handleEvent();
         void tryPop();
 

diff --git a/Source/Arcade/StateGameSelect.cpp b/Source/Arcade/StateGameSelect.cpp
@@ -7,6 +7,11 @@ StateGameSelect::StateGameSelect(Game& game)
 {
 }
 
+void StateGameSelect::onOpen()
+{
+    m_pGame->resizeWindow(1280, 720);
+}
+
 
 void StateGameSelect::handleEvent(sf::Event e)
 {

diff --git a/Source/Arcade/StateGameSelect.h b/Source/Arcade/StateGameSelect.h
@@ -2,16 +2,34 @@
 
 #include "../Framework/States/StateBase.h"
 
+#include <vector>
+
 class Game;
 
 class StateGameSelect : public StateBase
 {
+    class GameSelect
+    {
+        public:
+            GameSelect(const std::string& name, const sf::Texture& thumbnail)
+            { }
+
+            virtual std::unique_ptr<StateBase> getInitState() = 0;
+
+        private:
+            sf::RectangleShape m_container;
+            sf::RectangleShape m_thumbnail;
+    };
+
     public:
         StateGameSelect(Game& game);
 
+        void onOpen() override;
+
         void handleEvent(sf::Event e) override;
         void render(sf::RenderTarget& target) override;
 
     private:
+        void registerGame();
 
 };
diff --git a/Source/Framework/States/StateBase.h b/Source/Framework/States/StateBase.h
@@ -15,6 +15,7 @@ class StateBase : public NonCopyable
 
         virtual ~StateBase() = default;
 
+        virtual void onOpen() {}
         virtual void handleEvent(sf::Event e) {}
         virtual void handleInput() {}
         virtual void update(sf::Time deltaTime) {}

diff --git a/res/thumbnails/space_invaders.png b/res/thumbnails/space_invaders.png
diff --git a/resource.h b/resource.h
-Original file line number
+Diff line change
@@ Expand Up / @@ -7,6 +7,11 @@ StateGameSelect::StateGameSelect(Game& game) @@
     {
     }
+    void StateGameSelect::onOpen()
+    {
+        m_pGame->resizeWindow(1280, 720);
+    }
     void StateGameSelect::handleEvent(sf::Event e)
     {
@@ Expand Down @@