Brings ofxCv into the core

addons/.gitignore

@@ -24,6 +24,7 @@ ofxAndroid/ofAndroidLib/gen
 !ofxEmscripten
 !ofxUnitTests
 !ofxProjectGenerator
+!ofxCv
 
 # don't ignore the .gitignore file
 !.gitignore

addons/ofxCv/addon_config.mk

@@ -0,0 +1,63 @@
+# All variables and this file are optional, if they are not present the PG and the
+# makefiles will try to parse the correct values from the file system.
+#
+# Variables that specify exclusions can use % as a wildcard to specify that anything in
+# that position will match. A partial path can also be specified to, for example, exclude
+# a whole folder from the parsed paths from the file system
+#
+# Variables can be specified using = or +=
+# = will clear the contents of that variable both specified from the file or the ones parsed
+# from the file system
+# += will add the values to the previous ones in the file or the ones parsed from the file 
+# system
+# 
+# The PG can be used to detect errors in this file, just create a new project with this addon 
+# and the PG will write to the console the kind of error and in which line it is
+
+meta:
+	ADDON_NAME = ofxCv
+	ADDON_DESCRIPTION = Addon for computer vision using the open source library openCv
+	ADDON_AUTHOR = Kyle McDonald
+	ADDON_TAGS = "computer vision" "opencv" "image processing"
+	ADDON_URL = https://github.com/kylemcdonald/ofxcv
+
+common:
+	# dependencies with other addons, a list of them separated by spaces 
+	# or use += in several lines
+	ADDON_DEPENDENCIES = ofxOpenCv
+
+	# include search paths, this will be usually parsed from the file system
+	# but if the addon or addon libraries need special search paths they can be
+	# specified here separated by spaces or one per line using +=
+	ADDON_INCLUDES = libs/ofxCv/include
+	ADDON_INCLUDES += libs/CLD/include/CLD
+	ADDON_INCLUDES += src
+
+	# any special flag that should be passed to the compiler when using this
+	# addon
+	# ADDON_CFLAGS =
+
+	# any special flag that should be passed to the linker when using this
+	# addon, also used for system libraries with -lname
+	# ADDON_LDFLAGS =
+
+	# linux only, any library that should be included in the project using
+	# pkg-config
+	# ADDON_PKG_CONFIG_LIBRARIES =
+
+	# osx/iOS only, any framework that should be included in the project
+	# ADDON_FRAMEWORKS =
+
+	# source files, these will be usually parsed from the file system looking
+	# in the src folders in libs and the root of the addon. if your addon needs
+	# to include files in different places or a different set of files per platform
+	# they can be specified here
+	# ADDON_SOURCES =
+
+	# some addons need resources to be copied to the bin/data folder of the project
+	# specify here any files that need to be copied, you can use wildcards like * and ?
+	# ADDON_DATA = 
+
+	# when parsing the file system looking for libraries exclude this for all or
+	# a specific platform
+	# ADDON_LIBS_EXCLUDE =

addons/ofxCv/example-ar/addons.make

@@ -0,0 +1,3 @@
+ofxCv
+ofxOpenCv
+ofxGui

addons/ofxCv/example-ar/bin/data/mbp-2011-isight.yml

@@ -0,0 +1,19 @@
+%YAML:1.0
+cameraMatrix: !!opencv-matrix
+   rows: 3
+   cols: 3
+   dt: d
+   data: [ 6.6278599887122368e+02, 0., 3.1244256016006659e+02, 0.,
+       6.6129276875199082e+02, 2.2747179767124251e+02, 0., 0., 1. ]
+imageSize_width: 640
+imageSize_height: 480
+sensorSize_width: 0
+sensorSize_height: 0
+distCoeffs: !!opencv-matrix
+   rows: 5
+   cols: 1
+   dt: d
+   data: [ -1.8848338341464690e-01, 1.0721890419183855e+00,
+       -3.5244467228016116e-03, -7.0195032848241403e-04,
+       -2.0412827999027101e+00 ]
+reprojectionError: 2.1723265945911407e-01

addons/ofxCv/example-ar/src/main.cpp

@@ -0,0 +1,6 @@
+#include "ofApp.h"
+
+int main() {
+	ofSetupOpenGL(640, 480, OF_WINDOW);
+	ofRunApp(new ofApp());
+}

addons/ofxCv/example-ar/src/ofApp.cpp

