History

memory wastes and code cleaning PR comments

atlante45 committed 13 years ago

Commit 5da525f1 parent 1781abe21 files · +47 −225Browse files

Showing the changes to interface/src/VoxelSystem.cpp (1 of 21 files). Show all

Unified · Split

interface/src/VoxelSystem.cpp+1−4
@@ -545,7 +545,6 @@ glm::vec3 VoxelSystem::computeVoxelVertex(const glm::vec3& startVertex, float vo · 544 unmodified lines
545 return startVertex + glm::vec3(identityVertex[0], identityVertex[1], identityVertex[2]) * voxelScale;545 return startVertex + glm::vec3(identityVertex[0], identityVertex[1], identityVertex[2]) * voxelScale;
546}546}
547 547
548bool VoxelSystem::_perlinModulateProgramInitialized = false;
549ProgramObject VoxelSystem::_perlinModulateProgram;548ProgramObject VoxelSystem::_perlinModulateProgram;
550 549
551void VoxelSystem::init() {550void VoxelSystem::init() {
@@ -634,7 +633,7 @@ void VoxelSystem::init() { · 82 unmodified lines
634 633
635 634
636 // create our simple fragment shader if we're the first system to init635 // create our simple fragment shader if we're the first system to init
637 if (!_perlinModulateProgramInitialized) {636 if (!_perlinModulateProgram.isLinked()) {
638 switchToResourcesParentIfRequired();637 switchToResourcesParentIfRequired();
639 _perlinModulateProgram.addShaderFromSourceFile(QGLShader::Vertex, "resources/shaders/perlin_modulate.vert");638 _perlinModulateProgram.addShaderFromSourceFile(QGLShader::Vertex, "resources/shaders/perlin_modulate.vert");
640 _perlinModulateProgram.addShaderFromSourceFile(QGLShader::Fragment, "resources/shaders/perlin_modulate.frag");639 _perlinModulateProgram.addShaderFromSourceFile(QGLShader::Fragment, "resources/shaders/perlin_modulate.frag");
@@ -643,8 +642,6 @@ void VoxelSystem::init() { · 2 unmodified lines
643 _perlinModulateProgram.bind();642 _perlinModulateProgram.bind();
644 _perlinModulateProgram.setUniformValue("permutationNormalTexture", 0);643 _perlinModulateProgram.setUniformValue("permutationNormalTexture", 0);
645 _perlinModulateProgram.release();644 _perlinModulateProgram.release();
646
647 _perlinModulateProgramInitialized = true;
648 }645 }
649 _initialized = true;646 _initialized = true;
650}647}