diff --git a/src/osgPlugins/lwo/Surface.cpp b/src/osgPlugins/lwo/Surface.cpp index 9f485b83f..75f84f06e 100644 --- a/src/osgPlugins/lwo/Surface.cpp +++ b/src/osgPlugins/lwo/Surface.cpp @@ -47,7 +47,8 @@ Surface::Surface() translucency_(0), glossiness_(0.4f), sidedness_(FRONT_ONLY), - max_smoothing_angle_(0) + max_smoothing_angle_(0), + color_map_intensity_(1.0f) { } @@ -61,7 +62,8 @@ Surface::Surface(const lwo2::FORM::SURF *surf, const Clip_map &clips) translucency_(0), glossiness_(0.4f), sidedness_(FRONT_ONLY), - max_smoothing_angle_(0) + max_smoothing_angle_(0), + color_map_intensity_(1.0f) { compile(surf, clips); } diff --git a/src/osgPlugins/lwo/Tessellator.h b/src/osgPlugins/lwo/Tessellator.h index 2e81fc8f5..26d7d495f 100644 --- a/src/osgPlugins/lwo/Tessellator.h +++ b/src/osgPlugins/lwo/Tessellator.h @@ -24,29 +24,35 @@ namespace lwosg { - class Tessellator { - public: - bool tessellate(const Polygon &poly, const osg::Vec3Array *points, osg::DrawElementsUInt *out, const std::vector *remap = 0); + class Tessellator { + public: + bool tessellate(const Polygon &poly, const osg::Vec3Array *points, osg::DrawElementsUInt *out, const std::vector *remap = 0); - ~Tessellator(); + Tessellator(): + prim_type_(0), + last_error_(0) + { + } - protected: - void finalize_primitive(); + ~Tessellator(); - private: - friend void CALLBACK cb_begin_data(GLenum, void *); - friend void CALLBACK cb_vertex_data(void *, void *); - friend void CALLBACK cb_end_data(void *); - friend void CALLBACK cb_error_data(GLenum, void *); + protected: + void finalize_primitive(); - osg::ref_ptr out_; + private: + friend void CALLBACK cb_begin_data(GLenum, void *); + friend void CALLBACK cb_vertex_data(void *, void *); + friend void CALLBACK cb_end_data(void *); + friend void CALLBACK cb_error_data(GLenum, void *); - GLenum prim_type_; - GLenum last_error_; + osg::ref_ptr out_; - typedef std::vector Index_list; - Index_list incoming_; - }; + GLenum prim_type_; + GLenum last_error_; + + typedef std::vector Index_list; + Index_list incoming_; + }; }