lavavu 1.8.84__cp38-cp38-win_amd64.whl → 1.9.0__cp38-cp38-win_amd64.whl

lavavu/shaders/triShader.frag

@@ -22,25 +22,10 @@ uniform vec3 uClipMax;
 uniform bool uOpaque;
 uniform vec4 uLight;
 
-#ifdef WEBGL
-#define outColour gl_FragColor
-#define texture(a,b) texture2D(a,b)
-
-//Before OpenGL 3+ we need our own isnan function
-bool isnan3(vec3 val)
-{
-  if (!(val.x < 0.0 || 0.0 < val.x || val.x == 0.0)) return true;
-  if (!(val.y < 0.0 || 0.0 < val.y || val.y == 0.0)) return true;
-  if (!(val.z < 0.0 || 0.0 < val.z || val.z == 0.0)) return true;
-  return false;
-}
-
-#else
 #define isnan3(v) any(isnan(v))
 flat in vec4 vFlatColour;
 uniform bool uFlat;
 out vec4 outColour;
-#endif
 
 uniform bool uCalcNormal;
 
@@ -69,10 +54,8 @@ void main(void)
   if (any(lessThan(vVertex, uClipMin)) || any(greaterThan(vVertex, uClipMax))) discard;
 
   vec4 fColour = vColour;
-#ifndef WEBGL
   if (uFlat)
     fColour = vFlatColour;
