Revert "Indentation style changed to Horstmann"

This reverts commit f2259f712d.

Conflicts:

	src/GameWorld.cpp
	src/Systems/PhysicsSystem.cpp
This commit is contained in:
2014-04-12 01:48:15 +02:00
parent d7e65ff118
commit 3470a80f40
61 changed files with 697 additions and 354 deletions
+10 -5
View File
@@ -2,7 +2,8 @@
#include "Skybox.h"
Skybox::Skybox(std::string skyboxPath, std::string extension /* = "png" */)
{ m_Cubemap = std::make_shared<CubemapTexture>(
{
m_Cubemap = std::make_shared<CubemapTexture>(
skyboxPath + "/right." + extension,
skyboxPath + "/left." + extension,
skyboxPath + "/top." + extension,
@@ -14,8 +15,10 @@ Skybox::Skybox(std::string skyboxPath, std::string extension /* = "png" */)
}
void Skybox::Initialize()
{ float cubeVertices[] =
{ -1.0f, -1.0f, -1.0f,
{
float cubeVertices[] =
{
-1.0f, -1.0f, -1.0f,
1.0f, -1.0f, -1.0f,
1.0f, 1.0f, -1.0f,
-1.0f, 1.0f, -1.0f,
@@ -28,7 +31,8 @@ void Skybox::Initialize()
//std::copy(cubeVertices, cubeVertices + (3*8 - 1), m_CubeVertices);
unsigned int cubeIndices[] =
{ // Back
{
// Back
0, 2, 3,
0, 1, 2,
@@ -78,7 +82,8 @@ Skybox::~Skybox()
}
void Skybox::Draw()
{ m_Cubemap->Bind(GL_TEXTURE0);
{
m_Cubemap->Bind(GL_TEXTURE0);
glBindVertexArray(vao);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, ibo);