ansys-pyensight-core 0.9.0__py3-none-any.whl → 0.9.2__py3-none-any.whl

ansys/pyensight/core/utils/omniverse_glb_server.py

@@ -132,40 +132,41 @@ class GLBSession(dsg_server.DSGSession):
         """
         mesh = self._gltf.meshes[meshid]
         for prim_idx, prim in enumerate(mesh.primitives):
-            # POINTS, LINES, LINE_LOOP, LINE_STRIP, TRIANGLES, TRIANGLE_STRIP, TRIANGLE_FAN
+            # POINTS, LINES, TRIANGLES, LINE_LOOP, LINE_STRIP, TRIANGLE_STRIP, TRIANGLE_FAN
             mode = prim.mode
-            if mode not in (pygltflib.TRIANGLES, pygltflib.LINES, pygltflib.POINTS):
-                self.warn(
-                    f"Unhandled connectivity {mode}. Currently only TRIANGLE and LINE connectivity is supported."
-                )
+            if mode not in (
+                pygltflib.TRIANGLES,
+                pygltflib.LINES,
+                pygltflib.POINTS,
+                pygltflib.LINE_LOOP,
+                pygltflib.LINE_STRIP,
+                pygltflib.TRIANGLE_STRIP,
+                pygltflib.TRIANGLE_FAN,
+            ):
+                self.warn(f"Unhandled connectivity detected: {mode}.  Geometry skipped.")
                 continue
             glb_materialid = prim.material
+            line_width = self._callback_handler._omni.line_width
 
             # GLB Prim -> DSG Part
             part_name = f"{parentname}_prim{prim_idx}_"
             cmd, part_pb = self._create_pb("PART", parent_id=parentid, name=part_name)
-            part_pb.render = dynamic_scene_graph_pb2.UpdatePart.RenderingMode.CONNECTIVITY
+            if mode == pygltflib.POINTS:
+                part_pb.render = dynamic_scene_graph_pb2.UpdatePart.RenderingMode.NODES
+                part_pb.node_size_default = line_width
+            else:
+                part_pb.render = dynamic_scene_graph_pb2.UpdatePart.RenderingMode.CONNECTIVITY
             part_pb.shading = dynamic_scene_graph_pb2.UpdatePart.ShadingMode.NODAL
             self._map_material(glb_materialid, part_pb)
             part_dsg_id = part_pb.id
             self._handle_update_command(cmd)
 
             # GLB Attributes -> DSG Geom
-            conn = self._get_data(prim.indices, 0)
-            cmd, conn_pb = self._create_pb("GEOM", parent_id=part_dsg_id)
-            if mode == pygltflib.TRIANGLES:
-                conn_pb.payload_type = dynamic_scene_graph_pb2.UpdateGeom.ArrayType.TRIANGLES
-            elif mode == pygltflib.LINES:
-                conn_pb.payload_type = dynamic_scene_graph_pb2.UpdateGeom.ArrayType.LINES
-            else:
-                conn_pb.payload_type = dynamic_scene_graph_pb2.UpdateGeom.ArrayType.POINTS
-            conn_pb.int_array.extend(conn)
-            conn_pb.chunk_offset = 0
-            conn_pb.total_array_size = len(conn)
-            self._handle_update_command(cmd)
-
+            # Verts
+            num_verts = 0
             if prim.attributes.POSITION is not None:
                 verts = self._get_data(prim.attributes.POSITION)
+                num_verts = len(verts) // 3
                 cmd, verts_pb = self._create_pb("GEOM", parent_id=part_dsg_id)
                 verts_pb.payload_type = dynamic_scene_graph_pb2.UpdateGeom.ArrayType.COORDINATES
                 verts_pb.flt_array.extend(verts)
@@ -173,6 +174,35 @@ class GLBSession(dsg_server.DSGSession):
                 verts_pb.total_array_size = len(verts)
                 self._handle_update_command(cmd)
 
+            # Connectivity
+            if num_verts and (mode != pygltflib.POINTS):
+                if prim.indices is not None:
+                    conn = self._get_data(prim.indices, 0)
+                else:
+                    conn = numpy.array(list(range(num_verts)), dtype=numpy.uint32)
+                cmd, conn_pb = self._create_pb("GEOM", parent_id=part_dsg_id)
+                if mode == pygltflib.TRIANGLES:
+                    conn_pb.payload_type = dynamic_scene_graph_pb2.UpdateGeom.ArrayType.TRIANGLES
+                elif mode == pygltflib.TRIANGLE_STRIP:
+                    conn_pb.payload_type = dynamic_scene_graph_pb2.UpdateGeom.ArrayType.TRIANGLES
+                    conn = self._tri_strip_to_tris(conn)
+                elif mode == pygltflib.TRIANGLE_FAN:
+                    conn_pb.payload_type = dynamic_scene_graph_pb2.UpdateGeom.ArrayType.TRIANGLES
+                    conn = self._tri_fan_to_tris(conn)
+                elif mode == pygltflib.LINES:
+                    conn_pb.payload_type = dynamic_scene_graph_pb2.UpdateGeom.ArrayType.LINES
+                elif mode == pygltflib.LINE_LOOP:
+                    conn_pb.payload_type = dynamic_scene_graph_pb2.UpdateGeom.ArrayType.LINES
+                    conn = self._line_loop_to_lines(conn)
+                elif mode == pygltflib.LINE_STRIP:
+                    conn_pb.payload_type = dynamic_scene_graph_pb2.UpdateGeom.ArrayType.LINES
+                    conn = self._line_strip_to_lines(conn)
+                conn_pb.int_array.extend(conn)
+                conn_pb.chunk_offset = 0
+                conn_pb.total_array_size = len(conn)
+                self._handle_update_command(cmd)
+
+            # Normals
             if prim.attributes.NORMAL is not None:
                 normals = self._get_data(prim.attributes.NORMAL)
                 cmd, normals_pb = self._create_pb("GEOM", parent_id=part_dsg_id)
@@ -182,6 +212,7 @@ class GLBSession(dsg_server.DSGSession):
                 normals_pb.total_array_size = len(normals)
                 self._handle_update_command(cmd)
 
+            # Texture coords
             if prim.attributes.TEXCOORD_0 is not None:
                 # Note: texture coords are stored as VEC2, so we get 2 components back
                 texcoords = self._get_data(prim.attributes.TEXCOORD_0, components=2)
@@ -199,6 +230,103 @@ class GLBSession(dsg_server.DSGSession):
                     texcoords_pb.variable_id = glb_varid
                 self._handle_update_command(cmd)
 
+    @staticmethod
+    def _tri_strip_to_tris(conn: numpy.ndarray) -> numpy.ndarray:
+        """
+        Convert GL_TRIANGLE_STRIP connectivity into GL_TRIANGLES
+
+        Parameters
+        ----------
+        conn: numpy.ndarray
+            The tri strip connectivity
+
+        Returns
+        -------
+        numpy.array:
+            Triangles connectivity
+        """
+        tris = []
+        swap = False
+        for i in range(len(conn) - 2):
+            tris.append(conn[i])
+            if swap:
+                tris.append(conn[i + 2])
+                tris.append(conn[i + 1])
+            else:
+                tris.append(conn[i + 1])
+                tris.append(conn[i + 2])
+            swap = not swap
+        return numpy.array(tris, dtype=conn.dtype)
+
+    @staticmethod
+    def _tri_fan_to_tris(conn: numpy.ndarray) -> numpy.ndarray:
+        """
+        Convert GL_TRIANGLE_FAN connectivity into GL_TRIANGLES
+
+        Parameters
+        ----------
+        conn: numpy.ndarray
+            The fan connectivity
+
+        Returns
+        -------
+        numpy.array:
+            Triangles connectivity
+        """
+        tris = []
+        for i in range(1, len(conn) - 1):
+            tris.append(conn[0])
+            tris.append(conn[i])
+            tris.append(conn[i + 1])
+        return numpy.array(tris, dtype=conn.dtype)
+
+    @staticmethod
+    def _line_strip_to_lines(conn) -> numpy.ndarray:
+        """
+        Convert GL_LINE_STRIP connectivity into GL_LINES
+
+        Parameters
+        ----------
+        conn: numpy.ndarray
+           The line strip connectivity
+
+        Returns
+        -------
+        numpy.array:
+           Lines connectivity
+        """
+        lines = []
+        num_nodes = len(conn)
+        for i in range(num_nodes - 1):
+            lines.append(conn[i])
+            lines.append(conn[i + 1])
+        return numpy.array(lines, dtype=conn.dtype)
+
+    @staticmethod
+    def _line_loop_to_lines(conn) -> numpy.ndarray:
+        """
+        Convert GL_LINE_LOOP connectivity into GL_LINES
+
+        Parameters
+        ----------
+        conn: numpy.ndarray
+           The line loop connectivity
+
+        Returns
+        -------
+        numpy.array:
+           Lines connectivity
+        """
+        lines = []
+        num_nodes = len(conn)
+        for i in range(num_nodes):
+            lines.append(conn[i])
+            if i + 1 == num_nodes:
+                lines.append(conn[0])
+            else:
+                lines.append(conn[i + 1])
+        return numpy.array(lines, dtype=conn.dtype)
+
     def _get_data(
         self,
         accessorid: int,
@@ -452,7 +580,16 @@ class GLBSession(dsg_server.DSGSession):
                         view_pb.fieldofview = camera.perspective.yfov
                         view_pb.aspectratio = camera.aspectratio.aspectRatio
                 self._handle_update_command(cmd)
-                for node_id in self._gltf.scenes[scene_idx].nodes:
+                # walk the scene nodes RJF
+                scene = self._gltf.scenes[scene_idx]
+                try:
+                    if self._callback_handler._omni.line_width == 0.0:
+                        width = float(scene.extensions["ANSYS_linewidth"]["linewidth"])
+                        self._callback_handler._omni.line_width = width
+                except (KeyError, ValueError):
+                    # in the case where the extension does not exist or is mal-formed
+                    pass
+                for node_id in scene.nodes:
                     self._walk_node(node_id, view_pb.id)
                 self._finish_part()
 
@@ -490,11 +627,22 @@ class GLBSession(dsg_server.DSGSession):
         List[float]
             The computed timeline.
         """
