Extend ofNode for easier transform maintenance

Author: NickHardeman

addons/ofxSvg/src/ofxSvg.cpp

@@ -224,7 +224,7 @@ class ofxSvg : public ofxSvgGroup {
 	void validateXmlSvgRoot( ofXml& aRootSvgNode );
 	std::string cleanString( std::string aStr, std::string aReplace );
 	void _parseXmlNode( ofXml& aParentNode, std::vector< std::shared_ptr<ofxSvgElement> >& aElements );
-	bool _addElementFromXmlNode( ofXml& tnode, std::vector< std::shared_ptr<ofxSvgElement> >& aElements );
+	std::shared_ptr<ofxSvgElement> _addElementFromXmlNode( ofXml& tnode, std::vector< std::shared_ptr<ofxSvgElement> >& aElements );
 
 	void _parsePolylinePolygon( ofXml& tnode, std::shared_ptr<ofxSvgPath> aSvgPath );
 	// reference: https://www.w3.org/TR/SVG/paths.html
@@ -239,6 +239,8 @@ class ofxSvg : public ofxSvgGroup {
 
 	void _getTextSpanFromXmlNode( ofXml& anode, std::vector< std::shared_ptr<ofxSvgText::TextSpan> >& aspans );
 
+	void _setNodeParentGroupStack( std::shared_ptr<ofxSvgElement> aele );
+	
 	ofxSvgGroup* _getPushedGroup();
 	bool _hasPushedMatrix();
 	void _applyModelMatrixToElement( std::shared_ptr<ofxSvgElement> aele, glm::vec2 aDefaultPos );

addons/ofxSvg/src/ofxSvg.h

@@ -248,6 +248,11 @@ bool ofxSvgCssClass::addProperty( const std::string& aName, const ofColor& acolo
 	return addProperty(aName, prop );
 }
 
+//--------------------------------------------------
+bool ofxSvgCssClass::setColor(const ofColor& acolor) {
+	return addProperty("color", acolor);
+}
+
 //--------------------------------------------------
 bool ofxSvgCssClass::setFillColor(const ofColor& acolor) {
 	return addProperty("fill", acolor);
@@ -388,8 +393,13 @@ float ofxSvgCssClass::getFloatValue(const std::string& akey, const float& adefau
 
 //--------------------------------------------------
 ofColor ofxSvgCssClass::getColor(const std::string& akey) {
+	return getColor(akey, ofColor(0));
+}
+
+//--------------------------------------------------
+ofColor ofxSvgCssClass::getColor(const std::string& akey, const ofColor& adefault) {
 	if( properties.count(akey) < 1 ) {
-		return ofColor(0);
+		return adefault;
 	}
 	auto& prop = properties[akey];
 	if( !prop.cvalue.has_value() ) {

addons/ofxSvg/src/ofxSvgCss.cpp

@@ -85,6 +85,8 @@ class ofxSvgCssClass {
 	bool addProperty( const std::string& aName, const float& avalue );
 	bool addProperty( const std::string& aName, const ofColor& acolor );
 
+	bool setColor(const ofColor& acolor);
+	
 	bool setFillColor(const ofColor& acolor);
 	bool setNoFill();
 	bool isFilled();
@@ -112,6 +114,7 @@ class ofxSvgCssClass {
 	int getIntValue(const std::string& akey, const int& adefault);
 	float getFloatValue(const std::string& akey, const float& adefault);
 	ofColor getColor(const std::string& akey);
+	ofColor getColor(const std::string& akey, const ofColor& adefault);
 
 	std::string toString(bool aBPrettyPrint=true);