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

Removed redudent code paths

Browse Source
This commit is contained in:
Robert Osfield
2016-06-02 14:18:12 +01:00
parent 26e489f17d
commit 5c7e155a69
2 changed files with 17 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/osg/Drawable.cpp
View File

@@ -72,56 +72,28 @@ public:
{
OpenThreads::ScopedLock<OpenThreads::Mutex> lock(_mutex_deletedDisplayListCache);
bool trimFromFront = true;
if (trimFromFront)
unsigned int prev_size = _displayListMap.size();
// trim from front
DisplayListMap::iterator ditr=_displayListMap.begin();
unsigned int maxNumToDelete = (_displayListMap.size() > s_minimumNumberOfDisplayListsToRetainInCache) ? _displayListMap.size()-s_minimumNumberOfDisplayListsToRetainInCache : 0;
for(;
ditr!=_displayListMap.end() && elapsedTime<availableTime && noDeleted<maxNumToDelete;
++ditr)
{
unsigned int prev_size = _displayListMap.size();
glDeleteLists(ditr->second,1);
DisplayListMap::iterator ditr=_displayListMap.begin();
unsigned int maxNumToDelete = (_displayListMap.size() > s_minimumNumberOfDisplayListsToRetainInCache) ? _displayListMap.size()-s_minimumNumberOfDisplayListsToRetainInCache : 0;
for(;
ditr!=_displayListMap.end() && elapsedTime<availableTime && noDeleted<maxNumToDelete;
++ditr)
{
glDeleteLists(ditr->second,1);
elapsedTime = timer.delta_s(start_tick,timer.tick());
++noDeleted;
elapsedTime = timer.delta_s(start_tick,timer.tick());
++noDeleted;
++_numberDeletedDrawablesInLastFrame;
}
if (ditr!=_displayListMap.begin()) _displayListMap.erase(_displayListMap.begin(),ditr);
if (noDeleted+_displayListMap.size() != prev_size)
{
OSG_WARN<<"Error in delete"<<std::endl;
}
++_numberDeletedDrawablesInLastFrame;
}
else
if (ditr!=_displayListMap.begin()) _displayListMap.erase(_displayListMap.begin(),ditr);
if (noDeleted+_displayListMap.size() != prev_size)
{
unsigned int prev_size = _displayListMap.size();
DisplayListMap::reverse_iterator ditr=_displayListMap.rbegin();
unsigned int maxNumToDelete = (_displayListMap.size() > s_minimumNumberOfDisplayListsToRetainInCache) ? _displayListMap.size()-s_minimumNumberOfDisplayListsToRetainInCache : 0;
for(;
ditr!=_displayListMap.rend() && elapsedTime<availableTime && noDeleted<maxNumToDelete;
++ditr)
{
glDeleteLists(ditr->second,1);
elapsedTime = timer.delta_s(start_tick,timer.tick());
++noDeleted;
++_numberDeletedDrawablesInLastFrame;
}
if (ditr!=_displayListMap.rbegin()) _displayListMap.erase(ditr.base(),_displayListMap.end());
if (noDeleted+_displayListMap.size() != prev_size)
{
OSG_WARN<<"Error in delete"<<std::endl;
}
OSG_WARN<<"Error in delete"<<std::endl;
}
}
elapsedTime = timer.delta_s(start_tick,timer.tick());

2
src/osgFX/BumpMapping.cpp
View File

@@ -510,8 +510,6 @@ namespace
}
// second pass, self-shadowing
bool selfShadowing = false;
if (selfShadowing)
{
std::ostringstream vp_oss;
vp_oss <<