Introduce SLS nodes

Fine tuning of AR nodes Working on ProjectorFromGraycode node
elliotwoods · Nov 22, 2017 · 6f67c29 · 6f67c29
1 parent 38c9bda
commit 6f67c29
Show file tree

Hide file tree

Showing 25 changed files with 857 additions and 324 deletions.
diff --git a/Application/Rulr.sln b/Application/Rulr.sln
@@ -39,7 +39,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ofxBlackmagicLib", "..\..\o
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Core", "..\Core\Core.vcxproj", "{3E918808-ADEE-4B04-9042-25F795280BAD}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_KinectForWindows2", "..\Plugin_KinectForWindows2\Plugin_KinectForWindows2.vcxproj", "{CBFC3D47-1E57-4291-90B6-C344B836B8DA}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_KFW2", "..\Plugin_KinectForWindows2\Plugin_KinectForWindows2.vcxproj", "{CBFC3D47-1E57-4291-90B6-C344B836B8DA}"
 	ProjectSection(ProjectDependencies) = postProject
 		{C400D413-78E4-4F60-B5E2-7965FCAC0EEC} = {C400D413-78E4-4F60-B5E2-7965FCAC0EEC}
 	EndProjectSection
@@ -165,6 +165,13 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_BrightnessAssignment
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_Calibrate", "..\Plugin_Calibrate\Plugin_Calibrate.vcxproj", "{C135C231-F751-482D-9E4C-C29473E3DD98}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SLS", "SLS", "{B5D96B9A-620B-49D9-8A5D-B30C62FC76E4}"
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Plugin_SLS", "..\Plugin_SLS\Plugin_SLS.vcxproj", "{651FDD8B-6C0C-4A82-89ED-182CFF129D03}"
+	ProjectSection(ProjectDependencies) = postProject
+		{C400D413-78E4-4F60-B5E2-7965FCAC0EEC} = {C400D413-78E4-4F60-B5E2-7965FCAC0EEC}
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|x64 = Debug|x64
@@ -327,6 +334,10 @@ Global
 		{C135C231-F751-482D-9E4C-C29473E3DD98}.Debug|x64.Build.0 = Debug|x64
 		{C135C231-F751-482D-9E4C-C29473E3DD98}.Release|x64.ActiveCfg = Release|x64
 		{C135C231-F751-482D-9E4C-C29473E3DD98}.Release|x64.Build.0 = Release|x64
+		{651FDD8B-6C0C-4A82-89ED-182CFF129D03}.Debug|x64.ActiveCfg = Debug|x64
+		{651FDD8B-6C0C-4A82-89ED-182CFF129D03}.Debug|x64.Build.0 = Debug|x64
+		{651FDD8B-6C0C-4A82-89ED-182CFF129D03}.Release|x64.ActiveCfg = Release|x64
+		{651FDD8B-6C0C-4A82-89ED-182CFF129D03}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -387,5 +398,7 @@ Global
 		{BF44EFB4-1225-4F66-8ACC-349133784013} = {148566DA-E924-4085-B479-ACA0D1601C9A}
 		{5C78C8F2-6D2D-4B46-9D92-E29015F0E66A} = {BF44EFB4-1225-4F66-8ACC-349133784013}
 		{C135C231-F751-482D-9E4C-C29473E3DD98} = {DB1A8915-E9B1-47A2-8331-CA76EBA11A00}
+		{B5D96B9A-620B-49D9-8A5D-B30C62FC76E4} = {148566DA-E924-4085-B479-ACA0D1601C9A}
+		{651FDD8B-6C0C-4A82-89ED-182CFF129D03} = {B5D96B9A-620B-49D9-8A5D-B30C62FC76E4}
 	EndGlobalSection
 EndGlobal
