lavavu 1.8.84__cp311-cp311-macosx_11_0_arm64.whl → 1.9.0__cp311-cp311-macosx_11_0_arm64.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
+Metadata-Version: 2.2
 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
@@ -214,14 +214,15 @@ Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: numpy>=1.18
 Requires-Dist: aiohttp
-Requires-Dist: jupyter-server-proxy
+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,4 +1,4 @@
-lavavu/lavavu.py,sha256=B_n4pude411uaNukrugiM3JUdKgWvhW3q6UxfFCoFxs,208383
+lavavu/lavavu.py,sha256=5JdzlRaEjuWAPjBQrgIKEyIS2RRL2RIrQ2aWaHFkg2A,217172
 lavavu/vutils.py,sha256=6Vm_xl1bp9mWlfk7jgLDwbRw-tdE_oxin77YkLel3_4,5437
 lavavu/dict.json,sha256=lsZEHc7Bb6_lt7tkSBQMgkq7AEn_2hnhWzzdokmvIY8,52729
 lavavu/server.py,sha256=L-_yPCbNfwYxJCPjDQtr_lxPnDp4oMNVFyxXhBERYrQ,12468
@@ -12,7 +12,7 @@ lavavu/amalgamate.py,sha256=Xloq1IZ4VUvYiROzQtwKcQIWC65c7EZrdiGVhZdolL8,586
 lavavu/aserver.py,sha256=SfFvLeDTcx1XtS8fY_HIrDmh3q9HicCBRSAriY5yyOE,12003
 lavavu/font.bin,sha256=fvi5zkvmq6gh9v3jXedBVuxNJWKmHtbjECzv6eT9wb4,225360
 lavavu/__main__.py,sha256=EbDetijCjyoiNxmExqnDGoRVs996tSVave5DML9zuMY,235
-lavavu/_LavaVuPython.cpython-311-darwin.so,sha256=UF_G3z0hUlBF8BDxmEffxzPN_knsNup0163lCo_MD-Q,3842496
+lavavu/_LavaVuPython.cpython-311-darwin.so,sha256=xYjN7ELLgT87N1_ubcq3JujvVXjuPP318YJj5Z59uRc,3927360
 lavavu/html/control.css,sha256=PVLwmle00ciEckUV5ZIRmI3Whxhl7-mlVexnyyxoU70,3259
 lavavu/html/control.js,sha256=oV24eJZ0vfuCxF3fO60eeJSkNFJ9hUkSCThHGJS1Wvc,11652
 lavavu/html/gui.css,sha256=PRDLsYwM6cgLC9zZsEAG0dnnSd-HYH6oSEfsdEBkuxk,582
@@ -27,27 +27,29 @@ 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=FtI5i_Fw4DPfDfJyY6OnphZmyAmqFW1Mc14I6ouG9nM,1522
+lavavu/html/webview.html,sha256=aFUGmVs3dT3R9X9IgA5WN8ND6tWFM0Ki5mgywqIRjz4,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
 lavavu/html/menu.js,sha256=WCli3UYcQ7frjNq0aAXNALu33iNiN8lpTYwKZ7pUcn4,21501
 lavavu/html/baseviewer.js,sha256=u3UhC1At6rMBKmcQ7d2DXTRxQ20wsQkc4lqA-7sL7i4,9567
-lavavu/shaders/volumeShader.frag,sha256=CIFSfwI8xVZ0ALme2QPMcXWl5yB55WCGnfJZ1Led6TU,16120
-lavavu/shaders/pointShader.vert,sha256=rnEa8PfIK3kFtFg04Ataf10aWsjEkh1URY2ipV1xTMY,1235
-lavavu/shaders/lineShader.frag,sha256=aCmOWC20fHinR32p6LZPdCZP6abn-K1V2slbJ_5NoVA,945
-lavavu/shaders/fontShader.frag,sha256=DXAzO7kS36TBzYMJW0XqFiQQTTc4jFedGiUkLjelYKs,444
-lavavu/shaders/triShader.frag,sha256=pG6eWiVgtHB8cSHyB8W3SHrc7-mLqaCRlZaHZfsEKhc,5007
-lavavu/shaders/default.vert,sha256=9J5Oqg8ns711fSNeQTtdA7ENb2sfonx0KGh1QfHp5Ws,317
-lavavu/shaders/triShader.vert,sha256=pJXftq7IiqiGe7NTMmuBUMDs4OZc9TD8lNJ4q-8B57Q,1120
-lavavu/shaders/lineShader.vert,sha256=6kJQcfu3eqaj910_KdaklVRvYxNbeu0ZbpDEOxRVde0,522
+lavavu/osmesa/LavaVuPython.py,sha256=ixhceiAr0gGGfCe3d2cY0IIgS4hbgoYJGa_RfgAmmrU,33207
+lavavu/osmesa/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+lavavu/shaders/volumeShader.frag,sha256=Ajkpt0S2p0PpbQ2jygDnrymSgPMU2CG5xQT-dq2rr90,14194
+lavavu/shaders/pointShader.vert,sha256=mDMF4wAPvHELXT5rXN_QZFezxvK4q50Mdm-qZZJ7FYI,1160
+lavavu/shaders/lineShader.frag,sha256=2PQBMcb149jVKnsBhTvU1vf94x91O0kAdOBTSs8OpGY,888
+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/lineShader.vert,sha256=5HDJMphXW438yMc0I2NtBdnvF6uXrOUac9hjk3S7mfk,501
 lavavu/shaders/fontShader.vert,sha256=yCBmRugaPUeUQUdIh62-AK_5KELiJqVS2M82iyIqPwo,290
-lavavu/shaders/pointShader.frag,sha256=T1PA9Z6FiE66rS2sAmmFIbYM2VqEkLBycxV-sx3nACY,3384
+lavavu/shaders/pointShader.frag,sha256=3zREBdsimlL9fAXBPjhzomGaFUWmlG_QYkhwMTVURHQ,3291
 lavavu/shaders/volumeShader.vert,sha256=uGdQjGqi7V5kE6V7nxymfugtU4cbf6u570xBy13RgmY,78
-lavavu/shaders/default.frag,sha256=xCkYz8QriRlnAr-NtenZSIWI_liSxv9jz3Lp5immK9k,258
-lavavu-1.8.84.dist-info/LICENSE.md,sha256=EhfNgC6BYh5gDEaq4tcrN3S0wbO4CtJO46botJnCF8c,8603
-lavavu-1.8.84.dist-info/RECORD,,
-lavavu-1.8.84.dist-info/WHEEL,sha256=poswUSLteh-e2fl9um8bzvGmfWIWqlPA5zz46K8O6JE,109
-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/METADATA,sha256=MFufiRsa4bX84GlDYNKdHy3uH7jsoAK4xCJu-jUjkHE,18237
+lavavu/shaders/default.frag,sha256=5XLYVfLwzN0sFT3aMYGmxbyquA_cmndp55YCOuy1t4E,180
+lavavu-1.9.0.dist-info/LICENSE.md,sha256=EhfNgC6BYh5gDEaq4tcrN3S0wbO4CtJO46botJnCF8c,8603
+lavavu-1.9.0.dist-info/RECORD,,
+lavavu-1.9.0.dist-info/WHEEL,sha256=NW1RskY9zow1Y68W-gXg0oZyBRAugI1JHywIzAIai5o,109
+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/METADATA,sha256=yZSA74LHPQhIIUvqPUS3b9DhXpvQ3MLvl8lDLmENqS8,18267

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

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: false
 Tag: cp311-cp311-macosx_11_0_arm64