@@ -0,0 +1,62 @@
+#include "ofApp.h"
+
+using namespace ofxCv;
+using namespace cv;
+
+void ofApp::setup() {
+	ofSetVerticalSync(true);
+	cam.setup(640, 480);
+
+	calibration.load("mbp-2011-isight.yml");
+	patternSize = calibration.getPatternSize();
+	objectPoints = Calibration::createObjectPoints(patternSize, 1., CHESSBOARD);
+	found = false;
+
+	light.enable();
+	light.setPosition(500, 0, 0);
+}
+
+void ofApp::update() {
+	cam.update();
+	if(cam.isFrameNew()) {
+		found = calibration.findBoard(toCv(cam), imagePoints);
+		if(found) {
+			Mat cameraMatrix = calibration.getDistortedIntrinsics().getCameraMatrix();
+			Mat rvec, tvec;
+			solvePnP(Mat(objectPoints), Mat(imagePoints), cameraMatrix, calibration.getDistCoeffs(), rvec, tvec);
+			modelMatrix = makeMatrix(rvec, tvec);
+		}
+	}
+}
+
+void ofApp::draw() {
+	ofSetColor(255);
+	cam.draw(0, 0);
+	if(found) {
+		calibration.getDistortedIntrinsics().loadProjectionMatrix();
+		applyMatrix(modelMatrix);
+
+		ofMesh mesh;
+		mesh.setMode(OF_PRIMITIVE_POINTS);
+		for(int i = 0; i < objectPoints.size(); i++) {
+			mesh.addVertex(toOf(objectPoints[i]));
+		}
+		glPointSize(3);
+		ofSetColor(magentaPrint);
+		mesh.drawVertices();
+
+		ofEnableLighting();
+		ofSetColor(255);
+		glEnable(GL_DEPTH_TEST);
+		ofTranslate(.5, .5, -.5);
+		for(int i = 0; i < patternSize.width / 2; i++) {
+			for(int j = 0; j < patternSize.height / 2; j++) {
+				for(int k = 0; k < 3; k++) {
+					ofBox(2 * i, 2 * j, -2 * k, 1);
+				}
+			}
+		}
+		glDisable(GL_DEPTH_TEST);
+		ofDisableLighting();
+	}
+}

addons/ofxCv/example-ar/src/ofApp.h

@@ -0,0 +1,20 @@
+#pragma once
+
+#include "ofMain.h"
+#include "ofxCv.h"
+
+class ofApp : public ofBaseApp {
+public:
+	void setup();
+	void update();
+	void draw();
+
+	ofVideoGrabber cam;
+	ofxCv::Calibration calibration;
+	vector<cv::Point3f> objectPoints;
+	vector<cv::Point2f> imagePoints;
+	ofMatrix4x4 modelMatrix;
+	bool found;
+	cv::Size patternSize;
+	ofLight light;
+};

addons/ofxCv/example-background/addons.make

@@ -0,0 +1,3 @@
+ofxCv
+ofxOpenCv
+ofxGui

addons/ofxCv/example-background/src/main.cpp

@@ -0,0 +1,6 @@
+#include "ofApp.h"
+
+int main() {
+	ofSetupOpenGL(640 * 2, 480, OF_WINDOW);
+	ofRunApp(new ofApp());
+}

addons/ofxCv/example-background/src/ofApp.cpp

@@ -0,0 +1,29 @@
+#include "ofApp.h"
+
+using namespace ofxCv;
+using namespace cv;
+
+void ofApp::setup() {
+	cam.setup(640, 480);
+	background.setLearningTime(900);
+	background.setThresholdValue(10);
+}
+
+void ofApp::update() {
+	cam.update();
+	if(cam.isFrameNew()) {
+		background.update(cam, thresholded);
+		thresholded.update();
+	}
+}
+
+void ofApp::draw() {
+	cam.draw(0, 0);
+	thresholded.draw(640, 0);
+}
+
+void ofApp::keyPressed(int key) {
+	if(key == ' ') {
+		background.reset();
+	}
+}

addons/ofxCv/example-background/src/ofApp.h

@@ -0,0 +1,17 @@
+#pragma once
+
+#include "ofMain.h"
+#include "ofxCv.h"
+
+class ofApp : public ofBaseApp {
+public:
+	void setup();
+	void update();
+	void draw();
+
+	void keyPressed(int key);
+
+	ofVideoGrabber cam;
+	ofxCv::RunningBackground background;
+	ofImage thresholded;
+};

addons/ofxCv/example-bayer/addons.make

