update

agentdavo · agentdavo · commit 588c229202f9 · 2024-10-15T00:26:53.000+01:00
diff --git a/cncvis/api.c b/cncvis/api.c
@@ -18,9 +18,6 @@ ZBuffer *globalFramebuffer = NULL;
 ucncAssembly *globalScene = NULL;
 ucncCamera *globalCamera = NULL;
 
-int framebufferWidth = (int)globalFramebuffer->xsize;
-int framebufferHeight = (int)globalFramebuffer->ysize;
-
 ucncLight **globalLights = NULL;
 int globalLightCount = 0;
 
@@ -104,14 +101,24 @@ void ucncSetAllAssembliesToHome(ucncAssembly *assembly) {
     }
 }
 
-// Set the dimensions of the TinyGL Z-buffer
-void ucncSetZBufferDimensions(int width, int height) {
+// Set the dimensions of the TinyGL Z-buffer and return width/height
+void ucncSetZBufferDimensions(int width, int height, int *outFramebufferWidth, int *outFramebufferHeight) {
+	
     if (globalFramebuffer) {
         ZB_close(globalFramebuffer);
     }
     globalFramebuffer = ZB_open(width, height, ZB_MODE_RGBA, 0);
     if (!globalFramebuffer) {
         fprintf(stderr, "Failed to initialize Z-buffer with dimensions %d x %d.\n", width, height);
+        return;
+    }
+    
+    // Set the output width and height using the provided pointers
+    if (outFramebufferWidth) {
+        *outFramebufferWidth = globalFramebuffer->xsize;
+    }
+    if (outFramebufferHeight) {
+        *outFramebufferHeight = globalFramebuffer->ysize;
     }
 }
 
diff --git a/cncvis/api.h b/cncvis/api.h
@@ -9,9 +9,6 @@
 extern ucncLight **globalLights;
 extern int globalLightCount;
 
-extern int framebufferWidth;
-extern int framebufferHeight;
-
 // Global frame buffer and scene declaration
 extern ZBuffer *globalFramebuffer;
 extern ucncAssembly *globalScene;
@@ -23,7 +20,7 @@ void ucncSetAllAssembliesToHome(ucncAssembly *assembly);
 void ucncUpdateMotion(ucncAssembly *assembly, float value);
 
 // Z-buffer handling
-void ucncSetZBufferDimensions(int width, int height);
+void ucncSetZBufferDimensions(int width, int height, int *outFramebufferWidth, int *outFramebufferHeight);
 const float* ucncGetZBufferOutput(void);
 void ucncFrameReady(ZBuffer *framebuffer);
 
diff --git a/main/src/main.c b/main/src/main.c
@@ -57,9 +57,12 @@ static uint8_t *cbuf[LV_CANVAS_BUF_SIZE(CANVAS_WIDTH, CANVAS_HEIGHT, 32, LV_DRAW
 /**********************
  *   GLOBAL VARIABLES
  **********************/
-extern ZBuffer *globalFramebuffer;  // Make sure it matches your `api.h`
+extern ZBuffer *globalFramebuffer;
 extern ucncAssembly *globalScene;
 
+int framebufferWidth;
+int framebufferHeight;
+
 /*********************
  *   GLOBAL FUNCTIONS
  *********************/
@@ -125,9 +128,10 @@ int main(int argc, char **argv) {
     // Initialize the TinyGL framebuffer (through the CNC API)
 	
     printf("Setting Z-buffer dimensions...\n");
-    ucncSetZBufferDimensions(CANVAS_WIDTH-16, CANVAS_HEIGHT-16);
+    ucncSetZBufferDimensions(CANVAS_WIDTH-16, CANVAS_HEIGHT-16, &framebufferWidth, &framebufferHeight);
 
-    printf("Z-buffer initialized: %d x %d\n", globalFramebuffer->xsize, globalFramebuffer->ysize);
+    // Now framebufferWidth and framebufferHeight will be updated to the correct values
+    printf("Framebuffer Size: %d x %d\n", framebufferWidth, framebufferHeight);
 
     // Initialize the CNC scene (you could load an initial configuration here)
     printf("Loading CNC scene...\n");
