back to this version

Acid.Cam.v2.OSX.xcodeproj/project.pbxproj

@@ -10,9 +10,11 @@
 		7F47CB341C6D0549008689B9 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F47CB331C6D0549008689B9 /* AudioToolbox.framework */; };
 		7F4D4B9320E50293000248F9 /* ac-filter7.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F4D4B9220E50292000248F9 /* ac-filter7.cpp */; };
 		7F5181C820CC7F4200CF342C /* ac-filter6.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F5181C720CC7F4200CF342C /* ac-filter6.cpp */; };
+		7F52A4AA2197358C0032CCF3 /* ac-filter12.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F52A4A92197358B0032CCF3 /* ac-filter12.cpp */; };
 		7F5831E61E27F3CB00101A98 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F5831E41E27F3CB00101A98 /* AVFoundation.framework */; };
 		7F5831E71E27F3CB00101A98 /* AVKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F5831E51E27F3CB00101A98 /* AVKit.framework */; };
 		7F7346832145AD4700F1A327 /* ac-filter11.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F7346822145AD4700F1A327 /* ac-filter11.cpp */; };
+		7F98DA6E21B85C41003876C7 /* ac-filter13.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7F98DA6D21B85C41003876C7 /* ac-filter13.cpp */; };
 		7F9D709617DE4F35009C54DA /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F9D709517DE4F35009C54DA /* Cocoa.framework */; };
 		7F9D70A217DE4F35009C54DA /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F9D70A117DE4F35009C54DA /* main.m */; };
 		7F9D70A617DE4F35009C54DA /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 7F9D70A417DE4F35009C54DA /* Credits.rtf */; };
@@ -41,6 +43,8 @@
 		7F9E38C7204C807C002A1F4F /* libIlmImf.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FE23DB11E28356900B14623 /* libIlmImf.a */; };
 		7F9E38C8204C807C002A1F4F /* liblibwebp.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7F9E38A7204B3ED3002A1F4F /* liblibwebp.a */; };
 		7F9E38C9204C807C002A1F4F /* libippicv.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FE23DB21E28356900B14623 /* libippicv.a */; };
+		7FA4F5D121D553E600E6D442 /* ac-filtercat.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7FA4F5CF21D553E600E6D442 /* ac-filtercat.cpp */; };
+		7FA4F5D321DBDF7700E6D442 /* ac-filter14.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7FA4F5D221DBDF7700E6D442 /* ac-filter14.cpp */; };
 		7FB150EE2110B00D00DAD5FC /* ac-filter9.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7FB150ED2110B00D00DAD5FC /* ac-filter9.cpp */; };
 		7FC2145C2128DB08001EBDA3 /* ac-filter10.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7FC2145B2128DB08001EBDA3 /* ac-filter10.cpp */; };
 		7FC2B66A213185E700E54B6E /* Syphon.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 7FC2B668213185D000E54B6E /* Syphon.framework */; };
