From a44efe01bb41812faea240959cfc01193e738e04 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 12 Apr 2002 09:53:39 +0000 Subject: [PATCH] Fixes for Win32 build --- include/osg/Transform | 4 ++-- src/osg/Transform.cpp | 2 +- src/osgText/FTVectoriser.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/osg/Transform b/include/osg/Transform index bd181f731..a3059c7a2 100644 --- a/include/osg/Transform +++ b/include/osg/Transform @@ -43,12 +43,12 @@ class SG_EXPORT Transform : public Group enum ReferenceFrame { RELATIVE_TO_PARENTS, - ABSOLUTE + RELATIVE_TO_ABSOLUTE }; /** Set the transform's ReferenceFrame, either to be realtive to its parent reference frame, * or relative to an absolute coordinate frame. RELATIVE_TO_PARENTS is the default. - * Note, setting the RefrenceFrame to be ABSOLUTE will also set the CullingActive flag on the + * Note, setting the RefrenceFrame to be RELATIVE_TO_ABSOLUTE will also set the CullingActive flag on the * transform, and hence all its parents, to false, therby disabling culling of it and all its * parents. This is neccessary to prevent inappropriate culling, but may impact of cull times * if the absolute transform is deep in the scene graph, it is therefore recommend to only use diff --git a/src/osg/Transform.cpp b/src/osg/Transform.cpp index 3eb510d22..f49cf7d42 100644 --- a/src/osg/Transform.cpp +++ b/src/osg/Transform.cpp @@ -42,7 +42,7 @@ void Transform::setReferenceFrame(ReferenceFrame rf) _referenceFrame = rf; // switch off culling if transform is absolute. - if (_referenceFrame==ABSOLUTE) setCullingActive(false); + if (_referenceFrame==RELATIVE_TO_ABSOLUTE) setCullingActive(false); else setCullingActive(true); } diff --git a/src/osgText/FTVectoriser.cpp b/src/osgText/FTVectoriser.cpp index 0044d53fa..762e80cc3 100644 --- a/src/osgText/FTVectoriser.cpp +++ b/src/osgText/FTVectoriser.cpp @@ -30,7 +30,7 @@ void FTContour::AddPoint( const float x, const float y) FTVectoriser::FTVectoriser( FT_Glyph glyph) : contour(0), contourFlag(0), - kBSTEPSIZE( 0.2) + kBSTEPSIZE( 0.2f) { FT_OutlineGlyph outline = (FT_OutlineGlyph)glyph; ftOutline = outline->outline;