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

chore(rendering): migrate chunk mesh generation Flux #4786

Merged
merged 75 commits into from
May 13, 2022
Merged

chore(rendering): migrate chunk mesh generation Flux #4786

merged 75 commits into from
May 13, 2022

Commits on Jun 21, 2021

  1. refactor(rendering): rework chunk mesh generation with RXJava

    @pollend
    pollend committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    2723a05 View commit details
    Browse the repository at this point in the history

  2. cleanup

    @pollend
    pollend committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    f0ac410 View commit details
    Browse the repository at this point in the history

  3. chore: replace with computation

    @pollend
    pollend committed Jun 21, 2021
    Configuration menu
    Copy the full SHA
    ca841b7 View commit details
    Browse the repository at this point in the history

Commits on Jun 23, 2021

  1. refactor(rendering): rework chunk mesh generation with RXJava Flowable

    @pollend
    pollend committed Jun 23, 2021
    Configuration menu
    Copy the full SHA
    093921c View commit details
    Browse the repository at this point in the history

  2. update tessellator

    @pollend
    pollend committed Jun 23, 2021
    Configuration menu
    Copy the full SHA
    7791254 View commit details
    Browse the repository at this point in the history

Commits on Jun 25, 2021

  1. chore: cleanup

    @pollend
    pollend committed Jun 25, 2021
    Configuration menu
    Copy the full SHA
    8016258 View commit details
    Browse the repository at this point in the history

Commits on Jun 26, 2021

  1. chore: cleanup

    @pollend
    pollend committed Jun 26, 2021
    Configuration menu
    Copy the full SHA
    dea7815 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2021

  1. Merge branch 'develop' into refactor/migrate-chunk-mesh-generation-fl… 

    …owable
    @pollend
    pollend authored Jun 27, 2021
    Configuration menu
    Copy the full SHA
    9df6538 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' of github.com:MovingBlocks/Terasology into ref… 

    …actor/migrate-chunk-mesh-generation-flowable
    @pollend
    pollend committed Jun 27, 2021
    Configuration menu
    Copy the full SHA
    a8e2d11 View commit details
    Browse the repository at this point in the history

  3. chore: add info

    @pollend
    pollend committed Jun 27, 2021
    Configuration menu
    Copy the full SHA
    5902bbd View commit details
    Browse the repository at this point in the history

  4. Merge branch 'refactor/migrate-chunk-mesh-generation-flowable' of git… 

    …hub.com:MovingBlocks/Terasology into refactor/migrate-chunk-mesh-generation-flowable
    @pollend
    pollend committed Jun 27, 2021
    Configuration menu
    Copy the full SHA
    1456a7a View commit details
    Browse the repository at this point in the history

  5. chore: better handle processing chunks that are unloaded

    @pollend
    pollend committed Jun 27, 2021
    Configuration menu
    Copy the full SHA
    9b04a71 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2021

  1. chore: replace with reactor

    @pollend
    pollend committed Jul 3, 2021
    Configuration menu
    Copy the full SHA
    543a293 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into refactor/migrate-chunk-mesh-generation-fl… 

    …owable
    @pollend
    pollend authored Jul 3, 2021
    Configuration menu
    Copy the full SHA
    2826532 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2021

  1. chore: batch process chunks

    @pollend
    pollend committed Jul 4, 2021
    Configuration menu
    Copy the full SHA
    08cafdc View commit details
    Browse the repository at this point in the history

  2. Merge branch 'refactor/migrate-chunk-mesh-generation-flowable' of git… 

    …hub.com:MovingBlocks/Terasology into refactor/migrate-chunk-mesh-generation-flowable
    @pollend
    pollend committed Jul 4, 2021
    Configuration menu
    Copy the full SHA
    0acab6b View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' into refactor/migrate-chunk-mesh-generation-fl… 

    …owable
    @pollend
    pollend authored Jul 4, 2021
    Configuration menu
    Copy the full SHA
    d088ace View commit details
    Browse the repository at this point in the history

  4. chore: minor cleanup

    @pollend
    pollend committed Jul 4, 2021
    Configuration menu
    Copy the full SHA
    8c6e918 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'refactor/migrate-chunk-mesh-generation-flowable' of git… 

    …hub.com:MovingBlocks/Terasology into refactor/migrate-chunk-mesh-generation-flowable
    @pollend
    pollend committed Jul 4, 2021
    Configuration menu
    Copy the full SHA
    3da70fc View commit details
    Browse the repository at this point in the history

  6. chore: limit number of parallel rails

    @pollend
    pollend committed Jul 4, 2021
    Configuration menu
    Copy the full SHA
    f53e6bc View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2021

  1. Merge branch 'develop' into refactor/migrate-chunk-mesh-generation-fl… 

    …owable
    @pollend
    pollend authored Jul 5, 2021
    Configuration menu
    Copy the full SHA
    587dc29 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2021

  1. Merge branch 'develop' into refactor/migrate-chunk-mesh-generation-fl… 

    …owable
    @pollend
    pollend authored Aug 1, 2021
    Configuration menu
    Copy the full SHA
    8d4264f View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2021

  1. Merge branch 'develop' into refactor/migrate-chunk-mesh-generation-fl… 

    …owable
    @pollend
    pollend authored Aug 7, 2021
    Configuration menu
    Copy the full SHA
    4a951a8 View commit details
    Browse the repository at this point in the history

