8000 fl.cumsum~ -> fl.cumulative~ by fearn-e · Pull Request #118 · AlexHarker/FrameLib · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fl.cumsum~ -> fl.cumulative~ #118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 8 commits into from
Sep 15, 2023
Merged

fl.cumsum~ -> fl.cumulative~ #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
32a55f7
Rename fl.cumsum~ to fl.cumulative~
fearn-e Sep 13, 2023
8de2403
Params & info
fearn-e Sep 13, 2023
23b9b0f
product process
fearn-e Sep 13, 2023
c53477c
updated help patch
fearn-e Sep 13, 2023
3eb7208
Merge branch 'new-objects' into fl.cumulative
AlexHarker Sep 13, 2023
5d345d4
Update framelib.sln (fix indentation)
AlexHarker Sep 13, 2023
93283c0
Rebuild .pbxproj
AlexHarker Sep 15, 2023
2c758d3
Rebuild object cache
AlexHarker Sep 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
206 changes: 162 additions & 44 deletions ...lp_files/internal_tabs/fl.cumsum~.maxhelp → ...iles/internal_tabs/fl.cumulative~.maxhelp
View file
Open in desktop
EDBE
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
}
,
"classnamespace" : "box",
"rect" : [ 666.0, 659.0, 600.0, 421.0 ],
"rect" : [ 927.0, 734.0, 600.0, 485.0 ],
"bglocked" : 0,
"openinpresentation" : 0,
"default_fontsize" : 12.0,
Expand Down Expand Up @@ -57,7 +57,7 @@
}
,
"classnamespace" : "box",
"rect" : [ 0.0, 26.0, 600.0, 395.0 ],
"rect" : [ 0.0, 26.0, 600.0, 459.0 ],
"bglocked" : 0,
"openinpresentation" : 0,
"default_fontsize" : 12.0,
Expand Down Expand Up @@ -119,7 +119,7 @@
}
,
"classnamespace" : "box",
"rect" : [ 666.0, 685.0, 600.0, 395.0 ],
"rect" : [ 927.0, 760.0, 600.0, 459.0 ],
"bglocked" : 0,
"openinpresentation" : 0,
"default_fontsize" : 13.0,
Expand Down Expand Up @@ -149,15 +149,93 @@
"showontab" : 1,
"assistshowspatchername" : 0,
"boxes" : [ {
"box" : {
"id" : "obj-9",
"maxclass" : "newobj",
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 30.0, 255.0, 53.0, 23.0 ],
"text" : "fl.*~ 2.5"
}

}
, {
"box" : {
"fontsize" : 12.0,
"id" : "obj-8",
"maxclass" : "live.tab",
"num_lines_patching" : 2,
"num_lines_presentation" : 8,
"numinlets" : 1,
"numoutlets" : 3,
"outlettype" : [ "", "", "float" ],
"parameter_enable" : 1,
"patching_rect" : [ 320.625, 105.0, 63.75, 78.25 ],
"saved_attribute_attributes" : {
"valueof" : {
"parameter_enum" : [ "sum", "product" ],
"parameter_initial" : [ 0.0 ],
"parameter_initial_enable" : 1,
"parameter_longname" : "live.tab[1]",
"parameter_mmax" : 1,
"parameter_shortname" : "live.tab",
"parameter_type" : 2,
"parameter_unitstyle" : 9
}

}
,
"varname" : "live.tab[1]"
}

}
, {
"box" : {
"id" : "obj-7",
"maxclass" : "message",
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 343.0, 195.0, 59.0, 23.0 ],
"text" : "mode $1"
}

}
, {
"box" : {
"id" : "obj-5",
"maxclass" : "newobj",
"numinlets" : 1,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 30.0, 180.0, 114.0, 23.0 ],
"text" : "fl.interval~ 500 ms"
}

}
, {
"box" : {
"id" : "obj-2",
"maxclass" : "newobj",
"numinlets" : 1,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 343.0, 225.0, 163.0, 23.0 ],
"text" : "fl.frommax~ /mode params"
}

}
, {
"box" : {
"bubble" : 1,
"id" : "obj-4",
"linecount" : 2,
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 351.0, 186.5, 189.0, 40.0 ],
"text" : "Keeps a running cumulative sum of the current frame"
"patching_rect" : [ 364.0, 276.5, 217.0, 40.0 ],
"text" : "Keeps a running cumulative sum/product of the current frame"
}

}
Expand All @@ -168,7 +246,7 @@
"maxclass" : "ezdac~",
"numinlets" : 2,
"numoutlets" : 0,
"patching_rect" : [ 525.0, 281.5, 45.0, 45.0 ]
"patching_rect" : [ 525.0, 356.5, 45.0, 45.0 ]
}

}
Expand All @@ -178,8 +256,8 @@
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 335.0, 341.0, 115.0, 21.0 ],
"text" : "Cumulative sums",
"patching_rect" : [ 335.0, 416.0, 115.0, 21.0 ],
"text" : "Cumulative values",
"textjustification" : 1
}

