q3dviewer 1.2.3__py3-none-any.whl → 1.2.4__py3-none-any.whl

q3dviewer/__init__.py

@@ -1,14 +1,5 @@
-import time
-t1 = time.time()
 from q3dviewer.custom_items import *
-t2 = time.time()
 from q3dviewer.glwidget import *
 from q3dviewer.viewer import *
 from q3dviewer.base_item import *
-from q3dviewer.base_glwidget import *
-t3 = time.time()
-
-from q3dviewer.Qt import Q3D_DEBUG
-if Q3D_DEBUG:
-    print("Import custom items: ", t2 - t1)
-    print("Import base q3dviewer: ", t3 - t2)
+from q3dviewer.base_glwidget import *

q3dviewer/custom_items/__init__.py

@@ -8,4 +8,6 @@ from q3dviewer.custom_items.text_item import Text2DItem
 from q3dviewer.custom_items.image_item import ImageItem
 from q3dviewer.custom_items.line_item import LineItem
 from q3dviewer.custom_items.text3d_item import Text3DItem
+from q3dviewer.custom_items.static_mesh_item import StaticMeshItem
 from q3dviewer.custom_items.mesh_item import MeshItem
+

q3dviewer/custom_items/mesh_item.py

@@ -17,7 +17,6 @@ from q3dviewer.utils import set_uniform, text_to_rgba
 import time
 
 
-
 class MeshItem(BaseItem):
     """
     A OpenGL mesh item for rendering 3D triangular meshes.
@@ -63,6 +62,7 @@ class MeshItem(BaseItem):
         
         # Settings flag
         self.need_update_setting = True
+        self.need_update_buffer = True
         self.path = os.path.dirname(__file__)
     
         
@@ -181,102 +181,144 @@ class MeshItem(BaseItem):
 
     def set_data(self, data):
         """
-        Set complete mesh data at once.
-        
         Args:
-            data: is Nx3 numpy array (N must be divisible by 3) or dict
-            if is dict, uses the dict format: 
-            [face_key: (v0.x, v0.y, v0.z, ..., v3.z, good)]
+            data: One of the following formats:
+                  - Nx3 numpy array (N must be divisible by 3): vertex list -> static
+                  - Nx9 numpy array: triangle list -> static
+                  - Structured array with dtype [('key', int64), ('vertices', float32, (12,)), ('good', uint32)] -> incremental
         """
-        self.clear_mesh()
-
-        if isinstance(data, dict):
-            # Use dict format directly (from get_mesh_data/get_incremental_mesh_data)
+        if not isinstance(data, np.ndarray):
+            raise ValueError("Data must be a numpy array")
+        
+        want_dtype = np.dtype([
+            ('key', np.int64),
+            ('vertices', np.float32, (12,)),
+            ('good', np.uint32)
+        ])
+        
+        # Structured array format -> use incremental path (has keys for updates)
+        if data.dtype == want_dtype:
             self.set_incremental_data(data)
             return
-                
-        # Check if Nx3 array
+        
+        # Nx3 or Nx9 format -> use static path (more efficient, no key overhead)
+        if data.ndim == 2 and data.shape[1] in [3, 9]:
+            self.set_static_data(data)
+            return
+        
+        raise ValueError("Data must be Nx3, Nx9, or structured array format")
 
+    def set_static_data(self, data):
+        """
+        Efficiently set static mesh data without key2index overhead.
+        For static meshes that don't need incremental updates.
+        
+        Args:
+            data: numpy array in one of these formats:
+                  - Nx3: vertex list (N must be divisible by 3)
+                  - Nx9: triangle list
+        """
         if not isinstance(data, np.ndarray):
-            raise ValueError("Invalid data type")
-
-        good_format = False
-        if data.ndim == 2 and \
-            data.shape[1] == 3 and \
-            data.shape[0] % 3 == 0:
-            good_format = True
-
-        if not good_format:
-            raise ValueError("Invalid data shape")
-
-        # Convert to Nx13 numpy array
-        N = data.shape[0] // 3
-        faces = np.zeros((N, 13), dtype=np.float32)
-        tmp = data.reshape(N, 9)
-        faces[:, 0:3]  = tmp[:, 0:3]   # copy v0
-        faces[:, 3:6]  = tmp[:, 3:6]   # copy v1
-        faces[:, 6:9]  = tmp[:, 6:9]   # copy v2
-        faces[:, 9:12] = tmp[:, 6:9]   # copy v3 from v2 (degenerate quad)
-        faces[:, 12] = 1.0             # set good=1.0
+            raise ValueError("Data must be a numpy array")
+        
+        if data.ndim != 2:
+            raise ValueError(f"Data must be 2D array, got {data.ndim}D")
+        self.clear_mesh()
+        # Handle Nx3 format
+        if data.shape[1] == 3:
+            if data.shape[0] % 3 != 0:
+                raise ValueError(f"Nx3 format requires N divisible by 3, got N={data.shape[0]}")
+            
+            num_faces = data.shape[0] // 3
+            faces = np.zeros((num_faces, 13), dtype=np.float32)
+            
+            # Reshape to (num_faces, 9) for efficient copying
+            tmp = data.reshape(num_faces, 9)
+            faces[:, 0:3]  = tmp[:, 0:3]   # v0
+            faces[:, 3:6]  = tmp[:, 3:6]   # v1
+            faces[:, 6:9]  = tmp[:, 6:9]   # v2
+            faces[:, 9:12] = tmp[:, 6:9]   # v3 = v2 (degenerate)
+            faces[:, 12] = 1.0             # good=1.0
+            
+        # Handle Nx9 format
+        elif data.shape[1] == 9:
+            num_faces = data.shape[0]
+            faces = np.zeros((num_faces, 13), dtype=np.float32)
+            
+            faces[:, 0:9] = data           # Copy all 9 vertices
+            faces[:, 9:12] = data[:, 6:9]  # v3 = v2 (degenerate)
+            faces[:, 12] = 1.0             # good=1.0
+            
+        else:
+            raise ValueError(f"Data shape must be Nx3 or Nx9, got Nx{data.shape[1]}")
+        
+        # Replace faces buffer (static data, no key management)
+        self.clear_mesh()
         self.faces = faces
-        self.valid_f_top = N
+        self.valid_f_top = num_faces
+        self.need_update_buffer = True
 
 
     def set_incremental_data(self, fs):
         """
         Incrementally update mesh with new face data.
         Args:
