lavavu 1.8.76__cp311-cp311-win_amd64.whl → 1.8.79__cp311-cp311-win_amd64.whl

lavavu/html/webview.html

@@ -27,7 +27,7 @@
 
     <input id="fileinput" type="file" style="visibility:hidden" onchange="useFileInput(this)" />
 
-    <script async src="https://cdn.jsdelivr.net/gh/lavavu/lavavu.github.io@1.8.76/LavaVu-amalgamated.min.js"></script>
+    <script async src="https://cdn.jsdelivr.net/gh/lavavu/lavavu.github.io@1.8.79/LavaVu-amalgamated.min.js"></script>
     <!--script src="dat.gui.min.js"></script>
     <script src="OK-min.js"></script>
 

lavavu/lavavu.py

@@ -2319,29 +2319,29 @@ class _LavaVuWrapper(LavaVuPython.LavaVu):
                 if _LavaVuWrapper._ctx:
                     self.ctx = _LavaVuWrapper._ctx
                 else:
-                    self.ctx = moderngl.create_standalone_context(require=330)
+                    import platform
+                    if platform.system() == 'Linux':
+                        self.ctx = moderngl.create_context(standalone=True, require=330, backend='egl')
+                    else:
+                        self.ctx = moderngl.create_standalone_context(require=330)
+                    #print(self.ctx.info)
                     _LavaVuWrapper._ctx = self.ctx
 
             if self.use_moderngl_window and self.ctx:
                 # Activate the context
                 moderngl_window.activate_context(ctx=self.ctx)
-                if self.use_moderngl_window == 'window':
-                    # Configure with default window class / settings
-                    from moderngl_window.conf import settings
-                    settings.WINDOW['gl_version'] = (3, 3)
-                    settings.WINDOW['samples'] = 4
-                    if self.resolution:
-                        settings.WINDOW['size'] = self.resolution
-                    # Creates the window instance and activates its context
-                    self.wnd = moderngl_window.create_window_from_settings()
-                else:
-                    # Configure to use provided window class
-                    window_str = 'moderngl_window.context.' + self.use_moderngl_window + '.Window'
-                    window_cls = moderngl_window.get_window_cls(window_str)
-                    if self.resolution:
-                        self.wnd = window_cls(title="LavaVu", gl_version=(3, 3), samples=4, vsync=True, cursor=True, size=self.resolution)
-                    else:
-                        self.wnd = window_cls(title="LavaVu", gl_version=(3, 3), samples=4, vsync=True, cursor=True)
+
+                # Configure with default window class / settings
+                from moderngl_window.conf import settings
+                settings.WINDOW['gl_version'] = (3, 3)
+                if self.use_moderngl_window != 'window':
+                    #Use specified class
+                    settings.WINDOW['class'] = f'moderngl_window.context.{self.use_moderngl_window}.Window'
+                settings.WINDOW['samples'] = 4
+                if self.resolution:
+                    settings.WINDOW['size'] = self.resolution
+                # Creates the window instance and activates its context
+                self.wnd = moderngl_window.create_window_from_settings()
 
                 # register event methods
                 self.wnd.resize_func = self.resized
@@ -3695,6 +3695,56 @@ class Viewer(dict):
         else:
             return c.tolist()
 
