diff --git a/VisualStudio/osgPlugins/ive/ive.dsp b/VisualStudio/osgPlugins/ive/ive.dsp index 519fb9321..9aa4fad3e 100755 --- a/VisualStudio/osgPlugins/ive/ive.dsp +++ b/VisualStudio/osgPlugins/ive/ive.dsp @@ -110,6 +110,14 @@ SOURCE=..\..\..\src\osgPlugins\ive\BlendFunc.cpp # End Source File # Begin Source File +SOURCE=..\..\..\src\osgPlugins\ive\ConvexPlanarOccluder.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\osgPlugins\ive\ConvexPlanarPolygon.cpp +# End Source File +# Begin Source File + SOURCE=..\..\..\src\osgPlugins\ive\CullFace.cpp # End Source File # Begin Source File @@ -134,6 +142,10 @@ SOURCE=..\..\..\src\osgPlugins\ive\DrawArrays.cpp # End Source File # Begin Source File +SOURCE=..\..\..\src\osgPlugins\ive\DrawElementsUInt.cpp +# End Source File +# Begin Source File + SOURCE=..\..\..\src\osgPlugins\ive\DrawElementsUShort.cpp # End Source File # Begin Source File @@ -158,6 +170,10 @@ SOURCE=..\..\..\src\osgPlugins\ive\Image.cpp # End Source File # Begin Source File +SOURCE=..\..\..\src\osgPlugins\ive\Impostor.cpp +# End Source File +# Begin Source File + SOURCE=..\..\..\src\osgPlugins\ive\Light.cpp # End Source File # Begin Source File @@ -186,10 +202,30 @@ SOURCE=..\..\..\src\osgPlugins\ive\Object.cpp # End Source File # Begin Source File +SOURCE=..\..\..\src\osgPlugins\ive\OccluderNode.cpp +# End Source File +# Begin Source File + SOURCE=..\..\..\src\osgPlugins\ive\PositionAttitudeTransform.cpp # End Source File # Begin Source File +SOURCE=..\..\..\src\osgPlugins\ive\PolygonOffset.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\osgPlugins\ive\Point.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\osgPlugins\ive\ReaderWriterIVE.cpp +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\osgPlugins\ive\ShadeModel.cpp +# End Source File +# Begin Source File + SOURCE=..\..\..\src\osgPlugins\ive\PrimitiveSet.cpp # End Source File # Begin Source File @@ -202,6 +238,10 @@ SOURCE=..\..\..\src\osgPlugins\ive\StateSet.cpp # End Source File # Begin Source File +SOURCE=..\..\..\src\osgPlugins\ive\Switch.cpp +# End Source File +# Begin Source File + SOURCE=..\..\..\src\osgPlugins\ive\TexEnv.cpp # End Source File # Begin Source File @@ -234,151 +274,183 @@ SOURCE=..\..\..\src\osgPlugins\ive\Transform.cpp # PROP Default_Filter "h;hpp;hxx;hm;inl" # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\AnimationPath +SOURCE=..\..\..\src\osgPlugins\ive\AnimationPath.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\AnimationPathCallback +SOURCE=..\..\..\src\osgPlugins\ive\AnimationPathCallback.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\Billboard +SOURCE=..\..\..\src\osgPlugins\ive\Billboard.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\BlendFunc +SOURCE=..\..\..\src\osgPlugins\ive\BlendFunc.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\CullFace +SOURCE=..\..\..\src\osgPlugins\ive\ConvexPlanarOccluder.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\DataInputStream +SOURCE=..\..\..\src\osgPlugins\ive\ConvexPlanarPolygon.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\DataOutputStream +SOURCE=..\..\..\src\osgPlugins\ive\CullFace.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\DataTypeSize +SOURCE=..\..\..\src\osgPlugins\ive\DataInputStream.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\Drawable +SOURCE=..\..\..\src\osgPlugins\ive\DataOutputStream.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\DrawArrayLengths +SOURCE=..\..\..\src\osgPlugins\ive\DataTypeSize.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\DrawArrays +SOURCE=..\..\..\src\osgPlugins\ive\Drawable.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\DrawElementsUShort +SOURCE=..\..\..\src\osgPlugins\ive\DrawArrayLengths.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\Exception +SOURCE=..\..\..\src\osgPlugins\ive\DrawArrays.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\Export +SOURCE=..\..\..\src\osgPlugins\ive\DrawElementsUInt.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\Geode +SOURCE=..\..\..\src\osgPlugins\ive\DrawElementsUShort.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\Geometry +SOURCE=..\..\..\src\osgPlugins\ive\Exception.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\Group +SOURCE=..\..\..\src\osgPlugins\ive\Geode.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\Image +SOURCE=..\..\..\src\osgPlugins\ive\Geometry.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\Light +SOURCE=..\..\..\src\osgPlugins\ive\Group.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\LightSource +SOURCE=..\..\..\src\osgPlugins\ive\Image.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\LOD +SOURCE=..\..\..\src\osgPlugins\ive\Impostor.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\Material +SOURCE=..\..\..\src\osgPlugins\ive\Light.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\MatrixTransform +SOURCE=..\..\..\src\osgPlugins\ive\LightSource.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\Node +SOURCE=..\..\..\src\osgPlugins\ive\LOD.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\Object +SOURCE=..\..\..\src\osgPlugins\ive\Material.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\PositionAttitudeTransform +SOURCE=..\..\..\src\osgPlugins\ive\MatrixTransform.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\PrimitiveSet +SOURCE=..\..\..\src\osgPlugins\ive\Node.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\ReadWrite +SOURCE=..\..\..\src\osgPlugins\ive\Object.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\Sequence +SOURCE=..\..\..\src\osgPlugins\ive\OccluderNode.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\StateSet +SOURCE=..\..\..\src\osgPlugins\ive\PositionAttitudeTransform.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\TexEnv +SOURCE=..\..\..\src\osgPlugins\ive\PrimitiveSet.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\TexEnvCombine +SOURCE=..\..\..\src\osgPlugins\ive\PolygonOffset.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\TexGen +SOURCE=..\..\..\src\osgPlugins\ive\Point.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\Texture +SOURCE=..\..\..\src\osgPlugins\ive\ShadeModel.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\Texture2D +SOURCE=..\..\..\src\osgPlugins\ive\ReadWrite.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\TextureCubeMap +SOURCE=..\..\..\src\osgPlugins\ive\Sequence.h # End Source File # Begin Source File -SOURCE=..\..\..\src\osgPlugins\ive\Transform +SOURCE=..\..\..\src\osgPlugins\ive\Switch.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\osgPlugins\ive\StateSet.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\osgPlugins\ive\TexEnv.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\osgPlugins\ive\TexEnvCombine.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\osgPlugins\ive\TexGen.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\osgPlugins\ive\Texture.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\osgPlugins\ive\Texture2D.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\osgPlugins\ive\TextureCubeMap.h +# End Source File +# Begin Source File + +SOURCE=..\..\..\src\osgPlugins\ive\Transform.h # End Source File # End Group # Begin Group "Resource Files" diff --git a/doc/documentation.html b/doc/documentation.html index ce2d4b493..831b90f0a 100644 --- a/doc/documentation.html +++ b/doc/documentation.html @@ -51,7 +51,7 @@ scene graph database utilities reference guide. scene graph particle reference guide.
osgText/         scene graph text reference guide. -
osgText/         +
osgSim/         scene graph visual simulation library reference guide.
osgGA/         scene graph gui abstraction reference guide. diff --git a/examples/osgautotransform/osgautotransform.cpp b/examples/osgautotransform/osgautotransform.cpp index 2700a8d5e..ba1a8e121 100644 --- a/examples/osgautotransform/osgautotransform.cpp +++ b/examples/osgautotransform/osgautotransform.cpp @@ -60,9 +60,9 @@ osg::Node* createLabel2(const osg::Vec3& pos, float size, const std::string& lab text->setPosition(pos); text->setFontResolution(40,40); text->setCharacterSize(size); + text->setCharacterSizeMode(osgText::Text::SCREEN_COORDS); text->setAlignment(osgText::Text::CENTER_CENTER); text->setAutoRotateToScreen(true); - text->setAutoScaleToLimitScreenSizeToFontResolution(true); text->setDrawMode(osgText::Text::TEXT_PIXMAP); text->setText(label); @@ -87,7 +87,7 @@ osg::Node* createLabel3(const osg::Vec3& pos, float size, const std::string& lab text->setCharacterSize(size); text->setAlignment(osgText::Text::CENTER_CENTER); text->setAutoRotateToScreen(true); - text->setAutoScaleToLimitScreenSizeToFontResolution(true); + text->setCharacterSizeMode(osgText::Text::OBJECT_COORDS_WITH_MAXIMUM_SCREEN_SIZE_CAPPED_BY_FONT_HEIGHT); text->setText(label); }