Commits on Aug 24, 2021

  1. Merge branch 'develop' into refactor/migrate-chunk-mesh-generation-fl… 

    …owable
    @pollend
    pollend authored Aug 24, 2021
    Configuration menu
    Copy the full SHA
    0005fcd View commit details
    Browse the repository at this point in the history

Commits on Aug 28, 2021

  1. Merge branch 'develop' of github.com:MovingBlocks/Terasology into ref… 

    …actor/migrate-chunk-mesh-generation-flowable
    @pollend
    pollend committed Aug 28, 2021
    Configuration menu
    Copy the full SHA
    f2ba2d7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'refactor/migrate-chunk-mesh-generation-flowable' of git… 

    …hub.com:MovingBlocks/Terasology into refactor/migrate-chunk-mesh-generation-flowable
    @pollend
    pollend committed Aug 28, 2021
    Configuration menu
    Copy the full SHA
    b04e07e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'develop' of github.com:MovingBlocks/Terasology into ref… 

    …actor/migrate-chunk-mesh-generation-flowable
    @pollend
    pollend committed Aug 28, 2021
    Configuration menu
    Copy the full SHA
    bad0581 View commit details
    Browse the repository at this point in the history

Commits on Aug 29, 2021

  1. chore: remove duplicate reactor and scheulders

    @pollend
    pollend committed Aug 29, 2021
    Configuration menu
    Copy the full SHA
    fef81c6 View commit details
    Browse the repository at this point in the history

  2. chore: update interfaces

    @pollend
    pollend committed Aug 29, 2021
    Configuration menu
    Copy the full SHA
    cfc7d58 View commit details
    Browse the repository at this point in the history

Commits on Sep 3, 2021

  1. Merge branch 'develop' into refactor/migrate-chunk-mesh-generation-fl… 

    …owable
    @pollend
    pollend authored Sep 3, 2021
    Configuration menu
    Copy the full SHA
    7cbdc32 View commit details
    Browse the repository at this point in the history

  2. chore: clean up RenderableWorldImpl

    @pollend
    pollend committed Sep 3, 2021
    Configuration menu
    Copy the full SHA
    73085f8 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'refactor/migrate-chunk-mesh-generation-flowable' of git… 

    …hub.com:MovingBlocks/Terasology into refactor/migrate-chunk-mesh-generation-flowable
    @pollend
    pollend committed Sep 3, 2021
    Configuration menu
    Copy the full SHA
    a1e3ae1 View commit details
    Browse the repository at this point in the history

  4. chore: remove ChunkTask

    @pollend
    pollend committed Sep 3, 2021
    Configuration menu
    Copy the full SHA
    79f80f6 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2021

  1. Merge remote-tracking branch 'origin/develop' into refactor/migrate-c… 

    …hunk-mesh-generation-flowable

# Conflicts:
#	engine/src/main/java/org/terasology/engine/rendering/world/ChunkMeshUpdateManager.java
    @keturn
    keturn committed Sep 5, 2021
    Configuration menu
    Copy the full SHA
    262c677 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into refactor/migrate-chunk-mesh-generation-fl… 

    …owable
    @pollend
    pollend authored Sep 5, 2021
    Configuration menu
    Copy the full SHA
    bd783e6 View commit details
    Browse the repository at this point in the history

  3. chore: simplify consumer

    @pollend
    pollend committed Sep 5, 2021
    Configuration menu
    Copy the full SHA
    e15b975 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2021

  1. handle emission error when submitting chunk for mesh

    @pollend
    pollend committed Sep 6, 2021
    Configuration menu
    Copy the full SHA
    950acbe View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2021

  1. Merge branch 'develop' into refactor/migrate-chunk-mesh-generation-fl… 

    …owable
    @pollend
    pollend authored Oct 3, 2021
    Configuration menu
    Copy the full SHA
    e5069c7 View commit details
    Browse the repository at this point in the history