-#endif
   float alpha = fColour.a;
   if (uTextured && vTexCoord.x > -1.0) //Null texcoord (-1,-1)
   {

lavavu/shaders/triShader.vert

@@ -2,9 +2,7 @@ in vec3 aVertexPosition;
 in vec3 aVertexNormal;
 in vec4 aVertexColour;
 in vec2 aVertexTexCoord;
-#ifndef WEBGL
 flat out vec4 vFlatColour;
-#endif
 
 uniform mat4 uMVMatrix;
 uniform mat4 uPMatrix;
@@ -34,9 +32,7 @@ void main(void)
     vColour = aVertexColour;
 
   vTexCoord = aVertexTexCoord;
-#ifndef WEBGL
   vFlatColour = vColour;
-#endif
   vVertex = aVertexPosition;
 
   //Head light, lightPos=(0,0,0) - vPosEye

lavavu/shaders/volumeShader.frag

@@ -6,17 +6,10 @@
  * https://www.gnu.org/licenses/lgpl.html
  * (volume shader from sharevol https://github.com/OKaluza/sharevol)
  */
-#ifdef WEBGL
-uniform sampler2D uVolume;
-#define NO_DEPTH_WRITE
-#define outColour gl_FragColor
-#define texture(a,b) texture2D(a,b)
-#else
 //Included dynamically before compile in WebGL mode...
 const int maxSamples = 2048;
 uniform sampler3D uVolume;
 out vec4 outColour;
-#endif
 
 const float depthT = 0.99; //Transmissivity threshold below which depth write applied
 
@@ -63,63 +56,7 @@ vec3 bbMax;
 float interpolate_tricubic_fast(vec3 coord);
 #endif
 
-#ifdef WEBGL
-
-vec2 islices = vec2(1.0 / slices.x, 1.0 / slices.y);
-float maxslice = slices.x * slices.y - 1.0;
-//Clamp to a bit before halfway for the edge voxels
-vec2 cmin = vec2(0.55/(slices.x*slices.y), 0.55/(slices.x*slices.y));
-vec2 cmax = vec2(1.0, 1.0) - cmin;
-
-float sample(vec3 pos)
-{
-  //Get z slice index and position between two slices
-  float Z = pos.z * maxslice;
-  float slice = floor(Z); //Index of first slice
-  Z = fract(Z);
-  //Edge case at z min (possible with tricubic filtering)
-  if (int(slice) < 0)
-  {
-    slice = 0.0;
-    Z = 0.0;
-  }
-  //Edge case at z max
-  else if (int(slice) > int(maxslice)-1)
-  {
-    slice = maxslice-1.0;
-    Z = 1.0;
-  }
-  //Only start interpolation with next Z slice 1/3 from edges at first & last z slice
-  //(this approximates how 3d texture volume is sampled at edges with linear filtering
-  // due to edge sample being included in weighted average twice)
-  // - min z slice
-  else if (int(slice) == 0)
-  {
-    Z = max(0.0, (Z-0.33) * 1.5);
-  }
-  // - max z slice
-  else if (int(slice) == int(maxslice)-1)
-  {
-    Z = min(1.0, Z*1.5);
-  }
-
-  //X & Y coords of sample scaled to slice size
-  //(Clamp range at borders to prevent bleeding between tiles due to linear filtering)
-  vec2 sampleOffset = clamp(pos.xy, cmin, cmax) * islices;
-  //Offsets in 2D texture of given slice indices
-  //(add offsets to scaled position within slice to get sample positions)
-  float A = slice * islices.x;
-  float B = (slice+1.0) * islices.x;
-  vec2 z1offset = vec2(fract(A), floor(A) / slices.y) + sampleOffset;
-  vec2 z2offset = vec2(fract(B), floor(B) / slices.y) + sampleOffset;
-
-  //Interpolate the final value by position between slices [0,1]
-  return mix(texture2D(uVolume, z1offset).x, texture2D(uVolume, z2offset).x, Z);
-}
-
-#else
 #define sample(pos) (texture(uVolume, pos).x)
-#endif
 
 float tex3D(vec3 pos)
 {

{lavavu-1.8.84.dist-info → lavavu-1.9.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lavavu
-Version: 1.8.84
+Version: 1.9.0
 Summary: Python interface to LavaVu OpenGL 3D scientific visualisation utilities
 Author-email: Owen Kaluza <owen@kaluza.id.au>
 License: ### Licensing
@@ -215,13 +215,14 @@ License-File: LICENSE.md
 Requires-Dist: numpy>=1.18
 Requires-Dist: aiohttp
 Requires-Dist: jupyter-server-proxy
+Requires-Dist: numpy-quaternion
 
 ![# logo](http://owen.kaluza.id.au/Slides/2017-08-15/LavaVu.png)
 
 [![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.84)
+[![Binder](https://mybinder.org/badge_logo.svg)](https://mybinder.org/v2/gh/lavavu/LavaVu/1.9.0)
 
 A scientific visualisation tool with a python interface for fast and flexible visual analysis.
 

{lavavu-1.8.84.dist-info → lavavu-1.9.0.dist-info}/RECORD

@@ -1,5 +1,5 @@
 lavavu/LavaVuPython.py,sha256=uTyBhkTp-Gcg468mS7EXZWxUU4TVtQ0R6D169CnMUZ0,33768
-lavavu/_LavaVuPython.cp38-win_amd64.pyd,sha256=xFsr-WZ6_Zl6t4epnULdurthcQ5eEHaELS4HxjfgiqY,3117056
+lavavu/_LavaVuPython.cp38-win_amd64.pyd,sha256=bNtC88nDoweEyjK71-m7R_uu6SPmaext8oCO5Q-VQY8,3117056
 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=1q3o7wF_siDIwmA2Sw1nh8Y1knlfmWJ64EHki21iWRU,55246
 lavavu/font.bin,sha256=fvi5zkvmq6gh9v3jXedBVuxNJWKmHtbjECzv6eT9wb4,225360
 lavavu/glfw3.dll,sha256=zI-Qy4RDHQo4mYYgW4QLREz-WZ5l5HCXJzyksyTy0bY,83456
-lavavu/lavavu.py,sha256=GBV1gn62IBa1Kd9eRDFwYkh0fiuvU9fRogNxICerEe8,214242
+lavavu/lavavu.py,sha256=uu5Y3UVV7So3AMt5scmkHwRBoyQKpUEcr_L_Wvnxd-o,223286
 lavavu/liblzma.dll,sha256=_n95XbzYpeaXq6wB884fmpf8nqs2Ot9gyxUL_CS2TCI,154624
 lavavu/points.py,sha256=bp5XFMUHShjeRW7XUNgq8uxj3wjk4EE-qnWEJjAn-uM,6062
 lavavu/postproc-55.dll,sha256=DwfCHwxbuZiEzRcfbh5aa-5Ax3xIsWkxEN0achBvJPU,133120
@@ -46,22 +46,24 @@ 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=9F-wQhoSXW_u1kP0eN_VeDy_tYpJDZrZ5hYJ20LRmtY,1565
-lavavu/shaders/default.frag,sha256=AlGMo01JdaOsXx6Gq7s1WADi2b-vyX9XMSB91AcJvuA,278
-lavavu/shaders/default.vert,sha256=SKC2BkE2axNjJL2j5QYjU2bj6mMXs8Wq02XgMTiOeFo,334
-lavavu/shaders/fontShader.frag,sha256=0GGFFg6S4v0p_1gDTIATDmc19jrCl7xIgH9PpxcXEcE,469
+lavavu/html/webview.html,sha256=vK_u8TDI1ofFgkc2zMkyiCjsQ2QnkgoirvipuUxitvM,1564
+lavavu/osmesa/LavaVuPython.py,sha256=uTyBhkTp-Gcg468mS7EXZWxUU4TVtQ0R6D169CnMUZ0,33768
+lavavu/osmesa/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+lavavu/shaders/default.frag,sha256=SHdqowe24zRNKnffZX7XilwD_I0NhVx9_rR04YJlLTE,194
+lavavu/shaders/default.vert,sha256=I3K_YYirw2UaIMj_l-8QD7wdkQeXHN8xNNvIWs6Vnvo,369
+lavavu/shaders/fontShader.frag,sha256=c3U05-GMI5zd2jpQqi7w-D2nHWkVdGI-IXMncJxgVvM,371
 lavavu/shaders/fontShader.vert,sha256=4C1G47_G_8dNaoARI9hWyftTbGQ3lQnc4dx0u7Q2j-k,308
-lavavu/shaders/lineShader.frag,sha256=lK_fAYSim-xrgpqQ9ZI6bQ-unXs_xq8BDEFuh1hKzRg,988
-lavavu/shaders/lineShader.vert,sha256=OP_hi3TSUuDkmqEiQKLsKqE_XBHOl5xGQS7iBSV9Rfw,550
-lavavu/shaders/pointShader.frag,sha256=2DfYQhhM-b38xaBjUMCAzhIrOGWmqpcyzKUpMCq3qSc,3516
-lavavu/shaders/pointShader.vert,sha256=YJMQ35fq4sK_wUwjmkti_awjhKLqGKrbs07gAgiT-N8,1292
-lavavu/shaders/triShader.frag,sha256=eVGp_ttGMVgKnDYRwByvx_PN80EYiSz61jeuAD8JJvw,5177
-lavavu/shaders/triShader.vert,sha256=tzgJjqbhKDgVngUJvMVL1ehYvwxAMFLQ-WtKEYU3in0,1175
-lavavu/shaders/volumeShader.frag,sha256=PLTei6fN_uLxPD35LHbBQVe_S7TanxdBqcW5khslQMI,16583
+lavavu/shaders/lineShader.frag,sha256=CgXGNR7B_Uq-yZQiyOXQEvEzwdqxkyxXEStvU1ptgNg,927
+lavavu/shaders/lineShader.vert,sha256=KpeKdUKStdL3_6WG9H4rCYU3oQ6qY1vWbhTaZnCb_FQ,527
+lavavu/shaders/pointShader.frag,sha256=ua2SDQMU6b9and4aM17TGqLtyEW4FhoqbQNPo41v3AY,3418
+lavavu/shaders/pointShader.vert,sha256=Mbit_gPM2jKiePIgpl2eRLiaY4brSIQ2WTDiJDMabZw,1213
+lavavu/shaders/triShader.frag,sha256=6VhNYBN5encmiE6jM-Y_titqCteTnL4AcefGprVDqxM,4754
+lavavu/shaders/triShader.vert,sha256=haljW2eQwyB24QWR1SURspU1z6ndskdZG7mrILfgXzo,1129
+lavavu/shaders/volumeShader.frag,sha256=6NeP_bgEl0SNOAjMxOWORhU62-TA9KyveDZ93mVtkKE,14594
 lavavu/shaders/volumeShader.vert,sha256=CroiEfEIe7pP66w14KwmKxfbTuKN6EuXYbZJvt_bfHk,83
-lavavu-1.8.84.dist-info/LICENSE.md,sha256=zHOh_qOPkfR76vdrTRP7J-BqPieAIWVDTl2ZP0SN6lQ,8782
-lavavu-1.8.84.dist-info/METADATA,sha256=AJGc4e_tLRCUz0jmFTyFKolg_MZ5cRdN3AuepnWh0_Y,18555
-lavavu-1.8.84.dist-info/WHEEL,sha256=rTcqimtzpX3smAWAhGmiRSWAxTY4PqYPNE-p4kscHDQ,99
-lavavu-1.8.84.dist-info/entry_points.txt,sha256=LC2qXR6EMe45Cb7zGAF99R9HFrAECP6Qkp_YuG6HZB0,44
-lavavu-1.8.84.dist-info/top_level.txt,sha256=JptS0k1nlBumjLs_0hITr3_XUJhxqvKBXD2jGho3E3A,7
-lavavu-1.8.84.dist-info/RECORD,,
+lavavu-1.9.0.dist-info/LICENSE.md,sha256=zHOh_qOPkfR76vdrTRP7J-BqPieAIWVDTl2ZP0SN6lQ,8782
+lavavu-1.9.0.dist-info/METADATA,sha256=CTWDEVfZavnn9iaHXY8L3cPTToZGVlaQdsa-70thFAs,18586
+lavavu-1.9.0.dist-info/WHEEL,sha256=rTcqimtzpX3smAWAhGmiRSWAxTY4PqYPNE-p4kscHDQ,99
+lavavu-1.9.0.dist-info/entry_points.txt,sha256=LC2qXR6EMe45Cb7zGAF99R9HFrAECP6Qkp_YuG6HZB0,44
+lavavu-1.9.0.dist-info/top_level.txt,sha256=JptS0k1nlBumjLs_0hITr3_XUJhxqvKBXD2jGho3E3A,7
+lavavu-1.9.0.dist-info/RECORD,,