lavavu 1.9.7__cp312-cp312-macosx_11_0_arm64.whl → 1.9.9__cp312-cp312-macosx_11_0_arm64.whl

lavavu/dict.json

@@ -2147,6 +2147,17 @@
       false
     ]
   },
+  "upscalelines": {
+    "default": false,
+    "target": "global",
+    "type": "real",
+    "desc": "Enable to scale lines with the viewport size.",
+    "strict": true,
+    "redraw": 0,
+    "control": [
+      true
+    ]
+  },
   "fps": {
     "default": false,
     "target": "global",

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.9.7/LavaVu-amalgamated.min.js"></script>
+    <script async src="https://cdn.jsdelivr.net/gh/lavavu/lavavu.github.io@1.9.9/LavaVu-amalgamated.min.js"></script>
     <!--script src="dat.gui.min.js"></script>
     <script src="OK-min.js"></script>
 

lavavu/shaders/triShader.vert

@@ -8,7 +8,6 @@ uniform mat4 uMVMatrix;
 uniform mat4 uPMatrix;
 uniform mat4 uNMatrix;
 
-uniform vec4 uColour;
 uniform vec4 uLightPos;
 
 out vec4 vColour;
@@ -26,11 +25,10 @@ void main(void)
 
   vNormal = normalize(mat3(uNMatrix) * aVertexNormal);
 
-  if (uColour.a > 0.0)
-    vColour = uColour;
-  else
-    vColour = aVertexColour;
-
+  //This shader only applies attribute colour
+  //uColour is set for other/custom shaders
+  //Note uOpacity is "alpha" prop, "oapcity" is passed via attrib
+  vColour = aVertexColour;
   vTexCoord = aVertexTexCoord;
   vFlatColour = vColour;
   vVertex = aVertexPosition;

lavavu/tracers.py

@@ -24,7 +24,7 @@ def random_particles(count, lowerbound=[0,0,0], upperbound=[1,1,1], dims=3):
     return numpy.stack(p).T
 
 class Tracers():
-    def __init__(self, grid, count=1000, lowerbound=None, upperbound=None, limit=None, age=4, respawn_chance=0.2, speed_multiply=1.0, height=0.0, viewer=None):
+    def __init__(self, grid, count=1000, lowerbound=None, upperbound=None, limit=None, age=4, respawn_chance=0.2, speed_multiply=1.0, height=0.0, label='', viewer=None):
         """
         Seed random particles into a vector field and trace their positions
 
@@ -52,6 +52,8 @@ class Tracers():
             Speed multiplier, scaling factor for the velocity taken from the vector values
         height : float
             A fixed height value, all positions will be given this height as their Z component
+        label : str
+            Name label prefix for the visualisation objects when plotting
         viewer : lavavu.Viewer
             Viewer object for plotting functions
         """
@@ -100,6 +102,7 @@ class Tracers():
         self.speed_multiply = speed_multiply
         self.height = height
 
+        self.label = label
         self.lv = viewer
         self.points = None
         self.arrows = None
@@ -157,8 +160,8 @@ class Tracers():
                 self.speed[r] = 0.0
 
         if self.lv:
-            positions = self.positions
-            if self.dims == 2 and self.height != 0:
+            positions = self.get_positions()
+            if positions.shape[1] == 2 and self.height != 0:
                 #Convert to 3d and set z coord to height
                 shape = list(positions.shape)
                 shape[-1] = 3
@@ -180,15 +183,25 @@ class Tracers():
                 if len(self.tracers["colourmap"]):
                     self.tracers.values(self.speed)
 
+    def get_positions(self):
+        """
+        This funcion can be overridden if positions need to be transformed
+        in any way before plotting, eg: plotting on spherical earth model
+        """
+        return self.positions
+
+    def prefix(self):
+        return self.label + '_' if len(self.label) else ''
+
     def plot_points(self, **kwargs):
         if self.lv is not None and self.points is None:
-            self.points = self.lv.points('tracer_points', **kwargs)
+            self.points = self.lv.points(self.prefix() + 'tracer_points', **kwargs)
 
     def plot_arrows(self, **kwargs):
         if self.lv is not None and self.arrows is None:
-            self.arrows = self.lv.vectors('tracer_arrows', **kwargs)
+            self.arrows = self.lv.vectors(self.prefix() + 'tracer_arrows', **kwargs)
 
     def plot_tracers(self, **kwargs):
         if self.lv is not None and self.tracers is None:
-            self.tracers = self.lv.tracers('tracers', dims=self.count, limit=self.limit, **kwargs)
+            self.tracers = self.lv.tracers(self.prefix() + 'tracers', dims=self.count, limit=self.limit, **kwargs)
 

{lavavu-1.9.7.dist-info → lavavu-1.9.9.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lavavu
-Version: 1.9.7
+Version: 1.9.9
 Summary: Python interface to LavaVu OpenGL 3D scientific visualisation utilities
 Author-email: Owen Kaluza <owen@kaluza.id.au>
 License: ### Licensing
@@ -224,7 +224,7 @@ Dynamic: license-file
 [![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.9.7)
+[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/lavavu/LavaVu/1.9.9)
 
 A scientific visualisation tool with a python interface for fast and flexible visual analysis.
 

{lavavu-1.9.7.dist-info → lavavu-1.9.9.dist-info}/RECORD

@@ -1,11 +1,11 @@
 lavavu/lavavu.py,sha256=v7tXwp6gQzu1F05hHyALng8FXznv4rVwdCJ3sO65O8o,221223
 lavavu/vutils.py,sha256=6Vm_xl1bp9mWlfk7jgLDwbRw-tdE_oxin77YkLel3_4,5437
-lavavu/dict.json,sha256=lsZEHc7Bb6_lt7tkSBQMgkq7AEn_2hnhWzzdokmvIY8,52729
+lavavu/dict.json,sha256=EcJsoHsiHDDmM8FGuBRF6eOG2nMr-Pda3sxE6v6KB80,52952
 lavavu/server.py,sha256=L-_yPCbNfwYxJCPjDQtr_lxPnDp4oMNVFyxXhBERYrQ,12468
 lavavu/points.py,sha256=jRRtA6CrcA46Y2jUJmkxnIiVoMC5a14xEd_ojhmjhz4,5871
-lavavu/_LavaVuPython.cpython-312-darwin.so,sha256=Dm7lmgNMtpx_k16sNMWIbpKO-hea3NqV3fXFhiG_lUA,3927376
+lavavu/_LavaVuPython.cpython-312-darwin.so,sha256=fJpGRSK-jHG8x5J-ITdlEXa1waxOwPdTRuJk6Ruy1Ow,3927600
 lavavu/LavaVuPython.py,sha256=ixhceiAr0gGGfCe3d2cY0IIgS4hbgoYJGa_RfgAmmrU,33207
-lavavu/tracers.py,sha256=-NwdBAj5vYWmLt4NE0gWl36SQShQhICR7vBE4rzNOFI,8488
+lavavu/tracers.py,sha256=e10H8evUH7V-XUSkHjfoakaA4SfeuQ8-gWzfa86RGzQ,8997
 lavavu/convert.py,sha256=tbYRjLE2l1hI4d6tsW41Lia1JXmrWSc0-JAYCiMrjys,35516
 lavavu/control.py,sha256=s32rtLPXXYtxpeXd6-iHdupmaMTJ3KhK6Vq-CLjf9OQ,66755
 lavavu/__init__.py,sha256=JroZQiUbuVN7ifixk2zNDGlyLGaM8bqfRbw4D_F9qIQ,191
@@ -27,7 +27,7 @@ lavavu/html/dat.gui.min.js,sha256=S4_QjoXe4IOpU0f0Sj5jEQLTWPoX9uRl1ohB91jyhuw,56
 lavavu/html/OK-min.js,sha256=-4Gc1-dWfxP_w6r9ZOHa8u-X2BlGUoSQbX68lwCxQ3E,39115
 lavavu/html/emscripten.css,sha256=wkaIJhXaxuMchinQX9Z8c12cJomyvFQMeIZ62WGQEPQ,1813
 lavavu/html/drawbox.js,sha256=SJxFSmWd7QVFI5__66hFkKzLKeqg1JPcx-gJuqdMkXw,34590
-lavavu/html/webview.html,sha256=Tjv9TWx1k6ovHY8xxaG_NGwHwuiDC0Hz5Npm39afHAU,1521
+lavavu/html/webview.html,sha256=18jUDdjnNH0GEJl377vZ-2tj9AUawj3lUbveleBkguM,1521
 lavavu/html/emscripten-template.js,sha256=h63mzl3Lv7aQT1wMOiOucPOvHTJjpKkzsL-SFVYaZlA,6135
 lavavu/html/draw.js,sha256=57LlHlYRh0IvWVwzGDnF6PaCxYLzokpokLNCuZlG1ds,84108
 lavavu/html/dat-gui-light-theme.css,sha256=uPhvJs-1IAsdxudItyOw8lZy8Hrih0zmFM1u-xRwZ-M,1142
@@ -41,15 +41,15 @@ lavavu/shaders/lineShader.frag,sha256=2PQBMcb149jVKnsBhTvU1vf94x91O0kAdOBTSs8OpG
 lavavu/shaders/fontShader.frag,sha256=clgomy2lu-1u7w0GwFd0BNU_L3-SkYt8zv03N5ciJug,351
 lavavu/shaders/triShader.frag,sha256=SkPatq2s7Osa5o7U3lg-7We8ldY0oHZHCLuQjRY4Vgk,4601
 lavavu/shaders/default.vert,sha256=3xKybexF39UGsESMLQQcqHlE1MgLCDEXUMLz4sr5blQ,352
-lavavu/shaders/triShader.vert,sha256=H7rTS-WO5QiT9uP1ClhufQM8minSWknJ9UvKAEVnzRU,1078
+lavavu/shaders/triShader.vert,sha256=U_G_74Jybaw20-PI-NDgaLDDfxGhURHMxdvNYXEkBjc,1156
 lavavu/shaders/lineShader.vert,sha256=5HDJMphXW438yMc0I2NtBdnvF6uXrOUac9hjk3S7mfk,501
 lavavu/shaders/fontShader.vert,sha256=yCBmRugaPUeUQUdIh62-AK_5KELiJqVS2M82iyIqPwo,290
 lavavu/shaders/pointShader.frag,sha256=3zREBdsimlL9fAXBPjhzomGaFUWmlG_QYkhwMTVURHQ,3291
 lavavu/shaders/volumeShader.vert,sha256=uGdQjGqi7V5kE6V7nxymfugtU4cbf6u570xBy13RgmY,78
 lavavu/shaders/default.frag,sha256=5XLYVfLwzN0sFT3aMYGmxbyquA_cmndp55YCOuy1t4E,180
-lavavu-1.9.7.dist-info/RECORD,,
-lavavu-1.9.7.dist-info/WHEEL,sha256=mP9bWt4ASeNWfyg7GBBbGbsOVFgblaN5WklJcvrSjIE,136
-lavavu-1.9.7.dist-info/entry_points.txt,sha256=LC2qXR6EMe45Cb7zGAF99R9HFrAECP6Qkp_YuG6HZB0,44
-lavavu-1.9.7.dist-info/top_level.txt,sha256=JptS0k1nlBumjLs_0hITr3_XUJhxqvKBXD2jGho3E3A,7
-lavavu-1.9.7.dist-info/METADATA,sha256=pDV89WKg6njzJArxsKbduk1rcj2NHSb75oV1lUtNx30,17877
-lavavu-1.9.7.dist-info/licenses/LICENSE.md,sha256=EhfNgC6BYh5gDEaq4tcrN3S0wbO4CtJO46botJnCF8c,8603
+lavavu-1.9.9.dist-info/RECORD,,
+lavavu-1.9.9.dist-info/WHEEL,sha256=V1loQ6TpxABu1APUg0MoTRBOzSKT5xVc3skizX-ovCU,136
+lavavu-1.9.9.dist-info/entry_points.txt,sha256=LC2qXR6EMe45Cb7zGAF99R9HFrAECP6Qkp_YuG6HZB0,44
+lavavu-1.9.9.dist-info/top_level.txt,sha256=JptS0k1nlBumjLs_0hITr3_XUJhxqvKBXD2jGho3E3A,7
+lavavu-1.9.9.dist-info/METADATA,sha256=m26xD1S57nTm100gH36OwCwzJRRHuaiqk0Ai7ZQV7iY,17877
+lavavu-1.9.9.dist-info/licenses/LICENSE.md,sha256=EhfNgC6BYh5gDEaq4tcrN3S0wbO4CtJO46botJnCF8c,8603

{lavavu-1.9.7.dist-info → lavavu-1.9.9.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.4.0)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: false
 Tag: cp312-cp312-macosx_11_0_arm64
 Generator: delocate 0.13.0