diff --git a/Core/src/ofxRulr/Graph/World.h b/Core/src/ofxRulr/Graph/World.h
@@ -23,6 +23,8 @@ namespace ofxRulr {
 			ofxCvGui::PanelGroupPtr getGuiGrid() const;
 			shared_ptr<Editor::Patch> getPatch() const;
 			shared_ptr<WorldStage> getWorldStage() const;
+
+			ofParameter<bool> lockSelection{ "Lock selection", false };
 		protected:
 			static ofxCvGui::Controller * gui; ///< Why is this static? Needs comment.  I presume it's so we can grid multiple worlds?
 			ofxCvGui::PanelGroupPtr guiGrid;

diff --git a/Core/src/ofxRulr/Nodes/Base.cpp b/Core/src/ofxRulr/Nodes/Base.cpp
@@ -2,6 +2,7 @@
 #include "Base.h"
 
 #include "ofxRulr/Graph/Editor/NodeHost.h"
+#include "ofxRulr/Graph/World.h"
 #include "../Exception.h"
 #include "GraphicsManager.h"
 
@@ -168,7 +169,14 @@ namespace ofxRulr {
 				}
 			};
 
-			inspector->add(new Widgets::Title(this->getTypeName(), ofxCvGui::Widgets::Title::Level::H3));
+			inspector->addToggle("Lock selection"
+				, []() {
+				return ofxCvGui::InspectController::X().getInspectorLocked();
+			}, [](bool inspectorLocked) {
+				ofxCvGui::InspectController::X().setInspectorLocked(inspectorLocked);
+			});
+
+			inspector->add(new Widgets::Title("Type : " + this->getTypeName(), ofxCvGui::Widgets::Title::Level::H3));
 
 			{
 				auto widget = inspector->addMultipleChoice("Draw on World Stage", { "Always", "Selected", "Never" });
@@ -178,26 +186,6 @@ namespace ofxRulr {
 				};
 			}
 
