From 32a55f76aa047ac518e72d798b63379aa9f6694f Mon Sep 17 00:00:00 2001 From: fearne Date: Wed, 13 Sep 2023 02:05:47 +0100 Subject: [PATCH 1/7] Rename fl.cumsum~ to fl.cumulative~ --- ...cumsum~.maxhelp => fl.cumulative~.maxhelp} | 8 +- FrameLib_Exports/FrameLib_Objects.h | 2 +- FrameLib_Max_Objects/Common/framelib_max.cpp | 2 +- FrameLib_Max_Objects/Vector/fl.cumsum~.cpp | 8 - .../Vector/fl.cumulative~.cpp | 8 + ...ulativeSum.cpp => FrameLib_Cumulative.cpp} | 14 +- ..._CumulativeSum.h => FrameLib_Cumulative.h} | 8 +- FrameLib_PD_Objects/framelib_pd.cpp | 2 +- .../02_Common/framelib_objects.vcxproj | 4 +- ...cumsum~.vcxproj => fl.cumulative~.vcxproj} | 4 +- .../base_templates/cache/object_cache.json | 56 +++---- framelib.sln | 26 +-- framelib.xcodeproj/project.pbxproj | 152 +++++++++--------- .../framelib Max (objects build).xcscheme | 6 +- 14 files changed, 150 insertions(+), 150 deletions(-) rename Documentation/Max Documentation/content/help_files/internal_tabs/{fl.cumsum~.maxhelp => fl.cumulative~.maxhelp} (97%) delete mode 100644 FrameLib_Max_Objects/Vector/fl.cumsum~.cpp create mode 100644 FrameLib_Max_Objects/Vector/fl.cumulative~.cpp rename FrameLib_Objects/Vector/{FrameLib_CumulativeSum.cpp => FrameLib_Cumulative.cpp} (56%) rename FrameLib_Objects/Vector/{FrameLib_CumulativeSum.h => FrameLib_Cumulative.h} (57%) rename Projects/Visual_Studio/03_Max_Objects/{fl.cumsum~.vcxproj => fl.cumulative~.vcxproj} (97%) diff --git a/Documentation/Max Documentation/content/help_files/internal_tabs/fl.cumsum~.maxhelp b/Documentation/Max Documentation/content/help_files/internal_tabs/fl.cumulative~.maxhelp similarity index 97% rename from Documentation/Max Documentation/content/help_files/internal_tabs/fl.cumsum~.maxhelp rename to Documentation/Max Documentation/content/help_files/internal_tabs/fl.cumulative~.maxhelp index f65cfcd4..69c55cc1 100644 --- a/Documentation/Max Documentation/content/help_files/internal_tabs/fl.cumsum~.maxhelp +++ b/Documentation/Max Documentation/content/help_files/internal_tabs/fl.cumulative~.maxhelp @@ -156,7 +156,7 @@ "maxclass" : "comment", "numinlets" : 1, "numoutlets" : 0, - "patching_rect" : [ 351.0, 186.5, 189.0, 40.0 ], + "patching_rect" : [ 364.0, 186.5, 190.0, 40.0 ], "text" : "Keeps a running cumulative sum of the current frame" } @@ -262,8 +262,8 @@ "numinlets" : 1, "numoutlets" : 1, "outlettype" : [ "" ], - "patching_rect" : [ 274.0, 195.0, 75.0, 23.0 ], - "text" : "fl.cumsum~" + "patching_rect" : [ 274.0, 195.0, 88.0, 23.0 ], + "text" : "fl.cumulative~" } } @@ -297,7 +297,7 @@ "filename" : "fl.helpname.js", "id" : "obj-3", "ignoreclick" : 1, - "jsarguments" : [ "fl.cumsum~" ], + "jsarguments" : [ "fl.cumulative~" ], "maxclass" : "jsui", "numinlets" : 1, "numoutlets" : 1, diff --git a/FrameLib_Exports/FrameLib_Objects.h b/FrameLib_Exports/FrameLib_Objects.h index 94c5b5fe..cbd66245 100644 --- a/FrameLib_Exports/FrameLib_Objects.h +++ b/FrameLib_Exports/FrameLib_Objects.h @@ -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_Join.h" #include "../FrameLib_Objects/Vector/FrameLib_KernelSmooth.h" #include "../FrameLib_Objects/Vector/FrameLib_MedianFilter.h" diff --git a/FrameLib_Max_Objects/Common/framelib_max.cpp b/FrameLib_Max_Objects/Common/framelib_max.cpp index 8a7b1121..f15d59c0 100644 --- a/FrameLib_Max_Objects/Common/framelib_max.cpp +++ b/FrameLib_Max_Objects/Common/framelib_max.cpp @@ -139,7 +139,7 @@ extern "C" int C74_EXPORT main(void) FrameLib_MaxClass_Expand::makeClass("fl.accumpos~"); FrameLib_MaxClass_Expand::makeClass("fl.chop~"); - FrameLib_MaxClass_Expand::makeClass("fl.cumsum~"); + FrameLib_MaxClass_Expand::makeClass("fl.cumulative~"); FrameLib_MaxClass_Expand::makeClass("fl.join~"); FrameLib_MaxClass_Expand::makeClass("fl.kernelsmooth~"); FrameLib_MaxClass_Expand::makeClass("fl.medianfilter~"); diff --git a/FrameLib_Max_Objects/Vector/fl.cumsum~.cpp b/FrameLib_Max_Objects/Vector/fl.cumsum~.cpp deleted file mode 100644 index 401f90a8..00000000 --- a/FrameLib_Max_Objects/Vector/fl.cumsum~.cpp +++ /dev/null @@ -1,8 +0,0 @@ - -#include "FrameLib_CumulativeSum.h" -#include "FrameLib_MaxClass.h" - -extern "C" int C74_EXPORT main(void) -{ - FrameLib_MaxClass_Expand::makeClass("fl.cumsum~"); -} diff --git a/FrameLib_Max_Objects/Vector/fl.cumulative~.cpp b/FrameLib_Max_Objects/Vector/fl.cumulative~.cpp new file mode 100644 index 00000000..307e56f6 --- /dev/null +++ b/FrameLib_Max_Objects/Vector/fl.cumulative~.cpp @@ -0,0 +1,8 @@ + +#include "FrameLib_Cumulative.h" +#include "FrameLib_MaxClass.h" + +extern "C" int C74_EXPORT main(void) +{ + FrameLib_MaxClass_Expand::makeClass("fl.cumulative~"); +} diff --git a/FrameLib_Objects/Vector/FrameLib_CumulativeSum.cpp b/FrameLib_Objects/Vector/FrameLib_Cumulative.cpp similarity index 56% rename from FrameLib_Objects/Vector/FrameLib_CumulativeSum.cpp rename to FrameLib_Objects/Vector/FrameLib_Cumulative.cpp index 566fb8da..f4b21b68 100644 --- a/FrameLib_Objects/Vector/FrameLib_CumulativeSum.cpp +++ b/FrameLib_Objects/Vector/FrameLib_Cumulative.cpp @@ -1,37 +1,37 @@ -#include "FrameLib_CumulativeSum.h" +#include "FrameLib_Cumulative.h" #include // Constructor -FrameLib_CumulativeSum::FrameLib_CumulativeSum(FrameLib_Context context, const FrameLib_Parameters::Serial *serialisedParameters, FrameLib_Proxy *proxy) -: FrameLib_Processor(context, proxy, nullptr, 1, 1) +FrameLib_Cumulative::FrameLib_Cumulative(FrameLib_Context context, const FrameLib_Parameters::Serial *serialisedParameters, FrameLib_Proxy *proxy) + : FrameLib_Processor(context, proxy, nullptr, 1, 1) { mParameters.set(serialisedParameters); } // Info -std::string FrameLib_CumulativeSum::objectInfo(bool verbose) +std::string FrameLib_Cumulative::objectInfo(bool verbose) { return formatInfo("Computes the cumulative sum of the input frame: " "The output is the same length as the input." "Computes the cumulative sum of the input frame.", verbose); } -std::string FrameLib_CumulativeSum::inputInfo(unsigned long idx, bool verbose) +std::string FrameLib_Cumulative::inputInfo(unsigned long idx, bool verbose) { return "Input"; } -std::string FrameLib_CumulativeSum::outputInfo(unsigned long idx, bool verbose) +std::string FrameLib_Cumulative::outputInfo(unsigned long idx, bool verbose) { return "Output"; } // Process -void FrameLib_CumulativeSum::process() +void FrameLib_Cumulative::process() { unsigned long size; const double *input = getInput(0, &size); diff --git a/FrameLib_Objects/Vector/FrameLib_CumulativeSum.h b/FrameLib_Objects/Vector/FrameLib_Cumulative.h similarity index 57% rename from FrameLib_Objects/Vector/FrameLib_CumulativeSum.h rename to FrameLib_Objects/Vector/FrameLib_Cumulative.h index e1573683..bb575a0c 100644 --- a/FrameLib_Objects/Vector/FrameLib_CumulativeSum.h +++ b/FrameLib_Objects/Vector/FrameLib_Cumulative.h @@ -1,16 +1,16 @@ -#ifndef FRAMELIB_CUMULATIVESUM_H -#define FRAMELIB_CUMULATIVESUM_H +#ifndef FRAMELIB_CUMULATIVE_H +#define FRAMELIB_CUMULATIVE_H #include "FrameLib_DSP.h" -class FrameLib_CumulativeSum final : public FrameLib_Processor +class FrameLib_Cumulative final : public FrameLib_Processor { public: // Constructor - FrameLib_CumulativeSum(FrameLib_Context context, const FrameLib_Parameters::Serial *serialisedParameters, FrameLib_Proxy *proxy); + FrameLib_Cumulative(FrameLib_Context context, const FrameLib_Parameters::Serial *serialisedParameters, FrameLib_Proxy *proxy); // Info diff --git a/FrameLib_PD_Objects/framelib_pd.cpp b/FrameLib_PD_Objects/framelib_pd.cpp index b9a33890..e96fe568 100644 --- a/FrameLib_PD_Objects/framelib_pd.cpp +++ b/FrameLib_PD_Objects/framelib_pd.cpp @@ -715,7 +715,7 @@ PD_API void framelib_pd_setup(void) FrameLib_PDClass_Expand::makeClass("fl.accumpos~"); FrameLib_PDClass_Expand::makeClass("fl.chop~"); - FrameLib_PDClass_Expand::makeClass("fl.cumsum~"); + FrameLib_PDClass_Expand::makeClass("fl.cumulative~"); FrameLib_PDClass_Expand::makeClass("fl.join~"); FrameLib_PDClass_Expand::makeClass("fl.kernelsmooth~"); FrameLib_PDClass_Expand::makeClass("fl.medianfilter~"); diff --git a/Projects/Visual_Studio/02_Common/framelib_objects.vcxproj b/Projects/Visual_Studio/02_Common/framelib_objects.vcxproj index c4baac3f..1faa21bd 100644 --- a/Projects/Visual_Studio/02_Common/framelib_objects.vcxproj +++ b/Projects/Visual_Studio/02_Common/framelib_objects.vcxproj @@ -120,7 +120,7 @@ - + @@ -210,7 +210,7 @@ - + diff --git a/Projects/Visual_Studio/03_Max_Objects/fl.cumsum~.vcxproj b/Projects/Visual_Studio/03_Max_Objects/fl.cumulative~.vcxproj similarity index 97% rename from Projects/Visual_Studio/03_Max_Objects/fl.cumsum~.vcxproj rename to Projects/Visual_Studio/03_Max_Objects/fl.cumulative~.vcxproj index df8f4e3a..a9a39b74 100644 --- a/Projects/Visual_Studio/03_Max_Objects/fl.cumsum~.vcxproj +++ b/Projects/Visual_Studio/03_Max_Objects/fl.cumulative~.vcxproj @@ -11,11 +11,11 @@ - + 15.0 - {74551166-1A22-4B18-B905-63D3DB83CB88} + {52B1E13C-6248-41B9-A4A2-17460246962E} Win32Proj framelib 10.0 diff --git a/Scripts/project_tools/base_templates/cache/object_cache.json b/Scripts/project_tools/base_templates/cache/object_cache.json index 9c0a7767..20bc9d57 100644 --- a/Scripts/project_tools/base_templates/cache/object_cache.json +++ b/Scripts/project_tools/base_templates/cache/object_cache.json @@ -5949,38 +5949,38 @@ "xc_group_object_guid": "5A3CAB102052E625001082E3", "xc_group_max_guid": "5AB54BBD2052E95000325C14" }, - "fl.cumsum~": { - "object_class": "FrameLib_CumulativeSum", - "object_class_name_upper": "FRAMELIB_CUMULATIVESUM", - "object_class_file": "FrameLib_CumulativeSum", - "max_class_name": "fl.cumsum~", - "pd_class_name": "fl.cumsum~", + "fl.cumulative~": { + "object_class": "FrameLib_Cumulative", + "object_class_name_upper": "FRAMELIB_CUMULATIVE", + "object_class_file": "FrameLib_Cumulative", + "max_class_name": "fl.cumulative~", + "pd_class_name": "fl.cumulative~", "max_host_class": "FrameLib_MaxClass_Expand", "pd_host_class": "FrameLib_PDClass_Expand", "args_str": "", "category": "Vector", - "vs_project_guid": "74551166-1A22-4B18-B905-63D3DB83CB88", - "xc_obj_target_guid": "B96F4817B81C02BB60093C22", - "xc_obj_package_dep_guid": "7D99449F9D0910E46D8C173B", - "xc_obj_lib_dep_guid": "4E954E62BB15D4E17BD28908", - "xc_obj_lib_proxy_guid": "D8514E5F970A9E2B47C962C8", - "xc_obj_target_proxy_guid": "82034D6A9AC7198C41CDDAF4", - "xc_obj_sources_guid": "359345F78C4A39243EEAE70D", - "xc_obj_frameworks_guid": "299343ECA42E92F45D5C4DC3", - "xc_obj_file_class_guid": "819B4464BC42D26DC808E19A", - "xc_obj_file_object_guid": "8FDA4B53B2BDDFED65E7BFA5", - "xc_obj_file_lib_guid": "4C0548C491204CB940595E5F", - "xc_obj_file_object_lib_guid": "3B4A4E6BBE53323741DDFFED", - "xc_obj_file_fft_guid": "", - "xc_obj_file_ibuffer_guid": "", - "xc_obj_fileref_class_guid": "195E4AB6A63FEB379176C4F2", - "xc_obj_fileref_object_guid": "015A44469AF93BCF2B8AC4CD", - "xc_obj_fileref_header_guid": "8A894DC59FD4E07B5634308D", - "xc_obj_fileref_mxo_guid": "60DC4B4EB042426B79E12443", - "xc_obj_config_list_guid": "A1744BFAB3B83E7729DC19D2", - "xc_obj_config_dvmt_guid": "120F45EDAD9F5FF59B935DE7", - "xc_obj_config_dplt_guid": "F8D647B8AA4D2AE4AA38DCFB", - "xc_obj_config_test_guid": "152140289BE72CC27A211FAF", + "vs_project_guid": "52B1E13C-6248-41B9-A4A2-17460246962E", + "xc_obj_target_guid": "97BE4FE7B88E80777DC03D98", + "xc_obj_package_dep_guid": "276B428C99BD6D517070B914", + "xc_obj_lib_dep_guid": "1A164CA69F8EA0D4C578C03B", + "xc_obj_lib_proxy_guid": "757F411A9FB6BCFC45915D5F", + "xc_obj_target_proxy_guid": "1E684348BAB85C4AC13B489D", + "xc_obj_sources_guid": "AA08485D924A65F3F96C056E", + "xc_obj_frameworks_guid": "3CAB48DE8E3CBD3C3E8B9A74", + "xc_obj_file_class_guid": "3E204927B975EF0BF815E4A0", + "xc_obj_file_object_guid": "88A045CBB2614E3EE65E8062", + "xc_obj_file_lib_guid": "CFFB43179CE406088D0BD70F", + "xc_obj_file_object_lib_guid": "AB6E4BEB99B7D9C3C9516BC5", + "xc_obj_file_fft_guid": "", + "xc_obj_file_ibuffer_guid": "", + "xc_obj_fileref_class_guid": "92AC4FB38B633018A603AD7A", + "xc_obj_fileref_object_guid": "1DE34B63BCCD867B215E66C9", + "xc_obj_fileref_header_guid": "D7534214A3C9EAF9659F2538", + "xc_obj_fileref_mxo_guid": "A54843A2BD742E45FE4CE64C", + "xc_obj_config_list_guid": "018B4F4B9673C05BFE4282ED", + "xc_obj_config_dvmt_guid": "22C04994B7B8B9414AB672DB", + "xc_obj_config_dplt_guid": "3B67493CAA825692147A6067", + "xc_obj_config_test_guid": "CF46405CA61A079502150542", "xc_group_object_guid": "B85B68D019F26185002D6F1D", "xc_group_max_guid": "B8F83E2719C78D7A00230CD4" } diff --git a/framelib.sln b/framelib.sln index 909c3ec4..a3847809 100644 --- a/framelib.sln +++ b/framelib.sln @@ -62,7 +62,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "framelib_objects_max", "Pro {8B885C32-2253-4B9B-9FDA-70A012CBE62E} = {8B885C32-2253-4B9B-9FDA-70A012CBE62E} {204E46C9-E53D-4028-8188-791B01BA862F} = {204E46C9-E53D-4028-8188-791B01BA862F} {60EE72AF-E131-40D7-AB58-E33361FA67AE} = {60EE72AF-E131-40D7-AB58-E33361FA67AE} - {74551166-1A22-4B18-B905-63D3DB83CB88} = {74551166-1A22-4B18-B905-63D3DB83CB88} + {52B1E13C-6248-41B9-A4A2-17460246962E} = {52B1E13C-6248-41B9-A4A2-17460246962E} {E0DF2E82-8E09-4CDC-B133-CFF712198F0D} = {E0DF2E82-8E09-4CDC-B133-CFF712198F0D} {17940BEA-08D0-4ADF-A193-07D71E0BFD1F} = {17940BEA-08D0-4ADF-A193-07D71E0BFD1F} {ECFB830E-DE05-49DF-AF71-15420D50E3BA} = {ECFB830E-DE05-49DF-AF71-15420D50E3BA} @@ -482,7 +482,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fl.crest~", "Projects\Visua {A4E2A0AE-C945-4C8A-BAD6-B40660578BC3} = {A4E2A0AE-C945-4C8A-BAD6-B40660578BC3} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fl.cumsum~", "Projects\Visual_Studio\03_Max_Objects\fl.cumsum~.vcxproj", "{74551166-1A22-4B18-B905-63D3DB83CB88}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "fl.cumulative~", "Projects\Visual_Studio\03_Max_Objects\fl.cumulative~.vcxproj", "{52B1E13C-6248-41B9-A4A2-17460246962E}" ProjectSection(ProjectDependencies) = postProject {15B7B576-7125-46F8-AFF1-976F8E4685A7} = {15B7B576-7125-46F8-AFF1-976F8E4685A7} {A4E2A0AE-C945-4C8A-BAD6-B40660578BC3} = {A4E2A0AE-C945-4C8A-BAD6-B40660578BC3} @@ -1756,16 +1756,16 @@ Global {60EE72AF-E131-40D7-AB58-E33361FA67AE}.Static|x64.Build.0 = Release|x64 {60EE72AF-E131-40D7-AB58-E33361FA67AE}.Static|x86.ActiveCfg = Release|x64 {60EE72AF-E131-40D7-AB58-E33361FA67AE}.Static|x86.Build.0 = Release|x64 - {74551166-1A22-4B18-B905-63D3DB83CB88}.Debug|x64.ActiveCfg = Debug|x64 - {74551166-1A22-4B18-B905-63D3DB83CB88}.Debug|x64.Build.0 = Debug|x64 - {74551166-1A22-4B18-B905-63D3DB83CB88}.Debug|x86.ActiveCfg = Debug|x64 - {74551166-1A22-4B18-B905-63D3DB83CB88}.Release|x64.ActiveCfg = Release|x64 - {74551166-1A22-4B18-B905-63D3DB83CB88}.Release|x64.Build.0 = Release|x64 - {74551166-1A22-4B18-B905-63D3DB83CB88}.Release|x86.ActiveCfg = Release|x64 - {74551166-1A22-4B18-B905-63D3DB83CB88}.Static|x64.ActiveCfg = Release|x64 - {74551166-1A22-4B18-B905-63D3DB83CB88}.Static|x64.Build.0 = Release|x64 - {74551166-1A22-4B18-B905-63D3DB83CB88}.Static|x86.ActiveCfg = Release|x64 - {74551166-1A22-4B18-B905-63D3DB83CB88}.Static|x86.Build.0 = Release|x64 + {52B1E13C-6248-41B9-A4A2-17460246962E}.Debug|x64.ActiveCfg = Debug|x64 + {52B1E13C-6248-41B9-A4A2-17460246962E}.Debug|x64.Build.0 = Debug|x64 + {52B1E13C-6248-41B9-A4A2-17460246962E}.Debug|x86.ActiveCfg = Debug|x64 + {52B1E13C-6248-41B9-A4A2-17460246962E}.Release|x64.ActiveCfg = Release|x64 + {52B1E13C-6248-41B9-A4A2-17460246962E}.Release|x64.Build.0 = Release|x64 + {52B1E13C-6248-41B9-A4A2-17460246962E}.Release|x86.ActiveCfg = Release|x64 + {52B1E13C-6248-41B9-A4A2-17460246962E}.Static|x64.ActiveCfg = Release|x64 + {52B1E13C-6248-41B9-A4A2-17460246962E}.Static|x64.Build.0 = Release|x64 + {52B1E13C-6248-41B9-A4A2-17460246962E}.Static|x86.ActiveCfg = Release|x64 + {52B1E13C-6248-41B9-A4A2-17460246962E}.Static|x86.Build.0 = Release|x64 {E0DF2E82-8E09-4CDC-B133-CFF712198F0D}.Debug|x64.ActiveCfg = Debug|x64 {E0DF2E82-8E09-4CDC-B133-CFF712198F0D}.Debug|x64.Build.0 = Debug|x64 {E0DF2E82-8E09-4CDC-B133-CFF712198F0D}.Debug|x86.ActiveCfg = Debug|x64 @@ -3040,7 +3040,7 @@ Global {8B885C32-2253-4B9B-9FDA-70A012CBE62E} = {C4A2EA66-4867-49C3-8282-172AF6225B78} {204E46C9-E53D-4028-8188-791B01BA862F} = {C4A2EA66-4867-49C3-8282-172AF6225B78} {60EE72AF-E131-40D7-AB58-E33361FA67AE} = {C4A2EA66-4867-49C3-8282-172AF6225B78} - {74551166-1A22-4B18-B905-63D3DB83CB88} = {C4A2EA66-4867-49C3-8282-172AF6225B78} + {52B1E13C-6248-41B9-A4A2-17460246962E} = {C4A2EA66-4867-49C3-8282-172AF6225B78} {E0DF2E82-8E09-4CDC-B133-CFF712198F0D} = {C4A2EA66-4867-49C3-8282-172AF6225B78} {17940BEA-08D0-4ADF-A193-07D71E0BFD1F} = {C4A2EA66-4867-49C3-8282-172AF6225B78} {ECFB830E-DE05-49DF-AF71-15420D50E3BA} = {C4A2EA66-4867-49C3-8282-172AF6225B78} diff --git a/framelib.xcodeproj/project.pbxproj b/framelib.xcodeproj/project.pbxproj index fbb0a5b6..2c881ffc 100644 --- a/framelib.xcodeproj/project.pbxproj +++ b/framelib.xcodeproj/project.pbxproj @@ -63,7 +63,7 @@ B8C2BBE927CD9BD500B161F9 /* PBXTargetDependency */, B8C2BBEB27CD9BD500B161F9 /* PBXTargetDependency */, B8C2BBED27CD9BD500B161F9 /* PBXTargetDependency */, - 7D99449F9D0910E46D8C173B /* PBXTargetDependency */, + 276B428C99BD6D517070B914 /* PBXTargetDependency */, B8C2BBEF27CD9BD500B161F9 /* PBXTargetDependency */, B8C2BBF127CD9BD500B161F9 /* PBXTargetDependency */, B8C2BBF327CD9BD500B161F9 /* PBXTargetDependency */, @@ -193,16 +193,15 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 3B4A4E6BBE53323741DDFFED /* FrameLib_CumulativeSum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 015A44469AF93BCF2B8AC4CD /* FrameLib_CumulativeSum.cpp */; }; - 4C0548C491204CB940595E5F /* libframelib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B89ABA901FA73483006DAD53 /* libframelib.a */; }; + 3E204927B975EF0BF815E4A0 /* fl.cumulative~.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92AC4FB38B633018A603AD7A /* fl.cumulative~.cpp */; }; 5A3CAB1E2052E7E8001082E3 /* libframelib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B89ABA901FA73483006DAD53 /* libframelib.a */; }; 5AB54BBF2052E96E00325C14 /* fl.wrap~.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5AB54BBE2052E96E00325C14 /* fl.wrap~.cpp */; }; 5AB54BC92052EAD700325C14 /* libframelib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B89ABA901FA73483006DAD53 /* libframelib.a */; }; 5AB54BDC2052EAE900325C14 /* libframelib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B89ABA901FA73483006DAD53 /* libframelib.a */; }; 5AB54BE72052EB4400325C14 /* fl.clip~.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5AB54BE62052EB4400325C14 /* fl.clip~.cpp */; }; 5AB54BE92052EB6100325C14 /* fl.fold~.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5AB54BE82052EB6100325C14 /* fl.fold~.cpp */; }; - 819B4464BC42D26DC808E19A /* fl.cumsum~.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 195E4AB6A63FEB379176C4F2 /* fl.cumsum~.cpp */; }; - 8FDA4B53B2BDDFED65E7BFA5 /* FrameLib_CumulativeSum.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 015A44469AF93BCF2B8AC4CD /* FrameLib_CumulativeSum.cpp */; }; + 88A045CBB2614E3EE65E8062 /* FrameLib_Cumulative.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1DE34B63BCCD867B215E66C9 /* FrameLib_Cumulative.cpp */; }; + AB6E4BEB99B7D9C3C9516BC5 /* FrameLib_Cumulative.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1DE34B63BCCD867B215E66C9 /* FrameLib_Cumulative.cpp */; }; B802047C231BDCB80062447A /* HISSTools_FFT.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B85435731F65BF03001BA1AA /* HISSTools_FFT.cpp */; }; B8020488231BDD0F0062447A /* framelib_max.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B8020487231BDD0A0062447A /* framelib_max.cpp */; }; B802048B231BDD650062447A /* libframelib_objects.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B8BA6FD22078D49200D3DB3D /* libframelib_objects.a */; }; @@ -754,9 +753,17 @@ B8F83EA719C78F9400230CD4 /* fl.framemax~.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B8F83E2B19C78E0000230CD4 /* fl.framemax~.cpp */; }; B8F83EA819C78F9800230CD4 /* fl.framemin~.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B8F83E2A19C78DF600230CD4 /* fl.framemin~.cpp */; }; B8F83EBD19C79D0200230CD4 /* fl.ramp~.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B8F83EBC19C79D0200230CD4 /* fl.ramp~.cpp */; }; + CFFB43179CE406088D0BD70F /* libframelib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B89ABA901FA73483006DAD53 /* libframelib.a */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ + 1E684348BAB85C4AC13B489D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 089C1669FE841209C02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 97BE4FE7B88E80777DC03D98; + remoteInfo = "fl.cumulative~"; + }; 5A3CAB172052E7E8001082E3 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 089C1669FE841209C02AAC07 /* Project object */; @@ -778,12 +785,12 @@ remoteGlobalIDString = B89ABA8F1FA73483006DAD53; remoteInfo = framelib; }; - 82034D6A9AC7198C41CDDAF4 /* PBXContainerItemProxy */ = { + 757F411A9FB6BCFC45915D5F /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 089C1669FE841209C02AAC07 /* Project object */; proxyType = 1; - remoteGlobalIDString = B96F4817B81C02BB60093C22; - remoteInfo = "fl.cumsum~"; + remoteGlobalIDString = B89ABA8F1FA73483006DAD53; + remoteInfo = framelib; }; B8020489231BDD490062447A /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; @@ -3214,13 +3221,6 @@ remoteGlobalIDString = B89ABA8F1FA73483006DAD53; remoteInfo = framelib; }; - D8514E5F970A9E2B47C962C8 /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 089C1669FE841209C02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = B89ABA8F1FA73483006DAD53; - remoteInfo = framelib; - }; /* End PBXContainerItemProxy section */ /* Begin PBXCopyFilesBuildPhase section */ @@ -3237,8 +3237,7 @@ /* End PBXCopyFilesBuildPhase section */ /* Begin PBXFileReference section */ - 015A44469AF93BCF2B8AC4CD /* FrameLib_CumulativeSum.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = FrameLib_CumulativeSum.cpp; sourceTree = ""; }; - 195E4AB6A63FEB379176C4F2 /* fl.cumsum~.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = "fl.cumsum~.cpp"; sourceTree = ""; }; + 1DE34B63BCCD867B215E66C9 /* FrameLib_Cumulative.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = FrameLib_Cumulative.cpp; sourceTree = ""; }; 5A3CAB132052E67E001082E3 /* FrameLib_Ternary_Objects.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FrameLib_Ternary_Objects.h; sourceTree = ""; }; 5A3CAB142052E67E001082E3 /* FrameLib_Ternary_Template.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FrameLib_Ternary_Template.h; sourceTree = ""; }; 5A3CAB262052E7E8001082E3 /* fl.wrap~.mxo */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "fl.wrap~.mxo"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -3247,8 +3246,8 @@ 5AB54BE42052EAE900325C14 /* fl.fold~.mxo */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "fl.fold~.mxo"; sourceTree = BUILT_PRODUCTS_DIR; }; 5AB54BE62052EB4400325C14 /* fl.clip~.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = "fl.clip~.cpp"; sourceTree = ""; }; 5AB54BE82052EB6100325C14 /* fl.fold~.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = "fl.fold~.cpp"; sourceTree = ""; }; - 60DC4B4EB042426B79E12443 /* fl.cumsum~.mxo */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "fl.cumsum~.mxo"; sourceTree = BUILT_PRODUCTS_DIR; }; - 8A894DC59FD4E07B5634308D /* FrameLib_CumulativeSum.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FrameLib_CumulativeSum.h; sourceTree = ""; }; + 92AC4FB38B633018A603AD7A /* fl.cumulative~.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = "fl.cumulative~.cpp"; sourceTree = ""; }; + A54843A2BD742E45FE4CE64C /* fl.cumulative~.mxo */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "fl.cumulative~.mxo"; sourceTree = BUILT_PRODUCTS_DIR; }; B8020485231BDCB80062447A /* framelib_max.mxo */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = framelib_max.mxo; sourceTree = BUILT_PRODUCTS_DIR; }; B8020487231BDD0A0062447A /* framelib_max.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = framelib_max.cpp; sourceTree = ""; }; B805E23419C3AD0A007D8D8B /* fl.minus~.mxo */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "fl.minus~.mxo"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -3863,14 +3862,15 @@ B8FAA16024F0831D00089391 /* FrameLib_Edges.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FrameLib_Edges.h; sourceTree = ""; }; B8FD919D197F0F6C00437EB5 /* FrameLib_FixedPoint.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FrameLib_FixedPoint.h; sourceTree = ""; }; B8FD919E197F40B200437EB5 /* FrameLib_Types.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FrameLib_Types.h; sourceTree = ""; }; + D7534214A3C9EAF9659F2538 /* FrameLib_Cumulative.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FrameLib_Cumulative.h; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ - 299343ECA42E92F45D5C4DC3 /* Frameworks */ = { + 3CAB48DE8E3CBD3C3E8B9A74 /* Frameworks */ = { isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 4C0548C491204CB940595E5F /* libframelib.a in Frameworks */, + CFFB43179CE406088D0BD70F /* libframelib.a in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -5410,7 +5410,7 @@ B809BE1019C42CEF00BA41F4 /* fl.cosh~.mxo */, B809BF9A19C42D6400BA41F4 /* fl.cos~.mxo */, B8C89CD11F571FDD00B4E700 /* fl.crest~.mxo */, - 60DC4B4EB042426B79E12443 /* fl.cumsum~.mxo */, + A54843A2BD742E45FE4CE64C /* fl.cumulative~.mxo */, B805E32E19C3AE00007D8D8B /* fl.diff~.mxo */, B87E9DED1F8DAE820000886E /* fl.dispatch~.mxo */, B805E25619C3AD11007D8D8B /* fl.divide~.mxo */, @@ -5825,8 +5825,8 @@ B84A40591FD73D2100A30455 /* FrameLib_AccumPos.cpp */, B84943CA1B837B610037DFF1 /* FrameLib_Chop.h */, B8891CE11F2C8DEA00C5C4F0 /* FrameLib_Chop.cpp */, - 8A894DC59FD4E07B5634308D /* FrameLib_CumulativeSum.h */, - 015A44469AF93BCF2B8AC4CD /* FrameLib_CumulativeSum.cpp */, + D7534214A3C9EAF9659F2538 /* FrameLib_Cumulative.h */, + 1DE34B63BCCD867B215E66C9 /* FrameLib_Cumulative.cpp */, B85B68E619F29470002D6F1D /* FrameLib_Join.h */, B8891CE51F2C90CE00C5C4F0 /* FrameLib_Join.cpp */, B85536D722FEB74F00D10495 /* FrameLib_KernelSmooth.h */, @@ -6447,7 +6447,7 @@ B8C89CD51F57210600B4E700 /* fl.centroid~.cpp */, B84943C91B837B3C0037DFF1 /* fl.chop~.cpp */, B8C89CDF1F57217A00B4E700 /* fl.crest~.cpp */, - 195E4AB6A63FEB379176C4F2 /* fl.cumsum~.cpp */, + 92AC4FB38B633018A603AD7A /* fl.cumulative~.cpp */, B8C89CFE1F57242500B4E700 /* fl.flatness~.cpp */, B8F83E2B19C78E0000230CD4 /* fl.framemax~.cpp */, B8F83E2A19C78DF600230CD4 /* fl.framemin~.cpp */, @@ -6572,6 +6572,24 @@ productReference = B81F571D0D2422E0000D5E50 /* fl.unpack~.mxo */; productType = "com.apple.product-type.bundle"; }; + 97BE4FE7B88E80777DC03D98 /* fl.cumulative~ */ = { + isa = PBXNativeTarget; + buildConfigurationList = 018B4F4B9673C05BFE4282ED /* Build configuration list for PBXNativeTarget "fl.cumulative~" */; + buildPhases = ( + AA08485D924A65F3F96C056E /* Sources */, + 3CAB48DE8E3CBD3C3E8B9A74 /* Frameworks */, + ); + buildRules = ( + ); + dependencies = ( + 1A164CA69F8EA0D4C578C03B /* PBXTargetDependency */, + ); + name = "fl.cumulative~"; + productInstallPath = "$(HOME)/Library/Bundles"; + productName = MSPExternal; + productReference = A54843A2BD742E45FE4CE64C /* fl.cumulative~.mxo */; + productType = "com.apple.product-type.bundle"; + }; B8020472231BDCB80062447A /* framelib_max */ = { isa = PBXNativeTarget; buildConfigurationList = B8020481231BDCB80062447A /* Build configuration list for PBXNativeTarget "framelib_max" */; @@ -9735,24 +9753,6 @@ productReference = B8F83EBA19C79CC900230CD4 /* fl.ramp~.mxo */; productType = "com.apple.product-type.bundle"; }; - B96F4817B81C02BB60093C22 /* fl.cumsum~ */ = { - isa = PBXNativeTarget; - buildConfigurationList = A1744BFAB3B83E7729DC19D2 /* Build configuration list for PBXNativeTarget "fl.cumsum~" */; - buildPhases = ( - 359345F78C4A39243EEAE70D /* Sources */, - 299343ECA42E92F45D5C4DC3 /* Frameworks */, - ); - buildRules = ( - ); - dependencies = ( - 4E954E62BB15D4E17BD28908 /* PBXTargetDependency */, - ); - name = "fl.cumsum~"; - productInstallPath = "$(HOME)/Library/Bundles"; - productName = MSPExternal; - productReference = 60DC4B4EB042426B79E12443 /* fl.cumsum~.mxo */; - productType = "com.apple.product-type.bundle"; - }; /* End PBXNativeTarget section */ /* Begin PBXProject section */ @@ -9856,7 +9856,7 @@ B809BE0119C42CEF00BA41F4 /* fl.cosh~ */, B809BF8C19C42D6400BA41F4 /* fl.cos~ */, B8C89CB61F571FDD00B4E700 /* fl.crest~ */, - B96F4817B81C02BB60093C22 /* fl.cumsum~ */, + 97BE4FE7B88E80777DC03D98 /* fl.cumulative~ */, B805E31F19C3AE00007D8D8B /* fl.diff~ */, B87E9DD11F8DAE820000886E /* fl.dispatch~ */, B805E24719C3AD11007D8D8B /* fl.divide~ */, @@ -10037,15 +10037,6 @@ /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ - 359345F78C4A39243EEAE70D /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 819B4464BC42D26DC808E19A /* fl.cumsum~.cpp in Sources */, - 8FDA4B53B2BDDFED65E7BFA5 /* FrameLib_CumulativeSum.cpp in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; 5A3CAB1A2052E7E8001082E3 /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -10079,6 +10070,15 @@ ); runOnlyForDeploymentPostprocessing = 0; }; + AA08485D924A65F3F96C056E /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 3E204927B975EF0BF815E4A0 /* fl.cumulative~.cpp in Sources */, + 88A045CBB2614E3EE65E8062 /* FrameLib_Cumulative.cpp in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; B8020479231BDCB80062447A /* Sources */ = { isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; @@ -11238,7 +11238,7 @@ B8BA6FFC2078D5D000D3DB3D /* FrameLib_Convert.cpp in Sources */, B8BA70112078F2C600D3DB3D /* FrameLib_Convolve.cpp in Sources */, B8BA70122078F2D400D3DB3D /* FrameLib_Correlate.cpp in Sources */, - 3B4A4E6BBE53323741DDFFED /* FrameLib_CumulativeSum.cpp in Sources */, + AB6E4BEB99B7D9C3C9516BC5 /* FrameLib_Cumulative.cpp in Sources */, B8BA6FF12078D59E00D3DB3D /* FrameLib_Dispatch.cpp in Sources */, B812606C20D697C2000B81D9 /* FrameLib_Expression.cpp in Sources */, B8BA700E2078F2BD00D3DB3D /* FrameLib_FFT.cpp in Sources */, @@ -11686,10 +11686,15 @@ /* End PBXSourcesBuildPhase section */ /* Begin PBXTargetDependency section */ - 4E954E62BB15D4E17BD28908 /* PBXTargetDependency */ = { + 1A164CA69F8EA0D4C578C03B /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = B89ABA8F1FA73483006DAD53 /* framelib */; - targetProxy = D8514E5F970A9E2B47C962C8 /* PBXContainerItemProxy */; + targetProxy = 757F411A9FB6BCFC45915D5F /* PBXContainerItemProxy */; + }; + 276B428C99BD6D517070B914 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 97BE4FE7B88E80777DC03D98 /* fl.cumulative~ */; + targetProxy = 1E684348BAB85C4AC13B489D /* PBXContainerItemProxy */; }; 5A3CAB162052E7E8001082E3 /* PBXTargetDependency */ = { isa = PBXTargetDependency; @@ -11706,11 +11711,6 @@ target = B89ABA8F1FA73483006DAD53 /* framelib */; targetProxy = 5AB54BD52052EAE900325C14 /* PBXContainerItemProxy */; }; - 7D99449F9D0910E46D8C173B /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = B96F4817B81C02BB60093C22 /* fl.cumsum~ */; - targetProxy = 82034D6A9AC7198C41CDDAF4 /* PBXContainerItemProxy */; - }; B802048A231BDD490062447A /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = B8BA6FD12078D49200D3DB3D /* framelib_objects */; @@ -13568,19 +13568,19 @@ }; name = Deployment; }; - 120F45EDAD9F5FF59B935DE7 /* Development */ = { + 22C04994B7B8B9414AB672DB /* Development */ = { isa = XCBuildConfiguration; baseConfigurationReference = B81CE02C207FC02000EAC64C /* Config_FrameLib_Max.xcconfig */; buildSettings = { }; name = Development; }; - 152140289BE72CC27A211FAF /* Public Testing */ = { + 3B67493CAA825692147A6067 /* Deployment */ = { isa = XCBuildConfiguration; baseConfigurationReference = B81CE02C207FC02000EAC64C /* Config_FrameLib_Max.xcconfig */; buildSettings = { }; - name = "Public Testing"; + name = Deployment; }; 5A3CAB222052E7E8001082E3 /* Development */ = { isa = XCBuildConfiguration; @@ -18372,16 +18372,26 @@ }; name = Deployment; }; - F8D647B8AA4D2AE4AA38DCFB /* Deployment */ = { + CF46405CA61A079502150542 /* Public Testing */ = { isa = XCBuildConfiguration; baseConfigurationReference = B81CE02C207FC02000EAC64C /* Config_FrameLib_Max.xcconfig */; buildSettings = { }; - name = Deployment; + name = "Public Testing"; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ + 018B4F4B9673C05BFE4282ED /* Build configuration list for PBXNativeTarget "fl.cumulative~" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 22C04994B7B8B9414AB672DB /* Development */, + 3B67493CAA825692147A6067 /* Deployment */, + CF46405CA61A079502150542 /* Public Testing */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Development; + }; 0FFBC540097463A900D78707 /* Build configuration list for PBXNativeTarget "fl.unpack~" */ = { isa = XCConfigurationList; buildConfigurations = ( @@ -18432,16 +18442,6 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Development; }; - A1744BFAB3B83E7729DC19D2 /* Build configuration list for PBXNativeTarget "fl.cumsum~" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 120F45EDAD9F5FF59B935DE7 /* Development */, - F8D647B8AA4D2AE4AA38DCFB /* Deployment */, - 152140289BE72CC27A211FAF /* Public Testing */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Development; - }; B8020481231BDCB80062447A /* Build configuration list for PBXNativeTarget "framelib_max" */ = { isa = XCConfigurationList; buildConfigurations = ( diff --git a/framelib.xcodeproj/xcshareddata/xcschemes/framelib Max (objects build).xcscheme b/framelib.xcodeproj/xcshareddata/xcschemes/framelib Max (objects build).xcscheme index 5e5dd67a..41acf9e4 100644 --- a/framelib.xcodeproj/xcshareddata/xcschemes/framelib Max (objects build).xcscheme +++ b/framelib.xcodeproj/xcshareddata/xcschemes/framelib Max (objects build).xcscheme @@ -686,9 +686,9 @@ buildForAnalyzing = "YES"> From 8de24039238403da589f4f6dd1d76aa72b4e7dac Mon Sep 17 00:00:00 2001 From: fearne Date: Wed, 13 Sep 2023 02:52:04 +0100 Subject: [PATCH 2/7] Params & info --- .../Vector/FrameLib_Cumulative.cpp | 26 ++++++++++++++++--- FrameLib_Objects/Vector/FrameLib_Cumulative.h | 11 ++++++++ 2 files changed, 33 insertions(+), 4 deletions(-) diff --git a/FrameLib_Objects/Vector/FrameLib_Cumulative.cpp b/FrameLib_Objects/Vector/FrameLib_Cumulative.cpp index f4b21b68..b19d4072 100644 --- a/FrameLib_Objects/Vector/FrameLib_Cumulative.cpp +++ b/FrameLib_Objects/Vector/FrameLib_Cumulative.cpp @@ -5,23 +5,32 @@ // Constructor FrameLib_Cumulative::FrameLib_Cumulative(FrameLib_Context context, const FrameLib_Parameters::Serial *serialisedParameters, FrameLib_Proxy *proxy) - : FrameLib_Processor(context, proxy, nullptr, 1, 1) + : FrameLib_Processor(context, proxy, &sParamInfo, 2, 1) { + mParameters.addEnum(kMode, "mode", 0); + mParameters.addEnumItem(kSum, "sum", true); + mParameters.addEnumItem(kProduct, "product"); + mParameters.set(serialisedParameters); + + setParameterInput(1); } // Info std::string FrameLib_Cumulative::objectInfo(bool verbose) { - return formatInfo("Computes the cumulative sum of the input frame: " + return formatInfo("Performs a cumulative function on the input frame: " "The output is the same length as the input." - "Computes the cumulative sum of the input frame.", verbose); + "Performs a cumulative function on the input frame.", verbose); } std::string FrameLib_Cumulative::inputInfo(unsigned long idx, bool verbose) { - return "Input"; + if (idx) + return parameterInputInfo(verbose); + else + return "Input"; } std::string FrameLib_Cumulative::outputInfo(unsigned long idx, bool verbose) @@ -29,6 +38,15 @@ std::string FrameLib_Cumulative::outputInfo(unsigned long idx, bool verbose) return "Output"; } +// Parameter Info + +FrameLib_Cumulative::ParameterInfo FrameLib_Cumulative::sParamInfo; + +FrameLib_Cumulative::ParameterInfo::ParameterInfo() +{ + add("Set the cumulative function."); +} + // Process void FrameLib_Cumulative::process() diff --git a/FrameLib_Objects/Vector/FrameLib_Cumulative.h b/FrameLib_Objects/Vector/FrameLib_Cumulative.h index bb575a0c..a4ddbab9 100644 --- a/FrameLib_Objects/Vector/FrameLib_Cumulative.h +++ b/FrameLib_Objects/Vector/FrameLib_Cumulative.h @@ -6,6 +6,13 @@ class FrameLib_Cumulative final : public FrameLib_Processor { + // Parameter Enums and Info + + enum ParameterList { kMode }; + enum Modes { kSum, kProduct }; + + struct ParameterInfo : public FrameLib_Parameters::Info { ParameterInfo(); }; + public: // Constructor @@ -23,6 +30,10 @@ class FrameLib_Cumulative final : public FrameLib_Processor // Process void process() override; + + // Data + + static ParameterInfo sParamInfo; }; #endif From 23b9b0f007741618307565a26a8e3d4bb91cb676 Mon Sep 17 00:00:00 2001 From: fearne Date: Wed, 13 Sep 2023 03:07:57 +0100 Subject: [PATCH 3/7] product process --- FrameLib_Objects/Vector/FrameLib_Cumulative.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/FrameLib_Objects/Vector/FrameLib_Cumulative.cpp b/FrameLib_Objects/Vector/FrameLib_Cumulative.cpp index b19d4072..5421a6bf 100644 --- a/FrameLib_Objects/Vector/FrameLib_Cumulative.cpp +++ b/FrameLib_Objects/Vector/FrameLib_Cumulative.cpp @@ -59,8 +59,18 @@ void FrameLib_Cumulative::process() double *output = getOutput(0, &size); - if (output) + if (!size) + return; + + switch (mParameters.getEnum(kMode)) { - std::partial_sum(input, input + size, output); + case kSum: + std::partial_sum(input, input + size, output); + break; + case kProduct: + std::partial_sum(input, input + size, output, + [](const double& a, const double& b) + { return a * b; }); + break; } } From c53477c485f820770189f956db705c811b6ed90f Mon Sep 17 00:00:00 2001 From: fearne Date: Wed, 13 Sep 2023 03:08:07 +0100 Subject: [PATCH 4/7] updated help patch --- .../internal_tabs/fl.cumulative~.maxhelp | 202 ++++++++++++++---- 1 file changed, 160 insertions(+), 42 deletions(-) diff --git a/Documentation/Max Documentation/content/help_files/internal_tabs/fl.cumulative~.maxhelp b/Documentation/Max Documentation/content/help_files/internal_tabs/fl.cumulative~.maxhelp index 69c55cc1..9ee1f9e4 100644 --- a/Documentation/Max Documentation/content/help_files/internal_tabs/fl.cumulative~.maxhelp +++ b/Documentation/Max Documentation/content/help_files/internal_tabs/fl.cumulative~.maxhelp @@ -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, @@ -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, @@ -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, @@ -149,6 +149,84 @@ "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", @@ -156,8 +234,8 @@ "maxclass" : "comment", "numinlets" : 1, "numoutlets" : 0, - "patching_rect" : [ 364.0, 186.5, 190.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" } } @@ -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 ] } } @@ -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 } @@ -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 } @@ -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 ] @@ -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~" } @@ -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, @@ -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~" } @@ -259,10 +337,10 @@ "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, 88.0, 23.0 ], + "patching_rect" : [ 274.0, 285.0, 88.0, 23.0 ], "text" : "fl.cumulative~" } @@ -274,22 +352,10 @@ "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" : { @@ -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 ] } @@ -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" : [ { @@ -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 } From 5d345d4c9468a2e9526df3c84b264b91325f2ae3 Mon Sep 17 00:00:00 2001 From: Alex Harker Date: Wed, 13 Sep 2023 11:22:35 +0300 Subject: [PATCH 5/7] Update framelib.sln (fix indentation) Part 1 of fixing up merging conflict resolution errors --- framelib.sln | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framelib.sln b/framelib.sln index 651caf32..ea4e85ee 100644 --- a/framelib.sln +++ b/framelib.sln @@ -3058,7 +3058,7 @@ Global {204E46C9-E53D-4028-8188-791B01BA862F} = {C4A2EA66-4867-49C3-8282-172AF6225B78} {60EE72AF-E131-40D7-AB58-E33361FA67AE} = {C4A2EA66-4867-49C3-8282-172AF6225B78} {52B1E13C-6248-41B9-A4A2-17460246962E} = {C4A2EA66-4867-49C3-8282-172AF6225B78} - {01F42FE8-8CFF-4DC8-95D1-C1AD909E5076} = {C4A2EA66-4867-49C3-8282-172AF6225B78} + {01F42FE8-8CFF-4DC8-95D1-C1AD909E5076} = {C4A2EA66-4867-49C3-8282-172AF6225B78} {E0DF2E82-8E09-4CDC-B133-CFF712198F0D} = {C4A2EA66-4867-49C3-8282-172AF6225B78} {17940BEA-08D0-4ADF-A193-07D71E0BFD1F} = {C4A2EA66-4867-49C3-8282-172AF6225B78} {ECFB830E-DE05-49DF-AF71-15420D50E3BA} = {C4A2EA66-4867-49C3-8282-172AF6225B78} From 93283c0d76d4278d784b55dbfe63282f933d9695 Mon Sep 17 00:00:00 2001 From: Alex Harker Date: Fri, 15 Sep 2023 04:56:01 +0100 Subject: [PATCH 6/7] Rebuild .pbxproj --- framelib.xcodeproj/project.pbxproj | 47 +++++++++++++++--------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/framelib.xcodeproj/project.pbxproj b/framelib.xcodeproj/project.pbxproj index 743674ba..c046fca7 100644 --- a/framelib.xcodeproj/project.pbxproj +++ b/framelib.xcodeproj/project.pbxproj @@ -194,18 +194,19 @@ /* End PBXAggregateTarget section */ /* Begin PBXBuildFile section */ - 3E204927B975EF0BF815E4A0 /* fl.cumulative~.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92AC4FB38B633018A603AD7A /* fl.cumulative~.cpp */; }; 176E45DBA52E66BF3905F9D2 /* fl.deltas~.cpp in Sources */ = {isa = PBXBuildFile; fileRef = EC024926B1F68E73B86A1761 /* fl.deltas~.cpp */; }; 2A674288B18211EF59777F1F /* FrameLib_Deltas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5B64486187171B58B011DC7E /* FrameLib_Deltas.cpp */; }; + 3E204927B975EF0BF815E4A0 /* fl.cumulative~.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 92AC4FB38B633018A603AD7A /* fl.cumulative~.cpp */; }; 44E0436C870F4D5A35FA4DEC /* libframelib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B89ABA901FA73483006DAD53 /* libframelib.a */; }; 5A3CAB1E2052E7E8001082E3 /* libframelib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B89ABA901FA73483006DAD53 /* libframelib.a */; }; 5AB54BBF2052E96E00325C14 /* fl.wrap~.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5AB54BBE2052E96E00325C14 /* fl.wrap~.cpp */; }; - 5AB54BC92052EAD70325C14 /* libframelib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B89ABA901FA73483006DAD53 /* libframelib.a */; }; + 5AB54BC92052EAD700325C14 /* libframelib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B89ABA901FA73483006DAD53 /* libframelib.a */; }; + 5AB54BDC2052EAE900325C14 /* libframelib.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B89ABA901FA73483006DAD53 /* libframelib.a */; }; 5AB54BE72052EB4400325C14 /* fl.clip~.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5AB54BE62052EB4400325C14 /* fl.clip~.cpp */; }; 5AB54BE92052EB6100325C14 /* fl.fold~.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5AB54BE82052EB6100325C14 /* fl.fold~.cpp */; }; + 78674BA18D26ED1456625CA4 /* FrameLib_Deltas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5B64486187171B58B011DC7E /* FrameLib_Deltas.cpp */; }; 88A045CBB2614E3EE65E8062 /* FrameLib_Cumulative.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1DE34B63BCCD867B215E66C9 /* FrameLib_Cumulative.cpp */; }; AB6E4BEB99B7D9C3C9516BC5 /* FrameLib_Cumulative.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1DE34B63BCCD867B215E66C9 /* FrameLib_Cumulative.cpp */; }; - 78674BA18D26ED1456625CA4 /* FrameLib_Deltas.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 5B64486187171B58B011DC7E /* FrameLib_Deltas.cpp */; }; B802047C231BDCB80062447A /* HISSTools_FFT.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B85435731F65BF03001BA1AA /* HISSTools_FFT.cpp */; }; B8020488231BDD0F0062447A /* framelib_max.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B8020487231BDD0A0062447A /* framelib_max.cpp */; }; B802048B231BDD650062447A /* libframelib_objects.a in Frameworks */ = {isa = PBXBuildFile; fileRef = B8BA6FD22078D49200D3DB3D /* libframelib_objects.a */; }; @@ -761,13 +762,6 @@ /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ - 1E684348BAB85C4AC13B489D /* PBXContainerItemProxy */ = { - isa = PBXContainerItemProxy; - containerPortal = 089C1669FE841209C02AAC07 /* Project object */; - proxyType = 1; - remoteGlobalIDString = 97BE4FE7B88E80777DC03D98; - remoteInfo = "fl.cumulative~"; - }; 10FE4122A1EACC9C583AD041 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 089C1669FE841209C02AAC07 /* Project object */; @@ -775,6 +769,13 @@ remoteGlobalIDString = 2B494B9DA720CDFAD7F0122D; remoteInfo = "fl.deltas~"; }; + 1E684348BAB85C4AC13B489D /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 089C1669FE841209C02AAC07 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 97BE4FE7B88E80777DC03D98; + remoteInfo = "fl.cumulative~"; + }; 5A3CAB172052E7E8001082E3 /* PBXContainerItemProxy */ = { isa = PBXContainerItemProxy; containerPortal = 089C1669FE841209C02AAC07 /* Project object */; @@ -3265,10 +3266,10 @@ 5AB54BE42052EAE900325C14 /* fl.fold~.mxo */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "fl.fold~.mxo"; sourceTree = BUILT_PRODUCTS_DIR; }; 5AB54BE62052EB4400325C14 /* fl.clip~.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = "fl.clip~.cpp"; sourceTree = ""; }; 5AB54BE82052EB6100325C14 /* fl.fold~.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = "fl.fold~.cpp"; sourceTree = ""; }; - 92AC4FB38B633018A603AD7A /* fl.cumulative~.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = "fl.cumulative~.cpp"; sourceTree = ""; }; - A54843A2BD742E45FE4CE64C /* fl.cumulative~.mxo */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "fl.cumulative~.mxo"; sourceTree = BUILT_PRODUCTS_DIR; }; 5B64486187171B58B011DC7E /* FrameLib_Deltas.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = FrameLib_Deltas.cpp; sourceTree = ""; }; 89E24B8A8D0559DA99617FA5 /* FrameLib_Deltas.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = FrameLib_Deltas.h; sourceTree = ""; }; + 92AC4FB38B633018A603AD7A /* fl.cumulative~.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = "fl.cumulative~.cpp"; sourceTree = ""; }; + A54843A2BD742E45FE4CE64C /* fl.cumulative~.mxo */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "fl.cumulative~.mxo"; sourceTree = BUILT_PRODUCTS_DIR; }; B8020485231BDCB80062447A /* framelib_max.mxo */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = framelib_max.mxo; sourceTree = BUILT_PRODUCTS_DIR; }; B8020487231BDD0A0062447A /* framelib_max.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = framelib_max.cpp; sourceTree = ""; }; B805E23419C3AD0A007D8D8B /* fl.minus~.mxo */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "fl.minus~.mxo"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -6481,7 +6482,7 @@ B84943C91B837B3C0037DFF1 /* fl.chop~.cpp */, B8C89CDF1F57217A00B4E700 /* fl.crest~.cpp */, 92AC4FB38B633018A603AD7A /* fl.cumulative~.cpp */, - EC024926B1F68E73B86A1761 /* fl.deltas~.cpp *, + EC024926B1F68E73B86A1761 /* fl.deltas~.cpp */, B8C89CFE1F57242500B4E700 /* fl.flatness~.cpp */, B8F83E2B19C78E0000230CD4 /* fl.framemax~.cpp */, B8F83E2A19C78DF600230CD4 /* fl.framemin~.cpp */, @@ -11750,11 +11751,6 @@ /* Begin PBXTargetDependency section */ 1A164CA69F8EA0D4C578C03B /* PBXTargetDependency */ = { - isa = PBXTargetDependency; - target = B89ABA8F1FA73483006DAD53 /* framelib */; - targetProxy = 88924D1E88ACF284D31E79F5 /* PBXContainerItemProxy */; - }; - 4E954E62BB15D4E17BD28908 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = B89ABA8F1FA73483006DAD53 /* framelib */; targetProxy = 757F411A9FB6BCFC45915D5F /* PBXContainerItemProxy */; @@ -11764,6 +11760,11 @@ target = 97BE4FE7B88E80777DC03D98 /* fl.cumulative~ */; targetProxy = 1E684348BAB85C4AC13B489D /* PBXContainerItemProxy */; }; + 41434CF2A0EDA42531CC5D4B /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = B89ABA8F1FA73483006DAD53 /* framelib */; + targetProxy = 88924D1E88ACF284D31E79F5 /* PBXContainerItemProxy */; + }; 5A3CAB162052E7E8001082E3 /* PBXTargetDependency */ = { isa = PBXTargetDependency; target = B89ABA8F1FA73483006DAD53 /* framelib */; @@ -13648,19 +13649,19 @@ }; name = Development; }; - 3B67493CAA825692147A6067 /* Deployment */ = { + 2EC74B31BA9A4114CF50A038 /* Development */ = { isa = XCBuildConfiguration; baseConfigurationReference = B81CE02C207FC02000EAC64C /* Config_FrameLib_Max.xcconfig */; buildSettings = { }; - name = Deployment; + name = Development; }; - 2EC74B31BA9A4114CF50A038 /* Development */ = { + 3B67493CAA825692147A6067 /* Deployment */ = { isa = XCBuildConfiguration; baseConfigurationReference = B81CE02C207FC02000EAC64C /* Config_FrameLib_Max.xcconfig */; buildSettings = { }; - name = Development; + name = Deployment; }; 5A3CAB222052E7E8001082E3 /* Development */ = { isa = XCBuildConfiguration; @@ -18466,7 +18467,7 @@ }; name = "Public Testing"; }; - F8D647B8AA4D2AE4AA38DCFB /* Deployment */ = { + F62C40FABE52832373451693 /* Public Testing */ = { isa = XCBuildConfiguration; baseConfigurationReference = B81CE02C207FC02000EAC64C /* Config_FrameLib_Max.xcconfig */; buildSettings = { From 2c758d3dd8ec4de9a73072a917664ad1846f5418 Mon Sep 17 00:00:00 2001 From: Alex Harker Date: Fri, 15 Sep 2023 04:59:59 +0100 Subject: [PATCH 7/7] Rebuild object cache --- .../base_templates/cache/object_cache.json | 140 +++++++++--------- 1 file changed, 70 insertions(+), 70 deletions(-) diff --git a/Scripts/project_tools/base_templates/cache/object_cache.json b/Scripts/project_tools/base_templates/cache/object_cache.json index 264d3e97..c30d3b34 100644 --- a/Scripts/project_tools/base_templates/cache/object_cache.json +++ b/Scripts/project_tools/base_templates/cache/object_cache.json @@ -1679,6 +1679,76 @@ "xc_group_object_guid": "B85B68D019F26185002D6F1D", "xc_group_max_guid": "B8F83E2719C78D7A00230CD4" }, + "fl.cumulative~": { + "object_class": "FrameLib_Cumulative", + "object_class_name_upper": "FRAMELIB_CUMULATIVE", + "object_class_file": "FrameLib_Cumulative", + "max_class_name": "fl.cumulative~", + "pd_class_name": "fl.cumulative~", + "max_host_class": "FrameLib_MaxClass_Expand", + "pd_host_class": "FrameLib_PDClass_Expand", + "args_str": "", + "category": "Vector", + "vs_project_guid": "52B1E13C-6248-41B9-A4A2-17460246962E", + "xc_obj_target_guid": "97BE4FE7B88E80777DC03D98", + "xc_obj_package_dep_guid": "276B428C99BD6D517070B914", + "xc_obj_lib_dep_guid": "1A164CA69F8EA0D4C578C03B", + "xc_obj_lib_proxy_guid": "757F411A9FB6BCFC45915D5F", + "xc_obj_target_proxy_guid": "1E684348BAB85C4AC13B489D", + "xc_obj_sources_guid": "AA08485D924A65F3F96C056E", + "xc_obj_frameworks_guid": "3CAB48DE8E3CBD3C3E8B9A74", + "xc_obj_file_class_guid": "3E204927B975EF0BF815E4A0", + "xc_obj_file_object_guid": "88A045CBB2614E3EE65E8062", + "xc_obj_file_lib_guid": "CFFB43179CE406088D0BD70F", + "xc_obj_file_object_lib_guid": "AB6E4BEB99B7D9C3C9516BC5", + "xc_obj_file_fft_guid": "", + "xc_obj_file_ibuffer_guid": "", + "xc_obj_fileref_class_guid": "92AC4FB38B633018A603AD7A", + "xc_obj_fileref_object_guid": "1DE34B63BCCD867B215E66C9", + "xc_obj_fileref_header_guid": "D7534214A3C9EAF9659F2538", + "xc_obj_fileref_mxo_guid": "A54843A2BD742E45FE4CE64C", + "xc_obj_config_list_guid": "018B4F4B9673C05BFE4282ED", + "xc_obj_config_dvmt_guid": "22C04994B7B8B9414AB672DB", + "xc_obj_config_dplt_guid": "3B67493CAA825692147A6067", + "xc_obj_config_test_guid": "CF46405CA61A079502150542", + "xc_group_object_guid": "B85B68D019F26185002D6F1D", + "xc_group_max_guid": "B8F83E2719C78D7A00230CD4" + }, + "fl.deltas~": { + "object_class": "FrameLib_Deltas", + "object_class_name_upper": "FRAMELIB_DELTAS", + "object_class_file": "FrameLib_Deltas", + "max_class_name": "fl.deltas~", + "pd_class_name": "fl.deltas~", + "max_host_class": "FrameLib_MaxClass_Expand", + "pd_host_class": "FrameLib_PDClass_Expand", + "args_str": "", + "category": "Vector", + "vs_project_guid": "01F42FE8-8CFF-4DC8-95D1-C1AD909E5076", + "xc_obj_target_guid": "2B494B9DA720CDFAD7F0122D", + "xc_obj_package_dep_guid": "D4844558A12EB37F258F3D2D", + "xc_obj_lib_dep_guid": "41434CF2A0EDA42531CC5D4B", + "xc_obj_lib_proxy_guid": "88924D1E88ACF284D31E79F5", + "xc_obj_target_proxy_guid": "10FE4122A1EACC9C583AD041", + "xc_obj_sources_guid": "D03B4E35911E202E83442710", + "xc_obj_frameworks_guid": "C683421D8B63D2B752ADC4DC", + "xc_obj_file_class_guid": "176E45DBA52E66BF3905F9D2", + "xc_obj_file_object_guid": "2A674288B18211EF59777F1F", + "xc_obj_file_lib_guid": "44E0436C870F4D5A35FA4DEC", + "xc_obj_file_object_lib_guid": "78674BA18D26ED1456625CA4", + "xc_obj_file_fft_guid": "", + "xc_obj_file_ibuffer_guid": "", + "xc_obj_fileref_class_guid": "EC024926B1F68E73B86A1761", + "xc_obj_fileref_object_guid": "5B64486187171B58B011DC7E", + "xc_obj_fileref_header_guid": "89E24B8A8D0559DA99617FA5", + "xc_obj_fileref_mxo_guid": "24EF480F9CCA75D5F0DDA455", + "xc_obj_config_list_guid": "B46543C2B941F807E9D46AD3", + "xc_obj_config_dvmt_guid": "2EC74B31BA9A4114CF50A038", + "xc_obj_config_dplt_guid": "8FF9481C886FF539BF1AE5F9", + "xc_obj_config_test_guid": "F62C40FABE52832373451693", + "xc_group_object_guid": "B85B68D019F26185002D6F1D", + "xc_group_max_guid": "B8F83E2719C78D7A00230CD4" + }, "fl.diff~": { "object_class": "FrameLib_Diff", "object_class_name_upper": "FRAMELIB_DIFF", @@ -5948,75 +6018,5 @@ "xc_obj_config_test_guid": "5A3CAB242052E7E8001082E3", "xc_group_object_guid": "5A3CAB102052E625001082E3", "xc_group_max_guid": "5AB54BBD2052E95000325C14" - }, - "fl.cumulative~": { - "object_class": "FrameLib_Cumulative", - "object_class_name_upper": "FRAMELIB_CUMULATIVE", - "object_class_file": "FrameLib_Cumulative", - "max_class_name": "fl.cumulative~", - "pd_class_name": "fl.cumulative~", - "max_host_class": "FrameLib_MaxClass_Expand", - "pd_host_class": "FrameLib_PDClass_Expand", - "args_str": "", - "category": "Vector", - "vs_project_guid": "52B1E13C-6248-41B9-A4A2-17460246962E", - "xc_obj_target_guid": "97BE4FE7B88E80777DC03D98", - "xc_obj_package_dep_guid": "276B428C99BD6D517070B914", - "xc_obj_lib_dep_guid": "1A164CA69F8EA0D4C578C03B", - "xc_obj_lib_proxy_guid": "757F411A9FB6BCFC45915D5F", - "xc_obj_target_proxy_guid": "1E684348BAB85C4AC13B489D", - "xc_obj_sources_guid": "AA08485D924A65F3F96C056E", - "xc_obj_frameworks_guid": "3CAB48DE8E3CBD3C3E8B9A74", - "xc_obj_file_class_guid": "3E204927B975EF0BF815E4A0", - "xc_obj_file_object_guid": "88A045CBB2614E3EE65E8062", - "xc_obj_file_lib_guid": "CFFB43179CE406088D0BD70F", - "xc_obj_file_object_lib_guid": "AB6E4BEB99B7D9C3C9516BC5", - "xc_obj_file_fft_guid": "", - "xc_obj_file_ibuffer_guid": "", - "xc_obj_fileref_class_guid": "92AC4FB38B633018A603AD7A", - "xc_obj_fileref_object_guid": "1DE34B63BCCD867B215E66C9", - "xc_obj_fileref_header_guid": "D7534214A3C9EAF9659F2538", - "xc_obj_fileref_mxo_guid": "A54843A2BD742E45FE4CE64C", - "xc_obj_config_list_guid": "018B4F4B9673C05BFE4282ED", - "xc_obj_config_dvmt_guid": "22C04994B7B8B9414AB672DB", - "xc_obj_config_dplt_guid": "3B67493CAA825692147A6067", - "xc_obj_config_test_guid": "CF46405CA61A079502150542", - "xc_group_object_guid": "B85B68D019F26185002D6F1D", - "xc_group_max_guid": "B8F83E2719C78D7A00230CD4" - }, - "fl.deltas~": { - "object_class": "FrameLib_Deltas", - "object_class_name_upper": "FRAMELIB_DELTAS", - "object_class_file": "FrameLib_Deltas", - "max_class_name": "fl.deltas~", - "pd_class_name": "fl.deltas~", - "max_host_class": "FrameLib_MaxClass_Expand", - "pd_host_class": "FrameLib_PDClass_Expand", - "args_str": "", - "category": "Vector", - "vs_project_guid": "01F42FE8-8CFF-4DC8-95D1-C1AD909E5076", - "xc_obj_target_guid": "2B494B9DA720CDFAD7F0122D", - "xc_obj_package_dep_guid": "D4844558A12EB37F258F3D2D", - "xc_obj_lib_dep_guid": "41434CF2A0EDA42531CC5D4B", - "xc_obj_lib_proxy_guid": "88924D1E88ACF284D31E79F5", - "xc_obj_target_proxy_guid": "10FE4122A1EACC9C583AD041", - "xc_obj_sources_guid": "D03B4E35911E202E83442710", - "xc_obj_frameworks_guid": "C683421D8B63D2B752ADC4DC", - "xc_obj_file_class_guid": "176E45DBA52E66BF3905F9D2", - "xc_obj_file_object_guid": "2A674288B18211EF59777F1F", - "xc_obj_file_lib_guid": "44E0436C870F4D5A35FA4DEC", - "xc_obj_file_object_lib_guid": "78674BA18D26ED1456625CA4", - "xc_obj_file_fft_guid": "", - "xc_obj_file_ibuffer_guid": "", - "xc_obj_fileref_class_guid": "EC024926B1F68E73B86A1761", - "xc_obj_fileref_object_guid": "5B64486187171B58B011DC7E", - "xc_obj_fileref_header_guid": "89E24B8A8D0559DA99617FA5", - "xc_obj_fileref_mxo_guid": "24EF480F9CCA75D5F0DDA455", - "xc_obj_config_list_guid": "B46543C2B941F807E9D46AD3", - "xc_obj_config_dvmt_guid": "2EC74B31BA9A4114CF50A038", - "xc_obj_config_dplt_guid": "8FF9481C886FF539BF1AE5F9", - "xc_obj_config_test_guid": "F62C40FABE52832373451693", - "xc_group_object_guid": "B85B68D019F26185002D6F1D", - "xc_group_max_guid": "B8F83E2719C78D7A00230CD4" } } \ No newline at end of file