ofxGuiGroup: fix ofVec*f / glm::vec*

Fixes #6058
openframeworks · Jul 30, 2018 · 668c62f · 668c62f
1 parent 23647c3
commit 668c62f
Showing 1 changed file with 15 additions and 6 deletions.
diff --git a/addons/ofxGui/src/ofxGuiGroup.cpp b/addons/ofxGui/src/ofxGuiGroup.cpp
@@ -82,14 +82,23 @@ ofxGuiGroup * ofxGuiGroup::setup(const ofParameterGroup & _parameters, const std
 		}else if(type == typeid(ofParameter <void> ).name()){
 			auto p = _parameters.getVoid(i);
 			add(p);
-		}else if(type == typeid(ofParameter <ofDefaultVec2> ).name()){
-			auto p = _parameters.getVec2f(i);
+		}else if(type == typeid(ofParameter <ofVec2f> ).name()){
+			auto p = _parameters.get<ofVec2f>(i);
 			add(p);
-		}else if(type == typeid(ofParameter <ofDefaultVec3> ).name()){
-			auto p = _parameters.getVec3f(i);
+		}else if(type == typeid(ofParameter <ofVec3f> ).name()){
+			auto p = _parameters.get<ofVec3f>(i);
 			add(p);
-		}else if(type == typeid(ofParameter <ofDefaultVec4> ).name()){
-			auto p = _parameters.getVec4f(i);
+		}else if(type == typeid(ofParameter <ofVec4f> ).name()){
+			auto p = _parameters.get<ofVec4f>(i);
+			add(p);
+		}else if(type == typeid(ofParameter <glm::vec2> ).name()){
+			auto p = _parameters.get<glm::vec2>(i);
+			add(p);
+		}else if(type == typeid(ofParameter <glm::vec3> ).name()){
+			auto p = _parameters.get<glm::vec3>(i);
+			add(p);
+		}else if(type == typeid(ofParameter <glm::vec4> ).name()){
+			auto p = _parameters.get<glm::vec4>(i);
 			add(p);
 		}else if(type == typeid(ofParameter <ofColor> ).name()){
 			auto p = _parameters.getColor(i);