ofEasyCam: setPosition actually sets the position no matter what othe…

…r settings (#6265) #changelog #3d
openframeworks · Apr 1, 2019 · 2b2cc13 · 2b2cc13
1 parent 521d763
commit 2b2cc13
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/libs/openFrameworks/3d/ofEasyCam.cpp b/libs/openFrameworks/3d/ofEasyCam.cpp
@@ -70,6 +70,9 @@ void ofEasyCam::reset(){
 	rot = {0,0,0};
 	translate = {0,0,0};
 
+	if(bAutoDistance){
+		bDistanceSet = false;
+	}
 	bApplyInertia = false;
 	currentTransformType = TRANSFORM_NONE;
 }
@@ -507,3 +510,9 @@ bool ofEasyCam:: hasInteraction(TransformType type, int mouseButton, int key){
 void ofEasyCam::removeAllInteractions(){
 	interactions.clear();
 }
+//----------------------------------------
+void ofEasyCam::onPositionChanged(){
+	if(!bDistanceSet && bAutoDistance){
+		bDistanceSet = true;
+	}
+}
diff --git a/libs/openFrameworks/3d/ofEasyCam.h b/libs/openFrameworks/3d/ofEasyCam.h
@@ -178,6 +178,8 @@ class ofEasyCam : public ofCamera {
 	bool hasInteraction(TransformType type, int mouseButton, int key = -1);
 	bool hasInteraction(int mouseButton, int key);
 	void removeAllInteractions();
+protected:
+	virtual void onPositionChanged() ;
 private:
 	void setDistance(float distance, bool save);