FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added initializers

Browse Source
This commit is contained in:
Robert Osfield 2016-06-25 13:42:49 +01:00
parent aee1423e55
commit 5f920b21ca
2 changed files with 27 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/osgPlugins/lwo/Surface.cpp
View File

@ -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);
}

40
src/osgPlugins/lwo/Tessellator.h
View File

@ -24,29 +24,35 @@
namespace lwosg
{
class Tessellator {
public:
bool tessellate(const Polygon &poly, const osg::Vec3Array *points, osg::DrawElementsUInt *out, const std::vector<int> *remap = 0);
class Tessellator {
public:
bool tessellate(const Polygon &poly, const osg::Vec3Array *points, osg::DrawElementsUInt *out, const std::vector<int> *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<osg::DrawElementsUInt> 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<osg::DrawElementsUInt> out_;
typedef std::vector<int> Index_list;
Index_list incoming_;
};
GLenum prim_type_;
GLenum last_error_;
typedef std::vector<int> Index_list;
Index_list incoming_;
};
}