gestaltv7 compability for NUI 2.0 by DarkWeird · Pull Request #27 · MovingBlocks/TeraNUI

DarkWeird · 2020-09-07T20:27:47Z

Contains

some changes cherry picked from v1.0.0 ( Colorc, RectUtitlity#map)
For Terasology engine compability
moving package from org.terasology.input to org,terasology.nui.input
Cleaning org.terasology package
Compability for gestaltv7's package module
moving package from org.terasology.reflection to org.terasology.nui.reflection
Cleaning org.terasology package
Compability for gestaltv7's package module

* 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.

…int then, byte now) Left int version in place but deprecated to signal a need to still adjust callers

…ology.nui.input. Replace `MouseDevice#getMousePosition` with `MouseDevice#getPosition` (return)

keturn · 2021-03-06T19:14:17Z

This is from September's gestalt-v7 proposal. I expect it's still relevant, is it still mostly up-to-date?

jdrueckert · 2021-03-13T17:47:19Z

This is from September's gestalt-v7 proposal. I expect it's still relevant, is it still mostly up-to-date?

I'd hope @DarkWeird can answer that?

DarkWeird · 2021-03-13T18:14:43Z

This is from September's gestalt-v7 proposal. I expect it's still relevant, is it still mostly up-to-date?

I'd hope @DarkWeird can answer that?

@keturn
Yeah. It is up to date.

Needs another engine's pr for update imports.
(Together with gestaltv7 pr)

skaldarnar · 2021-03-13T20:44:52Z

Is this porting over everything that is needed, or only some partial list?

For reference, this is how the two branches are diverging...

