Skip to content

feat: migrate in change from v1 to master#46

Closed
pollend wants to merge 9 commits into
masterfrom
feature/master-update-from-v1
Closed

feat: migrate in change from v1 to master#46
pollend wants to merge 9 commits into
masterfrom
feature/master-update-from-v1

Conversation

@pollend
Copy link
Copy Markdown
Member

@pollend pollend commented Mar 21, 2021

Another attempt to bring all the v1 fixes to the v2 main line.

Contributes to #43

BenjaminAmos and others added 9 commits August 9, 2020 23:32
* Converted NUI to use gestalt 7.0.3
* Updated library version to 2.0.0 due to gestalt upgrade (now using gestalt 7)
* Fixed compiler errors due to changed gestalt namespace
* Added google maven repository.
This is required to ensure that RectUtility for Rectanglef works the
same way as for Rectanglei.
On TeraMath classes `Rect2i` and `Rect2f` had the semantics that
creating them from min and size would validate that the size is positive
along both axis.
The JOML utility class was missing this feature.

This also adds overflow prevention.
Adds JavaDoc to explain what the methods are doing and to state
contracts and guarantees.
Copy link
Copy Markdown
Member

@skaldarnar skaldarnar left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The following commits were already cherry-picked to the v2 main line:

  • 24902bc chore: add info how to get TeraNUI for local testting (as 40b4a18)
  • 9c88213 chore: Add math utility addClampAtMax for float (as b228db2)
  • 35b38ab fix: createFromMinAndSize clamps and validates result (as a4a74e3)
  • 77fc889 docs: Add JavaDoc for createFromMinAndMax (as e1f7918)

8bfd1db fiy(miglayout): setRowConstraints uses col constraints (#25) was submitted as separate PR agains v2 main line branch as 7e9c5d5 fiy(miglayout): setRowConstraints uses col constraints (#26).

  • at the time we merged 6abc996 from PR #12 I wasn't sure whether it is fully compatible the way it is with gestalt v7. I still don't know, so I hope you (@pollend, @DarkWeird) can judge that better
  • PR #24 feat(lwjgl3): split keyboard input to raw input and text input. Returns MouseDevice#getPosition was merged in 7f66723 and does quite a few things on the LWJGL3 front
    @DarkWeird can you confirm this is also safe for gestalt v7?
  • PR #36 feat(flexibleconfig): UI for editing arbitrary types and AutoConfigs was merged in
    6a27464 adding the auto config bits. This uses reflection.
    @pollend, @DarkWeird Does this interfere with gestalt v7 in any way?

@pollend
Copy link
Copy Markdown
Member Author

pollend commented Mar 21, 2021

If they were cherry picked then those commits have separate ids so they would essentially appear twice in the history. This is just a direct merge from v1 to master.

@keturn keturn force-pushed the master branch 2 times, most recently from 989bc52 to f6e444f Compare March 23, 2021 22:09
@jdrueckert
Copy link
Copy Markdown
Member

With #47 merged, this can be closed.

@jdrueckert jdrueckert closed this Mar 25, 2021
@pollend pollend deleted the feature/master-update-from-v1 branch March 26, 2021 02:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants