feat: implement automated CS2 cubemap generation tool with multi-exposure support and image stitching

Author: dertwist

makefile.py

@@ -230,6 +230,7 @@ def build_app_pyinstaller(fast=False, channel='stable') -> None:
 
         '--hidden-import=vpk',
         '--collect-all=velopack',
+        '--collect-all=imageio',
 
         '--noconfirm',
 

src/app_core.py

@@ -430,6 +430,7 @@ def setup_buttons(self):
         self.ui.documentation_button.clicked.connect(self.open_about)
         self.ui.mapbuilder.clicked.connect(self.open_mapbuilder_dialog)
         self.ui.open_dialog_button.clicked.connect(self.open_selected_dialog)
+        self.ui.dialog_selection_combobox.currentTextChanged.connect(self.save_last_tool)
         self.updateLaunchAddonButton()
 
     def updateLaunchAddonButton(self):
@@ -531,7 +532,12 @@ def open_export_and_import_addon(self):
 
     def open_my_twitter(self): webbrowser.open("https://twitter.com/dertwist")
     def open_discord(self): webbrowser.open("https://discord.gg/6X88yX8Y")
-    def _restore_user_prefs(self): pass
+    def save_last_tool(self, text):
+        set_settings_value('APP', 'last_tool', text)
+    def _restore_user_prefs(self):
+        last_tool = get_settings_value('APP', 'last_tool')
+        if last_tool:
+            self.ui.dialog_selection_combobox.setCurrentText(last_tool)
     def show_minimize_message_once(self): pass
 
 def handle_new_connection(server, widget):

src/forms/cubemap_maker/main.py

@@ -47,7 +47,7 @@ def init_ui(self):
         # Mode
         config_layout.addWidget(QLabel("Layout Mode:"))
         self.mode_combo = QComboBox()
-        self.mode_combo.addItems(["CrossHLayout", "Equirectangular"])
+        self.mode_combo.addItems(["CrossHLayout", "Equirectangular", "Individual Faces"])
         config_layout.addWidget(self.mode_combo)
 
         # Game Resolution
@@ -69,6 +69,12 @@ def init_ui(self):
         self.pos_x = QDoubleSpinBox(); self.pos_x.setRange(-1e6, 1e6); self.pos_x.setDecimals(2); self.pos_x.setButtonSymbols(QSpinBox.NoButtons)
         self.pos_y = QDoubleSpinBox(); self.pos_y.setRange(-1e6, 1e6); self.pos_y.setDecimals(2); self.pos_y.setButtonSymbols(QSpinBox.NoButtons)
         self.pos_z = QDoubleSpinBox(); self.pos_z.setRange(-1e6, 1e6); self.pos_z.setDecimals(2); self.pos_z.setButtonSymbols(QSpinBox.NoButtons)
+        
+        # Load last position
+        self.pos_x.setValue(float(get_settings_value('CUBEMAP', 'last_pos_x', "0")))
+        self.pos_y.setValue(float(get_settings_value('CUBEMAP', 'last_pos_y', "0")))
+        self.pos_z.setValue(float(get_settings_value('CUBEMAP', 'last_pos_z', "0")))
+        
         pos_h.addWidget(self.pos_x); pos_h.addWidget(self.pos_y); pos_h.addWidget(self.pos_z)
 
         paste_btn = QPushButton("Paste")
@@ -175,6 +181,10 @@ def start_capture(self):
             if addon_dir:
                 out_path = os.path.join(addon_dir, out_path)
 
+        set_settings_value('CUBEMAP', 'last_pos_x', str(self.pos_x.value()))
+        set_settings_value('CUBEMAP', 'last_pos_y', str(self.pos_y.value()))
+        set_settings_value('CUBEMAP', 'last_pos_z', str(self.pos_z.value()))
+        
         config = {
             'hdr': self.hdr_check.isChecked(),
             'game_res': self.game_res_edit.text(),

src/forms/cubemap_maker/stitcher.py

@@ -1,7 +1,8 @@
 import os
+os.environ["OPENCV_IO_ENABLE_OPENEXR"] = "1"
 import numpy as np
 from PIL import Image
-import imageio
+import cv2
 import pyopencl as cl
 
 class CubemapStitcher:
@@ -16,25 +17,42 @@ def __init__(self, face_size=1024):
         except:
             self.ctx = None
 
+    def _save_image(self, img_bgr, output_path):
+        """Internal helper to save images with correct type for extension."""
+        if output_path.lower().endswith('.exr'):
+            # OpenEXR requires float16 or float32, does not support uint8
+            img_float = img_bgr.astype(np.float32) / 255.0
+            cv2.imwrite(output_path, img_float)
+        else:
+            # Standard formats like .jpg, .png, .tga support uint8
+            cv2.imwrite(output_path, img_bgr)
+
     def stitch_cross(self, faces, output_path):
         """Creates a 3x4 horizontal cross layout for CS2."""
-        # Standard cross layout doesn't need flipping if captured correctly
+        # New CS2 Layout:
+        # R0: [Empty] [Up 90rot] [Empty] [Empty]
+        # R1: [Back] [Left] [Forward] [Right]
+        # R2: [Empty] [Down 90rot] [Empty] [Empty]
 
         cross_img = np.zeros((self.face_size * 3, self.face_size * 4, 3), dtype=np.uint8)
 
         # Row 0
-        cross_img[0:self.face_size, self.face_size:self.face_size*2] = faces[4] # Up
+        up_face = np.rot90(faces[4], k=1) # -90 rotate (clockwise)
+        cross_img[0:self.face_size, self.face_size:self.face_size*2] = up_face
+        
         # Row 1
-        cross_img[self.face_size:self.face_size*2, 0:self.face_size] = faces[3] # Left
-        cross_img[self.face_size:self.face_size*2, self.face_size:self.face_size*2] = faces[0] # Forward
-        cross_img[self.face_size:self.face_size*2, self.face_size*2:self.face_size*3] = faces[1] # Right
-        cross_img[self.face_size:self.face_size*2, self.face_size*3:self.face_size*4] = faces[2] # Back
+        cross_img[self.face_size:self.face_size*2, 0:self.face_size] = faces[2] # Back
+        cross_img[self.face_size:self.face_size*2, self.face_size:self.face_size*2] = faces[3] # Left
+        cross_img[self.face_size:self.face_size*2, self.face_size*2:self.face_size*3] = faces[0] # Forward
+        cross_img[self.face_size:self.face_size*2, self.face_size*3:self.face_size*4] = faces[1] # Right
+        
         # Row 2
-        cross_img[self.face_size*2:self.face_size*3, self.face_size:self.face_size*2] = faces[5] # Down
+        down_face = np.rot90(faces[5], k=-5) # 90 rotate (counter-clockwise)
+        cross_img[self.face_size*2:self.face_size*3, self.face_size:self.face_size*2] = down_face
 
-        # Save as EXR (normalized float32)
-        cross_float = cross_img.astype(np.float32) / 255.0
-        imageio.imwrite(output_path, cross_float)
+        # Convert RGB to BGR for OpenCV
+        cross_bgr = cv2.cvtColor(cross_img, cv2.COLOR_RGB2BGR)
+        self._save_image(cross_bgr, output_path) 
         return output_path
 
     def stitch_equirectangular(self, faces, output_path, out_w=4096, out_h=2048):
@@ -107,5 +125,8 @@ def stitch_equirectangular(self, faces, output_path, out_w=4096, out_h=2048):
         output = np.empty((out_h, out_w, 3), dtype=np.uint8)
         cl.enqueue_copy(self.queue, output, dest_buf)
 
-        Image.fromarray(output).save(output_path, quality=95)
+        # Convert RGB to BGR for OpenCV
+        output_bgr = cv2.cvtColor(output, cv2.COLOR_RGB2BGR)
+        self._save_image(output_bgr, output_path)
+        
         return output_path

src/forms/cubemap_maker/worker.py

@@ -132,46 +132,48 @@ def run(self):
             time.sleep(0.5)
 
             # Build command list to avoid semicolon issues in netcon
+            t = 0.1 # Tick interval
             cmds = [
                 "sv_cheats 1", "noclip 1", "r_drawviewmodel 0", "cl_drawhud 0", "r_drawpanorama 0", "cl_firstperson_legs 0",
                 "fov_cs_debug 106.260205", "ent_fire cmd kill", "ent_create point_servercommand {targetname cmd}",
                 "screenshot_subdir screenshots\\\\cubemap",
                 'ent_fire worldent addoutput "OnUser1>cmd>command>r_always_render_all_windows true>0.01>1"',
                 # Forward
-                f'ent_fire worldent addoutput "OnUser1>cmd>command>setpos_exact {x} {y} {z}>{1*0.5}>1"',
-                f'ent_fire worldent addoutput "OnUser1>cmd>command>setang 0 0 0>{1*0.5}>1"',
-                f'ent_fire worldent addoutput "OnUser1>cmd>command>screenshot_prefix {session_id}_cube_{ev_suffix}_forward>{1*0.5 + 0.1}>1"',
-                f'ent_fire worldent addoutput "OnUser1>cmd>command>png_screenshot>{1*0.5 + 0.2}>1"',
+                f'ent_fire worldent addoutput "OnUser1>cmd>command>setpos_exact {x} {y} {z}>{1*t}>1"',
+                f'ent_fire worldent addoutput "OnUser1>cmd>command>setang_exact 1 0 0>{1*t}>1"',
+                f'ent_fire worldent addoutput "OnUser1>cmd>command>screenshot_prefix {session_id}_cube_{ev_suffix}_forward>{1*t + 0.01}>1"',
+                f'ent_fire worldent addoutput "OnUser1>cmd>command>png_screenshot>{1*t + 0.02}>1"',
                 # Right
-                f'ent_fire worldent addoutput "OnUser1>cmd>command>setpos_exact {x} {y} {z}>{2*0.5}>1"',
-                f'ent_fire worldent addoutput "OnUser1>cmd>command>setang 0 270 0>{2*0.5}>1"',
-                f'ent_fire worldent addoutput "OnUser1>cmd>command>screenshot_prefix {session_id}_cube_{ev_suffix}_right>{2*0.5 + 0.1}>1"',
-                f'ent_fire worldent addoutput "OnUser1>cmd>command>png_screenshot>{2*0.5 + 0.2}>1"',
+                f'ent_fire worldent addoutput "OnUser1>cmd>command>setpos_exact {x} {y} {z}>{2*t}>1"',
+                f'ent_fire worldent addoutput "OnUser1>cmd>command>setang_exact 0 270 -1>{2*t}>1"',
+                f'ent_fire worldent addoutput "OnUser1>cmd>command>screenshot_prefix {session_id}_cube_{ev_suffix}_right>{2*t + 0.01}>1"',
+                f'ent_fire worldent addoutput "OnUser1>cmd>command>png_screenshot>{2*t + 0.02}>1"',
                 # Back
-                f'ent_fire worldent addoutput "OnUser1>cmd>command>setpos_exact {x} {y} {z}>{3*0.5}>1"',
-                f'ent_fire worldent addoutput "OnUser1>cmd>command>setang 0 180 0>{3*0.5}>1"',
-                f'ent_fire worldent addoutput "OnUser1>cmd>command>screenshot_prefix {session_id}_cube_{ev_suffix}_back>{3*0.5 + 0.1}>1"',
-                f'ent_fire worldent addoutput "OnUser1>cmd>command>png_screenshot>{3*0.5 + 0.2}>1"',
+                f'ent_fire worldent addoutput "OnUser1>cmd>command>setpos_exact {x} {y} {z}>{3*t}>1"',
+                f'ent_fire worldent addoutput "OnUser1>cmd>command>setang_exact -1 180 0>{3*t}>1"',
+                f'ent_fire worldent addoutput "OnUser1>cmd>command>screenshot_prefix {session_id}_cube_{ev_suffix}_back>{3*t + 0.01}>1"',
+                f'ent_fire worldent addoutput "OnUser1>cmd>command>png_screenshot>{3*t + 0.02}>1"',
                 # Left
-                f'ent_fire worldent addoutput "OnUser1>cmd>command>setpos_exact {x} {y} {z}>{4*0.5}>1"',
-                f'ent_fire worldent addoutput "OnUser1>cmd>command>setang 0 90 0>{4*0.5}>1"',
-                f'ent_fire worldent addoutput "OnUser1>cmd>command>screenshot_prefix {session_id}_cube_{ev_suffix}_left>{4*0.5 + 0.1}>1"',
-                f'ent_fire worldent addoutput "OnUser1>cmd>command>png_screenshot>{4*0.5 + 0.2}>1"',
+                f'ent_fire worldent addoutput "OnUser1>cmd>command>setpos_exact {x} {y} {z}>{4*t}>1"',
+                f'ent_fire worldent addoutput "OnUser1>cmd>command>setang_exact 0 90 1>{4*t}>1"',
+                f'ent_fire worldent addoutput "OnUser1>cmd>command>screenshot_prefix {session_id}_cube_{ev_suffix}_left>{4*t + 0.01}>1"',
+                f'ent_fire worldent addoutput "OnUser1>cmd>command>png_screenshot>{4*t + 0.02}>1"',
                 # Up
-                f'ent_fire worldent addoutput "OnUser1>cmd>command>setpos_exact {x} {y} {z}>{5*0.5}>1"',
-                f'ent_fire worldent addoutput "OnUser1>cmd>command>setang -90 0 0>{5*0.5}>1"',
-                f'ent_fire worldent addoutput "OnUser1>cmd>command>screenshot_prefix {session_id}_cube_{ev_suffix}_up>{5*0.5 + 0.1}>1"',
-                f'ent_fire worldent addoutput "OnUser1>cmd>command>png_screenshot>{5*0.5 + 0.2}>1"',
+                f'ent_fire worldent addoutput "OnUser1>cmd>command>fov_cs_debug 106.260205>{5*t}>1"',
+                f'ent_fire worldent addoutput "OnUser1>cmd>command>setpos_exact {x} {y} {z}>{5*t}>1"',
+                f'ent_fire worldent addoutput "OnUser1>cmd>command>setang_exact -89 0 0>{5*t}>1"',
+                f'ent_fire worldent addoutput "OnUser1>cmd>command>screenshot_prefix {session_id}_cube_{ev_suffix}_up>{5*t + 0.01}>1"',
+                f'ent_fire worldent addoutput "OnUser1>cmd>command>png_screenshot>{5*t + 0.02}>1"',
                 # Down
-                f'ent_fire worldent addoutput "OnUser1>cmd>command>setpos_exact {x} {y} {z}>{6*0.5}>1"',
-                f'ent_fire worldent addoutput "OnUser1>cmd>command>setang 90 0 0>{6*0.5}>1"',
-                f'ent_fire worldent addoutput "OnUser1>cmd>command>screenshot_prefix {session_id}_cube_{ev_suffix}_down>{6*0.5 + 0.1}>1"',
-                f'ent_fire worldent addoutput "OnUser1>cmd>command>png_screenshot>{6*0.5 + 0.2}>1"',
+                f'ent_fire worldent addoutput "OnUser1>cmd>command>setpos_exact {x} {y} {z}>{6*t}>1"',
+                f'ent_fire worldent addoutput "OnUser1>cmd>command>setang_exact 89 180 180>{6*t}>1"',
+                f'ent_fire worldent addoutput "OnUser1>cmd>command>screenshot_prefix {session_id}_cube_{ev_suffix}_down>{6*t + 0.01}>1"',
+                f'ent_fire worldent addoutput "OnUser1>cmd>command>png_screenshot>{6*t + 0.02}>1"',
                 # Cleanup
-                f'ent_fire worldent addoutput "OnUser1>cmd>command>cl_drawhud 1;r_drawviewmodel 1;r_drawpanorama 1;cl_firstperson_legs 1;fov_cs_debug 0;noclip 0>4.0>1"',
-                f'ent_fire worldent addoutput "OnUser1>cmd>command>r_always_render_all_windows {original_render_all}>4.2>1"',
-                'ent_fire worldent addoutput "OnUser1>cmd>command>screenshot_subdir \"\">4.2>1"',
-                'ent_fire worldent addoutput "OnUser1>cmd>command>echo [Cubemap Done]>4.5>1"'
+                f'ent_fire worldent addoutput "OnUser1>cmd>command>cl_drawhud 1;r_drawviewmodel 1;r_drawpanorama 1;cl_firstperson_legs 1;fov_cs_debug 0;noclip 1>{7*t}>1"',
+                f'ent_fire worldent addoutput "OnUser1>cmd>command>r_always_render_all_windows {original_render_all}>{7*t + 0.1}>1"',
+                f'ent_fire worldent addoutput "OnUser1>cmd>command>screenshot_subdir \"\">{7*t + 0.1}>1"',
+                'ent_fire worldent addoutput "OnUser1>cmd>command>echo [Cubemap Done]>5.0>1"'
             ]
 
             CS2Netcon.send_many(cmds) # Send all setup commands including the sentinel echo
@@ -202,28 +204,24 @@ def run(self):
 
                 if self.config['mode'] == "CrossHLayout":
                     stitcher.stitch_cross(faces, output_path)
+                elif self.config['mode'] == "Individual Faces":
+                    # Save individual faces to a subfolder
+                    indiv_dir = os.path.join(self.config['out'], f"individual_{ev_suffix}")
+                    os.makedirs(indiv_dir, exist_ok=True)
+                    face_names = ["forward", "right", "back", "left", "up", "down"]
+                    for i, name in enumerate(face_names):
+                        face_img = Image.fromarray(faces[i])
+                        face_img.save(os.path.join(indiv_dir, f"{name}.png"))
+                    self.progress.emit(f"Saved individual faces to {indiv_dir}")
                 else:
                     stitcher.stitch_equirectangular(faces, output_path)
 
             except Exception as e:
                 self.error.emit(f"Error stitching EV {ev}: {e}")
                 return
 
-        self.finished.emit(f"Success! Cubemap saved to: {self.config['out']}")
-            
-        # Ensure output folder exists
-        os.makedirs(self.config['out'], exist_ok=True)
-
-        out_name = "output_cubemap"
-        if self.config['mode'] == "CrossHLayout":
-            out_path = os.path.join(self.config['out'], f"{out_name}.exr")
-            stitcher.stitch_cross(faces, out_path)
-        else:
-            out_path = os.path.join(self.config['out'], f"{out_name}.jpg")
-            stitcher.stitch_equirectangular(faces, out_path)
-            
         # Success cleanup
         try: shutil.rmtree(cs2_ss_dir)
         except: pass
 
-        self.finished.emit(f"Success! Output saved to: {out_path}")
+        self.finished.emit(f"Success! Cubemap saved to: {self.config['out']}")