@@ -98,10 +102,12 @@
 		7F4D4B9220E50292000248F9 /* ac-filter7.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "ac-filter7.cpp"; path = "Acid.Cam.v2.OSX/ac-filter7.cpp"; sourceTree = "<group>"; };
 		7F50E2EE1CF3DFEB007843AE /* libdl.tbd */ = {isa = PBXFileReference; lastKnownFileType = "sourcecode.text-based-dylib-definition"; name = libdl.tbd; path = usr/lib/libdl.tbd; sourceTree = SDKROOT; };
 		7F5181C720CC7F4200CF342C /* ac-filter6.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "ac-filter6.cpp"; path = "Acid.Cam.v2.OSX/ac-filter6.cpp"; sourceTree = "<group>"; };
+		7F52A4A92197358B0032CCF3 /* ac-filter12.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "ac-filter12.cpp"; path = "Acid.Cam.v2.OSX/ac-filter12.cpp"; sourceTree = "<group>"; };
 		7F5831E41E27F3CB00101A98 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
 		7F5831E51E27F3CB00101A98 /* AVKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVKit.framework; path = System/Library/Frameworks/AVKit.framework; sourceTree = SDKROOT; };
 		7F5831E81E27F3DA00101A98 /* libopencv_world.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libopencv_world.a; path = cvlibs/libopencv_world.a; sourceTree = "<group>"; };
 		7F7346822145AD4700F1A327 /* ac-filter11.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "ac-filter11.cpp"; path = "Acid.Cam.v2.OSX/ac-filter11.cpp"; sourceTree = "<group>"; };
+		7F98DA6D21B85C41003876C7 /* ac-filter13.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "ac-filter13.cpp"; path = "Acid.Cam.v2.OSX/ac-filter13.cpp"; sourceTree = "<group>"; };
 		7F9D709217DE4F35009C54DA /* Acid.Cam.v2.OSX.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Acid.Cam.v2.OSX.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		7F9D709517DE4F35009C54DA /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = System/Library/Frameworks/Cocoa.framework; sourceTree = SDKROOT; };
 		7F9D709817DE4F35009C54DA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = System/Library/Frameworks/AppKit.framework; sourceTree = SDKROOT; };
@@ -125,6 +131,9 @@
 		7F9E38A8204B3ED3002A1F4F /* libittnotify.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libittnotify.a; path = cvlibs/libittnotify.a; sourceTree = "<group>"; };
 		7F9E38A9204B3ED3002A1F4F /* libippiw.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libippiw.a; path = cvlibs/libippiw.a; sourceTree = "<group>"; };
 		7F9E38AE204C7814002A1F4F /* libavresample.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = libavresample.a; path = cvlibs/libavresample.a; sourceTree = "<group>"; };
+		7FA4F5CF21D553E600E6D442 /* ac-filtercat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "ac-filtercat.cpp"; path = "Acid.Cam.v2.OSX/ac-filtercat.cpp"; sourceTree = "<group>"; };
+		7FA4F5D021D553E600E6D442 /* ac-filtercat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "ac-filtercat.h"; path = "Acid.Cam.v2.OSX/ac-filtercat.h"; sourceTree = "<group>"; };
+		7FA4F5D221DBDF7700E6D442 /* ac-filter14.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "ac-filter14.cpp"; path = "Acid.Cam.v2.OSX/ac-filter14.cpp"; sourceTree = "<group>"; };
 		7FB150ED2110B00D00DAD5FC /* ac-filter9.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "ac-filter9.cpp"; path = "Acid.Cam.v2.OSX/ac-filter9.cpp"; sourceTree = "<group>"; };
 		7FC2145B2128DB08001EBDA3 /* ac-filter10.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = "ac-filter10.cpp"; path = "Acid.Cam.v2.OSX/ac-filter10.cpp"; sourceTree = "<group>"; };
 		7FC2B666213185B800E54B6E /* Frameworks */ = {isa = PBXFileReference; lastKnownFileType = folder; path = Frameworks; sourceTree = "<group>"; };
@@ -237,9 +246,10 @@
 				7FEC38762130EB6800EE1A3E /* AC_AppDelegate.mm */,
 				7F9D70EB17DE4F7C009C54DA /* videocapture.h */,
 				7F9D70EC17DE4F7C009C54DA /* videoprogram.mm */,
-				7FEE831620C399420027A848 /* ac-alpha.cpp */,
 				7FEE831220C394320027A848 /* ac-obj.cpp */,
 				7F9D70B517DE4F7C009C54DA /* ac.h */,
+				7FA4F5CF21D553E600E6D442 /* ac-filtercat.cpp */,
+				7FA4F5D021D553E600E6D442 /* ac-filtercat.h */,
 				7FEE832A20C45B0D0027A848 /* ac-filter1.cpp */,
 				7FEE832D20C45B0D0027A848 /* ac-filter2.cpp */,
 				7FEE832C20C45B0D0027A848 /* ac-filter3.cpp */,
@@ -251,12 +261,16 @@
 				7FB150ED2110B00D00DAD5FC /* ac-filter9.cpp */,
 				7FC2145B2128DB08001EBDA3 /* ac-filter10.cpp */,
 				7F7346822145AD4700F1A327 /* ac-filter11.cpp */,
+				7F52A4A92197358B0032CCF3 /* ac-filter12.cpp */,
+				7F98DA6D21B85C41003876C7 /* ac-filter13.cpp */,
+				7FA4F5D221DBDF7700E6D442 /* ac-filter14.cpp */,
 				7FEE831120C394320027A848 /* ac-util.cpp */,
 				7FEE831820C39AAB0027A848 /* ac-square.cpp */,
 				7FEE831A20C39B020027A848 /* ac-particle.cpp */,
 				7FEE831C20C39B280027A848 /* ac-grid.cpp */,
 				7FEE831E20C39DF40027A848 /* ac-basic.cpp */,
 				7FEE832420C3DD130027A848 /* ac-image.cpp */,