-        # if ANSYS_scene_time is used, time ranges will come from there
-        if "ANSYS_scene_time" in self._gltf.scenes[scene_idx].extensions:
-            return self._gltf.scenes[scene_idx].extensions["ANSYS_scene_time"]
-        # if there is only one scene, then use the input timeline
         num_scenes = len(self._gltf.scenes)
+        # if ANSYS_scene_timevalue is used, time ranges will come from there
+        try:
+            t0 = self._gltf.scenes[scene_idx].extensions["ANSYS_scene_timevalue"]["timevalue"]
+            idx = scene_idx + 1
+            if idx >= num_scenes:
+                idx = scene_idx
+                t1 = self._gltf.scenes[idx].extensions["ANSYS_scene_timevalue"]["timevalue"]
+            else:
+                t1 = t0
+            return [t0, t1]
+        except KeyError:
+            # If we fail due to dictionary key issue, the extension does not exist or is
+            # improperly formatted.
+            pass
+        # if there is only one scene, then use the input timeline
         if num_scenes == 1:
             return input_timeline
         # if the timeline has zero length, we make it the number of scenes

{ansys_pyensight_core-0.9.0.dist-info → ansys_pyensight_core-0.9.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ansys-pyensight-core
-Version: 0.9.0
+Version: 0.9.2
 Summary: A python wrapper for Ansys EnSight
 Author-email: "ANSYS, Inc." <pyansys.core@ansys.com>
 Maintainer-email: "ANSYS, Inc." <pyansys.core@ansys.com>
@@ -20,7 +20,7 @@ Requires-Dist: ansys-api-pyensight==0.4.2
 Requires-Dist: requests>=2.28.2
 Requires-Dist: docker>=6.1.0
 Requires-Dist: urllib3<3.0.0
-Requires-Dist: numpy>=1.21.0,<2
+Requires-Dist: numpy>=1.21.0,<3
 Requires-Dist: Pillow>=9.3.0
 Requires-Dist: pypng>=0.0.20
 Requires-Dist: psutil>=5.9.2

{ansys_pyensight_core-0.9.0.dist-info → ansys_pyensight_core-0.9.2.dist-info}/RECORD

@@ -4,7 +4,7 @@ ansys/pyensight/core/deep_pixel_view.html,sha256=6u4mGOuzJiPze8N8pIKJsEGPv5y6-zb
 ansys/pyensight/core/dockerlauncher.py,sha256=LmgEFEjl0l3D_JaeJu5bbGR28aluHYtzb0-BmrC7ta8,28251
 ansys/pyensight/core/enscontext.py,sha256=GSKkjZt1QEPyHEQ59EEBgKGMik9vjCdR9coR4uX7fEw,12141
 ansys/pyensight/core/enshell_grpc.py,sha256=-OxSdFI_p3DmQnqh1jT_a_aSh_w-EUD2IaWGKxrnyjI,17122
-ansys/pyensight/core/ensight_grpc.py,sha256=0_qv9gUQsWyRSGGtTW84PNNEVegtsCPrnT6oXix-hvc,16415
+ansys/pyensight/core/ensight_grpc.py,sha256=IkntqzHmNzhADZ1VZJtWGpaB3ZlSThcovsbXyliW_Sk,29458
 ansys/pyensight/core/ensobj.py,sha256=uDtM2KHcAwd4hu5pcUYWbSD729ApHGIvuqZhEq8PxTI,18558
 ansys/pyensight/core/launch_ensight.py,sha256=iZJM6GdpzGRDLzrv1V2QZ5veIOpNSB5xPpJUFY7rBuo,10254
 ansys/pyensight/core/launcher.py,sha256=ymwfixwoHO7_c4qOetqccQbZjGT1HjeA7jwPi2JxlmE,10585
@@ -12,17 +12,17 @@ ansys/pyensight/core/libuserd.py,sha256=JIORrVqmbjsqnT9O-FUPwq1B1-Jt-lmDKaPkrrtV
 ansys/pyensight/core/listobj.py,sha256=Trw87IxIMXtmUd1DzywRmMzORU704AG4scX4fqYmO6M,9340
 ansys/pyensight/core/locallauncher.py,sha256=ot05X0vj-xDqNSx-2A_RDBBuN9Fyk2dONjkkD9gtVyM,16264
 ansys/pyensight/core/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ansys/pyensight/core/renderable.py,sha256=YhPfqjvTlJXn9BB4ctJXRwTfs0Yol8JLgOU9XQt5AC0,36203
-ansys/pyensight/core/session.py,sha256=T0zPiBmOMroBYhsw4Byf4Y-fKxJX_LhnI6DOzm1hat0,72767
+ansys/pyensight/core/renderable.py,sha256=KidVTVCZ4hKYq54pP9KoJ8OCxeWBXNUJYyKSwMZ2Sls,36362
+ansys/pyensight/core/session.py,sha256=gNWuihZEjmPcnEE5t7CXdK53e2Ah8MgdI5Tb3yE6CpQ,72876
 ansys/pyensight/core/sgeo_poll.html,sha256=1M4BIc5CZpYA3b40qzk22NcPCLhjFnWdoS2PrS6Rhn4,752
 ansys/pyensight/core/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ansys/pyensight/core/utils/adr.py,sha256=XslZhlwcrSGzOlnhzprOv3ju_ppxxsWBjCnQL5KiNms,3570
-ansys/pyensight/core/utils/dsg_server.py,sha256=RjUuGGgKfm1umJcItLjCYeTgx3BlSM5PmJ_9zW9G5ZI,44232
+ansys/pyensight/core/utils/dsg_server.py,sha256=FfiTJ7XsTW3OhI2w7PKMX5SLVoznGgZ6In-Q_wpkggE,45017
 ansys/pyensight/core/utils/export.py,sha256=UAJQcrElo3esQD0CWdxxjMQ8yE1vB4cdAhF33_uZfQw,22605
-ansys/pyensight/core/utils/omniverse.py,sha256=EAQnS_bapR2owEGa4X3hcyqpzGEnUf734nhW3WeglpY,13888
-ansys/pyensight/core/utils/omniverse_cli.py,sha256=m5TgxHxDVVSqEY4kGss0OwV-aYHDVX076JPwKlx1fp0,20042
-ansys/pyensight/core/utils/omniverse_dsg_server.py,sha256=gW9uQfHmuSYS9VrwI6jkn6BxIfu3MoxUbK7QlN6Cuec,35482
-ansys/pyensight/core/utils/omniverse_glb_server.py,sha256=FlftOS-MFCFlFyIFGe8o7dpHASPRjc37f_KJtDto7ss,24921
+ansys/pyensight/core/utils/omniverse.py,sha256=Y16_nXjfymnXpJmddAkqNnVCWGr8RTjHqA6JSNz8GA8,18483
+ansys/pyensight/core/utils/omniverse_cli.py,sha256=aVYu4HsSZBl7A9_xU3DfItNB-hpxCdMPXm_oMAOU_HQ,20261
+ansys/pyensight/core/utils/omniverse_dsg_server.py,sha256=Bnc99LU2216Dk2t8v0rVNH8sJm8pQiYwqkcH1N5zTvE,38384
+ansys/pyensight/core/utils/omniverse_glb_server.py,sha256=gP6NEmrmqB1ALFGGLkNwnIhn7JWHylRvyIb8JbXrbmA,29879
 ansys/pyensight/core/utils/parts.py,sha256=222XFRCjLgH7hho-cK9JrGCg3-KlTf54KIgc7y50sTE,52173
 ansys/pyensight/core/utils/query.py,sha256=OXKDbf1sOTX0sUvtKcp64LhVl-BcrEsE43w8uMxLOYI,19828
 ansys/pyensight/core/utils/readers.py,sha256=cNNzrE5pjy4wpQKWAzIIJfJCSpY3HU43az02f5I3pVU,11968
@@ -30,7 +30,7 @@ ansys/pyensight/core/utils/support.py,sha256=QI3z9ex7zJxjFbkCPba9DWqWgPFIThORqr0
 ansys/pyensight/core/utils/variables.py,sha256=ZUiJdDIeRcowrnLXaJQqGwA0RbrfXhc1s4o4v9A4PiY,95133
 ansys/pyensight/core/utils/views.py,sha256=ZKhJ6vMT7Rdd4bwJ0egMYTV7-D7Q7I19fF2_j_CMQ0o,12489
 ansys/pyensight/core/utils/resources/Materials/000_sky.exr,sha256=xAR1gFd2uxPZDnvgfegdhEhRaqKtZldQDiR_-1rHKO0,8819933
-ansys_pyensight_core-0.9.0.dist-info/LICENSE,sha256=qQWivZ12ETN5l3QxvTARY-QI5eoRRlyHdwLlAj0Bg5I,1089
-ansys_pyensight_core-0.9.0.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
-ansys_pyensight_core-0.9.0.dist-info/METADATA,sha256=sw7c3IaFUCrk7RHe3WyCrFjbmQF0Fjwymg4dus2PpWg,12113
-ansys_pyensight_core-0.9.0.dist-info/RECORD,,
+ansys_pyensight_core-0.9.2.dist-info/LICENSE,sha256=qQWivZ12ETN5l3QxvTARY-QI5eoRRlyHdwLlAj0Bg5I,1089
+ansys_pyensight_core-0.9.2.dist-info/WHEEL,sha256=CpUCUxeHQbRN5UGRQHYRJorO5Af-Qy_fHMctcQ8DSGI,82
+ansys_pyensight_core-0.9.2.dist-info/METADATA,sha256=KkO1m505t8Zbu76uwkfORfA33vR2HpHwyros1mwRFvs,12113
+ansys_pyensight_core-0.9.2.dist-info/RECORD,,