Commits on Nov 7, 2021

  1. Merge branch 'develop' into refactor/migrate-chunk-mesh-generation-fl… 

    …owable
    @pollend
    pollend authored Nov 7, 2021
    Configuration menu
    Copy the full SHA
    de2835d View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2021

  1. Merge branch 'develop' of github.com:MovingBlocks/Terasology into ref… 

    …actor/migrate-chunk-mesh-generation-flowable
    @pollend
    pollend committed Nov 20, 2021
    Configuration menu
    Copy the full SHA
    7072611 View commit details
    Browse the repository at this point in the history

Commits on Nov 27, 2021

  1. Merge branch 'develop' into refactor/migrate-chunk-mesh-generation-fl… 

    …owable
    @pollend
    pollend authored Nov 27, 2021
    Configuration menu
    Copy the full SHA
    60a63fe View commit details
    Browse the repository at this point in the history

Commits on Dec 5, 2021

  1. Merge branch 'develop' into refactor/migrate-chunk-mesh-generation-fl… 

    …owable
    @pollend
    pollend authored Dec 5, 2021
    Configuration menu
    Copy the full SHA
    25e2983 View commit details
    Browse the repository at this point in the history

Commits on Dec 6, 2021

  1. refactor: split out chunk work as a seperate helper class

    @pollend
    pollend committed Dec 6, 2021
    Configuration menu
    Copy the full SHA
    1bfcd3c View commit details
    Browse the repository at this point in the history

Commits on Dec 10, 2021

  1. chore: cleanup world renderer

    @pollend
    pollend committed Dec 10, 2021
    Configuration menu
    Copy the full SHA
    e7663be View commit details
    Browse the repository at this point in the history

Commits on Jan 19, 2022

  1. Merge remote-tracking branch 'origin/develop' into refactor/migrate-c… 

    …hunk-mesh-generation-flowable

# Conflicts:
#	engine/src/main/java/org/terasology/engine/rendering/world/ChunkMeshUpdateManager.java
    @keturn
    keturn committed Jan 19, 2022
    Configuration menu
    Copy the full SHA
    93fe4f8 View commit details
    Browse the repository at this point in the history

  2. fix(RenderableWorldImpl): update for ChunkMonitor change #4888

    @keturn
    keturn committed Jan 19, 2022
    Configuration menu
    Copy the full SHA
    4667639 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'refactor/migrate-chunk-mesh-generation-flowable' into r… 

    …efactor/split-chunk-processing-seperate-class

engine/src/main/java/org/terasology/engine/rendering/world/RenderableWorldImpl.java
    @keturn
    keturn committed Jan 19, 2022
    Configuration menu
    Copy the full SHA
    90791df View commit details
    Browse the repository at this point in the history

  4. chore(rendering.world): lint

    @keturn
    keturn committed Jan 19, 2022
    Configuration menu
    Copy the full SHA
    a15466b View commit details
    Browse the repository at this point in the history

  5. Merge pull request #4972 from MovingBlocks/refactor/split-chunk-proce… 

    …ssing-seperate-class
    @keturn
    keturn authored Jan 19, 2022
    Configuration menu
    Copy the full SHA
    8e227a1 View commit details
    Browse the repository at this point in the history

Commits on Jan 20, 2022

  1. test(ChunkMeshWorker): initial sketch of tests 

    #ci-skip
    @keturn
    keturn committed Jan 20, 2022
    Configuration menu
    Copy the full SHA
    9562e86 View commit details
    Browse the repository at this point in the history

  2. refactor(Chunk): provide default implementations of methods where pos… 

    …sible
    @keturn
    keturn committed Jan 20, 2022
    Configuration menu
    Copy the full SHA
    ff3b09c View commit details
    Browse the repository at this point in the history

  3. refactor(ChunkMeshWorker): factor out the generateMesh method

    @keturn
    keturn committed Jan 20, 2022
    Configuration menu
    Copy the full SHA
    130dfcd View commit details
    Browse the repository at this point in the history

  4. test(DummyChunk): stub implementation of Chunk

    @keturn
    keturn committed Jan 20, 2022
    Configuration menu
    Copy the full SHA
    e032131 View commit details
    Browse the repository at this point in the history

  5. test(ChunkMeshWorker): initial attempt at using reactor-test 

    #ci-skip
    @keturn
    keturn committed Jan 20, 2022
    Configuration menu
    Copy the full SHA
    e4c723a View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2022

  1. test(ChunkMeshWorker): implement more tests 

    They are beginning to look readable.
    @keturn
    keturn committed Jan 22, 2022
    Configuration menu
    Copy the full SHA
    e9e32b7 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/develop' into refactor/migrate-c… 

    …hunk-mesh-generation-flowable
    @keturn
    keturn committed Jan 22, 2022
    Configuration menu
    Copy the full SHA
    cf27ab9 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'refactor/migrate-chunk-mesh-generation-flowable' into t… 

    …est/chunkmeshworker
    @keturn
    keturn committed Jan 22, 2022
    Configuration menu
    Copy the full SHA
    3f5a78f View commit details
    Browse the repository at this point in the history

  4. fix(ChunkMeshWorker): fix no-longer-processing test

    @keturn
    keturn committed Jan 22, 2022
    Configuration menu
    Copy the full SHA
    cf7710a View commit details
    Browse the repository at this point in the history

  5. refactor(ChunkMeshWorker): inline fluxNewMeshes 

    As it is now, being able to pass a different source flux there did not improve testability.
    @keturn
    keturn committed Jan 22, 2022
    Configuration menu
    Copy the full SHA
    095e40d View commit details
    Browse the repository at this point in the history

  6. refactor(Chunk): push dispose-old-mesh logic down in to Chunk.setMesh 

    Every usage of setMesh had this, so it seemed safer to make Chunk responsible for this operation.
    @keturn
    keturn committed Jan 22, 2022
    Configuration menu
    Copy the full SHA
    72b0f67 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2022

  1. refactor(ChunkMeshWorker): make worker function definitions more compact

    @keturn
    keturn committed Feb 6, 2022
    Configuration menu
    Copy the full SHA
    ca2f3be View commit details
    Browse the repository at this point in the history

  2. Merge branch 'develop' into refactor/migrate-chunk-mesh-generation-fl… 

    …owable
    @keturn
    keturn authored Feb 6, 2022
    Configuration menu
    Copy the full SHA
    b41ebb1 View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2022

  1. Merge branch 'develop' into refactor/migrate-chunk-mesh-generation-fl… 

    …owable
    @keturn
    keturn authored Feb 18, 2022
    Configuration menu
    Copy the full SHA
    761a492 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/refactor/migrate-chunk-mesh-gene… 

    …ration-flowable' into test/chunkmeshworker
    @keturn
    keturn committed Feb 18, 2022
    Configuration menu
    Copy the full SHA
    430bafa View commit details
    Browse the repository at this point in the history

  3. test(ChunkMeshWorker): remove some difficult to implement tests about… 

    … optimizations we probably don't need
    @keturn
    keturn committed Feb 18, 2022
    Configuration menu
    Copy the full SHA
    972ee97 View commit details
    Browse the repository at this point in the history

Commits on Apr 3, 2022

  1. Merge branch 'develop' into refactor/migrate-chunk-mesh-generation-fl… 

    …owable
    @jdrueckert
    jdrueckert authored Apr 3, 2022
    Configuration menu
    Copy the full SHA
    1f4ac45 View commit details
    Browse the repository at this point in the history

Commits on May 3, 2022

  1. Merge remote-tracking branch 'origin/develop' into refactor/migrate-c… 

    …hunk-mesh-generation-flowable
    @keturn
    keturn committed May 3, 2022
    Configuration menu
    Copy the full SHA
    6e534d7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'refactor/migrate-chunk-mesh-generation-flowable' into t… 

    …est/chunkmeshworker
    @keturn
    keturn committed May 3, 2022
    Configuration menu
    Copy the full SHA
    4cc9ca1 View commit details
    Browse the repository at this point in the history

Commits on May 6, 2022

  1. test(ChunkMeshWorker): make DummyChunk strings slightly more concise

    @keturn
    keturn committed May 6, 2022
    Configuration menu
    Copy the full SHA
    b313fb0 View commit details
    Browse the repository at this point in the history

  2. test(ChunkMeshWorker): fix testMultipleChunks so the results are orde… 

    …r-independent

Because they run in parallel, if there are only two of them, either one may return first.
    @keturn
    keturn committed May 6, 2022
    Configuration menu
    Copy the full SHA
    3db427f View commit details
    Browse the repository at this point in the history

Commits on May 7, 2022

  1. test(ChunkMeshWorker): add some documentation

    @keturn
    keturn committed May 7, 2022
    Configuration menu
    Copy the full SHA
    d69eef8 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/develop' into refactor/migrate-c… 

    …hunk-mesh-generation-flowable
    @keturn
    keturn committed May 7, 2022
    Configuration menu
    Copy the full SHA
    a157225 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'refactor/migrate-chunk-mesh-generation-flowable' into t… 

    …est/chunkmeshworker
    @keturn
    keturn committed May 7, 2022
    Configuration menu
    Copy the full SHA
    f9c6475 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #4987 from MovingBlocks/test/chunkmeshworker

    @keturn
    keturn authored May 7, 2022
    Configuration menu
    Copy the full SHA
    cfb307c View commit details
    Browse the repository at this point in the history

Commits on May 9, 2022

  1. Merge branch 'develop' into refactor/migrate-chunk-mesh-generation-fl… 

    …owable
    @keturn
    keturn authored May 9, 2022
    Configuration menu
    Copy the full SHA
    4c296fe View commit details
    Browse the repository at this point in the history