lavavu 1.9.0__tar.gz → 1.9.5__tar.gz

{lavavu-1.9.0/lavavu.egg-info → lavavu-1.9.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lavavu
-Version: 1.9.0
+Version: 1.9.5
 Summary: Python interface to LavaVu OpenGL 3D scientific visualisation utilities
 Author-email: Owen Kaluza <owen@kaluza.id.au>
 License: ### Licensing
@@ -215,6 +215,7 @@ License-File: LICENSE.md
 Requires-Dist: numpy>=1.18
 Requires-Dist: aiohttp
 Requires-Dist: jupyter_server_proxy
+Requires-Dist: matplotlib
 Requires-Dist: numpy-quaternion
 Dynamic: license-file
 
@@ -223,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.0)
+[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/lavavu/LavaVu/1.9.5)
 
 A scientific visualisation tool with a python interface for fast and flexible visual analysis.
 
@@ -236,7 +237,7 @@ Prior development was funded by the Monash Immersive Visualisation Plaform at [M
 
 The acronym stands for: lightweight, automatable  visualisation and analysis viewing utility, but "lava" is also a reference to its primary application as a viewer for geophysical simulations. It was also chosen to be unique enough to find the repository with google.
 
-The project started in the gLucifer<sup>1</sup> framework for visualising geodynamics simulations. The OpenGL visualisation module was separated from the simulation and sampling libraries and became a more general purpose visualisation tool. gLucifer continues as a set of sampling tools for Underworld simulations as part of the [Underworld2](https://github.com/underworldcode/underworld2/) code. LavaVu provides the rendering library for creating 2d and 3d visualisations to view this sampled data, inline within interactive IPython notebooks and offline through saved visualisation databases and images/movies.
+The project started as a replacement rendering library for the gLucifer<sup>1</sup> framework, visualising geodynamics simulations. The new OpenGL visualisation code was re-implemented as a more general purpose visualisation tool. gLucifer continues as a set of sampling tools for Underworld simulations as part of the [Underworld2](https://github.com/underworldcode/underworld2/) code. LavaVu provides the rendering library for creating 2d and 3d visualisations to view this sampled data, inline within interactive Jupyter notebooks and offline through saved visualisation databases and images/movies.
 
 As a standalone tool it is a scriptable 3D visualisation tool capable of producing publication quality high res images and video output from time varying data sets along with HTML5 3D visualisations in WebGL.
 Rendering features include correctly and efficiently rendering large numbers of opaque and transparent points and surfaces and volume rendering by GPU ray-marching. There are also features for drawing vector fields and tracers (streamlines).
@@ -259,13 +260,10 @@ Development happens in the "master" branch with stable releases tagged, so if yo
 It's now in the python package index, so you can install with *pip*:
 
 ```
-pip install --user lavavu
+python -m pip install lavavu
 ```
 
-> If you don't have pip available, you can try `sudo easy_install pip` or just install [Anaconda](https://www.anaconda.com/download), which comes with pip and a whole lot of other useful packages for scientific work with python. Once in anaconda `pip install lavavu` will install the package.
-
-> Currently no binaries are provided and the installer needs to compile the library, so on Linux you may need some developer tools and headers first, eg: for Ubuntu:
-`sudo apt install build-essential libgl1-mesa-dev libx11-dev zlib1g-dev`
+> Currently binary wheels are provided for Linux x86_64, MacOS x86_64 and ARM64 and Windows x86_64. 
 
 To try it out:
 
@@ -282,7 +280,12 @@ Alternatively, clone this repository with *git* and build from source:
 ```
   git clone https://github.com/lavavu/LavaVu
   cd LavaVu
+  python -m pip install .
+```
+or 
+```
   make -j4
+
 ```
 
 If all goes well the viewer will be built, try running with:
@@ -291,14 +294,14 @@ If all goes well the viewer will be built, try running with:
 ### Dependencies ###
 
 * OpenGL and Zlib, present on most systems, headers may need to be installed
-* To use with python requires python 2.7+ and NumPy
-* For video output, requires: libavcodec, libavformat, libavutil, libswscale (from FFmpeg / libav)
+* To use with python requires python 3.6+ and NumPy
+* For video output, requires: PyAV or for built in encoding, libavcodec, libavformat, libavutil, libswscale (from FFmpeg / libav)
 * To build the python interface from source requires swig (http://www.swig.org/)
 
 ### Who do I talk to? ###
 
 * Report bugs/issues here on github: https://github.com/lavavu/LavaVu/issues
-* Contact developer: Owen Kaluza (at) monash.edu
+* Contact developer: Owen Kaluza (at) anu.edu.au
 
 For further documentation / examples, see the online documentation
 * https://lavavu.github.io/Documentation

{lavavu-1.9.0 → lavavu-1.9.5}/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.0)
+[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/lavavu/LavaVu/1.9.5)
 
 A scientific visualisation tool with a python interface for fast and flexible visual analysis.
 
@@ -16,7 +16,7 @@ Prior development was funded by the Monash Immersive Visualisation Plaform at [M
 
 The acronym stands for: lightweight, automatable  visualisation and analysis viewing utility, but "lava" is also a reference to its primary application as a viewer for geophysical simulations. It was also chosen to be unique enough to find the repository with google.
 
-The project started in the gLucifer<sup>1</sup> framework for visualising geodynamics simulations. The OpenGL visualisation module was separated from the simulation and sampling libraries and became a more general purpose visualisation tool. gLucifer continues as a set of sampling tools for Underworld simulations as part of the [Underworld2](https://github.com/underworldcode/underworld2/) code. LavaVu provides the rendering library for creating 2d and 3d visualisations to view this sampled data, inline within interactive IPython notebooks and offline through saved visualisation databases and images/movies.
+The project started as a replacement rendering library for the gLucifer<sup>1</sup> framework, visualising geodynamics simulations. The new OpenGL visualisation code was re-implemented as a more general purpose visualisation tool. gLucifer continues as a set of sampling tools for Underworld simulations as part of the [Underworld2](https://github.com/underworldcode/underworld2/) code. LavaVu provides the rendering library for creating 2d and 3d visualisations to view this sampled data, inline within interactive Jupyter notebooks and offline through saved visualisation databases and images/movies.
 
 As a standalone tool it is a scriptable 3D visualisation tool capable of producing publication quality high res images and video output from time varying data sets along with HTML5 3D visualisations in WebGL.
 Rendering features include correctly and efficiently rendering large numbers of opaque and transparent points and surfaces and volume rendering by GPU ray-marching. There are also features for drawing vector fields and tracers (streamlines).
@@ -39,13 +39,10 @@ Development happens in the "master" branch with stable releases tagged, so if yo
 It's now in the python package index, so you can install with *pip*:
 
 ```
-pip install --user lavavu
+python -m pip install lavavu
 ```
 
-> If you don't have pip available, you can try `sudo easy_install pip` or just install [Anaconda](https://www.anaconda.com/download), which comes with pip and a whole lot of other useful packages for scientific work with python. Once in anaconda `pip install lavavu` will install the package.
-
-> Currently no binaries are provided and the installer needs to compile the library, so on Linux you may need some developer tools and headers first, eg: for Ubuntu:
-`sudo apt install build-essential libgl1-mesa-dev libx11-dev zlib1g-dev`
+> Currently binary wheels are provided for Linux x86_64, MacOS x86_64 and ARM64 and Windows x86_64. 
 
 To try it out:
 
@@ -62,7 +59,12 @@ Alternatively, clone this repository with *git* and build from source:
 ```
   git clone https://github.com/lavavu/LavaVu
   cd LavaVu
+  python -m pip install .
+```
+or 
+```
   make -j4
+
 ```
 
 If all goes well the viewer will be built, try running with:
@@ -71,14 +73,14 @@ If all goes well the viewer will be built, try running with:
 ### Dependencies ###
 
 * OpenGL and Zlib, present on most systems, headers may need to be installed
-* To use with python requires python 2.7+ and NumPy
-* For video output, requires: libavcodec, libavformat, libavutil, libswscale (from FFmpeg / libav)
+* To use with python requires python 3.6+ and NumPy
+* For video output, requires: PyAV or for built in encoding, libavcodec, libavformat, libavutil, libswscale (from FFmpeg / libav)
 * To build the python interface from source requires swig (http://www.swig.org/)
 
 ### Who do I talk to? ###
 
 * Report bugs/issues here on github: https://github.com/lavavu/LavaVu/issues
-* Contact developer: Owen Kaluza (at) monash.edu
+* Contact developer: Owen Kaluza (at) anu.edu.au
 
 For further documentation / examples, see the online documentation
 * https://lavavu.github.io/Documentation

{lavavu-1.9.0 → lavavu-1.9.5}/lavavu/control.py

@@ -1689,13 +1689,26 @@ class _ControlFactory(object):
         """
         if not is_notebook():
             return
-        #Find matching viewer id, redisplay all that match
+        from IPython.display import display,HTML,Javascript
+        display(Javascript(self.redisplay_call()))
+
+    def redisplay_call(self):
+        """Update the active viewer image if any
+        Applies changes made in python to the viewer and forces a redisplay
+        """
+        #Find matching viewer id, redisplay first  match
+        ids = self.active_viewers()
+        return ';'.join('_wi["{0}"].redisplay()'.format(i) for i in ids)
+
+    def active_viewers(self):
+        """Return matching active viewer IDs
+        """
+        #Find matching viewer ids, all that match
+        ids = []
         for idx,obj in enumerate(windows):
             if obj == self._target():
-                viewerid = winids[idx]
-                from IPython.display import display,HTML,Javascript
-                #display(Javascript('_wi["{0}"].redisplay();'.format(viewerid)))
-                display(HTML('<script>_wi["{0}"].redisplay();</script>'.format(viewerid)))
+                ids.append(winids[idx])
+        return ids
 
     def update(self):
         """Update the control values from current viewer data

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

{lavavu-1.9.0 → lavavu-1.9.5}/lavavu/lavavu.py

@@ -53,6 +53,7 @@ import weakref
 import asyncio
 import quaternion as quat
 import platform
+import matplotlib
 
 if sys.version_info[0] < 3:
     print("Python 3 required. LavaVu no longer supports Python 2.7.")
@@ -610,12 +611,12 @@ class Object(dict):
         return key in self.dict
 
     def __repr__(self):
-        return str(self.ref)
+        return self.__str__()
 
     def __str__(self):
         #Default string representation
         self.parent._get() #Ensure in sync
-        return '{\n' + str('\n'.join(['  %s=%s' % (k,json.dumps(v)) for k,v in self.dict.items()])) + '\n}\n'
+        return '{\n' + str('\n'.join(['  %s=%s' % (k,json.dumps(v)) for k,v in self.dict.items()])) + '\n}'
 
     #Interface for setting filters
     def include(self, *args, **kwargs):
@@ -1144,7 +1145,12 @@ class Object(dict):
             #Re-arrange to array of [r,g,b,a] values
             data = numpy.dstack((data[0],data[1],data[2]))
 
-        self._loadScalar(data, LavaVuPython.lucRGBAData)
+        #Use the shape as dims for texture image data
+        if len(data.shape) > 1:
+            width, height =  data.shape[1], data.shape[0]
+            depth = 4 #4 channel RGBA
+
+        self._loadScalar(data, LavaVuPython.lucRGBAData, width, height, depth)
 
 
     def luminance(self, data):
@@ -1271,6 +1277,8 @@ class Object(dict):
             self.ref.colourMap = data.ref
             data = None
         else:
+            if isinstance(data, matplotlib.colors.Colormap):
+                data = matplotlib_cmap(data)
             if data is None:
                 self.parent._get() #Ensure in sync
                 cmid = self["colourmap"]
@@ -2739,7 +2747,7 @@ class Viewer(dict):
 
     """
 
-    def __init__(self, *args, resolution=None, binpath=None, context="default", port=8080, threads=False, **kwargs):
+    def __init__(self, *args, resolution=None, binpath=None, context=None, port=8080, threads=False, **kwargs):
         """
         Create and init viewer instance
 
@@ -2776,7 +2784,9 @@ class Viewer(dict):
         self._collections = {}
         self.validate = True #Property validation flag
         self.recording = None
-        self.context = os.environ.get('LV_CONTEXT', context)
+        self.context = context
+        if self.context is None:
+            self.context = os.environ.get('LV_CONTEXT', 'default')
 
         #Exit handler to clean up threads
         #(__del__ does not always seem to get called on termination)
@@ -4476,10 +4486,10 @@ class Viewer(dict):
                 for key in ["translate", "rotate", "xyzrotate", "fov", "focus"]:
                     if key in src:
                         dst[key] = copy.copy(src[key])
-                        #Round down arrays to max 3 decimal places
+                        #Round down arrays to max 6 decimal places
                         try:
                             for r in range(len(dst[key])):
-                                dst[key][r] = round(dst[key][r], 3)
+                                dst[key][r] = round(dst[key][r], 6)
                         except:
                             #Not a list/array
                             pass

{lavavu-1.9.0 → lavavu-1.9.5/lavavu.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lavavu
-Version: 1.9.0
+Version: 1.9.5
 Summary: Python interface to LavaVu OpenGL 3D scientific visualisation utilities
 Author-email: Owen Kaluza <owen@kaluza.id.au>
 License: ### Licensing
@@ -215,6 +215,7 @@ License-File: LICENSE.md
 Requires-Dist: numpy>=1.18
 Requires-Dist: aiohttp
 Requires-Dist: jupyter_server_proxy
+Requires-Dist: matplotlib
 Requires-Dist: numpy-quaternion
 Dynamic: license-file
 
@@ -223,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.0)
+[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/lavavu/LavaVu/1.9.5)
 
 A scientific visualisation tool with a python interface for fast and flexible visual analysis.
 
@@ -236,7 +237,7 @@ Prior development was funded by the Monash Immersive Visualisation Plaform at [M
 
 The acronym stands for: lightweight, automatable  visualisation and analysis viewing utility, but "lava" is also a reference to its primary application as a viewer for geophysical simulations. It was also chosen to be unique enough to find the repository with google.
 
-The project started in the gLucifer<sup>1</sup> framework for visualising geodynamics simulations. The OpenGL visualisation module was separated from the simulation and sampling libraries and became a more general purpose visualisation tool. gLucifer continues as a set of sampling tools for Underworld simulations as part of the [Underworld2](https://github.com/underworldcode/underworld2/) code. LavaVu provides the rendering library for creating 2d and 3d visualisations to view this sampled data, inline within interactive IPython notebooks and offline through saved visualisation databases and images/movies.
+The project started as a replacement rendering library for the gLucifer<sup>1</sup> framework, visualising geodynamics simulations. The new OpenGL visualisation code was re-implemented as a more general purpose visualisation tool. gLucifer continues as a set of sampling tools for Underworld simulations as part of the [Underworld2](https://github.com/underworldcode/underworld2/) code. LavaVu provides the rendering library for creating 2d and 3d visualisations to view this sampled data, inline within interactive Jupyter notebooks and offline through saved visualisation databases and images/movies.
 
 As a standalone tool it is a scriptable 3D visualisation tool capable of producing publication quality high res images and video output from time varying data sets along with HTML5 3D visualisations in WebGL.
 Rendering features include correctly and efficiently rendering large numbers of opaque and transparent points and surfaces and volume rendering by GPU ray-marching. There are also features for drawing vector fields and tracers (streamlines).
@@ -259,13 +260,10 @@ Development happens in the "master" branch with stable releases tagged, so if yo
 It's now in the python package index, so you can install with *pip*:
 
 ```
-pip install --user lavavu
+python -m pip install lavavu
 ```
 
-> If you don't have pip available, you can try `sudo easy_install pip` or just install [Anaconda](https://www.anaconda.com/download), which comes with pip and a whole lot of other useful packages for scientific work with python. Once in anaconda `pip install lavavu` will install the package.
-
-> Currently no binaries are provided and the installer needs to compile the library, so on Linux you may need some developer tools and headers first, eg: for Ubuntu:
-`sudo apt install build-essential libgl1-mesa-dev libx11-dev zlib1g-dev`
+> Currently binary wheels are provided for Linux x86_64, MacOS x86_64 and ARM64 and Windows x86_64. 
 
 To try it out:
 
@@ -282,7 +280,12 @@ Alternatively, clone this repository with *git* and build from source:
 ```
   git clone https://github.com/lavavu/LavaVu
   cd LavaVu
+  python -m pip install .
+```
+or 
+```
   make -j4
+
 ```
 
 If all goes well the viewer will be built, try running with:
@@ -291,14 +294,14 @@ If all goes well the viewer will be built, try running with:
 ### Dependencies ###
 
 * OpenGL and Zlib, present on most systems, headers may need to be installed
-* To use with python requires python 2.7+ and NumPy
-* For video output, requires: libavcodec, libavformat, libavutil, libswscale (from FFmpeg / libav)
+* To use with python requires python 3.6+ and NumPy
+* For video output, requires: PyAV or for built in encoding, libavcodec, libavformat, libavutil, libswscale (from FFmpeg / libav)
 * To build the python interface from source requires swig (http://www.swig.org/)
 
 ### Who do I talk to? ###
 
 * Report bugs/issues here on github: https://github.com/lavavu/LavaVu/issues
-* Contact developer: Owen Kaluza (at) monash.edu
+* Contact developer: Owen Kaluza (at) anu.edu.au
 
 For further documentation / examples, see the online documentation
 * https://lavavu.github.io/Documentation

{lavavu-1.9.0 → lavavu-1.9.5}/lavavu.egg-info/SOURCES.txt

@@ -26,11 +26,6 @@ lavavu.egg-info/entry_points.txt
 lavavu.egg-info/requires.txt
 lavavu.egg-info/top_level.txt
 lavavu/html/LavaVu-amalgamated.css
-lavavu/html/LavaVu-amalgamated.js
-lavavu/html/LavaVu.data
-lavavu/html/LavaVu.html
-lavavu/html/LavaVu.js
-lavavu/html/LavaVu.wasm
 lavavu/html/OK-min.js
 lavavu/html/baseviewer.js
 lavavu/html/control.css
@@ -41,7 +36,6 @@ lavavu/html/draw.js
 lavavu/html/drawbox.js
 lavavu/html/emscripten-template.js
 lavavu/html/emscripten.css
-lavavu/html/emscripten.js
 lavavu/html/favicon.ico
 lavavu/html/gl-matrix-min.js
 lavavu/html/gui.css

{lavavu-1.9.0 → lavavu-1.9.5}/lavavu.egg-info/requires.txt

@@ -1,4 +1,5 @@
 numpy>=1.18
 aiohttp
 jupyter_server_proxy
+matplotlib
 numpy-quaternion

{lavavu-1.9.0 → lavavu-1.9.5}/requirements.txt

@@ -1,5 +1,6 @@
 numpy >= 1.18
 aiohttp
 jupyter_server_proxy
+matplotlib
 numpy-quaternion
 

{lavavu-1.9.0 → lavavu-1.9.5}/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.0"
+version = "1.9.5"
 
 """
 To release a new verison:
@@ -383,19 +383,9 @@ if __name__ == "__main__":
             #EGL and OSMesa are built as optional extra modules
             '''
             if find_library('OpenGL') and find_library('EGL') and check_libraries(['OpenGL', 'EGL'], ['GL/gl.h', 'EGL/egl.h']):
-                #EGL for offscreen OpenGL without X11/GLX - works only with NVidia currently
-                ex = Extension('lavavu.egl._LavaVuPython',
-                                define_macros = defines + [('HAVE_EGL', '1')],
-                                include_dirs = inc_dirs,
-                                libraries = libs + ['OpenGL', 'EGL'],
-                                library_dirs = lib_dirs,
-                                runtime_library_dirs = rt_lib_dirs,
-                                extra_compile_args = cflags,
-                                extra_link_args = ldflags,
-                                extra_objects=extra_objects,
-                                sources = srcs)
-                extensions.append(ex)
             ''';
+
+            #OSMesa built as optional extra module
             if 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',
@@ -411,7 +401,12 @@ if __name__ == "__main__":
                 extensions.append(ex)
 
             #Main extension - use X11 or GLFW
-            if ("LV_GLFW" in os.environ and find_library('glfw')
+            if ("LV_EGL" in os.environ and find_library('OpenGL') and find_library('EGL')
+            and check_libraries(['OpenGL', 'EGL'], ['GL/gl.h', 'EGL/egl.h'])):
+                #EGL for offscreen OpenGL without X11/GLX - works with NVidia and latest Mesa
+                defines += [('HAVE_EGL', '1')]
+                libs += ['OpenGL', 'EGL']
+            elif ("LV_GLFW" in os.environ and find_library('glfw')
             and check_libraries(['glfw'], ['GLFW/glfw3.h'])):
                 #Use GLFW
                 defines += [('HAVE_GLFW', '1')]

{lavavu-1.9.0 → lavavu-1.9.5}/src/Geometry.cpp

@@ -1406,21 +1406,21 @@ void Geometry::setState(Geom_Ptr g)
         std::string texfn = prop;
         //Support multiple textures, load subsequent from custom props
         //std::cout << label << " = " << prop << std::endl;
-        //std::cout << "SEARCH LOCAL..." << std::endl;
+        //std::cout << "  SEARCH LOCAL..." << std::endl;
         Texture_Ptr the_texture = nullptr;
         if (draw->textures.find(label) == draw->textures.end() || draw->textures[label]->fn.full != texfn)
         {
           //Search in global textures
-          //std::cout << "NOT FOUND, SEARCH SHARED..." << std::endl;
+          //std::cout << "    NOT FOUND, SEARCH SHARED..." << std::endl;
           if (session.textures.find(label) != session.textures.end())
           {
-            //std::cout << "USING SHARED TEXTURE " << label << " : " << texfn << std::endl;
+            //std::cout << "      USING SHARED TEXTURE " << label << " : " << texfn << std::endl;
             //Save a copy in draw->textures so hasTexture returns true
             the_texture = draw->textures[label] = session.textures[label];
           }
           else if (FileExists(texfn))
           {
-            //std::cout << "NOT FOUND, CREATE/LOAD FROM FILE..." << std::endl;
+            //std::cout << "      NOT FOUND, CREATE/LOAD FROM FILE..." << std::endl;
             //Add a new empty texture container
             draw->textures[label] = std::make_shared<ImageLoader>();
             //Default to the object flip setting
@@ -1434,13 +1434,13 @@ void Geometry::setState(Geom_Ptr g)
             }
             draw->textures[label]->flip = flip;
             draw->textures[label]->fn = texfn;
-            //std::cout << "LOADED ADDITIONAL TEX " << label << " : " << texfn << std::endl;
+            //std::cout << "      LOADED ADDITIONAL TEX " << label << " : " << texfn << std::endl;
             the_texture = draw->textures[label];
           }
         }
         else
         {
-          //std::cout << "FOUND LOCAL." << std::endl;
+          //std::cout << "    FOUND LOCAL." << std::endl;
           the_texture = draw->textures[label];
         }
 
@@ -1464,10 +1464,18 @@ void Geometry::setState(Geom_Ptr g)
             //printf("Texture unit set %d \n", texture_data->unit);
           }
           else
-            std::cout << "Texture load failed, data is NULL! " << label << " = " << prop << std::endl;
+          {
+            //This is fine if texture not set or is empty string
+            //std::cout << "Texture load failed, data is NULL! " << label << " = " << prop << std::endl;
+            prog->setUniformi(label, 1024); //Dummy unit
+          }
         }
         else
-          std::cout << "Texture load failed, not found. " << label << " = " << prop << std::endl;
+        {
+          //This is fine if texture not set or is empty string
+          //std::cout << "Texture load failed, not found. " << label << " = " << prop << std::endl;
+          prog->setUniformi(label, 1024); //Dummy unit
+        }
       }
       else if (!prop.is_null())
       {
@@ -1865,7 +1873,26 @@ void Geometry::display(bool refresh)
           {
             geom[index]->opaque = true;
           }
+        }
 
+        //Load RGB/RGBA as texture
+        if (geom[index]->texwidth && geom[index]->texheight)
+        {
+           //printf("TEX %d x %d RGB %d COLOURS %d TEXTURE %d\n", geom[index]->texwidth, geom[index]->texheight, geom[index]->render->rgb.size(), geom[index]->render->colours.size(), geom[index]->hasTexture());
+          //RGB as ubyte * 3
+          if (geom[index]->texwidth * geom[index]->texheight == geom[index]->render->rgb.size() * 3)
+          {
+            //printf(" - LOADING RGB %d to TEXTURE %d x %d\n", geom[index]->render->rgb.size(), geom[index]->texwidth, geom[index]->texheight);
+            geom[index]->texture->loadData(static_cast<GLubyte*>(geom[index]->render->rgb.ref()), geom[index]->texwidth, geom[index]->texheight, 3, false);
+          }
+          //RGBA as int32 (ubyte * 4)
+          else if (geom[index]->texwidth * geom[index]->texheight == geom[index]->render->colours.size())
+          {
+            //printf(" - LOADING RGBA %d to TEXTURE %d x %d\n", geom[index]->render->colours.size(), geom[index]->texwidth, geom[index]->texheight);
+            geom[index]->texture->loadData(static_cast<GLubyte*>(geom[index]->render->colours.ref()), geom[index]->texwidth, geom[index]->texheight, 4, false);
+            //std::ofstream of("texout.png");
+            //write_png(of, 4, geom[index]->texwidth, geom[index]->texheight, geom[index]->render->colours.ref());
+          }
         }
       }
     }
@@ -2173,9 +2200,18 @@ Geom_Ptr Geometry::read(DrawingObject* draw, unsigned int n, lucGeometryDataType
 void Geometry::read(Geom_Ptr geomdata, unsigned int n, lucGeometryDataType dtype, const void* data, int width, int height, int depth)
 {
   //Set width & height if provided
-  if (width) geomdata->width = width;
-  if (height) geomdata->height = height;
-  if (depth) geomdata->depth = depth;
+  if (type != lucVolumeType && width && height && (dtype == lucRGBData || dtype == lucRGBAData))
+  {
+    //Set the texture width/height/depth
+    geomdata->texwidth = width;
+    geomdata->texheight = height;
+  }
+  else
+  {
+    if (width) geomdata->width = width;
+    if (height) geomdata->height = height;
+    if (depth) geomdata->depth = depth;
+  }
 
   //Read the data
   if (n > 0)

{lavavu-1.9.0 → lavavu-1.9.5}/src/Geometry.h

@@ -313,11 +313,13 @@ public:
   bool internal = false;
   static std::string names[lucMaxType];
   static std::string datalabels[lucMaxDataType+1];
-  DrawingObject* draw; //Parent drawing object
-  unsigned int width;
-  unsigned int height;
-  unsigned int depth;
-  bool opaque;   //Flag for opaque geometry, render first, don't depth sort
+  DrawingObject* draw = NULL; //Parent drawing object
+  unsigned int width = 0;
+  unsigned int height = 0;
+  unsigned int depth = 0;
+  unsigned int texwidth = 0;
+  unsigned int texheight = 0;
+  bool opaque = false;   //Flag for opaque geometry, render first, don't depth sort
   Texture_Ptr texture;               //Default texture
   lucGeometryType type;   //Holds the object type
   int step = -1; //Holds the timestep
@@ -368,7 +370,7 @@ public:
   }
 
   GeomData(DrawingObject* draw, lucGeometryType type, int step=-1)
-    : draw(draw), width(0), height(0), depth(0), opaque(false), type(type), step(step)
+    : draw(draw), type(type), step(step)
   {
     texture = std::make_shared<ImageLoader>(); //Add a new empty texture container
 

{lavavu-1.9.0 → lavavu-1.9.5}/src/Include.h

@@ -34,6 +34,7 @@
 #include <mutex>
 #include <condition_variable>
 #include <random>
+#include <chrono>
 
 //C headers
 #include <assert.h>

{lavavu-1.9.0 → lavavu-1.9.5}/src/InteractiveViewer.cpp

@@ -1822,7 +1822,10 @@ bool LavaVu::parseCommand(std::string cmd, bool gethelp)
       return false;
     }
 
-    aview->properties.data["title"] = parsed.getall("title", 0);
+    if (amodel->timesteps.size() > 1)
+      session.timesteps[session.now]->properties.data["title"] = parsed.getall("title", 0);
+    else
+      aview->properties.data["title"] = parsed.getall("title", 0);
   }
   else if (parsed.exists("rulers"))
   {

{lavavu-1.9.0 → lavavu-1.9.5}/src/Model.cpp

@@ -2118,7 +2118,18 @@ void Model::writeGeometryRecord(Database& outdb, lucGeometryType type, lucGeomet
     if (!std::isfinite(max[c])) max[c] = 0.0;
   }
 
-  snprintf(SQL, SQL_QUERY_MAX, "INSERT INTO geometry (object_id, timestep, rank, idx, type, data_type, size, count, width, minimum, maximum, dim_factor, units, minX, minY, minZ, maxX, maxY, maxZ, labels, data) VALUES (%d, %d, %d, %d, %d, %d, %d, %d, %d, %g, %g, %g, '%s', %g, %g, %g, %g, %g, %g, ?, ?)", objid, step, data->height, data->depth, type, dtype, block->unitsize(), block->size(), data->width, block->minimum, block->maximum, 0.0, block->label.c_str(), min[0], min[1], min[2], max[0], max[1], max[2]);
+  //Use texwidth/height if RGB/RGBA data
+  int width = data->width;
+  int height = data->height;
+  int depth = data->depth;
+  if (dtype == lucRGBData || dtype == lucRGBAData)
+  {
+    width = data->texwidth;
+    height = data->texheight;
+    depth = dtype == lucRGBData ? 3 : 4;
+  }
+
+  snprintf(SQL, SQL_QUERY_MAX, "INSERT INTO geometry (object_id, timestep, rank, idx, type, data_type, size, count, width, minimum, maximum, dim_factor, units, minX, minY, minZ, maxX, maxY, maxZ, labels, data) VALUES (%d, %d, %d, %d, %d, %d, %d, %d, %d, %g, %g, %g, '%s', %g, %g, %g, %g, %g, %g, ?, ?)", objid, step, height, depth, type, dtype, block->unitsize(), block->size(), width, block->minimum, block->maximum, 0.0, block->label.c_str(), min[0], min[1], min[2], max[0], max[1], max[2]);
 
   /* Prepare statement... */
   if (sqlite3_prepare_v2(outdb.db, SQL, -1, &statement, NULL) != SQLITE_OK)

{lavavu-1.9.0 → lavavu-1.9.5}/src/TriSurfaces.cpp

@@ -126,8 +126,8 @@ void TriSurfaces::loadMesh()
     //Sort vertices vector with std::sort & custom compare sort( vec.begin(), vec.end() );
     //Iterate, for duplicates replace indices with index of first
     //Remove duplicate vertices Triangles stored as list of indices
-    unsigned int hasColours = geom[index]->colourCount();
-    bool vertColour = hasColours && (hasColours >= geom[index]->count());
+    unsigned int hasColours = geom[index]->hasTexture() ? 0 : geom[index]->colourCount();
+    bool vertColour = hasColours && (hasColours == geom[index]->count());
     t1=tt=clock();
 
     int triverts = 0;
@@ -312,8 +312,8 @@ void TriSurfaces::smoothMesh(int index, std::vector<Vertex> &verts, std::vector<
   debug_print("Calculating normals for triangle surface %d size %d\n", index, geom[index]->render->vertices.size()/3);
   //Vertex elimination currently only works for per-vertex colouring, 
   // if less colour values provided, must precalc own indices to skip this step 
-  unsigned int hasColours = geom[index]->colourCount();
-  bool vertColour = (hasColours && hasColours >= geom[index]->render->vertices.size()/3);
+  unsigned int hasColours = geom[index]->hasTexture() ? 0 : geom[index]->colourCount();
+  bool vertColour = (hasColours && hasColours == geom[index]->render->vertices.size()/3);
   if (hasColours && !vertColour) debug_print("Not enough colour values for per-vertex normalisation %d < %d\n", hasColours, geom[index]->render->vertices.size()/3);
   bool vnormals = geom[index]->draw->properties["vertexnormals"];
   int anglemin = geom[index]->draw->properties["smoothangle"];