Menu
▾
▴
[Epfl-cvs] engine bind_manager.cc,1.1.1.1,1.2 bind_manager.h,1.1.1.1,1.2 canvas.cc,1.1.1.1,1.2 canvas.h,1.1.1.1,1.2 console.cc,1.1.1.1,1.2 console.h,1.1.1.1,1.2 defs.h,1.1.1.1,1.2 doom3level.cc,1.1.1.1,1.2 doom3level.h,1.1.1.1,1.2 endian.h,1.1.1.1,1.2 file_manager.cc,1.1.1.1,1.2 file_manager.h,1.1.1.1,1.2 glrenderer.cc,1.2,1.3 glrenderer.h,1.1.1.1,1.2 image.cc,1.1.1.1,1.2 image.h,1.1.1.1,1.2 main.cc,1.1.1.1,1.2 material.cc,1.2,1.3 material.h,1.1.1.1,1.2 material_manager.cc,1.2,1.3 material_manager.h,1.1.1.1,1.2 model.cc,1.1.1.1,1.2 model.h,1.1.1.1,1.2 model_cache.cc,1.1.1.1,1.2 model_cache.h,1.1.1.1,1.2 model_manager.cc,1.2,1.3 model_manager.h,1.1.1.1,1.2 q3defs.h,1.1.1.1,1.2 q3level.cc,1.1.1.1,1.2 q3level.h,1.1.1.1,1.2 system.h,1.1.1.1,1.2 system_linux.cc,1.1.1.1,1.2 system_linux.h,1.1.1.1,1.2 system_osx.cc,1.1.1.1,1.2 system_osx.h,1.1.1.1,1.2 timer.cc,1.1.1.1,1.2 timer.h,1.1.1.1,1.2 world_manager.cc,1.1.1.1,1.2 world_manager.h,1.1.1.1,1.2
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 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 "world_manager.h" *************** *** 68,73 **** void tgWorldManager::Manage () { ! unsigned int size = modelList.size(); ! for(unsigned int i=0; i<size; i++) { //FIXME: cf FIXME model.cc:181 //modelList[i]->Animate(pTimer->GetFrameInterval()); --- 90,95 ---- void tgWorldManager::Manage () { ! size_t size = modelList.size(); ! for(size_t i=0; i<size; i++) { //FIXME: cf FIXME model.cc:181 //modelList[i]->Animate(pTimer->GetFrameInterval()); Index: file_manager.h =================================================================== RCS file: /cvsroot/epfl/engine/file_manager.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** file_manager.h 24 Nov 2005 20:46:58 -0000 1.1.1.1 --- file_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 TGFILE_MANAGER_H #define TGFILE_MANAGER_H Index: bind_manager.h =================================================================== RCS file: /cvsroot/epfl/engine/bind_manager.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** bind_manager.h 24 Nov 2005 20:47:12 -0000 1.1.1.1 --- bind_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 TGBINDMANAGER_H #define TGBINDMANAGER_H Index: console.h =================================================================== RCS file: /cvsroot/epfl/engine/console.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** console.h 24 Nov 2005 20:47:05 -0000 1.1.1.1 --- console.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 TGCONSOLE_H #define TGCONSOLE_H Index: model_manager.cc =================================================================== RCS file: /cvsroot/epfl/engine/model_manager.cc,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** model_manager.cc 30 Nov 2005 16:45:54 -0000 1.2 --- model_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 "model_manager.h" Index: material_manager.h =================================================================== RCS file: /cvsroot/epfl/engine/material_manager.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** material_manager.h 24 Nov 2005 20:47:12 -0000 1.1.1.1 --- material_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 TGMATERIAL_MANAGER_H #define TGMATERIAL_MANAGER_H Index: console.cc =================================================================== RCS file: /cvsroot/epfl/engine/console.cc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** console.cc 24 Nov 2005 20:47:12 -0000 1.1.1.1 --- console.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 "console.h" *************** *** 90,94 **** bool tgConsole::_ExecuteLine(const tgstring& line) { ! unsigned int index = line.find_first_not_of (" "); if (index != tgstring::npos && line[index] == '-') {//si le premier non-espace est un tiret,on a une commande --- 112,116 ---- bool tgConsole::_ExecuteLine(const tgstring& line) { ! size_t index = line.find_first_not_of (" "); if (index != tgstring::npos && line[index] == '-') {//si le premier non-espace est un tiret,on a une commande *************** *** 104,109 **** //on cherche le premier mot ! unsigned int debut = command.find_first_not_of(" \t\n"); ! unsigned int pos = command.find_first_of(" \t\n", debut); if(pos != tgstring::npos) {//on sépare le premier mot (commande) de la fin de la chaîne (arguments) --- 126,131 ---- //on cherche le premier mot ! size_t debut = command.find_first_not_of(" \t\n"); ! size_t pos = command.find_first_of(" \t\n", debut); if(pos != tgstring::npos) {//on sépare le premier mot (commande) de la fin de la chaîne (arguments) *************** *** 116,124 **** tgvector<tgstring> vArgs; _GetArgs(&vArgs, args); ! for(int i=0; i<args.size(); i++) { out << args[i] << endl; } ! for(unsigned int i=0; i<vArgs.size(); i++) { this->Print(vArgs[i]); } --- 138,146 ---- tgvector<tgstring> vArgs; _GetArgs(&vArgs, args); ! for(size_t i=0; i<args.size(); i++) { out << args[i] << endl; } ! for(size_t i=0; i<vArgs.size(); i++) { this->Print(vArgs[i]); } *************** *** 147,151 **** for(; i != floatFunc.end(); i++) { if (firstWord.compare(i->first) == 0) { ! i->second (2.3); return true; } --- 169,173 ---- for(; i != floatFunc.end(); i++) { if (firstWord.compare(i->first) == 0) { ! i->second (2.3f); return true; } *************** *** 167,176 **** void tgConsole::_GetArgs(tgvector<tgstring>* args, const tgstring& line) { ! unsigned int count = 0; do { ! unsigned int debut = line.find_first_not_of(" \t\n", count); if(debut == tgstring::npos) return; ! unsigned int fin = line.find_first_of(" \t\n", debut); count = fin; if(fin == tgstring::npos) --- 189,198 ---- void tgConsole::_GetArgs(tgvector<tgstring>* args, const tgstring& line) { ! size_t count = 0; do { ! size_t debut = line.find_first_not_of(" \t\n", count); if(debut == tgstring::npos) return; ! size_t fin = line.find_first_of(" \t\n", debut); count = fin; if(fin == tgstring::npos) *************** *** 203,220 **** pCanvas->SetDrawColor(tgColor(1,1,1)); ! pCanvas->SetBackgroundColor(tgColor(0,0.5,0,0.8)); ! unsigned int length = vHistory.size(); //on affiche au maximum iMaxLines ! int begin; if (length < iMaxLines) begin = 0; else ! begin = length-iMaxLines; ! for(unsigned int i=begin;i<length;i++){ ! pCanvas->DrawText(vHistory[i]); } ! pCanvas->DrawText("$" + sCurrentLine); pCanvas->SetBackgroundColor(tempBG); --- 225,242 ---- pCanvas->SetDrawColor(tgColor(1,1,1)); ! pCanvas->SetBackgroundColor(tgColor(0,0.5f,0,0.8f)); ! size_t length = vHistory.size(); //on affiche au maximum iMaxLines ! size_t begin; if (length < iMaxLines) begin = 0; else ! begin = length-(size_t)iMaxLines; ! for(size_t i=begin;i<length;i++){ ! pCanvas->DisplayText(vHistory[i]); } ! pCanvas->DisplayText("$" + sCurrentLine); pCanvas->SetBackgroundColor(tempBG); Index: main.cc =================================================================== RCS file: /cvsroot/epfl/engine/main.cc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** main.cc 24 Nov 2005 20:47:10 -0000 1.1.1.1 --- main.cc 7 Dec 2005 22:23:49 -0000 1.2 *************** *** 1,4 **** #include "defs.h" ! #include <dlfcn.h> #ifdef TGLINUX --- 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. + ----------------------------------------------------------------------------- + */ #include "defs.h" ! #ifdef TGLINUX *************** *** 10,13 **** --- 32,39 ---- #endif + #ifdef WIN32 + #include "system_win32.h" + #endif + tgSystem* pSystem = NULL; tgIGame* pGame = NULL; *************** *** 42,45 **** --- 68,76 ---- pSystem = new tgSystemOSX(); #endif + + #ifdef TGWIN32 + out << "[TGE] Win32 System Version" << endl; + pSystem = new tgSystemWin32(); + #endif if (!pSystem) { *************** *** 58,63 **** #endif if (!pGame) { ! cerr << "[TGE] Errur lors de l'obtention du pointeur sur tgIGame" << endl; return -1; } --- 89,98 ---- #endif + #ifdef TGWIN32 + pGame = pSystem->GetGameAPI("tg-game.dll"); + #endif + if (!pGame) { ! cerr << "[TGE] Erreur lors de l'obtention du pointeur sur tgIGame" << endl; return -1; } *************** *** 103,109 **** //Ouverture de la fenêtre ! pSystem->OpenWindow("tg", 800, 600); pGLRenderer->InitGL(); ! pGLRenderer->ResizeWindow(800,600); pMaterialManager->Initialize(); --- 138,144 ---- //Ouverture de la fenêtre ! pSystem->OpenWindow("tg", 1024, 768); pGLRenderer->InitGL(); ! pGLRenderer->ResizeWindow(1024,768); pMaterialManager->Initialize(); Index: model_manager.h =================================================================== RCS file: /cvsroot/epfl/engine/model_manager.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** model_manager.h 24 Nov 2005 20:47:12 -0000 1.1.1.1 --- model_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 TGMODEL_MANAGER_H #define TGMODEL_MANAGER_H Index: defs.h =================================================================== RCS file: /cvsroot/epfl/engine/defs.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** defs.h 24 Nov 2005 20:47:05 -0000 1.1.1.1 --- defs.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 TGDEFS_H #define TGDEFS_H *************** *** 6,9 **** --- 28,32 ---- #include "math.h" #include <sys/stat.h> + #include <SDL/SDL.h> using namespace std; Index: model_cache.cc =================================================================== RCS file: /cvsroot/epfl/engine/model_cache.cc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** model_cache.cc 24 Nov 2005 20:47:07 -0000 1.1.1.1 --- model_cache.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_cache.h" #include "defs.h" *************** *** 149,153 **** pJoints[i].iChannel = /*gameImport.iNumChannels*/-1; //on met sur le channel "all" par defaut pJoints[i].sName.erase(0,1); //on efface le premier " ! int last = pJoints[i].sName.find_last_of('\"'); pJoints[i].sName.erase(last); --- 171,175 ---- pJoints[i].iChannel = /*gameImport.iNumChannels*/-1; //on met sur le channel "all" par defaut pJoints[i].sName.erase(0,1); //on efface le premier " ! size_t last = pJoints[i].sName.find_last_of('\"'); pJoints[i].sName.erase(last); *************** *** 224,229 **** pFileManager->Read(file, sTmp); ! int iLastSlash = sTmp.find_last_of("/"); ! int iLastQuote = sTmp.find_last_of("\""); iLastSlash += 1; //on veut le caractere juste apres le dernier slash sTmp.erase(iLastQuote); --- 246,251 ---- pFileManager->Read(file, sTmp); ! size_t iLastSlash = sTmp.find_last_of("/"); ! size_t iLastQuote = sTmp.find_last_of("\""); iLastSlash += 1; //on veut le caractere juste apres le dernier slash sTmp.erase(iLastQuote); *************** *** 484,491 **** int tgModelCache::GetAnimIndex(const std::string& name) { ! int size = pAnimations.size(); ! for (int i=0; i<size; i++) { if (pAnimations[i].sName == name) ! return i; } return -1; --- 506,513 ---- int tgModelCache::GetAnimIndex(const std::string& name) { ! size_t size = pAnimations.size(); ! for (size_t i=0; i<size; i++) { if (pAnimations[i].sName == name) ! return (int)i; } return -1; Index: model_cache.h =================================================================== RCS file: /cvsroot/epfl/engine/model_cache.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** model_cache.h 24 Nov 2005 20:47:06 -0000 1.1.1.1 --- model_cache.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_CACHE_H #define TGMODEL_CACHE_H Index: image.cc =================================================================== RCS file: /cvsroot/epfl/engine/image.cc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** image.cc 24 Nov 2005 20:47:05 -0000 1.1.1.1 --- image.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 "image.h" *************** *** 119,123 **** unsigned int imageSize = (bytesPerPixel*iWidth*iHeight); pData = new GLubyte[imageSize]; ! GLubyte colorbuffer[bytesPerPixel]; do { --- 141,145 ---- unsigned int imageSize = (bytesPerPixel*iWidth*iHeight); pData = new GLubyte[imageSize]; ! GLubyte* colorbuffer = new GLubyte[bytesPerPixel]; do { *************** *** 174,177 **** --- 196,200 ---- } while(currentpixel < pixelcount); pFileManager->Close(file); + delete [] colorbuffer; return true; } Index: doom3level.h =================================================================== RCS file: /cvsroot/epfl/engine/doom3level.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** doom3level.h 24 Nov 2005 20:47:07 -0000 1.1.1.1 --- doom3level.h 7 Dec 2005 22:23:49 -0000 1.2 *************** *** 1,2 **** --- 1,25 ---- + /* + ----------------------------------------------------------------------------- + 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. + ----------------------------------------------------------------------------- + */ + #if 0 #ifndef TGDOOM3LEVEL_H #define TGDOOM3LEVEL_H *************** *** 96,97 **** --- 119,123 ---- #endif + + + #endif \ No newline at end of file Index: material.h =================================================================== RCS file: /cvsroot/epfl/engine/material.h,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** material.h 24 Nov 2005 20:47:12 -0000 1.1.1.1 --- material.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 TGMATERIAL_H #define TGMATERIAL_H Index: doom3level.cc =================================================================== RCS file: /cvsroot/epfl/engine/doom3level.cc,v retrieving revision 1.1.1.1 retrieving revision 1.2 diff -C2 -d -r1.1.1.1 -r1.2 *** doom3level.cc 24 Nov 2005 20:46:58 -0000 1.1.1.1 --- doom3level.cc 7 Dec 2005 22:23:49 -0000 1.2 *************** *** 1,2 **** --- 1,25 ---- + /* + ----------------------------------------------------------------------------- + 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. + ----------------------------------------------------------------------------- + */ + #if 0 #include "doom3level.h" *************** *** 509,510 **** --- 532,534 ---- + #endif \ No newline at end of file Index: timer.cc ===============================... [truncated message content] |
