Skip to content

Commit 23ec3e8

Browse files
authored
Fluid.jit.plotter update - full parity with fluid.plotter (#417)
* add basic fluid.jit.plotter abstraction * changed interface to "refer" and more efficient ds loading via patcher scripting * handle bpatcher resizing * add force square aspect ratio * make mousing work with any size * implement xrange, yrange, and range messages * add color-matching highlighted points, rename resize pworld script * use fluid.dataset refer method instead of caveman-style, implement de-refer * change labelset interface to refer * implement click'n'drag, remove unused * remove clipping from mesh vertex scaling * report zoomxrange zoomyrange * fix vertex array and color array size mismatch * remove junk * enable fsaa on jit.pworld * massive cleanup * add init txt * add ref xml, add seealso to fluid.plotter * fix wrong label colors (mixing buf samps w ds ids) * add missing bgcolor method * hide highlighted mesh upon refer dataset * fix retaining colors from prev ds when ds changes/updates * just some patching * fix busted zoom rect when opt/alt lifted before trigger zoom * fix rogue highlight after zoom * fix range not resetting upon refer * implement colorscheme message * pass unmatched messages on the right to the left * fix not updating highlighted point colors when changing colorscheme * start resize polling upon creation to avoid weirdnesses * add help patcher * small text change * save on built-in screen lol * add fluid.jit.plotter to overview * minor positioning stuff in help * support dictionary message for datasets (left inlet) * implement clear and reset (alias to refer w no args) * fix style mismatch in help * renamed js files * remove "2017-2019" after copyright from refs * changed digest in ref * resizing help jsui after changing ref * save on local screen to avoid pain lolz * fix comment grammar * add panning mousing mode * fix rouge highlight once when transitioning from panning to zooming * document panning mode in help * add panfactor method to doc xml * fix comment * add [p ?] to both fluid.plotter and fluid.jit.plotter helps * add dump example to help, document clear and reset * add large dataset tab to fluid.plotter * avoid pop-up [p ?] subpatch on Windows * better comments in fluid.plotter help * use 100K points in the "large datasets" tab of fluid.plotter * decouple patching/pres mode position * add colormatrix support * minor positioning * decouple patching/pres mode position * add colormatrix support * don't open ? upon help load * remove colormatrix, implement pointcolor instead * add pointcolor example * change comment about jit.plotter now it supports pointcolor * add pointcolor to ref copied from corresponding entry for fluid.plotter * use jit.gl.render, partially implement setpoint * add missing init to dataset_name * fix setpoint bugs * implement individual pointsize, align interface w fluid.plotter * update help to use new interface * fix/remove comments use qlim - fix "let you be more draw" comment - change speedlim to qlim to avoid the timer thread - remove fluid.jit.plotter non-parity warning (since now there is parity) * update reference * fix using old js script in repo, add retina screen compensation * better handling of retina screens, force square AR of plot not bpatcher * use "highlight -1" to hide highlighted mesh "highlight -1" should hide the highlighted mesh. This is for parity in behavior with fluid.plotter. * do not reset xrange/yrange upon new dataset Parity in behavior with fluid.plotter. * fix setpoint with 0 default point size * better transparency - Enable blending, handle alpha color values and disable depth for all non-highlighted points. This can improve visibility for dense areas. - Set default point color to "0 0 0 0.8" for parity with fluid.plotter. - Automatically fill an alpha value of 1. if user only specifies RGB in "setpoint". * fix non-theme-aware bubble comments * align pointsizescale with fluid.plotter Just added a *2 for the point size scale, it is not a complete perfect match, but it is pretty close. The *2 is probably necessary now since I render the final texture in 4x resolution to have it look the same on retina and non-retina screens. * revert pointsizescale change Turns out it was correct for the help patches, and it somehow works differently in my test patch... Oh Dear Max. * update reference docs - update the fluid.jit.plotter's reference to reflect the current interface (now in parity with fluid.jit.plotter) - add message digests to fluid.plotter's reference * use theme-aware text color everywhere * more text color fixes * small cosmetic changes - checked "do not restore contents" for message box - [p party] now triggered by [active] to avoid excessive ramping * reverse-merge from local bkp So, apparently, when I manual-merged the conflicts earlier, I chose the wrong option consistently in all cases. :) I saved the local correct versions, so now I restore those from the backup. Sorry! * fix cable and panel sadness
1 parent 28d259b commit 23ec3e8

File tree

8 files changed

+12416
-6295
lines changed

8 files changed

+12416
-6295
lines changed
Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,39 @@
1+
<jittershader name="custom.point.size">
2+
<param name="Pointsize" type="float" state="VERTEX_ATTR" />
3+
<param name="shape" type="int" default="0" />
4+
5+
<language name="glsl" version="1.0">
6+
<bind param="Pointsize" program="vp" />
7+
<bind param="shape" program="fp" />
8+
<program name="vp" type="vertex">
9+
<![CDATA[
10+
11+
attribute float Pointsize;
12+
13+
varying vec4 Color;
14+
15+
void main()
16+
{
17+
gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex;
18+
gl_PointSize = Pointsize;
19+
Color = gl_Color;
20+
}
21+
]]>
22+
</program>
23+
<program name="fp" type="fragment">
24+
<![CDATA[
25+
26+
varying vec4 Color;
27+
uniform int shape;
28+
29+
void main()
30+
{
31+
gl_FragColor = Color;
32+
// draw a circle if shape is 0
33+
if(shape == 0 && length(gl_PointCoord-0.5) >= 0.5) discard;
34+
}
35+
36+
]]>
37+
</program>
38+
</language>
39+
</jittershader>

0 commit comments

Comments
 (0)