BTH/escape-the-dawn
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of github.com:sippeangelo/Escape-the-Dawn

Browse Source 
Conflicts:
	Escape-the-Dawn/AABB.h
	Escape-the-Dawn/Components/Bounds.h
	Escape-the-Dawn/Escape-the-Dawn.vcxproj
	Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters
This commit is contained in:
Adam
2014-03-07 19:17:24 +01:00
parent 566a5c2d93 1f48279bc6
commit 2fa8963e0a
35 changed files with 462 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Escape-the-Dawn.sln
+3
View File
@@ -4,6 +4,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Escape-the-Dawn", "Escape-the-Dawn\Escape-the-Dawn.vcxproj", "{FE405CFA-8FCE-4867-92CF-797E73B36482}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Escape-the-Dawn", "Escape-the-Dawn\Escape-the-Dawn.vcxproj", "{FE405CFA-8FCE-4867-92CF-797E73B36482}"
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tests", "Tests\Tests.vcxproj", "{B9A8F4AA-BE85-45EA-84DD-652D13DD22BE}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Tests", "Tests\Tests.vcxproj", "{B9A8F4AA-BE85-45EA-84DD-652D13DD22BE}"
ProjectSection(ProjectDependencies) = postProject
{A9755CAA-62DC-442D-B82C-F548546CFD38} = {A9755CAA-62DC-442D-B82C-F548546CFD38}
EndProjectSection
EndProject EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Executable", "Executable\Executable.vcxproj", "{A9755CAA-62DC-442D-B82C-F548546CFD38}" Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Executable", "Executable\Executable.vcxproj", "{A9755CAA-62DC-442D-B82C-F548546CFD38}"
EndProject EndProject
Escape-the-Dawn/Component.h
+3 -1
View File
@@ -1,7 +1,7 @@
#ifndef Component_h__ #ifndef Component_h__
#define Component_h__ #define Component_h__
#include "ComponentFactory.h" #include "Factory.h"
#include "Entity.h" #include "Entity.h"
struct Component struct Component
@@ -9,4 +9,6 @@ struct Component
EntityID Entity; EntityID Entity;
}; };
//&static ComponentFactory componentFactory;
#endif // Component_h__ #endif // Component_h__
Escape-the-Dawn/ComponentFactory.h
-51
View File
@@ -1,51 +0,0 @@
#ifndef ComponentFactory_h__
#define ComponentFactory_h__
#include <string>
#include <memory>
#include <functional>
#include <map>
struct Component;
#define REGISTER_COMPONENT(NAME, TYPE) \
static ComponentRegistrar<TYPE> registrar(NAME);
template <typename T>
class ComponentRegistrar
{
public:
ComponentRegistrar(std::string name)
{
ComponentFactory::Instance()->Register(name, [](void) -> std::shared_ptr<Component> { return std::shared_ptr<Component>(new T()); });
}
};
class ComponentFactory
{
public:
static ComponentFactory* Instance()
{
static ComponentFactory factory;
return &factory;
}
void Register(std::string name, std::function<std::shared_ptr<Component>(void)> factoryFunction)
{
m_FactoryFunctions[name] = factoryFunction;
}
std::shared_ptr<Component> Create(std::string name)
{
auto it = m_FactoryFunctions.find(name);
if (it != m_FactoryFunctions.end())
return it->second();
else
return nullptr;
}
private:
std::map<std::string, std::function<std::shared_ptr<Component>(void)>> m_FactoryFunctions;
};
#endif // ComponentFactory_h__
Escape-the-Dawn/Components/Bounds.h
+6 -7
View File
@@ -1,5 +1,5 @@
#ifndef Bounds_h__ #ifndef Components_Bounds_h__
#define Bounds_h__ #define Components_Bounds_h__
#include "Component.h" #include "Component.h"
#include <glm/common.hpp> #include <glm/common.hpp>
@@ -8,13 +8,12 @@
namespace Components namespace Components
{ {
struct Bounds : Component struct Bounds : Component
{ {
//Axis Aligned Bounding Box //Axis Aligned Bounding Box
glm::vec3 origin; glm::vec3 origin;
glm::vec3 volumeVector; //The vector that defines the volume of the BB, it goes from one corner to the opposite one glm::vec3 volumeVector; //The vector that defines the volume of the BB, it goes from one corner to the opposite one
}; };
REGISTER_COMPONENT("Bounds", Bounds);
} }
#endif // !Bounds_h__ #endif // !Components_Bounds_h__
Escape-the-Dawn/Components/Camera.h
+6 -7
View File
@@ -1,18 +1,17 @@
#ifndef Camera_h__ #ifndef Components_Camera_h__
#define Camera_h__ #define Components_Camera_h__
#include "Component.h" #include "Component.h"
namespace Components namespace Components
{ {
struct Camera : Component struct Camera : Component
{ {
int FOV; int FOV;
int NearClip; int NearClip;
int FarClip; int FarClip;
}; };
REGISTER_COMPONENT("Camera", Camera);
} }
#endif // !Camera_h__ #endif // !Components_Camera_h__
Escape-the-Dawn/Components/Collision.h
+8 -8
View File
@@ -1,18 +1,18 @@
#ifndef Collision_h__ #ifndef Components_Collision_h__
#define Collision_h__ #define Components_Collision_h__
#include "Entity.h"
#include "Component.h" #include "Component.h"
#include <vector> #include <vector>
namespace Components namespace Components
{ {
struct Collision : Component struct Collision : Component
{ {
bool Phantom; bool Phantom;
std::vector<int> CollidingEntities; std::vector<EntityID> CollidingEntities;
}; };
REGISTER_COMPONENT("Collision", Collision);
} }
#endif // !Collision_h__ #endif // !Components_Collision_h__
Escape-the-Dawn/Components/DirectionalLight.h
+7 -8
View File
@@ -1,5 +1,5 @@
#ifndef DirectionalLight_h__ #ifndef Components_DirectionalLight_h__
#define DirectionalLight_h__ #define Components_DirectionalLight_h__
#include "Component.h" #include "Component.h"
#include "Color.h" #include "Color.h"
@@ -7,14 +7,13 @@
namespace Components namespace Components
{ {
struct DirectionalLight : Component struct DirectionalLight : Component
{ {
float Intensity; float Intensity;
float MaxRange; float MaxRange;
float SpecularIntensity; float SpecularIntensity;
Color color; Color Color;
}; };
REGISTER_COMPONENT("DirectionalLight", DirectionalLight);
} }
#endif // !DirectionalLight_h__ #endif // !Components_DirectionalLight_h__
Escape-the-Dawn/Components/Input.h
+15 -10
View File
@@ -1,19 +1,24 @@
#ifndef Input_h__ #ifndef Components_Input_h__
#define Input_h__ #define Components_Input_h__
#include <array>
#include <GLFW/glfw3.h>
#include "Component.h" #include "Component.h"
#include <GLFW/glfw3.h>
namespace Components namespace Components
{ {
struct Input : Component struct Input : Component
{ {
int KeyState[GLFW_KEY_LAST]; std::array<int, GLFW_KEY_LAST> KeyState;
float MouseState[2]; std::array<int, GLFW_KEY_LAST> LastKeyState;
std::array<int, GLFW_MOUSE_BUTTON_LAST> MouseState;
std::array<int, GLFW_MOUSE_BUTTON_LAST> LastMouseState;
float dX, dY; float dX, dY;
}; };
REGISTER_COMPONENT("Input", Input);
} }
#endif // !Input_h__
#endif // !Components_Input_h__
Escape-the-Dawn/Components/Model.h
+10 -9
View File
@@ -1,5 +1,7 @@
#ifndef Model_h__ #ifndef Components_Model_h__
#define Model_h__ #define Components_Model_h__
#include <string>
#include "Component.h" #include "Component.h"
#include "Color.h" #include "Color.h"
@@ -7,12 +9,11 @@
namespace Components namespace Components
{ {
struct Model : Component struct Model : Component
{ {
std::string ModelName; std::string ModelFile;
Color color; Color Color;
}; };
REGISTER_COMPONENT("Model", Model);
} }
#endif // !Model_h__ #endif // !Components_Model_h__
Escape-the-Dawn/Components/ParticleEmitter.h
+6 -7
View File
@@ -1,5 +1,5 @@
#ifndef ParticleEmitter_h__ #ifndef Components_ParticleEmitter_h__
#define ParticleEmitter_h__ #define Components_ParticleEmitter_h__
#include "Component.h" #include "Component.h"
#include "Color.h" #include "Color.h"
@@ -8,8 +8,8 @@
namespace Components namespace Components
{ {
struct ParticleEmitter : Component struct ParticleEmitter : Component
{ {
int ParticleTemplate; int ParticleTemplate;
float SpawnFrequency; float SpawnFrequency;
int SpawnCount; int SpawnCount;
@@ -19,8 +19,7 @@ namespace Components
float LifeTime; float LifeTime;
std::vector<float[3]> VelocitySpectrum; std::vector<float[3]> VelocitySpectrum;
std::vector<float[3]> AngularVelocitySpectrum; std::vector<float[3]> AngularVelocitySpectrum;
}; };
REGISTER_COMPONENT("ParticleEmitter", ParticleEmitter);
} }
#endif // !ParticleEmitter_h__ #endif // !Components_ParticleEmitter_h__
Escape-the-Dawn/Components/PointLight.h
+7 -8
View File
@@ -1,5 +1,5 @@
#ifndef PointLight_h__ #ifndef Components_PointLight_h__
#define PointLight_h__ #define Components_PointLight_h__
#include "Component.h" #include "Component.h"
#include "Color.h" #include "Color.h"
@@ -7,14 +7,13 @@
namespace Components namespace Components
{ {
struct PointLight : Component struct PointLight : Component
{ {
float Intensity; float Intensity;
float MaxRange; float MaxRange;
float SpecularIntensity; float SpecularIntensity;
Color color; Color Color;
}; };
REGISTER_COMPONENT("PointLight", PointLight);
} }
#endif // !PointLight_h__ #endif // !Components_PointLight_h__
Escape-the-Dawn/Components/PowerUp.h
+7 -8
View File
@@ -1,16 +1,15 @@
#ifndef PowerUp_h__ #ifndef Components_PowerUp_h__
#define PowerUp_h__ #define Components_PowerUp_h__
#include "Component.h" #include "Component.h"
namespace Components namespace Components
{ {
struct PowerUp : Component struct PowerUp : Component
{ {
int Speed; float Speed;
}; };
REGISTER_COMPONENT("PowerUp", PowerUp);
} }
#endif // !PowerUp_h__ #endif // !Components_PowerUp_h__
Escape-the-Dawn/Components/SoundEmitter.h
+8 -7
View File
@@ -1,18 +1,19 @@
#ifndef SoundEmitter_h__ #ifndef Components_SoundEmitter_h__
#define SoundEmitter_h__ #define Components_SoundEmitter_h__
#include <string>
#include "Component.h" #include "Component.h"
namespace Components namespace Components
{ {
struct SoundEmitter : Component struct SoundEmitter : Component
{ {
std::string SoundFile; std::string SoundFile;
float Volume; float Volume;
float MaxRange; float MaxRange;
}; };
REGISTER_COMPONENT("SoundEmitter", SoundEmitter);
} }
#endif // !SoundEmitter_h__ #endif // !Components_SoundEmitter_h__
Escape-the-Dawn/Components/Sprite.h
+9 -8
View File
@@ -1,5 +1,7 @@
#ifndef Sprite_h__ #ifndef Components_Sprite_h__
#define Sprite_h__ #define Components_Sprite_h__
#include <string>
#include "Component.h" #include "Component.h"
#include "Color.h" #include "Color.h"
@@ -7,12 +9,11 @@
namespace Components namespace Components
{ {
struct Sprite : Component struct Sprite : Component
{ {
std::string SpriteFile; std::string SpriteFile;
Color color; Color Color;
}; };
REGISTER_COMPONENT("Sprite", Sprite);
} }
#endif // !Sprite_h__ #endif // !Components_Sprite_h__
Escape-the-Dawn/Components/Stat.h
+7 -8
View File
@@ -1,17 +1,16 @@
#ifndef Stat_h__ #ifndef Components_Stat_h__
#define Stat_h__ #define Components_Stat_h__
#include "Component.h" #include "Component.h"
namespace Components namespace Components
{ {
struct Stat : Component struct Stat : Component
{ {
int Health; float Health;
bool Destroyable; bool Destroyable;
}; };
REGISTER_COMPONENT("Stat", Stat);
} }
#endif // !Stat_h__ #endif // !Components_Stat_h__
Escape-the-Dawn/Components/Template.h
+4 -5
View File
@@ -1,13 +1,12 @@
#ifndef Template_h__ #ifndef Components_Template_h__
#define Template_h__ #define Components_Template_h__
#include "Component.h" #include "Component.h"
namespace Components namespace Components
{ {
struct Template : Component { }; struct Template : Component { };
REGISTER_COMPONENT("Template", Template);
} }
#endif // !Template_h__ #endif // !Components_Template_h__
Escape-the-Dawn/Components/Transform.h
+19
View File
@@ -0,0 +1,19 @@
#ifndef Components_Transform_h__
#define Components_Transform_h__
#include "Component.h"
#include <glm/gtc/quaternion.hpp>
namespace Components
{
struct Transform : Component
{
glm::vec3 Position;
glm::quat Orientation;
glm::vec3 Velocity;
};
}
#endif // Components_Transform_h__
Escape-the-Dawn/Components/TransformComponent.h
-19
View File
@@ -1,19 +0,0 @@
#ifndef Transform_h__
#define Transform_h__
#include "Component.h"
#include <glm/gtc/quaternion.hpp>
namespace Components
{
struct Transform : Component
{
float Position[3];
glm::fquat qtrn; //Quaternion with floats
float Velocity[3];
};
REGISTER_COMPONENT("Transform", Transform);
}
#endif // Transform_h__
Escape-the-Dawn/Engine.h
+14 -35
View File
@@ -11,53 +11,32 @@
#include "World.h" #include "World.h"
class Engine class Engine
{ {
public: public:
Engine(int argc, char* argv[]) Engine(int argc, char* argv[])
{ {
// Initialize GLFW renderer.Initialize();
if (!glfwInit()) { m_LastTime = glfwGetTime();
LOG_ERROR("GLFW: Initialization failed");
exit(EXIT_FAILURE);
} }
// Create a window bool Running() const { return !glfwWindowShouldClose(renderer.GetWindow()); }
m_Window = glfwCreateWindow(1280, 720, "OpenGL", nullptr, nullptr);
if (!m_Window) {
LOG_ERROR("GLFW: Failed to create window");
exit(EXIT_FAILURE);
}
glfwMakeContextCurrent(m_Window);
// GL version info
glGetIntegerv(GL_MAJOR_VERSION, &glVersion[0]);
glGetIntegerv(GL_MINOR_VERSION, &glVersion[1]);
glVendor = (GLchar*)glGetString(GL_VENDOR);
std::stringstream ss;
ss << glVendor << " OpenGL " << glVersion[0] << "." << glVersion[1];
#ifdef DEBUG
ss << " DEBUG";
#endif
LOG_INFO(ss.str().c_str());
glfwSetWindowTitle(m_Window, ss.str().c_str());
// Initialize GLEW
if (glewInit() != GLEW_OK) {
LOG_ERROR("GLEW: Initialization failed");
exit(EXIT_FAILURE);
}
}
bool Running() const { return !glfwWindowShouldClose(m_Window); }
void Tick() void Tick()
{ {
double currentTime = glfwGetTime();
double dt = currentTime - m_LastTime;
m_LastTime = currentTime;
//World.Update(dt);
renderer.Draw(dt);
glfwPollEvents(); glfwPollEvents();
} }
private: private:
GLFWwindow* m_Window; Renderer renderer;
GLint glVersion[2]; double m_LastTime;
GLchar* glVendor;
}; };
Escape-the-Dawn/Escape-the-Dawn.vcxproj
+5 -5
View File
@@ -98,9 +98,9 @@
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="Engine.h" /> <ClCompile Include="Engine.h" />
<ClCompile Include="main.cpp" />
<ClCompile Include="Model.cpp" /> <ClCompile Include="Model.cpp" />
<ClCompile Include="Renderer\Renderer.cpp" /> <ClCompile Include="Renderer.cpp" />
<ClCompile Include="ShaderProgram.cpp" />
<ClCompile Include="Systems\CollisionSystem.cpp" /> <ClCompile Include="Systems\CollisionSystem.cpp" />
<ClCompile Include="World.cpp" /> <ClCompile Include="World.cpp" />
<ClCompile Include="Systems\InputSystem.cpp" /> <ClCompile Include="Systems\InputSystem.cpp" />
@@ -113,9 +113,9 @@
<ItemGroup> <ItemGroup>
<ClInclude Include="Color.h" /> <ClInclude Include="Color.h" />
<ClInclude Include="Component.h" /> <ClInclude Include="Component.h" />
<ClInclude Include="ComponentFactory.h" />
<ClInclude Include="Components\Bounds.h" />
<ClInclude Include="Components\Camera.h" /> <ClInclude Include="Components\Camera.h" />
<ClInclude Include="Factory.h" />
<ClInclude Include="Components\Bounds.h" />
<ClInclude Include="Components\Collision.h" /> <ClInclude Include="Components\Collision.h" />
<ClInclude Include="Components\DirectionalLight.h" /> <ClInclude Include="Components\DirectionalLight.h" />
<ClInclude Include="Components\Input.h" /> <ClInclude Include="Components\Input.h" />
@@ -132,7 +132,7 @@
<ClInclude Include="logging.h" /> <ClInclude Include="logging.h" />
<ClInclude Include="glerror.h" /> <ClInclude Include="glerror.h" />
<ClInclude Include="Model.h" /> <ClInclude Include="Model.h" />
<ClInclude Include="Renderer\Renderer.h" /> <ClInclude Include="Renderer.h" />
<ClInclude Include="ShaderProgram.h" /> <ClInclude Include="ShaderProgram.h" />
<ClInclude Include="Systems\InputSystem.h" /> <ClInclude Include="Systems\InputSystem.h" />
<ClInclude Include="System.h" /> <ClInclude Include="System.h" />
Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters
+25 -18
View File
@@ -1,8 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup> <ItemGroup>
<ClCompile Include="main.cpp" />
<ClCompile Include="Renderer\Renderer.cpp" />
<ClCompile Include="World.cpp" /> <ClCompile Include="World.cpp" />
<ClCompile Include="Systems\CollisionSystem.cpp"> <ClCompile Include="Systems\CollisionSystem.cpp">
<Filter>Systems</Filter> <Filter>Systems</Filter>
@@ -27,14 +25,12 @@
</ClCompile> </ClCompile>
<ClCompile Include="Model.cpp" /> <ClCompile Include="Model.cpp" />
<ClCompile Include="Engine.h" /> <ClCompile Include="Engine.h" />
<ClCompile Include="Renderer.cpp" />
<ClCompile Include="ShaderProgram.cpp" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="Component.h" /> <ClInclude Include="Component.h" />
<ClInclude Include="ComponentFactory.h" />
<ClInclude Include="Entity.h" /> <ClInclude Include="Entity.h" />
<ClInclude Include="logging.h" />
<ClInclude Include="glerror.h" />
<ClInclude Include="Renderer\Renderer.h" />
<ClInclude Include="System.h" /> <ClInclude Include="System.h" />
<ClInclude Include="World.h" /> <ClInclude Include="World.h" />
<ClInclude Include="Systems\CollisionSystem.h"> <ClInclude Include="Systems\CollisionSystem.h">
@@ -63,18 +59,6 @@
<Filter>Components</Filter> <Filter>Components</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="ShaderProgram.h" /> <ClInclude Include="ShaderProgram.h" />
<ClInclude Include="Components\Bounds.h">
<Filter>Components</Filter>
</ClInclude>
<ClInclude Include="Components\Camera.h">
<Filter>Components</Filter>
</ClInclude>
<ClInclude Include="Components\Collision.h">
<Filter>Components</Filter>
</ClInclude>
<ClInclude Include="Components\DirectionalLight.h">
<Filter>Components</Filter>
</ClInclude>
<ClInclude Include="Components\Input.h"> <ClInclude Include="Components\Input.h">
<Filter>Components</Filter> <Filter>Components</Filter>
</ClInclude> </ClInclude>
@@ -103,6 +87,26 @@
<Filter>Components</Filter> <Filter>Components</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="Color.h" /> <ClInclude Include="Color.h" />
<ClInclude Include="Factory.h" />
<ClInclude Include="Components\DirectionalLight.h">
<Filter>Components</Filter>
</ClInclude>
<ClInclude Include="Components\Collision.h">
<Filter>Components</Filter>
</ClInclude>
<ClInclude Include="Components\Camera.h">
<Filter>Components</Filter>
</ClInclude>
<ClInclude Include="Components\Bounds.h">
<Filter>Components</Filter>
</ClInclude>
<ClInclude Include="glerror.h">
<Filter>Util</Filter>
</ClInclude>
<ClInclude Include="logging.h">
<Filter>Util</Filter>
</ClInclude>
<ClInclude Include="Renderer.h" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="Shaders\Fragment.glsl"> <None Include="Shaders\Fragment.glsl">
@@ -122,5 +126,8 @@
<Filter Include="Shaders"> <Filter Include="Shaders">
<UniqueIdentifier>{54f1eb6f-dc00-4e97-a3ef-ac255d755e2e}</UniqueIdentifier> <UniqueIdentifier>{54f1eb6f-dc00-4e97-a3ef-ac255d755e2e}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="Util">
<UniqueIdentifier>{d985d7a7-c041-46fe-ae03-aa40295a7aad}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
</Project> </Project>
Escape-the-Dawn/Factory.h
+35
View File
@@ -0,0 +1,35 @@
#ifndef ComponentFactory_h__
#define ComponentFactory_h__
#include <string>
#include <memory>
#include <functional>
#include <map>
template <typename T>
class Factory
{
public:
void Register(std::string name, std::function<T(void)> factoryFunction)
{
m_FactoryFunctions[name] = factoryFunction;
}
T Create(std::string name)
{
auto it = m_FactoryFunctions.find(name);
if (it != m_FactoryFunctions.end()) {
return it->second();
} else {
return nullptr;
}
}
private:
std::map<std::string, std::function<T(void)>> m_FactoryFunctions;
};
struct Component;
class ComponentFactory : public Factory<Component*> { };
#endif // ComponentFactory_h__
Escape-the-Dawn/Renderer.cpp
+59 -46
View File
@@ -1,64 +1,77 @@
#include "Renderer/Renderer.h" #include "Renderer.h"
Renderer::Renderer() Renderer::Renderer()
{ {
} }
void Renderer::Draw() void Renderer::Initialize()
{ {
// Initialize GLFW
if (!glfwInit()) {
LOG_ERROR("GLFW: Initialization failed");
exit(EXIT_FAILURE);
}
// Create a window
m_Window = glfwCreateWindow(1280, 720, "OpenGL", nullptr, nullptr);
if (!m_Window) {
LOG_ERROR("GLFW: Failed to create window");
exit(EXIT_FAILURE);
}
glfwMakeContextCurrent(m_Window);
// GL version info
glGetIntegerv(GL_MAJOR_VERSION, &m_glVersion[0]);
glGetIntegerv(GL_MINOR_VERSION, &m_glVersion[1]);
m_glVendor = (GLchar*)glGetString(GL_VENDOR);
std::stringstream ss;
ss << m_glVendor << " OpenGL " << m_glVersion[0] << "." << m_glVersion[1];
#ifdef DEBUG
ss << " DEBUG";
#endif
LOG_INFO(ss.str().c_str());
glfwSetWindowTitle(m_Window, ss.str().c_str());
// Initialize GLEW
if (glewInit() != GLEW_OK) {
LOG_ERROR("GLEW: Initialization failed");
exit(EXIT_FAILURE);
}
glEnable(GL_DEPTH_TEST);
LoadContent();
}
void Renderer::Draw(double _dt)
{
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glClearColor(1.0f, 1.0f, 0.0f, 1.0f);
//m_ShaderProgram->Bind();
glfwSwapBuffers(m_Window);
} }
void Renderer::DrawText() void Renderer::DrawText()
{ {
//DrawShitInTextForm
}
void Renderer::AddTextToDraw()
{
//Add to draw shit vector
}
void Renderer::AddModelToDraw(Model* _model)
{
ModelsToRender.push_back(_model);
} }
//Fixa med shaders, lägga in alla verts osv. //Fixa med shaders, lägga in alla verts osv.
void Renderer::LoadContent()
GLuint Renderer::CompileShader(GLenum shaderType, std::string fileName)
{ {
std::string shaderFile; m_ShaderProgram->AddShader(std::unique_ptr<Shader>(new VertexShader("Shaders/Vertex.glsl")));
std::ifstream in(fileName, std::ios::in); m_ShaderProgram->AddShader(std::unique_ptr<Shader>(new FragmentShader("Shaders/Fragment.glsl")));
m_ShaderProgram->Link();
if(!in)
{
LOG_ERROR("Error: Failed to open shader file %s", fileName);
return 0;
}
in.seekg(0, std::ios::end);
shaderFile.resize((int)in.tellg());
in.seekg(0, std::ios::beg);
in.read(&shaderFile[0], shaderFile.size());
in.close();
GLuint shader = glCreateShader(shaderType); //GL_VERTEX_SHADER, GL_FRAGMENT_SHADER
if(GLERROR("glCreateShader"))
return 0;
const GLchar* shaderFiles = shaderFile.c_str();
const GLint length = shaderFile.length();
glShaderSource(shader, 1, &shaderFiles, &length);
if(GLERROR("glShaderSource"))
return 0;
glCompileShader(shader);
GLint compileStatus;
glGetShaderiv(shader, GL_COMPILE_STATUS, &compileStatus);
if(compileStatus != GL_TRUE)
{
GLsizei infoLogLength;
glGetShaderiv(shader, GL_INFO_LOG_LENGTH, &infoLogLength);
GLchar* infolog = new GLchar[infoLogLength];
glGetShaderInfoLog(shader, infoLogLength, &infoLogLength, infolog);
std::cerr << infolog << std::endl;
delete[] infolog;
}
if(GLERROR("glCompileShader"))
return 0;
return shader;
} }
Escape-the-Dawn/Renderer.h
+22 -5
View File
@@ -1,3 +1,6 @@
#ifndef Renderer_h__
#define Renderer_h__
#include <string> #include <string>
#include <fstream> #include <fstream>
#include <iostream> #include <iostream>
@@ -16,19 +19,33 @@
#include <glm/gtc/type_ptr.hpp> #include <glm/gtc/type_ptr.hpp>
#include "glerror.h" #include "glerror.h"
#include "ShaderProgram.h"
#include "Model.h"
class Renderer class Renderer
{ {
public: public:
GLuint shaderProgram; std::shared_ptr<ShaderProgram> m_ShaderProgram;
GLuint VAO;
std::vector<Model*> ModelsToRender;
Renderer(); Renderer();
void Draw(); void Initialize();
void Draw(double dt);
void DrawText(); void DrawText();
GLuint CompileShader(GLenum, std::string); void AddModelToDraw(Model*);
void AddTextToDraw();
void LoadContent();
GLFWwindow* GetWindow() const { return m_Window; }
private:
GLFWwindow* m_Window;
GLint m_glVersion[2];
GLchar* m_glVendor;
}; };
#endif // Renderer_h__
Escape-the-Dawn/Renderer/Renderer.cpp
-38
View File
@@ -1,38 +0,0 @@
#include "Renderer.h"
Renderer::Renderer()
{
glEnable(GL_DEPTH_TEST);
}
void Renderer::Draw()
{
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
glClearColor(1.0f, 1.0f, 0.0f, 1.0f);
m_ShaderProgram->Bind();
}
void Renderer::DrawText()
{
//DrawShitInTextForm
}
void Renderer::AddTextToDraw()
{
//Add to draw shit vector
}
void Renderer::AddObjectToDraw()
{
}
//Fixa med shaders, lägga in alla verts osv.
void Renderer::LoadContent()
{
m_ShaderProgram->AddShader(std::unique_ptr<Shader>(new VertexShader("Shaders/Vertex.glsl")));
m_ShaderProgram->AddShader(std::unique_ptr<Shader>(new FragmentShader("Shaders/Fragment.glsl")));
m_ShaderProgram->Link();
}
Escape-the-Dawn/Renderer/Renderer.h
-42
View File
@@ -1,42 +0,0 @@
#include <string>
#include <fstream>
#include <iostream>
#include <sstream>
#include <vector>
#define _CRT_SECURE_NO_WARNINGS
#include <GL/glew.h>
#define GLFW_INCLUDE_GLU
#include <GLFW/glfw3.h>
#include <glext.h>
#define GLM_FORCE_RADIANS
#include <glm/glm.hpp>
#include <glm/gtc/constants.hpp>
#include <glm/gtc/matrix_transform.hpp>
#include <glm/gtc/type_ptr.hpp>
#include "glerror.h"
#include "ShaderProgram.h"
class Renderer
{
public:
std::shared_ptr<ShaderProgram> m_ShaderProgram;
GLuint VAO;
std::vector<std::vector<float>> Vertices;
std::vector<std::vector<float>> Normals;
std::vector<std::vector<float>> TextureCoords;
Renderer();
void Draw();
void DrawText();
void AddObjectToDraw();
void AddTextToDraw();
void LoadContent();
GLuint CompileShader(GLenum, std::string);
};
Escape-the-Dawn/ShaderProgram.cpp
+3 -1
View File
@@ -105,7 +105,9 @@ ShaderProgram::~ShaderProgram()
void ShaderProgram::AddShader(std::unique_ptr<Shader> shader) void ShaderProgram::AddShader(std::unique_ptr<Shader> shader)
{ {
if (!shader->IsCompiled()) { if (!shader->IsCompiled()) {
shader->Compile(); if (shader->Compile() == 0) {
return;
}
} }
m_Shaders.push_back(std::move(shader)); m_Shaders.push_back(std::move(shader));
Escape-the-Dawn/System.h
+4 -1
View File
@@ -11,7 +11,10 @@ public:
System(World* world) : m_World(world) { } System(World* world) : m_World(world) { }
virtual ~System() { } virtual ~System() { }
virtual void Update(double dt, EntityID entity, EntityID parent) = 0; // Called once per system every tick
virtual void Update(double dt) { }
// Called once for every entity in the world every tick
virtual void Update(double dt, EntityID entity, EntityID parent) { }
protected: protected:
World* m_World; World* m_World;
Escape-the-Dawn/Systems/CollisionSystem.h
+1 -2
View File
@@ -4,8 +4,7 @@
#include "System.h" #include "System.h"
#include "logging.h" #include "logging.h"
#include "Components/TransformComponent.h" #include "Components/Transform.h"
namespace Systems namespace Systems
{ {
Escape-the-Dawn/Systems/InputSystem.cpp
+40
View File
@@ -0,0 +1,40 @@
#include "InputSystem.h"
#include "World.h"
void Systems::InputSystem::Update(double dt)
{
m_LastKeyState = m_CurrentKeyState;
m_LastMouseState = m_CurrentMouseState;
// Keyboard input
for (int i = 0; i <= GLFW_KEY_LAST; ++i) {
m_CurrentKeyState[i] = glfwGetKey(m_Renderer->GetWindow(), i);
}
// Mouse buttons
for (int i = 0; i <= GLFW_MOUSE_BUTTON_LAST; ++i) {
m_CurrentKeyState[i] = glfwGetMouseButton(m_Renderer->GetWindow(), i);
}
// Cursor position
double xpos, ypos;
glfwGetCursorPos(m_Renderer->GetWindow(), &xpos, &ypos);
m_CurrentMouseDeltaX = xpos - m_LastMouseX;
m_CurrentMouseDeltaY = ypos - m_LastMouseY;
m_LastMouseX = xpos;
m_LastMouseY = ypos;
}
void Systems::InputSystem::Update(double dt, EntityID entity, EntityID parent)
{
auto input = m_World->GetComponent<Components::Input>(entity, "Input");
if (input == nullptr)
return;
input->KeyState = m_CurrentKeyState;
input->LastKeyState = m_LastKeyState;
input->MouseState = m_CurrentMouseState;
input->LastMouseState = m_LastMouseState;
input->dX = m_CurrentMouseDeltaX;
input->dY = m_CurrentMouseDeltaY;
}
Escape-the-Dawn/Systems/InputSystem.h
+35
View File
@@ -0,0 +1,35 @@
#ifndef InputSystem_h__
#define InputSystem_h__
#include <array>
#include "System.h"
#include "Renderer.h"
#include "Components/Input.h"
namespace Systems
{
class InputSystem : public System
{
public:
InputSystem(World* world, Renderer* renderer)
: System(world), m_Renderer(renderer) { }
void Update(double dt) override;
void Update(double dt, EntityID entity, EntityID parent) override;
private:
Renderer* m_Renderer;
std::array<int, GLFW_KEY_LAST> m_CurrentKeyState;
std::array<int, GLFW_KEY_LAST> m_LastKeyState;
std::array<int, GLFW_MOUSE_BUTTON_LAST> m_CurrentMouseState;
std::array<int, GLFW_MOUSE_BUTTON_LAST> m_LastMouseState;
float m_CurrentMouseDeltaX, m_CurrentMouseDeltaY;
float m_LastMouseX, m_LastMouseY;
};
}
#endif // InputSystem_h__
Escape-the-Dawn/World.cpp
+16
View File
@@ -32,6 +32,7 @@ void World::RecursiveUpdate(std::shared_ptr<System> system, double dt, EntityID
void World::Update(double dt) void World::Update(double dt)
{ {
for (auto system : m_Systems) { for (auto system : m_Systems) {
system->Update(dt);
RecursiveUpdate(system, dt, 0); RecursiveUpdate(system, dt, 0);
} }
} }
@@ -84,4 +85,19 @@ World::World()
m_LastEntityID = 0; m_LastEntityID = 0;
m_Systems.push_back(std::make_shared<Systems::Collision>(this)); m_Systems.push_back(std::make_shared<Systems::Collision>(this));
RegisterComponents();
RegisterSystems();
}
void World::RegisterComponents()
{
m_ComponentFactory.Register("Transform", []() { return new Components::Transform(); });
m_ComponentFactory.Register("Input", []() { return new Components::Input(); });
m_ComponentFactory.Register("DirectionalLight", []() { return new Components::DirectionalLight(); });
}
void World::RegisterSystems()
{
} }
Escape-the-Dawn/World.h
+23 -4
View File
@@ -6,9 +6,15 @@
#include <vector> #include <vector>
#include <string> #include <string>
#include "Renderer.h"
#include "Entity.h" #include "Entity.h"
#include "Component.h" #include "Component.h"
#include "ComponentFactory.h" #include "Factory.h"
#include "Components/Transform.h"
#include "Components/Input.h"
#include "Components/DirectionalLight.h"
#include "System.h" #include "System.h"
#include "Systems/CollisionSystem.h" #include "Systems/CollisionSystem.h"
@@ -18,6 +24,9 @@ public:
World(); World();
~World(); ~World();
virtual void RegisterComponents();
virtual void RegisterSystems();
EntityID CreateEntity(EntityID parent = 0); EntityID CreateEntity(EntityID parent = 0);
void RemoveEntity(EntityID entity); void RemoveEntity(EntityID entity);
@@ -29,12 +38,22 @@ public:
template <class T> template <class T>
std::shared_ptr<T> AddComponent(EntityID entity, std::string componentType) std::shared_ptr<T> AddComponent(EntityID entity, std::string componentType)
{ {
std::shared_ptr<T> component = std::static_pointer_cast<T>(ComponentFactory::Instance()->Create(componentType)); std::shared_ptr<T> component = std::shared_ptr<T>(static_cast<T*>(m_ComponentFactory.Create(componentType)));
if (component == nullptr) {
LOG_ERROR("Failed to attach invalid component \"%s\" to entity #%i", componentType.c_str(), entity);
return nullptr;
}
m_ComponentsOfType[componentType].push_back(component); m_ComponentsOfType[componentType].push_back(component);
m_EntityComponents[entity][componentType] = component; m_EntityComponents[entity][componentType] = component;
return component; return component;
} }
std::shared_ptr<Component> AddComponent(EntityID entity, std::string componentType)
{
return AddComponent<Component>(entity, componentType);
}
template <class T> template <class T>
std::shared_ptr<T> GetComponent(EntityID entity, std::string componentType) std::shared_ptr<T> GetComponent(EntityID entity, std::string componentType)
{ {
@@ -45,9 +64,8 @@ public:
void AddSystem(System* system); void AddSystem(System* system);
// Recursively update through the scene graph
void Update(double dt); void Update(double dt);
// Recursively update through the scene graph
void RecursiveUpdate(std::shared_ptr<System> system, double dt, EntityID parentEntity); void RecursiveUpdate(std::shared_ptr<System> system, double dt, EntityID parentEntity);
private: private:
@@ -56,6 +74,7 @@ private:
// A bottom to top tree. A map of child entities to parent entities. // A bottom to top tree. A map of child entities to parent entities.
std::unordered_map<EntityID, EntityID> m_EntityParents; std::unordered_map<EntityID, EntityID> m_EntityParents;
ComponentFactory m_ComponentFactory;
std::unordered_map<std::string, std::vector<std::shared_ptr<Component>>> m_ComponentsOfType; std::unordered_map<std::string, std::vector<std::shared_ptr<Component>>> m_ComponentsOfType;
std::unordered_map<EntityID, std::map<std::string, std::shared_ptr<Component>>> m_EntityComponents; std::unordered_map<EntityID, std::map<std::string, std::shared_ptr<Component>>> m_EntityComponents;
std::vector<std::shared_ptr<System>> m_Systems; std::vector<std::shared_ptr<System>> m_Systems;
Tests/Tests.vcxproj
+14
View File
@@ -63,6 +63,13 @@
</Link> </Link>
<PostBuildEvent /> <PostBuildEvent />
<PostBuildEvent /> <PostBuildEvent />
<PreBuildEvent />
<PostBuildEvent>
<Command>$(OutDir)$(TargetName)$(TargetExt) --log_level=test_suite</Command>
</PostBuildEvent>
<PostBuildEvent>
<Message>Running tests</Message>
</PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile> <ClCompile>
@@ -78,6 +85,13 @@
<OptimizeReferences>true</OptimizeReferences> <OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>boost_unit_test_framework-vc110-1_55.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>boost_unit_test_framework-vc110-1_55.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
<PreBuildEvent />
<PostBuildEvent>
<Command>$(OutDir)$(TargetName)$(TargetExt) --log_level=test_suite</Command>
</PostBuildEvent>
<PostBuildEvent>
<Message>Running tests</Message>
</PostBuildEvent>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="main.cpp" /> <ClCompile Include="main.cpp" />
Tests/main.cpp
+12 -1
View File
@@ -1,5 +1,7 @@
#include "logging.h"
#include "World.h" #include "World.h"
#include "Components/TransformComponent.h" #include "Components/Transform.h"
#define BOOST_TEST_MODULE World #define BOOST_TEST_MODULE World
#define BOOST_TEST_DYN_LINK #define BOOST_TEST_DYN_LINK
@@ -51,3 +53,12 @@ BOOST_AUTO_TEST_CASE(Recycling)
EntityID ent12 = world.CreateEntity(); // 1 EntityID ent12 = world.CreateEntity(); // 1
BOOST_REQUIRE(ent11 == ent12); BOOST_REQUIRE(ent11 == ent12);
} }
BOOST_AUTO_TEST_CASE(ComponentCreation)
{
World world;
EntityID ent = world.CreateEntity();
BOOST_CHECK(world.AddComponent(ent, "Transform") != nullptr);
BOOST_CHECK(world.AddComponent(ent, "Input") != nullptr);
}