@@ -0,0 +1,3 @@
+ofxCv
+ofxOpenCv
+ofxGui

addons/ofxCv/example-bayer/src/main.cpp

@@ -0,0 +1,6 @@
+#include "ofApp.h"
+
+int main() {
+	ofSetupOpenGL(640 * 2, 480, OF_WINDOW);
+	ofRunApp(new ofApp());
+}

addons/ofxCv/example-bayer/src/ofApp.cpp

@@ -0,0 +1,47 @@
+#include "ofApp.h"
+
+using namespace ofxCv;
+using namespace cv;
+
+void ofApp::setup() {
+	ofSetVerticalSync(true);
+
+	bayer.load("bayer.png");
+	rgb.load("rgb.png");
+
+	bayerType = 0;
+}
+
+void ofApp::update() {
+	int code;
+	switch(bayerType) {
+		case 0: code = CV_BayerBG2RGB; break;
+		case 1: code = CV_BayerGB2RGB; break;
+		case 2: code = CV_BayerRG2RGB; break;
+		case 3: code = CV_BayerGR2RGB; break;
+	}
+
+	convertColor(bayer, rgb, code);
+	rgb.update();
+}
+
+void ofApp::draw() {
+	ofPushMatrix();
+	bayer.draw(0, 0);
+	ofTranslate(rgb.getWidth(), 0);
+	rgb.draw(0, 0);
+	ofTranslate(bayer.getWidth(), 0);
+	ofPopMatrix();
+
+	drawHighlightString("use the up/down keys: " + ofToString(bayerType), 10, 10);
+}
+
+void ofApp::keyPressed(int key) {
+	if(key == OF_KEY_UP) {
+		bayerType--;
+	}
+	if(key == OF_KEY_DOWN) {
+		bayerType++;
+	}
+	bayerType = ofClamp(bayerType, 0, 3);
+}

addons/ofxCv/example-bayer/src/ofApp.h

@@ -0,0 +1,15 @@
+#pragma once
+
+#include "ofMain.h"
+#include "ofxCv.h"
+
+class ofApp : public ofBaseApp {
+public:
+	void setup();
+	void update();
+	void draw();
+	void keyPressed(int key);
+
+	ofImage bayer, rgb;
+	int bayerType;
+};

addons/ofxCv/example-blur/addons.make

@@ -0,0 +1,3 @@
+ofxCv
+ofxOpenCv
+ofxGui

addons/ofxCv/example-blur/src/main.cpp

@@ -0,0 +1,6 @@
+#include "ofApp.h"
+
+int main() {
+	ofSetupOpenGL(640, 480, OF_WINDOW);
+	ofRunApp(new ofApp());
+}

addons/ofxCv/example-blur/src/ofApp.cpp

@@ -0,0 +1,30 @@
+#include "ofApp.h"
+
+void ofApp::setup() {
+    useGaussian = false;
+    cam.setup(640, 480);
+}
+
+void ofApp::update() {
+    cam.update();
+    if(cam.isFrameNew()) {
+        ofxCv::copy(cam, img);
+        if(useGaussian) {
+            ofxCv::GaussianBlur(img, 50);
+        } else {
+            ofxCv::blur(img, 50);
+        }
+        img.update();
+    }
+}
+
+void ofApp::draw() {
+    if(img.isAllocated()) {
+        img.draw(0, 0);
+    }
+    ofDrawBitmapStringHighlight(useGaussian ? "GaussianBlur()" : "blur()", 10, 20);
+}
+
+void ofApp::keyPressed(int key) {
+    useGaussian = !useGaussian;
+}

addons/ofxCv/example-blur/src/ofApp.h

@@ -0,0 +1,16 @@
+#pragma once
+
+#include "ofMain.h"
+#include "ofxCv.h"
+
+class ofApp : public ofBaseApp {
+public:
+	void setup();
+	void update();
+	void draw();
+    void keyPressed(int key);
+
+    ofVideoGrabber cam;
+    ofImage img;
+    bool useGaussian;
+};

addons/ofxCv/example-calibration-lcp/addons.make

@@ -0,0 +1,3 @@
+ofxCv
+ofxOpenCv
+ofxGui

addons/ofxCv/example-calibration-lcp/src/main.cpp

@@ -0,0 +1,6 @@
+#include "ofApp.h"
+
+int main() {
+	ofSetupOpenGL(640 * 2, 480, OF_FULLSCREEN);
+	ofRunApp(new ofApp());
+}