update glow

voxelinc · Apr 6, 2014 · 889c1a3 · 889c1a3
1 parent 5100705
commit 889c1a3
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 14 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -113,7 +113,8 @@ else()
 endif()
 
 set(GLOW_SOURCE_DIR ${LIB_DIR}/glow)
-include_directories(${GLOW_SOURCE_DIR}/include)
+include_directories(${GLOW_SOURCE_DIR}/source/glow/include)
+include_directories(${GLOW_SOURCE_DIR}/source/glowutils/include)
 
 # Include directories
 include_directories(
@@ -238,7 +239,6 @@ set(INSTALL_LIB           "lib")
 set(OPTION_BUILD_STATIC   OFF)
 option(OPTION_ERRORS_AS_EXCEPTION "Throw exceptions" OFF)
 
-include_directories(${GLOW_SOURCE_DIR}/pre-build/generated)
 add_subdirectory(${GLOW_SOURCE_DIR}/source/glow)
 add_subdirectory(${GLOW_SOURCE_DIR}/source/glowutils)
 
diff --git a/lib/.gitignore b/lib/.gitignore
@@ -12,3 +12,4 @@ glow
 SFML-2.1
 OculusSDK
 lua52
+lua-5.2.3
diff --git a/lib/glow b/lib/glow
diff --git a/src/display/rendering/starfield.cpp b/src/display/rendering/starfield.cpp
@@ -1,6 +1,5 @@
 #include "starfield.h"
 
-#include <glow/Array.h>
 #include <glow/Shader.h>
 #include <glow/VertexArrayObject.h>
 #include <glow/VertexAttributeBinding.h>

diff --git a/src/display/rendering/starfield.h b/src/display/rendering/starfield.h
@@ -6,7 +6,6 @@
 #include <glm/gtc/quaternion.hpp>
 
 #include <glow/ref_ptr.h>
-#include <glow/Array.h>
 
 #include "property/property.h"
 #include "display/rendering/renderpass.h"
@@ -61,7 +60,7 @@ class Starfield : public RenderPass, public ContextDependant {
     glow::ref_ptr<glow::Program> m_shaderProgram;
     glow::ref_ptr<glow::VertexArrayObject> m_vertexArrayObject;
     glow::ref_ptr<glow::Buffer> m_gpuBuffer;
-    glow::Array<StarData> m_cpuBuffer;
+    std::vector<StarData> m_cpuBuffer;
 
     void createAndSetupShaders();
     void createAndSetupGeometry();

diff --git a/src/skybox.cpp b/src/skybox.cpp
@@ -52,11 +52,12 @@ void Skybox::initialize() {
 
 
     /* Geometry */
-    auto vertices = glow::Array<glm::vec3>()
-        << glm::vec3(-1, -1, 0)
-        << glm::vec3(1, -1, 0)
-        << glm::vec3(1, 1, 0)
-        << glm::vec3(-1, 1, 0);
+    std::array<glm::vec3, 4> vertices {
+        glm::vec3(-1, -1, 0),
+        glm::vec3(1, -1, 0),
+        glm::vec3(1, 1, 0),
+        glm::vec3(-1, 1, 0) 
+    };
 
     m_vertexArrayObject = new glow::VertexArrayObject();
 

diff --git a/src/utils/cubemesh.cpp b/src/utils/cubemesh.cpp
@@ -47,7 +47,7 @@ void CubeMesh::bindLinesTo(glow::Program& program, glow::VertexArrayObject& vao,
 void CubeMesh::initialize() {
     //assert(ContextProvider::instance()->available());
 
-    glow::Array<glm::vec3> array{
+    std::array<glm::vec3, 24> array {
         llf, llb, lrb, lrf, llf, lrf, llb, lrb,
         ulf, ulb, urb, urf, ulf, urf, ulb, urb,
         llf, ulf, llb, ulb, lrf, urf, lrb, urb

diff --git a/src/voxel/voxelrenderer.cpp b/src/voxel/voxelrenderer.cpp
@@ -1,4 +1,3 @@
-#include <glow/Array.h>
 #include <glow/Shader.h>
 #include <glow/Texture.h>
 #include <glow/VertexArrayObject.h>

diff --git a/src/voxeleffect/voxelmesh.cpp b/src/voxeleffect/voxelmesh.cpp
@@ -42,7 +42,7 @@ void VoxelMesh::bindTo(
 }
 
 void VoxelMesh::initialize() {
-    glow::Array<glm::vec3> array{
+    std::array<glm::vec3, 28> array {
         urb, dummy,
         lub, dummy,
         rlb, back,