Skip to content

Commit e2a06ea

Browse files
lostjaredlostjared
committed
updated
1 parent ea39fe8 commit e2a06ea

File tree

3 files changed

+5
-77
lines changed

3 files changed

+5
-77
lines changed

‎Acid.Cam.v2.OSX/ac-filter1.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,13 +45,13 @@
4545
// Acid Cam namespace
4646
namespace ac {
4747
#if defined(__APPLE__)
48-
const std::string version="2.80.4 (macOS)";
48+
const std::string version="2.80.5 (macOS)";
4949
#elif defined(__linux__)
50-
const std::string version="2.80.4 (Linux)";
50+
const std::string version="2.80.5 (Linux)";
5151
#elif defined(_WIN32)
52-
const std::string version="2.80.4 (Windows)";
52+
const std::string version="2.80.5 (Windows)";
5353
#else
54-
const std::string version="2.80.4 (Generic)";
54+
const std::string version="2.80.5 (Generic)";
5555
#endif
5656
std::mutex col_lock;
5757
bool swapColorOn = true;

‎Acid.Cam.v2.OSX/ac-filter43.cpp‎

Lines changed: 0 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -708,26 +708,6 @@ void ac::IncreaseLowBlueLevel(cv::Mat &frame) {
708708
}
709709

710710
void ac::Zoom(cv::Mat &frame) {
711-
static double zoom_x = 2, zoom_y = 2;
712-
cv::Mat copy1;
713-
cv::resize(frame, copy1, cv::Size(static_cast<int>(frame.cols*zoom_x), static_cast<int>(frame.rows*zoom_y)));
714-
int y = 0;
715-
for(int z = 0; z < frame.rows; ++z) {
716-
int x = 0;
717-
for(int i = 0; i < frame.cols; ++i) {
718-
if(x < copy1.cols && y < copy1.rows && i < frame.cols && z < frame.rows) {
719-
cv::Vec3b &pixel = pixelAt(frame,z, i);
720-
cv::Vec3b pix = copy1.at<cv::Vec3b>(y, x);
721-
pixel = pix;
722-
}
723-
++x;
724-
}
725-
++y;
726-
}
727-
static int dir1 = 1, dir2 = 1;
728-
AlphaMovementMaxMin(zoom_x, dir1, 0.05, 5, 2.0);
729-
AlphaMovementMaxMin(zoom_y, dir2, 0.05, 5, 2.0);
730-
AddInvert(frame);
731711
}
732712

733713
void ac::IntertwineVideo640(cv::Mat &frame) {
@@ -757,61 +737,9 @@ void ac::IntertwineCols640x8(cv::Mat &frame) {
757737
}
758738

759739
void ac::ZoomCorner(cv::Mat &frame) {
760-
static double zoom_x = 2, zoom_y = 2;
761-
cv::Mat copy1;
762-
cv::resize(frame, copy1, cv::Size(static_cast<int>(frame.cols*zoom_x), static_cast<int>(frame.rows*zoom_y)));
763-
int y = copy1.rows-frame.rows-2;
764-
for(int z = 0; z < frame.rows; ++z) {
765-
int x = copy1.cols-frame.cols-2;
766-
for(int i = 0; i < frame.cols; ++i) {
767-
if(x < copy1.cols && y < copy1.rows) {
768-
cv::Vec3b &pixel = pixelAt(frame,z, i);
769-
cv::Vec3b pix = copy1.at<cv::Vec3b>(y, x);
770-
pixel = pix;
771-
}
772-
++x;
773-
}
774-
++y;
775-
}
776-
static int dir1 = 1, dir2 = 1;
777-
AlphaMovementMaxMin(zoom_x, dir1, 0.05, 5, 2.0);
778-
AlphaMovementMaxMin(zoom_y, dir2, 0.05, 5, 2.0);
779-
AddInvert(frame);
780740
}
781741

782742
void ac::ZoomRandom(cv::Mat &frame) {
783-
static double zoom_x = 2, zoom_y = 2;
784-
cv::Mat copy1;
785-
cv::resize(frame, copy1, cv::Size(static_cast<int>(frame.cols*zoom_x), static_cast<int>(frame.rows*zoom_y)));
786-
int start_x = rand()%(1+(copy1.cols-frame.cols)), start_y = rand()%(1+(copy1.rows-frame.rows));
787-
int y = start_y;//copy1.rows-frame.rows-2;
788-
for(int z = 0; z < frame.rows; ++z) {
789-
int x = start_x;//copy1.cols-frame.cols-2;
790-
for(int i = 0; i < frame.cols; ++i) {
791-
if(x < copy1.cols && y < copy1.rows) {
792-
cv::Vec3b &pixel = pixelAt(frame,z, i);
793-
cv::Vec3b pix = copy1.at<cv::Vec3b>(y, x);
794-
pixel = pix;
795-
}
796-
++x;
797-
}
798-
++y;
799-
}
800-
static int dir1 = 1, dir2 = 1;
801-
AlphaMovementMaxMin(zoom_x, dir1, 0.05, 5, 2.0);
802-
AlphaMovementMaxMin(zoom_y, dir2, 0.05, 5, 2.0);
803-
AddInvert(frame);
804-
static int dir_x = 1;
805-
if(dir_x == 1) {
806-
++start_x;
807-
++start_y;
808-
} else {
809-
--start_x;
810-
--start_y;
811-
}
812-
if(start_x < 0 || start_y < 0) {
813-
dir_x = 1;
814-
}
815743
}
816744

817745
void ac::MedianBlendByLowValue(cv::Mat &frame) {

‎Acid.Cam.v2.OSX/ac-filtercat.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ namespace ac {
9393
if(value.find("subfilter") == std::string::npos && value.find("video") == std::string::npos && value.find("image") == std::string::npos && value.find("fractal") == std::string::npos && value.find("random") == std::string::npos && value.find("1080") == std::string::npos && value.find("720") == std::string::npos && value.find("custom") == std::string::npos && value.find("plugin") == std::string::npos && value.find("shuffle") == std::string::npos && value.find("late") == std::string::npos && value.find("gradient") == std::string::npos && value.find("vertical") == std::string::npos && value.find("color") != std::string::npos)
9494
color_filter.push_back(svAll[i]);
9595

96-
if(value.find("use") == std::string::npos && value.find("video") == std::string::npos && value.find("64") == std::string::npos && value.find("intertwine") == std::string::npos && value.find("squarestretch") == std::string::npos && value.find("inorder") == std::string::npos && value.find("slide") == std::string::npos && value.find("subfilter") == std::string::npos && value.find("image") == std::string::npos && value.find("rand") == std::string::npos && value.find("fractal") == std::string::npos && value.find("feedback") == std::string::npos && value.find("1080p") == std::string::npos && value.find("720p") == std::string::npos && value.find("custom") == std::string::npos && value.find("plugin") == std::string::npos && value.find("1080") == std::string::npos && value.find("720") == std::string::npos && value.find("64") == std::string::npos && value.find("32") == std::string::npos && value.find("16") == std::string::npos && value.find("fadefromframetoframe") == std::string::npos && value.find("glitchfadefromframetoframe") == std::string::npos && value.find("buffer") == std::string::npos && value.find("multivideo") == std::string::npos && value.find("syphon") == std::string::npos && value.find("desktop") == std::string::npos && value.find("slit") == std::string::npos && value.find("solo") == std::string::npos) {
96+
if(value.find("zoom") == std::string::npos && value.find("use") == std::string::npos && value.find("video") == std::string::npos && value.find("64") == std::string::npos && value.find("intertwine") == std::string::npos && value.find("squarestretch") == std::string::npos && value.find("inorder") == std::string::npos && value.find("slide") == std::string::npos && value.find("subfilter") == std::string::npos && value.find("image") == std::string::npos && value.find("rand") == std::string::npos && value.find("fractal") == std::string::npos && value.find("feedback") == std::string::npos && value.find("1080p") == std::string::npos && value.find("720p") == std::string::npos && value.find("custom") == std::string::npos && value.find("plugin") == std::string::npos && value.find("1080") == std::string::npos && value.find("720") == std::string::npos && value.find("64") == std::string::npos && value.find("32") == std::string::npos && value.find("16") == std::string::npos && value.find("fadefromframetoframe") == std::string::npos && value.find("glitchfadefromframetoframe") == std::string::npos && value.find("buffer") == std::string::npos && value.find("multivideo") == std::string::npos && value.find("syphon") == std::string::npos && value.find("desktop") == std::string::npos && value.find("slit") == std::string::npos && value.find("solo") == std::string::npos) {
9797
solo_filter.push_back(svAll[i]);
9898
}
9999
if(value.find("video") == std::string::npos && value.find("medianblend") != std::string::npos && value.find("image") == std::string::npos && value.find("subfilter") == std::string::npos && value.find("MedissanBlendSmoothAlpha") == std::string::npos) {

0 commit comments

Comments
 (0)