graycode works with calibrating projectors

elliotwoods · Jun 26, 2018 · 961ab12 · 961ab12
1 parent bd58bfd
commit 961ab12
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/Nodes/src/ofxRulr/Nodes/Item/Mesh.cpp b/Nodes/src/ofxRulr/Nodes/Item/Mesh.cpp
@@ -41,6 +41,10 @@ namespace ofxRulr {
 				this->addInput<Render::Style>();
 
 				this->modelLoader = make_unique<ofxAssimpModelLoader>();
+
+				//HACK : This is more common, esp coming from PhotoScan data
+				this->parameters.transform.theirXIsOur = Axes::NegX;
+				this->parameters.transform.theirYIsOur = Axes::NegY;
 			}
 
 			//----------

diff --git a/Nodes/src/ofxRulr/Nodes/Procedure/Scan/Graycode.cpp b/Nodes/src/ofxRulr/Nodes/Procedure/Scan/Graycode.cpp
@@ -79,6 +79,10 @@ namespace ofxRulr {
 
 				//----------
 				void Graycode::update() {
+					if (this->suite) {
+						this->suite->decoder.update();
+					}
+
 					if(this->previewDirty) {
 						this->updatePreview();
 					}
@@ -317,6 +321,9 @@ namespace ofxRulr {
 					this->suite->decoder.loadDataSet(filename);
 					this->suite->payload = suite->decoder.getPayload();
 					this->suite->encoder.init(suite->payload);
+					this->parameters.processing.threshold = this->suite->decoder.getThreshold();
+
+					this->previewDirty = true;
 				}
 
 				//----------