summaryrefslogtreecommitdiff
path: root/gistanalysis/src
diff options
context:
space:
mode:
authorTim Redfern <tim@getdrop.com>2018-05-25 08:21:58 +0100
committerTim Redfern <tim@getdrop.com>2018-05-25 08:21:58 +0100
commit7d91c0a084e12591b8b51c3479811742ad1be952 (patch)
treedcab92b98a6876d49ca50afeb8c698e2d6485288 /gistanalysis/src
parent6a552a24799918101cf040542a6a48caed18a9d9 (diff)
still no rotation
Diffstat (limited to 'gistanalysis/src')
-rw-r--r--gistanalysis/src/ofApp.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/gistanalysis/src/ofApp.cpp b/gistanalysis/src/ofApp.cpp
index 2c51e07..1ee92d1 100644
--- a/gistanalysis/src/ofApp.cpp
+++ b/gistanalysis/src/ofApp.cpp
@@ -8,11 +8,11 @@ int LASER_INTENSITY=37;
//--------------------------------------------------------------
void ofApp::setup(){
ofSetCircleResolution(80);
- ofSetFrameRate(60);
+ ofSetFrameRate(0);
ofBackground(255);
ofEnableSmoothing();
ofEnableAlphaBlending();
- ofSetVerticalSync(true);
+ ofSetVerticalSync(false);
bufferSize = 512;
@@ -54,7 +54,7 @@ void ofApp::setup(){
gui.add(scalePlot.set("scale plot", 0.1f, 0.0f, 1.0f ));
gui.add(decayPlot.set("decay", 0.9f, 0.0f, 1.0f ));
gui.add(xform.set("xform",ofVec2f(0,0),ofVec2f(-50,-50),ofVec2f(50,50)));
- gui.add(rotate.set("rotate", 0.0f, -1.0f, 1.0f ));
+ gui.add(rotate.set("rotate", 0.0f, -30.0f, 30.0f ));
gui.add(scale.set("scale",ofVec2f(1.0f,1.0f),ofVec2f(0.5f,0.5f),ofVec2f(2.0f,2.0f)));
@@ -289,7 +289,7 @@ void ofApp::drawOutput(ofEventArgs & args){
ofMatrix4x4 t;
t.makeTranslationMatrix(xform->x,xform->y,0);
ofMatrix4x4 r;
- r.makeRotationMatrix(rotate,ofVec3f(0,0,1));
+ r.makeRotationMatrix(rotate,ofVec3f(0,1,0));
ofMatrix4x4 s;
r.makeScaleMatrix(scale->x,scale->y,1.0f);