Skip to content

Fix Dynamic/Temp Model Sorting #1108

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
+11 −4
Open

Fix Dynamic/Temp Model Sorting #1108

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
15 changes: 11 additions & 4 deletions src/main/java/rs117/hd/renderer/zone/ModelStreamingManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,14 @@ public int getDrawnDynamicRenderableCount() {
return count;
}

public boolean shouldSortModel(Renderable renderable, Model model, ModelOverride modelOverride) {
final int renderMode = renderable.getRenderMode();
return model.getFaceTransparencies() != null
|| modelOverride.mightHaveTransparency
|| renderable instanceof Player
|| (renderMode != Renderable.RENDERMODE_UNSORTED && renderMode != Renderable.RENDERMODE_DEFAULT);
}

public void drawTemp(Projection worldProjection, Scene scene, GameObject gameObject, Model m, int orientation, int x, int y, int z) {
WorldViewContext ctx = sceneManager.getContext(scene);
if (ctx == null || !sceneManager.isRoot(ctx) && ctx.isLoading || !renderCallbackManager.drawObject(scene, gameObject))
Expand Down Expand Up @@ -296,9 +304,8 @@ private void uploadTempModel(
final PrimitiveCharArray visibleFaces = FACE_INDICES.acquire();
final PrimitiveCharArray culledFaces = FACE_INDICES.acquire();

boolean shouldSort =
renderable.getRenderMode() == Renderable.RENDERMODE_SORTED ||
renderable.getRenderMode() == Renderable.RENDERMODE_SORTED_NO_DEPTH;

boolean shouldSort = shouldSortModel(renderable, m, modelOverride);
boolean isPlayer = renderable instanceof Player;
try (
SceneUploader sceneUploader = SceneUploader.POOL.acquire();
Expand Down Expand Up @@ -565,7 +572,7 @@ private void uploadDynamicModel(
final PrimitiveCharArray visibleFaces = FACE_INDICES.acquire();
final PrimitiveCharArray culledFaces = FACE_INDICES.acquire();

boolean shouldSort = renderable.getRenderMode() != Renderable.RENDERMODE_UNSORTED;
boolean shouldSort = shouldSortModel(renderable, m, modelOverride);
try (
SceneUploader sceneUploader = SceneUploader.POOL.acquire();
FacePrioritySorter facePrioritySorter = shouldSort ? FacePrioritySorter.POOL.acquire() : null
Expand Down