menu fix, new voxel type + textures

assets/Data/voxelTypes.json

@@ -7,7 +7,7 @@
         {
             "id" : 1,
             "name" : "dirt",
-            "texture" : "/Textures/Ground/Dirt1_256.png"
+            "texture" : "/Textures/Ground/Dirt2_256.png"
         },
         {
             "id" : 2,
@@ -16,6 +16,11 @@
                 "Green Grass"
             ],
             "texture" : "/Textures/Ground/GrassTileable256.png"
+        },
+        {
+            "id" : 3,
+            "name" : "leaves",
+            "texture" : "/Textures/Ground/Leaves1_256.png"
         }
     ]
 }

docs/src/progress/currenttarget.md

@@ -17,5 +17,6 @@
 
 + bug fixes
   Fix grass rendering distance
+  Fix return to title menu synchronization bug
 
 + unreproducible bugs

docs/src/progress/renderertodo.md

@@ -719,6 +719,10 @@ Remove extraneous println's
 Fix empty item slot not showing underneath dragged item
 Fix voxel selection popout rendering, nav logic
 
+(09/11/2024)
+Voxel updates
+Fix return-to-title button from ingame main menu
+Fix F2 controls bug with title menu
 
 # TODO
 

src/main/java/electrosphere/controls/ControlHandler.java

@@ -261,6 +261,7 @@ public class ControlHandler {
         WindowStrings.WINDOW_DEBUG,
         WindowStrings.WINDOW_MENU_INGAME_MAIN,
         WindowStrings.WINDOW_MENU_INVENTORY,
+        WindowStrings.WINDOW_MENU_MAIN,
     };
 
 

src/main/java/electrosphere/engine/loadingthreads/MainMenuLoading.java

@@ -24,7 +24,7 @@ public class MainMenuLoading {
         //stop rendering game
         Globals.RENDER_FLAG_RENDER_SHADOW_MAP = false;
         Globals.RENDER_FLAG_RENDER_SCREEN_FRAMEBUFFER_CONTENT = false;
-        Globals.RENDER_FLAG_RENDER_SCREEN_FRAMEBUFFER = false;
+        Globals.RENDER_FLAG_RENDER_SCREEN_FRAMEBUFFER = true;
         Globals.RENDER_FLAG_RENDER_UI = true;
         Globals.RENDER_FLAG_RENDER_BLACK_BACKGROUND = true;
 
@@ -75,6 +75,10 @@ public class MainMenuLoading {
             }
             WindowUtils.focusWindow(WindowStrings.WINDOW_MENU_MAIN);
             Window mainMenuWindow = (Window)Globals.elementService.getWindow(WindowStrings.WINDOW_MENU_MAIN);
+            if(mainMenuWindow == null){
+                WindowUtils.initMainMenuWindow();
+            }
+            mainMenuWindow = (Window)Globals.elementService.getWindow(WindowStrings.WINDOW_MENU_MAIN);
             WindowUtils.replaceMainMenuContents(MenuGeneratorsTitleMenu.createTitleMenu());
             if(mainMenuWindow != null){
                 WindowUtils.recursiveSetVisible(mainMenuWindow, true);

src/main/java/electrosphere/menu/WindowUtils.java

@@ -203,7 +203,7 @@ public class WindowUtils {
         WindowUtils.recursiveSetVisible(loadingWindow, true);
     }
 
-    static void initMainMenuWindow(){
+    public static void initMainMenuWindow(){
         Window mainMenuWindow = new Window(Globals.renderingEngine.getOpenGLState(), 0, 0, Globals.WINDOW_WIDTH, Globals.WINDOW_HEIGHT,false);
         Globals.elementService.registerWindow(WindowStrings.WINDOW_MENU_MAIN, mainMenuWindow);
         WindowUtils.replaceMainMenuContents(MenuGeneratorsTitleMenu.createTitleMenu());