Merge pull request #208 from compas-dev/update/buffermanager

Update/buffermanager

Author: Licini

CHANGELOG.md

@@ -9,10 +9,23 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+* Added `BufferManager` to handle buffer data for all the scene objects.
+* Added `make_texture_buffer` in `gl.py` for matrix and settings array.
+
 ### Changed
 
+* Greatly improved performance for scenes with large number of objects.
+* All scene objects are rendered once in a combined buffer through single draw call.
+* Updated shaders to version OpenGL 330 Core Profile.
+* Implemented matrix and settings array as texture buffer instead of uniforms to improve performance.
+* Blending of transparent objects is handled in a second draw on top of the opaque objects.
+
 ### Removed
 
+* Removed all low-level buffer related functions from `SceneObject`s, which is now handled together by `BufferManager`.
+* Removed redundant Shaders: `grid_shader`, `instance_shader`, `surface_shader` and `arrow_shader`.
+* Removed `paint_instance` from `Renderer` as it handled by a shader flag.
+
 
 ## [1.3.2] 2025-03-12
 

docs/examples/dynamic/dynamic.py

@@ -11,8 +11,7 @@
 def movepoint(frame):
     print("frame", frame)
     obj.geometry.x += 0.1
-    obj.init()
-    obj.update()
+    obj.update(update_data=True)
 
 
 viewer.show()

docs/examples/dynamic/dynamic_mesh.py

@@ -11,16 +11,15 @@
 obj = viewer.scene.add(mesh, surfacecolor=Color.cyan(), use_vertexcolors=False)
 
 
-@viewer.on(interval=1000)
+@viewer.on(interval=200)
 def deform_mesh(frame):
     for v in mesh.vertices():
         vertex: list = mesh.vertex_attributes(v, "xyz")  # type: ignore
         vertex[0] += random() - 0.5
         vertex[1] += random() - 0.5
         vertex[2] += random() - 0.5
         mesh.vertex_attributes(v, "xyz", vertex)
-    obj.init()
-    obj.update()
+    obj.update(update_data=True)
     print(frame)
 
 

docs/examples/dynamic/orbiting.py

@@ -18,14 +18,14 @@
 viewer.scene.add(
     Mesh.from_shape(sphere, u=32, v=32),
     facecolor=Color.cyan(),
-    edgecolor=Color.blue(),
+    linecolor=Color.blue(),
     use_vertexcolors=False,
 )
 
 
 @viewer.on(interval=100)
 def orbit(f):
-    viewer.renderer.camera.rotation.z += 1
+    viewer.renderer.camera.rotation.z += 0.02
 
 
 viewer.show()

docs/examples/object/points.py

@@ -7,7 +7,7 @@
 viewer = Viewer()
 for i in range(10):
     point = Point(random() * 10, random() * 10, random() * 10)
-    viewer.scene.add(point, pointcolor=Color(random(), random(), random()), pointsize=30)
+    viewer.scene.add(point, pointcolor=Color(random(), random(), random()), pointsize=random() * 50)
 
 
 viewer.show()

scripts/boxes.py

@@ -0,0 +1,23 @@
+from compas.colors import Color
+from compas.geometry import Box
+from compas_viewer.viewer import Viewer
+from compas.geometry import Translation
+
+viewer = Viewer()
+N = 10
+for i in range(N):
+    for j in range(N):
+        for k in range(N):
+            obj = viewer.scene.add(
+                Box(0.5, 0.5, 0.5),
+                show_points=True,
+                linecolor=Color.white(),
+                pointcolor=Color(1 - i / N, 1 - j / N, 1 - k / N),
+                pointsize=10,
+                facecolor=Color(i / N, j / N, k / N),
+                name=f"Box_{i}_{j}_{k}",
+            )
+
+            obj.transformation = Translation.from_vector([i, j, k])
+
+viewer.show()

scripts/dynamic_box.py

@@ -3,12 +3,19 @@
 from compas.datastructures import Mesh
 from compas.geometry import Box
 from compas_viewer import Viewer
+from compas.geometry import Translation
 
 viewer = Viewer()
 
 mesh = Mesh.from_shape(Box.from_width_height_depth(2, 2, 2))
-obj = viewer.scene.add(mesh)
+obj1 = viewer.scene.add(mesh)
+obj2 = viewer.scene.add(mesh)
+obj2.transformation = Translation.from_vector([5, 0, 0])
 
+obj3 = viewer.scene.add(mesh)
+obj3.transformation = Translation.from_vector([-5, 0, 0])
+
+obj1.opacity = 0.7
 
 @viewer.on(interval=100)
 def deform_mesh(frame):