-            fs: Dict {face_key: (v0.x, v0.y, v0.z, v1.x, v1.y, v1.z, 
-                                  v2.x, v2.y, v2.z, v3.x, v3.y, v3.z, good), ...}
-                13-tuple with vertex positions and good flag (0.0 or 1.0)
-                If good==1:
-                    Triangle 1: (v0, v1, v3)
-                    Triangle 2: (v0, v3, v2)
+            fs: Structured numpy array with dtype:
+                [('key', np.int64), ('vertices', np.float32, (12,)), ('good', np.uint32)]
+                - key: unique identifier for the face
+                - vertices: 12 floats representing 4 vertices (v0, v1, v2, v3)
+                - good: 0 or 1, whether to render this face
         Updates:
             - faces: updates existing faces or appends new ones
             - key2index: tracks face_key -> face_index mapping
         """
-        if not fs:
+        if fs is None or len(fs) == 0:
             return
+        
+        if not isinstance(fs, np.ndarray) or fs.dtype.names is None:
+            raise ValueError("fs must be a structured numpy array with fields: key, vertices, good")
 
         # Ensure enough capacity in faces buffer
-        # wasted cases are better than frequent expansions
         while self.valid_f_top + len(fs) > len(self.faces):
             self._expand_face_buffer()
 
-        # Optimization: Separate updates from new insertions to avoid
-        # dictionary lookup performance degradation during growth
-        update_idxs = []   # [idx, ...]
-        update_data = []   # [face_data, ...]
-        new_keys = []      # [key, ...]
-        new_data = []      # [face_data, ...]
-
-        for face_key, face_data in fs.items():
-            face_idx = self.key2index.get(face_key)
-            if face_idx is not None:
-                update_idxs.append(face_idx)
-                update_data.append(face_data)
-            else:
-                new_keys.append(face_key)
-                new_data.append(face_data)
-
+        # Prepare face data: convert structured array to Nx13 format
+        n_faces = len(fs)
+        face_data = np.zeros((n_faces, 13), dtype=np.float32)
+        
+        # Copy vertices (12 floats -> positions 0:12)
+        face_data[:, :12] = fs['vertices']
+        
+        # Copy good flag (position 12)
+        face_data[:, 12] = fs['good'].astype(np.float32)
+        
+        # Extract keys
+        keys = fs['key']
+        
+        # Optimization: Separate updates from new insertions
+        update_mask = np.array([key in self.key2index for key in keys], dtype=bool)
+        new_mask = ~update_mask
+        
         # Batch update existing faces
-        if update_data:
-            indices = np.array(update_idxs, dtype=np.int32)
-            data = np.array(update_data, dtype=np.float32)
-            self.faces[indices] = data
+        if np.any(update_mask):
+            update_keys = keys[update_mask]
+            update_indices = np.array([self.key2index[key] for key in update_keys], dtype=np.int32)
+            self.faces[update_indices] = face_data[update_mask]
         
         # Batch insert new faces
-        if new_data:
-            n_new = len(new_data)
-            data = np.array(new_data, dtype=np.float32)
-            self.faces[self.valid_f_top: self.valid_f_top + n_new] = data
-
+        if np.any(new_mask):
+            new_keys = keys[new_mask]
+            new_face_data = face_data[new_mask]
+            n_new = len(new_keys)
+            
+            # Insert data
+            self.faces[self.valid_f_top: self.valid_f_top + n_new] = new_face_data
+            
             # Update key2index mapping for new faces
             for i, face_key in enumerate(new_keys):
                 self.key2index[face_key] = self.valid_f_top + i
-            
             self.valid_f_top += n_new
+            self.need_update_buffer = True
     
     def _expand_face_buffer(self):
         """Expand the faces buffer when capacity is reached"""
@@ -367,12 +409,15 @@ class MeshItem(BaseItem):
             self._gpu_face_capacity = len(self.faces)
         
         # Upload faces to VBO
-        glBindBuffer(GL_ARRAY_BUFFER, self.vbo)
-        glBufferSubData(GL_ARRAY_BUFFER,
-                       0,
-                       self.valid_f_top * 13 * 4,  # 13 floats * 4 bytes per face
-                       self.faces[:self.valid_f_top])
-        glBindBuffer(GL_ARRAY_BUFFER, 0)
+        if self.need_update_buffer:
+            glBindBuffer(GL_ARRAY_BUFFER, self.vbo)
+            glBufferSubData(GL_ARRAY_BUFFER,
+                           0,
+                           self.valid_f_top * 13 * 4,  # 13 floats * 4 bytes per face
+                           self.faces[:self.valid_f_top])
+            glBindBuffer(GL_ARRAY_BUFFER, 0)
+            self.need_update_buffer = False
+            glBindBuffer(GL_ARRAY_BUFFER, 0)
         
     def update_setting(self):
         """Set fixed rendering parameters (called once during initialization)"""

q3dviewer/custom_items/static_mesh_item.py

@@ -0,0 +1,330 @@
+#!/usr/bin/env python3
+
+"""
+Copyright 2024 Panasonic Advanced Technology Development Co.,Ltd. (Liu Yang)
+Distributed under MIT license. See LICENSE for more information.
+"""
+
+import numpy as np
+from q3dviewer.base_item import BaseItem
+from OpenGL.GL import *
+from OpenGL.GL import shaders
+from q3dviewer.Qt.QtWidgets import QLabel, QCheckBox, QDoubleSpinBox, QSlider, QHBoxLayout, QLineEdit
+
+import os
+from q3dviewer.utils import set_uniform, text_to_rgba
+
+
+class StaticMeshItem(BaseItem):
+    """
+    A OpenGL mesh item for rendering static 3D triangular meshes.
+    Optimized for static geometry with triangle-only rendering.
+    Data format: Nx9 numpy array (3 vertices per triangle, no good flag needed)
+    
+    Attributes:
+        color (str or tuple): Accepts any valid matplotlib color (e.g., 'red', '#FF4500', (1.0, 0.5, 0.0)).
+        wireframe (bool): If True, renders the mesh in wireframe mode.
+    """
+    def __init__(self, color='lightblue', wireframe=False):
+        super(StaticMeshItem, self).__init__()
+        self.wireframe = wireframe
+        self.color = color
+        self.flat_rgb = text_to_rgba(color, flat=True)
+        
+        # Static mesh buffer: N x 9 numpy array
+        # Each row: [v0.x, v0.y, v0.z, v1.x, v1.y, v1.z, v2.x, v2.y, v2.z]
+        self.vertices = None
+        self.num_triangles = 0
+        
+        # OpenGL objects
+        self.vao = None
+        self.vbo = None
+        self.program = None
+        
+        # Fixed rendering parameters
+        self.enable_lighting = True
+        self.line_width = 1.0
+        self.light_color = [1.0, 1.0, 1.0]
+        self.ambient_strength = 0.1
+        self.diffuse_strength = 1.2
+        self.specular_strength = 0.1
+        self.shininess = 32.0
+        self.alpha = 1.0
+        
+        # Settings flag
+        self.need_update_setting = True
+        self.need_update_buffer = True
+        self.path = os.path.dirname(__file__)
+    
+    def add_setting(self, layout):
+        """Add UI controls for mesh visualization"""
+        # Wireframe toggle
+        self.wireframe_box = QCheckBox("Wireframe Mode")
+        self.wireframe_box.setChecked(self.wireframe)
+        self.wireframe_box.toggled.connect(self.update_wireframe)
+        layout.addWidget(self.wireframe_box)
+
+        # Enable lighting toggle
+        self.lighting_box = QCheckBox("Enable Lighting")
+        self.lighting_box.setChecked(self.enable_lighting)
+        self.lighting_box.toggled.connect(self.update_enable_lighting)
+        layout.addWidget(self.lighting_box)
+
+        # Color setting
+        label_rgb = QLabel("Color:")
+        label_rgb.setToolTip("Use hex color, i.e. #FF4500, or named color, i.e. 'red'")
+        layout.addWidget(label_rgb)
+        self.edit_rgb = QLineEdit()
+        self.edit_rgb.setToolTip("Use hex color, i.e. #FF4500, or named color, i.e. 'red'")
+        self.edit_rgb.setText(self.color)
+        self.edit_rgb.textChanged.connect(self._on_color)
+        layout.addWidget(self.edit_rgb)
+
+        # Material property controls for Phong lighting
+        if self.enable_lighting:
+            # Ambient strength control
+            ambient_layout = QHBoxLayout()
+            ambient_label = QLabel("Ambient Strength:")
+            ambient_layout.addWidget(ambient_label)
+            self.ambient_slider = QSlider()
+            self.ambient_slider.setOrientation(1)  # Qt.Horizontal
+            self.ambient_slider.setRange(0, 100)
+            self.ambient_slider.setValue(int(self.ambient_strength * 100))
+            self.ambient_slider.valueChanged.connect(lambda v: self.update_ambient_strength(v / 100.0))
+            ambient_layout.addWidget(self.ambient_slider)
+            layout.addLayout(ambient_layout)
+
+            # Diffuse strength control
+            diffuse_layout = QHBoxLayout()
+            diffuse_label = QLabel("Diffuse Strength:")
+            diffuse_layout.addWidget(diffuse_label)
+            self.diffuse_slider = QSlider()
+            self.diffuse_slider.setOrientation(1)
+            self.diffuse_slider.setRange(0, 200)
+            self.diffuse_slider.setValue(int(self.diffuse_strength * 100))
+            self.diffuse_slider.valueChanged.connect(lambda v: self.update_diffuse_strength(v / 100.0))
+            diffuse_layout.addWidget(self.diffuse_slider)
+            layout.addLayout(diffuse_layout)
+
+            # Specular strength control
+            specular_layout = QHBoxLayout()
+            specular_label = QLabel("Specular Strength:")
+            specular_layout.addWidget(specular_label)
+            self.specular_slider = QSlider()
+            self.specular_slider.setOrientation(1)
+            self.specular_slider.setRange(0, 100)
+            self.specular_slider.setValue(int(self.specular_strength * 100))
+            self.specular_slider.valueChanged.connect(lambda v: self.update_specular_strength(v / 100.0))
+            specular_layout.addWidget(self.specular_slider)
+            layout.addLayout(specular_layout)
+
+            # Shininess control
+            shininess_layout = QHBoxLayout()
+            shininess_label = QLabel("Shininess:")
+            shininess_layout.addWidget(shininess_label)
+            self.shininess_slider = QSlider()
+            self.shininess_slider.setOrientation(1)
+            self.shininess_slider.setRange(1, 256)
+            self.shininess_slider.setValue(int(self.shininess))
+            self.shininess_slider.valueChanged.connect(lambda v: self.update_shininess(float(v)))
+            shininess_layout.addWidget(self.shininess_slider)
+            layout.addLayout(shininess_layout)
+
+    def _on_color(self, color):
+        try:
+            self.color = color
+            self.flat_rgb = text_to_rgba(color, flat=True)
+            self.need_update_setting = True
+        except ValueError:
+            pass
+
+    def update_wireframe(self, value):
+        self.wireframe = value
+        
+    def update_enable_lighting(self, value):
+        self.enable_lighting = value
+        self.need_update_setting = True
+        
+    def update_line_width(self, value):
+        self.line_width = value
+        self.need_update_setting = True
+        
+    def update_ambient_strength(self, value):
+        self.ambient_strength = value
+        self.need_update_setting = True
+        
+    def update_diffuse_strength(self, value):
+        self.diffuse_strength = value
+        self.need_update_setting = True
+        
+    def update_specular_strength(self, value):
+        self.specular_strength = value
+        self.need_update_setting = True
+        
+    def update_shininess(self, value):
+        self.shininess = value
+        self.need_update_setting = True
+
+    def update_alpha(self, value):
+        """Update mesh alpha (opacity)"""
+        self.alpha = float(value)
+        self.need_update_setting = True
+
+    def set_data(self, data):
+        """
+        Set complete mesh data at once.
+        
+        Args:
+            data: Nx9 numpy array where N is the number of triangles
+                  Each row: [v0.x, v0.y, v0.z, v1.x, v1.y, v1.z, v2.x, v2.y, v2.z]
+        """
+        print("Setting static mesh data with {} triangles".format(len(data)))
+        if not isinstance(data, np.ndarray):
+            raise ValueError("Data must be a numpy array")
+
+        # Check shape
+        if data.ndim != 2 or data.shape[1] != 9:
+            # Try to reshape if it's Nx3 (vertex list)
+            if data.ndim == 2 and data.shape[1] == 3 and data.shape[0] % 3 == 0:
+                data = data.reshape(-1, 9)
+            else:
+                raise ValueError(f"Invalid data shape {data.shape}. Expected Nx9 or (N*3)x3")
+
+        self.vertices = data.astype(np.float32)
+        self.num_triangles = len(self.vertices)
+        self.need_update_buffer = True
+
+    def clear_mesh(self):
+        """Clear all mesh data"""
+        self.vertices = None
+        self.num_triangles = 0
+        self.need_update_buffer = True
+
+    def initialize_gl(self):
+        """OpenGL initialization - load triangle shader"""
+        frag_shader = open(self.path + '/../shaders/mesh_frag.glsl', 'r').read()
+        
+        try:
+            vert_shader = open(self.path + '/../shaders/triangle_mesh_vert.glsl', 'r').read()
+            geom_shader = open(self.path + '/../shaders/triangle_mesh_geom.glsl', 'r').read()
+            self.program = shaders.compileProgram(
+                shaders.compileShader(vert_shader, GL_VERTEX_SHADER),
+                shaders.compileShader(geom_shader, GL_GEOMETRY_SHADER),
+                shaders.compileShader(frag_shader, GL_FRAGMENT_SHADER),
+            )
+        except Exception as e:
+            print(f"Error compiling static mesh shader: {e}")
+            raise
+
+    def update_render_buffer(self):
+        """
+        Update GPU buffer with triangle data.
+        Each triangle: 9 floats (3 vertices x 3 coordinates)
+        """
+        if self.num_triangles == 0 or self.vertices is None:
+            return
+        
+        # Initialize buffers on first call
+        if self.vao is None:
+            self.vao = glGenVertexArrays(1)
+            self.vbo = glGenBuffers(1)
+        
+        if not self.need_update_buffer:
+            return
+            
+        glBindVertexArray(self.vao)
+        glBindBuffer(GL_ARRAY_BUFFER, self.vbo)
+        
+        # Upload all triangle data
+        glBufferData(GL_ARRAY_BUFFER,
+                    self.vertices.nbytes,
+                    self.vertices,
+                    GL_STATIC_DRAW)
+        
+        # Setup vertex attributes
+        # Triangle: [v0.x, v0.y, v0.z, v1.x, v1.y, v1.z, v2.x, v2.y, v2.z]
+        # 9 floats = 36 bytes stride
+        stride = 36
+        
+        # v0 (location 1) - vec3
+        glEnableVertexAttribArray(1)
+        glVertexAttribPointer(1, 3, GL_FLOAT, GL_FALSE, stride, ctypes.c_void_p(0))
+        glVertexAttribDivisor(1, 1)
+        
+        # v1 (location 2) - vec3
+        glEnableVertexAttribArray(2)
+        glVertexAttribPointer(2, 3, GL_FLOAT, GL_FALSE, stride, ctypes.c_void_p(12))
+        glVertexAttribDivisor(2, 1)
+        
+        # v2 (location 3) - vec3
+        glEnableVertexAttribArray(3)
+        glVertexAttribPointer(3, 3, GL_FLOAT, GL_FALSE, stride, ctypes.c_void_p(24))
+        glVertexAttribDivisor(3, 1)
+        
+        glBindVertexArray(0)
+        glBindBuffer(GL_ARRAY_BUFFER, 0)
+        self.need_update_buffer = False
+        
+    def update_setting(self):
+        """Set rendering parameters"""
+        if not self.need_update_setting:
+            return
+        
+        set_uniform(self.program, int(self.enable_lighting), 'if_light')
+        set_uniform(self.program, 1, 'two_sided')
+        set_uniform(self.program, np.array(self.light_color, dtype=np.float32), 'light_color')
+        set_uniform(self.program, float(self.ambient_strength), 'ambient_strength')
+        set_uniform(self.program, float(self.diffuse_strength), 'diffuse_strength')
+        set_uniform(self.program, float(self.specular_strength), 'specular_strength')
+        set_uniform(self.program, float(self.shininess), 'shininess')
+        set_uniform(self.program, float(self.alpha), 'alpha')
+        set_uniform(self.program, int(self.flat_rgb), 'flat_rgb')
+        self.need_update_setting = False
+
+    def paint(self):
+        """
+        Render the static mesh using instanced rendering with geometry shader.
+        Each triangle instance is rendered as a point, geometry shader generates 1 triangle.
+        """
+        if self.num_triangles == 0 or self.vertices is None:
+            return
+        
+        glUseProgram(self.program)
+    
+        self.update_render_buffer()
+        self.update_setting()
+        
+        view_matrix = self.glwidget().view_matrix
+        set_uniform(self.program, view_matrix, 'view')
+        project_matrix = self.glwidget().projection_matrix
+        set_uniform(self.program, project_matrix, 'projection')
+        view_pos = self.glwidget().center
+        set_uniform(self.program, np.array(view_pos), 'view_pos')
+            
+        # Enable blending and depth testing
+        glEnable(GL_BLEND)
+        glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA)
+        glEnable(GL_DEPTH_TEST)
+        glDisable(GL_CULL_FACE)  # two-sided rendering
+        
+        # Set line width
+        glLineWidth(self.line_width)
+        
+        # Bind VAO
+        glBindVertexArray(self.vao)
+                
+        if self.wireframe:
+            glPolygonMode(GL_FRONT_AND_BACK, GL_LINE)
+        else:
+            glPolygonMode(GL_FRONT_AND_BACK, GL_FILL)
+        
+        # Draw using instanced rendering
+        # Input: POINTS (one per triangle instance)
+        # Geometry shader generates 1 triangle (3 vertices) per point
+        glDrawArraysInstanced(GL_POINTS, 0, 1, self.num_triangles)
+            
+        glPolygonMode(GL_FRONT_AND_BACK, GL_FILL)
+        glBindVertexArray(0)
+        glDisable(GL_DEPTH_TEST)
+        glDisable(GL_BLEND)
+        glUseProgram(0)

q3dviewer/shaders/triangle_mesh_geom.glsl

@@ -0,0 +1,66 @@
+#version 430 core
+
+/*
+Copyright 2024 Panasonic Advanced Technology Development Co.,Ltd. (Liu Yang)
+Distributed under MIT license. See LICENSE for more information.
+*/
+
+layout(points) in;
+layout(triangle_strip, max_vertices = 3) out;
+
+// Input from vertex shader
+in VS_OUT {
+    vec3 v0, v1, v2;
+} gs_in[];
+
+// Uniforms
+uniform mat4 view;
+uniform mat4 projection;
+
+uniform int flat_rgb;
+
+// Output to fragment shader
+out vec3 FragPos;
+out vec3 Normal;
+out vec3 objectColor;
+
+// Calculate normal from three vertices
+vec3 calculateNormal(vec3 a, vec3 b, vec3 c) {
+    vec3 edge1 = b - a;
+    vec3 edge2 = c - a;
+    return normalize(cross(edge1, edge2));
+}
+
+void emitVertex(vec3 pos, vec3 normal, vec3 color) {
+    FragPos = pos;
+    Normal = normal;
+    objectColor = color;
+    gl_Position = projection * view * vec4(pos, 1.0);
+    EmitVertex();
+}
+
+void main()
+{
+    vec3 v0 = gs_in[0].v0;
+    vec3 v1 = gs_in[0].v1;
+    vec3 v2 = gs_in[0].v2;
+    
+    float eps = 0.0001;
+    
+    // Use color from uniform
+    vec3 color = vec3(
+        float((uint(flat_rgb) & uint(0x00FF0000)) >> 16)/255.,
+        float((uint(flat_rgb) & uint(0x0000FF00)) >> 8)/255.,
+        float( uint(flat_rgb) & uint(0x000000FF))/255.
+    );
+    
+    // Triangle: (v0, v1, v2)
+    vec3 normal = calculateNormal(v0, v1, v2);
+    // Skip degenerate triangles
+    if (length(normal) > eps) {
+        emitVertex(v0, normal, color);
+        emitVertex(v1, normal, color);
+        emitVertex(v2, normal, color);
+        EndPrimitive();
+    }
+}

q3dviewer/shaders/triangle_mesh_vert.glsl

@@ -0,0 +1,31 @@
+#version 430 core
+
+/*
+Copyright 2024 Panasonic Advanced Technology Development Co.,Ltd. (Liu Yang)
+Distributed under MIT license. See LICENSE for more information.
+*/
+
+// Triangle face attributes (per-instance) - 3 vertex positions
+layout(location = 1) in vec3 v0;
+layout(location = 2) in vec3 v1;
+layout(location = 3) in vec3 v2;
+
+// Uniforms
+uniform mat4 view;
+uniform mat4 projection;
+
+// Outputs to fragment shader (via geometry shader)
+out VS_OUT {
+    vec3 v0, v1, v2;
+} vs_out;
+
+void main()
+{
+    // Pass vertex positions directly (no SSBO lookup needed)
+    vs_out.v0 = v0;
+    vs_out.v1 = v1;
+    vs_out.v2 = v2;
+    
+    // Output dummy point (geometry shader will generate triangles)
+    gl_Position = vec4(0.0, 0.0, 0.0, 1.0);
+}

q3dviewer/tools/cloud_viewer.py

@@ -10,6 +10,7 @@ import q3dviewer as q3d
 from q3dviewer.Qt.QtWidgets import QVBoxLayout, QDialog, QLabel
 from q3dviewer.Qt.QtCore import QThread, Signal, Qt
 from q3dviewer import GLWidget
+from q3dviewer.utils.helpers import get_version
 
 class ProgressWindow(QDialog):
     def __init__(self, parent=None):
@@ -186,7 +187,7 @@ def print_help():
     
     # Print title and table without border
     console.print()
-    console.print("[bold magenta]☁️  Cloud Viewer Help[/bold magenta]\n")
+    console.print(f"[bold magenta]☁️  Cloud Viewer ({get_version()}) Help[/bold magenta]\n")
     console.print(table)
     console.print()
 
@@ -205,7 +206,7 @@ def main():
     marker_item = q3d.Text3DItem()  # Changed from CloudItem to Text3DItem
     text_item = q3d.Text2DItem(pos=(20, 40), text="", color='lime', size=16)
     text_item.disable_setting()
-    mesh_item = q3d.MeshItem()  # Added MeshIOItem for mesh support
+    mesh_item = q3d.StaticMeshItem()
 
     viewer.add_items(
         {'marker': marker_item, 

q3dviewer/tools/film_maker.py

@@ -12,7 +12,7 @@ from q3dviewer.Qt.QtCore import QTimer
 from q3dviewer.Qt.QtGui import QKeyEvent
 from q3dviewer.Qt import QtCore
 from q3dviewer import GLWidget
-from q3dviewer.tools.cloud_viewer import ProgressDialog, FileLoaderThread
+from q3dviewer.tools.cloud_viewer import FileLoaderThread, ProgressWindow
 
 import imageio.v2 as imageio
 import os
@@ -386,20 +386,19 @@ class CMMViewer(q3d.Viewer):
         """
         Overwrite the drop event to open the cloud file.
         """
-        self.progress_dialog = ProgressDialog(self)
-        self.progress_dialog.show()
+        self.progress_window = ProgressWindow(self)
+        self.progress_window.show()
         files = event.mimeData().urls()
         self.progress_thread = FileLoaderThread(self, files)
-        self['cloud'].load(files[0].toLocalFile(), append=False)
         self.progress_thread.progress.connect(self.file_loading_progress)
         self.progress_thread.finished.connect(self.file_loading_finished)
         self.progress_thread.start()
 
-    def file_loading_progress(self, value):
-        self.progress_dialog.set_value(value)
+    def file_loading_progress(self, current, total, file_name):
+        self.progress_window.update_progress(current, total, file_name)
 
     def file_loading_finished(self):
-        self.progress_dialog.close()
+        self.progress_window.close()
 
     def open_cloud_file(self, file, append=False):
         cloud_item = self['cloud']
@@ -417,7 +416,7 @@ def main():
     args = parser.parse_args()
     app = q3d.QApplication(['Film Maker'])
     viewer = CMMViewer(name='Film Maker', update_interval=30)
-    cloud_item = q3d.CloudIOItem(size=1, point_type='SPHERE', alpha=0.5, depth_test=True)
+    cloud_item = q3d.CloudIOItem(size=1, point_type='SPHERE', alpha=0.5)
     grid_item = q3d.GridItem(size=1000, spacing=20)
 
     viewer.add_items(

q3dviewer/utils/helpers.py

@@ -7,6 +7,18 @@ import numpy as np
 from OpenGL.GL import *
 
 
+def get_version():
+    """
+    Get the version of q3dviewer package.
+    """
+    try:
+        from importlib.metadata import version
+        return version('q3dviewer')
+    except Exception:
+        # Fallback if package is not installed
+        return 'unknown'
+
+
 def rainbow(scalars, scalar_min=0, scalar_max=255):
     range = scalar_max - scalar_min
     values = 1.0 - (scalars - scalar_min) / range

{q3dviewer-1.2.3.dist-info → q3dviewer-1.2.4.dist-info}/METADATA

@@ -1,10 +1,11 @@
 Metadata-Version: 2.1
 Name: q3dviewer
-Version: 1.2.3
+Version: 1.2.4
 Summary: A library designed for quickly deploying a 3D viewer.
 Home-page: https://github.com/scomup/q3dviewer
 Author: Liu Yang
-License: UNKNOWN
+Author-email: liu.yang@jp.panasonic.com
+License: MIT
 Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
@@ -74,22 +75,34 @@ python3 -m q3dviewer.tools.cloud_viewer
 ```
 
 **Basic Operations**
-* Load files: Drag and drop point cloud files onto the window (multiple files are OK).
-* `M` key: Display the visualization settings screen for point clouds, background color, etc.
-* `Left mouse button` & `W, A, S, D` keys: Move the viewpoint on the horizontal plane.
-* `Z, X` keys: Move in the direction the screen is facing.
-* `Right mouse button` & `Arrow` keys: Rotate the viewpoint while keeping the screen center unchanged.
-* `Shift` + `Right mouse button` & `Arrow` keys: Rotate the viewpoint while keeping the camera position unchanged.
+
+📁 **Load Files** - Drag and drop files into the viewer
+* Point clouds: .pcd, .ply, .las, .e57
+* Mesh files: .stl
+
+📏 **Measure Distance** - Interactive point measurement
+* `Ctrl + Left Click`: Add measurement point
+* `Ctrl + Right Click`: Remove last point
+* Total distance displayed automatically
+
+🎥 **Camera Controls** - Navigate the 3D scene
+* `Double Click`: Set camera center to point
+* `Right Drag`: Rotate view
+* `Left Drag`: Pan view
+* `Mouse Wheel`: Zoom in/out
+
+⚙️ **Settings** - Press `M` to open settings window
+* Adjust visualization properties
 
 For example, you can download and view point clouds of Tokyo in LAS format from the following link:
 
 [Tokyo Point Clouds](https://www.geospatial.jp/ckan/dataset/tokyopc-23ku-2024/resource/7807d6d1-29f3-4b36-b0c8-f7aa0ea2cff3)
 
-![Cloud Viewer Screenshot](https://qiita-image-store.s3.ap-northeast-1.amazonaws.com/0/149168/03c981c6-1aec-e5b9-4536-e07e1e56ff29.png)
+![Cloud Viewer Screenshot](imgs/tokyo.png)
 
-Press `M` on your keyboard to display a menu on the screen, where you can modify visualization settings for each item. For example, you can adjust various settings such as shape, size, color, and transparency for `CloudItem`.
+**Mesh Support** - Starting from version 1.2.4, mesh files (.stl) are now supported.
 
-![Cloud Viewer Settings](https://qiita-image-store.s3.ap-northeast-1.amazonaws.com/0/149168/deeb996a-e419-58f4-6bc2-535099b1b73a.png)
+![Screenshot from 2026-02-04 18-32-04.png](imgs/mesh.png)
 
 ### 2. ROS Viewer
 

{q3dviewer-1.2.3.dist-info → q3dviewer-1.2.4.dist-info}/RECORD

@@ -1,10 +1,10 @@
-q3dviewer/__init__.py,sha256=cjyfUE5zK6xohDGDQIWfb0DKkWChVznBd7CrVLg7whQ,376
+q3dviewer/__init__.py,sha256=Nz48lhIxsGYMLvhOLQT0AXhn6d64wA4hdIz4d0qsVLc,172
 q3dviewer/base_glwidget.py,sha256=QxAuZzQSBbzTwpHHqYpiM-Jqv41E4YJmFG4KRF-HruY,15274
 q3dviewer/base_item.py,sha256=63MarHyoWszPL40ox-vPoOAQ1N4ypekOjoRARdPik-E,1755
 q3dviewer/glwidget.py,sha256=taewDTQUqmKOrDYz_ygghu00dlCnWzFRpDnEaTG25pA,6390
 q3dviewer/viewer.py,sha256=Vq3ucDlBcBBoiVVGmqG1sRjhLePl50heblx6wJpsc1A,2603
 q3dviewer/Qt/__init__.py,sha256=VJj7Ge6N_81__T9eHFl_YQpa1HyQrlLhMqC_9pUOYtc,2233
-q3dviewer/custom_items/__init__.py,sha256=kaaf84wOObfybJ8a12FqPMeg8ImTJWggA6g5nvpY2YY,621
+q3dviewer/custom_items/__init__.py,sha256=BXZzyOnwwB81pthx39n6issyroaxUxpCJPeW2U-TaWU,689
 q3dviewer/custom_items/axis_item.py,sha256=-WM2urosqV847zpTpOtxdLjb7y9NJqFCH13qqodcCTg,2572
 q3dviewer/custom_items/cloud_io_item.py,sha256=Haz-SOUUCPDSHgmKyyyFfP7LXBSEiN4r8xmchQwCm-k,4721
 q3dviewer/custom_items/cloud_item.py,sha256=UzpkWiMYcX8kEndmRV1ScysFfOvElaKo60KV-uEO2A4,13484
@@ -13,7 +13,8 @@ q3dviewer/custom_items/gaussian_item.py,sha256=JMubpahkTPh0E8ShL3FLTahv0e35ODzjg
 q3dviewer/custom_items/grid_item.py,sha256=LDB_MYACoxld-xvz01_MfAf12vLcRkH7R_WtGHHdSgk,4945
 q3dviewer/custom_items/image_item.py,sha256=k7HNTqdL2ckTbxMx7A7eKaP4aksZ85-pBjNdbpm6PXM,5355
 q3dviewer/custom_items/line_item.py,sha256=rel-lx8AgjDY7qyIecHxHQZzaswRn2ZTiOIjB_0Mrqo,4444
-q3dviewer/custom_items/mesh_item.py,sha256=L6GzCcxiAkeYMLBUbbTvQgY0s-maCYQZqZqeMDtxuFE,17568
+q3dviewer/custom_items/mesh_item.py,sha256=L8-EoiJMH8lXmSdLOFYQSF9biODzSC616AMY6KgVGMk,19807
+q3dviewer/custom_items/static_mesh_item.py,sha256=MQwlEMuYX0wB5odmeiw1nsBhciWs1jcauUvcWRDVj4Q,12882
 q3dviewer/custom_items/text3d_item.py,sha256=DYBPXnCmMEzWDE1y523YsWSl91taXAdu0kdnhUcwE4A,5524
 q3dviewer/custom_items/text_item.py,sha256=toeGjBu7RtT8CMUuaDWnmXPnA1UKHhnCzUNeonGczSo,2703
 q3dviewer/shaders/cloud_frag.glsl,sha256=psKVt9qI6BW0bCqOk4lcKqUd6XgYGtdFigyN9OdYSNI,609
@@ -25,10 +26,12 @@ q3dviewer/shaders/mesh_frag.glsl,sha256=i9ljnO2kjLNGaR1TPQIK4-4iJ-JppJ5bCsOHg173
 q3dviewer/shaders/mesh_geom.glsl,sha256=HwNEZy7UAQm-PKEP-LnqHTlsSqZ5eqm49CYZSVylzXk,1964
 q3dviewer/shaders/mesh_vert.glsl,sha256=bFg7HXesdVg7UaGDuZ4g7IpRdSKcfc6jzTcxLjNXkt8,968
 q3dviewer/shaders/sort_by_key.glsl,sha256=M5RK6uRDp40vVH6XtBIrdJTcYatqXyZwd6kCzEa2DZg,1097
+q3dviewer/shaders/triangle_mesh_geom.glsl,sha256=Uu9WUVbObAUBrtWamQ3trXbmi-Yn9HKWIJPICdjHv_4,1513
+q3dviewer/shaders/triangle_mesh_vert.glsl,sha256=-VTbZ3zZpDI1krMXp7dY0Dz198XqEu7v6lJttO5jQZo,741
 q3dviewer/tools/__init__.py,sha256=01wG7BGM6VX0QyFBKsqPmyf2e-vrmV_N3-mo-VQ1VBg,20
-q3dviewer/tools/cloud_viewer.py,sha256=wjgQNrn9IzHXd8V2Y45ANm12_YZRaV3uL7F8HkylrN0,8185
+q3dviewer/tools/cloud_viewer.py,sha256=94RABpCIn8sATw7I0l7f-Za1j8ulw2io2GICZ7yDRos,8221
 q3dviewer/tools/example_viewer.py,sha256=C867mLnCBjawS6LGgRsJ_c6-6wztfL9vOBQt85KbbdU,572
-q3dviewer/tools/film_maker.py,sha256=xLFgRhFWoMQ37qlvcu1lXWaTWXMNRYlRcZFfHW5JtmQ,16676
+q3dviewer/tools/film_maker.py,sha256=v5En1rm8CS4I7J1mdtvy6AXrkGGOXuDxfvTBuvnLPMs,16640
 q3dviewer/tools/gaussian_viewer.py,sha256=vIwWmiFhjNmknrEkBLzt2yiegeH7LP3OeNjnGM6GzaI,1633
 q3dviewer/tools/lidar_calib.py,sha256=hHnsSaQh_Pkdh8tPntt0MgEW26nQyAdC_HQHq4I3sw8,10562
 q3dviewer/tools/lidar_cam_calib.py,sha256=4CDcZZiFZDeKo2Y2_lXF9tfbiF9dPsz0OjppQdxQsU4,11430
@@ -37,12 +40,12 @@ q3dviewer/utils/__init__.py,sha256=dwTNAAebTiKY4ygv2G1O-w6-TbJnmnNVO2UfJXvJhaQ,1
 q3dviewer/utils/cloud_io.py,sha256=OLmVQWbrnGrlZHPz3zdoVn79r50JhM6V0zV-KwogEU8,13732
 q3dviewer/utils/convert_ros_msg.py,sha256=lNbLIawJfwp3VzygdW3dUXkfSG8atg_CoZbQFmt8H70,3142
 q3dviewer/utils/gl_helper.py,sha256=dRY_kUqyPMr7NTcupUr6_VTvgnj53iE2C0Lk0-oFYsI,1435
-q3dviewer/utils/helpers.py,sha256=SqR4YTQZi13FKbkVUYgodXce1JJ_YmrHEIRkUmnIUas,3085
+q3dviewer/utils/helpers.py,sha256=LMKm7R1OvBLoigxqTNN9pS1UlTw0865SFnMY7_IbgX8,3350
 q3dviewer/utils/maths.py,sha256=zHaPtvVZIuo8xepIXCMeSL9tpx8FahUrq0l4K1oXrBk,8834
 q3dviewer/utils/range_slider.py,sha256=Cs_xrwt6FCDVxGxan7r-ARd5ySwQ50xnCzcmz0dB_X0,4215
-q3dviewer-1.2.3.dist-info/LICENSE,sha256=81cMOyNfw8KLb1JnPYngGHJ5W83gSbZEBU9MEP3tl-E,1124
-q3dviewer-1.2.3.dist-info/METADATA,sha256=JjSE7g9HjmxRfl18Z79_EA90drP_EKhBVWuiMYk7yNM,8024
-q3dviewer-1.2.3.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
-q3dviewer-1.2.3.dist-info/entry_points.txt,sha256=EOjker7XYaBk70ffvNB_knPcfA33Bnlg21ZjEeM1EyI,362
-q3dviewer-1.2.3.dist-info/top_level.txt,sha256=HFFDCbGu28txcGe2HPc46A7EPaguBa_b5oH7bufmxHM,10
-q3dviewer-1.2.3.dist-info/RECORD,,
+q3dviewer-1.2.4.dist-info/LICENSE,sha256=81cMOyNfw8KLb1JnPYngGHJ5W83gSbZEBU9MEP3tl-E,1124
+q3dviewer-1.2.4.dist-info/METADATA,sha256=C89drDXpYSfUoEd_x005QqHp7Moc-ziC0vuo1XkWSu0,7776
+q3dviewer-1.2.4.dist-info/WHEEL,sha256=tZoeGjtWxWRfdplE7E3d45VPlLNQnvbKiYnx7gwAy8A,92
+q3dviewer-1.2.4.dist-info/entry_points.txt,sha256=EOjker7XYaBk70ffvNB_knPcfA33Bnlg21ZjEeM1EyI,362
+q3dviewer-1.2.4.dist-info/top_level.txt,sha256=HFFDCbGu28txcGe2HPc46A7EPaguBa_b5oH7bufmxHM,10
+q3dviewer-1.2.4.dist-info/RECORD,,