lavavu 1.9.7__tar.gz → 1.9.9__tar.gz

{lavavu-1.9.7/lavavu.egg-info → lavavu-1.9.9}/PKG-INFO

@@ -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 → lavavu-1.9.9}/README.md

@@ -3,7 +3,7 @@
 [![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 → lavavu-1.9.9}/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-1.9.7 → lavavu-1.9.9}/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-1.9.7 → lavavu-1.9.9}/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-1.9.7 → lavavu-1.9.9}/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 → lavavu-1.9.9/lavavu.egg-info}/PKG-INFO

@@ -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 → lavavu-1.9.9}/setup.py

@@ -19,7 +19,7 @@ import shutil
 
 #Current version
 #(must be of the form X.Y.Z to trigger wheel builds)
-version = "1.9.7"
+version = "1.9.9"
 
 """
 To release a new verison:
@@ -386,7 +386,8 @@ if __name__ == "__main__":
             ''';
 
             #OSMesa built as optional extra module
-            if find_library('OSMesa') and check_libraries(['OSMesa'], ['GL/osmesa.h']):
+            if ("LV_OSMESA" in os.environ and find_library('OSMesa')
+            and check_libraries(['OSMesa'], ['GL/osmesa.h'])):
                 #OSMesa for software rendered offscreen OpenGL, build as additional extension
                 ex = Extension('lavavu.osmesa._LavaVuPython',
                                 define_macros = defines + [('HAVE_OSMESA', '1')],

{lavavu-1.9.7 → lavavu-1.9.9}/src/Geometry.cpp

@@ -1357,10 +1357,8 @@ void Geometry::setState(Geom_Ptr g)
   }
 
   //Default line width
-  float lineWidth = (float)props["linewidth"] * session.context.scale2d; //Include 2d scale factor
-  if (session.context.core && lineWidth > 1.0) lineWidth = 1.0;
-  glLineWidth(lineWidth);
-  GL_Error_Check;
+  float lineWidth = (float)props["linewidth"];
+  session.context.setLineWidth(lineWidth, props["upscalelines"]);
 
   //Disable depth test by default for 2d lines, otherwise enable
   bool depthTestDefault = (view->is3d || type != lucLineType);
@@ -1493,6 +1491,13 @@ void Geometry::setState(Geom_Ptr g)
   bool allopaque = session.global("opaque");
   if (allopaque) opacity = 1.0;
   prog->setUniformf("uOpacity", opacity);
+  if (props.has("colour") && !draw->colourMap && g->render->colours.size() == 0)
+    prog->setUniform("uColour", draw->colour);
+  else
+  {
+    Colour clear(0.0, 0.0, 0.0, 0.0);
+    prog->setUniform("uColour", clear);
+  }
   prog->setUniformi("uLighting", lighting);
   prog->setUniformf("uBrightness", props["brightness"]);
   prog->setUniformf("uContrast", props["contrast"]);

{lavavu-1.9.7 → lavavu-1.9.9}/src/GraphicsUtil.cpp

@@ -203,7 +203,10 @@ Colour FontManager::setFont(Properties& properties, float scaling, bool print3d)
   //Set font type
   //Hershey line font for very small text
   if (fonttype == "line" || fonttype == "small")
+  {
     charset = FONT_LINE;
+    context->setLineWidth(0.75, properties["upscalelines"]);
+  }
   //Mesh vector font is the default
   else
     charset = FONT_VECTOR;
@@ -280,9 +283,6 @@ void FontManager::printString(const char* str)
   else
   {
     //Line font
-    float lineWidth = (context->scale2d - 0.5) * 1.5;
-    if (context->core && lineWidth > 1.0) lineWidth = 1.0;
-    glLineWidth(lineWidth);
     for (unsigned int c=0; c<strlen(str); c++)
     {
       //Render character

{lavavu-1.9.7 → lavavu-1.9.9}/src/Lines.cpp

@@ -308,10 +308,9 @@ void Lines::draw()
         float scaling = props["scalelines"];
         //Don't apply object scaling to internal lines objects
         if (!internal) scaling *= (float)props["scaling"];
-        float lineWidth = (float)props["linewidth"] * scaling * session.context.scale2d; //Include 2d scale factor
+        float lineWidth = (float)props["linewidth"] * scaling;
         if (lineWidth <= 0) lineWidth = scaling;
-        if (session.context.core && lineWidth > 1.0) lineWidth = 1.0;
-        glLineWidth(lineWidth);
+        session.context.setLineWidth(lineWidth, props["upscalelines"]);
 
         if (props["loop"])
           primitive = GL_LINE_LOOP;

{lavavu-1.9.7 → lavavu-1.9.9}/src/RenderContext.cpp

@@ -157,3 +157,21 @@ mat4 RenderContext::ortho(float left, float right, float bottom, float top, floa
   return M;
 }
 
+void RenderContext::setLineWidth(float lineWidth, bool upscale)
+{
+  //Attempt to set line width, even in core profile
+  //Previously we prevented this but in some drivers it still works
+  GL_Error_Check
+  //if (core && lineWidth > 1.0) lineWidth = 1.0;
+  if (upscale)
+    lineWidth *= scale2d; //Include 2d scale factor
+  glLineWidth(lineWidth);
+  if (glGetError() == GL_INVALID_VALUE)
+  {
+    debug_print("WARNING: line width > 1.0 not supported in core profile (%f)\n", lineWidth);
+    glLineWidth(1.0);
+  }
+  GL_Error_Check
+}
+
+

{lavavu-1.9.7 → lavavu-1.9.9}/src/RenderContext.h

@@ -86,6 +86,7 @@ public:
   int project(float objx, float objy, float objz, float *windowCoordinate);
   int project(float x, float y, float z, int* viewport, float* windowCoordinate);
   mat4 ortho(float left, float right, float bottom, float top, float nearc, float farc);
+  void setLineWidth(float lineWidth, bool upscale);
 };
 
 #endif //RenderContext__

lavavu-1.9.9/src/version.cpp

@@ -0,0 +1,2 @@
+#include "version.h"
+const std::string version = "1.9.9";

lavavu-1.9.7/src/version.cpp

@@ -1,2 +0,0 @@
-#include "version.h"
-const std::string version = "1.9.7";