Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

improves paging preloader #3126

Merged
merged 23 commits into from
Sep 27, 2021
Merged

improves paging preloader #3126

Changes from 1 commit
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
308de24
Return check for distance when we try to reuse data
bosvensson1 Sep 26, 2021
0382d12
[ci skip]
bosvensson1 Sep 26, 2021
b642d07
[ci skip]
bosvensson1 Sep 26, 2021
8673b65
[ci skip]
bosvensson1 Sep 26, 2021
91d6024
[ci skip]
bosvensson1 Sep 26, 2021
e4efbfd
[ci skip]
bosvensson1 Sep 26, 2021
6a28c6e
Merge branch 'OpenMW:master' into bosvensson1-patch-14
bosvensson1 Sep 26, 2021
78ee565
cellpreloader.cpp
bosvensson1 Sep 26, 2021
df43219
[ci skip]
bosvensson1 Sep 26, 2021
97c3e02
[ci skip]
bosvensson1 Sep 26, 2021
efa14ed
[ci skip]
bosvensson1 Sep 26, 2021
e452e06
[ci skip]
bosvensson1 Sep 26, 2021
8b00b01
[ci skip]
bosvensson1 Sep 26, 2021
b48da0f
[ci skip]
bosvensson1 Sep 26, 2021
6731a08
[ci skip]
bosvensson1 Sep 26, 2021
dc75b9c
[ci skip]
bosvensson1 Sep 26, 2021
4d5a73b
quadtreeworld.cpp
bosvensson1 Sep 26, 2021
6ba0484
chunkmanager.cpp
bosvensson1 Sep 26, 2021
42026c6
chunkmanager.cpp
bosvensson1 Sep 26, 2021
03c785c
cellpreloader.cpp
bosvensson1 Sep 26, 2021
91b44ba
jvoisin
bosvensson1 Sep 27, 2021
48cf421
whitespace
bosvensson1 Sep 27, 2021
7c139c9
whitespace
bosvensson1 Sep 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[ci skip]
  • Loading branch information
@bosvensson1
bosvensson1 committed Sep 26, 2021
commit b642d07e5ca359aaa4e20623f5728d417fdf0f69
7 changes: 1 addition & 6 deletions components/terrain/quadtreeworld.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ void loadRenderingNode(ViewData::Entry& entry, ViewData* vd, int vertexLodMod, f

for (QuadTreeWorld::ChunkManager* m : chunkManagers)
{
if (m->getViewDistance() && entry.mNode->distance(vd->getViewPoint()) > m->getViewDistance() + reuseDistance*10)
if (m->getViewDistance() && entry.mNode->distance(vd->getViewPoint()) > m->getViewDistance() + reuseDistance)
continue;
osg::ref_ptr<osg::Node> n = m->getChunk(entry.mNode->getSize(), entry.mNode->getCenter(), ourLod, entry.mLodFlags, activeGrid, vd->getViewPoint(), compile);
if (n) pat->addChild(n);
Expand Down Expand Up @@ -521,11 +521,6 @@ void QuadTreeWorld::preload(View *view, const osg::Vec3f &viewPoint, const osg::
vd->markUnchanged();
}

bool QuadTreeWorld::storeView(const View* view, double referenceTime)
{
return mViewDataMap->storeView(static_cast<const ViewData*>(view), referenceTime);
}

void QuadTreeWorld::reportStats(unsigned int frameNumber, osg::Stats *stats)
{
if (mCompositeMapRenderer)
Expand Down