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

Upgrading LWJGL to version 3 #3969

Merged
merged 51 commits into from
Oct 24, 2020
Merged

Upgrading LWJGL to version 3 #3969

merged 51 commits into from
Oct 24, 2020

Conversation

DarkWeird
Copy link
Contributor

@DarkWeird DarkWeird commented May 19, 2020 •
edited by Cervator
Loading

Contains

LWJGL change:

  • Windowing system - GLFW
  • Input system - GLFW
  • GL methods, which use buffers (+suffix)
  • Some GL Extensions moved

We can replace jinput library to GLFW for joystics(controllers) after merge.

Related PRs

MovingBlocks/TeraNUI#24 - after extraction NUI
MovingBlocks/SplashScreen#4 - GLFW splash screen's classes. (Old Swing screen crashes LWJGL3's OpenGL initialization - deep side effect)
Terasology/CoreRendering#15 - Update CoreRendering for lwjgl3

How to test

Checkout Terasology/CoreRendering#15.
Run and play as usual, check :)

Platforms:

  • - MacOs
  • - Windows
  • - Linux(X)
  • - Linux(Wayland) - non goal, GLFW provides support for Wayland LWJGL3 haven't proper code. possibly in next release

Checklist:

  • Input system:
    • Keyboard:
      • keys working, keybindings working
      • chat and console receive chars as usual - your language work, special symbols work, uppercase correct
    • Mouse:
      • position in NUI work correctly
      • scroll works
      • mouse acceleration works correctly
  • Windowing system:
    • Windows resizing works
    • Fullscreen works
    • Pseudo fullscreen works
  • Rendering works, not glitches
  • OpenVR works (I hope)
  • Natives publishes in distribution
  • Check switchable graphics on MacOS

[bonus] measure performance on discrete graphics

