lavavu 1.8.75__tar.gz → 1.8.76__tar.gz

{lavavu-1.8.75/lavavu.egg-info → lavavu-1.8.76}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: lavavu
-Version: 1.8.75
+Version: 1.8.76
 Summary: UNKNOWN
 Home-page: UNKNOWN
 Author: UNKNOWN

{lavavu-1.8.75 → lavavu-1.8.76}/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.8.75)
+[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/lavavu/LavaVu/1.8.76)
 
 A scientific visualisation tool with a python interface for fast and flexible visual analysis.
 

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

{lavavu-1.8.75 → lavavu-1.8.76/lavavu.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: lavavu
-Version: 1.8.75
+Version: 1.8.76
 Summary: UNKNOWN
 Home-page: UNKNOWN
 Author: UNKNOWN

{lavavu-1.8.75 → lavavu-1.8.76}/setup.py

@@ -19,7 +19,7 @@ import shutil
 
 #Current version
 #(must be of the form X.Y.Z to trigger wheel builds)
-version = "1.8.75"
+version = "1.8.76"
 
 """
 To release a new verison:

{lavavu-1.8.75 → lavavu-1.8.76}/src/DrawingObject.h

@@ -73,6 +73,9 @@ public:
   Properties properties;
   //Default texture
   Texture_Ptr texture;
+  //Additional textures (stored by label / uniform name)
+  std::map<std::string, Texture_Ptr> textures;
+  std::map<std::string, GLuint> texture_units;
 
   DrawingObject(Session& session, std::string name="", std::string props="", unsigned int id=0);
   ~DrawingObject();

{lavavu-1.8.75 → lavavu-1.8.76}/src/Geometry.cpp

@@ -1405,24 +1405,39 @@ void Geometry::setState(Geom_Ptr g)
       {
         std::string texfn = prop;
         //Support multiple textures, load subsequent from custom props
-        if (textures.find(texfn) == textures.end())
+        if (draw->textures.find(label) == draw->textures.end() || draw->textures[label]->fn.full != texfn)
         {
           //Add a new empty texture container
-          textures[texfn] = std::make_shared<ImageLoader>();
-          textures[texfn]->fn = texfn;
+          draw->textures[label] = std::make_shared<ImageLoader>();
+          //Default to the object flip setting
+          bool flip = draw->properties["fliptexture"];
+          //Allow override by setting "flip" or "noflip" in uniform name
+          if (label.find("flip") != std::string::npos)
+          {
+            flip = true;
+            if (label.find("noflip") != std::string::npos)
+              flip = false;
+          }
+          draw->textures[label]->flip = flip;
+          draw->textures[label]->fn = texfn;
           //std::cout << "LOADED ADDITIONAL TEX " << label << " : " << texfn << std::endl;
-
-          //NOTE: hasTexture() on geom objects will return False, unless the
-          //drawing object has a texture set too, so need to set ["texture"] = True at least
         }
-        //else
-          //std::cout << "FOUND ADDITIONAL TEX " << label << " : " << textures[texfn]->empty() << std::endl;
-        auto the_texture = textures[texfn];
+
+        auto the_texture = draw->textures[label];
         TextureData* texture_data = draw->useTexture(the_texture);
         if (texture_data)
         {
           if (!texture_data->unit)
-            texture_data->unit = textures.size()+2; //Set the texture unit, starting from 2 (1 reserved for 3d)
+          {
+            if (draw->texture_units.find(label) == draw->texture_units.end())
+            {
+              //Set the texture unit, starting from 2 (1 reserved for 3d)
+              texture_data->unit = draw->texture_units.size()+2;  //Set the texture unit, starting from 2 (1 reserved for 3d)
+              draw->texture_units[label] = texture_data->unit; //Associate this texture unit with this uniform name
+            }
+            else
+              texture_data->unit = draw->texture_units[label];
+          }
           prog->setUniformi(label, texture_data->unit);
           //printf("Texture unit set %d \n", texture_data->unit);
         }
@@ -1462,6 +1477,11 @@ void Geometry::setState(Geom_Ptr g)
   prog->setUniformi("uFrame", session.frame);
   prog->setUniformf("uTime", session.time);
 
+  //Viewport size uniform
+  float viewport[4];
+  glGetFloatv(GL_VIEWPORT, viewport);
+  prog->setUniform4f("uViewport", viewport);
+
   if (texture)
     prog->setUniform("uTexture", (int)texture->unit);
 
@@ -2427,13 +2447,22 @@ void Geometry::toImage(unsigned int idx)
   image.write(path);
 }
 
-void Geometry::setTexture(DrawingObject* draw, Texture_Ptr tex)
+void Geometry::setTexture(DrawingObject* draw, Texture_Ptr tex, std::string label)
 {
-  Geom_Ptr geomdata = getObjectStore(draw);
-  if (geomdata)
+  if (label.length() == 0)
   {
-    //printf("(%s) Set texture on %p to %p\n", GeomData::names[type].c_str(), geomdata.get(), tex.get());
-    geomdata->texture = tex;
+    Geom_Ptr geomdata = getObjectStore(draw);
+    if (geomdata)
+    {
+      //printf("(%s) Set texture on %p to %p\n", GeomData::names[type].c_str(), geomdata.get(), tex.get());
+      geomdata->texture = tex;
+    }
+  }
+  else
+  {
+    //Custom texture load by uniform name label
+    //std::cout << "LOAD TEXTURE " << tex->fn.full << " BY LABEL " << label << " ON " << draw->name() << std::endl;
+    draw->textures[label] = tex;
   }
 }
 
@@ -2449,17 +2478,34 @@ void Geometry::clearTexture(DrawingObject* draw)
     geomdata->texture = std::make_shared<ImageLoader>(); //Add a new empty texture container
 }
 
-void Geometry::loadTexture(DrawingObject* draw, GLubyte* data, GLuint width, GLuint height, GLuint channels, bool flip, int filter, bool bgr)
+void Geometry::loadTexture(DrawingObject* draw, GLubyte* data, GLuint width, GLuint height, GLuint channels, bool flip, int filter, bool bgr, std::string label)
 {
-  Geom_Ptr geomdata = getObjectStore(draw);
-  if (geomdata)
+  if (label.length() == 0)
   {
-    //printf("(%s) Load texture on %p to %p\n", GeomData::names[type].c_str(), geomdata.get(), geomdata->texture.get());
-    //std::cout << "LOAD TEXTURE " << width << " x " << height << " x " << channels << " BGR " << bgr << " ON " << draw->name() << std::endl;
-    //NOTE: must only load the data here, can't make OpenGL calls as can be called async
-    geomdata->texture->filter = filter;
-    geomdata->texture->bgr = bgr;
-    geomdata->texture->loadData(data, width, height, channels, flip);
+    Geom_Ptr geomdata = getObjectStore(draw);
+    if (geomdata)
+    {
+      //printf("(%s) Load texture on %p to %p\n", GeomData::names[type].c_str(), geomdata.get(), geomdata->texture.get());
+      //std::cout << "LOAD TEXTURE " << width << " x " << height << " x " << channels << " BGR " << bgr << " ON " << draw->name() << std::endl;
+      //NOTE: must only load the data here, can't make OpenGL calls as can be called async
+      //
+      geomdata->texture->filter = filter;
+      geomdata->texture->bgr = bgr;
+      geomdata->texture->loadData(data, width, height, channels, flip);
+    }
+  }
+  else
+  {
+    //Custom texture load by uniform name label
+    if (draw->textures.find(label) != draw->textures.end())
+    {
+      //std::cout << "LOAD TEXTURE BY LABEL" << label << " : " << width << " x " << height << " x " << channels << " BGR " << bgr << " ON " << draw->name() << std::endl;
+      draw->textures[label]->filter = filter;
+      draw->textures[label]->bgr = bgr;
+      draw->textures[label]->loadData(data, width, height, channels, flip);
+    }
+    else
+      std::cout << "LOAD TEXTURE, LABEL NOT FOUND: " << label << std::endl;
   }
 }
 

{lavavu-1.8.75 → lavavu-1.8.76}/src/Geometry.h

@@ -485,6 +485,7 @@ public:
   {
     if (texture->loaded || texture->source || !texture->fn.empty()) return true;
     if (draw->texture) return true;
+    if (draw->textures.size() > 0) return true;
     if (draw->properties.has("texture"))
     {
       std::string tex = draw->properties["texture"];
@@ -556,8 +557,6 @@ protected:
   std::vector<Geom_Ptr> records;
   std::vector<Geom_Ptr> geom;
   std::vector<bool> hidden;
-  //Additional textures (stored by filename)
-  std::map<std::string, Texture_Ptr> textures;
   unsigned int elements;
   unsigned int drawcount;
   DrawingObject* cached;
@@ -640,9 +639,9 @@ public:
   void objectBounds(DrawingObject* draw, float* min, float* max, bool allsteps=false);
   void move(Geometry* other);
   void toImage(unsigned int idx);
-  void setTexture(DrawingObject* draw, Texture_Ptr tex);
+  void setTexture(DrawingObject* draw, Texture_Ptr tex, std::string label="");
   void clearTexture(DrawingObject* draw);
-  void loadTexture(DrawingObject* draw, GLubyte* data, GLuint width, GLuint height, GLuint channels, bool flip=true, int filter=2, bool bgr=false);
+  void loadTexture(DrawingObject* draw, GLubyte* data, GLuint width, GLuint height, GLuint channels, bool flip=true, int filter=2, bool bgr=false, std::string label="");
   Quaternion vectorRotation(Vec3d rvector);
   void drawVector(DrawingObject *draw, const Vec3d& translate, const Vec3d& vector, bool scale3d, float scale, float radius0, float radius1, float head_scale, int segment_count=24, Colour* colour=NULL);
   void drawTrajectory(DrawingObject *draw, float coord0[3], float coord1[3], float radius0, float radius1, float arrowHeadSize, float scale[3], float maxLength=0.f, int segment_count=24, Colour* colour=NULL);

{lavavu-1.8.75 → lavavu-1.8.76}/src/InteractiveViewer.cpp

@@ -585,6 +585,8 @@ bool LavaVu::parseChar(unsigned char key)
     return parseCommands("help");
   case KEY_F2:
     return parseCommands("antialias");
+  case KEY_F3:
+    return parseCommands("shaders");
   case KEY_TAB:
     //Tab-completion from history
     for (int l=history.size()-1; l>=0; l--)
@@ -2890,7 +2892,6 @@ bool LavaVu::parseCommand(std::string cmd, bool gethelp)
 
     printMessage("Reloading shaders");
     reloadShaders();
-    return true;
   }
   else if (parsed.exists("blend"))
   {

{lavavu-1.8.75 → lavavu-1.8.76}/src/LavaVu.cpp

@@ -3639,7 +3639,7 @@ void LavaVu::clearTexture(DrawingObject* target)
     std::cerr << "Container not found object:" << target->name() << std::endl;
 }
 
-void LavaVu::setTexture(DrawingObject* target, std::string texpath, bool flip, int filter, bool bgr)
+void LavaVu::setTexture(DrawingObject* target, std::string texpath, bool flip, int filter, bool bgr, std::string label)
 {
   //GL_Check_Thread(viewer->render_thread);
   if (!amodel || !target) return;
@@ -3649,33 +3649,33 @@ void LavaVu::setTexture(DrawingObject* target, std::string texpath, bool flip, i
     Texture_Ptr texture = std::make_shared<ImageLoader>(texpath, flip);
     texture->filter = filter;
     texture->bgr = bgr;
-    container->setTexture(target, texture);
+    container->setTexture(target, texture, label);
     reloadObject(target);
   }
   else
     std::cerr << "Container not found object:" << target->name() << std::endl;
 }
 
-void LavaVu::textureUChar(DrawingObject* target, unsigned char* array, int len, unsigned int width, unsigned int height, unsigned int channels, bool flip, int filter, bool bgr)
+void LavaVu::textureUChar(DrawingObject* target, unsigned char* array, int len, unsigned int width, unsigned int height, unsigned int channels, bool flip, int filter, bool bgr, std::string label)
 {
   if (!amodel || !target) return;
   Geometry* container = amodel->lookupObjectRenderer(target);
   if (container)
   {
-    container->loadTexture(target, array, width, height, channels, flip, filter, bgr);
+    container->loadTexture(target, array, width, height, channels, flip, filter, bgr, label);
     reloadObject(target);
   }
   else
     std::cerr << "Container not found object:" << target->name() << std::endl;
 }
 
-void LavaVu::textureUInt(DrawingObject* target, unsigned int* array, int len, unsigned int width, unsigned int height, unsigned int channels, bool flip, int filter, bool bgr)
+void LavaVu::textureUInt(DrawingObject* target, unsigned int* array, int len, unsigned int width, unsigned int height, unsigned int channels, bool flip, int filter, bool bgr, std::string label)
 {
   if (!amodel || !target) return;
   Geometry* container = amodel->lookupObjectRenderer(target);
   if (container)
   {
-    container->loadTexture(target, (GLubyte*)array, width, height, channels, flip, filter, bgr);
+    container->loadTexture(target, (GLubyte*)array, width, height, channels, flip, filter, bgr, label);
     reloadObject(target);
   }
   else

{lavavu-1.8.75 → lavavu-1.8.76}/src/LavaVu.h

@@ -259,9 +259,9 @@ public:
   Geom_Ptr arrayFloat(DrawingObject* target, float* array, int len, lucGeometryDataType type=lucVertexData, int width=0, int height=0, int depth=0);
   Geom_Ptr arrayFloat(DrawingObject* target, float* array, int len, std::string label, int width=0, int height=0, int depth=0);
   void clearTexture(DrawingObject* target);
-  void setTexture(DrawingObject* target, std::string texpath, bool flip=true, int filter=2, bool bgr=false);
-  void textureUChar(DrawingObject* target, unsigned char* array, int len, unsigned int width, unsigned int height, unsigned int channels, bool flip=true, int filter=2, bool bgr=false);
-  void textureUInt(DrawingObject* target, unsigned int* array, int len, unsigned int width, unsigned int height, unsigned int channels, bool flip=true, int filter=2, bool bgr=false);
+  void setTexture(DrawingObject* target, std::string texpath, bool flip=true, int filter=2, bool bgr=false, std::string label="");
+  void textureUChar(DrawingObject* target, unsigned char* array, int len, unsigned int width, unsigned int height, unsigned int channels, bool flip=true, int filter=2, bool bgr=false, std::string label="");
+  void textureUInt(DrawingObject* target, unsigned int* array, int len, unsigned int width, unsigned int height, unsigned int channels, bool flip=true, int filter=2, bool bgr=false, std::string label="");
 
   std::vector<Geom_Ptr> getGeometry(DrawingObject* target);
   std::vector<Geom_Ptr> getGeometryAt(DrawingObject* target, int timestep=-2);