-			inspector->add(new Widgets::Button("Save Node...", [this] () {
-				try {
-					auto result = ofSystemSaveDialog(this->getDefaultFilename() + ".json", "Save node [" + this->getName() + "] as json");
-					if (result.bSuccess) {
-						this->save(result.getPath());
-					}
-				}
-				RULR_CATCH_ALL_TO_ALERT
-			}));
-
-			inspector->add(new Widgets::Button("Load Node...", [this] () {
-				try {
-					auto result = ofSystemLoadDialog("Load node [" + this->getName() + "] from json");
-					if (result.bSuccess) {
-						this->load(result.getPath());
-					}
-				}
-				RULR_CATCH_ALL_TO_ALERT
-			}));
-
 			//pin status
 			for (auto inputPin : this->getInputPins()) {
 				inspector->add(new Widgets::Indicator(inputPin->getName(), [inputPin]() {

diff --git a/Core/src/ofxRulr/Nodes/Base.h b/Core/src/ofxRulr/Nodes/Base.h
@@ -156,7 +156,6 @@ namespace ofxRulr {
 			ofxLiquidEvent<shared_ptr<Graph::AbstractPin>> onConnect;
 			ofxLiquidEvent<shared_ptr<Graph::AbstractPin>> onDisconnect;
 			ofxLiquidEvent<void> onAnyInputConnectionChanged;
-
 		protected:
 			void addInput(shared_ptr<Graph::AbstractPin>);
 

diff --git a/Core/src/ofxRulr/Utils/CaptureSet.cpp b/Core/src/ofxRulr/Utils/CaptureSet.cpp
@@ -362,11 +362,13 @@ namespace ofxRulr {
 		//----------
 		void AbstractCaptureSet::deserialize(const Json::Value & json) {
 			this->captures.clear();
-			auto & jsonCaptures = json["captures"];
-			for (const auto & jsonCapture : jsonCaptures) {
-				auto capture = this->makeEmpty();
-				capture->deserialize(jsonCapture);
-				this->add(capture); //ensure event listeners are attached
+			if (json.isMember("captures")) {
+				auto & jsonCaptures = json["captures"];
+				for (const auto & jsonCapture : jsonCaptures) {
+					auto capture = this->makeEmpty();
+					capture->deserialize(jsonCapture);
+					this->add(capture); //ensure event listeners are attached
+				}
 			}
 		}
 

diff --git a/Nodes/src/ofxRulr/Nodes/Test/ARCube.cpp b/Nodes/src/ofxRulr/Nodes/Test/ARCube.cpp
@@ -152,11 +152,26 @@ namespace ofxRulr {
 								//draw the 3D world on top
 								const auto & view = camera->getViewInWorldSpace();
 								view.beginAsCamera(true);
-								glEnable(GL_DEPTH_TEST);
-								glClear(GL_DEPTH_BUFFER_BIT);
-								this->drawWorldStage();
-								glDisable(GL_DEPTH_TEST);
+								{
+									glEnable(GL_DEPTH_TEST);
+									{
+										glClear(GL_DEPTH_BUFFER_BIT);
+										this->drawWorldStage();
+									}
+									glDisable(GL_DEPTH_TEST);
+								}
 								view.endAsCamera();
+
+								//emulate alpha by drawing undistorted image again on top
+								if (this->parameters.alpha < 1.0f) {
+									ofEnableAlphaBlending();
+									{
+										ofSetColor(255, 255.0f * (1.0f - this->parameters.alpha));
+										//draw the undistorted image
+										this->undistorted.draw(0, 0);
+									}
+									ofDisableAlphaBlending();
+								}
 							}
 							this->fbo.end();
 						}

diff --git a/Nodes/src/ofxRulr/Nodes/Test/ARCube.h b/Nodes/src/ofxRulr/Nodes/Test/ARCube.h
@@ -50,8 +50,9 @@ namespace ofxRulr {
 					ofParameter<ActiveWhen> activewhen{ "Active when", ActiveWhen::Selected };
 					ofParameter<DrawStyle> drawStyle{ "Draw style", DrawStyle::Cube };
 					ofParameter<FillMode> fillMode{ "Fill mode", FillMode::Fill };
+					ofParameter<float> alpha{ "Alpha", 1.0f, 0.0f, 1.0f };
 					ofParameter<FindBoardMode> findBoardMode{ "Find board mode", FindBoardMode::Optimized };
-					PARAM_DECLARE("ARCube", activewhen, drawStyle, fillMode, findBoardMode);
+					PARAM_DECLARE("ARCube", activewhen, drawStyle, fillMode, alpha, findBoardMode);
 				} parameters;
 
 				ofBoxPrimitive cube;

diff --git a/PlatformExamples/VVVV/SplitSymbolNames/main.v4p b/PlatformExamples/VVVV/SplitSymbolNames/main.v4p
@@ -1,13 +1,13 @@
 <!DOCTYPE PATCH  SYSTEM "http://vvvv.org/versions/vvvv50beta35.2.dtd" >
-   <PATCH nodename="E:\openFrameworks\addons\ofxRulr\PlatformExamples\VVVV\SplitSymbolNames\main.v4p" systemname="main" filename="E:\openFrameworks\addons\ofxRulr\PlatformExamples\VVVV\SplitSymbolNames\main.v4p" scrollx="50" scrolly="0">
+   <PATCH nodename="E:\openFrameworks\addons\ofxRulr\PlatformExamples\VVVV\SplitSymbolNames\main.v4p" systemname="main" filename="E:\openFrameworks\addons\ofxRulr\PlatformExamples\VVVV\SplitSymbolNames\main.v4p" scrollx="0" scrolly="0">
    <BOUNDS type="Window" left="1185" top="150" width="28980" height="16380">
    </BOUNDS>
    <NODE systemname="IOBox (String)" nodename="IOBox (String)" componentmode="InABox" id="0">
-   <BOUNDS type="Node" left="696" top="648" width="100" height="100">
+   <BOUNDS type="Node" left="666" top="573" width="100" height="100">
    </BOUNDS>
-   <BOUNDS type="Box" left="696" top="648" width="18780" height="1344">
+   <BOUNDS type="Box" left="666" top="573" width="18780" height="1344">
    </BOUNDS>
-   <PIN pinname="Input String" slicecount="1" values="|1&gt;------ Skipped Build: Project: ofxOrbbecLib, Configuration: Release x64 ------&cr;&lf;1&gt;Project not selected to build for this solution configuration &cr;&lf;2&gt;------ Skipped Build: Project: Plugin_MoCap, Configuration: Release x64 ------&cr;&lf;2&gt;Project not selected to build for this solution configuration &cr;&lf;3&gt;------ Build started: Project: Plugin_BrightnessAssignmentMap, Configuration: Release x64 ------&cr;&lf;4&gt;------ Skipped Build: Project: Plugin_Orbbec, Configuration: Release x64 ------&cr;&lf;4&gt;Project not selected to build for this solution configuration &cr;&lf;5&gt;------ Skipped Build: Project: Plugin_MultiTrack, Configuration: Release x64 ------&cr;&lf;5&gt;Project not selected to build for this solution configuration &cr;&lf;3&gt;E:\openFrameworks\addons\ofxCvGui\ofxCvGuiLib\ofxCvGui.props(4,5): warning MSB4011: &quot;E:\openFrameworks\addons\ofxSingleton\ofxSingletonLib\ofxSingleton.props&quot; cannot be imported again. It was already imported at &quot;E:\openFrameworks\addons\ofxPlugin\ofxPluginLib\ofxPlugin.props (4,5)&quot;. This is most likely a build authoring error. This subsequent import will be ignored. [E:\openFrameworks\addons\ofxRulr\Plugin_BrightnessAssignmentMap\Plugin_BrightnessAssignmentMap.vcxproj]&cr;&lf;3&gt;E:\openFrameworks\addons\ofxMachineVision\ofxMachineVisionLib\ofxMachineVision.props(4,5): warning MSB4011: &quot;E:\openFrameworks\addons\ofxPlugin\ofxPluginLib\ofxPlugin.props&quot; cannot be imported again. It was already imported at &quot;E:\openFrameworks\addons\ofxRulr\Core\ofxRulr_Core.props (4,5)&quot;. This is most likely a build authoring error. This subsequent import will be ignored. [E:\openFrameworks\addons\ofxRulr\Plugin_BrightnessAssignmentMap\Plugin_BrightnessAssignmentMap.vcxproj]&cr;&lf;3&gt;E:\openFrameworks\addons\ofxRulr\ofxRulr_Plugin.props(7,5): warning MSB4011: &quot;E:\openFrameworks\addons\ofxCvMin\ofxCvMinLib\ofxCvMin_libraries_only.props&quot; cannot be imported again. It was already imported at &quot;E:\openFrameworks\addons\ofxRulr\Core\ofxRulr_Core.props (7,5)&quot;. This is most likely a build authoring error. This subsequent import will be ignored. [E:\openFrameworks\addons\ofxRulr\Plugin_BrightnessAssignmentMap\Plugin_BrightnessAssignmentMap.vcxproj]&cr;&lf;3&gt;  Projector.cpp&cr;&lf;3&gt;     Creating library E:\openFrameworks\addons\ofxRulr\Application\bin\Plugin_BrightnessAssignmentMap.lib and object E:\openFrameworks\addons\ofxRulr\Application\bin\Plugin_BrightnessAssignmentMap.exp&cr;&lf;3&gt;Projector.obj : error LNK2001: unresolved external symbol &quot;public: static void __cdecl ofxRulr::Utils::Graphics::glPushAttrib(unsigned int)&quot; (?glPushAttrib@Graphics@Utils@ofxRulr@@SAXI@Z)&cr;&lf;3&gt;E:\openFrameworks\addons\ofxRulr\Application\bin\Plugin_BrightnessAssignmentMap.dll : fatal error LNK1120: 1 unresolved externals&cr;&lf;========== Build: 0 succeeded, 1 failed, 36 up-to-date, 4 skipped ==========&cr;&lf;|">
+   <PIN pinname="Input String" slicecount="1" values="|1&gt;------ Build started: Project: Plugin_Calibrate, Configuration: Release x64 ------&cr;&lf;1&gt;E:\openFrameworks\addons\ofxCvGui\ofxCvGuiLib\ofxCvGui.props(4,5): warning MSB4011: &quot;E:\openFrameworks\addons\ofxSingleton\ofxSingletonLib\ofxSingleton.props&quot; cannot be imported again. It was already imported at &quot;E:\openFrameworks\addons\ofxPlugin\ofxPluginLib\ofxPlugin.props (4,5)&quot;. This is most likely a build authoring error. This subsequent import will be ignored. [E:\openFrameworks\addons\ofxRulr\Plugin_Calibrate\Plugin_Calibrate.vcxproj]&cr;&lf;1&gt;E:\openFrameworks\addons\ofxMachineVision\ofxMachineVisionLib\ofxMachineVision.props(4,5): warning MSB4011: &quot;E:\openFrameworks\addons\ofxPlugin\ofxPluginLib\ofxPlugin.props&quot; cannot be imported again. It was already imported at &quot;E:\openFrameworks\addons\ofxRulr\Core\ofxRulr_Core.props (4,5)&quot;. This is most likely a build authoring error. This subsequent import will be ignored. [E:\openFrameworks\addons\ofxRulr\Plugin_Calibrate\Plugin_Calibrate.vcxproj]&cr;&lf;1&gt;E:\openFrameworks\addons\ofxRulr\ofxRulr_Plugin.props(7,5): warning MSB4011: &quot;E:\openFrameworks\addons\ofxCvMin\ofxCvMinLib\ofxCvMin_libraries_only.props&quot; cannot be imported again. It was already imported at &quot;E:\openFrameworks\addons\ofxRulr\Core\ofxRulr_Core.props (7,5)&quot;. This is most likely a build authoring error. This subsequent import will be ignored. [E:\openFrameworks\addons\ofxRulr\Plugin_Calibrate\Plugin_Calibrate.vcxproj]&cr;&lf;1&gt;C:\Program Files (x86)\MSBuild\Microsoft.Cpp\v4.0\V140\Microsoft.CppBuild.targets(392,5): warning MSB8028: The intermediate directory (x64\Release\) contains files shared from another project (Plugin_Calibration.vcxproj).  This can lead to incorrect clean and rebuild behavior.&cr;&lf;2&gt;------ Skipped Build: Project: ofxOrbbecLib, Configuration: Release x64 ------&cr;&lf;2&gt;Project not selected to build for this solution configuration &cr;&lf;3&gt;------ Skipped Build: Project: Plugin_Orbbec, Configuration: Release x64 ------&cr;&lf;3&gt;Project not selected to build for this solution configuration &cr;&lf;4&gt;------ Skipped Build: Project: Plugin_MultiTrack, Configuration: Release x64 ------&cr;&lf;4&gt;Project not selected to build for this solution configuration &cr;&lf;1&gt;  pch_Plugin_Calibrate.cpp&cr;&lf;1&gt;E:\openFrameworks\libs\openFrameworks\utils\ofConstants.h(140): warning C4005: &apos;_CRT_SECURE_NO_WARNINGS&apos;: macro redefinition&cr;&lf;1&gt;  E:\openFrameworks\libs\openFrameworks\utils\ofConstants.h(140): note: command-line arguments:  see previous definition of &apos;_CRT_SECURE_NO_WARNINGS&apos;&cr;&lf;1&gt;E:\openFrameworks\libs\openFrameworks\utils\ofConstants.h(141): warning C4005: &apos;_WINSOCK_DEPRECATED_NO_WARNINGS&apos;: macro redefinition&cr;&lf;1&gt;  E:\openFrameworks\libs\openFrameworks\utils\ofConstants.h(141): note: command-line arguments:  see previous definition of &apos;_WINSOCK_DEPRECATED_NO_WARNINGS&apos;&cr;&lf;1&gt;E:\openFrameworks\libs\openFrameworks\math\ofMatrix4x4.h(320): warning C4267: &apos;argument&apos;: conversion from &apos;size_t&apos; to &apos;int&apos;, possible loss of data&cr;&lf;1&gt;E:\openFrameworks\libs\openFrameworks\math\ofMatrix4x4.h(325): warning C4267: &apos;argument&apos;: conversion from &apos;size_t&apos; to &apos;int&apos;, possible loss of data&cr;&lf;1&gt;E:\openFrameworks\libs\openFrameworks\math\ofMatrix4x4.h(969): warning C4267: &apos;argument&apos;: conversion from &apos;size_t&apos; to &apos;int&apos;, possible loss of data&cr;&lf;1&gt;E:\openFrameworks\libs\openFrameworks\math\ofMatrix4x4.h(970): warning C4267: &apos;argument&apos;: conversion from &apos;size_t&apos; to &apos;int&apos;, possible loss of data&cr;&lf;1&gt;E:\openFrameworks\libs\openFrameworks\math\ofMatrix4x4.h(971): warning C4267: &apos;argument&apos;: conversion from &apos;size_t&apos; to &apos;int&apos;, possible loss of data&cr;&lf;1&gt;E:\openFrameworks\libs\openFrameworks\math\ofMatrix4x4.h(972): warning C4267: &apos;argument&apos;: conversion from &apos;size_t&apos; to &apos;int&apos;, possible loss of data&cr;&lf;1&gt;e:\openframeworks\addons\ofxtextinputfield\src\ofxTextInputFieldFontRenderer.h(45): warning C4267: &apos;return&apos;: conversion from &apos;size_t&apos; to &apos;int&apos;, possible loss of data&cr;&lf;1&gt;e:\openframeworks\addons\ofxnonlinearfit\src\../libs/NLopt/include/nlopt.hpp(414): warning C4267: &apos;argument&apos;: conversion from &apos;size_t&apos; to &apos;unsigned int&apos;, possible loss of data&cr;&lf;1&gt;e:\openframeworks\addons\ofxnonlinearfit\src\../libs/NLopt/include/nlopt.hpp(443): warning C4267: &apos;argument&apos;: conversion from &apos;size_t&apos; to &apos;unsigned int&apos;, possible loss of data&cr;&lf;1&gt;e:\openframeworks\addons\ofxnonlinearfit\src\../libs/NLopt/include/nlopt.hpp(473): warning C4267: &apos;argument&apos;: conversion from &apos;size_t&apos; to &apos;unsigned int&apos;, possible loss of data&cr;&lf;1&gt;e:\openframeworks\addons\ofxnonlinearfit\src\../libs/NLopt/include/nlopt.hpp(483): warning C4267: &apos;argument&apos;: conversion from &apos;size_t&apos; to &apos;unsigned int&apos;, possible loss of data&cr;&lf;1&gt;  SelectSceneVertices.cpp&cr;&lf;1&gt;  CameraExtrinsicsFromBoard.cpp&cr;&lf;1&gt;  CameraFromDepthCamera.cpp&cr;&lf;1&gt;  CameraIntrinsics.cpp&cr;&lf;1&gt;  HomographyFromGraycode.cpp&cr;&lf;1&gt;  IReferenceVertices.cpp&cr;&lf;1&gt;  Mesh2DFromGraycode.cpp&cr;&lf;1&gt;  MovingHeadToWorld.cpp&cr;&lf;1&gt;  ProjectorFromDepthCamera.cpp&cr;&lf;1&gt;  ProjectorFromGraycode.cpp&cr;&lf;1&gt;  ProjectorFromStereoAndHelperCamera.cpp&cr;&lf;1&gt;  ProjectorFromStereoCameras.cpp&cr;&lf;1&gt;src\ofxRulr\Nodes\Procedure\Calibrate\ProjectorFromStereoCameras.cpp(361): warning C4267: &apos;initializing&apos;: conversion from &apos;size_t&apos; to &apos;int&apos;, possible loss of data&cr;&lf;1&gt;src\ofxRulr\Nodes\Procedure\Calibrate\ProjectorFromStereoCameras.cpp(391): warning C4267: &apos;initializing&apos;: conversion from &apos;size_t&apos; to &apos;int&apos;, possible loss of data&cr;&lf;1&gt;src\ofxRulr\Nodes\Procedure\Calibrate\ProjectorFromStereoAndHelperCamera.cpp(352): warning C4267: &apos;initializing&apos;: conversion from &apos;size_t&apos; to &apos;int&apos;, possible loss of data&cr;&lf;1&gt;src\ofxRulr\Nodes\Procedure\Calibrate\ProjectorFromStereoAndHelperCamera.cpp(382): warning C4267: &apos;initializing&apos;: conversion from &apos;size_t&apos; to &apos;int&apos;, possible loss of data&cr;&lf;1&gt;  StereoCalibrate.cpp&cr;&lf;1&gt;  ViewToVertices.cpp&cr;&lf;1&gt;  plugin.cpp&cr;&lf;1&gt;     Creating library E:\openFrameworks\addons\ofxRulr\Application\bin\Plugin_Calibrate.lib and object E:\openFrameworks\addons\ofxRulr\Application\bin\Plugin_Calibrate.exp&cr;&lf;1&gt;ProjectorFromGraycode.obj : error LNK2001: unresolved external symbol &quot;public: class ofxRay::Ray __cdecl ofxRay::Projector::castPixel(class ofVec2f const &amp;)const &quot; (?castPixel@Projector@ofxRay@@QEBA?AVRay@2@AEBVofVec2f@@@Z)&cr;&lf;1&gt;E:\openFrameworks\addons\ofxRulr\Application\bin\Plugin_Calibrate.dll : fatal error LNK1120: 1 unresolved externals&cr;&lf;5&gt;------ Skipped Build: Project: Plugin_MoCap, Configuration: Release x64 ------&cr;&lf;5&gt;Project not selected to build for this solution configuration &cr;&lf;========== Build: 0 succeeded, 1 failed, 36 up-to-date, 4 skipped ==========&cr;&lf;|">
    </PIN>
    <PIN pinname="Output String" visible="1">
    </PIN>

diff --git a/Plugin_ArUco/src/ofxRulr/Nodes/ArUco/AlignMarkerMap.cpp b/Plugin_ArUco/src/ofxRulr/Nodes/ArUco/AlignMarkerMap.cpp
@@ -51,7 +51,7 @@ namespace ofxRulr {
 
 				element->onDraw += [this](ofxCvGui::DrawArguments) {
 					if (this->isSelected()) {
-						auto residual = this->residual.get();
+						auto residual = sqrt(this->residual.get());
 						if (residual != 0.0f) {
 							ofxCvGui::Utils::drawText("Residual " + ofToString(residual, 3) + "m"
 								, 0, 130, false);

diff --git a/Plugin_ArUco/src/ofxRulr/Nodes/ArUco/ChArUcoBoard.cpp b/Plugin_ArUco/src/ofxRulr/Nodes/ArUco/ChArUcoBoard.cpp
@@ -203,9 +203,9 @@ namespace ofxRulr {
 					auto pixelsPerMeter = this->getPreviewPixelsPerMeter();
 					ofScale(1.0f / pixelsPerMeter, 1.0f / pixelsPerMeter, 1.0f);
 					this->preview.draw(-this->preview.getWidth() / 2.0f
-						, -this->preview.getHeight() / 2.0f
+						, +this->preview.getHeight() / 2.0f
 						, this->preview.getWidth()
-						, +this->preview.getHeight());
+						, -this->preview.getHeight());
 				}
 				ofPopMatrix();
 			}