selim/gltest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

some raw pointers replaced by smart ones

Browse Source
This commit is contained in:
Selim Mustafaev 2016-03-03 23:10:52 +03:00
parent 95b0032de1
commit ff4a68d942
4 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/GLObjects/GLObject.cpp
View File

@ -12,8 +12,12 @@ GLObject::~GLObject() {
} }
void GLObject::create() { void GLObject::create() {
auto vData = generateVertices(); std::size_t iCount = 0, vCount = 0;
auto iData = generateIndices(); std::unique_ptr<Vertex[]> vArray;
std::unique_ptr<GLuint[]> iArray;
std::tie(vArray, vCount) = generateVertices();
std::tie(iArray, iCount) = generateIndices();
GLuint vbo[2]; GLuint vbo[2];
glGenBuffers(2, vbo); glGenBuffers(2, vbo);
@ -21,11 +25,11 @@ void GLObject::create() {
_indexVbo = vbo[1]; _indexVbo = vbo[1];
glBindBuffer(GL_ARRAY_BUFFER, _vertexVbo); glBindBuffer(GL_ARRAY_BUFFER, _vertexVbo);
glBufferData(GL_ARRAY_BUFFER, std::get<1>(vData), std::get<0>(vData), GL_STREAM_DRAW); glBufferData(GL_ARRAY_BUFFER, vCount, vArray.get(), GL_STREAM_DRAW);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _indexVbo); glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _indexVbo);
glBufferData(GL_ELEMENT_ARRAY_BUFFER, std::get<1>(iData), std::get<0>(iData), GL_STATIC_DRAW); glBufferData(GL_ELEMENT_ARRAY_BUFFER, iCount, iArray.get(), GL_STATIC_DRAW);
_trianglesCount = std::get<1>(iData)/sizeof(GLuint); _trianglesCount = iCount/sizeof(GLuint);
glGenVertexArrays(1, &_vao); glGenVertexArrays(1, &_vao);
glBindVertexArray(_vao); glBindVertexArray(_vao);
@ -34,9 +38,6 @@ void GLObject::create() {
glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(Vertex), nullptr); glVertexAttribPointer(0, 3, GL_FLOAT, GL_FALSE, sizeof(Vertex), nullptr);
glEnableVertexAttribArray(1); glEnableVertexAttribArray(1);
glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 6*sizeof(float), (GLchar*)(3*sizeof(float))); glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, 6*sizeof(float), (GLchar*)(3*sizeof(float)));
delete[] std::get<0>(vData);
delete[] std::get<0>(iData);
} }
void GLObject::rotate(glm::vec3 angles) { void GLObject::rotate(glm::vec3 angles) {
@ -68,9 +69,10 @@ void GLObject::draw() {
} }
void GLObject::update() { void GLObject::update() {
auto vData = generateVertices(); std::size_t vCount = 0;
std::unique_ptr<Vertex[]> vArray;
std::tie(vArray, vCount) = generateVertices();
glBindBuffer(GL_ARRAY_BUFFER, _vertexVbo); glBindBuffer(GL_ARRAY_BUFFER, _vertexVbo);
// glBufferData(GL_ARRAY_BUFFER, _size*_size*sizeof(Vertex), NULL, GL_STREAM_DRAW); // glBufferData(GL_ARRAY_BUFFER, _size*_size*sizeof(Vertex), NULL, GL_STREAM_DRAW);
glBufferData(GL_ARRAY_BUFFER, std::get<1>(vData), std::get<0>(vData), GL_STREAM_DRAW); glBufferData(GL_ARRAY_BUFFER, vCount, vArray.get(), GL_STREAM_DRAW);
delete[] std::get<0>(vData);
} }

11
src/GLObjects/GLObject.h
View File

@ -6,8 +6,15 @@
#include "vertex.h" #include "vertex.h"
#include <tuple> #include <tuple>
#include <memory>
#include <GL/glew.h> #include <GL/glew.h>
template <typename T>
using ArrayWithSize = std::tuple<std::unique_ptr<T[]>,std::size_t>;
using VertexArray = ArrayWithSize<Vertex>;
using IndexArray = ArrayWithSize<GLuint>;
class GLObject: public IGLObject { class GLObject: public IGLObject {
private: private:
GLuint _vertexVbo; GLuint _vertexVbo;
@ -29,8 +36,8 @@ public:
void update() override final; void update() override final;
protected: protected:
virtual std::tuple<Vertex*, std::size_t> generateVertices() const = 0; virtual VertexArray generateVertices() const = 0;
virtual std::tuple<GLuint*, std::size_t> generateIndices() const = 0; virtual IndexArray generateIndices() const = 0;
}; };

12
src/GLObjects/Mesh.cpp
View File

@ -9,9 +9,9 @@ Mesh::~Mesh() {
} }
std::tuple<Vertex *, std::size_t> Mesh::generateVertices() const { VertexArray Mesh::generateVertices() const {
std::size_t u = _size, v = _size; std::size_t u = _size, v = _size;
Vertex* retVal = new Vertex[u*v]; auto retVal = std::make_unique<Vertex[]>(u*v);
const float step = (exp(4) - 1)/_size; const float step = (exp(4) - 1)/_size;
for (std::size_t i = 0; i < u; i++) for (std::size_t i = 0; i < u; i++)
@ -28,12 +28,12 @@ std::tuple<Vertex *, std::size_t> Mesh::generateVertices() const {
retVal[j*u+i].normal[2] = 1.0f; retVal[j*u+i].normal[2] = 1.0f;
} }
return std::make_tuple(retVal, u*v*sizeof(Vertex)); return std::make_tuple(std::move(retVal), u*v*sizeof(Vertex));
} }
std::tuple<GLuint *, std::size_t> Mesh::generateIndices() const { IndexArray Mesh::generateIndices() const {
unsigned u = _size, v = _size; unsigned u = _size, v = _size;
unsigned int* indices = new unsigned int[(u-1)*(v-1)*6]; auto indices = std::make_unique<GLuint[]>((u-1)*(v-1)*6);
for (unsigned i = 0; i < (u - 1); i++) for (unsigned i = 0; i < (u - 1); i++)
for (unsigned j = 0; j < (v - 1); j++) for (unsigned j = 0; j < (v - 1); j++)
{ {
@ -48,5 +48,5 @@ std::tuple<GLuint *, std::size_t> Mesh::generateIndices() const {
indices[indexa*6+5]=indexb+u+1; indices[indexa*6+5]=indexb+u+1;
} }
return std::make_tuple(indices, (u-1)*(v-1)*6*sizeof(GLuint)); return std::make_tuple(std::move(indices), (u-1)*(v-1)*6*sizeof(GLuint));
} }

4
src/GLObjects/Mesh.h
View File

@ -19,8 +19,8 @@ public:
virtual ~Mesh(); virtual ~Mesh();
protected: protected:
std::tuple<Vertex*, std::size_t> generateVertices() const override final; VertexArray generateVertices() const override final;
std::tuple<GLuint*, std::size_t> generateIndices() const override final; IndexArray generateIndices() const override final;
protected: protected:
virtual float heightMapFunc(std::size_t nx, std::size_t ny, float fx, float fy) const = 0; virtual float heightMapFunc(std::size_t nx, std::size_t ny, float fx, float fy) const = 0;