revert to string for filepath due to msys error. Override customDraw ofNode function.

Author: NickHardeman

addons/ofxSvg/src/ofxSvg.cpp

@@ -2016,7 +2016,7 @@ glm::mat4 ofxSvg::setTransformFromSvgMatrixString( string aStr, std::shared_ptr<
 //			aele->pos.x = pos3.x;
 //			aele->pos.y = pos3.y;
 
-			ofLogNotice("ofxSvg::setTransformFromSvgMatrixString") << "pos: " << aele->getPosition() << " rotation: " << trotation << " scale: " << aele->getScale();
+			ofLogVerbose("ofxSvg::setTransformFromSvgMatrixString") << "pos: " << aele->getPosition() << " rotation: " << trotation << " scale: " << aele->getScale();
 
 //			apos.x = matrixF[4];
 //			apos.y = matrixF[5];

addons/ofxSvg/src/ofxSvgElements.cpp

@@ -220,9 +220,9 @@ void ofxSvgPath::applyStyle(ofxSvgCssClass& aclass) {
 }
 
 //--------------------------------------------------------------
-void ofxSvgPath::draw() {
+void ofxSvgPath::customDraw() {
 //	ofPushMatrix(); {
-	transformGL(); {
+//	transformGL(); {
 		ofSetColor( ofColor::orange );
 		//		ofDrawCircle(0, 0, 15);
 
@@ -255,7 +255,7 @@ void ofxSvgPath::draw() {
 				}
 			}
 		}
-	} restoreTransformGL();
+//	} restoreTransformGL();
 //	} ofPopMatrix();
 }
 
@@ -276,22 +276,22 @@ void ofxSvgImage::load() {
 }
 
 //--------------------------------------------------------------
-void ofxSvgImage::draw() {
+void ofxSvgImage::customDraw() {
 	if( !bTryLoad ) {
 		load();
 	}
 
 	if( isVisible() ) {
 		if( img.isAllocated() ) {
 //			ofPushMatrix(); {
-			transformGL(); {
+//			transformGL(); {
 //				ofTranslate( pos.x, pos.y );
 //				if( rotation != 0.0 ) ofRotateZDeg( rotation );
 //				ofScale( scale.x, scale.y );
 				if(bUseShapeColor) ofSetColor( getColor() );
 				img.draw( 0, 0 );
 				//			} ofPopMatrix();
-			} restoreTransformGL();
+//			} restoreTransformGL();
 		}
 	}
 }
@@ -738,7 +738,7 @@ void ofxSvgText::create() {
 }
 
 //--------------------------------------------------------------
-void ofxSvgText::draw() {
+void ofxSvgText::customDraw() {
     if( !isVisible() ) return;
 
 	if(bUseShapeColor) {
@@ -751,7 +751,7 @@ void ofxSvgText::draw() {
 		create();
 	}
 
-	transformGL(); {
+//	transformGL(); {
 		ofTexture* tex = NULL;
 		for( mainIt = meshes.begin(); mainIt != meshes.end(); ++mainIt ) {
 			string fontKey = mainIt->first;
@@ -788,7 +788,7 @@ void ofxSvgText::draw() {
 				tMeshMesh.enableColors();
 			}
 		}
-	} restoreTransformGL();
+//	} restoreTransformGL();
 }
 
 //--------------------------------------------------------------

addons/ofxSvg/src/ofxSvgElements.h

@@ -55,7 +55,7 @@ class ofxSvgElement : public ofNode {
 
 	// override this in ofxSvgGroup 
 	virtual void setVisible( bool ab ) { bVisible = ab; }
-	bool isVisible() { return bVisible; }
+	bool isVisible() const { return bVisible; }
 
 	virtual void setAlpha( float aAlpha ) {
 		alpha = aAlpha;
@@ -72,7 +72,8 @@ class ofxSvgElement : public ofNode {
 	float layer = -1.f;
 	bool bVisible=true;
 
-	virtual void draw() {}
+	/// \brief Override the function in ofNode meant for drawing
+	virtual void customDraw() override {};
 
 	virtual void applyStyle(ofxSvgCssClass& aclass) {};
 
@@ -144,7 +145,7 @@ class ofxSvgPath : public ofxSvgElement {
 
 	virtual void applyStyle(ofxSvgCssClass& aclass) override;
 
-	virtual void draw() override;
+	virtual void customDraw() override;
 
 	bool isFilled() { return path.isFilled(); }
 	ofColor getFillColor() { return path.getFillColor(); }
@@ -269,7 +270,7 @@ class ofxSvgImage : public ofxSvgElement {
 		return (img.isAllocated() && img.getWidth() > 0 && img.getHeight() > 0);
 	}
 
-	virtual void draw() override;
+	virtual void customDraw() override;
 //	glm::vec2 getAnchorPointForPercent( float ax, float ay );
 
 	const std::filesystem::path& getFilePath() { return filepath; }
@@ -504,14 +505,14 @@ class ofxSvgText : public ofxSvgElement {
 
 	void setText( const std::string& astring, std::string aFontFamily, int aFontSize, float aMaxWidth );
 	void create();
-	void draw() override;
+	void customDraw() override;
 	void draw(const std::string &astring, bool abCentered );
 	void draw(const std::string &astring, const ofColor& acolor, bool abCentered );
 
 	void setFontDirectory( std::string aPath ) {
 		fdirectory = aPath;
 	}
-	of::filesystem::path getFontDirectory() {
+	std::string getFontDirectory() {
 		return fdirectory;
 	}
 
@@ -549,7 +550,7 @@ class ofxSvgText : public ofxSvgElement {
 	bool bCentered = false;
 
 protected:
-	of::filesystem::path fdirectory;
+	std::string fdirectory;
 
 	ofxSvgCssClass mSvgCssClass;
 

addons/ofxSvg/src/ofxSvgFontBook.cpp

@@ -34,7 +34,7 @@ bool ofxSvgFontBook::loadFont( const std::string& aDirectory, const std::string&
 		bool bHasFontDirectory = false;
 	//    cout << "checking directory: " << fdirectory+"/fonts/" << endl;
 		std::string fontsDirectory = "";// = ofToDataPath("", true);
-		if( aDirectory != "" ) {
+		if( !aDirectory.empty() ) {
 			fontsDirectory = aDirectory;
 		}
 

addons/ofxSvg/src/ofxSvgGroup.cpp

@@ -6,8 +6,9 @@ using std::shared_ptr;
 using std::string;
 
 //--------------------------------------------------------------
-void ofxSvgGroup::draw() {
+void ofxSvgGroup::draw() const {
 	if( !isVisible() ) return;
+	
     std::size_t numElements = mChildren.size();
 	for( std::size_t i = 0; i < numElements; i++ ) {
 		mChildren[i]->draw();

addons/ofxSvg/src/ofxSvgGroup.h

@@ -58,8 +58,9 @@ class ofxSvgGroup : public ofxSvgElement {
 		return *this;
 	}
 
-	
-	virtual void draw() override;
+	// we need to override this so that we can draw the children correctly
+	// without this transform getting applied to the children
+	virtual void draw() const override;
 
 	/// \brief Set the visibility of the group. Does not set visibility of each child. The group only draws its children if the group is visible.
 	/// \param bool aBVisible set to true for visible.