ofxGui: Changed instances of ofVec*f and ofPoint into GLM (#6207)

#changelog #addons #ofxGui
openframeworks · Mar 22, 2019 · 1ad1022 · 1ad1022
1 parent 60281fb
commit 1ad1022
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 19 deletions.
diff --git a/addons/ofxGui/src/ofxBaseGui.cpp b/addons/ofxGui/src/ofxBaseGui.cpp
@@ -259,7 +259,7 @@ void ofxBaseGui::setName(const std::string& _name){
 	setNeedsRedraw();
 }
 
-void ofxBaseGui::setPosition(const ofPoint & p){
+void ofxBaseGui::setPosition(const glm::vec3 & p){
 	setPosition(p.x, p.y);
 }
 
@@ -285,8 +285,8 @@ void ofxBaseGui::setShape(float x, float y, float w, float h){
 	sizeChangedCB();
 }
 
-ofPoint ofxBaseGui::getPosition() const {
-	return ofPoint(b.x, b.y);
+glm::vec3 ofxBaseGui::getPosition() const {
+	return glm::vec3(b.x, b.y, 0);
 }
 
 ofRectangle ofxBaseGui::getShape() const {

diff --git a/addons/ofxGui/src/ofxBaseGui.h b/addons/ofxGui/src/ofxBaseGui.h
@@ -28,13 +28,13 @@ class ofxBaseGui {
 		std::string getName();
 		void setName(const std::string& name);
 
-		virtual void setPosition(const ofPoint & p);
+		virtual void setPosition(const glm::vec3 & p);
 		virtual void setPosition(float x, float y);
 		virtual void setSize(float w, float h);
 		virtual void setShape(ofRectangle r);
 		virtual void setShape(float x, float y, float w, float h);
 
-		ofPoint getPosition() const;
+		glm::vec3 getPosition() const;
 		ofRectangle getShape() const;
 		float getWidth() const;
 		float getHeight() const;

diff --git a/addons/ofxGui/src/ofxGuiGroup.cpp b/addons/ofxGui/src/ofxGuiGroup.cpp
@@ -244,7 +244,7 @@ bool ofxGuiGroup::mouseMoved(ofMouseEventArgs & args){
 			return true;
 		}
 	}
-	if(b.inside(ofPoint(args.x, args.y))){
+	if(b.inside(args)){
 		return true;
 	}else{
 		return false;
@@ -314,7 +314,7 @@ bool ofxGuiGroup::mouseScrolled(ofMouseEventArgs & args){
 			return true;
 		}
 	}
-	if(b.inside(ofPoint(args.x, args.y))){
+	if(b.inside(args)){
 		return true;
 	}else{
 		return false;
@@ -529,8 +529,8 @@ ofAbstractParameter & ofxGuiGroup::getParameter(){
 	return parameters;
 }
 
-void ofxGuiGroup::setPosition(const ofPoint& p){
-	ofVec2f diff = p - b.getPosition();
+void ofxGuiGroup::setPosition(const glm::vec3& p){
+	auto diff = p - b.getPosition();
 
 	for(std::size_t i = 0; i < collection.size(); i++){
 		collection[i]->setPosition(collection[i]->getPosition() + diff);
@@ -541,7 +541,7 @@ void ofxGuiGroup::setPosition(const ofPoint& p){
 }
 
 void ofxGuiGroup::setPosition(float x, float y){
-	setPosition(ofVec2f(x, y));
+	setPosition({x, y, 0});
 }
 
 void ofxGuiGroup::enableHeader(){

diff --git a/addons/ofxGui/src/ofxGuiGroup.h b/addons/ofxGui/src/ofxGuiGroup.h
@@ -74,7 +74,7 @@ class ofxGuiGroup : public ofxBaseGui {
 
 		virtual ofAbstractParameter & getParameter();
 
-		virtual void setPosition(const ofPoint& p);
+		virtual void setPosition(const glm::vec3& p);
 		virtual void setPosition(float x, float y);
 
 		void enableHeader();

diff --git a/addons/ofxGui/src/ofxPanel.cpp b/addons/ofxGui/src/ofxPanel.cpp
@@ -148,7 +148,7 @@ bool ofxPanel::setValue(float mx, float my, bool bCheck){
 
 			if( headerRect.inside(mx, my)){
 				bGrabbed = true;
-				grabPt.set(mx-b.x, my-b.y);
+				grabPt = {mx-b.x, my-b.y, 0};
 				return true;
 			} else{
 				bGrabbed = false;

diff --git a/addons/ofxGui/src/ofxPanel.h b/addons/ofxGui/src/ofxPanel.h
@@ -34,6 +34,6 @@ class ofxPanel : public ofxGuiGroup {
 	ofRectangle loadBox, saveBox;
 	ofImage loadIcon, saveIcon;
 
-    ofPoint grabPt;
+    glm::vec3 grabPt;
 	bool bGrabbed;
 };
diff --git a/addons/ofxGui/src/ofxSlider.cpp b/addons/ofxGui/src/ofxSlider.cpp
@@ -337,7 +337,7 @@ void ofxSlider<Type>::valueChanged(Type & value){
 }
 
 template<typename Type>
-void ofxSlider<Type>::setPosition(const ofPoint & p){
+void ofxSlider<Type>::setPosition(const glm::vec3 & p){
 	ofxBaseGui::setPosition(p);
 	input.setPosition(p);
 }

diff --git a/addons/ofxGui/src/ofxSlider.h b/addons/ofxGui/src/ofxSlider.h
@@ -45,7 +45,7 @@ class ofxSlider : public ofxBaseGui{
 	operator const Type & ();
 
 
-	virtual void setPosition(const ofPoint & p);
+	virtual void setPosition(const glm::vec3 & p);
 	virtual void setPosition(float x, float y);
 	virtual void setSize(float w, float h);
 	virtual void setShape(ofRectangle r);

diff --git a/addons/ofxGui/src/ofxSliderGroup.h b/addons/ofxGui/src/ofxSliderGroup.h
@@ -31,7 +31,7 @@ class ofxVecSlider_ : public ofxGuiGroup {
 typedef ofxVecSlider_<ofDefaultVec3> ofxVec3Slider;
 typedef ofxVecSlider_<ofDefaultVec2> ofxVec2Slider;
 typedef ofxVecSlider_<ofDefaultVec4> ofxVec4Slider;
-typedef ofxVecSlider_<ofVec3f> ofxPointSlider;
+typedef ofxVecSlider_<glm::vec3> ofxPointSlider;
 
 template<typename ColorType>
 class ofxColorSlider_: public ofxGuiGroup{

diff --git a/addons/ofxGui/src/ofxToggle.cpp b/addons/ofxGui/src/ofxToggle.cpp
@@ -34,7 +34,7 @@ ofxToggle * ofxToggle::setup(const std::string& toggleName, bool _bVal, float wi
 
 
 bool ofxToggle::mouseMoved(ofMouseEventArgs & args){
-	if(isGuiDrawing() && b.inside(ofPoint(args.x,args.y))){
+	if(isGuiDrawing() && b.inside(args)){
 		return true;
 	}else{
 		return false;
@@ -50,7 +50,7 @@ bool ofxToggle::mousePressed(ofMouseEventArgs & args){
 }
 
 bool ofxToggle::mouseDragged(ofMouseEventArgs & args){
-	if(bGuiActive && b.inside(ofPoint(args.x,args.y))){
+	if(bGuiActive && b.inside(args)){
 		return true;
 	}else{
 		return false;
@@ -60,7 +60,7 @@ bool ofxToggle::mouseDragged(ofMouseEventArgs & args){
 bool ofxToggle::mouseReleased(ofMouseEventArgs & args){
 	bool wasGuiActive = bGuiActive;
 	bGuiActive = false;
-	if(wasGuiActive && b.inside(ofPoint(args.x,args.y))){
+	if(wasGuiActive && b.inside(args)){
 		return true;
 	}else{
 		return false;