diff --git a/vcg/math/matrix44.h b/vcg/math/matrix44.h index fb2442e6..ef440e93 100644 --- a/vcg/math/matrix44.h +++ b/vcg/math/matrix44.h @@ -138,7 +138,13 @@ public: void operator*=( const T k ); template - void ToMatrix(Matrix44Type & m) const {for(int i = 0; i < 16; i++) m.V()[i]=V()[i];} + void ToMatrix(Matrix44Type & m) const + { + for(int i = 0; i < 16; i++) + { + m.V()[i]= V()[i]; + } + } void ToEulerAngles(T &alpha, T &beta, T &gamma); diff --git a/vcg/math/shot.h b/vcg/math/shot.h index f0a4b1df..978100b2 100644 --- a/vcg/math/shot.h +++ b/vcg/math/shot.h @@ -75,7 +75,7 @@ public: RotoType rot; // rotation Point3 tra; // viewpoint public: - ReferenceFrame(){} + ReferenceFrame():rot(),tra(){} void SetIdentity(){ rot.SetIdentity(); tra = Point3(0.0,0.0,0.0);} void SetTra(const Point3 & tr) {tra = tr;} @@ -87,18 +87,21 @@ public: Camera Intrinsics; // the camera that made the shot ReferenceFrame Extrinsics; // the position and orientation of the camera Shot(const Camera &i, const ReferenceFrame &e) + :Intrinsics(),Extrinsics() { Intrinsics = i; Extrinsics = e; } Shot(const Camera &c) + :Intrinsics(),Extrinsics() { Intrinsics = c; Extrinsics.SetIdentity(); } Shot() + :Intrinsics(),Extrinsics() { Extrinsics.SetIdentity(); } diff --git a/wrap/gl/gl_mesh_attributes_info.h b/wrap/gl/gl_mesh_attributes_info.h index b3fe0cdf..60d96fb1 100644 --- a/wrap/gl/gl_mesh_attributes_info.h +++ b/wrap/gl/gl_mesh_attributes_info.h @@ -288,6 +288,7 @@ namespace vcg } }; + protected: struct INT_ATT_NAMES : public ATT_NAMES { diff --git a/wrap/gl/gl_mesh_attributes_multi_viewer_bo_manager.h b/wrap/gl/gl_mesh_attributes_multi_viewer_bo_manager.h index 1833d742..d1184a64 100644 --- a/wrap/gl/gl_mesh_attributes_multi_viewer_bo_manager.h +++ b/wrap/gl/gl_mesh_attributes_multi_viewer_bo_manager.h @@ -75,19 +75,21 @@ namespace vcg RenderingModalityGLOptions() { _perbbox_enabled = false; + _perbbox_fixed_color_enabled = true; _perpoint_fixed_color_enabled = false; _perwire_fixed_color_enabled = true; - + _persolid_fixed_color_enabled = true; + _perbbox_fixed_color = vcg::Color4b(Color4b::White); _perpoint_fixed_color = vcg::Color4b(Color4b::White); _perwire_fixed_color = Color4b(Color4b::DarkGray); _persolid_fixed_color = vcg::Color4b(Color4b::White); - _persolid_fixed_color_enabled = false; _perbbox_mesh_color_enabled = false; _perpoint_mesh_color_enabled = false; _perwire_mesh_color_enabled = false; + _persolid_mesh_color_enabled = false; _perpoint_dot_enabled = false;