+    def texture(self, label, data=None, flip=True, filter=2, bgr=False):
+        """
+        Load or clear global/shared texture data
+
+        Parameters
+        ----------
+        label : string
+            Label to load a custom texture by name of uniform used
+            Will attempt to find the texture by this label and replace its data
+        data : list or array or string
+            (If data is not provided, the object's texture data will be cleared)
+            Pass a list or numpy uint32 or uint8 array
+            texture data is loaded as raw image data
+            shape of array must be 2d or 3d,
+            either (height, width, channels) for RGB(A) image
+            or (height, width) for single channel grayscale image
+            Pass a string to load a texture from given filename
+        flip : boolean
+            flip the texture vertically after loading
+            (default is enabled as usually required for OpenGL but can be disabled)
+        filter : int
+            type of filtering, 0=None/nearest, 1=linear, 2=mipmap linear
+        bgr : boolean
+            rgb data is in BGR/BGRA format instead of RGB/RGBA
+        """
+        if data is None:
+            #Clear texture
+            self.app.clearTexture(None, label)
+            return
+        if isinstance(data, str):
+            self.app.setTexture(None, data, flip, filter, bgr, label)
+            return
+
+        data = _convert(data)
+        if len(data.shape) < 2:
+            raise ValueError(data.shape + " : Must pass a 2D or 3D data set")
+        if len(data.shape) < 3:
+            height, width = data.shape
+            channels = 1
+        else:
+            height, width, channels = data.shape
+
+        #Convert floating point data
+        if data.dtype == numpy.float32:
+            data = _convert(data, numpy.uint8)
+        if data.dtype == numpy.uint32:
+            self.app.textureUInt(None, data.ravel(), width, height, channels, flip, filter, bgr, label)
+        elif data.dtype == numpy.uint8:
+            self.app.textureUChar(None, data.ravel(), width, height, channels, flip, filter, bgr, label)
+
     def clear(self, objects=True, colourmaps=True):
         """
         Clears all data from the visualisation

{lavavu-1.8.76.dist-info → lavavu-1.8.79.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lavavu
-Version: 1.8.76
+Version: 1.8.79
 Summary: Python interface to LavaVu OpenGL 3D scientific visualisation utilities
 Author-email: Owen Kaluza <owen@kaluza.id.au>
 License: ### Licensing
@@ -221,7 +221,7 @@ Requires-Dist: jupyter-server-proxy
 [![Build Status](https://github.com/lavavu/LavaVu/workflows/Test/badge.svg)](https://github.com/lavavu/LavaVu/actions?query=workflow:Test)
 [![Deploy Status](https://github.com/lavavu/LavaVu/workflows/Deploy/badge.svg?branch=1.7.3)](https://github.com/lavavu/LavaVu/actions?query=workflow:Deploy)
 [![DOI](https://zenodo.org/badge/45163055.svg)](https://zenodo.org/badge/latestdoi/45163055)
-[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/lavavu/LavaVu/1.8.76)
+[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/lavavu/LavaVu/1.8.79)
 
 A scientific visualisation tool with a python interface for fast and flexible visual analysis.
 

{lavavu-1.8.76.dist-info → lavavu-1.8.79.dist-info}/RECORD

@@ -1,5 +1,5 @@
 lavavu/LavaVuPython.py,sha256=fM1Xo8N4RGzWPdCkJy3rvjHECge4Vw5h8QZLCU31ep4,33691
-lavavu/_LavaVuPython.cp311-win_amd64.pyd,sha256=VMDgd803xTP5vQoi4tEeeYfDu-2vPQWyGG2gE8tilLo,3111424
+lavavu/_LavaVuPython.cp311-win_amd64.pyd,sha256=gK2mgx6-2YntZmGmKJ992RcwR5QD8sU7A2G0sLC1P_w,3116544
 lavavu/__init__.py,sha256=ZOkoA9N5M5swxkeLDlrc9NGFQ1PggLWW4GheseTtq8I,206
 lavavu/__main__.py,sha256=9L7Rfhb_U9Oqkop7MVJ4fi9XUnx4t2vpajOMKNNVunc,247
 lavavu/amalgamate.py,sha256=goS8OLot2q400zRMMRoksYkaNyBgRJlrpU1UxSKwLmA,601
@@ -14,7 +14,7 @@ lavavu/convert.py,sha256=3F79LHdsi74pvewvDuvnlYR_Zsh5mCc1QI7XZnQSMN8,36404
 lavavu/dict.json,sha256=6WjVWKKKfF5ieZK2AfWldrl4c7BCo8tEgigJR5CpCqQ,55239
 lavavu/font.bin,sha256=fvi5zkvmq6gh9v3jXedBVuxNJWKmHtbjECzv6eT9wb4,225360
 lavavu/glfw3.dll,sha256=zI-Qy4RDHQo4mYYgW4QLREz-WZ5l5HCXJzyksyTy0bY,83456
-lavavu/lavavu.py,sha256=U-cz-UJxMYHJA7-xkJwNIQz5iroRe6I4dqA-OeQcK7g,211403
+lavavu/lavavu.py,sha256=-jnCO6HDx7PMIfy0yBwwbZCWDp3oeVdNUpdTQFEaJVE,213371
 lavavu/liblzma.dll,sha256=_n95XbzYpeaXq6wB884fmpf8nqs2Ot9gyxUL_CS2TCI,154624
 lavavu/points.py,sha256=bp5XFMUHShjeRW7XUNgq8uxj3wjk4EE-qnWEJjAn-uM,6062
 lavavu/postproc-55.dll,sha256=DwfCHwxbuZiEzRcfbh5aa-5Ax3xIsWkxEN0achBvJPU,133120
@@ -46,7 +46,7 @@ lavavu/html/server.js,sha256=WXuAnY6aE4h8vYs4U2sl4Xq5RjrkuDi-mIgM-x3Nkj0,7325
 lavavu/html/stats.min.js,sha256=q9kZjkwmWu8F8HV-4m2EfZRJXQBzyibceJoz-tDgB94,1970
 lavavu/html/styles.css,sha256=8JE8l7zcc0PV8CfOQpfDyhM226-Sq9eDLXvTCe-wSgw,3041
 lavavu/html/webview-template.html,sha256=E5w7pd91z0WL3244PQxDKMNZorWzoRT5G7wuBHXJc6Y,1573
-lavavu/html/webview.html,sha256=4mKjKToZMhjneCJyVJ57ViSayk_pglb85smcZMp2oLE,1565
+lavavu/html/webview.html,sha256=w4C77Jr0rq4vnugNAdEol8i1i6echtei4cbsBWzIYz8,1565
 lavavu/shaders/default.frag,sha256=AlGMo01JdaOsXx6Gq7s1WADi2b-vyX9XMSB91AcJvuA,278
 lavavu/shaders/default.vert,sha256=SKC2BkE2axNjJL2j5QYjU2bj6mMXs8Wq02XgMTiOeFo,334
 lavavu/shaders/fontShader.frag,sha256=0GGFFg6S4v0p_1gDTIATDmc19jrCl7xIgH9PpxcXEcE,469
@@ -59,9 +59,9 @@ lavavu/shaders/triShader.frag,sha256=eVGp_ttGMVgKnDYRwByvx_PN80EYiSz61jeuAD8JJvw
 lavavu/shaders/triShader.vert,sha256=tzgJjqbhKDgVngUJvMVL1ehYvwxAMFLQ-WtKEYU3in0,1175
 lavavu/shaders/volumeShader.frag,sha256=PLTei6fN_uLxPD35LHbBQVe_S7TanxdBqcW5khslQMI,16583
 lavavu/shaders/volumeShader.vert,sha256=CroiEfEIe7pP66w14KwmKxfbTuKN6EuXYbZJvt_bfHk,83
-lavavu-1.8.76.dist-info/LICENSE.md,sha256=zHOh_qOPkfR76vdrTRP7J-BqPieAIWVDTl2ZP0SN6lQ,8782
-lavavu-1.8.76.dist-info/METADATA,sha256=auIzfJ0-5C-LJYC06IywxU70e61vm4NOZYRjrne29Fw,18555
-lavavu-1.8.76.dist-info/WHEEL,sha256=yNCBXpt7EYM4XWkQWwdIjv6aROYfg72vYtkZaa0M7Y4,101
-lavavu-1.8.76.dist-info/entry_points.txt,sha256=LC2qXR6EMe45Cb7zGAF99R9HFrAECP6Qkp_YuG6HZB0,44
-lavavu-1.8.76.dist-info/top_level.txt,sha256=JptS0k1nlBumjLs_0hITr3_XUJhxqvKBXD2jGho3E3A,7
-lavavu-1.8.76.dist-info/RECORD,,
+lavavu-1.8.79.dist-info/LICENSE.md,sha256=zHOh_qOPkfR76vdrTRP7J-BqPieAIWVDTl2ZP0SN6lQ,8782
+lavavu-1.8.79.dist-info/METADATA,sha256=bHU40XkfV2_g2GpMFX1-ruODskLB6kUQBoGNOMyw2kI,18555
+lavavu-1.8.79.dist-info/WHEEL,sha256=qW4RD1rfHm8ZRUjJbXUnZHDNPCXHt6Rq0mgR8lv_JEg,101
+lavavu-1.8.79.dist-info/entry_points.txt,sha256=LC2qXR6EMe45Cb7zGAF99R9HFrAECP6Qkp_YuG6HZB0,44
+lavavu-1.8.79.dist-info/top_level.txt,sha256=JptS0k1nlBumjLs_0hITr3_XUJhxqvKBXD2jGho3E3A,7
+lavavu-1.8.79.dist-info/RECORD,,

{lavavu-1.8.76.dist-info → lavavu-1.8.79.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (74.0.0)
+Generator: setuptools (75.1.0)
 Root-Is-Purelib: false
 Tag: cp311-cp311-win_amd64