Expand All @@ -190,7 +268,7 @@
"maxclass" : "comment",
"numinlets" : 1,
"numoutlets" : 0,
"patching_rect" : [ 85.5, 341.0, 112.0, 21.0 ],
"patching_rect" : [ 85.5, 416.0, 112.0, 21.0 ],
"text" : "Original values",
"textjustification" : 1
}
Expand All @@ -205,8 +283,8 @@
"numoutlets" : 2,
"outlettype" : [ "", "" ],
"parameter_enable" : 0,
"patching_rect" : [ 274.0, 270.0, 223.0, 68.0 ],
"setminmax" : [ 0.0, 10.0 ],
"patching_rect" : [ 274.0, 345.0, 223.0, 68.0 ],
"setminmax" : [ 0.0, 30.0 ],
"setstyle" : 1,
"size" : 10,
"slidercolor" : [ 0.0, 0.588235294117647, 1.0, 1.0 ]
Expand All @@ -220,7 +298,7 @@
"numinlets" : 1,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 274.0, 240.0, 62.0, 23.0 ],
"patching_rect" : [ 274.0, 315.0, 62.0, 23.0 ],
"text" : "fl.tomax~"
}

Expand All @@ -234,7 +312,7 @@
"numoutlets" : 2,
"outlettype" : [ "", "" ],
"parameter_enable" : 0,
"patching_rect" : [ 30.0, 270.0, 223.0, 68.0 ],
"patching_rect" : [ 30.0, 345.0, 223.0, 68.0 ],
"setminmax" : [ 0.0, 1.0 ],
"setstyle" : 1,
"size" : 10,
Expand All @@ -249,7 +327,7 @@
"numinlets" : 1,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 30.0, 240.0, 62.0, 23.0 ],
"patching_rect" : [ 30.0, 315.0, 62.0, 23.0 ],
"text" : "fl.tomax~"
}

