Improve Main Menu options and fix misc bugs #166

clayjohn · 2023-03-01T19:11:47Z

Depends on #163
Fixes most issues in #162
Fixes: #164

Turns on looping for the flying forklift animation
Fixes scaling of the crosshair
Switches to using physical keyboard layouts
Replaces resolution settings with 3D_scaling
Fixes settings menu (same as [4.0] Fix the settings menu #165)
Updates settings menu settings to work with
Replaces "Root" of .import files with "Node3D" instead of "Spatial"
Uses buttons throughout the main menu so the buttons appear consistent
Add GI Type menu options (SDFGI, VoxelGI, or LightmapGI + Reflection Probes)
Removes the refraction setting from glass tiles (scale was 0 anyway so it wasn't actually doing anything) This dramatically improves performance on low-end devices
Fixes robot aim

This PR gets the demo much closer to the functionality we want for 4.0.

Calinou · 2023-03-02T21:54:31Z

main/main.gd

+	if DisplayServer.get_name() == "headless":
+		Engine.max_fps = 60


Not related to this PR, but this trick should probably be documented in the High-level multiplayer documentation. (In general, we need better documentation on controlling tickrate, choosing a tickrate, etc.)

project.godot

level/level.gd

Calinou · 2023-03-02T23:03:21Z

level/level.gd

+	# LightmapGI nodes override SDFGI (even when hidden)
+	# so we need to free the LightmapGI node if it exists


This sounds like an engine bug (same for VoxelGI-LightmapGI interaction). I'd expect hiding the LightmapGI node to have the other GI technique take over automatically, so that providing a fallback is easier.

I can create an issue with a MRP if you want.

Yes, this is an engine bug (or that the very least a poor interaction that should be improved)

Calinou

Tested locally, it works.

There's a change that could be made to the SDFGI high quality setting before merging though (see my review comment).

LightmapGI seems very dark in the outside area, but I'm not sure how to fix this since there's no longer an energy multiplier available (unlike BakedLightmap in 3.x).

clayjohn · 2023-03-03T02:38:54Z

LightmapGI seems very dark in the outside area, but I'm not sure how to fix this since there's no longer an energy multiplier available (unlike BakedLightmap in 3.x).

Heh, I noticed the same thing. With SDFGI and with VoxelGI we boost the energy by 2.2 times to account for how dark the scene is. Its definitely something to keep in mind as we revisit and improve LightmapGI

Calinou · 2023-03-06T17:33:51Z

I've merged #163. This PR needs a rebase before this can be merged.

Re-import GLBs with UV2s enabled for lightmaps Fix misc bugs

clayjohn · 2023-03-09T23:22:05Z

@Calinou Rebased and fixed a couple more bugs. This should be good to merge!

The only thing of concern is that the size of the lightmap file is 68 mb which is larger than Github recommends. On pushing the branch I got a warning that 50mb is the maximum recommended file size.

Calinou · 2023-03-11T19:04:25Z

The only thing of concern is that the size of the lightmap file is 68 mb which is larger than Github recommends. On pushing the branch I got a warning that 50mb is the maximum recommended file size.

I've baked high-quality lightmaps (Ultra quality, 16 bounces) which are only 20 MB in size, presumably as they're less noisy and compress better: level_lightmaps.zip

However, two floor structures in the inner room use a fully cyan color with this lightmap for some reason.

PS: Did you have Directional enabled when baking lightmaps? I had it disabled when baking here. We should write out the instructions for rebaking lightmaps somewhere, as this may be needed at some point in the future.

clayjohn · 2023-03-11T21:03:48Z

The only thing of concern is that the size of the lightmap file is 68 mb which is larger than Github recommends. On pushing the branch I got a warning that 50mb is the maximum recommended file size.

I've baked high-quality lightmaps (Ultra quality, 16 bounces) which are only 20 MB in size, presumably as they're less noisy and compress better: level_lightmaps.zip

However, two floor structures in the inner room use a fully cyan color with this lightmap for some reason.

PS: Did you have Directional enabled when baking lightmaps? I had it disabled when baking here. We should write out the instructions for rebaking lightmaps somewhere, as this may be needed at some point in the future.

I didn't enable Directional as I found the added size wasn't worth it.

It looks like your bake didn't include many assets. Here is what I get when I use it.

And here is how it looks without any GI

It looks like the pillars don't have lightmaps at all. And the things that do have lightmaps have turned completely black.
When I captured lightmaps originally I had a similar issue and I had to reimport all the assets with static GI + lightmaps enabled so they had UV2s.

Calinou · 2023-03-13T17:12:04Z

When I captured lightmaps originally I had a similar issue and I had to reimport all the assets with static GI + lightmaps enabled so they had UV2s.

I've tried reimporting all assets¹ this way to no avail. It seems the objects that get included every bake are picked almost randomly, so I think we should just merge this until we can figure out how to bake high-quality lightmaps properly.

I kept the existing bake modes, since the light shafts/particle/player models shouldn't be included in the bake. ↩

clayjohn added bug enhancement labels Mar 1, 2023

clayjohn added this to the 4.0 milestone Mar 1, 2023

clayjohn changed the title ~~Menu~~ Improve Main Menu options and fix misc bugs Mar 2, 2023

clayjohn force-pushed the menu branch from f108087 to 8f16163 Compare March 2, 2023 20:13

Calinou reviewed Mar 2, 2023

View reviewed changes

project.godot Show resolved Hide resolved

Calinou reviewed Mar 2, 2023

View reviewed changes

level/level.gd Outdated Show resolved Hide resolved

Calinou reviewed Mar 2, 2023

View reviewed changes

Calinou approved these changes Mar 2, 2023

View reviewed changes

clayjohn added 4 commits March 9, 2023 14:45

Update main menu with 3D scaling options and fix various bugs

f34e245

Re-import GLBs with UV2s enabled for lightmaps Fix misc bugs

Add SDFGI and LightmapGI

e7e27db

Reduce SDFGI probe count and remove refraction

6bb9eb7

Fix a bug with the robot's aim and with the GI setting

76893ee

clayjohn force-pushed the menu branch from 34097b6 to 76893ee Compare March 9, 2023 23:20

Calinou merged commit bd457e3 into godotengine:4.0-dev Mar 26, 2023

This was referenced Mar 26, 2023

Recommendation to run the project converter #164

Closed

[4.0] Fix the settings menu #165

Closed

clayjohn deleted the menu branch April 3, 2023 17:31

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Improve Main Menu options and fix misc bugs #166

Improve Main Menu options and fix misc bugs #166

clayjohn commented Mar 1, 2023 •

edited

Loading

Calinou Mar 2, 2023 •

edited

Loading

Calinou Mar 2, 2023 •

edited

Loading

clayjohn Mar 3, 2023

Calinou left a comment •

edited

Loading

clayjohn commented Mar 3, 2023 •

edited

Loading

Calinou commented Mar 6, 2023 •

edited

Loading

clayjohn commented Mar 9, 2023 •

edited

Loading

Calinou commented Mar 11, 2023 •

edited

Loading

clayjohn commented Mar 11, 2023

Calinou commented Mar 13, 2023 •

edited

Loading

		if DisplayServer.get_name() == "headless":
		Engine.max_fps = 60

		# LightmapGI nodes override SDFGI (even when hidden)
		# so we need to free the LightmapGI node if it exists

Improve Main Menu options and fix misc bugs #166

Improve Main Menu options and fix misc bugs #166

Conversation

clayjohn commented Mar 1, 2023 • edited Loading

Calinou Mar 2, 2023 • edited Loading

Choose a reason for hiding this comment

Calinou Mar 2, 2023 • edited Loading

Choose a reason for hiding this comment

clayjohn Mar 3, 2023

Choose a reason for hiding this comment

Calinou left a comment • edited Loading

Choose a reason for hiding this comment

clayjohn commented Mar 3, 2023 • edited Loading

Calinou commented Mar 6, 2023 • edited Loading

clayjohn commented Mar 9, 2023 • edited Loading

Calinou commented Mar 11, 2023 • edited Loading

clayjohn commented Mar 11, 2023

Calinou commented Mar 13, 2023 • edited Loading

Footnotes

clayjohn commented Mar 1, 2023 •

edited

Loading

Calinou Mar 2, 2023 •

edited

Loading

Calinou Mar 2, 2023 •

edited

Loading

Calinou left a comment •

edited

Loading

clayjohn commented Mar 3, 2023 •

edited

Loading

Calinou commented Mar 6, 2023 •

edited

Loading

clayjohn commented Mar 9, 2023 •

edited

Loading

Calinou commented Mar 11, 2023 •

edited

Loading

Calinou commented Mar 13, 2023 •

edited

Loading