[Igarden-commit] CommonSource/YAAFExtensions RGGLView.h, 1.9, 1.9.2.1 RGGLView.cpp, 1.11, 1.11.2.1

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

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

Modified Files:
      Tag: Release_branch_v1
	RGGLView.h RGGLView.cpp 
Log Message:
Make tesselation available in more places

Index: RGGLView.cpp
===================================================================
RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGGLView.cpp,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C2 -d -r1.11 -r1.11.2.1
*** RGGLView.cpp	30 Oct 2005 03:16:33 -0000	1.11
--- RGGLView.cpp	5 Nov 2006 02:34:23 -0000	1.11.2.1
***************
*** 31,34 ****
--- 31,35 ----
  
  
+ #include "MyAssert.h"
  #include "RGGLView.h"
  #include "CGWorld.h"
***************
*** 49,52 ****
--- 50,64 ----
  							  GLfloat weight[4], GLdouble **dataOut );
  
+ long			RGGLView::_tessBufSize;
+ long			RGGLView::_tessBufFilled;
+ GLdouble		*RGGLView::_tessBuf;
+ GLdouble		*RGGLView::_tessPtr;
+ GLdouble		RGGLView::_xOrigin;
+ GLdouble		RGGLView::_yOrigin;
+ GLdouble		RGGLView::_xSize;
+ GLdouble		RGGLView::_ySize;
+ GLint			RGGLView::_list;
+ 
+ 
  GLUtesselator *RGGLView::_tessObj = NULL;
  

Index: RGGLView.h
===================================================================
RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGGLView.h,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -C2 -d -r1.9 -r1.9.2.1
*** RGGLView.h	16 Sep 2005 10:50:44 -0000	1.9
--- RGGLView.h	5 Nov 2006 02:34:23 -0000	1.9.2.1
***************
*** 116,124 ****
  	void				DrawToCGWorld( Rect& printRect, CGWorld *world );
  
! 	void				BeginTesselation(GLint list, long numPoints, double xOrigin, double yOrigin, double xSize, double ySize);
! 	void				BeginTessContour();
! 	void				AddTessPoint(double x, double y, double z);
! 	void				EndTessContour();
! 	void				EndTesselation();
  
  	RGGLBitmapFont*		CreateBitmapFont(XGFont *fontPtr);
--- 116,124 ----
  	void				DrawToCGWorld( Rect& printRect, CGWorld *world );
  
! 	static void			BeginTesselation(GLint list, long numPoints, double xOrigin, double yOrigin, double xSize, double ySize);
! 	static void			BeginTessContour();
! 	static void			AddTessPoint(double x, double y, double z);
! 	static void			EndTessContour();
! 	static void			EndTesselation();
  
  	RGGLBitmapFont*		CreateBitmapFont(XGFont *fontPtr);
***************
*** 136,148 ****
  	double				_defaultScale;
  	double				_curScale;
! 	long				_tessBufSize;
! 	long				_tessBufFilled;
! 	GLdouble			*_tessBuf;
! 	GLdouble			*_tessPtr;
! 	GLdouble			_xOrigin;
! 	GLdouble			_yOrigin;
! 	GLdouble			_xSize;
! 	GLdouble			_ySize;
! 	GLint				_list;
  	bool				_active;
  	static GLUtesselator *_tessObj;
--- 136,148 ----
  	double				_defaultScale;
  	double				_curScale;
! 	static long			_tessBufSize;
! 	static long			_tessBufFilled;
! 	static GLdouble		*_tessBuf;
! 	static GLdouble		*_tessPtr;
! 	static GLdouble		_xOrigin;
! 	static GLdouble		_yOrigin;
! 	static GLdouble		_xSize;
! 	static GLdouble		_ySize;
! 	static GLint		_list;
  	bool				_active;
  	static GLUtesselator *_tessObj;