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

Fixes for Win32 build

Browse Source
This commit is contained in:
Robert Osfield 2002-04-12 09:53:39 +00:00
parent c6cdfc6794
commit a44efe01bb
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/osg/Transform
View File

@ -43,12 +43,12 @@ class SG_EXPORT Transform : public Group
enum ReferenceFrame enum ReferenceFrame
{ {
RELATIVE_TO_PARENTS, RELATIVE_TO_PARENTS,
ABSOLUTE RELATIVE_TO_ABSOLUTE
}; };
/** Set the transform's ReferenceFrame, either to be realtive to its parent reference frame, /** 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. * 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 * 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 * 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 * if the absolute transform is deep in the scene graph, it is therefore recommend to only use

2
src/osg/Transform.cpp
View File

@ -42,7 +42,7 @@ void Transform::setReferenceFrame(ReferenceFrame rf)
_referenceFrame = rf; _referenceFrame = rf;
// switch off culling if transform is absolute. // switch off culling if transform is absolute.
if (_referenceFrame==ABSOLUTE) setCullingActive(false); if (_referenceFrame==RELATIVE_TO_ABSOLUTE) setCullingActive(false);
else setCullingActive(true); else setCullingActive(true);
} }

2
src/osgText/FTVectoriser.cpp
View File

@ -30,7 +30,7 @@ void FTContour::AddPoint( const float x, const float y)
FTVectoriser::FTVectoriser( FT_Glyph glyph) FTVectoriser::FTVectoriser( FT_Glyph glyph)
: contour(0), : contour(0),
contourFlag(0), contourFlag(0),
kBSTEPSIZE( 0.2) kBSTEPSIZE( 0.2f)
{ {
FT_OutlineGlyph outline = (FT_OutlineGlyph)glyph; FT_OutlineGlyph outline = (FT_OutlineGlyph)glyph;
ftOutline = outline->outline; ftOutline = outline->outline;