more clean up

Author: Licini

src/compas_viewer/renderer/renderer.py

@@ -3,9 +3,7 @@
 from typing import TYPE_CHECKING
 
 from numpy import float32
-from numpy import frombuffer
 from numpy import identity
-from numpy import uint8
 from OpenGL import GL
 from PySide6 import QtCore
 from PySide6.QtGui import QKeyEvent
@@ -17,9 +15,9 @@
 from compas.geometry import Frame
 from compas.geometry import transform_points_numpy
 from compas_viewer.scene import TagObject
+from compas_viewer.scene.buffermanager import BufferManager
 from compas_viewer.scene.gridobject import GridObject
 from compas_viewer.scene.vectorobject import VectorObject
-from compas_viewer.scene.buffermanager import BufferManager
 
 from .camera import Camera
 from .shaders import Shader
@@ -442,22 +440,9 @@ def update_projection(self, w=None, h=None):
         self.shader_model.uniform4x4("projection", projection)
         self.shader_model.release()
 
-        # self.shader_tag.bind()
-        # self.shader_tag.uniform4x4("projection", projection)
-        # self.shader_tag.release()
-
-        # self.shader_arrow.bind()
-        # self.shader_arrow.uniform4x4("projection", projection)
-        # self.shader_arrow.uniform1f("aspect", w / h)
-        # self.shader_arrow.release()
-
-        # self.shader_instance.bind()
-        # self.shader_instance.uniform4x4("projection", projection)
-        # self.shader_instance.release()
-
-        # self.shader_grid.bind()
-        # self.shader_grid.uniform4x4("projection", projection)
-        # self.shader_grid.release()
+        self.shader_tag.bind()
+        self.shader_tag.uniform4x4("projection", projection)
+        self.shader_tag.release()
 
     def resize(self, w: int, h: int):
         """
@@ -559,18 +544,17 @@ def paint(self, is_instance: bool = False):
 
         self.shader_model.uniform4x4("viewworld", viewworld)
         self.shader_model.uniform1i("is_instance", is_instance)
-        
 
         if self.viewer.config.renderer.show_grid:
             self.grid.draw(self.shader_model)
-        
+
         # Draw opaque objects
         self.buffer_manager.draw(
             self.shader_model,
             self.rendermode,
             is_instance=is_instance,
         )
-        
+
         self.shader_model.release()
 
         # Draw text tag sprites
@@ -680,9 +664,9 @@ def read_instance_color(self, box: tuple[int, int, int, int]):
             draw.rectangle([x1, y1, x2, y2], outline="red", width=2)
             full_image.save("instance_debug_full_with_box.png")
 
-            print(f"Saved debug images:")
-            print(f"- Full frame: instance_debug_full.png")
-            print(f"- Full frame with box: instance_debug_full_with_box.png")
+            print("Saved debug images:")
+            print("- Full frame: instance_debug_full.png")
+            print("- Full frame with box: instance_debug_full_with_box.png")
             print(f"Box coordinates: x={x}, y={y}, width={width}, height={height}")
             print(f"Original box: x1={x1}, y1={y1}, x2={x2}, y2={y2}")
             print(f"Window size: {self.width()}x{self.height()}")
@@ -703,7 +687,7 @@ def read_instance_color(self, box: tuple[int, int, int, int]):
             box_image = Image.fromarray(box_map)
             box_image = box_image.transpose(Image.FLIP_TOP_BOTTOM)
             box_image.save("instance_debug_box.png")
-            print(f"- Box area: instance_debug_box.png")
+            print("- Box area: instance_debug_box.png")
 
         # Restore previous render states
         if prev_blend:

src/compas_viewer/scene/buffermanager.py

@@ -1,9 +1,17 @@
-from typing import Any, Dict, List
+from typing import Any
+from typing import Dict
+from typing import List
+
 import numpy as np
-from compas_viewer.gl import make_vertex_buffer, make_index_buffer, make_texture_buffer, update_texture_buffer, update_vertex_buffer
-from compas_viewer.renderer.shaders import Shader
 import OpenGL.GL as GL
 
+from compas_viewer.gl import make_index_buffer
+from compas_viewer.gl import make_texture_buffer
+from compas_viewer.gl import make_vertex_buffer
+from compas_viewer.gl import update_texture_buffer
+from compas_viewer.gl import update_vertex_buffer
+from compas_viewer.renderer.shaders import Shader
+
 
 class BufferManager:
     """A class to manage and combine buffers from multiple objects for efficient rendering.
@@ -124,7 +132,6 @@ def _add_buffer_data(self, obj: Any, buffer_type: str) -> None:
         self.object_indices[buffer_type] = np.append(self.object_indices[buffer_type], obj_indices)
 
         if buffer_type == "_frontfaces_data" or buffer_type == "_backfaces_data":
-
             opaque_elements = np.array(opaque_elements, dtype=np.int32)
             transparent_elements = np.array(transparent_elements, dtype=np.int32)
             opaque_elements += start_idx

src/compas_viewer/scene/groupobject.py

@@ -1,6 +1,6 @@
 from compas.data import Data
-from compas.colors import Color
-from .sceneobject import SceneObject
+
+from .sceneobject import ViewerSceneObject
 
 
 class Group(Data):
@@ -15,21 +15,11 @@ def __data__(self):
         return {"items": self.items}
 
 
-class GroupObject(SceneObject):
+class GroupObject(ViewerSceneObject):
     """A group of scene objects."""
 
     def __init__(self, item=None, **kwargs):
         super().__init__(item=Group(item), **kwargs)
-        self.show = True
-        self.show_points = False
-        self.show_lines = False
-        self.show_faces = False
-        self.is_selected = False
-        self.opacity = 1.0
-        self.bounding_box = None
-        self._matrix_buffer = None
-        self.instance_color = Color.black()
-
         for item in self.items:
             if isinstance(item, (Data, list)):
                 self.add(item, **kwargs)
@@ -47,9 +37,3 @@ def items(self):
 
     def init(self, *args, **kwargs):
         pass
-
-    def draw(self, *args, **kwargs):
-        pass
-
-    def draw_instance(self, *args, **kwargs):
-        pass

src/compas_viewer/scene/vectorobject.py

@@ -3,7 +3,6 @@
 from compas.geometry import Point
 from compas.geometry import Vector
 from compas.scene import GeometryObject
-from compas_viewer.renderer.shaders import Shader
 
 from .sceneobject import ShaderDataType
 from .sceneobject import ViewerSceneObject

src/compas_viewer/viewer.py

@@ -5,8 +5,8 @@
 
 from PySide6.QtCore import QTimer
 from PySide6.QtGui import QIcon
-from PySide6.QtWidgets import QApplication
 from PySide6.QtGui import QSurfaceFormat
+from PySide6.QtWidgets import QApplication
 
 from compas.scene import Scene
 from compas_viewer import HERE