Menu
▾
▴
epfl-cvs
Update of /cvsroot/epfl/engine In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24199/engine Modified Files: bind_manager.cc bind_manager.h canvas.cc canvas.h console.cc console.h defs.h doom3level.cc doom3level.h endian.h file_manager.cc file_manager.h glrenderer.cc glrenderer.h image.cc image.h main.cc material.cc material.h material_manager.cc material_manager.h model.cc model.h model_cache.cc model_cache.h model_manager.cc model_manager.h q3defs.h q3level.cc q3level.h system.h system_linux.cc system_linux.h system_osx.cc system_osx.h timer.cc timer.h world_manager.cc world_manager.h Log Message: license Index: material_manager.cc =================================================================== RCS file: /cvsroot/epfl/engine/material_manager.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** material_manager.cc 30 Nov 2005 16:45:54 -0000 1.2 --- material_manager.cc 7 Dec 2005 22:23:49 -0000 1.3 *************** *** 1,2 **** --- 1,24 ---- + /* + ----------------------------------------------------------------------------- + This source file is part of Terminal G33k + + Copyright (c) 2000-2005 The Terminal G33k Team + Also see acknowledgements in Readme.html + + This program is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the Free Software + Foundation; either version 2 of the License, or (at your option) any later + version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License along with + this program; if not, write to the Free Software Foundation, Inc., 59 Temple + Place - Suite 330, Boston, MA 02111-1307, USA, or go to + http://www.gnu.org/copyleft/lesser.txt. + ----------------------------------------------------------------------------- + */ #include "material_manager.h" *************** *** 22,25 **** --- 44,55 ---- else out << "chargement de notexture :\t OK" << endl; + + mat = new tgMaterial("data/textures/font.tga"); + matMap["textures/font"] = mat; + mat->Load(); + if(!mat->Loaded()) //probleme lors du chargement du notexture + out << "chargement de font :\t ERREUR" << endl; + else + out << "chargement de font :\t OK" << endl; // pFileManager->Close(file); } *************** *** 39,43 **** } } else { //sinon on ajoute la texture direct ! #define ALL_TEXTURES #ifdef ALL_TEXTURES tgMaterial* mat = new tgMaterial("data/"+name+".tga"); --- 69,73 ---- } } else { //sinon on ajoute la texture direct ! //#define ALL_TEXTURES #ifdef ALL_TEXTURES tgMaterial* mat = new tgMaterial("data/"+name+".tga"); Index: world_manager.h =================================================================== RCS file: /cvsroot/epfl/engine/world_manager.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** world_manager.h 24 Nov 2005 20:47:05 -0000 1.1.1.1 --- world_manager.h 7 Dec 2005 22:23:49 -0000 1.2 *************** *** 1,2 **** --- 1,24 ---- + /* + ----------------------------------------------------------------------------- + This source file is part of Terminal G33k + + Copyright (c) 2000-2005 The Terminal G33k Team + Also see acknowledgements in Readme.html + + This program is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the Free Software + Foundation; either version 2 of the License, or (at your option) any later + version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License along with + this program; if not, write to the Free Software Foundation, Inc., 59 Temple + Place - Suite 330, Boston, MA 02111-1307, USA, or go to + http://www.gnu.org/copyleft/lesser.txt. + ----------------------------------------------------------------------------- + */ #ifndef TGWORLD_MANAGER_H #define TGWORLD_MANAGER_H *************** *** 4,9 **** #include "iworld_manager.h" #include "defs.h" ! class tgDoom3Level; class tgQ3Level; class tgModel; --- 26,32 ---- #include "iworld_manager.h" #include "defs.h" ! #if 0 class tgDoom3Level; + #endif class tgQ3Level; class tgModel; *************** *** 27,32 **** inline tgRenderView* GetRenderView () const { return pRenderView; } inline tgModel* GetModel (int i) const { return modelList[i]; } ! inline int GetModelCount () const { return modelList.size(); } inline tgDoom3Level* GetLevel () const { return pDoom3Level; } inline tgQ3Level* GetQ3Level () const { return pQ3Level; } protected: --- 50,57 ---- inline tgRenderView* GetRenderView () const { return pRenderView; } inline tgModel* GetModel (int i) const { return modelList[i]; } ! inline int GetModelCount () const { return (int)modelList.size(); } ! #if 0 inline tgDoom3Level* GetLevel () const { return pDoom3Level; } + #endif inline tgQ3Level* GetQ3Level () const { return pQ3Level; } protected: *************** *** 35,39 **** --- 60,66 ---- tgRenderView* pTestRenderView; tgQ3Level* pQ3Level; + #if 0 tgDoom3Level* pDoom3Level; + #endif }; Index: bind_manager.cc =================================================================== RCS file: /cvsroot/epfl/engine/bind_manager.cc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** bind_manager.cc 24 Nov 2005 20:46:58 -0000 1.1.1.1 --- bind_manager.cc 7 Dec 2005 22:23:49 -0000 1.2 *************** *** 1,2 **** --- 1,46 ---- + /* + ----------------------------------------------------------------------------- + This source file is part of Terminal G33k + + Copyright (c) 2000-2005 The Terminal G33k Team + Also see acknowledgements in Readme.html + + This program is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the Free Software + Foundation; either version 2 of the License, or (at your option) any later + version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License along with + this program; if not, write to the Free Software Foundation, Inc., 59 Temple + Place - Suite 330, Boston, MA 02111-1307, USA, or go to + http://www.gnu.org/copyleft/lesser.txt. + ----------------------------------------------------------------------------- + */ + /* + ----------------------------------------------------------------------------- + This source file is part of Terminal G33k + + Copyright (c) 2005 The Terminal G33k Team + + This program is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the Free Software + Foundation; either version 2 of the License, or (at your option) any later + version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License along with + this program; if not, write to the Free Software Foundation, Inc., 59 Temple + Place - Suite 330, Boston, MA 02111-1307, USA, or go to + http://www.gnu.org/copyleft/lesser.txt. + ----------------------------------------------------------------------------- + */ + #include "bind_manager.h" Index: model.h =================================================================== RCS file: /cvsroot/epfl/engine/model.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** model.h 24 Nov 2005 20:47:12 -0000 1.1.1.1 --- model.h 7 Dec 2005 22:23:49 -0000 1.2 *************** *** 1,2 **** --- 1,24 ---- + /* + ----------------------------------------------------------------------------- + This source file is part of Terminal G33k + + Copyright (c) 2000-2005 The Terminal G33k Team + Also see acknowledgements in Readme.html + + This program is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the Free Software + Foundation; either version 2 of the License, or (at your option) any later + version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License along with + this program; if not, write to the Free Software Foundation, Inc., 59 Temple + Place - Suite 330, Boston, MA 02111-1307, USA, or go to + http://www.gnu.org/copyleft/lesser.txt. + ----------------------------------------------------------------------------- + */ #ifndef TGMODEL_H #define TGMODEL_H *************** *** 12,15 **** --- 34,38 ---- { friend class tgGLRenderer; + friend class tgGLRendererSTD; public: Index: endian.h =================================================================== RCS file: /cvsroot/epfl/engine/endian.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** endian.h 24 Nov 2005 20:47:12 -0000 1.1.1.1 --- endian.h 7 Dec 2005 22:23:49 -0000 1.2 *************** *** 1,2 **** --- 1,24 ---- + /* + ----------------------------------------------------------------------------- + This source file is part of Terminal G33k + + Copyright (c) 2000-2005 The Terminal G33k Team + Also see acknowledgements in Readme.html + + This program is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the Free Software + Foundation; either version 2 of the License, or (at your option) any later + version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License along with + this program; if not, write to the Free Software Foundation, Inc., 59 Temple + Place - Suite 330, Boston, MA 02111-1307, USA, or go to + http://www.gnu.org/copyleft/lesser.txt. + ----------------------------------------------------------------------------- + */ #ifndef TGENDIAN_H #define TGENDIAN_H Index: q3level.h =================================================================== RCS file: /cvsroot/epfl/engine/q3level.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** q3level.h 24 Nov 2005 20:47:12 -0000 1.1.1.1 --- q3level.h 7 Dec 2005 22:23:49 -0000 1.2 *************** *** 1,2 **** --- 1,24 ---- + /* + ----------------------------------------------------------------------------- + This source file is part of Terminal G33k + + Copyright (c) 2000-2005 The Terminal G33k Team + Also see acknowledgements in Readme.html + + This program is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the Free Software + Foundation; either version 2 of the License, or (at your option) any later + version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License along with + this program; if not, write to the Free Software Foundation, Inc., 59 Temple + Place - Suite 330, Boston, MA 02111-1307, USA, or go to + http://www.gnu.org/copyleft/lesser.txt. + ----------------------------------------------------------------------------- + */ #ifndef TGQ3LEVEL_H #define TGQ3LEVEL_H *************** *** 17,20 **** --- 39,43 ---- { friend class tgGLRenderer; + friend class tgGLRendererSTD; public: tgQ3Level (const char* levelname); Index: glrenderer.h =================================================================== RCS file: /cvsroot/epfl/engine/glrenderer.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** glrenderer.h 24 Nov 2005 20:47:05 -0000 1.1.1.1 --- glrenderer.h 7 Dec 2005 22:23:49 -0000 1.2 *************** *** 1,92 **** ! #ifndef TGGLRENDERER_H ! #define TGGLRENDERER_H ! ! #include "gl/tggl.h" ! #include "defs.h" ! class tgWorldManager; ! class tgModel; ! class tgDoom3Level; ! class tgQ3Level; ! class tgFrustum; ! class tgCanvas; ! struct tgFont; ! /** ! * La classe de base de tout ce qui touche au rendu graphique ! * Une sous-class par famille de carte graphique (NV15, R300, ...) ! */ ! class tgGLRenderer ! { ! public: ! tgGLRenderer (); ! /** ! * Initialize Opengl ! */ ! void InitGL (); ! ! /** ! * Change la taille de la fenêtre de rendu ! * @param w la nouvelle hauteur ! * @param h la nouvelle largeur ! */ ! void ResizeWindow(int w, int h); ! ! /** ! * Effectue le rendu du WorldManager passé en paramètre ! * @param pWorld un pointeur sur le WorldManager ! */ ! void RenderWorld(tgWorldManager* pWorld); ! ! /** ! * Rend un frustum (debug) ! * @param pFrustum un pointeur sur le frustum ! */ ! void RenderDebugFrustum (tgFrustum* pFrustum); ! ! /** ! * Rend un canevas ! * @param pCanvas un pointeur sur le canevas ! */ ! void RenderCanvas (tgCanvas* pCanvas); ! ! /** ! * Appelée avant le rendu ! */ ! void PreRender (); ! ! /** ! * Appelée après le rendu ! */ ! void PostRender (); ! ! /** ! * Chargement d'une font ! */ ! void LoadFont(tgFont* f, const tgstring& sMatName); ! ! protected: ! void _GLUPerspective(double fovy, double aspect, double zNear, double zFar); ! void _SetupView(tgRenderView* r); ! void _RenderBVolume(tgBoundingVolume* b); ! //void _RenderBBox (tgAABoundingBox* b, bool child=false); ! /* void _RenderText (tgFont* f,const char* c, float x, float y, float s);*/ ! void _RenderText (tgFont* f,const char* c, float x, float y, float s, const tgColor& FGcolor, const tgColor& BGcolor); ! void _DrawAxis(); ! void _Begin2D(); ! void _End2D(); ! ! void _RenderModel (tgModel* m); ! void _RenderD3Level (tgDoom3Level* l); ! void _RenderQ3Level (tgQ3Level* l); ! ! void _TransformEntity (tgIEntity* e); ! ! void _ExtractFrustum (tgFrustum& f); ! tgRenderView* pRenderView; ! tgRenderView* pTestRenderView; ! ! }; ! #endif --- 1,133 ---- ! /* ! ----------------------------------------------------------------------------- ! This source file is part of Terminal G33k ! Copyright (c) 2000-2005 The Terminal G33k Team ! Also see acknowledgements in Readme.html ! This program is free software; you can redistribute it and/or modify it under ! the terms of the GNU Lesser General Public License as published by the Free Software ! Foundation; either version 2 of the License, or (at your option) any later ! version. ! This program is distributed in the hope that it will be useful, but WITHOUT ! ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS ! FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. ! You should have received a copy of the GNU Lesser General Public License along with ! this program; if not, write to the Free Software Foundation, Inc., 59 Temple ! Place - Suite 330, Boston, MA 02111-1307, USA, or go to ! http://www.gnu.org/copyleft/lesser.txt. ! ----------------------------------------------------------------------------- ! */ ! #ifndef TGGLRENDERER_H ! #define TGGLRENDERER_H ! ! #include "gl/tggl.h" ! #include "tglib.h" ! ! class tgWorldManager; ! class tgModel; ! class tgDoom3Level; ! class tgQ3Level; ! class tgFrustum; ! class tgCanvas; ! struct tgFont; ! struct tgColor; ! struct tgRenderView; ! class tgIEntity; ! ! /** ! * La classe de base de tout ce qui touche au rendu graphique ! * Une sous-class par famille de carte graphique (NV15, R300, ...) ! */ ! class tgGLRenderer ! { ! public: ! tgGLRenderer (); ! /** ! * Initialize Opengl ! */ ! void InitGL (); ! ! /** ! * Change la taille de la fenêtre de rendu ! * @param w la nouvelle hauteur ! * @param h la nouvelle largeur ! */ ! void ResizeWindow(int w, int h); ! ! /** ! * Effectue le rendu du WorldManager passé en paramètre ! * @param pWorld un pointeur sur le WorldManager ! */ ! void RenderWorld(tgWorldManager* pWorld); ! ! /** ! * Rend un frustum (debug) ! * @param pFrustum un pointeur sur le frustum ! */ ! void RenderDebugFrustum (tgFrustum* pFrustum); ! ! /** ! * Rend un canevas ! * @param pCanvas un pointeur sur le canevas ! */ ! void RenderCanvas (tgCanvas* pCanvas); ! ! /** ! * Appelée avant le rendu ! */ ! void PreRender (); ! ! /** ! * Appelée après le rendu ! */ ! void PostRender (); ! ! /** ! * Chargement d'une font ! */ ! void LoadFont(tgFont* f, const tgstring& sMatName); ! ! protected: ! void _GLUPerspective(double fovy, double aspect, double zNear, double zFar); ! void _SetupView(tgRenderView* r); ! void _RenderBVolume(tgBoundingVolume* b); ! void _RenderText (tgFont* f,const char* c, float x, float y, float s, const tgColor& FGcolor, const tgColor& BGcolor); ! void _DrawAxis(); ! ! void _Begin2D(); ! void _End2D(); ! ! void _RenderModel (tgModel* m); ! #if 0 ! void _RenderD3Level (tgDoom3Level* l); ! #endif ! void _RenderQ3Level (tgQ3Level* l); ! ! void _TransformEntity (tgIEntity* e); ! ! void _ExtractFrustum (tgFrustum& f); ! tgRenderView* pRenderView; ! tgRenderView* pTestRenderView; ! ! //OPENGL EXTENSIONS ! //#ifdef TGLINUX ! //#define APIENTRY ! ! //#endif ! //#ifdef TGWIN32 ! ! typedef void (APIENTRY * GL_ActiveTextureARB_Func)(GLenum); ! typedef void (APIENTRY * GL_MultiTexCoord2fARB_Func)(GLenum, GLfloat, GLfloat); ! typedef void (APIENTRY * GL_ClientActiveTextureARB_Func)(GLenum); ! //#endif ! GL_ActiveTextureARB_Func tgglActiveTexture; ! GL_MultiTexCoord2fARB_Func tgglMultiTexCoord2f; ! GL_ClientActiveTextureARB_Func tgglClientActiveTexture; ! ! }; ! ! ! #endif Index: system_linux.h =================================================================== RCS file: /cvsroot/epfl/engine/system_linux.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** system_linux.h 24 Nov 2005 20:46:58 -0000 1.1.1.1 --- system_linux.h 7 Dec 2005 22:23:49 -0000 1.2 *************** *** 1,2 **** --- 1,26 ---- + /* + ----------------------------------------------------------------------------- + This source file is part of Terminal G33k + + Copyright (c) 2000-2005 The Terminal G33k Team + Also see acknowledgements in Readme.html + + This program is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the Free Software + Foundation; either version 2 of the License, or (at your option) any later + version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License along with + this program; if not, write to the Free Software Foundation, Inc., 59 Temple + Place - Suite 330, Boston, MA 02111-1307, USA, or go to + http://www.gnu.org/copyleft/lesser.txt. + ----------------------------------------------------------------------------- + */ + #ifdef TGLINUX + #ifndef TGSYSTEM_LINUX_H #define TGSYSTEM_LINUX_H *************** *** 93,94 **** --- 117,120 ---- #endif + #endif + Index: canvas.cc =================================================================== RCS file: /cvsroot/epfl/engine/canvas.cc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** canvas.cc 24 Nov 2005 20:47:05 -0000 1.1.1.1 --- canvas.cc 7 Dec 2005 22:23:49 -0000 1.2 *************** *** 1,2 **** --- 1,24 ---- + /* + ----------------------------------------------------------------------------- + This source file is part of Terminal G33k + + Copyright (c) 2000-2005 The Terminal G33k Team + Also see acknowledgements in Readme.html + + This program is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the Free Software + Foundation; either version 2 of the License, or (at your option) any later + version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License along with + this program; if not, write to the Free Software Foundation, Inc., 59 Temple + Place - Suite 330, Boston, MA 02111-1307, USA, or go to + http://www.gnu.org/copyleft/lesser.txt. + ----------------------------------------------------------------------------- + */ #include "canvas.h" *************** *** 5,9 **** fOriginX = fOriginY = fCurrentX = fCurrentY = 0.0f; DrawColor.Set(1,1,1,1); ! BackgroundColor.Set(0,0,0,0.2); bFontLoaded = false; } --- 27,31 ---- fOriginX = fOriginY = fCurrentX = fCurrentY = 0.0f; DrawColor.Set(1,1,1,1); ! BackgroundColor.Set(0,0,0,0.2f); bFontLoaded = false; } *************** *** 20,24 **** } ! void tgCanvas::DrawText (const tgstring& str, bool CR) { if (!bFontLoaded) --- 42,46 ---- } ! void tgCanvas::DisplayText(const tgstring& str, bool CR) { if (!bFontLoaded) Index: file_manager.cc =================================================================== RCS file: /cvsroot/epfl/engine/file_manager.cc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** file_manager.cc 24 Nov 2005 20:47:05 -0000 1.1.1.1 --- file_manager.cc 7 Dec 2005 22:23:49 -0000 1.2 *************** *** 1,2 **** --- 1,24 ---- + /* + ----------------------------------------------------------------------------- + This source file is part of Terminal G33k + + Copyright (c) 2000-2005 The Terminal G33k Team + Also see acknowledgements in Readme.html + + This program is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the Free Software + Foundation; either version 2 of the License, or (at your option) any later + version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License along with + this program; if not, write to the Free Software Foundation, Inc., 59 Temple + Place - Suite 330, Boston, MA 02111-1307, USA, or go to + http://www.gnu.org/copyleft/lesser.txt. + ----------------------------------------------------------------------------- + */ #include "file_manager.h" *************** *** 71,75 **** if (!_ValidateStream(iD)) return true; //return pStreams[iD].eof (); ! return feof(pStreams[iD]); } --- 93,98 ---- if (!_ValidateStream(iD)) return true; //return pStreams[iD].eof (); ! return (feof(pStreams[iD]) == 0)?false:true; ! //return (bool)feof(pStreams[iD]); } Index: timer.h =================================================================== RCS file: /cvsroot/epfl/engine/timer.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** timer.h 24 Nov 2005 20:47:06 -0000 1.1.1.1 --- timer.h 7 Dec 2005 22:23:49 -0000 1.2 *************** *** 1,2 **** --- 1,24 ---- + /* + ----------------------------------------------------------------------------- + This source file is part of Terminal G33k + + Copyright (c) 2000-2005 The Terminal G33k Team + Also see acknowledgements in Readme.html + + This program is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the Free Software + Foundation; either version 2 of the License, or (at your option) any later + version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License along with + this program; if not, write to the Free Software Foundation, Inc., 59 Temple + Place - Suite 330, Boston, MA 02111-1307, USA, or go to + http://www.gnu.org/copyleft/lesser.txt. + ----------------------------------------------------------------------------- + */ #ifndef TGTIMER_H #define TGTIMER_H Index: model.cc =================================================================== RCS file: /cvsroot/epfl/engine/model.cc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** model.cc 24 Nov 2005 20:47:12 -0000 1.1.1.1 --- model.cc 7 Dec 2005 22:23:49 -0000 1.2 *************** *** 1,2 **** --- 1,24 ---- + /* + ----------------------------------------------------------------------------- + This source file is part of Terminal G33k + + Copyright (c) 2000-2005 The Terminal G33k Team + Also see acknowledgements in Readme.html + + This program is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the Free Software + Foundation; either version 2 of the License, or (at your option) any later + version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License along with + this program; if not, write to the Free Software Foundation, Inc., 59 Temple + Place - Suite 330, Boston, MA 02111-1307, USA, or go to + http://www.gnu.org/copyleft/lesser.txt. + ----------------------------------------------------------------------------- + */ #include "model.h" Index: canvas.h =================================================================== RCS file: /cvsroot/epfl/engine/canvas.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** canvas.h 24 Nov 2005 20:47:05 -0000 1.1.1.1 --- canvas.h 7 Dec 2005 22:23:49 -0000 1.2 *************** *** 1,7 **** #ifndef TGCANVAS_H #define TGCANVAS_H - #include "icanvas.h" #include "defs.h" struct tgFont --- 1,30 ---- + /* + ----------------------------------------------------------------------------- + This source file is part of Terminal G33k + + Copyright (c) 2000-2005 The Terminal G33k Team + Also see acknowledgements in Readme.html + + This program is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the Free Software + Foundation; either version 2 of the License, or (at your option) any later + version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License along with + this program; if not, write to the Free Software Foundation, Inc., 59 Temple + Place - Suite 330, Boston, MA 02111-1307, USA, or go to + http://www.gnu.org/copyleft/lesser.txt. + ----------------------------------------------------------------------------- + */ #ifndef TGCANVAS_H #define TGCANVAS_H #include "defs.h" + #include "icanvas.h" + struct tgFont *************** *** 16,25 **** public: tgCanvas (); ! virtual ~tgCanvas (); /** ! * @see tgICanvas::DrawText */ ! void DrawText (const tgstring& str, bool CR=true); /** --- 39,48 ---- public: tgCanvas (); ! ~tgCanvas (); /** ! * @see tgICanvas::DisplayText */ ! void DisplayText(const tgstring& str, bool CR=true); /** Index: world_manager.cc =================================================================== RCS file: /cvsroot/epfl/engine/world_manager.cc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** world_manager.cc 24 Nov 2005 20:47:12 -0000 1.1.1.1 --- world_manager.cc 7 Dec 2005 22:23:49 -0000 1.2 *************** *** 1,2 **** --- 1,24 ---- + /* + ----------------------------------------------------------------------------- + This source file is part of Terminal G33k + + Copyright (c) 2000-2005 The Terminal G33k Team + Also see acknowledgements in Readme.html + + This program is free software; you can redistribute it and/or modify it under + the terms of the GNU Lesser General Public License as published by the Free Software + Foundation; either version 2 of the License, or (at your option) any later + version. + + This program is distributed in the hope that it will be useful, but WITHOUT + ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + FOR A PART... [truncated message content] |
Thanks for helping keep SourceForge clean.
X