Skip to content

Replaced Zone Upload Estimate with staging buffers #1035

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

Open
RuffledPlume wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Replaced Zone Upload Estimate with staging buffers #1035

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions src/main/java/rs117/hd/overlays/FrameTimerOverlay.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,6 +214,7 @@ public Dimension render(Graphics2D g) {
WorldViewContext root = sceneManager.getRoot();
addTiming("Root Scene Load", root.loadTime, false);
addTiming("Root Scene Upload", root.uploadTime, false);
addTiming("Root Scene Buffer", root.bufferInit / ((long) root.sizeX * root.sizeZ), false);
addTiming("Root Scene Swap", root.sceneSwapTime, false);

// TODO: Maybe this should be calculated somewhere else
Expand Down
27 changes: 16 additions & 11 deletions src/main/java/rs117/hd/renderer/zone/SceneManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,7 +361,7 @@ private static boolean isEdgeTile(Zone[][] zones, int zx, int zz) {
Zone zone = zones[x][z];
if (!zone.initialized)
return true;
if (zone.sizeO == 0 && zone.sizeA == 0)
if (zone.sizeIntsOpaque == 0 && zone.sizeIntsAlpha == 0)
return true;
}
}
Expand Down Expand Up @@ -434,7 +434,7 @@ public synchronized void loadScene(WorldView worldView, Scene scene) {

Stopwatch sw = Stopwatch.createStarted();
root.isLoading = true;
root.loadTime = root.uploadTime = root.sceneSwapTime = 0;
root.loadTime = root.uploadTime = root.bufferInit = root.sceneSwapTime = 0;

root.sceneLoadGroup.complete();
root.streamingGroup.complete();
Expand Down Expand Up @@ -543,7 +543,7 @@ public synchronized void loadScene(WorldView worldView, Scene scene) {
continue;

final Zone old = ctx.zones[ox][oz];
if (!old.initialized || (old.sizeO == 0 && old.sizeA == 0))
if (!old.initialized || (old.sizeIntsOpaque == 0 && old.sizeIntsAlpha == 0))
continue;

old.needsRoofUpdate = true;
Expand Down Expand Up @@ -578,7 +578,7 @@ public synchronized void loadScene(WorldView worldView, Scene scene) {
float dist = distance(vec(x, z), vec(NUM_ZONES / 2, NUM_ZONES / 2));
if (!staggerLoad || dist < ZONE_DEFER_DIST_START) {
ZoneUploadJob
.build(ctx, nextSceneContext, zone, true, x, z)
.build(ctx, nextSceneContext, zone, x, z)
.queue(ctx.sceneLoadGroup, generateSceneDataTask);
nextSceneContext.totalMapZones++;
} else {
Expand All @@ -597,13 +597,18 @@ public synchronized void loadScene(WorldView worldView, Scene scene) {
// Reuse the old zone while uploading a correct one
sorted.zone.cull = false;
sorted.zone.uploadJob = ZoneUploadJob
.build(ctx, nextSceneContext, newZone, false, sorted.x, sorted.z);
sorted.zone.uploadJob.revealAfterTimestampMs =
timeMs + ceil(clamp(sorted.dist / 15.0f, 0.25f, 1.5f) * 1000.0f);
.build(
ctx,
nextSceneContext,
newZone,
sorted.x,
sorted.z,
timeMs + ceil(clamp(sorted.dist / 15.0f, 0.25f, 1.5f) * 1000.0f)
);
} else {
nextZones[sorted.x][sorted.z] = newZone;
ZoneUploadJob
.build(ctx, nextSceneContext, newZone, true, sorted.x, sorted.z)
.build(ctx, nextSceneContext, newZone, sorted.x, sorted.z)
.queue(ctx.sceneLoadGroup, generateSceneDataTask);
}
sorted.free();
Expand Down Expand Up @@ -677,8 +682,8 @@ public void swapScene(Scene scene) {
int totalAlpha = 0;
for (int x = 0; x < NUM_ZONES; ++x) {
for (int z = 0; z < NUM_ZONES; ++z) {
totalOpaque += nextZones[x][z].bufLen;
totalAlpha += nextZones[x][z].bufLenA;
totalOpaque += nextZones[x][z].sizeIntsOpaque;
totalAlpha += nextZones[x][z].sizeIntsAlpha;
}
}

Expand Down Expand Up @@ -764,7 +769,7 @@ private void loadSubScene(WorldView worldView, Scene scene) {
for (int x = 0; x < ctx.sizeX; ++x)
for (int z = 0; z < ctx.sizeZ; ++z)
ZoneUploadJob
.build(ctx, sceneContext, ctx.zones[x][z], true, x, z)
.build(ctx, sceneContext, ctx.zones[x][z], x, z)
.queue(ctx.sceneLoadGroup);

ctx.loadTime = sw.elapsed(TimeUnit.NANOSECONDS);
Expand Down
Loading