[Igarden-commit] CommonSource/YAAFExtensions RGGLSVGDraw.cpp, 1.26.2.3, 1.26.2.4

[Jeffrey B. <jlb...@us...>]

Update of /cvsroot/igarden/CommonSource/YAAFExtensions
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv15299

Modified Files:
      Tag: Release_branch_v1
	RGGLSVGDraw.cpp 
Log Message:
Clean up polygon paint

Index: RGGLSVGDraw.cpp
===================================================================
RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGGLSVGDraw.cpp,v
retrieving revision 1.26.2.3
retrieving revision 1.26.2.4
diff -C2 -d -r1.26.2.3 -r1.26.2.4
*** RGGLSVGDraw.cpp	4 Nov 2006 23:04:12 -0000	1.26.2.3
--- RGGLSVGDraw.cpp	5 Nov 2006 03:42:08 -0000	1.26.2.4
***************
*** 636,643 ****
  		const char	*dval;
  
- 		StartTransform(data, scaleX, scaleY);
- 		
  		dval = data->GetArgValue("d");
  		
  		glPushAttrib(GL_DEPTH_BUFFER_BIT);
  		glDisable(GL_LINE_STIPPLE);
--- 636,644 ----
  		const char	*dval;
  
  		dval = data->GetArgValue("d");
  		
+ 		if(CIstrstr(dval, " A ") == NULL)
+ 			StartTransform(data, scaleX, scaleY);
+ 		
  		glPushAttrib(GL_DEPTH_BUFFER_BIT);
  		glDisable(GL_LINE_STIPPLE);
***************
*** 654,666 ****
  			dval = data->GetArgValue("d");
  			SetFillStyle(data);
! 			glBegin(GL_POLYGON);
  				EnumeratePathVertices(dval, xOffset, yOffset, zOffset, xSize, ySize, scaleX, scaleY);
  			glEnd();
  		}			
  		
! 		if(fillVisible || strokeVisible)
  		{
! 			if(strokeVisible)
! 				SetStrokeStyle(data, scaleX, scaleY);
  			
  			glPushAttrib(GL_LINE_BIT);
--- 655,666 ----
  			dval = data->GetArgValue("d");
  			SetFillStyle(data);
! 			glBegin(GL_TRIANGLE_FAN);
  				EnumeratePathVertices(dval, xOffset, yOffset, zOffset, xSize, ySize, scaleX, scaleY);
  			glEnd();
  		}			
  		
! 		if(strokeVisible)
  		{
! 			SetStrokeStyle(data, scaleX, scaleY);
  			
  			glPushAttrib(GL_LINE_BIT);
***************
*** 668,679 ****
  			glHint (GL_LINE_SMOOTH_HINT, GL_NICEST);
  			glBegin(GL_LINE_STRIP);
! 				EnumeratePathVertices(dval, xOffset, yOffset, 0.0, xSize, ySize, scaleX, scaleY);
  			glEnd();
  			glPopAttrib();
  		}
! 
  		glPopAttrib();
  		
! 		StopTransform();
  	}
  }
--- 668,681 ----
  			glHint (GL_LINE_SMOOTH_HINT, GL_NICEST);
  			glBegin(GL_LINE_STRIP);
! 				EnumeratePathVertices(dval, xOffset, yOffset, zOffset, xSize, ySize, scaleX, scaleY);
  			glEnd();
+ 			
  			glPopAttrib();
  		}
! 		
  		glPopAttrib();
  		
! 		if(CIstrstr(dval, " A ") == NULL)
! 			StopTransform();
  	}
  }
***************
*** 775,779 ****
  			ParseOnePoint(val, false, xSize, ySize, _bounds.top, _bounds.left, xPosSVG, yPosSVG);
  			val = ParseOnePoint(val, true, xSize, ySize, _bounds.top, _bounds.left, xPos, yPos);
! 			glVertex3f((xPos * scaleX) + xOffset, (yPos * scaleY) + yOffset, zOffset);	// Z axis taken care of on glTranslate
  		}
  		else if(*val == 'L')
--- 777,781 ----
  			ParseOnePoint(val, false, xSize, ySize, _bounds.top, _bounds.left, xPosSVG, yPosSVG);
  			val = ParseOnePoint(val, true, xSize, ySize, _bounds.top, _bounds.left, xPos, yPos);
! //			glVertex3f((xPos * scaleX) + xOffset, (yPos * scaleY) + yOffset, zOffset);	// Z axis taken care of on glTranslate
  		}
  		else if(*val == 'L')
***************
*** 785,788 ****
--- 787,791 ----
  			val = ParseOnePoint(val, true, xSize, ySize, _bounds.top, _bounds.left, xPos, yPos);
  			glVertex3f((xPos * scaleX) + xOffset, (yPos * scaleY) + yOffset, zOffset);	// Z axis taken care of on glTranslate
+ 			
  		}
  		else if(*val == 'A')
***************
*** 835,844 ****
  						x = (cos(t) * rx*cos(t) - sin(t)*ry*sin(t));	//+ (center.x - (xSize/2));
  						y = (sin(t) * rx*cos(t) + cos(t)*ry*sin(t));	//+ (center.y - (ySize/2));
! 						glVertex3f((x * scaleX) + xOffset, (y * scaleY) + yOffset, 0.0);	// Z axis taken care of on glTranslate
  					}
  					
  					x = (cos(endA) * rx*cos(endA) - sin(endA)*ry*sin(endA));	//+ (center.x - (xSize/2));
  					y = (sin(endA) * rx*cos(endA) + cos(endA)*ry*sin(endA));	//+ (center.y - (ySize/2));
! 					glVertex3f((x * scaleX) + xOffset, (y * scaleY) + yOffset, 0.0);	// Z axis taken care of on glTranslate
  				}
  				if(isClosed && startPosSet)
--- 838,847 ----
  						x = (cos(t) * rx*cos(t) - sin(t)*ry*sin(t));	//+ (center.x - (xSize/2));
  						y = (sin(t) * rx*cos(t) + cos(t)*ry*sin(t));	//+ (center.y - (ySize/2));
! 						glVertex3f((x * scaleX) + xOffset, (y * scaleY) + yOffset, zOffset);	// Z axis taken care of on glTranslate
  					}
  					
  					x = (cos(endA) * rx*cos(endA) - sin(endA)*ry*sin(endA));	//+ (center.x - (xSize/2));
  					y = (sin(endA) * rx*cos(endA) + cos(endA)*ry*sin(endA));	//+ (center.y - (ySize/2));
! 					glVertex3f((x * scaleX) + xOffset, (y * scaleY) + yOffset, zOffset);	// Z axis taken care of on glTranslate
  				}
  				if(isClosed && startPosSet)