diff --git a/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerSession.cc b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerSession.cc index 2de29853..bc093040 100644 --- a/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerSession.cc +++ b/src/OpenMesh/Apps/Unsupported/Streaming-qt4/Server/VDPMServerSession.cc @@ -252,11 +252,7 @@ stream_vsplits() VHierarchyNodeHandle node_handle; OpenMesh::Vec3f pos; VHierarchyNodeIndex node_index, fund_lcut_index, fund_rcut_index; - float lchild_radius, rchild_radius; OpenMesh::Vec3f lchild_normal, rchild_normal; - float lchild_sin_square, rchild_sin_square; - float lchild_mue_square, rchild_mue_square; - float lchild_sigma_square, rchild_sigma_square; unsigned int n_vsplit_packets = (unsigned int) vsplits_.size(); QDataStream qTcp(socket_); @@ -277,11 +273,11 @@ stream_vsplits() node_index = node.node_index(); fund_lcut_index = node.fund_lcut_index(); fund_rcut_index = node.fund_rcut_index(); - lchild_radius = lchild.radius(); rchild_radius = rchild.radius(); + const float lchild_radius = lchild.radius(); const float rchild_radius = rchild.radius(); lchild_normal = lchild.normal(); rchild_normal = rchild.normal(); - lchild_sin_square = lchild.sin_square(); rchild_sin_square = rchild.sin_square(); - lchild_mue_square = lchild.mue_square(); rchild_mue_square = rchild.mue_square(); - lchild_sigma_square = lchild.sigma_square(); rchild_sigma_square = rchild.sigma_square(); + const float lchild_sin_square = lchild.sin_square(); const float rchild_sin_square = rchild.sin_square(); + const float lchild_mue_square = lchild.mue_square(); const float rchild_mue_square = rchild.mue_square(); + const float lchild_sigma_square = lchild.sigma_square(); const float rchild_sigma_square = rchild.sigma_square(); qTcp << pos[0] << pos[1] << pos[2] << node_index.value() diff --git a/src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerSession.cc b/src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerSession.cc index 0dab1b16..4160d8ef 100644 --- a/src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerSession.cc +++ b/src/OpenMesh/Apps/Unsupported/Streaming/Server/VDPMServerSession.cc @@ -245,11 +245,7 @@ stream_vsplits() VHierarchyNodeHandle node_handle; OpenMesh::Vec3f pos; VHierarchyNodeIndex node_index, fund_lcut_index, fund_rcut_index; - float lchild_radius, rchild_radius; OpenMesh::Vec3f lchild_normal, rchild_normal; - float lchild_sin_square, rchild_sin_square; - float lchild_mue_square, rchild_mue_square; - float lchild_sigma_square, rchild_sigma_square; unsigned int n_vsplit_packets = (unsigned int) vsplits_.size(); QDataStream qTcp(this); @@ -270,11 +266,11 @@ stream_vsplits() node_index = node.node_index(); fund_lcut_index = node.fund_lcut_index(); fund_rcut_index = node.fund_rcut_index(); - lchild_radius = lchild.radius(); rchild_radius = rchild.radius(); - lchild_normal = lchild.normal(); rchild_normal = rchild.normal(); - lchild_sin_square = lchild.sin_square(); rchild_sin_square = rchild.sin_square(); - lchild_mue_square = lchild.mue_square(); rchild_mue_square = rchild.mue_square(); - lchild_sigma_square = lchild.sigma_square(); rchild_sigma_square = rchild.sigma_square(); + const float lchild_radius = lchild.radius(); const float rchild_radius = rchild.radius(); + lchild_normal = lchild.normal(); rchild_normal = rchild.normal(); + const float lchild_sin_square = lchild.sin_square(); const float rchild_sin_square = rchild.sin_square(); + const float lchild_mue_square = lchild.mue_square(); const float rchild_mue_square = rchild.mue_square(); + const float lchild_sigma_square = lchild.sigma_square(); const float rchild_sigma_square = rchild.sigma_square(); qTcp << pos[0] << pos[1] << pos[2] << node_index.value() diff --git a/src/OpenMesh/Tools/VDPM/VHierarchy.cc b/src/OpenMesh/Tools/VDPM/VHierarchy.cc index 0bf9e961..f28be46d 100644 --- a/src/OpenMesh/Tools/VDPM/VHierarchy.cc +++ b/src/OpenMesh/Tools/VDPM/VHierarchy.cc @@ -67,7 +67,8 @@ namespace VDPM { VHierarchy:: -VHierarchy() +VHierarchy() : + n_roots_(0), tree_id_bits_(0) { clear(); } diff --git a/src/OpenMesh/Tools/VDPM/VHierarchyNode.hh b/src/OpenMesh/Tools/VDPM/VHierarchyNode.hh index beaa96ce..435ba711 100644 --- a/src/OpenMesh/Tools/VDPM/VHierarchyNode.hh +++ b/src/OpenMesh/Tools/VDPM/VHierarchyNode.hh @@ -96,7 +96,7 @@ class VHierarchyNode { public: - VHierarchyNode() { } + VHierarchyNode() :radius_(0.0f), sin_square_(0.0f),mue_square_(0.0f), sigma_square_(0.0f) { } /// Returns true, if node is root else false. bool is_root() const diff --git a/src/OpenMesh/Tools/VDPM/VHierarchyWindow.cc b/src/OpenMesh/Tools/VDPM/VHierarchyWindow.cc index fa1fee82..886c24b0 100644 --- a/src/OpenMesh/Tools/VDPM/VHierarchyWindow.cc +++ b/src/OpenMesh/Tools/VDPM/VHierarchyWindow.cc @@ -77,27 +77,17 @@ namespace VDPM { VHierarchyWindow:: -VHierarchyWindow() +VHierarchyWindow() : + vhierarchy_(NULL), buffer_(NULL),buffer_min_ (0), buffer_max_(0), window_min_(0), window_max_(0), current_pos_(0) , n_shift_(0) { - vhierarchy_ = NULL; - buffer_ = NULL; - buffer_min_ = 0; - buffer_max_ = 0; - - window_min_ = 0; - window_max_ = 0; - current_pos_ = 0; - - n_shift_ = 0; } VHierarchyWindow:: -VHierarchyWindow(VHierarchy &_vhierarchy) +VHierarchyWindow(VHierarchy &_vhierarchy) : + vhierarchy_(&_vhierarchy),buffer_(NULL),buffer_min_ (0), buffer_max_(0), window_min_(0), window_max_(0) , current_pos_(0) ,n_shift_(0) { - vhierarchy_ = &_vhierarchy; - buffer_ = NULL; } diff --git a/src/OpenMesh/Tools/VDPM/ViewingParameters.cc b/src/OpenMesh/Tools/VDPM/ViewingParameters.cc index 3f78301a..2036e2fb 100644 --- a/src/OpenMesh/Tools/VDPM/ViewingParameters.cc +++ b/src/OpenMesh/Tools/VDPM/ViewingParameters.cc @@ -70,6 +70,9 @@ namespace VDPM { ViewingParameters:: ViewingParameters() { + for ( unsigned int i = 0; i < 16; ++i) + modelview_matrix_[i] = 0.0; + fovy_ = 45.0f; aspect_ = 1.0f; tolerance_square_ = 0.001f;