+				7FEE831620C399420027A848 /* ac-alpha.cpp */,
 				7FEE832620C3DFEA0027A848 /* ac-box.cpp */,
 				7F4A50A920800F84009998DA /* tokenize.hpp */,
 				7F9D70BD17DE4F7C009C54DA /* fractal.cpp */,
@@ -448,11 +462,13 @@
 				7FC2145C2128DB08001EBDA3 /* ac-filter10.cpp in Sources */,
 				7FEC38782130EB6800EE1A3E /* AC_Renderer.mm in Sources */,
 				7F9D70ED17DE4F7C009C54DA /* AC_Controller.mm in Sources */,
+				7F52A4AA2197358C0032CCF3 /* ac-filter12.cpp in Sources */,
 				7FEE831520C394320027A848 /* ac-obj.cpp in Sources */,
 				7FEE832E20C45B0E0027A848 /* ac-filter1.cpp in Sources */,
 				7FEE831D20C39B290027A848 /* ac-grid.cpp in Sources */,
 				7FEC387C2130EB9900EE1A3E /* AC_ImageView.mm in Sources */,
 				7FEE831F20C39DF40027A848 /* ac-basic.cpp in Sources */,
+				7FA4F5D121D553E600E6D442 /* ac-filtercat.cpp in Sources */,
 				7FEE832F20C45B0E0027A848 /* ac-filter4.cpp in Sources */,
 				7FEE833320C45B560027A848 /* ac-filter5.cpp in Sources */,
 				7FEC38792130EB6800EE1A3E /* AC_AppDelegate.mm in Sources */,
@@ -461,7 +477,9 @@
 				7FEE831B20C39B030027A848 /* ac-particle.cpp in Sources */,
 				7F9D70F217DE4F7C009C54DA /* fractal.cpp in Sources */,
 				7F5181C820CC7F4200CF342C /* ac-filter6.cpp in Sources */,
+				7FA4F5D321DBDF7700E6D442 /* ac-filter14.cpp in Sources */,
 				7F9D711E17DE4F7C009C54DA /* videoprogram.mm in Sources */,
+				7F98DA6E21B85C41003876C7 /* ac-filter13.cpp in Sources */,
 				7FEE833020C45B0E0027A848 /* ac-filter3.cpp in Sources */,
 				7FEE833120C45B0E0027A848 /* ac-filter2.cpp in Sources */,
 				7F7346832145AD4700F1A327 /* ac-filter11.cpp in Sources */,

Acid.Cam.v2.OSX/AC_AppDelegate.h

@@ -2,7 +2,7 @@
  * This source file was modified from sample Syphon Examples
  * Software written by Jared Bruni https://github.com/lostjared
  
- This software is dedicated to all the people that struggle with mental illness.
+ This software is dedicated to all the people that experience mental illness.
  
  Website: http://lostsidedead.com
  YouTube: http://youtube.com/LostSideDead
@@ -16,7 +16,7 @@
  
  BSD 2-Clause License
  
- Copyright (c) 2018, Jared Bruni
+ Copyright (c) 2019, Jared Bruni
  All rights reserved.
  
  Redistribution and use in source and binary forms, with or without

Acid.Cam.v2.OSX/AC_AppDelegate.mm

@@ -2,7 +2,7 @@
  * This source file was modified from sample Syphon Examples
  * Software written by Jared Bruni https://github.com/lostjared
  
- This software is dedicated to all the people that struggle with mental illness.
+ This software is dedicated to all the people that experience mental illness.
  
  Website: http://lostsidedead.com
  YouTube: http://youtube.com/LostSideDead
@@ -16,7 +16,7 @@
  
  BSD 2-Clause License
  
- Copyright (c) 2018, Jared Bruni
+ Copyright (c) 2019, Jared Bruni
  All rights reserved.
  
  Redistribution and use in source and binary forms, with or without

Acid.Cam.v2.OSX/AC_Controller.h

@@ -4,11 +4,11 @@
 //
 //  Created by Jared Bruni on 6/3/13.
 //  https://github.com/lostjared
