Skip to content

Commit

Permalink
renamed ModelProjector to mapamok. changed fast lerp to 1, which closes
Browse files Browse the repository at this point in the history 
#3.
  • Loading branch information
@kylemcdonald
kylemcdonald committed Feb 1, 2012
1 parent 6054cc6 commit 04f1d9e
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 31 deletions.
0 ModelProjector/Project.xcconfig → mapamok/Project.xcconfig
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions ModelProjector/bin/data/shader.frag → mapamok/bin/data/shader.frag
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const vec4 off = vec4(vec3(0.), 1.);

void main() {
float stages = 6.;
float stage = 5.;mod(elapsedTime * .6, stages);
float stage = 2.;mod(elapsedTime * .6, stages);
if(stage < 1.) {
// diagonal stripes
const float speed = 50.;
Expand All @@ -24,8 +24,8 @@ void main() {
} else if(stage < 3.) {
// fast rising stripes
if(normal.z == 0.) {
const float speed = 60.;
const float scale = 30.;
const float speed = 10.;
const float scale = 10.;
gl_FragColor =
(mod((-position.z) + (elapsedTime * speed), scale) < 1.) ?
on : off;
Expand Down
0 ModelProjector/bin/data/shader.vert → mapamok/bin/data/shader.vert
View file
File renamed without changes.
54 changes: 27 additions & 27 deletions .../ModelProjector.xcodeproj/project.pbxproj → mapamok/mapamok.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

/* Begin PBXBuildFile section */
27052EA6143EF5F10067A76B /* ofxAssimpModelLoader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27052E9D143EF5F10067A76B /* ofxAssimpModelLoader.cpp */; };
27053039143F29C60067A76B /* ofxProCamToolkit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27053022143F29C60067A76B /* ofxProCamToolkit.cpp */; };
2760A430146783A8005D564E /* Calibration.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2760A3D3146783A8005D564E /* Calibration.cpp */; };
2760A431146783A8005D564E /* ContourFinder.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2760A3D4146783A8005D564E /* ContourFinder.cpp */; };
2760A432146783A8005D564E /* Distance.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2760A3D5146783A8005D564E /* Distance.cpp */; };
Expand All @@ -18,6 +17,7 @@
2760A436146783A8005D564E /* Utilities.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2760A3D9146783A8005D564E /* Utilities.cpp */; };
2760A437146783A8005D564E /* Wrappers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 2760A3DA146783A8005D564E /* Wrappers.cpp */; };
2760A438146783A8005D564E /* opencv.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 2760A42F146783A8005D564E /* opencv.a */; };
276F8C6F14C808C20074AB98 /* ofxProCamToolkit.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 276F8C5514C808C20074AB98 /* ofxProCamToolkit.cpp */; };
27E4EF51143F2D00008D8085 /* guiBaseObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27E4EF16143F2D00008D8085 /* guiBaseObject.cpp */; };
27E4EF52143F2D00008D8085 /* guiCallback.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27E4EF18143F2D00008D8085 /* guiCallback.cpp */; };
27E4EF53143F2D00008D8085 /* guiCallbackValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 27E4EF1A143F2D00008D8085 /* guiCallbackValue.cpp */; };
Expand Down Expand Up @@ -103,8 +103,6 @@
27052E9C143EF5F10067A76B /* ofxAssimpMeshHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofxAssimpMeshHelper.h; path = ../../../../../../../Users/kyle/Documents/openFrameworks/addons/ofxAssimpModelLoader/src/ofxAssimpMeshHelper.h; sourceTree = SOURCE_ROOT; };
27052E9D143EF5F10067A76B /* ofxAssimpModelLoader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofxAssimpModelLoader.cpp; path = ../../../../../../../Users/kyle/Documents/openFrameworks/addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.cpp; sourceTree = SOURCE_ROOT; };
27052E9E143EF5F10067A76B /* ofxAssimpModelLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofxAssimpModelLoader.h; path = ../../../../../../../Users/kyle/Documents/openFrameworks/addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.h; sourceTree = SOURCE_ROOT; };
27053022143F29C60067A76B /* ofxProCamToolkit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofxProCamToolkit.cpp; path = ../../../../../../../Users/kyle/Documents/openFrameworks/apps/Ycam/SharedCode/ofxProCamToolkit.cpp; sourceTree = SOURCE_ROOT; };
27053023143F29C60067A76B /* ofxProCamToolkit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofxProCamToolkit.h; path = ../../../../../../../Users/kyle/Documents/openFrameworks/apps/Ycam/SharedCode/ofxProCamToolkit.h; sourceTree = SOURCE_ROOT; };
2705B33D143D6DB000F2A09E /* ofxCv.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofxCv.h; path = ../../../../../../../Users/kyle/Documents/openFrameworks/addons/ofxCv/src/ofxCv.h; sourceTree = SOURCE_ROOT; };
2760A3C6146783A8005D564E /* .gitignore */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = .gitignore; path = ../../../addons/ofxCv/libs/.gitignore; sourceTree = SOURCE_ROOT; };
2760A3CA146783A8005D564E /* Calibration.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Calibration.h; path = ../../../addons/ofxCv/libs/ofxCv/include/ofxCv/Calibration.h; sourceTree = SOURCE_ROOT; };
Expand Down Expand Up @@ -190,7 +188,9 @@
2760A42B146783A8005D564E /* background_segm.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = background_segm.hpp; path = ../../../addons/ofxCv/libs/opencv/include/opencv2/video/background_segm.hpp; sourceTree = SOURCE_ROOT; };
2760A42C146783A8005D564E /* tracking.hpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.h; name = tracking.hpp; path = ../../../addons/ofxCv/libs/opencv/include/opencv2/video/tracking.hpp; sourceTree = SOURCE_ROOT; };
2760A42F146783A8005D564E /* opencv.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; name = opencv.a; path = ../../../addons/ofxCv/libs/opencv/lib/osx/opencv.a; sourceTree = SOURCE_ROOT; };
278BC755146AC08900BB415E /* LineArt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LineArt.h; path = ../SharedCode/LineArt.h; sourceTree = SOURCE_ROOT; };
276F8C5414C808C20074AB98 /* LineArt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = LineArt.h; path = ../../../../../../../Users/kyle/Documents/openFrameworks/apps/ProCamToolkit/SharedCode/LineArt.h; sourceTree = SOURCE_ROOT; };
276F8C5514C808C20074AB98 /* ofxProCamToolkit.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = ofxProCamToolkit.cpp; path = ../../../../../../../Users/kyle/Documents/openFrameworks/apps/ProCamToolkit/SharedCode/ofxProCamToolkit.cpp; sourceTree = SOURCE_ROOT; };
276F8C5614C808C20074AB98 /* ofxProCamToolkit.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ofxProCamToolkit.h; path = ../../../../../../../Users/kyle/Documents/openFrameworks/apps/ProCamToolkit/SharedCode/ofxProCamToolkit.h; sourceTree = SOURCE_ROOT; };
27E4EF16143F2D00008D8085 /* guiBaseObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = guiBaseObject.cpp; path = ../../../../../../../Users/kyle/Documents/openFrameworks/addons/ofxControlPanel/src/guiBaseObject.cpp; sourceTree = SOURCE_ROOT; };
27E4EF17143F2D00008D8085 /* guiBaseObject.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = guiBaseObject.h; path = ../../../../../../../Users/kyle/Documents/openFrameworks/addons/ofxControlPanel/src/guiBaseObject.h; sourceTree = SOURCE_ROOT; };
27E4EF18143F2D00008D8085 /* guiCallback.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = guiCallback.cpp; path = ../../../../../../../Users/kyle/Documents/openFrameworks/addons/ofxControlPanel/src/guiCallback.cpp; sourceTree = SOURCE_ROOT; };
Expand Down Expand Up @@ -271,7 +271,7 @@
E45BE9770E8CC7DD009D7055 /* CoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreServices.framework; path = /System/Library/Frameworks/CoreServices.framework; sourceTree = "<absolute>"; };
E45BE9790E8CC7DD009D7055 /* OpenGL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGL.framework; path = /System/Library/Frameworks/OpenGL.framework; sourceTree = "<absolute>"; };
E45BE97A0E8CC7DD009D7055 /* QuickTime.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuickTime.framework; path = /System/Library/Frameworks/QuickTime.framework; sourceTree = "<absolute>"; };
E4B69B5B0A3A1756003C02F2 /* ModelProjector.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = ModelProjector.app; sourceTree = BUILT_PRODUCTS_DIR; };
E4B69B5B0A3A1756003C02F2 /* mapamok.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = mapamok.app; sourceTree = BUILT_PRODUCTS_DIR; };
E4B69E1D0A3A1BDC003C02F2 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = main.cpp; path = src/main.cpp; sourceTree = SOURCE_ROOT; };
E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.cpp; fileEncoding = 30; name = testApp.cpp; path = src/testApp.cpp; sourceTree = SOURCE_ROOT; };
E4B69E1F0A3A1BDC003C02F2 /* testApp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = testApp.h; path = src/testApp.h; sourceTree = SOURCE_ROOT; };
Expand Down Expand Up @@ -330,17 +330,6 @@
path = ../../../../../../../Users/kyle/Documents/openFrameworks/addons/ofxAssimpModelLoader/src;
sourceTree = SOURCE_ROOT;
};
27053021143F29C60067A76B /* SharedCode */ = {
isa = PBXGroup;
children = (
278BC755146AC08900BB415E /* LineArt.h */,
27053022143F29C60067A76B /* ofxProCamToolkit.cpp */,
27053023143F29C60067A76B /* ofxProCamToolkit.h */,
);
name = SharedCode;
path = ../../../../../../../Users/kyle/Documents/openFrameworks/apps/Ycam/SharedCode;
sourceTree = SOURCE_ROOT;
};
2705B337143D6DA300F2A09E /* ofxCv */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -649,6 +638,17 @@
path = ../../../addons/ofxCv/libs/opencv/lib/osx;
sourceTree = SOURCE_ROOT;
};
276F8C5114C808C20074AB98 /* SharedCode */ = {
isa = PBXGroup;
children = (
276F8C5414C808C20074AB98 /* LineArt.h */,
276F8C5514C808C20074AB98 /* ofxProCamToolkit.cpp */,
276F8C5614C808C20074AB98 /* ofxProCamToolkit.h */,
);
name = SharedCode;
path = ../../../../../../../Users/kyle/Documents/openFrameworks/apps/ProCamToolkit/SharedCode;
sourceTree = SOURCE_ROOT;
};
27E4EF14143F2D00008D8085 /* ofxControlPanel */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -850,14 +850,14 @@
E4EEC9E9138DF44700A80321 /* openFrameworks */,
BB4B014C10F69532006C3DED /* addons */,
E45BE5980E8CC70C009D7055 /* frameworks */,
E4B69B5B0A3A1756003C02F2 /* ModelProjector.app */,
E4B69B5B0A3A1756003C02F2 /* mapamok.app */,
);
sourceTree = "<group>";
};
E4B69E1C0A3A1BDC003C02F2 /* src */ = {
isa = PBXGroup;
children = (
27053021143F29C60067A76B /* SharedCode */,
276F8C5114C808C20074AB98 /* SharedCode */,
E4B69E1D0A3A1BDC003C02F2 /* main.cpp */,
E4B69E1E0A3A1BDC003C02F2 /* testApp.cpp */,
E4B69E1F0A3A1BDC003C02F2 /* testApp.h */,
Expand All @@ -879,9 +879,9 @@
/* End PBXGroup section */

/* Begin PBXNativeTarget section */
E4B69B5A0A3A1756003C02F2 /* ModelProjector */ = {
E4B69B5A0A3A1756003C02F2 /* mapamok */ = {
isa = PBXNativeTarget;
buildConfigurationList = E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "ModelProjector" */;
buildConfigurationList = E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "mapamok" */;
buildPhases = (
E4B69B580A3A1756003C02F2 /* Sources */,
E4B69B590A3A1756003C02F2 /* Frameworks */,
Expand All @@ -893,17 +893,17 @@
dependencies = (
E4EEB9AC138B136A00A80321 /* PBXTargetDependency */,
);
name = ModelProjector;
name = mapamok;
productName = myOFApp;
productReference = E4B69B5B0A3A1756003C02F2 /* ModelProjector.app */;
productReference = E4B69B5B0A3A1756003C02F2 /* mapamok.app */;
productType = "com.apple.product-type.application";
};
/* End PBXNativeTarget section */

/* Begin PBXProject section */
E4B69B4C0A3A1720003C02F2 /* Project object */ = {
isa = PBXProject;
buildConfigurationList = E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "ModelProjector" */;
buildConfigurationList = E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "mapamok" */;
compatibilityVersion = "Xcode 2.4";
hasScannedForEncodings = 0;
knownRegions = (
Expand All @@ -923,7 +923,7 @@
);
projectRoot = "";
targets = (
E4B69B5A0A3A1756003C02F2 /* ModelProjector */,
E4B69B5A0A3A1756003C02F2 /* mapamok */,
);
};
/* End PBXProject section */
Expand Down Expand Up @@ -962,7 +962,6 @@
E4B69E200A3A1BDC003C02F2 /* main.cpp in Sources */,
E4B69E210A3A1BDC003C02F2 /* testApp.cpp in Sources */,
27052EA6143EF5F10067A76B /* ofxAssimpModelLoader.cpp in Sources */,
27053039143F29C60067A76B /* ofxProCamToolkit.cpp in Sources */,
27E4EF51143F2D00008D8085 /* guiBaseObject.cpp in Sources */,
27E4EF52143F2D00008D8085 /* guiCallback.cpp in Sources */,
27E4EF53143F2D00008D8085 /* guiCallbackValue.cpp in Sources */,
Expand Down Expand Up @@ -1002,6 +1001,7 @@
2760A435146783A8005D564E /* Tracker.cpp in Sources */,
2760A436146783A8005D564E /* Utilities.cpp in Sources */,
2760A437146783A8005D564E /* Wrappers.cpp in Sources */,
276F8C6F14C808C20074AB98 /* ofxProCamToolkit.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Expand Down Expand Up @@ -1350,7 +1350,7 @@
/* End XCBuildConfiguration section */

/* Begin XCConfigurationList section */
E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "ModelProjector" */ = {
E4B69B4D0A3A1720003C02F2 /* Build configuration list for PBXProject "mapamok" */ = {
isa = XCConfigurationList;
buildConfigurations = (
E4B69B4E0A3A1720003C02F2 /* Debug */,
Expand All @@ -1359,7 +1359,7 @@
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "ModelProjector" */ = {
E4B69B5F0A3A1757003C02F2 /* Build configuration list for PBXNativeTarget "mapamok" */ = {
isa = XCConfigurationList;
buildConfigurations = (
E4B69B600A3A1757003C02F2 /* Debug */,
Expand Down
0 ModelProjector/openFrameworks-Info.plist → mapamok/openFrameworks-Info.plist
View file
File renamed without changes.
0 ModelProjector/src/main.cpp → mapamok/src/main.cpp
View file
File renamed without changes.
4 changes: 3 additions & 1 deletion ModelProjector/src/testApp.cpp → mapamok/src/testApp.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ void testApp::setup() {
}

void testApp::update() {
ofSetWindowTitle("mapamok");
if(getb("randomLighting")) {
setf("lightX", ofSignedNoise(ofGetElapsedTimef(), 1, 1) * 1000);
setf("lightY", ofSignedNoise(1, ofGetElapsedTimef(), 1) * 1000);
Expand Down Expand Up @@ -265,7 +266,7 @@ void testApp::setupControlPanel() {
panel.addToggle("dragging", false);
panel.addSlider("selectionChoice", 0, 0, objectPoints.size(), true);
panel.addSlider("slowLerpRate", .001, 0, .01);
panel.addSlider("fastLerpRate", .05, 0, .1);
panel.addSlider("fastLerpRate", 1, 0, 1);
}

void testApp::updateRenderMode() {
Expand Down Expand Up @@ -321,6 +322,7 @@ void testApp::drawLabeledPoint(int label, ofVec2f position, ofColor color, ofCol
ofSetColor(color);
float w = ofGetWidth();
float h = ofGetHeight();
ofSetLineWidth(1.5);
ofLine(position - ofVec2f(w,0), position + ofVec2f(w,0));
ofLine(position - ofVec2f(0,h), position + ofVec2f(0,h));
ofCircle(position, geti("selectedPointSize"));
Expand Down
0 ModelProjector/src/testApp.h → mapamok/src/testApp.h
View file
File renamed without changes.

0 comments on commit 04f1d9e

Please sign in to comment.