Skip to content
Browse files

manual merge of johan's files. also initial commit to this repo

Signed-off-by: Miles Whiticker <miles.whiticker@gmail.com>
  • Loading branch information...
1 parent b9f6d2f commit 7428895fc9338f6769192afd21b3bab2ea2ce897 @mileswhiticker mileswhiticker committed May 21, 2012
View
7 .gitignore
@@ -3,24 +3,23 @@
*.lo
*.o
-
# Compiled Dynamic libraries
*.so
-
# Compiled Static libraries
*.lai
*.la
*.a
-
# project files
*.ipch
*.sdf
*.suo
+*.opensdf
# folders
+Release/
Debug/
include/
lib/
-src/
+src/
View
BIN bin/libsndfile-1.dll
Binary file not shown.
View
BIN bin/openal32.dll
Binary file not shown.
View
BIN bin/sfgui-d.dll
Binary file not shown.
View
BIN bin/sfml-audio-2.dll
Binary file not shown.
View
BIN bin/sfml-audio-d-2.dll
Binary file not shown.
View
BIN bin/sfml-graphics-2.dll
Binary file not shown.
View
BIN bin/sfml-graphics-d-2.dll
Binary file not shown.
View
BIN bin/sfml-network-2.dll
Binary file not shown.
View
BIN bin/sfml-network-d-2.dll
Binary file not shown.
View
BIN bin/sfml-system-2.dll
Binary file not shown.
View
BIN bin/sfml-system-d-2.dll
Binary file not shown.
View
BIN bin/sfml-window-2.dll
Binary file not shown.
View
BIN bin/sfml-window-d-2.dll
Binary file not shown.
View
6 source/App.cpp
@@ -7,12 +7,12 @@
#include <iostream>
-App::App(WindowManager& a_WindowMgr, GUIManager& a_GUIMgr, Renderer& a_Renderer)
+App::App(WindowManager& a_WindowMgr, GUIManager& a_GUIMgr, Renderer& a_Renderer, ResourceManager& a_ResMgr)
: m_GUIMgr(a_GUIMgr)
, m_WindowMgr(a_WindowMgr)
, m_Renderer(a_Renderer)
-, m_pResourceMgr(new ResourceManager())
-, m_pSceneMgr(new SceneManager(a_GUIMgr, *m_pResourceMgr, m_Renderer))
+, m_ResourceMgr(a_ResMgr)
+, m_pSceneMgr(new SceneManager(a_GUIMgr, m_ResourceMgr, m_Renderer))
//
, m_IsQuittingNextUpdate(false)
{
View
4 source/App.hpp
@@ -12,7 +12,7 @@ class GUIManager;
class App
{
public:
- App(WindowManager& a_WindowMgr, GUIManager& a_GUIMgr, Renderer& a_Renderer);
+ App(WindowManager& a_WindowMgr, GUIManager& a_GUIMgr, Renderer& a_Renderer, ResourceManager& a_ResMgr);
~App();
//
bool Update(float a_Dt);
@@ -21,7 +21,7 @@ class App
private:
Renderer& m_Renderer;
WindowManager& m_WindowMgr;
- ResourceManager* m_pResourceMgr;
+ ResourceManager& m_ResourceMgr;
SceneManager* m_pSceneMgr;
GUIManager& m_GUIMgr;
//
View
15 source/Block.cpp
@@ -0,0 +1,15 @@
+#include <SFML/Graphics.hpp>
+#include "ResourceManager.hpp"
+#include "block.hpp"
+
+Block::Block(ResourceManager& a_ResMgr)
+: m_pSprite(NULL)
+{
+ m_pSprite = new sf::Sprite();
+ a_ResMgr.CreateSprite("media/block.png", &m_pSprite);
+}
+
+sf::Sprite* Block::GetSprite()
+{
+ return m_pSprite;
+}
View
20 source/Block.hpp
@@ -0,0 +1,20 @@
+#ifndef BLOCK_H
+#define BLOCK_H
+
+namespace sf
+{
+ class Sprite;
+}
+
+class Block
+{
+public:
+ Block(ResourceManager& a_ResMgr);
+ sf::Sprite* GetSprite();
+ //
+private:
+ sf::Sprite* m_pSprite;
+ //
+};
+
+#endif // BLOCK_H
View
57 source/GameInst.cpp
@@ -1,10 +1,17 @@
#include "GameInst.hpp"
#include "GUIManager.hpp"
#include "Helpers.hpp"
+#include "block.hpp"
+#include "Renderer.hpp"
-GameInst::GameInst(GUIManager& a_GUIMgr)
-: Scene(a_GUIMgr)
+#include <SFML/Graphics.hpp>
+#include <iostream>
+#include <fstream>
+
+GameInst::GameInst(GUIManager& a_GUIMgr, ResourceManager& a_ResMgr, Renderer& a_Renderer)
+: Scene(a_GUIMgr, a_ResMgr, a_Renderer)
, m_Running(false)
+, m_Renderer(a_Renderer)
//, m_pQuitMenuButton(sfg::Button::Create("Quit to Main Menu"))
//
{
@@ -13,7 +20,6 @@ GameInst::GameInst(GUIManager& a_GUIMgr)
//to handle button presses and the like
m_pSelectListener = new SelectListener(*this);
-
/** Create Adjustment.
* @param value Current value.
* @param lower Minimum value.
@@ -58,19 +64,62 @@ GameInst::GameInst(GUIManager& a_GUIMgr)
bool GameInst::Start()
{
m_Running = true;
+ LoadLevel();
return true;
}
+void GameInst::LoadLevel()
+{
+ /*Block *block = new Block(m_ResMgr);
+ m_blocks.push_back(block);
+ m_Renderer.AddDrawableSprite(block->Sprite());*/
+ std::fstream file;
+ file.open(("media/level.txt"));
+ std::string line;
+ int curLine = 0;
+ while( std::getline(file,line) )
+ {
+ //
+ for(unsigned int i = 0; i < line.size();i++)
+ {
+ char c = line[i];
+ switch(c)
+ {
+ case('#'):
+ {
+ Block *block = new Block(m_ResMgr);
+ m_blocks.push_back(block);
+ block->GetSprite()->setPosition(float(i)*32,float(curLine)*32);
+ m_Renderer.AddDrawableSprite(block->GetSprite());
+ break;
+ }
+ }
+ //
+ }
+ curLine++;
+ }
+}
+
+void GameInst::UnloadLevel() {
+ for (auto it = m_blocks.begin(); it != m_blocks.end();) {
+ it = m_blocks.erase(it);
+ }
+}
+
void GameInst::Stop()
{
m_Running = false;
- //
+ UnloadLevel();
}
void GameInst::Update(float a_dt)
{
if(m_Running)
{
+ for (auto it = m_blocks.begin(); it != m_blocks.end();++it)
+ {
+ //m_Renderer->((*it)->Sprite());
+ }
//
}
}
View
11 source/GameInst.hpp
@@ -3,19 +3,25 @@
#include "Scene.hpp"
#include "SelectListener.hpp"
+#include <vector>
/*#include <SFGUI/Button.hpp>
#include <SFGUI/Window.hpp>
#include <SFGUI/Notebook.hpp>
#include <SFGUI/Table.hpp>
#include <SFGUI/Label.hpp>*/
+class Block;
+class Renderer;
+
class GameInst : public Scene
{
public:
- GameInst(GUIManager& a_GUIMgr);
+ GameInst(GUIManager& a_GUIMgr, ResourceManager& a_ResMgr, Renderer& a_Renderer);
bool Start();
void Stop();
+ void LoadLevel();
+ void UnloadLevel();
virtual void Update(float a_dt);
virtual void UpdateGUISizes();
//
@@ -26,9 +32,10 @@ class GameInst : public Scene
void Select(void* a_pSelectee, SelectListener::Type a_SelectedType);
//
private:
- //
+ std::vector<Block*> m_blocks;
bool m_Running;
SelectListener* m_pSelectListener;
+ Renderer& m_Renderer;
//
};
View
9 source/Main.cpp
@@ -9,13 +9,14 @@
#include "guicon.h"
#include <SFML/System.hpp>
-#include <SFGUI/SFGUI.hpp>
+//#include <SFGUI/SFGUI.hpp>
#include "App.hpp"
#include "ResourceManager.hpp"
#include "GUIManager.hpp"
#include "WindowManager.hpp"
#include "Renderer.hpp"
+#include "ResourceManager.hpp"
//don't use this, it's lazy
//#pragma comment(lib, "requiredLibrary.lib")
@@ -44,9 +45,11 @@ int WINAPI WinMain(HINSTANCE a_hInst, HINSTANCE a_hPrevInst, LPSTR a_pCmdLine, i
//
WindowManager* pWindowMgr = new WindowManager();
GUIManager* pGUIMgr = new GUIManager(*pWindowMgr);
- Renderer renderer(*pGUIMgr,*pWindowMgr);
- App app(*pWindowMgr,*pGUIMgr,renderer);
+ ResourceManager* pResMgr = new ResourceManager();
+ Renderer renderer(*pGUIMgr,*pWindowMgr, *pResMgr);
+ App app(*pWindowMgr,*pGUIMgr,renderer, *pResMgr);
+
//
sf::Clock deltaTimer;
bool quit = false;
View
7 source/MainMenu.cpp
@@ -1,10 +1,10 @@
#include "MainMenu.hpp"
#include "GUIManager.hpp"
-#include <SFGUI\Button.hpp>
+//#include <SFGUI\Button.hpp>
-MainMenu::MainMenu(GUIManager& a_GUIMgr)
-: Scene(a_GUIMgr)
+MainMenu::MainMenu(GUIManager& a_GUIMgr, ResourceManager& a_ResMgr, Renderer& a_Renderer)
+: Scene(a_GUIMgr, a_ResMgr, a_Renderer)
//
//, m_Title(sfg::Label::Create("App"))
//, m_pStartButton(sfg::Button::Create("Start"))
@@ -18,6 +18,7 @@ MainMenu::MainMenu(GUIManager& a_GUIMgr)
float invHeightScalar = 10;
float invWidthScalar = 5;
+ /*
//changing font size is slooooow :(
//title
//m_Title = new sfg::Button();
View
14 source/MainMenu.hpp
@@ -2,20 +2,20 @@
#define MAIN_MENU_HPP
#include "Scene.hpp"
-#include <SFGUI/Label.hpp>
-#include <SFGUI/Button.hpp>
+//#include <SFGUI/Label.hpp>
+//#include <SFGUI/Button.hpp>
class MainMenu : public Scene
{
public:
- MainMenu(GUIManager& a_GUIMgr);
+ MainMenu(GUIManager& a_GUIMgr, ResourceManager& a_ResMgr, Renderer& a_Renderer);
virtual void Update(float a_dt);
virtual void UpdateGUISizes();
//
- sfg::Label::Ptr m_Title;
- sfg::Button::Ptr m_pStartButton;
- sfg::Button::Ptr m_pOptionsButton;
- sfg::Button::Ptr m_pQuitButton;
+ //sfg::Label::Ptr m_Title;
+ //sfg::Button::Ptr m_pStartButton;
+ //sfg::Button::Ptr m_pOptionsButton;
+ //sfg::Button::Ptr m_pQuitButton;
//
private:
//
View
4 source/OptionsMenu.cpp
@@ -1,7 +1,7 @@
#include "OptionsMenu.hpp"
-OptionsMenu::OptionsMenu(GUIManager& a_GUIMgr)
-: Scene(a_GUIMgr)
+OptionsMenu::OptionsMenu(GUIManager& a_GUIMgr, ResourceManager& a_ResMgr, Renderer& a_Renderer)
+: Scene(a_GUIMgr, a_ResMgr, a_Renderer)
{
//
}
View
2 source/OptionsMenu.hpp
@@ -6,7 +6,7 @@
class OptionsMenu : public Scene
{
public:
- OptionsMenu(GUIManager& a_GUIMgr);
+ OptionsMenu(GUIManager& a_GUIMgr, ResourceManager& a_ResMgr, Renderer& a_Renderer);
virtual void Update(float a_dt);
virtual void UpdateGUISizes();
//
View
29 source/Renderer.cpp
@@ -1,12 +1,15 @@
#include "Renderer.hpp"
#include "WindowManager.hpp"
#include "GUIManager.hpp"
+#include "ResourceManager.hpp"
#include <SFML/Graphics/Sprite.hpp>
#include <SFML/Graphics/RenderTarget.hpp>
+#include <SFML/Graphics.hpp>
-Renderer::Renderer(GUIManager& a_guiMgr, WindowManager& a_WindowMgr)
+Renderer::Renderer(GUIManager& a_guiMgr, WindowManager& a_WindowMgr, ResourceManager& a_ResMgr)
: m_WindowMgr(a_WindowMgr)
+, m_ResMgr(a_ResMgr)
, m_pBackgroundImage(NULL)
, m_guiMgr(a_guiMgr)
{
@@ -31,8 +34,15 @@ bool Renderer::Render(float a_dt)
renderWindow.clear();
//first, draw the background image if there is one
- if(m_pBackgroundImage)
- renderWindow.draw(*m_pBackgroundImage);
+ /*if(m_pBackgroundImage)
+ renderWindow.draw(*m_pBackgroundImage);*/
+
+ //render sprites
+ for(auto it = VisibleSprites.begin(); it != VisibleSprites.end(); it++ )
+ {
+ sf::Sprite* sprite = *it;
+ renderWindow.draw(*sprite);
+ }
//render the gui
m_guiMgr.RenderGui(renderWindow);
@@ -57,3 +67,16 @@ sf::Vector2f Renderer::GetWindowDim()
{
return m_WindowMgr.GetWindowDim();
}
+
+void Renderer::AddDrawableSprite(sf::Sprite* a_pSprite)
+{
+ VisibleSprites.push_back(a_pSprite);
+}
+
+void Renderer::RemoveDrawableSprite(sf::Sprite* a_pSprite)
+{
+ for(auto it = VisibleSprites.begin(); it != VisibleSprites.end(); it++ )
+ {
+ //if((*it)->)
+ }
+}
View
7 source/Renderer.hpp
@@ -16,6 +16,7 @@ namespace sf
class RenderTarget;
};
+class ResourceManager;
class GUIManager;
class Button;
class Entity;
@@ -24,7 +25,7 @@ class Anim;
class Renderer
{
public:
- Renderer(GUIManager& a_guiMgr, WindowManager& a_WindowMgr);
+ Renderer(GUIManager& a_guiMgr, WindowManager& a_WindowMgr, ResourceManager& a_ResMgr);
bool Init();
bool Render(float a_dt);
bool CleanUp();
@@ -45,9 +46,12 @@ class Renderer
//void MouseClick( sf::Vector2f ClickPos );
//
//void RemoveAllVisible();
+ void AddDrawableSprite(sf::Sprite* a_pSprite);
+ void RemoveDrawableSprite(sf::Sprite* a_pSprite);
//
private:
WindowManager& m_WindowMgr;
+ ResourceManager& m_ResMgr;
//
sf::Sprite* m_pBackgroundImage;
//std::vector<sf::Sprite*> m_pVisibleSprites;
@@ -56,6 +60,7 @@ class Renderer
//std::list<Entity*> m_pVisibleEntities;
//
GUIManager& m_guiMgr;
+ std::vector<sf::Sprite*> VisibleSprites;
};
#endif // RENDERER_H
View
16 source/ResourceManager.cpp
@@ -76,11 +76,12 @@ bool ResourceManager::CreateSprite( std::string FilePath, sf::Sprite** a_ppOut )
create_sprite:
//if sfml creates the sprite, then we're good
- /*sf::Texture* texture = new sf::Texture();
- texture->loadFromImage(*Images[imageIndex].second);*/
+ //sf::Texture* texture = new sf::Texture();
+ //texture->loadFromImage(*Images[imageIndex].second);
sf::Sprite* sprite = new sf::Sprite(*Textures[textureIndex].second);
- /*if(a_pSubRect)
- sprite->set(*a_pSubRect);*/
+ Sprites.push_back( std::pair<std::string, sf::Sprite*>(FilePath, sprite) );
+ //if(a_pSubRect)
+ // sprite->set(*a_pSubRect);
//sf::Vector2f size = texture->getSize();
if(a_ppOut)
*a_ppOut = sprite;
@@ -137,4 +138,9 @@ bool ResourceManager::CreateAnim(std::string FilePath, sf::Vector2f a_FrameSize,
*a_ppOut = pNewAnim;
return true;
}
-*/
+*/
+
+std::vector< std::pair<std::string, sf::Sprite*> > ResourceManager::GetSprites()
+{
+ return Sprites;
+}
View
4 source/ResourceManager.hpp
@@ -25,11 +25,13 @@ class ResourceManager
bool CreateSprite(std::string FilePath, _Out_ sf::Sprite** a_ppOut = NULL ); // _In_ sf::Rect<int>* a_pSubRect = NULL
bool CreateAnim(std::string FilePath, sf::Vector2f a_FrameSize, double FrameLength, short numFrames, _Out_ Anim** a_ppOut = NULL );
//
-private:
+ std::vector< std::pair<std::string, sf::Sprite*> > GetSprites();
//
+private:
std::vector< std::pair<std::string, sf::Image*> > Images;
std::vector< std::pair<std::string, sf::Texture*> > Textures;
std::vector< std::pair<std::string, sf::Sprite*> > Sprites;
+ //
};
#endif //RESOURCE_MANAGER_HPP
View
5 source/Scene.cpp
@@ -2,13 +2,16 @@
#include "App.hpp"
#include "Renderer.hpp"
#include "GUIManager.hpp"
+#include "ResourceManager.hpp"
//#include <SFGUI/SFGUI.hpp>
#include <iostream>
-Scene::Scene(GUIManager& a_GUIMgr)
+Scene::Scene(GUIManager& a_GUIMgr, ResourceManager& a_ResMgr, Renderer& a_Renderer)
: m_GUIMgr(a_GUIMgr)
+, m_ResMgr(a_ResMgr)
+, m_Renderer(a_Renderer)
{
//
}
View
6 source/Scene.hpp
@@ -22,11 +22,13 @@ class Entity;
class SpeechBubble;
class Anim;
class GUIManager;
+class ResourceManager;
+class Renderer;
class Scene
{
public:
- Scene(GUIManager& a_GUIMgr);
+ Scene(GUIManager& a_GUIMgr, ResourceManager& a_ResMgr, Renderer& a_Renderer);
~Scene();
virtual void Update(float a_dt)=0;
virtual void UpdateGUISizes()=0;
@@ -39,6 +41,8 @@ class Scene
//
protected:
GUIManager& m_GUIMgr;
+ ResourceManager& m_ResMgr;
+ Renderer& m_Renderer;
//
sf::Sprite* m_pBackgroundImage;
//std::vector< sfg::SharedPtr<sfg::Widget> > Widgets;
View
17 source/SceneManager.cpp
@@ -1,4 +1,6 @@
+
#include <SFGUI/SFGUI.hpp>
+#include <SFML/Graphics.hpp>
#include "SceneManager.hpp"
#include "Renderer.hpp"
@@ -9,8 +11,8 @@
#include "OptionsMenu.hpp"
#include "GameInst.hpp"
-#include <SFGUI/Label.hpp>
-#include <SFGUI/Button.hpp>
+//#include <SFGUI/Label.hpp>
+//#include <SFGUI/Button.hpp>
SceneManager::SceneManager(GUIManager& a_GUIMgr, ResourceManager& a_ResMgr, Renderer& a_Renderer)
: m_ResMgr(a_ResMgr)
@@ -25,7 +27,7 @@ SceneManager::SceneManager(GUIManager& a_GUIMgr, ResourceManager& a_ResMgr, Rend
, m_IsQuittingNextUpdate(false)
{
//--------------- main menu ---------------//
- m_pMainMenu = new MainMenu(m_GUIMgr);
+ m_pMainMenu = new MainMenu(m_GUIMgr, m_ResMgr, m_Renderer);
sf::Sprite* pBG = new sf::Sprite();
a_ResMgr.CreateSprite("media/menubackground[1920x1080].jpg", &pBG);
m_pMainMenu->SetBackground(pBG);
@@ -35,7 +37,7 @@ SceneManager::SceneManager(GUIManager& a_GUIMgr, ResourceManager& a_ResMgr, Rend
Scenes[SCENE_MAINMENU] = m_pMainMenu;
//scale bg to fit the screen
- sf::Vector2f screenDim;// = m_GUIMgr.GetWindowDim();
+ sf::Vector2f screenDim = m_GUIMgr.GetWindowDim();
sf::FloatRect bgSize;
float scalar;
if(pBG)
@@ -48,17 +50,18 @@ SceneManager::SceneManager(GUIManager& a_GUIMgr, ResourceManager& a_ResMgr, Rend
}
//--------------- options menu ---------------//
- m_pOptionsMenu = new OptionsMenu(m_GUIMgr);
+ m_pOptionsMenu = new OptionsMenu(m_GUIMgr, m_ResMgr, m_Renderer);
m_pOptionsMenu->SetBackground(pBG);
Scenes[SCENE_OPTIONSMENU] = m_pOptionsMenu;
//--------------- application screen ---------------//
- m_pGameInst = new GameInst(m_GUIMgr);
+ m_pGameInst = new GameInst(m_GUIMgr, m_ResMgr, m_Renderer);
pBG = new sf::Sprite();
a_ResMgr.CreateSprite("media/starry[1280x853].bmp", &pBG);
m_pGameInst->SetBackground(pBG);
//m_pGameInst->m_pQuitMenuButton->OnLeftClick.Connect(&SceneManager::GotoMenuScene, this);
Scenes[SCENE_GAMEINST] = m_pGameInst;
+ m_pGameInst->Start();
//scale bg to fit the screen
if(pBG)
@@ -71,7 +74,7 @@ SceneManager::SceneManager(GUIManager& a_GUIMgr, ResourceManager& a_ResMgr, Rend
}
//set the main menu as the first scene
- EnableSceneByID(SCENE_MAINMENU);
+ EnableSceneByID(SCENE_GAMEINST);
}
SceneManager::~SceneManager()
View
9 source/WindowManager.cpp
@@ -15,7 +15,7 @@ WindowManager::WindowManager()
: m_pSFMLRenderWindow(new RenderWindow())
, m_IsQuittingNextUpdate(false)
{
- m_pSFMLRenderWindow->create(sf::VideoMode(800,600),"Space Economy Sim");
+ m_pSFMLRenderWindow->create(sf::VideoMode(1024,768),"Space Economy Sim");
sf::Image Icon;
if (Icon.loadFromFile("media/icon[617x480].bmp") && m_pSFMLRenderWindow)
m_pSFMLRenderWindow->setIcon(617, 480, Icon.getPixelsPtr());
@@ -57,9 +57,14 @@ void WindowManager::PollEvents(GUIManager& a_GUIMgr)
m_IsQuittingNextUpdate = true;
break;
}
+ case(Event::KeyPressed):
+ {
+ if(curEvent.key.code = sf::Keyboard::Escape)
+ delete m_pSFMLRenderWindow;
+ break;
+ }
default:
{
- //
//a_GUIMgr.HandleEvent(curEvent);
break;
}
View
9 source/hubris-gamescomp2012.vcxproj
@@ -39,9 +39,10 @@
<PropertyGroup Label="UserMacros" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<LinkIncremental>true</LinkIncremental>
- <IncludePath>F:\mileswhiticker-hubris-gamescomp2012-0003789\include;$(IncludePath)</IncludePath>
- <SourcePath>F:\mileswhiticker-hubris-gamescomp2012-0003789\src\SFGUI;$(SourcePath)</SourcePath>
- <LibraryPath>F:\mileswhiticker-hubris-gamescomp2012-0003789\lib;$(LibraryPath)</LibraryPath>
+ <IncludePath>$\mirrors-lasers\include;$(IncludePath)</IncludePath>
+ <SourcePath>$(SourcePath)</SourcePath>
+ <LibraryPath>$\mirrors-lasers\lib;$(LibraryPath)</LibraryPath>
+ <ExecutablePath>$\mirrors-lasers\bin;$(ExecutablePath)</ExecutablePath>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<LinkIncremental>false</LinkIncremental>
@@ -80,6 +81,7 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="App.cpp" />
+ <ClCompile Include="Block.cpp" />
<ClCompile Include="GameInst.cpp" />
<ClCompile Include="guicon.cpp" />
<ClCompile Include="GUIManager.cpp" />
@@ -97,6 +99,7 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="App.hpp" />
+ <ClInclude Include="Block.hpp" />
<ClInclude Include="Defs.hpp" />
<ClInclude Include="GameInst.hpp" />
<ClInclude Include="guicon.h" />
View
173 source/hubris-gamescomp2012.vcxproj.filters
@@ -1,54 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
- <Filter Include="Source Files">
- <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
- <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
- </Filter>
- <Filter Include="Header Files">
- <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
- <Extensions>h;hpp;hxx;hm;inl;inc;xsd</Extensions>
- </Filter>
- <Filter Include="Resource Files">
- <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
- <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
- </Filter>
- <Filter Include="Source Files\Managers">
- <UniqueIdentifier>{4912f74d-9ba8-4dc6-be49-99018e995e0a}</UniqueIdentifier>
- </Filter>
- <Filter Include="Header Files\Managers">
- <UniqueIdentifier>{17652be1-8e23-4c42-8fa0-18e305bc6d37}</UniqueIdentifier>
- </Filter>
- <Filter Include="Source Files\Application">
- <UniqueIdentifier>{e8fb532b-aac0-40d7-aa2f-c586a17a5708}</UniqueIdentifier>
- </Filter>
- <Filter Include="Header Files\Application">
- <UniqueIdentifier>{e586e69c-1f98-4f8a-8f99-d8ac6cc83323}</UniqueIdentifier>
- </Filter>
- <Filter Include="Source Files\Scenes">
- <UniqueIdentifier>{83ca0ad2-26d7-4363-aeab-63feeac262f4}</UniqueIdentifier>
- </Filter>
- <Filter Include="Header Files\Scenes">
- <UniqueIdentifier>{f6f05b5a-35eb-4bfd-8e35-8a9764371917}</UniqueIdentifier>
- </Filter>
- <Filter Include="Header Files\Game">
- <UniqueIdentifier>{f2a71c2b-315f-4d7e-9d5e-cefc991a1681}</UniqueIdentifier>
- </Filter>
- <Filter Include="Source Files\Game">
- <UniqueIdentifier>{b7e37ece-fbe9-4ee4-ab17-a43cba530fa5}</UniqueIdentifier>
- </Filter>
- <Filter Include="Header Files\Game\Listeners">
- <UniqueIdentifier>{00a61bae-0919-4f25-afdd-c98bceaf0182}</UniqueIdentifier>
- </Filter>
- <Filter Include="Source Files\Game\Listeners">
- <UniqueIdentifier>{da2e7dc2-9742-496a-aeb5-4eef99c120a9}</UniqueIdentifier>
- </Filter>
- </ItemGroup>
- <ItemGroup>
- <ClCompile Include="GUIManager.cpp">
- <Filter>Source Files\Managers</Filter>
+ <ClCompile Include="App.cpp">
+ <Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="WindowManager.cpp">
+ <ClCompile Include="Main.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="GameInst.cpp">
+ <Filter>Source Files\Scenes</Filter>
+ </ClCompile>
+ <ClCompile Include="MainMenu.cpp">
+ <Filter>Source Files\Scenes</Filter>
+ </ClCompile>
+ <ClCompile Include="OptionsMenu.cpp">
+ <Filter>Source Files\Scenes</Filter>
+ </ClCompile>
+ <ClCompile Include="Renderer.cpp">
<Filter>Source Files\Managers</Filter>
</ClCompile>
<ClCompile Include="ResourceManager.cpp">
@@ -57,82 +25,111 @@
<ClCompile Include="SceneManager.cpp">
<Filter>Source Files\Managers</Filter>
</ClCompile>
- <ClCompile Include="guicon.cpp">
- <Filter>Source Files\Application</Filter>
- </ClCompile>
- <ClCompile Include="Main.cpp">
- <Filter>Source Files\Application</Filter>
- </ClCompile>
- <ClCompile Include="Renderer.cpp">
- <Filter>Source Files\Application</Filter>
+ <ClCompile Include="WindowManager.cpp">
+ <Filter>Source Files\Managers</Filter>
</ClCompile>
- <ClCompile Include="App.cpp">
- <Filter>Source Files\Application</Filter>
+ <ClCompile Include="GUIManager.cpp">
+ <Filter>Source Files\Managers</Filter>
</ClCompile>
- <ClCompile Include="MainMenu.cpp">
+ <ClCompile Include="Scene.cpp">
<Filter>Source Files\Scenes</Filter>
</ClCompile>
- <ClCompile Include="GameInst.cpp">
- <Filter>Source Files\Scenes</Filter>
+ <ClCompile Include="Helpers.cpp">
+ <Filter>Source Files\Application</Filter>
</ClCompile>
- <ClCompile Include="OptionsMenu.cpp">
- <Filter>Source Files\Scenes</Filter>
+ <ClCompile Include="guicon.cpp">
+ <Filter>Source Files\Application</Filter>
</ClCompile>
<ClCompile Include="SceneTraversals.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
- <ClCompile Include="Scene.cpp">
- <Filter>Source Files\Scenes</Filter>
- </ClCompile>
- <ClCompile Include="Helpers.cpp">
- <Filter>Source Files</Filter>
+ <Filter>Source Files\Application</Filter>
</ClCompile>
<ClCompile Include="SelectListener.cpp">
- <Filter>Source Files\Game\Listeners</Filter>
+ <Filter>Source Files\Application</Filter>
+ </ClCompile>
+ <ClCompile Include="Block.cpp">
+ <Filter>Source Files\GameObjects</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
- <ClInclude Include="Defs.hpp">
+ <ClInclude Include="App.hpp">
<Filter>Header Files</Filter>
</ClInclude>
- <ClInclude Include="GUIManager.hpp">
- <Filter>Header Files\Managers</Filter>
- </ClInclude>
- <ClInclude Include="ResourceManager.hpp">
- <Filter>Header Files\Managers</Filter>
- </ClInclude>
<ClInclude Include="SceneManager.hpp">
<Filter>Header Files\Managers</Filter>
</ClInclude>
<ClInclude Include="WindowManager.hpp">
<Filter>Header Files\Managers</Filter>
</ClInclude>
- <ClInclude Include="App.hpp">
- <Filter>Header Files\Application</Filter>
- </ClInclude>
- <ClInclude Include="guicon.h">
- <Filter>Header Files\Application</Filter>
+ <ClInclude Include="ResourceManager.hpp">
+ <Filter>Header Files\Managers</Filter>
</ClInclude>
- <ClInclude Include="Renderer.hpp">
- <Filter>Header Files\Application</Filter>
+ <ClInclude Include="OptionsMenu.hpp">
+ <Filter>Header Files\Scenes</Filter>
</ClInclude>
<ClInclude Include="MainMenu.hpp">
<Filter>Header Files\Scenes</Filter>
</ClInclude>
+ <ClInclude Include="GUIManager.hpp">
+ <Filter>Header Files\Managers</Filter>
+ </ClInclude>
<ClInclude Include="GameInst.hpp">
<Filter>Header Files\Scenes</Filter>
</ClInclude>
- <ClInclude Include="OptionsMenu.hpp">
- <Filter>Header Files\Scenes</Filter>
+ <ClInclude Include="Renderer.hpp">
+ <Filter>Header Files\Managers</Filter>
</ClInclude>
<ClInclude Include="Scene.hpp">
<Filter>Header Files\Scenes</Filter>
</ClInclude>
+ <ClInclude Include="guicon.h">
+ <Filter>Header Files\Application</Filter>
+ </ClInclude>
<ClInclude Include="Helpers.hpp">
- <Filter>Header Files</Filter>
+ <Filter>Header Files\Application</Filter>
+ </ClInclude>
+ <ClInclude Include="Defs.hpp">
+ <Filter>Header Files\Application</Filter>
</ClInclude>
<ClInclude Include="SelectListener.hpp">
- <Filter>Header Files\Game\Listeners</Filter>
+ <Filter>Header Files\Application</Filter>
+ </ClInclude>
+ <ClInclude Include="Block.hpp">
+ <Filter>Header Files\GameObjects</Filter>
</ClInclude>
</ItemGroup>
+ <ItemGroup>
+ <Filter Include="Header Files">
+ <UniqueIdentifier>{305a1215-9928-4c23-825e-fc7c4f4e7624}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files">
+ <UniqueIdentifier>{cb32e5d9-b136-4f1d-9d19-971535ee9306}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\Scenes">
+ <UniqueIdentifier>{14931460-10ac-43c2-9eda-8d7a2a66829b}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\Application">
+ <UniqueIdentifier>{f885a1a4-4631-4246-9d97-6bcd40a7ce78}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\Managers">
+ <UniqueIdentifier>{469be92a-3efd-4aab-be5c-d517cbea68aa}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\Managers">
+ <UniqueIdentifier>{d7713966-99e0-4238-9645-a4ca4e17dad0}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\Scenes">
+ <UniqueIdentifier>{14defc0b-3f05-4831-a78a-5a098ac2b88a}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\Application">
+ <UniqueIdentifier>{4a1a74a7-742a-4a85-86bc-74a20315a2b2}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Source Files\GameObjects">
+ <UniqueIdentifier>{c147a50e-c38c-4e7f-bd17-51d24e9d7585}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Header Files\GameObjects">
+ <UniqueIdentifier>{a9d75c54-664e-4dc8-ae10-dce46f67f64b}</UniqueIdentifier>
+ </Filter>
+ <Filter Include="Resource Files">
+ <UniqueIdentifier>{4c9fb107-8654-402d-908c-83ad940f1642}</UniqueIdentifier>
+ </Filter>
+ </ItemGroup>
</Project>
View
BIN source/media/block.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
24 source/media/level.txt
@@ -0,0 +1,24 @@
+################################
+#..............................#
+#..............................<
+#..............................#
+#..............................#
+#..............................#
+#..............................#
+#..............................#
+#..............................#
+#..............................#
+#..............................#
+#..............................#
+#..............................#
+#..............................#
+#..............................#
+#..............................#
+#..............................#
+#..............................#
+#.....p........................#
+#.#########....................#
+#..............................#
+>..............................#
+#..............................#
+################################

0 comments on commit 7428895

Please sign in to comment.
Something went wrong with that request. Please try again.