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

Fixed typo of SEPARATE enums

Browse Source 
git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/trunk@14833 16af8721-9629-0410-8352-f15c8da7e697
This commit is contained in:
Robert Osfield 2015-04-13 11:48:28 +00:00
parent 0a1db3d6fc
commit 87122ca369
7 changed files with 48 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
examples/osgprerender/osgprerender.cpp
View File

@ -448,7 +448,7 @@ int main( int argc, char **argv )
while (arguments.read("--pbuffer")) { renderImplementation = osg::Camera::PIXEL_BUFFER; } while (arguments.read("--pbuffer")) { renderImplementation = osg::Camera::PIXEL_BUFFER; }
while (arguments.read("--pbuffer-rtt")) { renderImplementation = osg::Camera::PIXEL_BUFFER_RTT; } while (arguments.read("--pbuffer-rtt")) { renderImplementation = osg::Camera::PIXEL_BUFFER_RTT; }
while (arguments.read("--fb")) { renderImplementation = osg::Camera::FRAME_BUFFER; } while (arguments.read("--fb")) { renderImplementation = osg::Camera::FRAME_BUFFER; }
while (arguments.read("--window")) { renderImplementation = osg::Camera::SEPERATE_WINDOW; } while (arguments.read("--window")) { renderImplementation = osg::Camera::SEPARATE_WINDOW; }
while (arguments.read("--fbo-samples", samples)) {} while (arguments.read("--fbo-samples", samples)) {}
while (arguments.read("--color-samples", colorSamples)) {} while (arguments.read("--color-samples", colorSamples)) {}

2
examples/osgprerendercubemap/osgprerendercubemap.cpp
View File

@ -327,7 +327,7 @@ int main(int argc, char** argv)
while (arguments.read("--fbo")) { renderImplementation = osg::Camera::FRAME_BUFFER_OBJECT; } while (arguments.read("--fbo")) { renderImplementation = osg::Camera::FRAME_BUFFER_OBJECT; }
while (arguments.read("--pbuffer")) { renderImplementation = osg::Camera::PIXEL_BUFFER; } while (arguments.read("--pbuffer")) { renderImplementation = osg::Camera::PIXEL_BUFFER; }
while (arguments.read("--fb")) { renderImplementation = osg::Camera::FRAME_BUFFER; } while (arguments.read("--fb")) { renderImplementation = osg::Camera::FRAME_BUFFER; }
while (arguments.read("--window")) { renderImplementation = osg::Camera::SEPERATE_WINDOW; } while (arguments.read("--window")) { renderImplementation = osg::Camera::SEPARATE_WINDOW; }
// any option left unread are converted into errors to write out later. // any option left unread are converted into errors to write out later.

2
include/osg/Camera
View File

@ -292,7 +292,7 @@ class OSG_EXPORT Camera : public Transform, public CullSettings
PIXEL_BUFFER_RTT, PIXEL_BUFFER_RTT,
PIXEL_BUFFER, PIXEL_BUFFER,
FRAME_BUFFER, FRAME_BUFFER,
SEPERATE_WINDOW SEPARATE_WINDOW
}; };
/** Set the render target.*/ /** Set the render target.*/

10
src/osgSim/ElevationSlice.cpp
View File

