Skip to content

Commit

Permalink
updated
Browse files Browse the repository at this point in the history
  • Loading branch information
@lostjared
lostjared committed Aug 1, 2018
1 parent 1700bd2 commit 93593a4
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 11 deletions.
Binary file modified ...xcodeproj/project.xcworkspace/xcuserdata/jared.xcuserdatad/UserInterfaceState.xcuserstate
View file
Binary file not shown.
11 changes: 6 additions & 5 deletions Acid.Cam.v2.OSX/AC_Controller.mm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -811,13 +811,13 @@ - (void) camThread: (id) sender {


if(fade_state == NSOffState) {
if(disableFilter == false) ac::draw_func[ac::draw_offset](frame);
if(disableFilter == false && ac::testSize(frame)) ac::draw_func[ac::draw_offset](frame);
} else {
if(current_fade_alpha >= 0) {
ac::filterFade(frame, (int)current_fade, ac::draw_offset, current_fade_alpha);
current_fade_alpha -= 0.08;
} else {
if(disableFilter == false) ac::draw_func[ac::draw_offset](frame);
if(disableFilter == false && ac::testSize(frame)) ac::draw_func[ac::draw_offset](frame);
}
}
ac::frames_released = false;
Expand Down Expand Up @@ -1016,14 +1016,14 @@ - (void) cvProc: (id) sender {
ac::ApplyColorMap(frame);

if([fade_filter state] == NSOffState) {
if(disableFilter == false)
if(disableFilter == false && ac::testSize(frame))
ac::draw_func[ac::draw_offset](frame);
} else {
if(current_fade_alpha >= 0) {
ac::filterFade(frame, (int)current_fade, ac::draw_offset, current_fade_alpha);
current_fade_alpha -= 0.08;
} else {
if(disableFilter == false) ac::draw_func[ac::draw_offset](frame);
if(disableFilter == false && ac::testSize(frame)) ac::draw_func[ac::draw_offset](frame);
}
}
ac::frames_released = false;
Expand Down Expand Up @@ -1672,7 +1672,8 @@ void custom_filter(cv::Mat &frame) {
@try {
num = [custom_array objectAtIndex:i];
NSInteger index = [num integerValue];
ac::draw_func[static_cast<int>(index)](frame);
if(ac::testSize(frame))
ac::draw_func[static_cast<int>(index)](frame);
} @catch(NSException *e) {
NSLog(@"%@\n", [e reason]);
}
Expand Down
13 changes: 7 additions & 6 deletions Acid.Cam.v2.OSX/ac-filter8.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -983,7 +983,7 @@ void ac::SoftFeedbackSubFilter(cv::Mat &frame) {
cv::resize(frame_copy, out_frame, cv::Size(source.w, source.h));
size_t rand_test = 0;
if(subfilter != -1) rand_test = ac::draw_strings[subfilter].find("Rand");
if(rand_test == std::string::npos && subfilter != -1 && ac::draw_strings[subfilter] != "SoftFeedbackSubFilter" && ac::draw_strings[subfilter] != "Random Filter") {
if(testSize(out_frame) && rand_test == std::string::npos && subfilter != -1 && ac::draw_strings[subfilter] != "SoftFeedbackSubFilter" && ac::draw_strings[subfilter] != "Random Filter") {
ac::draw_func[ac::subfilter](out_frame);
}
copyMat(out_frame, 0, 0, frame, source.x, source.y, source.w, source.h);
Expand Down Expand Up @@ -1012,7 +1012,7 @@ void ac::SoftFeedbackResizeSubFilter(cv::Mat &frame) {
cv::resize(collection.frames[offset], out_frame, cv::Size(source.w, source.h));
size_t rand_test = 0;
if(subfilter != -1) rand_test = ac::draw_strings[subfilter].find("Rand");
if(rand_test == std::string::npos && subfilter != -1 && ac::draw_strings[subfilter] != "SoftFeedbackResizeSubFilter" && ac::draw_strings[subfilter] != "Random Filter") {
if(testSize(out_frame) && rand_test == std::string::npos && subfilter != -1 && ac::draw_strings[subfilter] != "SoftFeedbackResizeSubFilter" && ac::draw_strings[subfilter] != "Random Filter") {
ac::draw_func[ac::subfilter](out_frame);
}
copyMat(out_frame, 0, 0, frame, source.x, source.y, source.w, source.h);
Expand All @@ -1037,7 +1037,8 @@ void ac::SoftFeedbackResizeSubFilter(cv::Mat &frame) {
}

void ac::SoftFeedbackResizeSubFilter64(cv::Mat &frame) {
static MatrixCollection<65> collection;

static MatrixCollection<64> collection;
collection.shiftFrames(frame);
Rect source(0, 0, frame.cols-1, frame.rows-1);
cv::Mat frame_copy = frame.clone();
Expand All @@ -1052,7 +1053,7 @@ void ac::SoftFeedbackResizeSubFilter64(cv::Mat &frame) {
cv::resize(collection.frames[offset], out_frame, cv::Size(source.w, source.h));
size_t rand_test = 0;
if(subfilter != -1) rand_test = ac::draw_strings[subfilter].find("Rand");
if(rand_test == std::string::npos && subfilter != -1 && ac::draw_strings[subfilter] != "SoftFeedbackResizeSubFilter64") {
if(testSize(out_frame) && rand_test == std::string::npos && subfilter != -1 && ac::draw_strings[subfilter] != "SoftFeedbackResizeSubFilter64") {
ac::draw_func[ac::subfilter](out_frame);
}
copyMat(out_frame, 0, 0, frame, source.x, source.y, source.w, source.h);
Expand Down Expand Up @@ -1093,7 +1094,7 @@ void ac::SoftFeedbackReszieSubFilter64_Negate(cv::Mat &frame) {
size_t rand_test = 0;
if(subfilter != -1) rand_test = ac::draw_strings[subfilter].find("Rand");

if(rand_test != std::string::npos && subfilter != -1 && ac::draw_strings[subfilter] != "SoftFeedbackResizeSubFilter64" && ac::draw_strings[subfilter] != "Random Filter") {
if(testSize(out_frame) && rand_test != std::string::npos && subfilter != -1 && ac::draw_strings[subfilter] != "SoftFeedbackResizeSubFilter64" && ac::draw_strings[subfilter] != "Random Filter") {
ac::draw_func[ac::subfilter](out_frame);
}
if((offset%2) == 0)
Expand Down Expand Up @@ -1137,7 +1138,7 @@ void ac::SoftFeedbackReszieSubFilter64_Mirror(cv::Mat &frame) {
size_t rand_test = 0;
if(subfilter != -1) rand_test = ac::draw_strings[subfilter].find("Rand");

if(rand_test != std::string::npos && subfilter != -1 && ac::draw_strings[subfilter] != "SoftFeedbackResizeSubFilter64" && ac::draw_strings[subfilter] != "Random Filter") {
if(testSize(out_frame) && rand_test != std::string::npos && subfilter != -1 && ac::draw_strings[subfilter] != "SoftFeedbackResizeSubFilter64" && ac::draw_strings[subfilter] != "Random Filter") {
ac::draw_func[ac::subfilter](out_frame);
}
if((offset%2) == 0)
Expand Down

0 comments on commit 93593a4

Please sign in to comment.