summaryrefslogtreecommitdiff
path: root/src/keyVar.cpp
diff options
context:
space:
mode:
authorTim Redfern <tim@eclectronics.org>2012-02-23 01:07:34 +0000
committerTim Redfern <tim@eclectronics.org>2012-02-23 01:07:34 +0000
commit61e590513b2e725a8df7eed75a041b188d4ecd39 (patch)
tree3e81b514ad7c225dbf491316d4acd35559572e4f /src/keyVar.cpp
parentb3a0d6eb435fc2584466106ef613b99100b0a470 (diff)
proper vertigo effect
Diffstat (limited to 'src/keyVar.cpp')
-rw-r--r--src/keyVar.cpp8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/keyVar.cpp b/src/keyVar.cpp
index 06fd2bd..1bf562a 100644
--- a/src/keyVar.cpp
+++ b/src/keyVar.cpp
@@ -17,6 +17,7 @@ void keyVar::set(char _keyInc,char _keyDec,float _val,float _speed,float _accel,
accelTime=_accelTime;
state=0;
timePressed=timeCalc=0;
+ inc=0;
}
void keyVar::keyPressed(char _key){
@@ -44,10 +45,15 @@ void keyVar::keyReleased(char _key){
}
float keyVar::getVal(){
float segment = min(1.0f,(ofGetElapsedTimef()-timePressed)/accelTime);
- if (state) val+=pow(segment,accel)*speed*state; //(ofGetElapsedTimef()-timeCalc)*
+ //if (state)
+ val+=pow(segment,accel)*speed*state; //(ofGetElapsedTimef()-timeCalc)*
+ inc=pow(segment,accel)*speed*state;
timeCalc=ofGetElapsedTimef();
return val;
}
+float keyVar::readVal(){
+ return val;
+}
float keyVar::getInc(){
float segment = min(1.0f,(ofGetElapsedTimef()-timePressed)/accelTime);
return pow(segment,accel)*speed*state;