* 6a27464 feat(flexibleconfig): UI for editing arbitrary types and AutoConfigs (#36)
* 4488cf0 chore: prepare snapshot builds for 1.5.0
* 25ba115 (tag: v1.4.0) release: version 1.4.0
* bac6a5a chore: use newly released joml-ext v0.1.0 (#40)
* 0b65cf1 chore: trigger build with new joml-ext SNAPSHOT
* 5429dad feat(JOML): migrate joml to 1.10.0 and 1.0.0-SNAPSHOT for geometry (#39)
* 5762bbd chore: prepare next snapshot for 1.4.0
* 4b9733d (tag: v1.3.1) release: version 1.3.1
* ee8af75 fix: moving while typing in console or chat (TS) (#35)
* 8fa207a chore: prepare next snapshot for 1.4.0
* 55f074e (tag: v1.3.0) release: version 1.3.0
*   7f66723 Merge pull request #24 from MovingBlocks/topic/lwjgl3
|\  
| *   356aae2 Merge pull request #32 from MovingBlocks/topic/lwjgl3-compile-errors
| |\  
| | * a1034de correct compile errors for LibGDXKeyboard
| |/  
| *   21a2d82 Merge branch 'release/v1.x' into topic/lwjgl3
| |\  
| |/  
|/|   
* | 82556b6 feat: add new prop "overrideChildEnabledProp" to AbstractWidget (#29)
* | 8bfd1db fiy(miglayout): `setRowConstraints` uses col constraints (#25)
| * 22e7b69 chore(lwjgl3): Fix nui versioning.
| * ab32b35 Bump up version
| * e410156 feat(lwjgl3): split keyboard input to raw input and text input. Returns MouseDevice#getPosition
|/  
* 0642317 chore: version bump
* 41b80fe release: version 1.2.0
* be9da9d fix: restore type parity from when NUI was in the Terasology engine (int then, byte now)
* 86aa22f fix Color(float,float,float,float) (#21)
* c797577 chore: bump next version scope to minor, tiny Gradle cleanup
* 03abcde tweaked canvas render
* 0b33510 remove new Color for operations
* 81c157a update imports
* 250a0e3 add rectangle test
* 596f6ad feature add map to RectUtility and readonly color
* 5eabc56 chore: prepare next snapshot for 1.1.1
* 4c9ea44 release: version 1.1.0
* 2445166 add missing clamp to Color#set*
* 85128bb test: test both set and alter methods for Color
* 2e6026a test: Add FontColorTest (from MovingBlocks/Terasology)
* 7be7f4c test: Add more ColorTests (from MovingBlocks/Terasology)
* 27fce2d test: Add LineTest (from MovingBlocks/Terasology)
* 58f4f67 fix: Explicitly compute rect from min and size in Line
* 47a3874 test: Add BorderTest; remove JOML conversions, fix assertions
* 77fc889 docs: Add JavaDoc for `createFromMinAndMax`
* 35b38ab fix: `createFromMinAndSize` clamps and validates result
* 9c88213 chore: Add math utility `addClampAtMax` for float
* 6abc996 feat: deep copy of EntityRef.copy (MovingBlocks/Terasology#4099)
* 24902bc chore: add info how to get TeraNUI for local testting
* 179c810 chore: prepare next snapshot for 1.1.0-SNAPSHOT
* b4c243a (tag: v1.0.0) release: version 1.0.0
| * 7e9c5d5 (origin/master, master) fiy(miglayout): `setRowConstraints` uses col constraints (#26)
| * e1f7918 docs: Add JavaDoc for `createFromMinAndMax`
| * a4a74e3 fix: `createFromMinAndSize` clamps and validates result
| * b228db2 chore: Add math utility `addClampAtMax` for float
| * 40b4a18 chore: add info how to get TeraNUI for local testting
| * 456edae chore: prepare next snapshot for 2.1.0-SNAPSHOT
| * 4f78131 (tag: v2.0.0) release: version 2.0.0
| * 926d327 Updated NUI to use gestalt 7 (#4)
|/  
* 2af3a7d chore: prepare multi releases (#11)

keturn · 2021-03-13T23:39:11Z

which two branches diverged? this PR vs the v2.0 branch, or the https://github.com/MovingBlocks/TeraNUI/commits/release/v1.x branch?

keturn · 2021-03-24T00:52:39Z

Now that #47 is merged as v3, where does that leave this?

Here you said:

I think use BSA's PR firsts, then provide support in nui-gestaltv7 module is better then synthetic module

DarkWeird · 2021-03-24T09:24:48Z

Now that #47 is merged as v3, where does that leave this?

Here you said:

I think use BSA's PR firsts, then provide support in nui-gestaltv7 module is better then synthetic module

Next steps:

Close no related PR at TeraNUI(bug fixes from v1 to v2)
Rebase related prs.
Integrate nui v3 to terasology (develop)
Switch nui-gestalt at gestaltv7 pr.

(Or skip 3)

Profits:

No repeating bugfixes
Switch should be easier
NuiV3 not syntetic module at TS and DestSol
Future profit for gestalt-di
We can implement nui-editor-kind app(or use nui at launcher)

DarkWeird · 2021-03-27T18:13:27Z

Obsolete after #47

BenjaminAmos and others added 10 commits August 9, 2020 23:32

Updated NUI to use gestalt 7 (#4)

926d327

* 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.

release: version 2.0.0

4f78131

chore: prepare next snapshot for 2.1.0-SNAPSHOT

456edae

chore: add info how to get TeraNUI for local testting

40b4a18

chore: Add math utility addClampAtMax for float

b228db2

This is required to ensure that RectUtility for Rectanglef works the same way as for Rectanglei.

docs: Add JavaDoc for createFromMinAndMax

e1f7918

Adds JavaDoc to explain what the methods are doing and to state contracts and guarantees.

feature add map to RectUtility and readonly color

52abbe9

remove new Color for operations

cba4aa7

fix: restore type parity from when NUI was in the Terasology engine (…

d419d01

…int then, byte now) Left int version in place but deprecated to signal a need to still adjust callers

DarkWeird mentioned this pull request Sep 7, 2020

[Breaking all] Gestalt v7 re-integration.... MovingBlocks/Terasology#4144

Closed

7 tasks

DarkWeird added 2 commits September 9, 2020 17:10

feature(reintegrate-gestaltv7): move nui's input to package org.teras…

eb7026e

…ology.nui.input. Replace `MouseDevice#getMousePosition` with `MouseDevice#getPosition` (return)

feature(reintegrate-gestaltv7): move reflection package to nui package.

1d9ec84

keturn mentioned this pull request Mar 7, 2021

refactor! move engine code in to org.terasology.engine package MovingBlocks/Terasology#4560

Merged

This was referenced Mar 21, 2021

Separated gestalt from NUI core code #47

Merged

feature: migrate to gestaltv7 MovingBlocks/Terasology#4593

Closed

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

DarkWeird closed this Mar 27, 2021

keturn mentioned this pull request Apr 28, 2021

chore: migrate to gestalt v7—fork 🅰, keep subsystems separate MovingBlocks/Terasology#4622

Merged

5 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

gestaltv7 compability for NUI 2.0#27

gestaltv7 compability for NUI 2.0#27
DarkWeird wants to merge 12 commits into
masterfrom
feature/gestaltv7-compability

DarkWeird commented Sep 7, 2020 •

edited

Loading

Uh oh!

keturn commented Mar 6, 2021

Uh oh!

jdrueckert commented Mar 13, 2021

Uh oh!

DarkWeird commented Mar 13, 2021

Uh oh!

skaldarnar commented Mar 13, 2021

Uh oh!

keturn commented Mar 13, 2021 •

edited

Loading

Uh oh!

keturn commented Mar 24, 2021

Uh oh!

DarkWeird commented Mar 24, 2021 •

edited

Loading

Uh oh!

DarkWeird commented Mar 27, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

Conversation

DarkWeird commented Sep 7, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Contains

Uh oh!

keturn commented Mar 6, 2021

Uh oh!

jdrueckert commented Mar 13, 2021

Uh oh!

DarkWeird commented Mar 13, 2021

Uh oh!

skaldarnar commented Mar 13, 2021

Uh oh!

keturn commented Mar 13, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

keturn commented Mar 24, 2021

Uh oh!

DarkWeird commented Mar 24, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

DarkWeird commented Mar 27, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

7 participants

DarkWeird commented Sep 7, 2020 •

edited

Loading

keturn commented Mar 13, 2021 •

edited

Loading

DarkWeird commented Mar 24, 2021 •

edited

Loading