Tentacle mask - #6
Merged
Merged
Conversation
It rode in with the eyeball commit by accident. The artifact-path fix is a release-pipeline change with nothing to do with the goo, and a tag is waiting on it — so it goes out on its own branch rather than waiting for this one to be ready. Reverted rather than amended: this branch is already pushed, and rewriting a ref someone may have fetched to save one commit is a bad trade. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Three conflicts, all of them the same shape: this branch already carried the work main was bringing, so git saw two independent additions of the same thing rather than a divergence. - CMakeLists.txt / qml/Main.qml — main adds the eye resources, the eye shaders and the --full flag; this branch has all of them plus the tentacle entries and the --interval flag. Kept ours, having checked line by line that nothing main adds is missing from it. - src/effects/OozeEffect.cpp — the eye code is identical on both sides, so the merge duplicated 400 lines of it. The only real difference is that main keeps OozeTextureData as a private class inside the file while this branch has it extracted as IconTexture, which the tentacle effect also uses. Kept ours; main's copy would have left two classes doing one job and the tentacles unable to reach either. The audit of what main has and this branch does not came back with four things, all deliberate: the simtest target (migrated to CTest), the find_package line without Test, main's simpler countly submodule guard (this branch fetches or downloads it instead of failing), and an earlier wording of the eye-mesh comment. Verified: configure and build clean from an empty tree, ctest 39/39, and all three effects render — the goo's eyes, which are what main was bringing, and the tentacles, which are what this branch is for. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
No description provided.