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

Fixed the scaling in pixelSize computation and the autoscale usage of it.

Browse Source
This commit is contained in:
Robert Osfield 2005-03-23 10:46:08 +00:00
parent a61a99251f
commit 60597f4bbb
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/osg/AutoTransform.cpp
View File

@ -153,7 +153,7 @@ void AutoTransform::accept(NodeVisitor& nv)
if (getAutoScaleToScreen()) if (getAutoScaleToScreen())
{ {
float size = 1.0f/cs->pixelSize(getPosition(),1.0f); float size = 1.0f/cs->pixelSize(getPosition(),0.48f);
setScale(size); setScale(size);
} }

2
src/osg/CullStack.cpp
View File

@ -106,7 +106,7 @@ void CullStack::pushCullingSet()
M(2,2)*P23, M(2,2)*P23,
M(3,2)*P23 + M(3,3)*P33); M(3,2)*P23 + M(3,3)*P33);
float scaleRatio = 0.701f/sqrtf(scale_00.length2()+scale_10.length2()); float scaleRatio = 0.7071067811f/sqrtf(scale_00.length2()+scale_10.length2());
pixelSizeVector *= scaleRatio; pixelSizeVector *= scaleRatio;