Commit c2b87c2b authored by Christian Schulte zu Berge's avatar Christian Schulte zu Berge
Browse files

Taking care of CppCheck issues #1

parent 87b21ec4
...@@ -51,6 +51,7 @@ namespace campvis { ...@@ -51,6 +51,7 @@ namespace campvis {
, p_flipMatrix("FlipMatrix", "Flip Matrix for Alignment (optional)", cgt::mat4::identity) , p_flipMatrix("FlipMatrix", "Flip Matrix for Alignment (optional)", cgt::mat4::identity)
, _cubeGeometry(nullptr) , _cubeGeometry(nullptr)
, _shader(nullptr) , _shader(nullptr)
, _passthroughShader(nullptr)
, _textures(nullptr) , _textures(nullptr)
{ {
addProperty(p_camera); addProperty(p_camera);
......
...@@ -43,7 +43,10 @@ namespace campvis { ...@@ -43,7 +43,10 @@ namespace campvis {
std::string VoxelHierarchyMapper::loggerCat_ = "CAMPVis.modules.vis.VoxelHierarchyMapper"; std::string VoxelHierarchyMapper::loggerCat_ = "CAMPVis.modules.vis.VoxelHierarchyMapper";
VoxelHierarchyMapper::VoxelHierarchyMapper() VoxelHierarchyMapper::VoxelHierarchyMapper()
: _xorBitmaskShader(nullptr) : _brickSize(0)
, _brickDepth(0)
, _maxMipmapLevel(0)
, _xorBitmaskShader(nullptr)
, _hierarchyRendererShader(nullptr) , _hierarchyRendererShader(nullptr)
, _mimapRendererShader(nullptr) , _mimapRendererShader(nullptr)
, _fbo(nullptr) , _fbo(nullptr)
......
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
#include <string> #include <string>
#include "cgt/assert.h"
#include "cgt/framebufferobject.h" #include "cgt/framebufferobject.h"
#include "cgt/shadermanager.h" #include "cgt/shadermanager.h"
...@@ -74,6 +75,9 @@ namespace campvis { ...@@ -74,6 +75,9 @@ namespace campvis {
GLuint getMaxMipmapLevel() { return _maxMipmapLevel; } GLuint getMaxMipmapLevel() { return _maxMipmapLevel; }
private: private:
// disable copying and assignment
explicit VoxelHierarchyMapper(const VoxelHierarchyMapper& rhs);
VoxelHierarchyMapper& operator=(VoxelHierarchyMapper rhs);
void createXorBitmaskTexture(); void createXorBitmaskTexture();
...@@ -108,7 +112,6 @@ namespace campvis { ...@@ -108,7 +112,6 @@ namespace campvis {
std::unique_ptr<FaceGeometry> _quad; std::unique_ptr<FaceGeometry> _quad;
static std::string loggerCat_; static std::string loggerCat_;
}; };
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment