From 6d09a50c6daef023fabb7e77c4e83f9c3efb58f2 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Thu, 7 Nov 2002 08:49:12 +0000 Subject: [PATCH] Added shape drawable into dot osg plugin. --- NEWS | 8 ++++++++ VisualStudio/osgPlugins/osg/dot_osg.dsp | 4 ++++ include/osg/Drawable | 2 +- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/NEWS b/NEWS index 1af3f6cd8..a5b46aa37 100644 --- a/NEWS +++ b/NEWS @@ -23,6 +23,14 @@ OSG News (most significant items from ChangeLog) Draw and Sort callbacks added to osg::RenderStage. Support for multitexturing added to OpenFlight loader. + + LOD has been revamped to allow independat min and max ranges for + each LOD child, bringing it inline with the OpenFlight style LOD + representation. + + Switch has been revamped to allow independat switching on or off of + each Switch child, bringing it inline with the OpenFlight style Switch + representation. Added PolygonStipple class. diff --git a/VisualStudio/osgPlugins/osg/dot_osg.dsp b/VisualStudio/osgPlugins/osg/dot_osg.dsp index 17a27e09f..a69cafe66 100755 --- a/VisualStudio/osgPlugins/osg/dot_osg.dsp +++ b/VisualStudio/osgPlugins/osg/dot_osg.dsp @@ -242,6 +242,10 @@ SOURCE=..\..\..\src\osgPlugins\osg\ShadeModel.cpp # End Source File # Begin Source File +SOURCE=..\..\..\src\osgPlugins\osg\ShapeDrawable.cpp +# End Source File +# Begin Source File + SOURCE=..\..\..\src\osgPlugins\osg\Sequence.cpp # End Source File # Begin Source File diff --git a/include/osg/Drawable b/include/osg/Drawable index e44d78a23..22e133ec1 100644 --- a/include/osg/Drawable +++ b/include/osg/Drawable @@ -219,7 +219,7 @@ class SG_EXPORT Drawable : public Object virtual void drawImplementation(State& state,const osg::Drawable* drawable) const { drawImmediateMode(state,const_cast(drawable)); } /** do customized draw code.*/ - virtual void drawImmediateMode(State& state,osg::Drawable* drawable) const {}; + virtual void drawImmediateMode(State&,osg::Drawable*) const {}; #else /** do customized draw code.*/ virtual void drawImplementation(State& state,const osg::Drawable* drawable) const = 0;