ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dont alloc quaternion buffer if not flip

Browse Source
This commit is contained in:
Vlj 2014-08-13 23:56:27 +02:00
parent c7a4d45d08
commit 3e277f8edf
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/graphics/gpuparticles.cpp
View File

@ -407,10 +407,11 @@ void ParticleSystemProxy::generateVAOs()
glBindVertexArray(non_current_simulation_vao); glBindVertexArray(non_current_simulation_vao);
CommonSimulationVAO(tfb_buffers[1], initial_values_buffer); CommonSimulationVAO(tfb_buffers[1], initial_values_buffer);
float *quaternions = new float[4 * count];
glBindVertexArray(0); glBindVertexArray(0);
if (flip) if (flip)
{ {
float *quaternions = new float[4 * count];
for (unsigned i = 0; i < count; i++) for (unsigned i = 0; i < count; i++)
{ {
core::vector3df rotationdir(0., 1., 0.); core::vector3df rotationdir(0., 1., 0.);
@ -423,6 +424,7 @@ void ParticleSystemProxy::generateVAOs()
glGenBuffers(1, &quaternionsbuffer); glGenBuffers(1, &quaternionsbuffer);
glBindBuffer(GL_ARRAY_BUFFER, quaternionsbuffer); glBindBuffer(GL_ARRAY_BUFFER, quaternionsbuffer);
glBufferData(GL_ARRAY_BUFFER, 4 * count * sizeof(float), quaternions, GL_STATIC_DRAW); glBufferData(GL_ARRAY_BUFFER, 4 * count * sizeof(float), quaternions, GL_STATIC_DRAW);
delete[] quaternions;
} }
glBindVertexArray(current_rendering_vao); glBindVertexArray(current_rendering_vao);
@ -435,8 +437,6 @@ void ParticleSystemProxy::generateVAOs()
if (flip) if (flip)
AppendQuaternionRenderingVAO(quaternionsbuffer); AppendQuaternionRenderingVAO(quaternionsbuffer);
glBindVertexArray(0); glBindVertexArray(0);
delete[] quaternions;
} }
void ParticleSystemProxy::render() { void ParticleSystemProxy::render() {