Expand All @@ -259,11 +337,11 @@
"color" : [ 0.0, 0.588235294117647, 1.0, 1.0 ],
"id" : "obj-33",
"maxclass" : "newobj",
"numinlets" : 1,
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 274.0, 195.0, 75.0, 23.0 ],
"text" : "fl.cumsum~"
"patching_rect" : [ 274.0, 285.0, 88.0, 23.0 ],
"text" : "fl.cumulative~"
}

}
Expand All @@ -274,30 +352,18 @@
"numinlets" : 2,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 30.0, 135.0, 131.0, 23.0 ],
"patching_rect" : [ 30.0, 225.0, 131.0, 23.0 ],
"text" : "fl.random~ /length 10"
}

}
, {
"box" : {
"id" : "obj-13",
"maxclass" : "newobj",
"numinlets" : 1,
"numoutlets" : 1,
"outlettype" : [ "" ],
"patching_rect" : [ 30.0, 90.0, 54.0, 23.0 ],
"text" : "fl.once~"
}

}
, {
"box" : {
"border" : 0,
"filename" : "fl.helpname.js",
"id" : "obj-3",
"ignoreclick" : 1,
"jsarguments" : [ "fl.cumsum~" ],
"jsarguments" : [ "fl.cumulative~" ],
"maxclass" : "jsui",
"numinlets" : 1,
"numoutlets" : 1,
Expand All @@ -310,24 +376,14 @@
],
"lines" : [ {
"patchline" : {
"destination" : [ "obj-32", 0 ],
"source" : [ "obj-13", 0 ]
}

}
, {
"patchline" : {
"destination" : [ "obj-33", 0 ],
"midpoints" : [ 39.5, 180.0, 283.5, 180.0 ],
"order" : 0,
"source" : [ "obj-32", 0 ]
"destination" : [ "obj-33", 1 ],
"source" : [ "obj-2", 0 ]
}

}
, {
"patchline" : {
"destination" : [ "obj-34", 0 ],
"order" : 1,
"destination" : [ "obj-9", 0 ],
"source" : [ "obj-32", 0 ]
}

Expand All @@ -352,6 +408,54 @@
"source" : [ "obj-36", 0 ]
}

}
, {
"patchline" : {
"destination" : [ "obj-2", 0 ],
"midpoints" : [ 39.5, 219.0, 330.0, 219.0, 330.0, 219.0, 352.5, 219.0 ],
"order" : 0,
"source" : [ "obj-5", 0 ]
}

}
, {
"patchline" : {
"destination" : [ "obj-32", 0 ],
"order" : 1,
"source" : [ "obj-5", 0 ]
}

}
, {
"patchline" : {
"destination" : [ "obj-2", 0 ],
"source" : [ "obj-7", 0 ]
}

}
, {
"patchline" : {
"destination" : [ "obj-7", 0 ],
"source" : [ "obj-8", 1 ]
}

}
, {
"patchline" : {
"destination" : [ "obj-33", 0 ],
"midpoints" : [ 39.5, 282.0, 283.5, 282.0 ],
"order" : 0,
"source" : [ "obj-9", 0 ]
}

}
, {
"patchline" : {
"destination" : [ "obj-34", 0 ],
"order" : 1,
"source" : [ "obj-9", 0 ]
}

}
],
"styles" : [ {
Expand Down Expand Up @@ -400,6 +504,20 @@
}
],
"lines" : [ ],
"parameters" : {
"obj-1::obj-8" : [ "live.tab[1]", "live.tab", 0 ],
"parameterbanks" : {
"0" : {
"index" : 0,
"name" : "",
"parameters" : [ "-", "-", "-", "-", "-", "-", "-", "-" ]
}

}
,
"inherited_shortname" : 1
}
,
"autosave" : 0
}

Expand Down
2 changes: 1 addition & 1 deletion FrameLib_Exports/FrameLib_Objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@

#include "../FrameLib_Objects/Vector/FrameLib_AccumPos.h"
#include "../FrameLib_Objects/Vector/FrameLib_Chop.h"
#include "../FrameLib_Objects/Vector/FrameLib_CumulativeSum.h"
#include "../FrameLib_Objects/Vector/FrameLib_Cumulative.h"
#include "../FrameLib_Objects/Vector/FrameLib_Deltas.h"
#include "../FrameLib_Objects/Vector/FrameLib_Join.h"
#include "../FrameLib_Objects/Vector/FrameLib_KernelSmooth.h"
Expand Down
2 changes: 1 addition & 1 deletion FrameLib_Max_Objects/Common/framelib_max.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,7 @@ extern "C" int C74_EXPORT main(void)

FrameLib_MaxClass_Expand<FrameLib_AccumPos>::makeClass("fl.accumpos~");
FrameLib_MaxClass_Expand<FrameLib_Chop>::makeClass("fl.chop~");
FrameLib_MaxClass_Expand<FrameLib_CumulativeSum>::makeClass("fl.cumsum~");
FrameLib_MaxClass_Expand<FrameLib_Cumulative>::makeClass("fl.cumulative~");
FrameLib_MaxClass_Expand<FrameLib_Deltas>::makeClass("fl.deltas~");
FrameLib_MaxClass_Expand<FrameLib_Join>::makeClass("fl.join~");
FrameLib_MaxClass_Expand<FrameLib_KernelSmooth>::makeClass("fl.kernelsmooth~");
6377 Expand Down
8 changes: 0 additions & 8 deletions FrameLib_Max_Objects/Vector/fl.cumsum~.cpp
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions FrameLib_Max_Objects/Vector/fl.cumulative~.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@

#include "FrameLib_Cumulative.h"
#include "FrameLib_MaxClass.h"

4AE7 extern "C" int C74_EXPORT main(void)
{
FrameLib_MaxClass_Expand<FrameLib_Cumulative>::makeClass("fl.cumulative~");
}
Loading
0