Introduction of a Hexagon Cell Grid in the GridMap node #822
Conversation
Changed some license header details and added a float value
Implemented core scripts for defining a hexagon cell as well as include the option to switch to hexagon from grid in the GridMap options.
From the developer's notes at line 321: General scaling and translation for the cell mesh. The translation is necessary because the meshes are centered around the origin, and we need to shift the cell up.
From what I can understand. updates the file to include grid changes and introduce the hex grid plus corresponding directions and caching for transforms.
From inline dev notes, Introduces the changes to rotating and flipping hexes so Y is down, crucial component for 3D art as well as other notable changes.
From dev notes - SQRT(3)/2; used both in the editor and the GridMap. Due to the division, it didn't fit the pattern of other Math_SQRTN defines, so I'm putting it here.
changed the top line + Introduction of the hexagon cells into a hex grid floor, adding transform options like rotation and flipping for cells and more.
Edited second line
Changed top lines 1 and 2 + Introduced hexagon cells into the core GridMap node, including coordinates for diagonal directions.
| @@ -41,6 +41,7 @@ | |||
|
|
|||
| #define Math_SQRT12 0.7071067811865475244008443621048490 | |||
| #define Math_SQRT2 1.4142135623730950488016887242 | |||
| #define Math_SQRT3 1.7320508075688772935274463415059 | |||
There was a problem hiding this comment.
This is a trivial math change, it does not need attribution.
There was a problem hiding this comment.
Okay, thanks for letting me know, wanted to be thorough.
There was a problem hiding this comment.
I believe this merge is done completely wrong. If you're using git for the first time, that's understandable I suppose.
Original work is presumably here?
https://github.com/BSChad/godot/commits/feat-grid-map-hexagonal-cells/
How it is now: All commits are from you. Each file is its own commit. You're giving credits in the file contents.
How it should be: Commit metadata should be exactly the same as original. There should be no changes in the headers at all. Attribution should be given in commit messages.
I'd suggest to use git cherry-pick.
Yeah first time, and yes that's the repo. |
|
also, this is an open PR in Godot (85890), which they want to release as 4.4 just wait until it appears upstream Redot should be merging old and/or rejected PRs, not the new ones that would appear in Godot anyway |
|
It's been ready to merge for months |
|
Okay, here's how you merge stuff: git clone git@github.com:Wasabi-Cheetah/redot-engine.git
cd redot-engine
git checkout -b feat-grid-map-hexagonal-cells
git fetch https://github.com/Redot-Engine/redot-engine master
git reset --hard FETCH_HEAD
git fetch https://github.com/BSChad/godot feat-grid-map-hexagonal-cells
git merge FETCH_HEAD
git push git@github.com:Wasabi-Cheetah/redot-engine.git feat-grid-map-hexagonal-cellsThen compile the engine and verify that all of it works as expected. That's the most important part, without which your PR has no value (since the commands above can be run automatically and by anyone). I've just did that, and here's the changes you should have in the PR: |
Spartan322
added
the
tracked:godot
|
Also could I get the related Godot PR/proposal for this? |
I opened a discussion using the redot-proposals repo here. It contains the reference PRs from Godot by BSChad and octetdev2 |
|
Related: godotengine/godot-proposals#4337 and godotengine/godot#85890 |
Forgot to add those important links, added it to my first post, thanks. |
|
Personally I'd prefer to wait on the Godot PR as its still being actively developed, its not abandoned nor stalled nor rejected by Godot, it had another commit just last week and it does not appear to be finished. |
Yeah I noticed that, thinking I jumped the gun. |
| @@ -29,6 +26,9 @@ | |||
| /* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ | |||
| /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ | |||
| /**************************************************************************/ | |||
| /* Work done by Octetdev2 and BSChad. */ | |||
| /* Merging done by Wasabi_Cheetah. */ | |||
| /**************************************************************************/ | |||
There was a problem hiding this comment.
About this, we can see what the rest of the team says.
But for future references, this is generally not a good practice to add credits to the preamble, if we allowed one person to do this everyone would want to do it and then suddenly you have 100 names in the preamble.
There was a problem hiding this comment.
Co-authors are supposed to be added to the commit message anyway, like what I did with 2d1c65b for WhalesState, but this won't be merged anyway cause the Godot PR is still WIP.
I've merged the work done by BSChad in his fork of Godot.
It Introduces a new Hexagon Grid option for the GridMap node.
Proper accreditation given in each file since I'm just a merger.
Locations of files changed for Hexagon feature in GridMap node.
redot/core/math/math_defs.h
modules/gridmap/doc_classes/GridMap.xml
modules/gridmap/editor/grid_map_editor_plugin.cpp
modules/gridmap/editor/grid_map_editor_plugin.h
modules/gridmap/grid_map.cpp
Since I'm on Linux, I will do build for Linux and post it on my fork.
Related: godotengine/godot-proposals#4337 and godotengine/godot#85890