Skip to content

Commit e9deb89

Browse files
authored
Merge pull request #449 from flucoma/pre-production
[release] 1.0.9
2 parents 0a9327e + aaaa987 commit e9deb89

20 files changed

+14600
-6567
lines changed

CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -184,6 +184,8 @@ install(FILES ${flucoma-core_SOURCE_DIR}/distribution.lic
184184
RENAME LICENSE.md)
185185
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/local_docs/"
186186
DESTINATION "${MAX_PACKAGE_ROOT}/docs")
187+
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/code/"
188+
DESTINATION "${MAX_PACKAGE_ROOT}/code")
187189
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/vignettes"
188190
DESTINATION "${MAX_PACKAGE_ROOT}/docs")
189191

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>

help/fluid.bufstats~.maxhelp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5436,7 +5436,7 @@
54365436
"numoutlets" : 1,
54375437
"outlettype" : [ "" ],
54385438
"patching_rect" : [ 172.0, 277.0, 350.0, 23.0 ],
5439-
"text" : "jstrigger (new Buffer('help.bufstats.4.src').peek(a[0]\\,0\\, a[1]))"
5439+
"text" : "jstrigger (new Buffer('help.bufstats.4.stats').peek(a[0]\\,0\\, a[1]))"
54405440
}
54415441

54425442
}

0 commit comments

Comments
 (0)