-//  Copyright (c) 2018 Jared Bruni. All rights reserved.
+//  Copyright (c) 2019 Jared Bruni. All rights reserved.
 /*
  * Software written by Jared Bruni https://github.com/lostjared
 
-This software is dedicated to all the people that struggle with mental illness.
+This software is dedicated to all the people that experience mental illness.
 
 Website: http://lostsidedead.com
 YouTube: http://youtube.com/LostSideDead
@@ -22,7 +22,7 @@ as you do not charge anything for this program. This program is meant to be
 
 BSD 2-Clause License
 
-Copyright (c) 2018, Jared Bruni
+Copyright (c) 2019, Jared Bruni
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -53,6 +53,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #undef check
 #include"videocapture.h"
 #include<sstream>
+#include<string>
+#include<unordered_map>
+#include<cstdlib>
+#include<cstdio>
 #include "AC_Renderer.h"
 // type def
 typedef void (*pixel)(int x, int y, unsigned char *pixels);
@@ -132,8 +136,18 @@ extern void SearchForString(NSString *s);
     IBOutlet NSPopUpButton *proc_change;
     IBOutlet NSPopUpButton *blend_source_amt;
     IBOutlet NSPopUpButton *sy_size;
-    IBOutlet NSTextField *selectedFilename;
+    IBOutlet NSButton *chk_replace;
+    IBOutlet NSTextField *selectedFilename, *colorkey_range, *colorkey_r_low, *colorkey_r_high, *colorkey_g_low, *colorkey_g_high, *colorkey_b_low, *colorkey_b_high;
+    IBOutlet NSComboBox *blocked_colors;
+    IBOutlet NSColorWell *blocked_color_well, *blocked_color_well_high;
+    IBOutlet NSWindow *block_colors_window;
+    IBOutlet NSTextField *val_colorkey_r_low, *val_colorkey_r_high, *val_colorkey_g_low, *val_colorkey_g_high, *val_colorkey_b_low, *val_colorkey_b_high;
+    IBOutlet NSButton *key_tolerance, *key_range, *chk_blocked_replace, *chk_blocked_key, *chk_spill;
+    IBOutlet NSComboBox *user_filter_name;
+    IBOutlet NSButton *user_filter_add, *user_filter_remove,*user_filter_set, *user_filter_save;
     SearchController *search_controller;
+    NSMenu *user_menu;
+    NSThread *proc_cv;
     // variables
     bool reset_memory;
     bool pauseStepTrue;
@@ -154,7 +168,7 @@ extern void SearchForString(NSString *s);
     BOOL syphon_enabled;
 }
 // classes messages
-- (void) createMenu: (NSMenu **)cat menuAll: (NSMenu **)all items: (NSMenu **)it_arr custom:(BOOL)cust;
+- (void) createMenu: (NSMenu **)cat menuAll: (NSMenu **)all items: (NSMenu **)it_arr custom:(BOOL)cust adduser: (BOOL) addu;
 - (void) fillMenuWithString: (NSMenu *)menu stringValues:(const char **) items;
 - (IBAction) menuSelected: (id) sender;
 - (IBAction) customMenuSelected:(id) sender;
@@ -228,8 +242,36 @@ extern void SearchForString(NSString *s);
 - (IBAction) clearSubFilter: (id) sender;
 - (IBAction) enableSpyhon: (id) sender;
 - (IBAction) setCustomSubFromSearch: (id) sender;
+- (IBAction) updateLabelText: (id) sender;
+- (IBAction) addToBlocked: (id) sender;
+- (IBAction) removedFromBlocked: (id) sender;
+- (IBAction) openBlockedColors: (id) sender;
+- (IBAction) setColorsEnabled: (id) sender;
+- (IBAction) setColorValuesRange: (id) sender;
+- (IBAction) setRangeTolerance:(id) sender;
+- (IBAction) addToRange: (id) sender;
+- (IBAction) addToTolerance: (id) sender;
+- (IBAction) setCheckBoxBlocked: (id) sender;
+- (IBAction) setCheckBoxImage: (id) sender;
+- (IBAction) user_Set: (id) sender;
+- (IBAction) user_Save: (id) sender;
+- (IBAction) user_Load: (id) sender;
+- (IBAction) user_Clear: (id) sender;
+- (void) loadFileData: (const char *)path;
+- (void) loadMenuList;
+- (IBAction) jumpToCustom: (id) sender;
 @end
 
+class UserFilter {
+public:
+    int index, subfilter;
+    std::string name, other_name;
+    UserFilter(): index(0), subfilter(-1) {}
+};
+
+extern std::unordered_map<std::string, UserFilter> user_filter;
+void CustomFilter(cv::Mat &frame, NSMutableArray *list, NSMutableArray *sublist);
+
 // global variables / functions
 extern NSInteger _NSRunAlertPanel(NSString *msg1, NSString *msg2, NSString *button1, NSString *button2, NSString *button3);
 extern void flushToLog(std::ostringstream &sout);