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

Added OpenAL

Browse Source
This commit is contained in:
Adam
2014-03-07 19:14:38 +01:00
parent 18197bf21d
commit 566a5c2d93
23 changed files with 6180 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Escape-the-Dawn/AABB.cpp
-46
View File
@@ -1,46 +0,0 @@
#include "AABB.h"
AABB::AABB(glm::vec3 _volumeVector, glm::vec3 _origin)
{
volumeVector = _volumeVector;
origin = _origin;
CreateBB();
}
void AABB::CreateBB()
{
// Cube 1x1x1, centered on origin
GLfloat vertices[] = {
origin.x - 0.5, origin.y - 0.5, origin.z - 0.5, 1.0,
origin.x + 0.5, origin.y - 0.5, origin.z - 0.5, 1.0,
origin.x + 0.5, origin.y + 0.5, origin.z - 0.5, 1.0,
origin.x - 0.5, origin.y + 0.5, origin.z - 0.5, 1.0,
origin.x - 0.5, origin.y - 0.5, origin.z + 0.5, 1.0,
origin.x + 0.5, origin.y - 0.5, origin.z + 0.5, 1.0,
origin.x + 0.5, origin.y + 0.5, origin.z + 0.5, 1.0,
origin.x - 0.5, origin.y + 0.5, origin.z + 0.5, 1.0,
};
GLuint vbo_vertices;
glGenBuffers(1, &vbo_vertices);
glBindBuffer(GL_ARRAY_BUFFER, vbo_vertices);
glBufferData(GL_ARRAY_BUFFER, sizeof(vertices), vertices, GL_STATIC_DRAW);
glBindBuffer(GL_ARRAY_BUFFER, 0);
GLushort elements[] = {
0, 1, 2, 3,
4, 5, 6, 7,
0, 4, 1, 5,
2, 6, 3, 7
};
GLuint ibo_elements;
glGenBuffers(1, &ibo_elements);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ibo_elements);
glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(elements), elements, GL_STATIC_DRAW);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
glm::vec3 size = glm::vec3(glm::abs(origin.x-volumeVector.x), glm::abs(origin.y-volumeVector.y), glm::abs(origin.z-volumeVector.z));
glm::mat4 transform = glm::translate(glm::mat4(1), origin) * glm::scale(glm::mat4(1), size);
for (int i = 0; i < )
}
Escape-the-Dawn/AABB.h
-23
View File
@@ -1,23 +0,0 @@
#ifndef AABB_h__
#define AABB_h__
#include <GL/glew.h>
//#define GLFW_INCLUDE_GLU
//#include <GLFW/glfw3.h>
//#include <glext.h>
#include <glm/common.hpp>
#include <glm/gtc/matrix_transform.hpp>
class AABB
{
public:
AABB(glm::vec3, glm::vec3);
void CreateBB(void);
private:
glm::vec3 origin;
glm::vec3 volumeVector; //The vector that defines the volume of the BB, it goes from one corner to the opposite one
};
#endif // !AABB_h__
Escape-the-Dawn/Components/Bounds.h
+5 -2
View File
@@ -2,14 +2,17 @@
#define Bounds_h__
#include "Component.h"
#include "AABB.h"
#include <glm/common.hpp>
namespace Components
{
struct Bounds : Component
{
AABB BB; //Axis Aligned Bounding Box
//Axis Aligned Bounding Box
glm::vec3 origin;
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);
Escape-the-Dawn/Escape-the-Dawn.vcxproj
-2
View File
@@ -98,7 +98,6 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="Engine.h" />
<ClCompile Include="AABB.cpp" />
<ClCompile Include="main.cpp" />
<ClCompile Include="Model.cpp" />
<ClCompile Include="Renderer\Renderer.cpp" />
@@ -112,7 +111,6 @@
<ClCompile Include="Systems\SoundsSystem.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="AABB.h" />
<ClInclude Include="Color.h" />
<ClInclude Include="Component.h" />
<ClInclude Include="ComponentFactory.h" />
Escape-the-Dawn/Escape-the-Dawn.vcxproj.filters
-2
View File
@@ -27,7 +27,6 @@
</ClCompile>
<ClCompile Include="Model.cpp" />
<ClCompile Include="Engine.h" />
<ClCompile Include="AABB.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="Component.h" />
@@ -103,7 +102,6 @@
<ClInclude Include="Components\SoundEmitter.h">
<Filter>Components</Filter>
</ClInclude>
<ClInclude Include="AABB.h" />
<ClInclude Include="Color.h" />
</ItemGroup>
<ItemGroup>