@@ -18,7 +25,19 @@ def deform_mesh(frame):
         vertex[1] += (random() - 0.5) * 0.1
         vertex[2] += (random() - 0.5) * 0.1
         mesh.vertex_attributes(v, "xyz", vertex)
-    obj.update()
+
+    obj1.transformation = Translation.from_vector([random() - 0.5, random() - 0.5, random() - 0.5])
+    obj3.transformation *= Translation.from_euler_angles([0.05, 0, 0])
+
+    # Three objects share the same geometry data, but updated differently
+    # obj1 should move around and deform
+    obj1.update(update_transform=True, update_data=True)
+
+    # obj2 will not move but will deform
+    obj2.update(update_transform=False, update_data=True)
+
+    # obj3 will rotate but not deform
+    obj3.update(update_transform=True, update_data=False)
 
 
 viewer.show()

scripts/group.py

@@ -22,4 +22,5 @@
 box1 = box1.transformed(Translation.from_vector([0, 5, 0]))
 box2 = box2.transformed(Translation.from_vector([0, 5, 0]))
 group3 = viewer.scene.add([[box1], box2])
+group3.transformation = Translation.from_vector([0, 0, 5])
 viewer.show()

src/compas_viewer/gl.py

@@ -90,7 +90,7 @@ def make_index_buffer(data, dynamic=False):
     return vbo
 
 
-def update_vertex_buffer(data, buffer):
+def update_vertex_buffer(data, buffer, offset=0):
     """Update a vertex buffer with new data.
 
     Parameters
@@ -99,12 +99,14 @@ def update_vertex_buffer(data, buffer):
         A flat list of floats.
     buffer : int
         The ID of the buffer.
+    offset : int
+        Byte offset into the buffer where the update should start.
     """
     n = len(data)
     size = n * ct.sizeof(ct.c_float)
     data = (ct.c_float * n)(*data)
     GL.glBindBuffer(GL.GL_ARRAY_BUFFER, buffer)
-    GL.glBufferSubData(GL.GL_ARRAY_BUFFER, 0, size, data)
+    GL.glBufferSubData(GL.GL_ARRAY_BUFFER, offset, size, data)
     GL.glBindBuffer(GL.GL_ARRAY_BUFFER, 0)
 
 
@@ -124,3 +126,51 @@ def update_index_buffer(data, buffer):
     GL.glBindBuffer(GL.GL_ELEMENT_ARRAY_BUFFER, buffer)
     GL.glBufferSubData(GL.GL_ELEMENT_ARRAY_BUFFER, 0, size, data)
     GL.glBindBuffer(GL.GL_ELEMENT_ARRAY_BUFFER, 0)
+
+
+def make_texture_buffer(data, internal_format=GL.GL_RGBA32F):
+    """Make a texture buffer from the given data.
+
+    Parameters
+    ----------
+    data : numpy.ndarray
+        A numpy array of floats.
+    internal_format : GLenum, optional
+        The internal format for the texture buffer. Default is GL.GL_RGBA32F.
+
+    Returns
+    -------
+    int
+        The texture ID.
+    """
+    # Create buffer
+    buffer = GL.glGenBuffers(1)
+    GL.glBindBuffer(GL.GL_TEXTURE_BUFFER, buffer)
+
+    GL.glBufferData(GL.GL_TEXTURE_BUFFER, data.nbytes, data, GL.GL_STATIC_DRAW)
+
+    # Create texture
+    texture = GL.glGenTextures(1)
+    GL.glBindTexture(GL.GL_TEXTURE_BUFFER, texture)
+    GL.glTexBuffer(GL.GL_TEXTURE_BUFFER, internal_format, buffer)
+
+    return texture
+
+
+def update_texture_buffer(data, texture, offset=0):
+    """Update a texture buffer with new data.
+
+    Parameters
+    ----------
+    data : numpy.ndarray
+        A numpy array of floats.
+    texture : int
+        The texture ID.
+    offset : int
+        Byte offset into the buffer where the update should start.
+    """
+    GL.glBindTexture(GL.GL_TEXTURE_BUFFER, texture)
+    buffer = GL.glGetTexLevelParameteriv(GL.GL_TEXTURE_BUFFER, 0, GL.GL_TEXTURE_BUFFER_DATA_STORE_BINDING)
+    GL.glBindBuffer(GL.GL_TEXTURE_BUFFER, buffer)
+    GL.glBufferSubData(GL.GL_TEXTURE_BUFFER, offset, data.nbytes, data)
+    GL.glBindBuffer(GL.GL_TEXTURE_BUFFER, 0)