feat(JOML): migrate BatchPropagator
#4395
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
pollend
reviewed
Jan 10, 2021
Comment on lines
226
to
222
| int initialDepth = Math.max(ChunkConstants.SUNLIGHT_REGEN_THRESHOLD - start, 0); | ||
| int finalDepth = depth[depthIndex]; | ||
|
|
||
| int strength = Math.min(start + initialDepth - ChunkConstants.SUNLIGHT_REGEN_THRESHOLD + 1, ChunkConstants.MAX_SUNLIGHT); | ||
|
|
||
| for (int i = initialDepth; i <= finalDepth; ++i) { | ||
| sunlightPropagator.propagateFrom(toChunk.chunkToWorldPosition(x, ChunkConstants.SIZE_Y - i - 1, z), | ||
| (byte) (strength)); | ||
| if (strength < ChunkConstants.MAX_SUNLIGHT) { | ||
| strength++; | ||
| } | ||
| } | ||
| initialDepth = Math.max(Chunks.SUNLIGHT_REGEN_THRESHOLD - start, 0); | ||
| } else { | ||
| int initialDepth = Math.max(adjDepths[depthIndex], ChunkConstants.SUNLIGHT_REGEN_THRESHOLD - start); | ||
| byte strength = (byte) Math.min(ChunkConstants.MAX_SUNLIGHT, start + initialDepth - ChunkConstants.SUNLIGHT_REGEN_THRESHOLD + 1); | ||
| for (int i = initialDepth; i <= depth[depthIndex]; ++i) { | ||
| sunlightPropagator.propagateFrom(toChunk.chunkToWorldPosition(x, ChunkConstants.SIZE_Y - i - 1, z), strength); | ||
| if (strength < ChunkConstants.MAX_SUNLIGHT) { | ||
| strength++; | ||
| } | ||
| pos.y--; | ||
| initialDepth = Math.max(Chunks.SUNLIGHT_REGEN_THRESHOLD - start, adjDepths[depthIndex]); | ||
| } | ||
| byte strength = (byte) Math.min(Chunks.MAX_SUNLIGHT, start + initialDepth - Chunks.SUNLIGHT_REGEN_THRESHOLD + 1); | ||
| for (int i = initialDepth; i <= depth[depthIndex]; ++i) { | ||
| sunlightPropagator.propagateFrom(toChunk.chunkToWorldPosition(x, Chunks.SIZE_Y - i - 1, z, pos), strength); | ||
| if (strength < Chunks.MAX_SUNLIGHT) { | ||
| strength++; |
There was a problem hiding this comment.
so you moved the iterator out since its replicated in both conditions
There was a problem hiding this comment.
yep, I started with doing small changes, bringing arguments in the same order, inlining some parts, and suddenly it was highlighted as duplicate 😅
| * @param target | ||
| * @param populateMargins Whether to populate the edges of the target array | ||
| */ | ||
| default void populateMinAdjacent2D(int[] source, int[] target, int dimX, int dimY, boolean populateMargins) { |
There was a problem hiding this comment.
I was thinking static but this might work better. allows for different implementations. 👍
There was a problem hiding this comment.
I don't know whether we actually want different implementations? Maybe we should keep it static and only open that up if we actually find a use case for that?
pollend
previously approved these changes
Jan 10, 2021
skaldarnar
changed the base branch from
develop
to
joml/migrate-world-propagation-2
skaldarnar
force-pushed
the
joml/migrate-world-propagation-3
branch
from
d1d6c6d
to
e54e6a1
Compare
|
Rebased this PR onto |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
InternalLightProcessorSunlightRegenBatchPropagatorpopulateMinAdjacent2DfromChunkMathtoBatchPropagatorContributes to #3832
Follow-up to #4391