[Igarden-commit] CommonSource/YAAFExtensions RGGLView.h, 1.12, 1.13 RGGLView.cpp, 1.14, 1.15 RGGLBi
Status: Beta
Brought to you by:
jlbedell
|
From: Jeffrey B. <jlb...@us...> - 2006-10-18 02:17:22
|
Update of /cvsroot/igarden/CommonSource/YAAFExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv2926 Modified Files: RGGLView.h RGGLView.cpp RGGLBitmapFont.h Log Message: Clean up include order Index: RGGLView.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGGLView.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** RGGLView.cpp 9 Oct 2006 12:23:59 -0000 1.14 --- RGGLView.cpp 18 Oct 2006 02:17:14 -0000 1.15 *************** *** 32,35 **** --- 32,36 ---- #include "RGGLView.h" + #include "RGGLBitmapFont.h" #include "CGWorld.h" #include "MyAssert.h" Index: RGGLBitmapFont.h =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGGLBitmapFont.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** RGGLBitmapFont.h 15 Oct 2006 01:20:43 -0000 1.10 --- RGGLBitmapFont.h 18 Oct 2006 02:17:18 -0000 1.11 *************** *** 41,44 **** --- 41,45 ---- #include <XGDynArray.h> #include <XGFont.h> + #include "RGGLView.h" using namespace yaaf; Index: RGGLView.h =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGGLView.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** RGGLView.h 15 Oct 2006 01:20:43 -0000 1.12 --- RGGLView.h 18 Oct 2006 02:17:14 -0000 1.13 *************** *** 131,135 **** void EndTesselation(); ! RGGLBitmapFont* CreateBitmapFont(XGFont *fontPtr); private: --- 131,135 ---- void EndTesselation(); ! class RGGLBitmapFont* CreateBitmapFont(XGFont *fontPtr); private: *************** *** 154,158 **** bool _active; static GLUtesselator *_tessObj; ! XGDynArray<RGGLBitmapFont *> _allFonts; }; --- 154,158 ---- bool _active; static GLUtesselator *_tessObj; ! XGDynArray<class RGGLBitmapFont *> _allFonts; }; |