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

Added support for priority offset and scale into PagedLOD.

Browse Source
This commit is contained in:
Robert Osfield
2004-01-05 20:45:28 +00:00
parent 50a7fc16af
commit 413064fc6e
10 changed files with 137 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/osgPlugins/osg/LOD.cpp
View File

@@ -46,15 +46,12 @@ bool LOD_readLocalData(Object& obj, Input& fr)
// set up coordinates.
int entry = fr[0].getNoNestedBrackets();
int capacity;
if (matchFirst)
{
fr += 2;
}
else if (fr[1].getInt(capacity))
else
{
lod.getRangeList().reserve(capacity);
fr += 3;
}
@@ -86,15 +83,12 @@ bool LOD_readLocalData(Object& obj, Input& fr)
// set up coordinates.
int entry = fr[0].getNoNestedBrackets();
int capacity;
if (matchFirst)
{
fr += 2;
}
else if (fr[1].getInt(capacity))
else
{
lod.getRangeList().reserve(capacity);
fr += 3;
}

5
src/osgPlugins/osg/PagedLOD.cpp
View File

@@ -49,15 +49,12 @@ bool PagedLOD_readLocalData(Object& obj, Input& fr)
// set up coordinates.
int entry = fr[0].getNoNestedBrackets();
int capacity;
if (matchFirst)
{
fr += 2;
}
else if (fr[1].getInt(capacity))
else
{
lod.getFileNameList().reserve(capacity);
fr += 3;
}

2
src/osgPlugins/txp/TXPNode.cpp
View File

@@ -189,6 +189,8 @@ osg::Node* TXPNode::addPagedLODTile(int x, int y, int lod)
osg::PagedLOD* pagedLOD = new osg::PagedLOD;
pagedLOD->setFileName(0,pagedLODfile);
pagedLOD->setPriorityOffset(0,1.0f);
pagedLOD->setPriorityScale(0,1.0f);
pagedLOD->setRange(0,0.0,info.maxRange);
pagedLOD->setCenter(info.center);
pagedLOD->setRadius(info.radius);