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

Minor fixes to ReaderWriter and Paragraph to help work with use of Doxygen.

Browse Source 
Fix to CullVisior to handle the new no referenced counted cull and draw traversal.
This commit is contained in:
Robert Osfield
2003-02-10 13:58:39 +00:00
parent d4f7da7bb8
commit c2b4a05825
5 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/osgDB/ReaderWriter
View File

@@ -18,6 +18,9 @@
#include <osg/Image>
#include <osg/Node>
#include <osgDB/Export>
#include <string>
namespace osgDB {

2
include/osgText/Paragraph
View File

@@ -30,7 +30,7 @@ class OSGTEXT_EXPORT Paragraph : public osg::Geode
Paragraph(const Paragraph& paragraph,const osg::CopyOp& copyop=osg::CopyOp::SHALLOW_COPY);
Paragraph(const osg::Vec3& position,const std::string& text,osgText::Font* font);
META_Node(osgText,Paragraph)
META_Node(osgText,Paragraph);
void setFont(osgText::Font* font);

1
include/osgUtil/CullVisitor
View File

@@ -244,6 +244,7 @@ class OSGUTIL_EXPORT CullVisitor : public osg::NodeVisitor, public osg::CullStac
osg::ref_ptr<RenderStage> _rootRenderStage;
RenderBin* _currentRenderBin;
osg::ref_ptr<osg::StateSet> _localPreRenderState;
ComputeNearFarMode _computeNearFar;
float _computed_znear;

2
src/osg/Geometry.cpp
View File

@@ -510,7 +510,7 @@ void Geometry::drawImplementation(State& state) const
if (_normalBinding==BIND_OFF) glNormal3f(0.0f,0.0f,1.0f);
#endif
#if ISE_DEFAULT_COLOUR
#if USE_DEFAULT_COLOUR
if (_colorBinding==BIND_OFF) glColor4f(1.0f,1.0f,1.0f,1.0f);
#endif

6
src/osgUtil/CullVisitor.cpp
View File

@@ -802,9 +802,9 @@ ImpostorSprite* CullVisitor::createImpostorSprite(Impostor& node)
// into account the new camera orientation.
pushModelViewMatrix(rotate_matrix);
ref_ptr<StateSet> dummyState = new StateSet;
if (!_localPreRenderState) _localPreRenderState = new StateSet;
pushStateSet(dummyState.get());
pushStateSet(_localPreRenderState.get());
{
@@ -888,7 +888,7 @@ ImpostorSprite* CullVisitor::createImpostorSprite(Impostor& node)
new_viewport->setViewport(center_x-new_s/2,center_y-new_t/2,new_s,new_t);
rtts->setViewport(new_viewport);
dummyState->setAttribute(new_viewport);
_localPreRenderState->setAttribute(new_viewport);
// create the impostor sprite.
ImpostorSprite* impostorSprite =