@ -241,7 +241,7 @@ struct Segment
{ {
UNCLASSIFIED, UNCLASSIFIED,
IDENTICAL, IDENTICAL,
SEPERATE, SEPARATE,
JOINED, JOINED,
OVERLAPPING, OVERLAPPING,
ENCLOSING, ENCLOSING,
@ -262,10 +262,10 @@ struct Segment
if (delta_distance==0.0) if (delta_distance==0.0)
{ {
return SEPERATE; return SEPARATE;
} }
if (rhs._p2->distance < _p1->distance || _p2->distance < rhs._p1->distance) return SEPERATE; if (rhs._p2->distance < _p1->distance || _p2->distance < rhs._p1->distance) return SEPARATE;
bool rhs_p1_inside = (_p1->distance <= rhs._p1->distance) && (rhs._p1->distance <= _p2->distance); bool rhs_p1_inside = (_p1->distance <= rhs._p1->distance) && (rhs._p1->distance <= _p2->distance);
bool rhs_p2_inside = (_p1->distance <= rhs._p2->distance) && (rhs._p2->distance <= _p2->distance); bool rhs_p2_inside = (_p1->distance <= rhs._p2->distance) && (rhs._p2->distance <= _p2->distance);
@ -406,7 +406,7 @@ struct LineConstructor
switch(classification) switch(classification)
{ {
case(Segment::IDENTICAL): OSG_NOTICE<<"i"; break; case(Segment::IDENTICAL): OSG_NOTICE<<"i"; break;
case(Segment::SEPERATE): OSG_NOTICE<<"s"<<std::endl; break; case(Segment::SEPARATE): OSG_NOTICE<<"s"<<std::endl; break;
case(Segment::JOINED): OSG_NOTICE<<"j"; break; case(Segment::JOINED): OSG_NOTICE<<"j"; break;
case(Segment::OVERLAPPING): OSG_NOTICE<<"o"; break; case(Segment::OVERLAPPING): OSG_NOTICE<<"o"; break;
case(Segment::ENCLOSING): OSG_NOTICE<<"E"; break; case(Segment::ENCLOSING): OSG_NOTICE<<"E"; break;
@ -1110,7 +1110,7 @@ struct LineConstructor
Segment::Classification classification = prevItr->compare(*nextItr); Segment::Classification classification = prevItr->compare(*nextItr);
switch(classification) switch(classification)
{ {
case(Segment::SEPERATE): case(Segment::SEPARATE):
{ {
intersections.push_back( nextItr->_p1->position ); intersections.push_back( nextItr->_p1->position );
distanceHeightIntersections.push_back( ElevationSlice::DistanceHeight(nextItr->_p1->distance, nextItr->_p1->height) ); distanceHeightIntersections.push_back( ElevationSlice::DistanceHeight(nextItr->_p1->distance, nextItr->_p1->height) );

8
src/osgUtil/RenderStage.cpp
View File

@ -610,7 +610,7 @@ void RenderStage::runCameraSetUp(osg::RenderInfo& renderInfo)
while (!getGraphicsContext() && while (!getGraphicsContext() &&
(renderTargetImplementation==osg::Camera::PIXEL_BUFFER_RTT || (renderTargetImplementation==osg::Camera::PIXEL_BUFFER_RTT ||
renderTargetImplementation==osg::Camera::PIXEL_BUFFER || renderTargetImplementation==osg::Camera::PIXEL_BUFFER ||
renderTargetImplementation==osg::Camera::SEPERATE_WINDOW) ) renderTargetImplementation==osg::Camera::SEPARATE_WINDOW) )
{ {
osg::ref_ptr<osg::GraphicsContext> context = getGraphicsContext(); osg::ref_ptr<osg::GraphicsContext> context = getGraphicsContext();
if (!context) if (!context)
@ -625,8 +625,8 @@ void RenderStage::runCameraSetUp(osg::RenderInfo& renderInfo)
// OSG_NOTICE<<"traits = "<<traits->width<<" "<<traits->height<<std::endl; // OSG_NOTICE<<"traits = "<<traits->width<<" "<<traits->height<<std::endl;
traits->pbuffer = (renderTargetImplementation==osg::Camera::PIXEL_BUFFER || renderTargetImplementation==osg::Camera::PIXEL_BUFFER_RTT); traits->pbuffer = (renderTargetImplementation==osg::Camera::PIXEL_BUFFER || renderTargetImplementation==osg::Camera::PIXEL_BUFFER_RTT);
traits->windowDecoration = (renderTargetImplementation==osg::Camera::SEPERATE_WINDOW); traits->windowDecoration = (renderTargetImplementation==osg::Camera::SEPARATE_WINDOW);
traits->doubleBuffer = (renderTargetImplementation==osg::Camera::SEPERATE_WINDOW); traits->doubleBuffer = (renderTargetImplementation==osg::Camera::SEPARATE_WINDOW);
osg::Texture* pBufferTexture = 0; osg::Texture* pBufferTexture = 0;
GLenum bufferFormat = GL_NONE; GLenum bufferFormat = GL_NONE;
@ -699,7 +699,7 @@ void RenderStage::runCameraSetUp(osg::RenderInfo& renderInfo)
} }
default: default:
{ {
if (renderTargetImplementation==osg::Camera::SEPERATE_WINDOW) if (renderTargetImplementation==osg::Camera::SEPARATE_WINDOW)
{ {
OSG_NOTICE<<"Warning: RenderStage::runCameraSetUp(State&) Window "; OSG_NOTICE<<"Warning: RenderStage::runCameraSetUp(State&) Window ";
} }

8
src/osgWrappers/deprecated-dotosg/osg/Camera.cpp
View File

@ -125,7 +125,7 @@ bool Camera_readLocalData(Object& obj, Input& fr)
else if (fr[1].matchWord("PIXEL_BUFFER_RTT")) implementation = osg::Camera::PIXEL_BUFFER_RTT; else if (fr[1].matchWord("PIXEL_BUFFER_RTT")) implementation = osg::Camera::PIXEL_BUFFER_RTT;
else if (fr[1].matchWord("PIXEL_BUFFER")) implementation = osg::Camera::PIXEL_BUFFER; else if (fr[1].matchWord("PIXEL_BUFFER")) implementation = osg::Camera::PIXEL_BUFFER;
else if (fr[1].matchWord("FRAME_BUFFER")) implementation = osg::Camera::FRAME_BUFFER; else if (fr[1].matchWord("FRAME_BUFFER")) implementation = osg::Camera::FRAME_BUFFER;
else if (fr[1].matchWord("SEPERATE_WINDOW")) implementation = osg::Camera::SEPERATE_WINDOW; else if (fr[1].matchWord("SEPARATE_WINDOW")) implementation = osg::Camera::SEPARATE_WINDOW;
camera.setRenderTargetImplementation(implementation); camera.setRenderTargetImplementation(implementation);
@ -141,7 +141,7 @@ bool Camera_readLocalData(Object& obj, Input& fr)
else if (fr[1].matchWord("PIXEL_BUFFER_RTT")) fallback = osg::Camera::PIXEL_BUFFER_RTT; else if (fr[1].matchWord("PIXEL_BUFFER_RTT")) fallback = osg::Camera::PIXEL_BUFFER_RTT;
else if (fr[1].matchWord("PIXEL_BUFFER")) fallback = osg::Camera::PIXEL_BUFFER; else if (fr[1].matchWord("PIXEL_BUFFER")) fallback = osg::Camera::PIXEL_BUFFER;
else if (fr[1].matchWord("FRAME_BUFFER")) fallback = osg::Camera::FRAME_BUFFER; else if (fr[1].matchWord("FRAME_BUFFER")) fallback = osg::Camera::FRAME_BUFFER;
else if (fr[1].matchWord("SEPERATE_WINDOW")) fallback = osg::Camera::SEPERATE_WINDOW; else if (fr[1].matchWord("SEPARATE_WINDOW")) fallback = osg::Camera::SEPARATE_WINDOW;
camera.setRenderTargetImplementation(camera.getRenderTargetImplementation(), fallback); camera.setRenderTargetImplementation(camera.getRenderTargetImplementation(), fallback);
@ -273,7 +273,7 @@ bool Camera_writeLocalData(const Object& obj, Output& fw)
case(osg::Camera::PIXEL_BUFFER_RTT): fw <<"PIXEL_BUFFER_RTT"<<std::endl; break; case(osg::Camera::PIXEL_BUFFER_RTT): fw <<"PIXEL_BUFFER_RTT"<<std::endl; break;
case(osg::Camera::PIXEL_BUFFER): fw <<"PIXEL_BUFFER"<<std::endl; break; case(osg::Camera::PIXEL_BUFFER): fw <<"PIXEL_BUFFER"<<std::endl; break;
case(osg::Camera::FRAME_BUFFER): fw <<"FRAME_BUFFER"<<std::endl; break; case(osg::Camera::FRAME_BUFFER): fw <<"FRAME_BUFFER"<<std::endl; break;
case(osg::Camera::SEPERATE_WINDOW): fw <<"SEPERATE_WINDOW"<<std::endl; break; case(osg::Camera::SEPARATE_WINDOW): fw <<"SEPARATE_WINDOW"<<std::endl; break;
} }
fw.indent()<<"renderTargetFallback "; fw.indent()<<"renderTargetFallback ";
@ -283,7 +283,7 @@ bool Camera_writeLocalData(const Object& obj, Output& fw)
case(osg::Camera::PIXEL_BUFFER_RTT): fw <<"PIXEL_BUFFER_RTT"<<std::endl; break; case(osg::Camera::PIXEL_BUFFER_RTT): fw <<"PIXEL_BUFFER_RTT"<<std::endl; break;
case(osg::Camera::PIXEL_BUFFER): fw <<"PIXEL_BUFFER"<<std::endl; break; case(osg::Camera::PIXEL_BUFFER): fw <<"PIXEL_BUFFER"<<std::endl; break;
case(osg::Camera::FRAME_BUFFER): fw <<"FRAME_BUFFER"<<std::endl; break; case(osg::Camera::FRAME_BUFFER): fw <<"FRAME_BUFFER"<<std::endl; break;
case(osg::Camera::SEPERATE_WINDOW): fw <<"SEPERATE_WINDOW"<<std::endl; break; case(osg::Camera::SEPARATE_WINDOW): fw <<"SEPARATE_WINDOW"<<std::endl; break;
} }
fw.indent()<<"drawBuffer "<<std::hex<<camera.getDrawBuffer()<<std::endl; fw.indent()<<"drawBuffer "<<std::hex<<camera.getDrawBuffer()<<std::endl;

2
src/osgWrappers/serializers/osg/Camera.cpp
View File

@ -220,7 +220,7 @@ REGISTER_OBJECT_WRAPPER( Camera,
ADD_ENUM_VALUE( PIXEL_BUFFER_RTT ); ADD_ENUM_VALUE( PIXEL_BUFFER_RTT );
ADD_ENUM_VALUE( PIXEL_BUFFER ); ADD_ENUM_VALUE( PIXEL_BUFFER );
ADD_ENUM_VALUE( FRAME_BUFFER ); ADD_ENUM_VALUE( FRAME_BUFFER );
ADD_ENUM_VALUE( SEPERATE_WINDOW ); ADD_ENUM_VALUE( SEPARATE_WINDOW );
END_ENUM_SERIALIZER(); // _renderTargetImplementation END_ENUM_SERIALIZER(); // _renderTargetImplementation
ADD_USER_SERIALIZER( BufferAttachmentMap ); // _bufferAttachmentMap ADD_USER_SERIALIZER( BufferAttachmentMap ); // _bufferAttachmentMap