Outstanding before merging

  • Return SkySphere, LWJGL 3 lost glu packages
  • Merge GLFW's char and key callbacks products... or separate NUIs key events
    Its works separatelly now. Generates two independent KeyboardEvent streams.
    [!] You are moving when type in chat or console in-game!
  • Repair type adapter for configuration (Resolution not saves)
  • Repair LwjglPortlet (for TeraEd, or use another way)
  • Repair framelimit
  • Fix Resolution in settings gui (used Object's toString)
  • Expose LWJGL 3 to modules
  • Saving window position
  • Refactor Debug/Error outputs for LWJGL 3
  • Overall refactoring
  • Replace SwingSplashScreen with LWJGL 3 solution (GLFW+ LWJGL's opengl).
  • Merge Add classes for implement GLFW splash screen. SplashScreen#4

@DarkWeird DarkWeird marked this pull request as draft May 19, 2020 06:12
@DarkWeird DarkWeird marked this pull request as ready for review May 19, 2020 06:38
@skaldarnar
Copy link
Member

Wow, thanks for putting all the effort into this @DarkWeird 👍 highly appreciated, I hope we can pull this change off 💪

@lgtm-com
Copy link

lgtm-com bot commented May 25, 2020

This pull request introduces 1 alert when merging 9da53be into 1367fa1 - view on LGTM.com

new alerts:

  • 1 for Implicit narrowing conversion in compound assignment

@lgtm-com
Copy link

lgtm-com bot commented May 25, 2020

This pull request introduces 1 alert when merging f8e6fcf into 1367fa1 - view on LGTM.com

new alerts:

  • 1 for Implicit narrowing conversion in compound assignment

DarkWeird added 22 commits June 8, 2020 20:52
@DarkWeird
feat(LWJGL3): initial migrate
7da81a4
@DarkWeird
fix: keyboard binding id from lwjgl's to tera's
7d5d908
@DarkWeird
fix: save window position and window size on exit
c6c7a98
@DarkWeird
chore: refactor GL and GLFW debug/error callbacks
22950e9
@DarkWeird
Fix: WindowResizeCallback creates only 1 time on window creation
d15eeec
@DarkWeird
Fix: Return SkySphere! and glu's Sphere related things
9c7cb57
@DarkWeird
Fix: Settings Resolution restored now!
feaa3a1
@DarkWeird
chore(LWJGL3): expose lwjgl3 libs to modules
3689c8d
@DarkWeird
fix(LWJGL3): fix disable vSync
b615a28
@DarkWeird
fix(LWJGL3): fixed mouse scroll. before was delta=0
4cde3a8
@DarkWeird
fix(Lwjgl3): reordered lwjgl3 natives init and direct implement os de…
47b2ec1 
…tect. otherwise System.setProperty haven't any effect on Lwjgl Configuration.
@DarkWeird
fix(Lwjgl3): fixed Resolution, switching DesplayModes
cdd6282
@DarkWeird
chore(LWJGL3): Remove static getter for window/display size
1d44358
@DarkWeird
fix(LWJGL3): Fix FrameLimit
1e0a822
@DarkWeird
fix(LWJGL3): Merge keys and chars from callbacks together.
760f8c4
@DarkWeird
chore(LWJGL3): refactor Sync(framelimiter) names.
35af4a3
@DarkWeird
fix(LWJGL3): fix OpenGL's messages
ec23566
@DarkWeird
chore(LWJGL3): cleanup commented code/todos. PixelFormat(depth bits) …
f9d94a3 
…returned
@DarkWeird
fix(LWJGL3): revert .idea configs
8c1499c
@DarkWeird
fix(LWJGL3): make OS detection for determinate platform path - lwjgl-…
3d78b7a 
…independ (it can break writing lwjgl's path natives)
@DarkWeird
chore(lwjgl3): update LWJGL3 for DAG
10f639b
@DarkWeird
Merge remote-tracking branch 'tera/develop' into lwjgl3
b377ec1 
# Conflicts:
#	engine/src/main/java/org/terasology/engine/subsystem/lwjgl/LwjglGraphics.java
#	engine/src/main/java/org/terasology/rendering/ShaderManagerLwjgl.java
@DarkWeird DarkWeird added the Api label Oct 13, 2020
@pollend
Copy link
Member

pollend commented Oct 18, 2020

I made some tweaks to mouse to correct for some stuttering issues I've been having:

DarkWeird#1

@jdrueckert
Copy link
Member

LWJGL3

@DarkWeird DarkWeird mentioned this pull request Oct 19, 2020
Open
6 tasks
@lgtm-com
Copy link

lgtm-com bot commented Oct 23, 2020

This pull request introduces 2 alerts when merging 02736ba into 4d73f9d - view on LGTM.com

new alerts:

  • 1 for Spurious Javadoc @param tags
  • 1 for Implicit narrowing conversion in compound assignment

@DarkWeird
fix(build): added "java-platform" gradle plagin for "platform"/BOM de…
adb8075 
…pendencies. Seems, broken after upgrading gradle to version 6.7
@lgtm-com
Copy link

lgtm-com bot commented Oct 23, 2020

This pull request introduces 2 alerts when merging adb8075 into 4d73f9d - view on LGTM.com

new alerts:

  • 1 for Spurious Javadoc @param tags
  • 1 for Implicit narrowing conversion in compound assignment

Cervator added a commit to Terasology/ModularComputers that referenced this pull request Oct 24, 2020
@Cervator
fix: but not really - compiles but needs an actual fix to go with Mov…
24dfab1 
…ingBlocks/Terasology#3969
@Cervator Cervator mentioned this pull request Oct 24, 2020
Merged
@Cervator Cervator merged commit c83655f into MovingBlocks:develop Oct 24, 2020
@Cervator Cervator added this to the v4.1.0 milestone Oct 24, 2020
@Cervator Cervator added the Topic: Architecture Requests, Issues and Changes related to software architecture, programming patterns, etc. label Oct 24, 2020
@Cervator
Copy link
Member

Did final testing on both Mac + Windows, made a few tweaks via #4216, and merged this. Thanks for both the momentous work and the patience in keeping it up to date and continuously improving it @DarkWeird :-)

Cervator added a commit to Terasology/WorkstationCrafting that referenced this pull request Oct 24, 2020
@Cervator
fix: adjustments needed for MovingBlocks/Terasology#3969
2a5e1c0
Cervator added a commit to Terasology/BasicCrafting that referenced this pull request Oct 24, 2020
@Cervator
fix: adjustments needed for MovingBlocks/Terasology#3969
0967ce4
Cervator added a commit to Terasology-Archived/WoodAndStone that referenced this pull request Oct 24, 2020
@Cervator
fix: adjustments needed for MovingBlocks/Terasology#3969
0268bf7
Cervator added a commit to Terasology/Equipment that referenced this pull request Oct 24, 2020
@Cervator
fix: adjustments needed for MovingBlocks/Terasology#3969
54339e8
Cervator added a commit to Terasology-Archived/GooKeeper that referenced this pull request Oct 24, 2020
@Cervator
fix: adjustments needed for MovingBlocks/Terasology#3969
aa21b36
Cervator added a commit to Terasology/Anatomy that referenced this pull request Oct 24, 2020
@Cervator
fix: adjustments needed for MovingBlocks/Terasology#3969
b18d48c
@skaldarnar skaldarnar mentioned this pull request Nov 6, 2020
Open
@skaldarnar skaldarnar removed the Api label May 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@pollend pollend pollend left review comments

@keturn keturn Awaiting requested review from keturn

@Cervator Cervator Awaiting requested review from Cervator

Assignees
No one assigned
Labels
Category: Performance Requests, Issues and Changes targeting performance Topic: Architecture Requests, Issues and Changes related to software architecture, programming patterns, etc. Topic: Rendering Requests, Issues and Changes related to lighting, meshes, camera, etc. Topic: UI/UX Requests, Issues and Changes related to screens, artwork, sound and overall user experience
Projects
None yet
Milestone
v4.1.0
Development

Successfully merging this pull request may close these issues.

Upgrade to LWJGL 3 (or LibGDX)
6 participants
@DarkWeird @skaldarnar @pollend @kaen @Cervator @jdrueckert