epfl-cvs — CVS Commit

[Epfl-cvs] engine Makefile,1.1.1.1,1.2 defs.h,1.2,1.3 glrenderer.cc,1.4,1.5 image.cc,1.2,1.3 image.h,1.2,1.3 material_manager.cc,1.3,1.4

[julien r. <jul...@us...>]

Update of /cvsroot/epfl/engine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26830

Modified Files:
	Makefile defs.h glrenderer.cc image.cc image.h 
	material_manager.cc 
Log Message:
buxfix lightmaps, bugfix deplacements

Index: material_manager.cc
===================================================================
RCS file: /cvsroot/epfl/engine/material_manager.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** material_manager.cc	7 Dec 2005 22:23:49 -0000	1.3
--- material_manager.cc	11 Dec 2005 22:16:00 -0000	1.4
***************
*** 69,73 ****
  		}
  	} 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: image.h
===================================================================
RCS file: /cvsroot/epfl/engine/image.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** image.h	7 Dec 2005 22:23:49 -0000	1.2
--- image.h	11 Dec 2005 22:16:00 -0000	1.3
***************
*** 38,49 ****
  	//unsigned short int GetAlphaDepth () { return iAlphaDepth; }
  	//unsigned short int GetPixelDepth () { return iPixelDepth; }
! 	unsigned short GetColorMode () { return iColorMode; }
! 	unsigned int GetWidth () { return iWidth; }
! 	unsigned int GetHeight () { return iHeight; }
! 	unsigned char* GetPixels () {return pData; }
  	
  	inline operator bool() const { return bLoaded; } 
   protected:
! 	struct TGAHeader {
  		uint8	IDLength;
  		uint8	colorMapType;
--- 38,49 ----
  	//unsigned short int GetAlphaDepth () { return iAlphaDepth; }
  	//unsigned short int GetPixelDepth () { return iPixelDepth; }
! 	unsigned short GetColorMode () { return /*iColorMode;*/type; }
! 	unsigned int GetWidth () { return /*iWidth;*/w; }
! 	unsigned int GetHeight () { return /*iHeight;*/h; }
! 	unsigned char* GetPixels () {return /*pData;*/ data;}
  	
  	inline operator bool() const { return bLoaded; } 
   protected:
! 	/*struct TGAHeader {
  		uint8	IDLength;
  		uint8	colorMapType;
***************
*** 74,79 ****
  	unsigned int iBpp;
  	unsigned int iWidth;
! 	unsigned int iHeight;
! 	
  	bool bLoaded;
  };
--- 74,83 ----
  	unsigned int iBpp;
  	unsigned int iWidth;
! 	unsigned int iHeight;*/
! 	//SDL_Surface* image;
! 	unsigned char* data;
! 	int w;
! 	int h;
! 	int type;
  	bool bLoaded;
  };

Index: defs.h
===================================================================
RCS file: /cvsroot/epfl/engine/defs.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** defs.h	7 Dec 2005 22:23:49 -0000	1.2
--- defs.h	11 Dec 2005 22:16:00 -0000	1.3
***************
*** 29,32 ****
--- 29,33 ----
  #include <sys/stat.h>
  #include <SDL/SDL.h>
+ #include <SDL/SDL_image.h>
  
  using namespace std;

Index: Makefile
===================================================================
RCS file: /cvsroot/epfl/engine/Makefile,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** Makefile	24 Nov 2005 20:47:12 -0000	1.1.1.1
--- Makefile	11 Dec 2005 22:16:00 -0000	1.2
***************
*** 1,5 ****
  CC	=	g++
  CFLAGS	=	-DTGLINUX -I/usr/include/SDL -I./interface -I../game/interface -Wall -DDEBUG -DMEMORY_DEBUG -ggdb
! LDFLAGS	=	-ldl -lSDL -lm -lGL -lGLU -ggdb -L../ -ltglib -pg
  TARGET	=	../tg
  OBJ_EXT	=	o
--- 1,5 ----
  CC	=	g++
  CFLAGS	=	-DTGLINUX -I/usr/include/SDL -I./interface -I../game/interface -Wall -DDEBUG -DMEMORY_DEBUG -ggdb
! LDFLAGS	=	-ldl -lSDL -lSDL_image -lm -lGL -lGLU -ggdb -L../ -ltglib 
  TARGET	=	../tg
  OBJ_EXT	=	o

Index: image.cc
===================================================================
RCS file: /cvsroot/epfl/engine/image.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** image.cc	7 Dec 2005 22:23:49 -0000	1.2
--- image.cc	11 Dec 2005 22:16:00 -0000	1.3
***************
*** 22,29 ****
  */
  #include "image.h"
  
  tgImage::tgImage(const tgstring& filename)
  {
! 	pData = NULL;
  	iColorMode = 0;
  	iWidth = 0;
--- 22,68 ----
  */
  #include "image.h"
+ inline Uint32 getpixel(SDL_Surface *surface, int x, int y) {
+ 	Uint8 *p = (Uint8 *)surface->pixels + y * surface->pitch + x *
+ 	surface->format->BytesPerPixel;
+ 	return (*(Uint32 *)p);
+ }
  
  tgImage::tgImage(const tgstring& filename)
  {
! 	SDL_Surface* image = IMG_Load(filename.data());
! 	if(!image) {
! 		bLoaded = false;
! 		return;
! 	}
! 	bLoaded = true;
! 	w = image->w;
! 	h = image->h;
! 	type = GL_RGBA;
! 	int dim = w*h*4; // RGBA
! 	data = new unsigned char[dim];
! 	int pos = 0;
! 	for(int y=(h-1); y>-1; y--) {
! 		for(int x=0; x<w; x++) {
! 			Uint8 r,g,b,a;
! 			//Uint32 color = getpixel(img, x,y);
! 			//Uint32 color = (Uint32)image->pixels[x+y*w];
! 			Uint32 color = getpixel(image,x,y);
! 
! /*			if(!alpha)
! 				SDL_GetRGB(color, img->format, &r,&g,&b);
! 			else*/
! 				SDL_GetRGBA(color, image->format, &r,&g,&b,&a);
! 
! 			data[pos] = r; pos++;
! 			data[pos] = g; pos++;
! 			data[pos] = b; pos++;
! 			//if(alpha) {
! 				data[pos] = a; pos++;
! 			//}
! 		}
! 	}
! 	SDL_FreeSurface(image);
! 
! /*	pData = NULL;
  	iColorMode = 0;
  	iWidth = 0;
***************
*** 37,48 ****
  		bLoaded = false;
  	}
! 	
  }
  
  tgImage::~ tgImage()
  {
! 	delete [] pData;
  }
! 
  bool tgImage::_LoadTGA(const tgstring& filename)
  {
--- 76,88 ----
  		bLoaded = false;
  	}
! 	*/
  }
  
  tgImage::~ tgImage()
  {
! 	delete [] data;	
! 	/*	delete [] pData;*/
  }
! /*
  bool tgImage::_LoadTGA(const tgstring& filename)
  {
***************
*** 198,201 ****
  	delete [] colorbuffer;
  	return true;
! }
  
--- 238,241 ----
  	delete [] colorbuffer;
  	return true;
! }*/
  

Index: glrenderer.cc
===================================================================
RCS file: /cvsroot/epfl/engine/glrenderer.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** glrenderer.cc	10 Dec 2005 23:58:26 -0000	1.4
--- glrenderer.cc	11 Dec 2005 22:16:00 -0000	1.5
***************
*** 482,489 ****
  			tgglActiveTexture(GL_TEXTURE1);
  			if (pMesh->lightmapID>=0)
! 				glBindTexture (GL_TEXTURE_2D, l->pLightMaps[pMesh->lightmapID]);
  			else {
! 				//glBindTexture (GL_TEXTURE_2D, pTexManager->GetWhite());
! 				glDisable(GL_TEXTURE_2D);
  			}
  			
--- 482,489 ----
  			tgglActiveTexture(GL_TEXTURE1);
  			if (pMesh->lightmapID>=0)
! 				tgglBindTexture (GL_TEXTURE_2D, l->pLightMaps[pMesh->lightmapID]);
  			else {
! 			//	glBindTexture (GL_TEXTURE_2D, pTexManager->GetWhite());
! 				tgglDisable(GL_TEXTURE_2D);
  			}
  			
***************
*** 497,500 ****
--- 497,505 ----
  			glDrawElements (GL_TRIANGLES, pMesh->numOfMeshVerts, GL_UNSIGNED_INT, &l->pMeshIndices[pMesh->firstMeshIndex]);
  			numMeshRend++;
+ 			//au cas ou on l'aurait disable ci-dessus
+ 			if (pMesh->lightmapID<0) {
+ 				tgglActiveTexture(GL_TEXTURE1);
+ 				tgglEnable(GL_TEXTURE_2D);
+ 			}
  		}
  	}

[Epfl-cvs] game player.cc,1.2,1.3

[julien r. <jul...@us...>]

Update of /cvsroot/epfl/game
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26912

Modified Files:
	player.cc 
Log Message:
bugfix deplacements

Index: player.cc
===================================================================
RCS file: /cvsroot/epfl/game/player.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** player.cc	7 Dec 2005 22:23:51 -0000	1.2
--- player.cc	11 Dec 2005 22:16:00 -0000	1.3
***************
*** 21,187 ****
  -----------------------------------------------------------------------------
  */
! #include "player.h"
! #include <iostream>
! 
! tgPlayer::tgPlayer (tgIWorldManager* pWorldManager, tgIModelManager* pModelManager, const tgVector3& position)
! {
! 	totY = totX = 0;
! 	bActive = false;
! 
! 	for(int i=0; i<6; i++)
! 		bMoveDirs[i] = false;
! 	rView.vOrigin.Set(-50,0,-100);
! 	tgQuaternion q;
! 	q.GetMatrix(rView.matrix);
! 	
! 	//chargement du modèle
! 	pModel = pModelManager->GetInstance("imp");
! 	pModel->SetAnimation("idle", -1, false, false);
! 	pModel->SetAnimation("evade_left", 1, false, false);
! 	pModel->SetAnimation("range1", 0, false, false);
! 	pModel->SetAnimation("sight1", 0, false, false);
! 	
! 	tgAABoundingBox* box = new tgAABoundingBox(tgVector3(-30,-30,-30), tgVector3(30,30,30));
! 	box->SetPosition(position);
! 	//tgBoundingSphere* box = new tgBoundingSphere(position, 30);
! 	pModel->SetBoundingVolume(box);
! 	
! 	pModel->SetPosition(position);
! 	
! 	
! 	
! 	pWorldManager->AddModel(pModel);
! }
! 
! tgPlayer::~tgPlayer ()
! {
! 	delete pModel;
! }
! 
! void tgPlayer::SetActive ()
! {
! 	pModel->SetVisible(false);
! 	bActive = true;
! }
! 
! void tgPlayer::SetInactive ()
! {
! 	pModel->SetVisible(true);
! 	bActive = false;
! }
! 
! void tgPlayer::Think (float eTime)
! {
! 	//FIXME: sans les 2 lignes suivantes, la caméra ne suit pas les mouvemnts du perso si il est déplacé par la physique
! 	// avec, cela pose de gros problèmes dans les déplacements...
! 	rView.vOrigin = pModel->GetPosition();
! 	//rView.qRotation = pModel->GetRotation();
! 	
! 	
! 	#define SPEED 2
! 	if (bMoveDirs[FORWARD])
! 		rView.vOrigin -= rView.qRotation.GetZAxis()*SPEED;
! 	if (bMoveDirs[BACKWARD])
! 		rView.vOrigin += rView.qRotation.GetZAxis()*SPEED;
! 	if (bMoveDirs[STRAFELEFT])
! 		rView.vOrigin -= rView.qRotation.GetXAxis()*SPEED;
! 	if (bMoveDirs[STRAFERIGHT])
! 		rView.vOrigin += rView.qRotation.GetXAxis()*SPEED;
! 		
! 	pModel->SetPosition(rView.vOrigin);
! 	#if 0
! 	float angle_x, angle_y, angle_z;
! 	//Matrix to euler conversion
! 	{
! 		float matrix[16];
! 		rView.qRotation.GetMatrix(matrix);
! 		angle_y = -asin(matrix[2]);
! 		float C = cos(angle_y);
! 		angle_y *= RADTODEG;
! 		
! 		if (fabs(C) > 0.005) {
! 			float tr_x = matrix[10]/C;
! 			float tr_y = -matrix[6]/C;
! 			
! 			angle_x = atan2(tr_y, tr_x)*RADTODEG;
! 			
! 			tr_x = matrix[0]/C;
! 			tr_y = -matrix[1]/C;
! 			
! 			angle_z = atan2(tr_y, tr_x)*RADTODEG;
! 		} else {
! 			angle_x = 0;
! 			float tr_x = matrix[5];
! 			float tr_y = matrix[4];
! 			angle_z = atan2(tr_y, tr_x)*RADTODEG;
! 		}
! 	}
! 	
! 	cout << angle_x << "\t" << angle_y << "\t" << angle_z << endl;
! 	#endif
! 	pModel->SetRotation(rView.qRotation*tgQuaternion(90, tgVector3(0,1,0)));
! 	//pModel->SetRotation(tgQuaternion(angle_y, tgVector3(0,1,0)));
! 	
! 	
! 	
! 	
! 	//std::cout << rView.vOrigin.x << ":" << rView.vOrigin.y << ":" << rView.vOrigin.z << std::endl;
! }
! 
! void tgPlayer::MouseMotion (int rx, int ry)
! {
! 	float fSensivity = 0.2f;
! 	
! 	totX -= ((float)ry)*fSensivity;
! 	totY -= ((float)rx)*fSensivity;
! 
! 	tgQuaternion qY = tgQuaternion(totY, tgVector3(0,1,0));
! 	tgQuaternion qX = tgQuaternion(totX, tgVector3(1,0,0));
! 	tgQuaternion q = qY*qX;
! 	q.Normalize();
! 	rView.qRotation = q;
! 	q = q.Conjugate();
! 
! 	q.GetMatrix(rView.matrix);
! 	
! }
! 
! void tgPlayer::MoveForward (int state)
! {
! 	if (state)
! 		bMoveDirs[FORWARD] = true;
! 	else
! 		bMoveDirs[FORWARD] = false;
! 	//rView.vOrigin.z -= 10;
! 	//pModel->SetAnimation("walk", 1, false, true);
! }
! 
! void tgPlayer::MoveBackward (int state)
! {
! 	if (state)	
! 		bMoveDirs[BACKWARD] = true;
! 	else
! 		bMoveDirs[BACKWARD] = false;
! 	//rView.vOrigin.z += 10;
! 	//pModel->SetAnimation("crouch", 1, true, false);
! }
! 
! void tgPlayer::StrafeLeft (int state)
! {
! 	if (state)
! 		bMoveDirs[STRAFELEFT] = true;
! 	else
! 		bMoveDirs[STRAFELEFT] = false;
! 	//pModel->SetAnimation("range1", 0, false, true);
! 	//rView.vOrigin.x -= 10;
! }
! 
! void tgPlayer::StrafeRight (int state)
! {
! 	if (state)
! 		bMoveDirs[STRAFERIGHT] = true;
! 	else
! 		bMoveDirs[STRAFERIGHT] = false;
! 	//pModel->SetAnimation("sight1", 0, true, false);
! 	//rView.vOrigin.x += 10;
! }
--- 21,187 ----
  -----------------------------------------------------------------------------
  */
! #include "player.h"
! #include <iostream>
! 
! tgPlayer::tgPlayer (tgIWorldManager* pWorldManager, tgIModelManager* pModelManager, const tgVector3& position)
! {
! 	totY = totX = 0;
! 	bActive = false;
! 
! 	for(int i=0; i<6; i++)
! 		bMoveDirs[i] = false;
! 	rView.vOrigin.Set(-50,0,-100);
! 	tgQuaternion q;
! 	q.GetMatrix(rView.matrix);
! 	
! 	//chargement du modèle
! 	pModel = pModelManager->GetInstance("imp");
! 	pModel->SetAnimation("idle", -1, false, false);
! 	pModel->SetAnimation("evade_left", 1, false, false);
! 	pModel->SetAnimation("range1", 0, false, false);
! 	pModel->SetAnimation("sight1", 0, false, false);
! 	
! 	tgAABoundingBox* box = new tgAABoundingBox(tgVector3(-30,-30,-30), tgVector3(30,30,30));
! 	box->SetPosition(position);
! 	//tgBoundingSphere* box = new tgBoundingSphere(position, 30);
! 	pModel->SetBoundingVolume(box);
! 	
! 	pModel->SetPosition(position);
! 	
! 	
! 	
! 	pWorldManager->AddModel(pModel);
! }
! 
! tgPlayer::~tgPlayer ()
! {
! 	delete pModel;
! }
! 
! void tgPlayer::SetActive ()
! {
! 	pModel->SetVisible(false);
! 	bActive = true;
! }
! 
! void tgPlayer::SetInactive ()
! {
! 	pModel->SetVisible(true);
! 	bActive = false;
! }
! 
! void tgPlayer::Think (float eTime)
! {
! 	//FIXME: sans les 2 lignes suivantes, la caméra ne suit pas les mouvemnts du perso si il est déplacé par la physique
! 	// avec, cela pose de gros problèmes dans les déplacements...
! 	rView.vOrigin = pModel->GetPosition();
! 	//rView.qRotation = pModel->GetRotation();
! 	
! 	
! 	#define SPEED 200
! 	if (bMoveDirs[FORWARD])
! 		rView.vOrigin -= rView.qRotation.GetZAxis()*SPEED*eTime;
! 	if (bMoveDirs[BACKWARD])
! 		rView.vOrigin += rView.qRotation.GetZAxis()*SPEED*eTime;
! 	if (bMoveDirs[STRAFELEFT])
! 		rView.vOrigin -= rView.qRotation.GetXAxis()*SPEED*eTime;
! 	if (bMoveDirs[STRAFERIGHT])
! 		rView.vOrigin += rView.qRotation.GetXAxis()*SPEED*eTime;
! 		
! 	pModel->SetPosition(rView.vOrigin);
! 	#if 0
! 	float angle_x, angle_y, angle_z;
! 	//Matrix to euler conversion
! 	{
! 		float matrix[16];
! 		rView.qRotation.GetMatrix(matrix);
! 		angle_y = -asin(matrix[2]);
! 		float C = cos(angle_y);
! 		angle_y *= RADTODEG;
! 		
! 		if (fabs(C) > 0.005) {
! 			float tr_x = matrix[10]/C;
! 			float tr_y = -matrix[6]/C;
! 			
! 			angle_x = atan2(tr_y, tr_x)*RADTODEG;
! 			
! 			tr_x = matrix[0]/C;
! 			tr_y = -matrix[1]/C;
! 			
! 			angle_z = atan2(tr_y, tr_x)*RADTODEG;
! 		} else {
! 			angle_x = 0;
! 			float tr_x = matrix[5];
! 			float tr_y = matrix[4];
! 			angle_z = atan2(tr_y, tr_x)*RADTODEG;
! 		}
! 	}
! 	
! 	cout << angle_x << "\t" << angle_y << "\t" << angle_z << endl;
! 	#endif
! 	pModel->SetRotation(rView.qRotation*tgQuaternion(90, tgVector3(0,1,0)));
! 	//pModel->SetRotation(tgQuaternion(angle_y, tgVector3(0,1,0)));
! 	
! 	
! 	
! 	
! 	//std::cout << rView.vOrigin.x << ":" << rView.vOrigin.y << ":" << rView.vOrigin.z << std::endl;
! }
! 
! void tgPlayer::MouseMotion (int rx, int ry)
! {
! 	float fSensivity = 0.2f;
! 	
! 	totX -= ((float)ry)*fSensivity;
! 	totY -= ((float)rx)*fSensivity;
! 
! 	tgQuaternion qY = tgQuaternion(totY, tgVector3(0,1,0));
! 	tgQuaternion qX = tgQuaternion(totX, tgVector3(1,0,0));
! 	tgQuaternion q = qY*qX;
! 	q.Normalize();
! 	rView.qRotation = q;
! 	q = q.Conjugate();
! 
! 	q.GetMatrix(rView.matrix);
! 	
! }
! 
! void tgPlayer::MoveForward (int state)
! {
! 	if (state)
! 		bMoveDirs[FORWARD] = true;
! 	else
! 		bMoveDirs[FORWARD] = false;
! 	//rView.vOrigin.z -= 10;
! 	//pModel->SetAnimation("walk", 1, false, true);
! }
! 
! void tgPlayer::MoveBackward (int state)
! {
! 	if (state)	
! 		bMoveDirs[BACKWARD] = true;
! 	else
! 		bMoveDirs[BACKWARD] = false;
! 	//rView.vOrigin.z += 10;
! 	//pModel->SetAnimation("crouch", 1, true, false);
! }
! 
! void tgPlayer::StrafeLeft (int state)
! {
! 	if (state)
! 		bMoveDirs[STRAFELEFT] = true;
! 	else
! 		bMoveDirs[STRAFELEFT] = false;
! 	//pModel->SetAnimation("range1", 0, false, true);
! 	//rView.vOrigin.x -= 10;
! }
! 
! void tgPlayer::StrafeRight (int state)
! {
! 	if (state)
! 		bMoveDirs[STRAFERIGHT] = true;
! 	else
! 		bMoveDirs[STRAFERIGHT] = false;
! 	//pModel->SetAnimation("sight1", 0, true, false);
! 	//rView.vOrigin.x += 10;
! }

[Epfl-cvs] engine doom3level.cc,1.2,1.3 doom3level.h,1.2,1.3 glrenderer.cc,1.3,1.4 main.cc,1.2,1.3 system_linux.cc,1.2,1.3

[julien r. <jul...@us...>]

Update of /cvsroot/epfl/engine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19574

Modified Files:
	doom3level.cc doom3level.h glrenderer.cc main.cc 
	system_linux.cc 
Log Message:
stepslidemove

Index: system_linux.cc
===================================================================
RCS file: /cvsroot/epfl/engine/system_linux.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** system_linux.cc	7 Dec 2005 22:23:49 -0000	1.2
--- system_linux.cc	10 Dec 2005 23:58:26 -0000	1.3
***************
*** 167,169 ****
  }
  
! #endif
\ No newline at end of file
--- 167,170 ----
  }
  
! #endif
! 

Index: main.cc
===================================================================
RCS file: /cvsroot/epfl/engine/main.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** main.cc	7 Dec 2005 22:23:49 -0000	1.2
--- main.cc	10 Dec 2005 23:58:26 -0000	1.3
***************
*** 138,144 ****
  
  	//Ouverture de la fenêtre
! 	pSystem->OpenWindow("tg", 1024, 768);
  	pGLRenderer->InitGL();
! 	pGLRenderer->ResizeWindow(1024,768);
  	
  	pMaterialManager->Initialize();
--- 138,146 ----
  
  	//Ouverture de la fenêtre
! #define X_RES 1024
! #define Y_RES 768
! 	pSystem->OpenWindow("tg", X_RES, Y_RES);
  	pGLRenderer->InitGL();
! 	pGLRenderer->ResizeWindow(X_RES,Y_RES);
  	
  	pMaterialManager->Initialize();

Index: doom3level.h
===================================================================
RCS file: /cvsroot/epfl/engine/doom3level.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** doom3level.h	7 Dec 2005 22:23:49 -0000	1.2
--- doom3level.h	10 Dec 2005 23:58:26 -0000	1.3
***************
*** 21,123 ****
  -----------------------------------------------------------------------------
  */
! #if 0
! #ifndef TGDOOM3LEVEL_H
! #define TGDOOM3LEVEL_H
! 
! #include "defs.h"
! 
! class tgMaterial;
! 
! class tgDoom3Level
! {
!  friend class tgGLRenderer;
!  public:
! 	tgDoom3Level (const char* procname, const char* mapname);
! 	~tgDoom3Level();
! 	
! 	
! 	void MarkVisibleModels ();
! 	void RenderAreas(tgRenderView* rView);
!  protected:
! 	bool _LoadProc(int file);
! 	bool _LoadMap(int file);
! 	int _FindArea(const tgVector3& pos);
! 	int _FindArea_r(const tgVector3& box, int index);
! 	void _FindBoxAreas(tgAABoundingBox* box, tgvector<int>& areas);
! 	void _FindBoxAreas_r(tgAABoundingBox* box, int index, tgvector<int>& areas);
! 	
! 	void _RenderArea (const tgFrustum& frustum, int areaNum, int fromArea);
! 	void _ClassifyModels ();
! 	
! 	struct _Surface
! 	{
! 		tgstring shaderName;
! 		int numVertices;
! 		int numIndexes;
! 		tgVertice* pVertices;
! 		int* pIndexes;
! 		tgMaterial* pMaterial;
! 	};
! 
! 	struct _Entity
! 	{
! 		/*tgstring sName;
! 		tgVector3 vOrigin;*/
! 		tgmap<tgstring, tgstring> mProps;
! 	};
! 	
! 	struct _Portal
! 	{
! 		int iNumPoints;
! 		int iPositiveArea;
! 		int iNegativeArea;
! 		tgVector3* pPoints;
! 		
! 		bool visible;
! 	};
! 	
! 	struct _Model
! 	{
! 		tgstring sName;
! 		int numSurfaces;
! 		_Surface* pSurfaces;
! 		tgAABoundingBox* pBBox;
! 		bool visible; //utilise par les areas
! 		
! 	};
! 	
! 	struct _StaticModel : public _Model
! 	{
! 		tgVector3 vOrigin;
! 		tgvector<int> areas;
! 	};
! 	
! 	struct _Area : public _Model
! 	{
! 		int iNumPortals;
! 		_Portal** pPortals; // des pointeurs vers les portals auquelles cette area est connectee
! 	};
! 	
! 	struct _Node
! 	{
! 		tgPlane plane; //un child negatif sera une area d'index (-1-child)
! 		int iPositiveChild;
! 		int iNegativeChild;
! 	};
! 	
! 	int iNumStaticModels;
! 	int iNumEntities;
! 	int iNumPortals;
! 	int iNumAreas;
! 	int iNumNodes;
! 	_StaticModel* pStaticModels;
! 	_Entity* pEntities;
! 	_Portal* pPortals;
! 	_Area* pAreas;
! 	_Node* pNodes;
! };
! 
! #endif
! 
! 
! #endif
\ No newline at end of file
--- 21,124 ----
  -----------------------------------------------------------------------------
  */
! #if 0
! #ifndef TGDOOM3LEVEL_H
! #define TGDOOM3LEVEL_H
! 
! #include "defs.h"
! 
! class tgMaterial;
! 
! class tgDoom3Level
! {
!  friend class tgGLRenderer;
!  public:
! 	tgDoom3Level (const char* procname, const char* mapname);
! 	~tgDoom3Level();
! 	
! 	
! 	void MarkVisibleModels ();
! 	void RenderAreas(tgRenderView* rView);
!  protected:
! 	bool _LoadProc(int file);
! 	bool _LoadMap(int file);
! 	int _FindArea(const tgVector3& pos);
! 	int _FindArea_r(const tgVector3& box, int index);
! 	void _FindBoxAreas(tgAABoundingBox* box, tgvector<int>& areas);
! 	void _FindBoxAreas_r(tgAABoundingBox* box, int index, tgvector<int>& areas);
! 	
! 	void _RenderArea (const tgFrustum& frustum, int areaNum, int fromArea);
! 	void _ClassifyModels ();
! 	
! 	struct _Surface
! 	{
! 		tgstring shaderName;
! 		int numVertices;
! 		int numIndexes;
! 		tgVertice* pVertices;
! 		int* pIndexes;
! 		tgMaterial* pMaterial;
! 	};
! 
! 	struct _Entity
! 	{
! 		/*tgstring sName;
! 		tgVector3 vOrigin;*/
! 		tgmap<tgstring, tgstring> mProps;
! 	};
! 	
! 	struct _Portal
! 	{
! 		int iNumPoints;
! 		int iPositiveArea;
! 		int iNegativeArea;
! 		tgVector3* pPoints;
! 		
! 		bool visible;
! 	};
! 	
! 	struct _Model
! 	{
! 		tgstring sName;
! 		int numSurfaces;
! 		_Surface* pSurfaces;
! 		tgAABoundingBox* pBBox;
! 		bool visible; //utilise par les areas
! 		
! 	};
! 	
! 	struct _StaticModel : public _Model
! 	{
! 		tgVector3 vOrigin;
! 		tgvector<int> areas;
! 	};
! 	
! 	struct _Area : public _Model
! 	{
! 		int iNumPortals;
! 		_Portal** pPortals; // des pointeurs vers les portals auquelles cette area est connectee
! 	};
! 	
! 	struct _Node
! 	{
! 		tgPlane plane; //un child negatif sera une area d'index (-1-child)
! 		int iPositiveChild;
! 		int iNegativeChild;
! 	};
! 	
! 	int iNumStaticModels;
! 	int iNumEntities;
! 	int iNumPortals;
! 	int iNumAreas;
! 	int iNumNodes;
! 	_StaticModel* pStaticModels;
! 	_Entity* pEntities;
! 	_Portal* pPortals;
! 	_Area* pAreas;
! 	_Node* pNodes;
! };
! 
! #endif
! 
! 
! #endif
! 

Index: glrenderer.cc
===================================================================
RCS file: /cvsroot/epfl/engine/glrenderer.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** glrenderer.cc	7 Dec 2005 22:23:49 -0000	1.3
--- glrenderer.cc	10 Dec 2005 23:58:26 -0000	1.4
***************
*** 21,835 ****
  -----------------------------------------------------------------------------
  */
! #include "glrenderer.h"
! #include "defs.h"
! 
! tgGLRenderer::tgGLRenderer ()
! {
! 	pRenderView = NULL;
! }
! 
[...1601 lines suppressed...]
! }
! 
! //Opengl Extensions
! /*bool IsExtensionSupported(const char *extstring)
! {
!     char *s = (char*) glGetString(GL_EXTENSIONS);
!     char *temp = strstr(s, extstring);
!     return temp != NULL;
! }
! 
! bool tgSystemWin32::GetProcAdresses()
! {
! 	tgglMultiTexCoord2f     = (PFNGLMULTITEXCOORD2FARBPROC)wglGetProcAddress ("glMultiTexCoord2fARB");
! 	tgglClientActiveTexture = (PFNGLCLIENTACTIVETEXTUREARBPROC)wglGetProcAddress ("glClientActiveTextureARB"); 
!     tgglActiveTexture      = (PFNGLACTIVETEXTUREARBPROC)wglGetProcAddress ("glActiveTextureARB");
! 	if(tgglMultiTexCoord2f == NULL || tgglClientActiveTexture == NULL || tgglActiveTexture == NULL)
! 		return false;
! 	return true;
! }*/
  

Index: doom3level.cc
===================================================================
RCS file: /cvsroot/epfl/engine/doom3level.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** doom3level.cc	7 Dec 2005 22:23:49 -0000	1.2
--- doom3level.cc	10 Dec 2005 23:58:26 -0000	1.3
***************
*** 21,534 ****
  -----------------------------------------------------------------------------
  */
! #if 0
! #include "doom3level.h"
! 
! tgDoom3Level::tgDoom3Level(const char* procname, const char* mapname)
! {
! 	int file = pFileManager->Open(mapname, TGFILE_TEXT);
! 	_LoadMap(file);
! 	pFileManager->Close(file);
[...1001 lines suppressed...]
! 
! int tgDoom3Level::_FindArea_r(const tgVector3& pos, int index)
! {
! 	const _Node& node = pNodes[index];
! 	int side = node.plane.ClassifyPoint(pos);
! 	if (side == POINT_IN_FRONT_OF_PLANE)
! 		index = node.iPositiveChild;
! 	else 
! 		index = node.iNegativeChild;
! 		
! 	if (index <= 0)
! 		return ~index;
! 		
! 	return _FindArea_r(pos, index);
! }
! 
! 
! 
! #endif
! 

[Epfl-cvs] game game.cc,1.2,1.3 physic_engine.cc,1.2,1.3 physic_node_entity.cc,1.3,1.4 physic_node_entity.h,1.2,1.3

[julien r. <jul...@us...>]

Update of /cvsroot/epfl/game
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19582

Modified Files:
	game.cc physic_engine.cc physic_node_entity.cc 
	physic_node_entity.h 
Log Message:
stepslidemove

Index: physic_node_entity.cc
===================================================================
RCS file: /cvsroot/epfl/game/physic_node_entity.cc,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** physic_node_entity.cc	7 Dec 2005 22:23:51 -0000	1.3
--- physic_node_entity.cc	10 Dec 2005 23:58:23 -0000	1.4
***************
*** 155,161 ****
  	/*tgVector3 org(0,1,0);
  	vVelocity = ClipVelocity(vVelocity, org, OVERCLIP);*/
! //	_StepSlideMove(eTime);
! 	vPosition += vVelocity*eTime;
! 	
  //	cout << "--> Velocity " << vVelocity.x << " : " << vVelocity.y << " : " << vVelocity.z << std::endl;
  //	cout << "===========================================" << std::endl;
--- 155,162 ----
  	/*tgVector3 org(0,1,0);
  	vVelocity = ClipVelocity(vVelocity, org, OVERCLIP);*/
! 	_StepSlideMove(eTime);
! //	_MyStepSlideMove(eTime);
! //	vPosition += vVelocity*eTime;
! 
  //	cout << "--> Velocity " << vVelocity.x << " : " << vVelocity.y << " : " << vVelocity.z << std::endl;
  //	cout << "===========================================" << std::endl;
***************
*** 166,171 ****
  }
  
! #define STEPSIZE 18
! tgVector3 tgPhysicNodeEntity::ClipVelocity(tgVector3& in, tgVector3& normal, float overbounce) {
  	float backoff;
  	backoff = in*normal;
--- 167,218 ----
  }
  
! #define STEPSIZE 20/*
! void tgPhysicNodeEntity::_MyStepSlideMove(float eTime)
! {
! 	tgVector3 tempVel = vVelocity;
! 	if(!_TraceNAjust(eTime, tempVel, vPosition)) {
! 		vPosition += tempVel*eTime;
! 		return;
! 	}
! 		
! 	//---position initiales 
! 	tgVector3 headPos_o = vPosition + tgVector3(0,STEPSIZE,0);
! //	tgVector3 headVel_o = vVelocity;
! 
! 	tgVector3 feetPos_o = vPosition;
! //	tgVector3 feetVel_o = vVelocity;
! 	//---
! 	
! 	//---calcul des nouvelles vitesses
! 	tgVector3 headVel_e = vVelocity;
! 	_TraceNAjust(eTime, headVel_e, headPos_o);
! 	
! 	tgVector3 feetVel_e = vVelocity;
! 	_TraceNAjust(eTime, feetVel_e, feetPos_o);
! 	//---
! 	
! 	//---calcul des nouvelles positions
! 	tgVector3 headPos_e = headPos_o+headVel_e*eTime;
! 	tgVector3 feetPos_e = feetPos_o+feetVel_e*eTime;
! 	cout << feetVel_e << endl;
! 	//---
! 	
! 	//---calcul des distances
! 	float headDist = headVel_e.x*headVel_e.x + headVel_e.z*headVel_e.z;
! 	float feetDist = feetVel_e.x*feetVel_e.x + feetVel_e.z*feetVel_e.z;
! 	//---
! 	
! 	//---comparaison et montage eventuel des marches
! 	if(headDist > feetDist) { //on doit monter
! 		vPosition = feetPos_e;
! 	} else {
! 		vPosition = feetPos_e;
! 	}
! 	//---
! }*/
! 
! 
! 
! tgVector3 tgPhysicNodeEntity::ClipVelocity(tgVector3& in, tgVector3& normal, float overbounce) const{
  	float backoff;
  	backoff = in*normal;
***************
*** 177,181 ****
  	return tgVector3(in.x-normal.x*backoff, in.y-normal.y*backoff,in.z-normal.z*backoff);
  }
! 
  void tgPhysicNodeEntity::_StepSlideMove(float eTime) {
  	tgVector3 start_o, start_v;
--- 224,228 ----
  	return tgVector3(in.x-normal.x*backoff, in.y-normal.y*backoff,in.z-normal.z*backoff);
  }
! #if 0
  void tgPhysicNodeEntity::_StepSlideMove(float eTime) {
  	tgVector3 start_o, start_v;
***************
*** 187,194 ****
  	start_o = vPosition;
  	start_v = vVelocity;
- 	if (!_TraceNAjust(eTime))
- 		return; //pas de collision, pas besoin de monter des escaliers :)
- 	
  	
  	down = start_o;
  	down.y -= STEPSIZE;
--- 234,240 ----
  	start_o = vPosition;
  	start_v = vVelocity;
  	
+ 	if (!_TraceNAjust(eTime, vVelocity,vPosition))
+ 		return; //pas de collision, pas besoin de monter des escaliers :)
  	down = start_o;
  	down.y -= STEPSIZE;
***************
*** 216,243 ****
  	vVelocity = start_v;
  	
! 	_TraceNAjust(eTime);
  	
  	down = vPosition;
  	down.y -= stepSize;
  	trace = pWorldManager->Trace(vPosition, down, pBVolume);
! 	if(!trace.bAllSolid)
  		vPosition = trace.vEndPoint;
! 	if(trace.fFraction < 1.0f) 
  		vVelocity = ClipVelocity(vVelocity, trace.vColNormal, OVERCLIP);
  }
  
  #define MAX_CLIP_PLANES 5
  #define EPSILON 0.0001f
  
! bool tgPhysicNodeEntity::_TraceNAjust(float eTime) {
  	//quake3 source : code/game/bg_slidemove.c:50
  	
  	tgVector3 pPlanes[MAX_CLIP_PLANES];
  	float timeLeft =eTime;
! 	tgVector3 origin(vPosition);
  	tgVector3 vNewPosition;
! 	tgVector3 initialVelocity(vVelocity);
  	int bumpcount;
! 	tgVector3 endVelocity = vVelocity;;
  	tgVector3 clipVelocity;
  	tgVector3 endClipVelocity;
--- 262,347 ----
  	vVelocity = start_v;
  	
! 	_TraceNAjust(eTime,vVelocity,vPosition);
  	
  	down = vPosition;
  	down.y -= stepSize;
  	trace = pWorldManager->Trace(vPosition, down, pBVolume);
! 	if(!trace.bAllSolid) {
  		vPosition = trace.vEndPoint;
! 	}
! 	if(trace.fFraction < 1.0f) {
  		vVelocity = ClipVelocity(vVelocity, trace.vColNormal, OVERCLIP);
+ 	}
+ 	vPosition += vVelocity*eTime;
  }
+ #else
+ void tgPhysicNodeEntity::_StepSlideMove(float eTime) {
+ 	tgVector3 start_o, start_v;
+ 	tgVector3 down_o, down_v;
+ 	tgCollisionResult trace;
+ 	tgVector3 up, down;
+ 	float stepSize;
+ 	
+ 	start_o = vPosition;
+ 	start_v = vVelocity;
+ 	
+ 	if (!_TraceNAjust(eTime, vVelocity,vPosition))
+ 		return; //pas de collision, pas besoin de monter des escaliers :)
+ 	down = start_o;
+ 	down.y -= STEPSIZE;
+ 	
+ 	trace = pWorldManager->Trace(start_o, down, pBVolume);
+ 	up.Set(0,1,0);
+ 	
+ 	//on ne monte pas si on a encore une vitesse ou si on peut encore descendre (si fFraction == 1.0, on a rien en-dessous de nous)
+ 	//trace.vColNormal est de longueur 1, up aussi -> trace.vColNormal*up = ||trace.vColNormal||*||up||*cos(angle) -> si cos(angle)<0.7, angle>45, pente trop raide
+ 	if(vVelocity.y < 0 && (trace.fFraction == 1.0 || trace.vColNormal*up < 0.7))
+ 		return;
+ 	
+ 	down_o = vPosition;
+ 	down_v = vVelocity;
+ 	
+ 	up = start_o;
+ 	up.y += STEPSIZE;
+ 	
+ 	//on trace entre la position du joueur et la position STEPSIZE plus haut, pour éviter de monter à travers un plafond
+ 	trace = pWorldManager->Trace(start_o, up, pBVolume);
+ 	if(trace.bAllSolid)
+ 		return;
+ 		
+ 	stepSize = trace.vEndPoint.y-start_o.y;
+ 	vPosition = trace.vEndPoint;
+ 	vVelocity = start_v;
+ 	
+ 	_TraceNAjust(eTime,vVelocity,vPosition);
+ 	//
+ 	down = vPosition;
+ 	down.y -= stepSize;
+ 	trace = pWorldManager->Trace(vPosition, down, pBVolume);
+ 	if(!trace.bAllSolid) {
+ 		vPosition = trace.vEndPoint;
+ 	}
+ 	if(trace.fFraction < 1.0f) {
+ 		vVelocity = ClipVelocity(vVelocity, trace.vColNormal, OVERCLIP);
+ 	}
+ //	vPosition += vVelocity*eTime;
+ }
+ #endif
+ 
+ 
  
  #define MAX_CLIP_PLANES 5
  #define EPSILON 0.0001f
  
! bool tgPhysicNodeEntity::_TraceNAjust(float eTime, tgVector3& vel, const tgVector3& pos) {
  	//quake3 source : code/game/bg_slidemove.c:50
  	
  	tgVector3 pPlanes[MAX_CLIP_PLANES];
  	float timeLeft =eTime;
! 	tgVector3 origin(pos);
  	tgVector3 vNewPosition;
! 	tgVector3 initialVelocity(vel);
  	int bumpcount;
! 	tgVector3 endVelocity = vel;
  	tgVector3 clipVelocity;
  	tgVector3 endClipVelocity;
***************
*** 246,261 ****
  	int i;
  	//ne jamais revenir contre la vitesse
! 	pPlanes[numPlanes] = vVelocity.GetNormalized();
  	
  	for(bumpcount = 0; bumpcount <4; bumpcount++) {
! 		vNewPosition = origin+vVelocity * timeLeft;
! 		cr = pWorldManager->Trace(origin, vNewPosition, pBVolume);
  		if(cr.bAllSolid) {
! 			vVelocity.y = 0;
  			return true;
  		}
  		
  		if(cr.fFraction > 0) {
! 			origin = cr.vEndPoint;
  		}
  		
--- 350,366 ----
  	int i;
  	//ne jamais revenir contre la vitesse
! 	pPlanes[numPlanes] = vel.GetNormalized();
  	
  	for(bumpcount = 0; bumpcount <4; bumpcount++) {
! 		vNewPosition = /*origin*/vPosition+vel * timeLeft;
! 		cr = pWorldManager->Trace(/*origin*/vPosition, vNewPosition, pBVolume);
  		if(cr.bAllSolid) {
! 			vel.y = 0;
  			return true;
  		}
  		
  		if(cr.fFraction > 0) {
! //			origin = cr.vEndPoint;
! 			vPosition = cr.vEndPoint;
  		}
  		
***************
*** 267,271 ****
  		
  		if(numPlanes > MAX_CLIP_PLANES) {
! 			vVelocity.Set(0,0,0);
  			return true;
  		}
--- 372,376 ----
  		
  		if(numPlanes > MAX_CLIP_PLANES) {
! 			vel.Set(0,0,0);
  			return true;
  		}
***************
*** 274,278 ****
  		for(i=0; i<numPlanes;i++) {
  			if (cr.vColNormal*pPlanes[i] > 0.99 ) {
! 				vVelocity = cr.vColNormal + vVelocity;
  				break;
  			}
--- 379,383 ----
  		for(i=0; i<numPlanes;i++) {
  			if (cr.vColNormal*pPlanes[i] > 0.99 ) {
! 				vel = cr.vColNormal + vel;
  				break;
  			}
***************
*** 289,298 ****
  		for(i=0; i<numPlanes;i++) {
  			
! 			float into = vVelocity*pPlanes[i];
  			
  			if(into >= 0.01)
  				continue;
  				
! 			clipVelocity = ClipVelocity(vVelocity, pPlanes[i], OVERCLIP);
  			endClipVelocity = ClipVelocity(endVelocity, pPlanes[i], OVERCLIP);
  			
--- 394,403 ----
  		for(i=0; i<numPlanes;i++) {
  			
! 			float into = vel*pPlanes[i];
  			
  			if(into >= 0.01)
  				continue;
  				
! 			clipVelocity = ClipVelocity(vel, pPlanes[i], OVERCLIP);
  			endClipVelocity = ClipVelocity(endVelocity, pPlanes[i], OVERCLIP);
  			
***************
*** 313,317 ****
  				dir = pPlanes[i]%pPlanes[j];
  				dir.Normalize();
! 				d = dir*vVelocity;
  				clipVelocity = dir*d;
  				
--- 418,422 ----
  				dir = pPlanes[i]%pPlanes[j];
  				dir.Normalize();
! 				d = dir*vel;
  				clipVelocity = dir*d;
  				
***************
*** 326,334 ****
  					if(clipVelocity*pPlanes[k] >= 0.01) 
  						continue;
! 					vVelocity.Set(0,0,0);
  					return true;
  				}
  			}
! 			vVelocity = clipVelocity;
  			endVelocity = endClipVelocity;
  			break;
--- 431,439 ----
  					if(clipVelocity*pPlanes[k] >= 0.01) 
  						continue;
! 					vel.Set(0,0,0);
  					return true;
  				}
  			}
! 			vel = clipVelocity;
  			endVelocity = endClipVelocity;
  			break;

Index: game.cc
===================================================================
RCS file: /cvsroot/epfl/game/game.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** game.cc	7 Dec 2005 22:23:51 -0000	1.2
--- game.cc	10 Dec 2005 23:58:23 -0000	1.3
***************
*** 97,101 ****
  	pBindManager->Bind(TGKEY_s, tgMakeFunctor((tgFunctor1<int>*)0, *pPlayer, &tgPlayer::MoveBackward));
  
! 	pTestPlayer = new tgPlayer (pWorldManager, pModelManager, tgVector3(-750,80,271));
  	pTestPlayer->SetInactive();
  	/*pBindManager->Bind(TGKEY_LEFT, tgMakeFunctor((tgFunctor1<int>*)0, *pTestPlayer, &tgPlayer::StrafeLeft));
--- 97,101 ----
  	pBindManager->Bind(TGKEY_s, tgMakeFunctor((tgFunctor1<int>*)0, *pPlayer, &tgPlayer::MoveBackward));
  
! 	pTestPlayer = new tgPlayer (pWorldManager, pModelManager, tgVector3(-570,30,-650));
  	pTestPlayer->SetInactive();
  	/*pBindManager->Bind(TGKEY_LEFT, tgMakeFunctor((tgFunctor1<int>*)0, *pTestPlayer, &tgPlayer::StrafeLeft));
***************
*** 230,234 ****
  	
  	// moteur physique
! 	/*pPhysicEngine->MoveObjects(eTime);	
  	std::ostringstream* streamPh = new std::ostringstream();
  	(*streamPh) << "Position pTestPlayer: " << pTestPlayer->GetEntity()->GetPosition().x << " # "
--- 230,234 ----
  	
  	// moteur physique
! 	pPhysicEngine->MoveObjects(eTime);	
  	std::ostringstream* streamPh = new std::ostringstream();
  	(*streamPh) << "Position pTestPlayer: " << pTestPlayer->GetEntity()->GetPosition().x << " # "
***************
*** 239,243 ****
  	(*stream) << pTimer->GetFPS() << std::endl;
  	pCanvas->DisplayText(stream->str());
! 	delete stream;*/
  }
  
--- 239,243 ----
  	(*stream) << pTimer->GetFPS() << std::endl;
  	pCanvas->DisplayText(stream->str());
! 	delete stream;
  }
  

Index: physic_node_entity.h
===================================================================
RCS file: /cvsroot/epfl/game/physic_node_entity.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** physic_node_entity.h	7 Dec 2005 22:23:51 -0000	1.2
--- physic_node_entity.h	10 Dec 2005 23:58:23 -0000	1.3
***************
*** 83,89 ****
  		* true -> collision, false -> aucune collision
  		*/
! 		bool _TraceNAjust(float eTime);
  		void _StepSlideMove(float eTime);
! 		tgVector3 ClipVelocity(tgVector3& in, tgVector3& normal, float overbounce);
  		
  		bool onAir;
--- 83,90 ----
  		* true -> collision, false -> aucune collision
  		*/
! 		bool _TraceNAjust(float eTime, tgVector3& vel, const tgVector3& pos);
! 		void _MyStepSlideMove(float eTime);
  		void _StepSlideMove(float eTime);
! 		tgVector3 ClipVelocity(tgVector3& in, tgVector3& normal, float overbounce) const;
  		
  		bool onAir;

Index: physic_engine.cc
===================================================================
RCS file: /cvsroot/epfl/game/physic_engine.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** physic_engine.cc	7 Dec 2005 22:23:51 -0000	1.2
--- physic_engine.cc	10 Dec 2005 23:58:23 -0000	1.3
***************
*** 93,95 ****
  			(*i)->removeForce(force);
  	}
! }
\ No newline at end of file
--- 93,96 ----
  			(*i)->removeForce(force);
  	}
! }
! 

[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

[julien r. <jul...@us...>]

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]

[Epfl-cvs] game defs.h,1.1.1.1,1.2 export.cc,1.1.1.1,1.2 game.cc,1.1.1.1,1.2 game.h,1.1.1.1,1.2 game.kdevelop.pcs,1.2,1.3 physic_callbacks.h,1.1.1.1,1.2 physic_defs.h,1.1.1.1,1.2 physic_engine.cc,1.1.1.1,1.2 physic_engine.h,1.1.1.1,1.2 physic_node.cc,1.1.1.1,1.2 physic_node.h,1.1.1.1,1.2 physic_node_entity.cc,1.2,1.3 physic_node_entity.h,1.1.1.1,1.2 physic_node_none.cc,1.1.1.1,1.2 physic_node_none.h,1.1.1.1,1.2 player.cc,1.1.1.1,1.2 player.h,1.1.1.1,1.2

[julien r. <jul...@us...>]

Update of /cvsroot/epfl/game
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24199/game

Modified Files:
	defs.h export.cc game.cc game.h game.kdevelop.pcs 
	physic_callbacks.h physic_defs.h physic_engine.cc 
	physic_engine.h physic_node.cc physic_node.h 
	physic_node_entity.cc physic_node_entity.h physic_node_none.cc 
	physic_node_none.h player.cc player.h 
Log Message:
license

Index: player.h
===================================================================
RCS file: /cvsroot/epfl/game/player.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** player.h	24 Nov 2005 20:48:56 -0000	1.1.1.1
--- player.h	7 Dec 2005 22:23:51 -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 TGPLAYER_H
  #define TGPLAYER_H

Index: physic_engine.cc
===================================================================
RCS file: /cvsroot/epfl/game/physic_engine.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** physic_engine.cc	24 Nov 2005 20:48:56 -0000	1.1.1.1
--- physic_engine.cc	7 Dec 2005 22:23:51 -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 "physic_engine.h"
  
***************
*** 4,8 ****
  {
  	this->pWorld = worldManager;
! 	fGravity = 9.8;
  }
  
--- 26,30 ----
  {
  	this->pWorld = worldManager;
! 	fGravity = 9.8f;
  }
  

Index: physic_defs.h
===================================================================
RCS file: /cvsroot/epfl/game/physic_defs.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** physic_defs.h	24 Nov 2005 20:48:56 -0000	1.1.1.1
--- physic_defs.h	7 Dec 2005 22:23:51 -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 TG_PHYSIC_DEFS_H
  #define TG_PHYSIC_DEFS_H

Index: physic_node_none.h
===================================================================
RCS file: /cvsroot/epfl/game/physic_node_none.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** physic_node_none.h	24 Nov 2005 20:48:55 -0000	1.1.1.1
--- physic_node_none.h	7 Dec 2005 22:23:51 -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 TG_PHYSIC_NODE_NONE_H
  #define TG_PHYSIC_NODE_NONE_H

Index: game.h
===================================================================
RCS file: /cvsroot/epfl/game/game.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** game.h	24 Nov 2005 20:48:55 -0000	1.1.1.1
--- game.h	7 Dec 2005 22:23:51 -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 TGGAME_H
  #define TGGAME_H

Index: export.cc
===================================================================
RCS file: /cvsroot/epfl/game/export.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** export.cc	24 Nov 2005 20:48:56 -0000	1.1.1.1
--- export.cc	7 Dec 2005 22:23:51 -0000	1.2
***************
*** 1,11 ****
  #include "defs.h"
  #include "game.h"
  
! extern "C" tgIGame* newGame ()
  {
  	return new tgGame ();
  }
  
! extern "C" void deleteGame (tgIGame* g)
  {
  	delete g;
--- 1,33 ----
+ /*
+ -----------------------------------------------------------------------------
+ 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"
  #include "game.h"
  
! DLL_EXPORT tgIGame* newGame ()
  {
  	return new tgGame ();
  }
  
! DLL_EXPORT void deleteGame (tgIGame* g)
  {
  	delete g;

Index: player.cc
===================================================================
RCS file: /cvsroot/epfl/game/player.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** player.cc	24 Nov 2005 20:48:55 -0000	1.1.1.1
--- player.cc	7 Dec 2005 22:23:51 -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 "player.h"
  #include <iostream>
***************
*** 109,113 ****
  void tgPlayer::MouseMotion (int rx, int ry)
  {
! 	float fSensivity = 0.2;
  	
  	totX -= ((float)ry)*fSensivity;
--- 131,135 ----
  void tgPlayer::MouseMotion (int rx, int ry)
  {
! 	float fSensivity = 0.2f;
  	
  	totX -= ((float)ry)*fSensivity;

Index: physic_node.h
===================================================================
RCS file: /cvsroot/epfl/game/physic_node.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** physic_node.h	24 Nov 2005 20:48:54 -0000	1.1.1.1
--- physic_node.h	7 Dec 2005 22:23:51 -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 TG_PHYSIC_NODE_H
  #define TG_PHYSIC_NODE_H

Index: physic_node_none.cc
===================================================================
RCS file: /cvsroot/epfl/game/physic_node_none.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** physic_node_none.cc	24 Nov 2005 20:48:55 -0000	1.1.1.1
--- physic_node_none.cc	7 Dec 2005 22:23:51 -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 "physic_node_none.h"
  

Index: physic_node_entity.cc
===================================================================
RCS file: /cvsroot/epfl/game/physic_node_entity.cc,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** physic_node_entity.cc	30 Nov 2005 16:46:52 -0000	1.2
--- physic_node_entity.cc	7 Dec 2005 22:23:51 -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 "physic_node_entity.h"
  

Index: game.cc
===================================================================
RCS file: /cvsroot/epfl/game/game.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** game.cc	24 Nov 2005 20:48:55 -0000	1.1.1.1
--- game.cc	7 Dec 2005 22:23:51 -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 "game.h"
  
***************
*** 14,19 ****
  	pConsole = e->pConsole;
  
! 	#define HSPEED 1200.0
! 	#define AIR_CONTROL 0.004
  	jump = new tgForce();
  	jump->force = tgVector3(0.0,900000.0,0.0);
--- 36,41 ----
  	pConsole = e->pConsole;
  
! 	#define HSPEED 1200.0f
! 	#define AIR_CONTROL 0.004f
  	jump = new tgForce();
  	jump->force = tgVector3(0.0,900000.0,0.0);
***************
*** 203,221 ****
  	pTestPlayer->Think(eTime);
  	if (pPlayer->IsActive())
! 		pCanvas->DrawText("pPlayer");
  	if (pTestPlayer->IsActive())
! 		pCanvas->DrawText("pTestPlayer");
  	
  	// moteur physique
! 	pPhysicEngine->MoveObjects(eTime);	
  	std::ostringstream* streamPh = new std::ostringstream();
  	(*streamPh) << "Position pTestPlayer: " << pTestPlayer->GetEntity()->GetPosition().x << " # "
  	<< pTestPlayer->GetEntity()->GetPosition().y << " # " << pTestPlayer->GetEntity()->GetPosition().z << std::endl;
! 	pCanvas->DrawText(streamPh->str());
  	
  	std::ostringstream* stream = new std::ostringstream();
  	(*stream) << pTimer->GetFPS() << std::endl;
! 	pCanvas->DrawText(stream->str());
! 	delete stream;
  }
  
--- 225,243 ----
  	pTestPlayer->Think(eTime);
  	if (pPlayer->IsActive())
! 		pCanvas->DisplayText("pPlayer");
  	if (pTestPlayer->IsActive())
! 		pCanvas->DisplayText("pTestPlayer");
  	
  	// moteur physique
! 	/*pPhysicEngine->MoveObjects(eTime);	
  	std::ostringstream* streamPh = new std::ostringstream();
  	(*streamPh) << "Position pTestPlayer: " << pTestPlayer->GetEntity()->GetPosition().x << " # "
  	<< pTestPlayer->GetEntity()->GetPosition().y << " # " << pTestPlayer->GetEntity()->GetPosition().z << std::endl;
! 	pCanvas->DisplayText(streamPh->str());
  	
  	std::ostringstream* stream = new std::ostringstream();
  	(*stream) << pTimer->GetFPS() << std::endl;
! 	pCanvas->DisplayText(stream->str());
! 	delete stream;*/
  }
  

Index: physic_node.cc
===================================================================
RCS file: /cvsroot/epfl/game/physic_node.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** physic_node.cc	24 Nov 2005 20:48:56 -0000	1.1.1.1
--- physic_node.cc	7 Dec 2005 22:23:51 -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 "physic_node.h"
  

Index: defs.h
===================================================================
RCS file: /cvsroot/epfl/game/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:48:55 -0000	1.1.1.1
--- defs.h	7 Dec 2005 22:23:51 -0000	1.2
***************
*** 1,17 ****
! #ifndef TGDEFS_H
! #define TGDEFS_H
  
! #include "functor.h"
! #include <iostream>
! using namespace std;
  
! #include "iworld_manager.h"
! #include "imodel_manager.h"
! #include "ibind_manager.h"
! #include "keys.h"
! #include "imaterial_manager.h"
! #include "imaterial.h"
! #include "icanvas.h"
  
! #endif
  
--- 1,47 ----
! /*
! -----------------------------------------------------------------------------
! 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
+ 
+ #ifdef TGWIN32
+ 	//meme sous Win32 on doit utiliser le extern "C", sinon le nom est "decore" (pour gerer la surcharge et autres specifites du c++)
+ 	//--> apres dans notre GetProcAddress on devrait donner le nom decore, style @newGame8 ...
+ 	#define DLL_EXPORT extern "C" __declspec(dllexport)
+ # else
+ 	# define DLL_EXPORT extern "C"
+ #endif
+ 
+ #include "functor.h"
+ #include <iostream>
+ using namespace std;
+ 
+ #include "iworld_manager.h"
+ #include "imodel_manager.h"
+ #include "ibind_manager.h"
+ #include "keys.h"
+ #include "imaterial_manager.h"
+ #include "imaterial.h"
+ #include "icanvas.h"
+ 
+ #endif
+ 

Index: physic_engine.h
===================================================================
RCS file: /cvsroot/epfl/game/physic_engine.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** physic_engine.h	24 Nov 2005 20:48:56 -0000	1.1.1.1
--- physic_engine.h	7 Dec 2005 22:23:51 -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 TG_PHYSIC_ENGINE_H
  #define TG_PHYSIC_ENGINE_H

Index: physic_callbacks.h
===================================================================
RCS file: /cvsroot/epfl/game/physic_callbacks.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** physic_callbacks.h	24 Nov 2005 20:48:56 -0000	1.1.1.1
--- physic_callbacks.h	7 Dec 2005 22:23:51 -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 TG_PHYSIC_CALLBACK_H
  #define TG_PHYSIC_CALLBACK_H

Index: game.kdevelop.pcs
===================================================================
RCS file: /cvsroot/epfl/game/game.kdevelop.pcs,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
Binary files /tmp/cvswFYao7 and /tmp/cvsTNZQ7t differ

Index: physic_node_entity.h
===================================================================
RCS file: /cvsroot/epfl/game/physic_node_entity.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** physic_node_entity.h	24 Nov 2005 20:48:55 -0000	1.1.1.1
--- physic_node_entity.h	7 Dec 2005 22:23:51 -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 TG_PHYISC_NODE_ENTITY_H
  #define TG_PHYISC_NODE_ENTITY_H

[Epfl-cvs] engine/interface export.h,1.1.1.1,1.2 functor.h,1.1.1.1,1.2 ibind_manager.h,1.1.1.1,1.2 icanvas.h,1.1.1.1,1.2 iconsole.h,1.1.1.1,1.2 ientity.h,1.1.1.1,1.2 ifile_manager.h,1.1.1.1,1.2 imaterial.h,1.1.1.1,1.2 imaterial_manager.h,1.1.1.1,1.2 imodel.h,1.1.1.1,1.2 imodel_manager.h,1.1.1.1,1.2 import.h,1.1.1.1,1.2 itimer.h,1.1.1.1,1.2 iworld_manager.h,1.1.1.1,1.2 keys.h,1.1.1.1,1.2 tglib.h,1.1.1.1,1.2

[julien r. <jul...@us...>]

Update of /cvsroot/epfl/engine/interface
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24199/engine/interface

Modified Files:
	export.h functor.h ibind_manager.h icanvas.h iconsole.h 
	ientity.h ifile_manager.h imaterial.h imaterial_manager.h 
	imodel.h imodel_manager.h import.h itimer.h iworld_manager.h 
	keys.h tglib.h 
Log Message:
license

Index: imodel.h
===================================================================
RCS file: /cvsroot/epfl/engine/interface/imodel.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** imodel.h	24 Nov 2005 20:47:13 -0000	1.1.1.1
--- imodel.h	7 Dec 2005 22:23:50 -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 TGIMODEL_H
  #define TGIMODEL_H

Index: iworld_manager.h
===================================================================
RCS file: /cvsroot/epfl/engine/interface/iworld_manager.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** iworld_manager.h	24 Nov 2005 20:47:13 -0000	1.1.1.1
--- iworld_manager.h	7 Dec 2005 22:23:50 -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 TGIWORLD_MANAGER_H
  #define TGIWORLD_MANAGER_H

Index: iconsole.h
===================================================================
RCS file: /cvsroot/epfl/engine/interface/iconsole.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** iconsole.h	24 Nov 2005 20:47:13 -0000	1.1.1.1
--- iconsole.h	7 Dec 2005 22:23:50 -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 TGICONSOLE_H
  #define TGICONSOLE_H
***************
*** 4,8 ****
  #include "functor.h"
  #include "tglib.h"
- #include "stdlib.h" //conversion string, float, int
  #include <sstream>
  
--- 26,29 ----
***************
*** 50,54 ****
  	inline void _UpdateStr() {
  		intVal = atoi(strVal.data());
! 		floatVal = atof(strVal.data());
  	}
  };
--- 71,75 ----
  	inline void _UpdateStr() {
  		intVal = atoi(strVal.data());
! 		floatVal = (float)atof(strVal.data());
  	}
  };

Index: itimer.h
===================================================================
RCS file: /cvsroot/epfl/engine/interface/itimer.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** itimer.h	24 Nov 2005 20:47:13 -0000	1.1.1.1
--- itimer.h	7 Dec 2005 22:23:50 -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 TGITIMER_H
  #define TGITIMER_H

Index: imaterial_manager.h
===================================================================
RCS file: /cvsroot/epfl/engine/interface/imaterial_manager.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** imaterial_manager.h	24 Nov 2005 20:47:13 -0000	1.1.1.1
--- imaterial_manager.h	7 Dec 2005 22:23:50 -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 TGIMATERIAL_MANAGER_H
  #define TGIMATERIAL_MANAGER_H

Index: icanvas.h
===================================================================
RCS file: /cvsroot/epfl/engine/interface/icanvas.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** icanvas.h	24 Nov 2005 20:47:13 -0000	1.1.1.1
--- icanvas.h	7 Dec 2005 22:23:50 -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 TGICANVAS_H
  #define TGICANVAS_H
***************
*** 19,23 ****
  {
   public:
!  	virtual ~tgICanvas() {};
   	/**
   	* Affiche du texte à l'écran
--- 41,45 ----
  {
   public:
! 	 virtual ~tgICanvas() {}
   	/**
   	* Affiche du texte à l'écran
***************
*** 25,29 ****
   	* @param CR un booléen qui dit si il faudra aller à la ligne après l'affichage du texte (par défaut, true)
   	*/
! 	virtual void DrawText (const tgstring& str, bool CR=true) = 0;
  	
  	/**
--- 47,51 ----
   	* @param CR un booléen qui dit si il faudra aller à la ligne après l'affichage du texte (par défaut, true)
   	*/
! 	 virtual void DisplayText (const tgstring& str, bool CR=true) = 0;
  	
  	/**

Index: ifile_manager.h
===================================================================
RCS file: /cvsroot/epfl/engine/interface/ifile_manager.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ifile_manager.h	24 Nov 2005 20:47:13 -0000	1.1.1.1
--- ifile_manager.h	7 Dec 2005 22:23:50 -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 TGIFILE_MANAGER_H
  #define TGIFILE_MANAGER_H

Index: ibind_manager.h
===================================================================
RCS file: /cvsroot/epfl/engine/interface/ibind_manager.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ibind_manager.h	24 Nov 2005 20:47:13 -0000	1.1.1.1
--- ibind_manager.h	7 Dec 2005 22:23:50 -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 TGIBIND_MANAGER_H
  #define TGIBIND_MANAGER_H

Index: keys.h
===================================================================
RCS file: /cvsroot/epfl/engine/interface/keys.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** keys.h	24 Nov 2005 20:47:13 -0000	1.1.1.1
--- keys.h	7 Dec 2005 22:23:50 -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 TGKEYS_H
  #define TGKEYS_H

Index: export.h
===================================================================
RCS file: /cvsroot/epfl/engine/interface/export.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** export.h	24 Nov 2005 20:47:13 -0000	1.1.1.1
--- export.h	7 Dec 2005 22:23:50 -0000	1.2
***************
*** 1,25 ****
! #ifndef TGEXPORT_H
! #define TGEXPORT_H
  
! #include "iworld_manager.h"
! #include "ibind_manager.h"
! #include "ifile_manager.h"
! #include "imodel_manager.h"
! #include "itimer.h"
! #include "iconsole.h"
! #include "icanvas.h"
! #include "imaterial_manager.h"
  
! struct tgEngineExport
! {
! 	tgIWorldManager* pWorldManager;
! 	tgIBindManager* pBindManager;
! 	tgIFileManager* pFileManager;
! 	tgIModelManager* pModelManager;
! 	tgITimer* pTimer;
! 	tgIConsole* pConsole;
! 	tgICanvas* pCanvas;
! 	tgIMaterialManager* pMaterialManager;
! };
  
! #endif
--- 1,50 ----
! /*
! -----------------------------------------------------------------------------
! 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 TGEXPORT_H
! #define TGEXPORT_H
! 
! //comptabilite Win32
! 
! 
! #include "iworld_manager.h"
! #include "ibind_manager.h"
! #include "ifile_manager.h"
! #include "imodel_manager.h"
! #include "itimer.h"
! #include "iconsole.h"
! #include "icanvas.h"
! #include "imaterial_manager.h"
! 
! struct tgEngineExport
! {
! 	tgIWorldManager* pWorldManager;
! 	tgIBindManager* pBindManager;
! 	tgIFileManager* pFileManager;
! 	tgIModelManager* pModelManager;
! 	tgITimer* pTimer;
! 	tgIConsole* pConsole;
! 	tgICanvas* pCanvas;
! 	tgIMaterialManager* pMaterialManager;
! };
! 
! #endif

Index: functor.h
===================================================================
RCS file: /cvsroot/epfl/engine/interface/functor.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** functor.h	24 Nov 2005 20:47:13 -0000	1.1.1.1
--- functor.h	7 Dec 2005 22:23:50 -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.
+ -----------------------------------------------------------------------------
+ */
  /** Template de functor, utilises pour les callback
  * Ce fichier a été généré automatiquement
***************
*** 5,10 ****
  #ifndef TGFUNCTOR_H
  #define TGFUNCTOR_H
! #include <stdlib.h>
! #include <string.h>
  
  /*
--- 27,33 ----
  #ifndef TGFUNCTOR_H
  #define TGFUNCTOR_H
! #include "tglib.h"
! /*#include <stdlib.h>
! #include <string.h>*/
  
  /*

Index: imaterial.h
===================================================================
RCS file: /cvsroot/epfl/engine/interface/imaterial.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** imaterial.h	24 Nov 2005 20:47:13 -0000	1.1.1.1
--- imaterial.h	7 Dec 2005 22:23:50 -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 TGIMATERIAL_H
  #define TGIMATERIAL_H

Index: import.h
===================================================================
RCS file: /cvsroot/epfl/engine/interface/import.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** import.h	24 Nov 2005 20:47:13 -0000	1.1.1.1
--- import.h	7 Dec 2005 22:23:50 -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 TGIMPORT_H
  #define TGIMPORT_H

Index: tglib.h
===================================================================
RCS file: /cvsroot/epfl/engine/interface/tglib.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** tglib.h	24 Nov 2005 20:47:13 -0000	1.1.1.1
--- tglib.h	7 Dec 2005 22:23:50 -0000	1.2
***************
*** 1,6 ****
  #ifndef TGLIB_H
  #define TGLIB_H
  
- 
  /// Unsigned 1-byte integer.
  typedef unsigned char uint8;
--- 1,27 ----
+ /*
+ -----------------------------------------------------------------------------
+ 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 TGLIB_H
  #define TGLIB_H
  
  /// Unsigned 1-byte integer.
  typedef unsigned char uint8;
***************
*** 17,21 ****
  
  
! 
  
  #include "../tglib/math/vector.h"
--- 38,43 ----
  
  
! //fscanf, fopen deprecated sous Visualc++ 2005 (en faveur de fscanf_s fopen_s)
! #include "stdlib.h"
  
  #include "../tglib/math/vector.h"

Index: imodel_manager.h
===================================================================
RCS file: /cvsroot/epfl/engine/interface/imodel_manager.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** imodel_manager.h	24 Nov 2005 20:47:13 -0000	1.1.1.1
--- imodel_manager.h	7 Dec 2005 22:23:50 -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 TGIMODEL_MANAGER_H
  #define TGIMODEL_MANAGER_H

Index: ientity.h
===================================================================
RCS file: /cvsroot/epfl/engine/interface/ientity.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** ientity.h	24 Nov 2005 20:47:13 -0000	1.1.1.1
--- ientity.h	7 Dec 2005 22:23:50 -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 TGENTITY_H
  #define TGENTITY_H

[Epfl-cvs] engine/tglib/containers linklist.h,1.1.1.1,1.2

[julien r. <jul...@us...>]

Update of /cvsroot/epfl/engine/tglib/containers
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24199/engine/tglib/containers

Modified Files:
	linklist.h 
Log Message:
license

Index: linklist.h
===================================================================
RCS file: /cvsroot/epfl/engine/tglib/containers/linklist.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** linklist.h	24 Nov 2005 20:47:14 -0000	1.1.1.1
--- linklist.h	7 Dec 2005 22:23:50 -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 TGLINKLIST_H
  #define TGLINKLIST_H

[Epfl-cvs] game/interface igame.h,1.1.1.1,1.2

[julien r. <jul...@us...>]

Update of /cvsroot/epfl/game/interface
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24199/game/interface

Modified Files:
	igame.h 
Log Message:
license

Index: igame.h
===================================================================
RCS file: /cvsroot/epfl/game/interface/igame.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** igame.h	24 Nov 2005 20:48:56 -0000	1.1.1.1
--- igame.h	7 Dec 2005 22:23:51 -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 TGIGAME_H
  #define TGIGAME_H

[Epfl-cvs] engine/tglib/math frustum.h,1.1.1.1,1.2 math.h,1.1.1.1,1.2 quaternion.h,1.1.1.1,1.2 triangle.h,1.1.1.1,1.2 vector.h,1.1.1.1,1.2

[julien r. <jul...@us...>]

Update of /cvsroot/epfl/engine/tglib/math
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24199/engine/tglib/math

Modified Files:
	frustum.h math.h quaternion.h triangle.h vector.h 
Log Message:
license

Index: frustum.h
===================================================================
RCS file: /cvsroot/epfl/engine/tglib/math/frustum.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** frustum.h	24 Nov 2005 20:47:14 -0000	1.1.1.1
--- frustum.h	7 Dec 2005 22:23:50 -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 TGFRUSTUM_H
  #define TGFRUSTUM_H

Index: vector.h
===================================================================
RCS file: /cvsroot/epfl/engine/tglib/math/vector.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** vector.h	24 Nov 2005 20:47:14 -0000	1.1.1.1
--- vector.h	7 Dec 2005 22:23:50 -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 TGMATHVECTOR_H
  #define TGMATHVECTOR_H
***************
*** 57,61 ****
  {
  	float   d, invDenom;
! 	invDenom = 1.0 / (normal*normal);
  	d = (normal*p) * invDenom;
  	dst = p-(normal*invDenom)*d;
--- 79,83 ----
  {
  	float   d, invDenom;
! 	invDenom = 1.0f / (normal*normal);
  	d = (normal*p) * invDenom;
  	dst = p-(normal*invDenom)*d;

Index: triangle.h
===================================================================
RCS file: /cvsroot/epfl/engine/tglib/math/triangle.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** triangle.h	24 Nov 2005 20:47:14 -0000	1.1.1.1
--- triangle.h	7 Dec 2005 22:23:50 -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 TGTRIANGLE_H
  #define TGTRIANGLE_H

Index: math.h
===================================================================
RCS file: /cvsroot/epfl/engine/tglib/math/math.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** math.h	24 Nov 2005 20:47:14 -0000	1.1.1.1
--- math.h	7 Dec 2005 22:23:50 -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 TGMATH_H
  #define TGMATH_H

Index: quaternion.h
===================================================================
RCS file: /cvsroot/epfl/engine/tglib/math/quaternion.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** quaternion.h	24 Nov 2005 20:47:14 -0000	1.1.1.1
--- quaternion.h	7 Dec 2005 22:23:50 -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 TGQUATERNION_H
  #define TGQUATERNION_H
***************
*** 185,189 ****
  {
  	tgVector3 tmp = axis/axis.Length();
! 	angle *= DEGTORAD;
  	float sin_a = tgMath::Sin(angle/2);
  	float cos_a = tgMath::Cos(angle/2);
--- 207,211 ----
  {
  	tgVector3 tmp = axis/axis.Length();
! 	angle *= (float)DEGTORAD;
  	float sin_a = tgMath::Sin(angle/2);
  	float cos_a = tgMath::Cos(angle/2);

[Epfl-cvs] engine/tglib face.h,1.1.1.1,1.2 plane.cc,1.1.1.1,1.2 plane.h,1.1.1.1,1.2 vertice.h,1.1.1.1,1.2

[julien r. <jul...@us...>]

Update of /cvsroot/epfl/engine/tglib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24199/engine/tglib

Modified Files:
	face.h plane.cc plane.h vertice.h 
Log Message:
license

Index: vertice.h
===================================================================
RCS file: /cvsroot/epfl/engine/tglib/vertice.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** vertice.h	24 Nov 2005 20:47:13 -0000	1.1.1.1
--- vertice.h	7 Dec 2005 22:23:50 -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 TGVERTICE_H
  #define TGVERTICE_H

Index: plane.h
===================================================================
RCS file: /cvsroot/epfl/engine/tglib/plane.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** plane.h	24 Nov 2005 20:47:14 -0000	1.1.1.1
--- plane.h	7 Dec 2005 22:23:50 -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 TGPLANE_H
  #define TGPLANE_H

Index: face.h
===================================================================
RCS file: /cvsroot/epfl/engine/tglib/face.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** face.h	24 Nov 2005 20:47:13 -0000	1.1.1.1
--- face.h	7 Dec 2005 22:23:50 -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 TGFACE_H
  #define TGFACE_H

Index: plane.cc
===================================================================
RCS file: /cvsroot/epfl/engine/tglib/plane.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** plane.cc	24 Nov 2005 20:47:14 -0000	1.1.1.1
--- plane.cc	7 Dec 2005 22:23:50 -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 "plane.h"
  

[Epfl-cvs] engine/tglib/stl stack.h,1.1.1.1,1.2

[julien r. <jul...@us...>]

Update of /cvsroot/epfl/engine/tglib/stl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24199/engine/tglib/stl

Modified Files:
	stack.h 
Log Message:
license

Index: stack.h
===================================================================
RCS file: /cvsroot/epfl/engine/tglib/stl/stack.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** stack.h	24 Nov 2005 20:47:14 -0000	1.1.1.1
--- stack.h	7 Dec 2005 22:23:50 -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 TGSTACK_H
  #define TGSTACK_H

[Epfl-cvs] engine/tglib/bvolume aaboundingbox.cc,1.1.1.1,1.2 aaboundingbox.h,1.1.1.1,1.2 boundingsphere.cc,1.1.1.1,1.2 boundingsphere.h,1.1.1.1,1.2 boundingvolume.h,1.1.1.1,1.2

[julien r. <jul...@us...>]

Update of /cvsroot/epfl/engine/tglib/bvolume
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24199/engine/tglib/bvolume

Modified Files:
	aaboundingbox.cc aaboundingbox.h boundingsphere.cc 
	boundingsphere.h boundingvolume.h 
Log Message:
license

Index: boundingsphere.h
===================================================================
RCS file: /cvsroot/epfl/engine/tglib/bvolume/boundingsphere.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** boundingsphere.h	24 Nov 2005 20:47:14 -0000	1.1.1.1
--- boundingsphere.h	7 Dec 2005 22:23:50 -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 TGBOUNDINGSPHERE_H
  #define TGBOUNDINGSPHERE_H

Index: boundingsphere.cc
===================================================================
RCS file: /cvsroot/epfl/engine/tglib/bvolume/boundingsphere.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** boundingsphere.cc	24 Nov 2005 20:47:14 -0000	1.1.1.1
--- boundingsphere.cc	7 Dec 2005 22:23:50 -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 "boundingsphere.h"
  

Index: aaboundingbox.cc
===================================================================
RCS file: /cvsroot/epfl/engine/tglib/bvolume/aaboundingbox.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** aaboundingbox.cc	24 Nov 2005 20:47:14 -0000	1.1.1.1
--- aaboundingbox.cc	7 Dec 2005 22:23:50 -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 "aaboundingbox.h"
  

Index: boundingvolume.h
===================================================================
RCS file: /cvsroot/epfl/engine/tglib/bvolume/boundingvolume.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** boundingvolume.h	24 Nov 2005 20:47:14 -0000	1.1.1.1
--- boundingvolume.h	7 Dec 2005 22:23:50 -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 TGBOUNDINGVOLUME_H
  #define TGBOUNDINGVOLUME_H

Index: aaboundingbox.h
===================================================================
RCS file: /cvsroot/epfl/engine/tglib/bvolume/aaboundingbox.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** aaboundingbox.h	24 Nov 2005 20:47:14 -0000	1.1.1.1
--- aaboundingbox.h	7 Dec 2005 22:23:50 -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 TGAABOUNDINGBOX_H
  #define TGAABOUNDINGBOX_H
***************
*** 105,109 ****
  int tgAABoundingBox::GetChildrensCount()
  {
! 	return childrens.size();
  }
  
--- 127,131 ----
  int tgAABoundingBox::GetChildrensCount()
  {
! 	return (int)childrens.size();
  }
  

[Epfl-cvs] engine/gl gl.h,1.1.1.1,1.2 glext.h,1.1.1.1,1.2 tggl.h,1.1.1.1,1.2 tggl_linked.h,1.1.1.1,1.2

[julien r. <jul...@us...>]

Update of /cvsroot/epfl/engine/gl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24199/engine/gl

Modified Files:
	gl.h glext.h tggl.h tggl_linked.h 
Log Message:
license

Index: tggl_linked.h
===================================================================
RCS file: /cvsroot/epfl/engine/gl/tggl_linked.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** tggl_linked.h	24 Nov 2005 20:47:14 -0000	1.1.1.1
--- tggl_linked.h	7 Dec 2005 22:23:49 -0000	1.2
***************
*** 1,361 ****
! /*#define GLAPI extern
! #define APIENTRY
! GLAPI void APIENTRY glActiveTexture (GLenum);
! GLAPI void APIENTRY glClientActiveTexture (GLenum);
! GLAPI void APIENTRY glMultiTexCoord2f (GLenum, GLfloat, GLfloat);*/
! 
! //BEGIN on devrait les obtenir via des pointeurs
! #define tgglClientActiveTexture glClientActiveTexture
! #define tgglActiveTexture glActiveTexture
! #define tgglMultiTexCoord2f glMultiTexCoord2f
! //END
  
  
! #define tggluBuild2DMipmaps gluBuild2DMipmaps
  
! #define tgglAccum glAccum
! #define tgglAlphaFunc glAlphaFunc
! #define tgglAreTexturesResident glAreTexturesResident
! #define tgglArrayElement glArrayElement
! #define tgglBegin glBegin
! #define tgglBindTexture glBindTexture
! #define tgglBitmap glBitmap
! #define tgglBlendFunc glBlendFunc
! #define tgglCallList glCallList
! #define tgglCallLists glCallLists
! #define tgglClear glClear
! #define tgglClearAccum glClearAccum
! #define tgglClearColor glClearColor
! #define tgglClearDepth glClearDepth
! #define tgglClearIndex glClearIndex
! #define tgglClearStencil glClearStencil
! #define tgglClipPlane glClipPlane
! #define tgglColor3b glColor3b
! #define tgglColor3bv glColor3bv
! #define tgglColor3d glColor3d
! #define tgglColor3dv glColor3dv
! #define tgglColor3f glColor3f
! #define tgglColor3fv glColor3fv
! #define tgglColor3i glColor3i
! #define tgglColor3iv glColor3iv
! #define tgglColor3s glColor3s
! #define tgglColor3sv glColor3sv
! #define tgglColor3ub glColor3ub
! #define tgglColor3ubv glColor3ubv
! #define tgglColor3ui glColor3ui
! #define tgglColor3uiv glColor3uiv
! #define tgglColor3us glColor3us
! #define tgglColor3usv glColor3usv
! #define tgglColor4b glColor4b
! #define tgglColor4bv glColor4bv
! #define tgglColor4d glColor4d
! #define tgglColor4dv glColor4dv
! #define tgglColor4f glColor4f
! #define tgglColor4fv glColor4fv
! #define tgglColor4i glColor4i
! #define tgglColor4iv glColor4iv
! #define tgglColor4s glColor4s
! #define tgglColor4sv glColor4sv
! #define tgglColor4ub glColor4ub
! #define tgglColor4ubv glColor4ubv
! #define tgglColor4ui glColor4ui
! #define tgglColor4uiv glColor4uiv
! #define tgglColor4us glColor4us
! #define tgglColor4usv glColor4usv
! #define tgglColorMask glColorMask
! #define tgglColorMaterial glColorMaterial
! #define tgglColorPointer glColorPointer
! #define tgglCopyPixels glCopyPixels
! #define tgglCopyTexImage1D glCopyTexImage1D
! #define tgglCopyTexImage2D glCopyTexImage2D
! #define tgglCopyTexSubImage1D glCopyTexSubImage1D
! #define tgglCopyTexSubImage2D glCopyTexSubImage2D
! #define tgglCullFace glCullFace
! #define tgglDeleteLists glDeleteLists
! #define tgglDeleteTextures glDeleteTextures
! #define tgglDepthFunc glDepthFunc
! #define tgglDepthMask glDepthMask
! #define tgglDepthRange glDepthRange
! #define tgglDisable glDisable
! #define tgglDisableClientState glDisableClientState
! #define tgglDrawArrays glDrawArrays
! #define tgglDrawBuffer glDrawBuffer
! #define tgglDrawElements glDrawElements
! #define tgglDrawPixels glDrawPixels
! #define tgglEdgeFlag glEdgeFlag
! #define tgglEdgeFlagPointer glEdgeFlagPointer
! #define tgglEdgeFlagv glEdgeFlagv
! #define tgglEnable glEnable
! #define tgglEnableClientState glEnableClientState
! #define tgglEnd glEnd
! #define tgglEndList glEndList
! #define tgglEvalCoord1d glEvalCoord1d
! #define tgglEvalCoord1dv glEvalCoord1dv
! #define tgglEvalCoord1f glEvalCoord1f
! #define tgglEvalCoord1fv glEvalCoord1fv
! #define tgglEvalCoord2d glEvalCoord2d
! #define tgglEvalCoord2dv glEvalCoord2dv
! #define tgglEvalCoord2f glEvalCoord2f
! #define tgglEvalCoord2fv glEvalCoord2fv
! #define tgglEvalMesh1 glEvalMesh1
! #define tgglEvalMesh2 glEvalMesh2
! #define tgglEvalPoint1 glEvalPoint1
! #define tgglEvalPoint2 glEvalPoint2
! #define tgglFeedbackBuffer glFeedbackBuffer
! #define tgglFinish glFinish
! #define tgglFlush glFlush
! #define tgglFogf glFogf
! #define tgglFogfv glFogfv
! #define tgglFogi glFogi
! #define tgglFogiv glFogiv
! #define tgglFrontFace glFrontFace
! #define tgglFrustum glFrustum
! #define tgglGenLists glGenLists
! #define tgglGenTextures glGenTextures
! #define tgglGetBooleanv glGetBooleanv
! #define tgglGetClipPlane glGetClipPlane
! #define tgglGetDoublev glGetDoublev
! #define tgglGetError glGetError
! #define tgglGetFloatv glGetFloatv
! #define tgglGetIntegerv glGetIntegerv
! #define tgglGetLightfv glGetLightfv
! #define tgglGetLightiv glGetLightiv
! #define tgglGetMapdv glGetMapdv
! #define tgglGetMapfv glGetMapfv
! #define tgglGetMapiv glGetMapiv
! #define tgglGetMaterialfv glGetMaterialfv
! #define tgglGetMaterialiv glGetMaterialiv
! #define tgglGetPixelMapfv glGetPixelMapfv
! #define tgglGetPixelMapuiv glGetPixelMapuiv
! #define tgglGetPixelMapusv glGetPixelMapusv
! #define tgglGetPointerv glGetPointerv
! #define tgglGetPolygonStipple glGetPolygonStipple
! #define tgglGetString glGetString
! #define tgglGetTexEnviv glGetTexEnviv
! #define tgglGetTexEnvfv glGetTexEnvfv
! #define tgglGetTexGendv glGetTexGendv
! #define tgglGetTexGenfv glGetTexGenfv
! #define tgglGetTexGeniv glGetTexGeniv
! #define tgglGetTexImage glGetTexImage
! #define tgglGetTexLevelParameterfv glGetTexLevelParameterfv
! #define tgglGetTexLevelParameteriv glGetTexLevelParameteriv
! #define tgglGetTexParameterfv glGetTexParameterfv
! #define tgglGetTexParameteriv glGetTexParameteriv
! #define tgglHint glHint
! #define tgglIndexMask glIndexMask
! #define tgglIndexPointer glIndexPointer
! #define tgglIndexd glIndexd
! #define tgglIndexdv glIndexdv
! #define tgglIndexf glIndexf
! #define tgglIndexfv glIndexfv
! #define tgglIndexi glIndexi
! #define tgglIndexiv glIndexiv
! #define tgglIndexs glIndexs
! #define tgglIndexsv glIndexsv
! #define tgglIndexub glIndexub
! #define tgglIndexubv glIndexubv
! #define tgglInitNames glInitNames
! #define tgglInterleavedArrays glInterleavedArrays
! #define tgglIsEnabled glIsEnabled
! #define tgglIsList glIsList
! #define tgglIsTexture glIsTexture
! #define tgglLightModelf glLightModelf
! #define tgglLightModelfv glLightModelfv
! #define tgglLightModeli glLightModeli
! #define tgglLightModeliv glLightModeliv
! #define tgglLightf glLightf
! #define tgglLightfv glLightfv
! #define tgglLighti glLighti
! #define tgglLightiv glLightiv
! #define tgglLineStipple glLineStipple
! #define tgglLineWidth glLineWidth
! #define tgglListBase glListBase
! #define tgglLoadIdentity glLoadIdentity
! #define tgglLoadMatrixd glLoadMatrixd
! #define tgglLoadMatrixf glLoadMatrixf
! #define tgglLoadName glLoadName
! #define tgglLogicOp glLogicOp
! #define tgglMap1d glMap1d
! #define tgglMap1f glMap1f
! #define tgglMap2d glMap2d
! #define tgglMap2f glMap2f
! #define tgglMapGrid1d glMapGrid1d
! #define tgglMapGrid1f glMapGrid1f
! #define tgglMapGrid2d glMapGrid2d
! #define tgglMapGrid2f glMapGrid2f
! #define tgglMaterialf glMaterialf
! #define tgglMaterialfv glMaterialfv
! #define tgglMateriali glMateriali
! #define tgglMaterialiv glMaterialiv
! #define tgglMatrixMode glMatrixMode
! #define tgglMultMatrixd glMultMatrixd
! #define tgglMultMatrixf glMultMatrixf
! #define tgglNewList glNewList
! #define tgglNormal3b glNormal3b
! #define tgglNormal3bv glNormal3bv
! #define tgglNormal3d glNormal3d
! #define tgglNormal3dv glNormal3dv
! #define tgglNormal3f glNormal3f
! #define tgglNormal3fv glNormal3fv
! #define tgglNormal3i glNormal3i
! #define tgglNormal3iv glNormal3iv
! #define tgglNormal3s glNormal3s
! #define tgglNormal3sv glNormal3sv
! #define tgglNormalPointer glNormalPointer
! #define tgglOrtho glOrtho
! #define tgglPassThrough glPassThrough
! #define tgglPixelMapfv glPixelMapfv
! #define tgglPixelMapuiv glPixelMapuiv
! #define tgglPixelMapusv glPixelMapusv
! #define tgglPixelStoref glPixelStoref
! #define tgglPixelStorei glPixelStorei
! #define tgglPixelTransferf glPixelTransferf
! #define tgglPixelTransferi glPixelTransferi
! #define tgglPixelZoom glPixelZoom
! #define tgglPointSize glPointSize
! #define tgglPolygonMode glPolygonMode
! #define tgglPolygonOffset glPolygonOffset
! #define tgglPolygonStipple glPolygonStipple
! #define tgglPopAttrib glPopAttrib
! #define tgglPopClientAttrib glPopClientAttrib
! #define tgglPopMatrix glPopMatrix
! #define tgglPopName glPopName
! #define tgglPrioritizeTextures glPrioritizeTextures
! #define tgglPushAttrib glPushAttrib
! #define tgglPushClientAttrib glPushClientAttrib
! #define tgglPushMatrix glPushMatrix
! #define tgglPushName glPushName
! #define tgglRasterPos2d glRasterPos2d
! #define tgglRasterPos2dv glRasterPos2dv
! #define tgglRasterPos2f glRasterPos2f
! #define tgglRasterPos2fv glRasterPos2fv
! #define tgglRasterPos2i glRasterPos2i
! #define tgglRasterPos2iv glRasterPos2iv
! #define tgglRasterPos2s glRasterPos2s
! #define tgglRasterPos2sv glRasterPos2sv
! #define tgglRasterPos3d glRasterPos3d
! #define tgglRasterPos3dv glRasterPos3dv
! #define tgglRasterPos3f glRasterPos3f
! #define tgglRasterPos3fv glRasterPos3fv
! #define tgglRasterPos3i glRasterPos3i
! #define tgglRasterPos3iv glRasterPos3iv
! #define tgglRasterPos3s glRasterPos3s
! #define tgglRasterPos3sv glRasterPos3sv
! #define tgglRasterPos4d glRasterPos4d
! #define tgglRasterPos4dv glRasterPos4dv
! #define tgglRasterPos4f glRasterPos4f
! #define tgglRasterPos4fv glRasterPos4fv
! #define tgglRasterPos4i glRasterPos4i
! #define tgglRasterPos4iv glRasterPos4iv
! #define tgglRasterPos4s glRasterPos4s
! #define tgglRasterPos4sv glRasterPos4sv
! #define tgglReadBuffer glReadBuffer
! #define tgglReadPixels glReadPixels
! #define tgglRectd glRectd
! #define tgglRectdv glRectdv
! #define tgglRectf glRectf
! #define tgglRectfv glRectfv
! #define tgglRecti glRecti
! #define tgglRectiv glRectiv
! #define tgglRects glRects
! #define tgglRectsv glRectsv
! #define tgglRenderMode glRenderMode
! #define tgglRotated glRotated
! #define tgglRotatef glRotatef
! #define tgglScaled glScaled
! #define tgglScalef glScalef
! #define tgglScissor glScissor
! #define tgglSelectBuffer glSelectBuffer
! #define tgglShadeModel glShadeModel
! #define tgglStencilFunc glStencilFunc
! #define tgglStencilMask glStencilMask
! #define tgglStencilOp glStencilOp
! #define tgglTexCoord1d glTexCoord1d
! #define tgglTexCoord1dv glTexCoord1dv
! #define tgglTexCoord1f glTexCoord1f
! #define tgglTexCoord1fv glTexCoord1fv
! #define tgglTexCoord1i glTexCoord1i
! #define tgglTexCoord1iv glTexCoord1iv
! #define tgglTexCoord1s glTexCoord1s
! #define tgglTexCoord1sv glTexCoord1sv
! #define tgglTexCoord2d glTexCoord2d
! #define tgglTexCoord2dv glTexCoord2dv
! #define tgglTexCoord2f glTexCoord2f
! #define tgglTexCoord2fv glTexCoord2fv
! #define tgglTexCoord2i glTexCoord2i
! #define tgglTexCoord2iv glTexCoord2iv
! #define tgglTexCoord2s glTexCoord2s
! #define tgglTexCoord2sv glTexCoord2sv
! #define tgglTexCoord3d glTexCoord3d
! #define tgglTexCoord3dv glTexCoord3dv
! #define tgglTexCoord3f glTexCoord3f
! #define tgglTexCoord3fv glTexCoord3fv
! #define tgglTexCoord3i glTexCoord3i
! #define tgglTexCoord3iv glTexCoord3iv
! #define tgglTexCoord3s glTexCoord3s
! #define tgglTexCoord3sv glTexCoord3sv
! #define tgglTexCoord4d glTexCoord4d
! #define tgglTexCoord4dv glTexCoord4dv
! #define tgglTexCoord4f glTexCoord4f
! #define tgglTexCoord4fv glTexCoord4fv
! #define tgglTexCoord4i glTexCoord4i
! #define tgglTexCoord4iv glTexCoord4iv
! #define tgglTexCoord4s glTexCoord4s
! #define tgglTexCoord4sv glTexCoord4sv
! #define tgglTexCoordPointer glTexCoordPointer
! #define	tgglTexEnvf glTexEnvf
! #define	tgglTexEnvfv glTexEnvfv
! #define	tgglTexEnvi glTexEnvi
! #define	tgglTexEnviv glTexEnviv
! #define tgglTexGend glTexGend
! #define tgglTexGendv glTexGendv
! #define tgglTexGenf glTexGenf
! #define tgglTexGenfv glTexGenfv
! #define tgglTexGeni glTexGeni
! #define tgglTexGeniv glTexGeniv
! #define tgglTexImage1D glTexImage1D
! #define tgglTexImage2D glTexImage2D
! #define tgglTexParameterf glTexParameterf
! #define tgglTexParameterfv glTexParameterfv
! #define tgglTexParameteri glTexParameteri
! #define tgglTexParameteriv glTexParameteriv
! #define tgglTexSubImage1D glTexSubImage1D
! #define tgglTexSubImage2D glTexSubImage2D
! #define tgglTranslated glTranslated
! #define tgglTranslatef glTranslatef
! #define tgglVertex2d glVertex2d
! #define tgglVertex2dv glVertex2dv
! #define tgglVertex2f glVertex2f
! #define tgglVertex2fv glVertex2fv
! #define tgglVertex2i glVertex2i
! #define tgglVertex2iv glVertex2iv
! #define tgglVertex2s glVertex2s
! #define tgglVertex2sv glVertex2sv
! #define tgglVertex3d glVertex3d
! #define tgglVertex3dv glVertex3dv
! #define tgglVertex3f glVertex3f
! #define tgglVertex3fv glVertex3fv
! #define tgglVertex3i glVertex3i
! #define tgglVertex3iv glVertex3iv
! #define tgglVertex3s glVertex3s
! #define tgglVertex3sv glVertex3sv
! #define tgglVertex4d glVertex4d
! #define tgglVertex4dv glVertex4dv
! #define tgglVertex4f glVertex4f
! #define tgglVertex4fv glVertex4fv
! #define tgglVertex4i glVertex4i
! #define tgglVertex4iv glVertex4iv
! #define tgglVertex4s glVertex4s
! #define tgglVertex4sv glVertex4sv
! #define tgglVertexPointer glVertexPointer
! #define tgglViewport glViewport
  
! #ifdef GLX_VERSION_1_1 // catch all for any GLX-aware situation
! #define tgglXChooseVisual glXChooseVisual
! #define tgglXCreateContext glXCreateContext
! #define tgglXDestroyContext glXDestroyContext
! #define tgglXMakeCurrent glXMakeCurrent
! #define tgglXSwapBuffers glXSwapBuffers
! #define tgglXGetProcAddressARB glXGetProcAddressARB
! #endif
!  
--- 1,394 ----
! /*
! -----------------------------------------------------------------------------
! 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 TGGL_LINKED_H
! #define TGGL_LINKED_H
! 
! /*#define GLAPI extern
! #define APIENTRY
! GLAPI void APIENTRY glActiveTexture (GLenum);
! GLAPI void APIENTRY glClientActiveTexture (GLenum);
! GLAPI void APIENTRY glMultiTexCoord2f (GLenum, GLfloat, GLfloat);*/
! 
! //BEGIN on devrait les obtenir via des pointeurs
! /*#ifdef TGLINUX
! #define tgglClientActiveTexture glClientActiveTexture
! #define tgglActiveTexture glActiveTexture
! #define tgglMultiTexCoord2f glMultiTexCoord2f
! #endif
! #ifdef TGWIN32
! extern PFNGLMULTITEXCOORD2FARBPROC		tgglMultiTexCoord2f;
! extern PFNGLACTIVETEXTUREARBPROC		tgglActiveTexture;
! extern PFNGLCLIENTACTIVETEXTUREARBPROC	tgglClientActiveTexture;
! #endif*/
! //END
! 
! 
! #define tggluBuild2DMipmaps gluBuild2DMipmaps
! 
! #define tgglAccum glAccum
! #define tgglAlphaFunc glAlphaFunc
! #define tgglAreTexturesResident glAreTexturesResident
! #define tgglArrayElement glArrayElement
! #define tgglBegin glBegin
! #define tgglBindTexture glBindTexture
! #define tgglBitmap glBitmap
! #define tgglBlendFunc glBlendFunc
! #define tgglCallList glCallList
! #define tgglCallLists glCallLists
! #define tgglClear glClear
! #define tgglClearAccum glClearAccum
! #define tgglClearColor glClearColor
! #define tgglClearDepth glClearDepth
! #define tgglClearIndex glClearIndex
! #define tgglClearStencil glClearStencil
! #define tgglClipPlane glClipPlane
! #define tgglColor3b glColor3b
! #define tgglColor3bv glColor3bv
! #define tgglColor3d glColor3d
! #define tgglColor3dv glColor3dv
! #define tgglColor3f glColor3f
! #define tgglColor3fv glColor3fv
! #define tgglColor3i glColor3i
! #define tgglColor3iv glColor3iv
! #define tgglColor3s glColor3s
! #define tgglColor3sv glColor3sv
! #define tgglColor3ub glColor3ub
! #define tgglColor3ubv glColor3ubv
! #define tgglColor3ui glColor3ui
! #define tgglColor3uiv glColor3uiv
! #define tgglColor3us glColor3us
! #define tgglColor3usv glColor3usv
! #define tgglColor4b glColor4b
! #define tgglColor4bv glColor4bv
! #define tgglColor4d glColor4d
! #define tgglColor4dv glColor4dv
! #define tgglColor4f glColor4f
! #define tgglColor4fv glColor4fv
! #define tgglColor4i glColor4i
! #define tgglColor4iv glColor4iv
! #define tgglColor4s glColor4s
! #define tgglColor4sv glColor4sv
! #define tgglColor4ub glColor4ub
! #define tgglColor4ubv glColor4ubv
! #define tgglColor4ui glColor4ui
! #define tgglColor4uiv glColor4uiv
! #define tgglColor4us glColor4us
! #define tgglColor4usv glColor4usv
! #define tgglColorMask glColorMask
! #define tgglColorMaterial glColorMaterial
! #define tgglColorPointer glColorPointer
! #define tgglCopyPixels glCopyPixels
! #define tgglCopyTexImage1D glCopyTexImage1D
! #define tgglCopyTexImage2D glCopyTexImage2D
! #define tgglCopyTexSubImage1D glCopyTexSubImage1D
! #define tgglCopyTexSubImage2D glCopyTexSubImage2D
! #define tgglCullFace glCullFace
! #define tgglDeleteLists glDeleteLists
! #define tgglDeleteTextures glDeleteTextures
! #define tgglDepthFunc glDepthFunc
! #define tgglDepthMask glDepthMask
! #define tgglDepthRange glDepthRange
! #define tgglDisable glDisable
! #define tgglDisableClientState glDisableClientState
! #define tgglDrawArrays glDrawArrays
! #define tgglDrawBuffer glDrawBuffer
! #define tgglDrawElements glDrawElements
! #define tgglDrawPixels glDrawPixels
! #define tgglEdgeFlag glEdgeFlag
! #define tgglEdgeFlagPointer glEdgeFlagPointer
! #define tgglEdgeFlagv glEdgeFlagv
! #define tgglEnable glEnable
! #define tgglEnableClientState glEnableClientState
! #define tgglEnd glEnd
! #define tgglEndList glEndList
! #define tgglEvalCoord1d glEvalCoord1d
! #define tgglEvalCoord1dv glEvalCoord1dv
! #define tgglEvalCoord1f glEvalCoord1f
! #define tgglEvalCoord1fv glEvalCoord1fv
! #define tgglEvalCoord2d glEvalCoord2d
! #define tgglEvalCoord2dv glEvalCoord2dv
! #define tgglEvalCoord2f glEvalCoord2f
! #define tgglEvalCoord2fv glEvalCoord2fv
! #define tgglEvalMesh1 glEvalMesh1
! #define tgglEvalMesh2 glEvalMesh2
! #define tgglEvalPoint1 glEvalPoint1
! #define tgglEvalPoint2 glEvalPoint2
! #define tgglFeedbackBuffer glFeedbackBuffer
! #define tgglFinish glFinish
! #define tgglFlush glFlush
! #define tgglFogf glFogf
! #define tgglFogfv glFogfv
! #define tgglFogi glFogi
! #define tgglFogiv glFogiv
! #define tgglFrontFace glFrontFace
! #define tgglFrustum glFrustum
! #define tgglGenLists glGenLists
! #define tgglGenTextures glGenTextures
! #define tgglGetBooleanv glGetBooleanv
! #define tgglGetClipPlane glGetClipPlane
! #define tgglGetDoublev glGetDoublev
! #define tgglGetError glGetError
! #define tgglGetFloatv glGetFloatv
! #define tgglGetIntegerv glGetIntegerv
! #define tgglGetLightfv glGetLightfv
! #define tgglGetLightiv glGetLightiv
! #define tgglGetMapdv glGetMapdv
! #define tgglGetMapfv glGetMapfv
! #define tgglGetMapiv glGetMapiv
! #define tgglGetMaterialfv glGetMaterialfv
! #define tgglGetMaterialiv glGetMaterialiv
! #define tgglGetPixelMapfv glGetPixelMapfv
! #define tgglGetPixelMapuiv glGetPixelMapuiv
! #define tgglGetPixelMapusv glGetPixelMapusv
! #define tgglGetPointerv glGetPointerv
! #define tgglGetPolygonStipple glGetPolygonStipple
! #define tgglGetString glGetString
! #define tgglGetTexEnviv glGetTexEnviv
! #define tgglGetTexEnvfv glGetTexEnvfv
! #define tgglGetTexGendv glGetTexGendv
! #define tgglGetTexGenfv glGetTexGenfv
! #define tgglGetTexGeniv glGetTexGeniv
! #define tgglGetTexImage glGetTexImage
! #define tgglGetTexLevelParameterfv glGetTexLevelParameterfv
! #define tgglGetTexLevelParameteriv glGetTexLevelParameteriv
! #define tgglGetTexParameterfv glGetTexParameterfv
! #define tgglGetTexParameteriv glGetTexParameteriv
! #define tgglHint glHint
! #define tgglIndexMask glIndexMask
! #define tgglIndexPointer glIndexPointer
! #define tgglIndexd glIndexd
! #define tgglIndexdv glIndexdv
! #define tgglIndexf glIndexf
! #define tgglIndexfv glIndexfv
! #define tgglIndexi glIndexi
! #define tgglIndexiv glIndexiv
! #define tgglIndexs glIndexs
! #define tgglIndexsv glIndexsv
! #define tgglIndexub glIndexub
! #define tgglIndexubv glIndexubv
! #define tgglInitNames glInitNames
! #define tgglInterleavedArrays glInterleavedArrays
! #define tgglIsEnabled glIsEnabled
! #define tgglIsList glIsList
! #define tgglIsTexture glIsTexture
! #define tgglLightModelf glLightModelf
! #define tgglLightModelfv glLightModelfv
! #define tgglLightModeli glLightModeli
! #define tgglLightModeliv glLightModeliv
! #define tgglLightf glLightf
! #define tgglLightfv glLightfv
! #define tgglLighti glLighti
! #define tgglLightiv glLightiv
! #define tgglLineStipple glLineStipple
! #define tgglLineWidth glLineWidth
! #define tgglListBase glListBase
! #define tgglLoadIdentity glLoadIdentity
! #define tgglLoadMatrixd glLoadMatrixd
! #define tgglLoadMatrixf glLoadMatrixf
! #define tgglLoadName glLoadName
! #define tgglLogicOp glLogicOp
! #define tgglMap1d glMap1d
! #define tgglMap1f glMap1f
! #define tgglMap2d glMap2d
! #define tgglMap2f glMap2f
! #define tgglMapGrid1d glMapGrid1d
! #define tgglMapGrid1f glMapGrid1f
! #define tgglMapGrid2d glMapGrid2d
! #define tgglMapGrid2f glMapGrid2f
! #define tgglMaterialf glMaterialf
! #define tgglMaterialfv glMaterialfv
! #define tgglMateriali glMateriali
! #define tgglMaterialiv glMaterialiv
! #define tgglMatrixMode glMatrixMode
! #define tgglMultMatrixd glMultMatrixd
! #define tgglMultMatrixf glMultMatrixf
! #define tgglNewList glNewList
! #define tgglNormal3b glNormal3b
! #define tgglNormal3bv glNormal3bv
! #define tgglNormal3d glNormal3d
! #define tgglNormal3dv glNormal3dv
! #define tgglNormal3f glNormal3f
! #define tgglNormal3fv glNormal3fv
! #define tgglNormal3i glNormal3i
! #define tgglNormal3iv glNormal3iv
! #define tgglNormal3s glNormal3s
! #define tgglNormal3sv glNormal3sv
! #define tgglNormalPointer glNormalPointer
! #define tgglOrtho glOrtho
! #define tgglPassThrough glPassThrough
! #define tgglPixelMapfv glPixelMapfv
! #define tgglPixelMapuiv glPixelMapuiv
! #define tgglPixelMapusv glPixelMapusv
! #define tgglPixelStoref glPixelStoref
! #define tgglPixelStorei glPixelStorei
! #define tgglPixelTransferf glPixelTransferf
! #define tgglPixelTransferi glPixelTransferi
! #define tgglPixelZoom glPixelZoom
! #define tgglPointSize glPointSize
! #define tgglPolygonMode glPolygonMode
! #define tgglPolygonOffset glPolygonOffset
! #define tgglPolygonStipple glPolygonStipple
! #define tgglPopAttrib glPopAttrib
! #define tgglPopClientAttrib glPopClientAttrib
! #define tgglPopMatrix glPopMatrix
! #define tgglPopName glPopName
! #define tgglPrioritizeTextures glPrioritizeTextures
! #define tgglPushAttrib glPushAttrib
! #define tgglPushClientAttrib glPushClientAttrib
! #define tgglPushMatrix glPushMatrix
! #define tgglPushName glPushName
! #define tgglRasterPos2d glRasterPos2d
! #define tgglRasterPos2dv glRasterPos2dv
! #define tgglRasterPos2f glRasterPos2f
! #define tgglRasterPos2fv glRasterPos2fv
! #define tgglRasterPos2i glRasterPos2i
! #define tgglRasterPos2iv glRasterPos2iv
! #define tgglRasterPos2s glRasterPos2s
! #define tgglRasterPos2sv glRasterPos2sv
! #define tgglRasterPos3d glRasterPos3d
! #define tgglRasterPos3dv glRasterPos3dv
! #define tgglRasterPos3f glRasterPos3f
! #define tgglRasterPos3fv glRasterPos3fv
! #define tgglRasterPos3i glRasterPos3i
! #define tgglRasterPos3iv glRasterPos3iv
! #define tgglRasterPos3s glRasterPos3s
! #define tgglRasterPos3sv glRasterPos3sv
! #define tgglRasterPos4d glRasterPos4d
! #define tgglRasterPos4dv glRasterPos4dv
! #define tgglRasterPos4f glRasterPos4f
! #define tgglRasterPos4fv glRasterPos4fv
! #define tgglRasterPos4i glRasterPos4i
! #define tgglRasterPos4iv glRasterPos4iv
! #define tgglRasterPos4s glRasterPos4s
! #define tgglRasterPos4sv glRasterPos4sv
! #define tgglReadBuffer glReadBuffer
! #define tgglReadPixels glReadPixels
! #define tgglRectd glRectd
! #define tgglRectdv glRectdv
! #define tgglRectf glRectf
! #define tgglRectfv glRectfv
! #define tgglRecti glRecti
! #define tgglRectiv glRectiv
! #define tgglRects glRects
! #define tgglRectsv glRectsv
! #define tgglRenderMode glRenderMode
! #define tgglRotated glRotated
! #define tgglRotatef glRotatef
! #define tgglScaled glScaled
! #define tgglScalef glScalef
! #define tgglScissor glScissor
! #define tgglSelectBuffer glSelectBuffer
! #define tgglShadeModel glShadeModel
! #define tgglStencilFunc glStencilFunc
! #define tgglStencilMask glStencilMask
! #define tgglStencilOp glStencilOp
! #define tgglTexCoord1d glTexCoord1d
! #define tgglTexCoord1dv glTexCoord1dv
! #define tgglTexCoord1f glTexCoord1f
! #define tgglTexCoord1fv glTexCoord1fv
! #define tgglTexCoord1i glTexCoord1i
! #define tgglTexCoord1iv glTexCoord1iv
! #define tgglTexCoord1s glTexCoord1s
! #define tgglTexCoord1sv glTexCoord1sv
! #define tgglTexCoord2d glTexCoord2d
! #define tgglTexCoord2dv glTexCoord2dv
! #define tgglTexCoord2f glTexCoord2f
! #define tgglTexCoord2fv glTexCoord2fv
! #define tgglTexCoord2i glTexCoord2i
! #define tgglTexCoord2iv glTexCoord2iv
! #define tgglTexCoord2s glTexCoord2s
! #define tgglTexCoord2sv glTexCoord2sv
! #define tgglTexCoord3d glTexCoord3d
! #define tgglTexCoord3dv glTexCoord3dv
! #define tgglTexCoord3f glTexCoord3f
! #define tgglTexCoord3fv glTexCoord3fv
! #define tgglTexCoord3i glTexCoord3i
! #define tgglTexCoord3iv glTexCoord3iv
! #define tgglTexCoord3s glTexCoord3s
! #define tgglTexCoord3sv glTexCoord3sv
! #define tgglTexCoord4d glTexCoord4d
! #define tgglTexCoord4dv glTexCoord4dv
! #define tgglTexCoord4f glTexCoord4f
! #define tgglTexCoord4fv glTexCoord4fv
! #define tgglTexCoord4i glTexCoord4i
! #define tgglTexCoord4iv glTexCoord4iv
! #define tgglTexCoord4s glTexCoord4s
! #define tgglTexCoord4sv glTexCoord4sv
! #define tgglTexCoordPointer glTexCoordPointer
! #define	tgglTexEnvf glTexEnvf
! #define	tgglTexEnvfv glTexEnvfv
! #define	tgglTexEnvi glTexEnvi
! #define	tgglTexEnviv glTexEnviv
! #define tgglTexGend glTexGend
! #define tgglTexGendv glTexGendv
! #define tgglTexGenf glTexGenf
! #define tgglTexGenfv glTexGenfv
! #define tgglTexGeni glTexGeni
! #define tgglTexGeniv glTexGeniv
! #define tgglTexImage1D glTexImage1D
! #define tgglTexImage2D glTexImage2D
! #define tgglTexParameterf glTexParameterf
! #define tgglTexParameterfv glTexParameterfv
! #define tgglTexParameteri glTexParameteri
! #define tgglTexParameteriv glTexParameteriv
! #define tgglTexSubImage1D glTexSubImage1D
! #define tgglTexSubImage2D glTexSubImage2D
! #define tgglTranslated glTranslated
! #define tgglTranslatef glTranslatef
! #define tgglVertex2d glVertex2d
! #define tgglVertex2dv glVertex2dv
! #define tgglVertex2f glVertex2f
! #define tgglVertex2fv glVertex2fv
! #define tgglVertex2i glVertex2i
! #define tgglVertex2iv glVertex2iv
! #define tgglVertex2s glVertex2s
! #define tgglVertex2sv glVertex2sv
! #define tgglVertex3d glVertex3d
! #define tgglVertex3dv glVertex3dv
! #define tgglVertex3f glVertex3f
! #define tgglVertex3fv glVertex3fv
! #define tgglVertex3i glVertex3i
! #define tgglVertex3iv glVertex3iv
! #define tgglVertex3s glVertex3s
! #define tgglVertex3sv glVertex3sv
! #define tgglVertex4d glVertex4d
! #define tgglVertex4dv glVertex4dv
! #define tgglVertex4f glVertex4f
! #define tgglVertex4fv glVertex4fv
! #define tgglVertex4i glVertex4i
! #define tgglVertex4iv glVertex4iv
! #define tgglVertex4s glVertex4s
! #define tgglVertex4sv glVertex4sv
! #define tgglVertexPointer glVertexPointer
! #define tgglViewport glViewport
! 
! #ifdef GLX_VERSION_1_1 // catch all for any GLX-aware situation
! #define tgglXChooseVisual glXChooseVisual
! #define tgglXCreateContext glXCreateContext
! #define tgglXDestroyContext glXDestroyContext
! #define tgglXMakeCurrent glXMakeCurrent
! #define tgglXSwapBuffers glXSwapBuffers
! #define tgglXGetProcAddressARB glXGetProcAddressARB
! #endif
!  
! #endif

Index: tggl.h
===================================================================
RCS file: /cvsroot/epfl/engine/gl/tggl.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** tggl.h	24 Nov 2005 20:47:15 -0000	1.1.1.1
--- tggl.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 TGGL_H
  #define TGGL_H
***************
*** 10,17 ****
  #include <OpenGL/gl.h>
  #include <OpenGL/glu.h>
! #else
  #include <GL/gl.h>
  #include <GL/glu.h>
  #endif
  
  #include "glext.h"
--- 32,48 ----
  #include <OpenGL/gl.h>
  #include <OpenGL/glu.h>
! #endif
! #ifdef TGLINUX
  #include <GL/gl.h>
  #include <GL/glu.h>
  #endif
+ #ifdef TGWIN32
+ #include <windows.h>
+ #include <gl\gl.h>
+ #include <gl\glu.h>
+ #include <SDL.h>
+ #endif
+ 
+ 
  
  #include "glext.h"

Index: gl.h
===================================================================
RCS file: /cvsroot/epfl/engine/gl/gl.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** gl.h	24 Nov 2005 20:47:15 -0000	1.1.1.1
--- gl.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.
+ -----------------------------------------------------------------------------
+ */
  /* $Id$ */
  

Index: glext.h
===================================================================
RCS file: /cvsroot/epfl/engine/gl/glext.h,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** glext.h	24 Nov 2005 20:47:19 -0000	1.1.1.1
--- glext.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 __glext_h_
  #define __glext_h_

[Epfl-cvs] game game.kdevelop.pcs,1.1.1.1,1.2 game.kdevses,1.1.1.1,1.2 physic_node_entity.cc,1.1.1.1,1.2

[julien r. <jul...@us...>]

Update of /cvsroot/epfl/game
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31534

Modified Files:
	game.kdevelop.pcs game.kdevses physic_node_entity.cc 
Log Message:
...

Index: physic_node_entity.cc
===================================================================
RCS file: /cvsroot/epfl/game/physic_node_entity.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** physic_node_entity.cc	24 Nov 2005 20:48:55 -0000	1.1.1.1
--- physic_node_entity.cc	30 Nov 2005 16:46:52 -0000	1.2
***************
*** 133,137 ****
  	/*tgVector3 org(0,1,0);
  	vVelocity = ClipVelocity(vVelocity, org, OVERCLIP);*/
! 	_StepSlideMove(eTime);
  	vPosition += vVelocity*eTime;
  	
--- 133,137 ----
  	/*tgVector3 org(0,1,0);
  	vVelocity = ClipVelocity(vVelocity, org, OVERCLIP);*/
! //	_StepSlideMove(eTime);
  	vPosition += vVelocity*eTime;
  	

Index: game.kdevelop.pcs
===================================================================
RCS file: /cvsroot/epfl/game/game.kdevelop.pcs,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
Binary files /tmp/cvsAIjvuD and /tmp/cvsw1L8Qe differ

Index: game.kdevses
===================================================================
RCS file: /cvsroot/epfl/game/game.kdevses,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** game.kdevses	24 Nov 2005 20:48:55 -0000	1.1.1.1
--- game.kdevses	30 Nov 2005 16:46:52 -0000	1.2
***************
*** 4,8 ****
   <DocsAndViews NumberOfDocuments="9" >
    <Doc0 NumberOfViews="1" URL="file:///home/silver/Terminal_G33k/game/game.cc" >
!    <View0 line="0" Type="Source" />
    </Doc0>
    <Doc1 NumberOfViews="1" URL="file:///home/silver/Terminal_G33k/game/physic_node_entity.cc" >
--- 4,8 ----
   <DocsAndViews NumberOfDocuments="9" >
    <Doc0 NumberOfViews="1" URL="file:///home/silver/Terminal_G33k/game/game.cc" >
!    <View0 Type="Source" />
    </Doc0>
    <Doc1 NumberOfViews="1" URL="file:///home/silver/Terminal_G33k/game/physic_node_entity.cc" >
***************
*** 28,32 ****
    </Doc7>
    <Doc8 NumberOfViews="1" URL="file:///home/silver/Terminal_G33k/game/physic_engine.h" >
!    <View0 line="4" Type="Source" />
    </Doc8>
   </DocsAndViews>
--- 28,32 ----
    </Doc7>
    <Doc8 NumberOfViews="1" URL="file:///home/silver/Terminal_G33k/game/physic_engine.h" >
!    <View0 line="14" Type="Source" />
    </Doc8>
   </DocsAndViews>

[Epfl-cvs] engine glrenderer.cc,1.1.1.1,1.2 material.cc,1.1.1.1,1.2 material_manager.cc,1.1.1.1,1.2 model_manager.cc,1.1.1.1,1.2

[julien r. <jul...@us...>]

Update of /cvsroot/epfl/engine
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31418

Modified Files:
	glrenderer.cc material.cc material_manager.cc model_manager.cc 
Log Message:
...

Index: material.cc
===================================================================
RCS file: /cvsroot/epfl/engine/material.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** material.cc	24 Nov 2005 20:47:07 -0000	1.1.1.1
--- material.cc	30 Nov 2005 16:45:54 -0000	1.2
***************
*** 68,73 ****
  void tgMaterial::Load ()
  {
! 	if (!pFileManager->Exist(sColorName.data())) //si le fichier image n'existe pas
  		return;
  		
  	tgImage* img = new tgImage(sColorName);
--- 68,77 ----
  void tgMaterial::Load ()
  {
! 	if(bLoaded)
! 		return;
! 	if (!pFileManager->Exist(sColorName.data())) {//si le fichier image n'existe pas
! 		out << "Pas de fichier image " << sColorName << endl;
  		return;
+ 	}
  		
  	tgImage* img = new tgImage(sColorName);

Index: material_manager.cc
===================================================================
RCS file: /cvsroot/epfl/engine/material_manager.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** material_manager.cc	24 Nov 2005 20:47:06 -0000	1.1.1.1
--- material_manager.cc	30 Nov 2005 16:45:54 -0000	1.2
***************
*** 13,25 ****
  void tgMaterialManager::Initialize ()
  {
! 	int file = pFileManager->Open("data/default.mtr", TGFILE_TEXT);
! 	tgMaterial* mat =  new tgMaterial(file);
  	matMap["notexture"] = mat;
  	mat->Load();
! 	pFileManager->Close(file);
! 
! 	AddFile("data/default.mtr");
! 	/*if(!matMap["notexture"])
! 		err << "ERROR OMFG" << endl;*/
  }
  
--- 13,26 ----
  void tgMaterialManager::Initialize ()
  {
! //	int file = pFileManager->Open("data/default.mtr", TGFILE_TEXT);
! //	tgMaterial* mat =  new tgMaterial(file);
! 	tgMaterial* mat = new tgMaterial("data/textures/notexture.tga");
  	matMap["notexture"] = mat;
  	mat->Load();
! 	if(!mat->Loaded()) //probleme lors du chargement du notexture
! 		out << "chargement de notexture :\t ERREUR" << endl;
! 	else
! 		out << "chargement de notexture :\t OK" << endl;
! //	pFileManager->Close(file);
  }
  
***************
*** 28,33 ****
  	materialMap_t::iterator i = matMap.find(name);
  	if (i != matMap.end()) { //le material est dans notre liste
! 		i->second->Load ();
! 		return i->second;
  	} else { //sinon on ajoute la texture direct
  		#define ALL_TEXTURES
--- 29,41 ----
  	materialMap_t::iterator i = matMap.find(name);
  	if (i != matMap.end()) { //le material est dans notre liste
! 		if(!i->second->Loaded()) {//il n'a pas encore ete charge
! 			i->second->Load();
! 			if (i->second->Loaded()) //le chargement s'est-il bien passe ?
! 				return i->second;
! 			else
! 				return matMap["notexture"];
! 		} else { //il est deja charge
! 			return i->second;
! 		}
  	} else { //sinon on ajoute la texture direct
  		#define ALL_TEXTURES
***************
*** 36,40 ****
  		mat->Load();
  		if (!mat->Loaded()) {
! 			out << "Material non trouve : " << "data/"+name+".tga" << endl;
  			return matMap["notexture"];
  		} else {
--- 44,49 ----
  		mat->Load();
  		if (!mat->Loaded()) {
! 			//out << "Material non trouve : " << "data/"+name+".tga" << endl;
! 			delete mat;
  			return matMap["notexture"];
  		} else {
***************
*** 43,46 ****
--- 52,56 ----
  		}
  		#else
+ 		out << "Material pas dans la liste -> notexture : " << name << endl;
  		return matMap["notexture"];
  		#endif
***************
*** 56,66 ****
  void tgMaterialManager::AddFile(const tgstring& filename)
  {
! 	int file = pFileManager->Open(filename.data(), TGFILE_TEXT);
  	
  	while(!pFileManager->EndOfFile(file)) {
  		tgMaterial* mat = new tgMaterial(file);
! 		matMap[mat->GetName()] = mat;
  	}
  	
! 	pFileManager->Close(file);
  }
--- 66,85 ----
  void tgMaterialManager::AddFile(const tgstring& filename)
  {
! 	//TODO: Reactiver l'ajout de material via des fichiers .mtr, mais il faudrait ecrire un vrai parseur
! /*	int file = pFileManager->Open(filename.data(), TGFILE_TEXT);
  	
  	while(!pFileManager->EndOfFile(file)) {
  		tgMaterial* mat = new tgMaterial(file);
! 		//On verifie si le material n'a pas deja ete charge.
! 		//S'il existe deja, on ne le remplace pas par le nouveau,ca invaliderait les anciens pointeurs
! 		materialMap_t::iterator i = matMap.find(mat->GetName()); 
! 		if(i != matMap.end()) {
! 			out << "Double chargement du material : " << mat->GetName() << endl;
! 			delete mat;
! 		} else {
! 			matMap[mat->GetName()] = mat;
! 		}
  	}
  	
! 	pFileManager->Close(file);*/
  }

Index: model_manager.cc
===================================================================
RCS file: /cvsroot/epfl/engine/model_manager.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** model_manager.cc	24 Nov 2005 20:47:12 -0000	1.1.1.1
--- model_manager.cc	30 Nov 2005 16:45:54 -0000	1.2
***************
*** 24,33 ****
  void tgModelManager::PreLoadModel (const tgstring& modelName, const tgstring& filename)
  {
! 	ModelsMap::iterator i = mModels.begin ();
! 	if ((i=mModels.find(modelName)) == mModels.end()) {
  		tgModelCache* m = new tgModelCache(filename.data());
! 		if (m->IsLoaded())
  			mModels[modelName] = m;
! 		else {
  			mModels[modelName] = mModels["nomodel"];
  			delete m;
--- 24,33 ----
  void tgModelManager::PreLoadModel (const tgstring& modelName, const tgstring& filename)
  {
! 	ModelsMap::iterator i = mModels.find(modelName);
! 	if (i == mModels.end()) { // non trouve
  		tgModelCache* m = new tgModelCache(filename.data());
! 		if (m->IsLoaded()) {
  			mModels[modelName] = m;
! 		} else {
  			mModels[modelName] = mModels["nomodel"];
  			delete m;
***************
*** 39,46 ****
  {
  	ModelsMap::iterator i = mModels.begin ();
! 	if((i=mModels.find(modelName)) == mModels.end())//mesh non chargé
  		return new tgModel(mModels["nomodel"]);
! 	else
  		return new tgModel(i->second);
  }
  
--- 39,49 ----
  {
  	ModelsMap::iterator i = mModels.begin ();
! 	if((i=mModels.find(modelName)) == mModels.end()) {//mesh non chargé
! 		out << "nomodel" << endl;
  		return new tgModel(mModels["nomodel"]);
! 	} else {
! 		out << "trouve" << endl;
  		return new tgModel(i->second);
+ 	}
  }
  

Index: glrenderer.cc
===================================================================
RCS file: /cvsroot/epfl/engine/glrenderer.cc,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** glrenderer.cc	24 Nov 2005 20:47:06 -0000	1.1.1.1
--- glrenderer.cc	30 Nov 2005 16:45:54 -0000	1.2
***************
*** 154,161 ****
  		
  		glBlendFunc(GL_SRC_ALPHA, GL_ONE);
  		tgglColor4fv(&FGcolor.r);
  		glCallLists( strlen(c), GL_BYTE, c );
! 	glPopMatrix();
! 	glDisable (GL_BLEND);
  }
  
--- 154,163 ----
  		
  		glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+ 
  		tgglColor4fv(&FGcolor.r);
  		glCallLists( strlen(c), GL_BYTE, c );
! 		tgglDisable(GL_TEXTURE_2D);
! 	tgglPopMatrix();
! 	tgglDisable (GL_BLEND);
  }
  
***************
*** 187,195 ****
  {
  	f->pMat = pMaterialManager->GetMaterial(sMatName);
! 	
  	float cx;
  	float cy;
  	f->dListId = glGenLists (256);
- 	f->pMat->BindColor();
  	
  	for (int i=0; i<256;i++)
--- 189,196 ----
  {
  	f->pMat = pMaterialManager->GetMaterial(sMatName);
! 
  	float cx;
  	float cy;
  	f->dListId = glGenLists (256);
  	
  	for (int i=0; i<256;i++)
***************
*** 415,420 ****
  		else if (l->pDirectory[i].type == Q3Defs::PatchFace)
  		{
! 			tgglPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
! 			tgglLineWidth(1.0f);
  			Q3Defs::BspPatch* p = &l->pPatches[l->pDirectory[i].typeIndex];
  			
--- 416,421 ----
  		else if (l->pDirectory[i].type == Q3Defs::PatchFace)
  		{
! 		//	tgglPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
! 		//	tgglLineWidth(1.0f);
  			Q3Defs::BspPatch* p = &l->pPatches[l->pDirectory[i].typeIndex];
  			
***************
*** 432,436 ****
  			tgglDrawElements(GL_TRIANGLES, p->iNumIndices, GL_UNSIGNED_INT, &p->pIndices[0]);
  			
! 			tgglActiveTexture(GL_TEXTURE0);
  			tgglDisable(GL_TEXTURE_2D);
  			tgglActiveTexture(GL_TEXTURE1);
--- 433,437 ----
  			tgglDrawElements(GL_TRIANGLES, p->iNumIndices, GL_UNSIGNED_INT, &p->pIndices[0]);
  			
! 		/*	tgglActiveTexture(GL_TEXTURE0);
  			tgglDisable(GL_TEXTURE_2D);
  			tgglActiveTexture(GL_TEXTURE1);
***************
*** 448,453 ****
  			tgglActiveTexture(GL_TEXTURE0);
  			tgglEnable(GL_TEXTURE_2D);
! 			tgglColor3f(1,1,1);
! 			tgglPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
  			//_RenderBVolume(p->pBBox);
  			numPatchRend++;
--- 449,454 ----
  			tgglActiveTexture(GL_TEXTURE0);
  			tgglEnable(GL_TEXTURE_2D);
! 			tgglColor3f(1,1,1);*/
! 		//	tgglPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
  			//_RenderBVolume(p->pBBox);
  			numPatchRend++;

[Epfl-cvs] tggame railgun.cc,NONE,1.1 railgun.h,NONE,1.1 aicontroller.cc,1.24,1.25 aicontroller.h,1.14,1.15 controller.cc,1.14,1.15 controller.h,1.13,1.14 game.cc,1.43,1.44 playercontroller.cc,1.25,1.26 playercontroller.h,1.14,1.15 rocketlauncher.cc,1.7,1.8 rocketlauncher.h,1.4,1.5 weapon.cc,1.6,1.7 weapon.h,1.5,1.6

[julien r. <jul...@us...>]

Update of /cvsroot/epfl/tggame
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26062

Modified Files:
	aicontroller.cc aicontroller.h controller.cc controller.h 
	game.cc playercontroller.cc playercontroller.h 
	rocketlauncher.cc rocketlauncher.h weapon.cc weapon.h 
Added Files:
	railgun.cc railgun.h 
Log Message:
railgun


--- NEW FILE: railgun.h ---
#ifndef _TGRAILGUN_H
#define _TGRAILGUN_H

#include "weapon.h"
#include <beamemitter.h>

class RailGun : public Weapon
{
 public:
	RailGun (Controller* owner, bool bFirstPerson);
	~RailGun ();

	void Fire (const Vector3& vPosition, const Vector3& vTarget, Pawn* p);
	void AltFire (const Vector3& vPosition, const Vector3& vTarget, Pawn* p);
	void Think (float eTime);




};

#endif

Index: rocketlauncher.cc
===================================================================
RCS file: /cvsroot/epfl/tggame/rocketlauncher.cc,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** rocketlauncher.cc	6 Dec 2004 19:13:06 -0000	1.7
--- rocketlauncher.cc	10 Dec 2004 19:57:26 -0000	1.8
***************
*** 2,9 ****
  #include "game.h"
  
! RocketLauncher::RocketLauncher() : Weapon ()
  {
  	fFireRate = 0.1f;
  	fCoolDown = fFireRate;
  }
  
--- 2,16 ----
  #include "game.h"
  
! RocketLauncher::RocketLauncher(Controller* owner, bool bFirstPerson) : Weapon (owner)
  {
  	fFireRate = 0.1f;
  	fCoolDown = fFireRate;
+ 	pModel = Engine::pMeshManager->LoadInstance("machinegun");
+ 	pModel->SetAnimation("idle");
+ 	pModel->bCamera = bFirstPerson;
+ 	pModel->SetRotation(Quaternion(90, Vector3(0,1,0)));
+ 	pModel->SetPosition(Vector3(5,0,-9));
+ 	Game::pSelf->GetSceneManager()->AddWorldObject(pModel);
+ 
  }
  

Index: controller.cc
===================================================================
RCS file: /cvsroot/epfl/tggame/controller.cc,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** controller.cc	30 Nov 2004 18:22:00 -0000	1.14
--- controller.cc	10 Dec 2004 19:57:26 -0000	1.15
***************
*** 1,3 ****
--- 1,10 ----
  #include "controller.h"
+ int Controller::FORWARD = 3;
+ int Controller::BACKWARD = 2;
+ int Controller::STRAFELEFT = 0;
+ int Controller::STRAFERIGHT = 1;
+ int Controller::JUMP = 4;
+ int Controller::CROUCH = 5;
+ 
  
  

Index: game.cc
===================================================================
RCS file: /cvsroot/epfl/tggame/game.cc,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** game.cc	5 Dec 2004 14:29:55 -0000	1.43
--- game.cc	10 Dec 2004 19:57:26 -0000	1.44
***************
*** 143,149 ****
  
  	p = new Pawn("guardian");
! 	p->SetAnimation("death");
  	this->AddPawn(p);
! 	p->SetPosition(pWorld->GetStartPosition(0));
  	p->SetBB(Vector3(-50, 0, -50), Vector3(50, 200, 50));
  
--- 143,150 ----
  
  	p = new Pawn("guardian");
! 	p->SetAnimation("buggy");
  	this->AddPawn(p);
! 	//p->SetPosition(pWorld->GetStartPosition(0));
! 	p->SetPosition(Vector3(0,0,0));
  	p->SetBB(Vector3(-50, 0, -50), Vector3(50, 200, 50));
  

Index: rocketlauncher.h
===================================================================
RCS file: /cvsroot/epfl/tggame/rocketlauncher.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** rocketlauncher.h	5 Dec 2004 14:29:55 -0000	1.4
--- rocketlauncher.h	10 Dec 2004 19:57:26 -0000	1.5
***************
*** 8,12 ****
  {
   public:
! 	RocketLauncher ();
  	~RocketLauncher ();
  	
--- 8,12 ----
  {
   public:
! 	RocketLauncher (Controller* owner, bool bFirstPerson);
  	~RocketLauncher ();
  	

Index: aicontroller.h
===================================================================
RCS file: /cvsroot/epfl/tggame/aicontroller.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** aicontroller.h	3 Dec 2004 19:49:55 -0000	1.14
--- aicontroller.h	10 Dec 2004 19:57:26 -0000	1.15
***************
*** 7,16 ****
  class AIController : public Controller
  {
- 	static int FORWARD;
- 	static int BACKWARD;
- 	static int STRAFELEFT;
- 	static int STRAFERIGHT;
- 	static int JUMP;
- 	static int CROUCH;
  
  	DebugSphere* pSphere;
--- 7,10 ----

Index: controller.h
===================================================================
RCS file: /cvsroot/epfl/tggame/controller.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** controller.h	30 Nov 2004 18:22:00 -0000	1.13
--- controller.h	10 Dec 2004 19:57:26 -0000	1.14
***************
*** 9,16 ****
--- 9,22 ----
  #include "actor.h"
  
+ 
  /**
  * Controller : une classe abstraite qui permet de controller un joueur
  * * Classe parente des robots et joueurs humains
  */
+ 
+ class RocketLauncher;
+ class RailGun;
+ class Weapon;
+ 
  class Controller : public Actor, public PhysicCallBack
  {
***************
*** 41,44 ****
--- 47,64 ----
  	Vector3 vViewOffset;
  	Vector3 vLastVel;
+ 
+ 
+ 	static int FORWARD;
+ 	static int BACKWARD;
+ 	static int STRAFELEFT;
+ 	static int STRAFERIGHT;
+ 	static int JUMP;
+ 	static int CROUCH;
+ 
+ 	RocketLauncher* pRocketLauncher;
+ 	Weapon* pWeapon;
+ 	RailGun* pRailGun;
+ 	bool bFire;
+ 	bool bAltFire;
  	//pour les mouvements
  	//int iForward;

Index: playercontroller.h
===================================================================
RCS file: /cvsroot/epfl/tggame/playercontroller.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** playercontroller.h	2 Dec 2004 00:18:54 -0000	1.14
--- playercontroller.h	10 Dec 2004 19:57:26 -0000	1.15
***************
*** 16,30 ****
  	};
  
- 	static int FORWARD;
- 	static int BACKWARD;
- 	static int STRAFELEFT;
- 	static int STRAFERIGHT;
- 	static int JUMP;
- 	static int CROUCH;
- 
- 	RocketLauncher* pRocketLauncher;
- 	Weapon* pWeapon;
- 	bool bFire;
- 	bool bAltFire;
  	DebugSphere* pSphere;
   public:
--- 16,19 ----

Index: playercontroller.cc
===================================================================
RCS file: /cvsroot/epfl/tggame/playercontroller.cc,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** playercontroller.cc	5 Dec 2004 14:29:55 -0000	1.25
--- playercontroller.cc	10 Dec 2004 19:57:26 -0000	1.26
***************
*** 2,14 ****
  #include <soundmanager.h>
  #include "game.h"
  
  using namespace tg;
  
- int PlayerController::FORWARD = 0;
- int PlayerController::BACKWARD = 1;
- int PlayerController::STRAFELEFT = 2;
- int PlayerController::STRAFERIGHT = 3;
- int PlayerController::JUMP = 4;
- int PlayerController::CROUCH = 5;
  
  PlayerController::PlayerController(Pawn* p) : Controller (p)
--- 2,10 ----
  #include <soundmanager.h>
  #include "game.h"
+ #include "railgun.h"
+ #include "rocketlauncher.h"
  
  using namespace tg;
  
  
  PlayerController::PlayerController(Pawn* p) : Controller (p)
***************
*** 18,22 ****
  	pSphere = new DebugSphere ();
  	Game::pSelf->GetSceneManager()->AddDebugSphere(pSphere);
! 	pRocketLauncher = new RocketLauncher();
  	pWeapon = pRocketLauncher;
  	bFire = false;
--- 14,20 ----
  	pSphere = new DebugSphere ();
  	Game::pSelf->GetSceneManager()->AddDebugSphere(pSphere);
! 	pRocketLauncher = new RocketLauncher(this, true);
! 	pRailGun = new RailGun(this, true);
! 	pRailGun->Hide();
  	pWeapon = pRocketLauncher;
  	bFire = false;
***************
*** 127,148 ****
  			case TGKEY_w:
  				//iForward += 1;
! 				bDir[FORWARD] = true;
  				SoundManager::pSoundManager->PlaySound("step");
  				break;
  			case TGKEY_s:
  				//iForward -= 1;
! 				bDir[BACKWARD] = true;
  				SoundManager::pSoundManager->PlaySound("step");
  				break;
  			case TGKEY_a:
  				//iStrafe -= 1;
! 				bDir[STRAFELEFT] = true;
  				SoundManager::pSoundManager->PlaySound("step");
  				break;
  			case TGKEY_d:
  				//iStrafe += 1;
! 				bDir[STRAFERIGHT] = true;
  				SoundManager::pSoundManager->PlaySound("step");
  				break;
  			case TGKEY_SPACE:
  				bDir[JUMP] = true;
--- 125,159 ----
  			case TGKEY_w:
  				//iForward += 1;
! 				bDir[STRAFELEFT] = true;
  				SoundManager::pSoundManager->PlaySound("step");
  				break;
  			case TGKEY_s:
  				//iForward -= 1;
! 				bDir[STRAFERIGHT] = true;
  				SoundManager::pSoundManager->PlaySound("step");
  				break;
  			case TGKEY_a:
  				//iStrafe -= 1;
! 				bDir[BACKWARD] = true;
  				SoundManager::pSoundManager->PlaySound("step");
  				break;
  			case TGKEY_d:
  				//iStrafe += 1;
! 				bDir[FORWARD] = true;
  				SoundManager::pSoundManager->PlaySound("step");
  				break;
+ 			case TGKEY_v:
+ 				pWeapon->Hide ();
+ 				pRailGun->UnHide ();
+ 				pWeapon = pRailGun;
+ 				break;
+ 				
+ 			case TGKEY_r:
+ 				pWeapon->Hide ();
+ 				pRocketLauncher->UnHide ();
+ 				pWeapon = pRocketLauncher;
+ 				break;
+ 
+ 				
  			case TGKEY_SPACE:
  				bDir[JUMP] = true;
***************
*** 162,181 ****
  		{
  			case TGKEY_w:
! 				bDir[FORWARD] = false;
  				SoundManager::pSoundManager->StopSound("step");
  				break;
  			case TGKEY_s:
  				//iForward = 0;
! 				bDir[BACKWARD] = false;
  				SoundManager::pSoundManager->StopSound("step");
  				break;
  				
  			case TGKEY_a:
! 				bDir[STRAFELEFT] = false;
  				SoundManager::pSoundManager->StopSound("step");
  				break;
  			case TGKEY_d:
  				//iStrafe = 0;
! 				bDir[STRAFERIGHT] = false;
  				SoundManager::pSoundManager->StopSound("step");
  				break;
--- 173,192 ----
  		{
  			case TGKEY_w:
! 				bDir[STRAFELEFT] = false;
  				SoundManager::pSoundManager->StopSound("step");
  				break;
  			case TGKEY_s:
  				//iForward = 0;
! 				bDir[STRAFERIGHT] = false;
  				SoundManager::pSoundManager->StopSound("step");
  				break;
  				
  			case TGKEY_a:
! 				bDir[BACKWARD] = false;
  				SoundManager::pSoundManager->StopSound("step");
  				break;
  			case TGKEY_d:
  				//iStrafe = 0;
! 				bDir[FORWARD] = false;
  				SoundManager::pSoundManager->StopSound("step");
  				break;

--- NEW FILE: railgun.cc ---
#include "railgun.h"
#include "controller.h"
#include "game.h"

RailGun::RailGun(Controller* owner, bool bFirstPerson) : Weapon (owner)
{
	pModel = Engine::pMeshManager->LoadInstance("machinegun");
	pModel->SetAnimation("idle");
	pModel->bCamera = bFirstPerson;
	pModel->SetRotation(Quaternion(90, Vector3(0,1,0)));
	pModel->SetPosition(Vector3(5,0,-4));
	Game::pSelf->GetSceneManager()->AddWorldObject(pModel);
	
	fFireRate = 1.0f;
}

RailGun::~RailGun()  
{

}

void RailGun::Fire(const Vector3& vPosition, const Vector3& vTarget, Pawn* p) 
{
	if(fCoolDown > 0.0f)
		return;
	fCoolDown = fFireRate;

	CollisionResult col = Game::pSelf->Trace(vPosition+vTarget.Normalize()*20, vPosition+vTarget, pOwner->GetPawn());
	BeamEmitter* myBeam = new BeamEmitter(1,vPosition, col.EndPoint, Engine::pTextureManager->LoadTexture("data/textures/railgun/beam.jpg", TG_TEXTURE_2D), 1.0f);
	Game::pSelf->GetSceneManager()->AddTimedBeamEmitter(myBeam, 0.5f);
}

void RailGun::AltFire (const Vector3& vPosition, const Vector3& vTarget, Pawn* p)
{

}


Index: weapon.cc
===================================================================
RCS file: /cvsroot/epfl/tggame/weapon.cc,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** weapon.cc	30 Nov 2004 18:22:01 -0000	1.6
--- weapon.cc	10 Dec 2004 19:57:26 -0000	1.7
***************
*** 3,14 ****
  #include <soundmanager.h>
  
! Weapon::Weapon ()
  {
! 	pModel = Engine::pMeshManager->LoadInstance("machinegun");
! 	pModel->SetAnimation("idle");
! 	pModel->bCamera = true;
! 	pModel->SetRotation(Quaternion(90, Vector3(0,0,1)));
! 	pModel->SetPosition(Vector3(5,0,-5));
! 	Game::pSelf->GetSceneManager()->AddWorldObject(pModel);
  }
  
--- 3,9 ----
  #include <soundmanager.h>
  
! Weapon::Weapon (Controller* owner)
  {
! 	pOwner = owner;
  }
  
***************
*** 19,22 ****
--- 14,28 ----
  }
  
+ void Weapon::Hide ()
+ {
+ 	pModel->SetRender(false);
+ }
+ 
+ void Weapon::UnHide ()
+ {
+ 	pModel->SetRender(true);
+ }
+ 
+ 
  void Weapon::Think (float eTime)
  {

Index: weapon.h
===================================================================
RCS file: /cvsroot/epfl/tggame/weapon.h,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** weapon.h	30 Nov 2004 18:22:01 -0000	1.5
--- weapon.h	10 Dec 2004 19:57:26 -0000	1.6
***************
*** 13,17 ****
  {
   public:
! 	Weapon ();
  	virtual ~Weapon ();
  
--- 13,17 ----
  {
   public:
! 	Weapon (Controller* owner);
  	virtual ~Weapon ();
  
***************
*** 19,22 ****
--- 19,25 ----
  	virtual void AltFire (const Vector3& vPosition, const Vector3& vTarget, Pawn* p) = 0;
  	void Think (float eTime);
+ 
+ 	void Hide ();
+ 	void UnHide ();
  	 	 
  	void Animation(std::string name);
***************
*** 32,35 ****
--- 35,41 ----
  	 float fCoolDown;
  	 float fFireRate;
+ 
+ 	 Controller* pOwner;
+ 
  };
  

Index: aicontroller.cc
===================================================================
RCS file: /cvsroot/epfl/tggame/aicontroller.cc,v
retrieving revision 1.24
retrieving revision 1.25
diff -C2 -d -r1.24 -r1.25
*** aicontroller.cc	8 Dec 2004 14:01:58 -0000	1.24
--- aicontroller.cc	10 Dec 2004 19:57:25 -0000	1.25
***************
*** 20,29 ****
  int iYOffset=0;
  
- int AIController::FORWARD = 3;
- int AIController::BACKWARD = 2;
- int AIController::STRAFELEFT = 0;
- int AIController::STRAFERIGHT = 1;
- int AIController::JUMP = 4;
- int AIController::CROUCH = 5;
  
  AIController::AIController(Pawn* p) : Controller(p)
--- 20,23 ----

[Epfl-cvs] tgengine-0.1 beamemitter.cc,NONE,1.1 beamemitter.h,NONE,1.1

[julien r. <jul...@us...>]

Update of /cvsroot/epfl/tgengine-0.1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv26057

Added Files:
	beamemitter.cc beamemitter.h 
Log Message:
beamemitter


--- NEW FILE: beamemitter.cc ---
#include "beamemitter.h"

namespace tg
{

BeamEmitter::BeamEmitter (int numParticles, const Vector3& vOrig, const Vector3& end, Texture* t, float s) : SceneNode (vOrig)
{
	_TG_INIT_DLINKEDNODE(NULL, NULL)
	iNumParticles = numParticles;
	vEnd = end;

	pTex = t;
	Initialize ();
}

BeamEmitter::~BeamEmitter () 
{

}

void BeamEmitter::PreRender(float eTime)
{

}

void BeamEmitter::Initialize ()
{
	fEndPointWidth = 1.0f;
	fBeginPointWidth = 1.0f;
	pBeams = new Beam[iNumParticles];
	for (int i=0; i<iNumParticles; i++)
	{
		pBeams[i].bActive = true;
		pBeams[i].vBegin = vPosition;
		pBeams[i].vEnd = vEnd;
	}
}
	
}

--- NEW FILE: beamemitter.h ---
#ifndef _TGBEAMEMITTER_H
#define _TGBEAMEMITTER_H

#include "scenenode.h"
#include "dlinkednode.h"
#include "texture.h"

namespace tg
{

struct Beam
{
	bool bActive;
	Vector3 vBegin;
	Vector3 vEnd;
};

class BeamEmitter: public SceneNode
{
_TG_DLINKEDNODE(BeamEmitter)
 public:
	BeamEmitter (int numParticles, const Vector3& vOrig, const Vector3& end, Texture* t, float s);
	~BeamEmitter ();

	void SetEndPointWidth (float f) { fEndPointWidth = f; }
	void SetBeginPointWidth (float f) { fBeginPointWidth = f; }

	float GetEndPointWidth () { return fEndPointWidth; }
	float GetBeginPointWidth () { return fBeginPointWidth; }

	void PreRender (float );
	void Initialize ();

	int GetNumParticles () { return iNumParticles; }
	Beam* GetBeamsTab () { return pBeams; }
	Texture* GetTexture () { return pTex; }
 protected:
	int iNumParticles;
	float fEndPointWidth;
	float fBeginPointWidth;
	float fLife;
	float fFade;
	Vector3 vEnd;
	Texture* pTex;

	Beam* pBeams;

};

}

#endif

[Epfl-cvs] tgengine-0.1 camera.cc,1.11,1.12 glrenderer.cc,1.25,1.26 glrenderer.h,1.6,1.7 scenemanager.cc,1.21,1.22 scenemanager.h,1.10,1.11 util.cc,1.4,1.5 util.h,1.4,1.5

[julien r. <jul...@us...>]

Update of /cvsroot/epfl/tgengine-0.1
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv25614

Modified Files:
	camera.cc glrenderer.cc glrenderer.h scenemanager.cc 
	scenemanager.h util.cc util.h 
Log Message:
railgun & bugfixes


Index: camera.cc
===================================================================
RCS file: /cvsroot/epfl/tgengine-0.1/camera.cc,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** camera.cc	17 Nov 2004 23:12:37 -0000	1.11
--- camera.cc	10 Dec 2004 19:55:36 -0000	1.12
***************
*** 150,153 ****
--- 150,154 ----
  	qconj.GetMatrix(matrix);
  	glMultMatrixf (matrix);
+ //	glRotatef(-90,0,1,0);
  	//glRotatef (-a, axis.x, axis.y, axis.z);
  	glTranslatef(-vViewOffset.x, -vViewOffset.y, -vViewOffset.z);

Index: scenemanager.cc
===================================================================
RCS file: /cvsroot/epfl/tgengine-0.1/scenemanager.cc,v
retrieving revision 1.21
retrieving revision 1.22
diff -C2 -d -r1.21 -r1.22
*** scenemanager.cc	30 Nov 2004 18:21:56 -0000	1.21
--- scenemanager.cc	10 Dec 2004 19:55:36 -0000	1.22
***************
*** 17,20 ****
--- 17,22 ----
  	pFirstPointLight = NULL;
  	pCurrentPointLight = NULL;
+ 	pFirstBeam = NULL;
+ 	pCurrentBeam = NULL;
  	
  	pDecalManager = new DecalManager ();
***************
*** 50,53 ****
--- 52,68 ----
  }
  
+ void SceneManager::_ProcessTimedObject (BeamEmitter* b, float t)
+ {
+ 	if (b->fTime == -1) //l'objet ne tient pas compte du temps
+ 		return;
+ 	
+ 	b->fTime -= t;
+ 	if (b->fTime <= 0) //l'objet est arrive en fin de vie
+ 	{
+ 		RemoveBeamEmitter(b);
+ 		delete b;
+ 	}
+ }
+ 
  void SceneManager::Render ()
  {
***************
*** 66,69 ****
--- 81,85 ----
  
  	Mesh* m = pFirstObject;
+ 	Mesh* mnext;
  	if (m != NULL)
  	{
***************
*** 85,90 ****
  				#endif
  			}
  			_ProcessTimedObject(m, frameInterval);
! 		} while((m=m->GetNext()) != NULL);
  	}
  	
--- 101,108 ----
  				#endif
  			}
+ 			//on prend un pointeur sur next maintenant au cas ou l'objet serait supprimé par _ProcessTimedObject
+ 			mnext = m->GetNext();
  			_ProcessTimedObject(m, frameInterval);
! 		} while((m=mnext) != NULL);
  	}
  	
***************
*** 144,148 ****
--- 162,168 ----
  	Engine::pRenderer->End2D();
  	#endif
+ 	
  	ParticleEmitter* p = pFirstEmitter;
+ 	ParticleEmitter* pnext;
  	if (p != NULL)
  	{
***************
*** 151,161 ****
  			p->PreRender(frameInterval);
  			p->iLeaf = pLevel->FindLeaf(p->GetPosition());
! 			if (pLevel->IsVisible(p->iLeaf))
  			{
  				Engine::pRenderer->RenderParticles(p);
  			}
  			_ProcessTimedObject(p, frameInterval);
! 		} while((p=p->GetNext()) != NULL);
  	}
  	#ifdef DEBUG
  	Engine::pRenderer->Render ();
--- 171,204 ----
  			p->PreRender(frameInterval);
  			p->iLeaf = pLevel->FindLeaf(p->GetPosition());
! 			if (p->GetRender() && pLevel->IsVisible(p->iLeaf))
  			{
  				Engine::pRenderer->RenderParticles(p);
  			}
+ 			//on prend un pointeur sur next maintenant au cas ou l'objet serait supprimé par _ProcessTimedObject
+ 			pnext = p->GetNext();
  			_ProcessTimedObject(p, frameInterval);
! 		} while((p=pnext) != NULL);
  	}
+ 
+ 	BeamEmitter* b = pFirstBeam;
+ 	BeamEmitter* bnext;
+ 	if (b != NULL)
+ 	{
+ 		do
+ 		{
+ 			b->PreRender(frameInterval);
+ 			b->iLeaf = pLevel->FindLeaf(b->GetPosition());
+ 			if (pLevel->IsVisible(b->iLeaf))
+ 			{
+ 				Engine::pRenderer->RenderBeams(b);
+ 			}
+ 			//on prend un pointeur sur next maintenant au cas ou l'objet serait supprimé par _ProcessTimedObject
+ 			bnext = b->GetNext();
+ 			_ProcessTimedObject(b, frameInterval);
+ 		} while((b=bnext) != NULL);
+ 	}
+ 
+ 
+ 
  	#ifdef DEBUG
  	Engine::pRenderer->Render ();
***************
*** 255,258 ****
--- 298,313 ----
  }
  
+ void SceneManager::AddBeamEmitter(BeamEmitter* b)
+ {
+ 	_TG_ADD_DLINKEDNODE(b, pCurrentBeam, pFirstBeam);
+ }
+ 
+ void SceneManager::RemoveBeamEmitter(BeamEmitter* b)
+ {
+ 	_TG_REMOVE_DLINKEDNODE(b, pCurrentBeam, pFirstBeam);
+ }
+ 
+ 
+ 
  void SceneManager::SetCamera (Camera* pcam)
  { 
***************
*** 274,277 ****
--- 329,340 ----
  }
  
+ void SceneManager::AddTimedBeamEmitter(BeamEmitter* b, float time)
+ {
+ 	b->fTime = time;
+ 	AddBeamEmitter(b);
+ }
+ 
+ 
+ 
  
  } //END tg

Index: util.h
===================================================================
RCS file: /cvsroot/epfl/tgengine-0.1/util.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** util.h	17 Nov 2004 23:12:39 -0000	1.4
--- util.h	10 Dec 2004 19:55:36 -0000	1.5
***************
*** 16,19 ****
--- 16,22 ----
  {
   public:
+ 	static void ProjectPointOnPlane (Vector3& dst, Vector3 p, Vector3 normal);
+ 	static void PerpendicularVector (Vector3& dst, Vector3 src);
+ 
  	static float Random ();
  	static float InvSqrt(float x);

Index: glrenderer.cc
===================================================================
RCS file: /cvsroot/epfl/tgengine-0.1/glrenderer.cc,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** glrenderer.cc	30 Nov 2004 18:21:55 -0000	1.25
--- glrenderer.cc	10 Dec 2004 19:55:36 -0000	1.26
***************
*** 565,568 ****
--- 565,633 ----
  }
  
+ #define BW 2
+ void GLRenderer::RenderBeams (BeamEmitter* b)
+ {
+ 	Beam* pBeams = b->GetBeamsTab();
+ 	int num = b->GetNumParticles();
+ 
+ 	Vector3 axis[3];
+ 
+ 	//glLineWidth(5.0f);
+ 	glEnable(GL_BLEND);
+ 	glBlendFunc( GL_SRC_ALPHA, GL_ONE );
+ 	
+ 	(*_glActiveTextureARB)(GL_TEXTURE0);
+ 	glEnable (GL_TEXTURE_2D);
+ 	glBindTexture(GL_TEXTURE_2D, b->GetTexture()->iId);
+ 
+ 	glDisable(GL_CULL_FACE);
+ 	float mat[16];
+ 	
+ 	
+ 	for(int i=0; i<num; i++)
+ 	{
+ 		axis[0] = (pBeams[i].vEnd - pBeams[i].vBegin).Normalize();
+ 		Util::PerpendicularVector(axis[1], axis[0]);
+ 		axis[2] = axis[0]%axis[1];
+ 		
+ 		mat[0] = axis[2].x;
+ 		mat[1] = axis[2].y;
+ 		mat[2] = axis[2].z;
+ 		mat[3] = 0;
+ 		mat[4] = axis[1].x;
+ 		mat[5] = axis[1].y;
+ 		mat[6] = axis[1].z;
+ 		mat[7] = 0;
+ 		mat[8] = axis[0].x;
+ 		mat[9] = axis[0].y;
+ 		mat[10] = axis[0].z;
+ 		mat[11] = 0;
+ 		mat[12] = 0;
+ 		mat[13] = 0;
+ 		mat[14] = 0;
+ 		mat[15] = 1;
+ 		
+ 		float dist = (pBeams[i].vEnd-pBeams[i].vBegin).Magnitude();
+ 		glPushMatrix();
+ 			glTranslatef(pBeams[i].vBegin.x, pBeams[i].vBegin.y, pBeams[i].vBegin.z);
+ 			glMultMatrixf(mat);
+ 			glBegin(GL_QUADS);
+ 				glTexCoord2f(0,0); glVertex3f(-BW,0,0);
+ 				glTexCoord2f(0,1); glVertex3f(-BW,0,dist);
+ 				glTexCoord2f(1,1); glVertex3f(BW,0,dist);
+ 				glTexCoord2f(1,0); glVertex3f(BW,0,0);
+ 				
+ 				glTexCoord2f(0,0); glVertex3f(0,-BW,0);
+ 				glTexCoord2f(0,1); glVertex3f(0,-BW,dist);
+ 				glTexCoord2f(1,1); glVertex3f(0,BW,dist);
+ 				glTexCoord2f(1,0); glVertex3f(0,BW,0);
+ 			glEnd();
+ 		glPopMatrix();
+ 	}
+ 
+ 	glEnable(GL_CULL_FACE);
+ 	glDisable(GL_BLEND);
+ }
+ 
  
  void GLRenderer::RenderParticles (ParticleEmitter* p)

Index: glrenderer.h
===================================================================
RCS file: /cvsroot/epfl/tgengine-0.1/glrenderer.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** glrenderer.h	17 Nov 2004 23:12:37 -0000	1.6
--- glrenderer.h	10 Dec 2004 19:55:36 -0000	1.7
***************
*** 12,15 ****
--- 12,16 ----
  #include "tgglext.h"
  #include "decal.h"
+ #include "beamemitter.h"
  
  namespace tg
***************
*** 59,62 ****
--- 60,64 ----
  	virtual void RenderMeshShadow (Mesh*);
  	virtual void RenderDecal (Decal*);
+ 	virtual void RenderBeams (BeamEmitter*);
  	virtual void EndShadow ();
  	virtual void RenderParticles (ParticleEmitter*);

Index: util.cc
===================================================================
RCS file: /cvsroot/epfl/tgengine-0.1/util.cc,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** util.cc	17 Nov 2004 23:12:39 -0000	1.4
--- util.cc	10 Dec 2004 19:55:36 -0000	1.5
***************
*** 5,8 ****
--- 5,38 ----
  {
  
+ void Util::ProjectPointOnPlane (Vector3& dst, Vector3 p, Vector3 normal)
+ {
+ 	float   d, invDenom;
+ 	invDenom = 1.0 / (normal*normal);
+ 	d = (normal*p) * invDenom;
+ 	dst = p-d*(normal*invDenom);
+ }
+ 
+ void Util::PerpendicularVector (Vector3& dst, Vector3 src)
+ {
+ 	int i, pos = 0;
+ 	float val, min = 1.0;
+ 	Vector3 tmp;
+ 	// Find the smallest magnitude axially aligned vector
+ 	for (i = 0; i < 3; i++){
+ 		val = fabs(src[i]);
+ 		if (val < min){
+ 			min = val;
+ 			pos = i;
+ 		}
+ 	}
+ 	tmp[pos] = 1.0;
+ 	// Project the point onto the plane defined by src
+ 	ProjectPointOnPlane(dst, tmp, src);
+ 	// Normalize the result
+ 	dst = dst.Normalize();
+ }
+ 
+ 
+ 
  float Util::Random ()
  {

Index: scenemanager.h
===================================================================
RCS file: /cvsroot/epfl/tgengine-0.1/scenemanager.h,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** scenemanager.h	30 Nov 2004 18:21:56 -0000	1.10
--- scenemanager.h	10 Dec 2004 19:55:36 -0000	1.11
***************
*** 13,16 ****
--- 13,17 ----
  #include "pointlight.h"
  #include "decalmanager.h"
+ #include "beamemitter.h"
  
  namespace tg
***************
*** 59,62 ****
--- 60,67 ----
  	void AddTimedParticleEmitter (ParticleEmitter* p,float time);
  	
+ 	void AddBeamEmitter (BeamEmitter* b);
+ 	void RemoveBeamEmitter(BeamEmitter* b);
+ 	void AddTimedBeamEmitter (BeamEmitter* b, float time);
+ 
  	void SetLevel(Q3Bsp* p) { pLevel = p; if(pPhysicEngine) pPhysicEngine->SetLevel(p); pDecalManager->SetLevel(p);}
  	
***************
*** 68,71 ****
--- 73,77 ----
  	void _ProcessTimedObject (Mesh* s, float t);
  	void _ProcessTimedObject (ParticleEmitter* s, float t);
+ 	void _ProcessTimedObject (BeamEmitter* b, float t);
  	void _RenderLightedMesh (Mesh* m);
  	void _RenderLight (PointLight*);
***************
*** 84,87 ****
--- 90,97 ----
  	PointLight* pFirstPointLight;
  	PointLight* pCurrentPointLight;
+ 
+ 	BeamEmitter* pFirstBeam;
+ 	BeamEmitter* pCurrentBeam;
+ 
  	
  	PhysicEngine* pPhysicEngine;

[Epfl-cvs] tggame aicontroller.cc,1.23,1.24

[Yohann C. <pl...@us...>]

Update of /cvsroot/epfl/tggame
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23138

Modified Files:
	aicontroller.cc 
Log Message:
oups.... ca va mieux sans les messages de Debug...


Index: aicontroller.cc
===================================================================
RCS file: /cvsroot/epfl/tggame/aicontroller.cc,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** aicontroller.cc	8 Dec 2004 13:19:40 -0000	1.23
--- aicontroller.cc	8 Dec 2004 14:01:58 -0000	1.24
***************
*** 1,3 ****
! #define AI_DEBUG 4
  
  #include "aicontroller.h"
--- 1,3 ----
! #define AI_DEBUG 0
  
  #include "aicontroller.h"
***************
*** 12,16 ****
  bool initialised = false;
  int rot=0;
! int iAngle = 5;
  
  int iState=0;
--- 12,16 ----
  bool initialised = false;
  int rot=0;
! short int iAngle = 5;
  
  int iState=0;
***************
*** 73,77 ****
  
  	//iLife -= 5;
! 	pPawn->SetRotation(Quaternion(Util::Random()*360, Vector3::UNIT_Y));
  	#if AI_DEBUG >=3
  		cout << "OUCH" << std::endl;
--- 73,77 ----
  
  	//iLife -= 5;
! 	pPawn->SetRotation(Quaternion(rot=Util::Random()*360, Vector3::UNIT_Y));
  	#if AI_DEBUG >=3
  		cout << "OUCH" << std::endl;
***************
*** 140,145 ****
  
  		pPawn->SetRotation(Quaternion(rot+=iAngle, Vector3::UNIT_Y));
! 		#if AI_DEBUG >= 5
! 			cout << "Changement de direction... " << iAngle << std::endl;
  		#endif
  	} else {
--- 140,145 ----
  
  		pPawn->SetRotation(Quaternion(rot+=iAngle, Vector3::UNIT_Y));
! 		#if AI_DEBUG >= 4
! 			cout << "cd " << iAngle << std::endl;
  		#endif
  	} else {
***************
*** 153,157 ****
  		// sinon, on va augmenter la vitesse (pas de vitesse limite dans le moteur pour le moment
  		// a priori, donc je limite moi-meme....
! 		if(fMoveSpeed < 448) {
  			#if AI_DEBUG >= 5
  				cout << "augmentation de la vitesse" << std::endl;
--- 153,157 ----
  		// sinon, on va augmenter la vitesse (pas de vitesse limite dans le moteur pour le moment
  		// a priori, donc je limite moi-meme....
! 		if(fMoveSpeed < 446) {
  			#if AI_DEBUG >= 5
  				cout << "augmentation de la vitesse" << std::endl;
***************
*** 161,168 ****
  	}
  
- 	#if AI_DEBUG >= 5
- 		cout << c.EndPoint << " / " << (2*vVelocity+pPawn->GetPosition())<< std::endl;
- 	#endif
- 
  	// ca, ca sert a rien pour le moment, mais c'est sensé servir plus tard
  	// (biensur, je retournerai autre chose..)
--- 161,164 ----

[Epfl-cvs] tgtools case,NONE,1.1

[Yohann C. <pl...@us...>]

Update of /cvsroot/epfl/tgtools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18218

Added Files:
	case 
Log Message:
convertit tous les noms de fichiers contenus dans le répertoire donné en premier argument en minuscule.


--- NEW FILE: case ---
#!/bin/sh

cd $1
for i in *
do
	[ -w $i ] && {
		a=`echo $i |tr [A-Z] [a-z]`
		mv $i $a
		echo $i ' --> ' $a
	} || {
		echo $i ' est un repertoire'
	}
done

[Epfl-cvs] tggame Makefile.Linux,1.8,1.9 aicontroller.cc,1.22,1.23

[Yohann C. <pl...@us...>]

Update of /cvsroot/epfl/tggame
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14041

Modified Files:
	Makefile.Linux aicontroller.cc 
Log Message:
Cf wiki


Index: Makefile.Linux
===================================================================
RCS file: /cvsroot/epfl/tggame/Makefile.Linux,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile.Linux	1 Dec 2004 18:56:48 -0000	1.8
--- Makefile.Linux	8 Dec 2004 13:19:40 -0000	1.9
***************
*** 1,4 ****
  # TG Makefile
! CFLAGS = -O3 -DTGLINUX
  INCLUDEPATH = -I/usr/include/SDL -I./ -I../tgengine-0.1
  LINKPATH = -L../tgengine-0.1/out
--- 1,4 ----
  # TG Makefile
! CFLAGS = -O3 -DTGLINUX -DDEBUG -pg
  INCLUDEPATH = -I/usr/include/SDL -I./ -I../tgengine-0.1
  LINKPATH = -L../tgengine-0.1/out
***************
*** 13,17 ****
  
  all: $(OBJS)
! 	g++ -o tg $(INCLUDEPATH) $(LINKPATH) $(LIBS) $(OBJS)
  
  clean:
--- 13,17 ----
  
  all: $(OBJS)
! 	g++ -pg -o tg $(INCLUDEPATH) $(LINKPATH) $(LIBS) $(OBJS)
  
  clean:

Index: aicontroller.cc
===================================================================
RCS file: /cvsroot/epfl/tggame/aicontroller.cc,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** aicontroller.cc	6 Dec 2004 19:13:06 -0000	1.22
--- aicontroller.cc	8 Dec 2004 13:19:40 -0000	1.23
***************
*** 1,3 ****
! #define AI_DEBUG 0
  
  #include "aicontroller.h"
--- 1,3 ----
! #define AI_DEBUG 4
  
  #include "aicontroller.h"
***************
*** 12,15 ****
--- 12,22 ----
  bool initialised = false;
  int rot=0;
+ int iAngle = 5;
+ 
+ int iState=0;
+ enum {WALK, TURN};
+ 
+ int iZOffset=0;
+ int iYOffset=0;
  
  int AIController::FORWARD = 3;
***************
*** 59,62 ****
--- 66,70 ----
  }
  
+ 
  void AIController::HitWall(const Vector3& vPoint, const Vector3& vNormal, PhysicNode* who)
  {
***************
*** 98,102 ****
  {
  	Vector3 vTarget = pPawn->GetRotation().GetXAxis();;
! 	Vector3 vPosition = pPawn->GetPosition()+Vector3(0, 0, 4);
  	float fMoveSpeed = pPawn->GetMoveSpeed();
  
--- 106,110 ----
  {
  	Vector3 vTarget = pPawn->GetRotation().GetXAxis();;
! 	Vector3 vPosition = pPawn->GetPosition()+Vector3(0, iYOffset, 0);
  	float fMoveSpeed = pPawn->GetMoveSpeed();
  
***************
*** 112,127 ****
  		}
  		// puis on tourne... (a revoir... en fonction de l'angle de c.Normal et le vecteur vitesse)
! 		pPawn->SetRotation(Quaternion(rot+=5, Vector3::UNIT_Y));
! 		#if AI_DEBUG >= 4
! 			cout << "Changement de direction... "<< c.Fraction << std::endl;
  		#endif
  	} else {
  		// sinon, on va augmenter la vitesse (pas de vitesse limite dans le moteur pour le moment
  		// a priori, donc je limite moi-meme....
  		if(fMoveSpeed < 448) {
! 			#if AI_DEBUG >= 4
  				cout << "augmentation de la vitesse" << std::endl;
  			#endif
! 			pPawn->SetMoveSpeed(fMoveSpeed+2);
  		}
  	}
--- 120,161 ----
  		}
  		// puis on tourne... (a revoir... en fonction de l'angle de c.Normal et le vecteur vitesse)
! 		if(iState != TURN) {
! #if AI_DEBUG >= 4
! 	cout << "Start turn" << std::endl;
! #endif
! 			iState = TURN;
! 			if((c.Normal % pPawn->GetVelocity().Normalize()).y < 0) {
! //				iAngle=abs(iAngle);
! 				iAngle=5;
! #if AI_DEBUG >= 5
! 	cout << "      iAngle positif..." << std::endl;
! #endif
! 			} else {
! #if AI_DEBUG >= 5
! 	cout << "      iAngle negatif..." << std::endl;
! #endif
! 				iAngle=-5;
! 			}
! 		}
! 
! 		pPawn->SetRotation(Quaternion(rot+=iAngle, Vector3::UNIT_Y));
! 		#if AI_DEBUG >= 5
! 			cout << "Changement de direction... " << iAngle << std::endl;
  		#endif
  	} else {
+ 		if(iState == TURN) {
+ #if AI_DEBUG >= 4
+ 	cout << "End    turn" << std::endl;
+ #endif
+ 			iState = WALK;
+ 		}
+ 		iYOffset=(iYOffset + 5)%80;
  		// sinon, on va augmenter la vitesse (pas de vitesse limite dans le moteur pour le moment
  		// a priori, donc je limite moi-meme....
  		if(fMoveSpeed < 448) {
! 			#if AI_DEBUG >= 5
  				cout << "augmentation de la vitesse" << std::endl;
  			#endif
! 			pPawn->SetMoveSpeed(fMoveSpeed+5);
  		}
  	}

[Epfl-cvs] tgtools Convert.java,1.5,1.6

[Yohann C. <pl...@us...>]

Update of /cvsroot/epfl/tgtools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6723

Modified Files:
	Convert.java 
Log Message:
bon, comme ce script ne servira pas que pour la map du co, le second argument est le répertoire des textures :-)
ex: java Convert epfl_co.vmx epfl_co > epfl_co.map


Index: Convert.java
===================================================================
RCS file: /cvsroot/epfl/tgtools/Convert.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** Convert.java	8 Dec 2004 12:38:15 -0000	1.5
--- Convert.java	8 Dec 2004 12:47:35 -0000	1.6
***************
*** 4,10 ****
  class Convert
  {
  	public static void main(String [] args)
  	{
! 		Convert c = new Convert(args[0]);
  	}
  
--- 4,14 ----
  class Convert
  {
+ 	
  	public static void main(String [] args)
  	{
! 		String rep = "";
! 		if(args.length >1 )
! 			rep = args[1].replaceAll("\\/", "")+"/";
! 		Convert c = new Convert(args[0], rep);
  	}
  
***************
*** 14,19 ****
  	// 2 = on est dans un solid
  	// 3 = on est dans un side
! 	Convert(String file)
  	{
  //		String fichier = LireFichier(file);
  		LireFichier(file);
--- 18,25 ----
  	// 2 = on est dans un solid
  	// 3 = on est dans un side
! 	private String rep;
! 	Convert(String file, String rep)
  	{
+ 		this.rep = rep;
  //		String fichier = LireFichier(file);
  		LireFichier(file);
***************
*** 145,149 ****
  		s = s.replaceAll("side.?\n\\{", "");
  		s = s.replaceAll("\"plane\" \"", "");
! 		s = s.replaceAll("\"\n\"material\" \".*\\/", " epfl_co/");
  		s = s.replaceAll("\"\n\"uaxis\" \"\\[", " ");
  		s = s.replaceAll("\\] -?[0-9]*\\.?[0-9]*\"\n\"vaxis\" \"\\[", " ");
--- 151,155 ----
  		s = s.replaceAll("side.?\n\\{", "");
  		s = s.replaceAll("\"plane\" \"", "");
! 		s = s.replaceAll("\"\n\"material\" \".*\\/", " "+rep);
  		s = s.replaceAll("\"\n\"uaxis\" \"\\[", " ");
  		s = s.replaceAll("\\] -?[0-9]*\\.?[0-9]*\"\n\"vaxis\" \"\\[", " ");

[Epfl-cvs] tgtools Convert.java,1.4,1.5

[Yohann C. <pl...@us...>]

Update of /cvsroot/epfl/tgtools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4673

Modified Files:
	Convert.java 
Log Message:
Re. en fait, toutes les textures doivent être places dans le repertoire epfl_co/


Index: Convert.java
===================================================================
RCS file: /cvsroot/epfl/tgtools/Convert.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** Convert.java	8 Dec 2004 12:36:23 -0000	1.4
--- Convert.java	8 Dec 2004 12:38:15 -0000	1.5
***************
*** 145,149 ****
  		s = s.replaceAll("side.?\n\\{", "");
  		s = s.replaceAll("\"plane\" \"", "");
! 		s = s.replaceAll("\"\n\"material\" \".*\\/", " ");
  		s = s.replaceAll("\"\n\"uaxis\" \"\\[", " ");
  		s = s.replaceAll("\\] -?[0-9]*\\.?[0-9]*\"\n\"vaxis\" \"\\[", " ");
--- 145,149 ----
  		s = s.replaceAll("side.?\n\\{", "");
  		s = s.replaceAll("\"plane\" \"", "");
! 		s = s.replaceAll("\"\n\"material\" \".*\\/", " epfl_co/");
  		s = s.replaceAll("\"\n\"uaxis\" \"\\[", " ");
  		s = s.replaceAll("\\] -?[0-9]*\\.?[0-9]*\"\n\"vaxis\" \"\\[", " ");

[Epfl-cvs] tgtools Convert.java,1.3,1.4

[Yohann C. <pl...@us...>]

Update of /cvsroot/epfl/tgtools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4218

Modified Files:
	Convert.java 
Log Message:
convertit tout en LowerCasse, et enlève les repertoires pour les textures


Index: Convert.java
===================================================================
RCS file: /cvsroot/epfl/tgtools/Convert.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Convert.java	22 Nov 2004 13:52:12 -0000	1.3
--- Convert.java	8 Dec 2004 12:36:23 -0000	1.4
***************
*** 145,149 ****
  		s = s.replaceAll("side.?\n\\{", "");
  		s = s.replaceAll("\"plane\" \"", "");
! 		s = s.replaceAll("\"\n\"material\" \"", " ");
  		s = s.replaceAll("\"\n\"uaxis\" \"\\[", " ");
  		s = s.replaceAll("\\] -?[0-9]*\\.?[0-9]*\"\n\"vaxis\" \"\\[", " ");
--- 145,149 ----
  		s = s.replaceAll("side.?\n\\{", "");
  		s = s.replaceAll("\"plane\" \"", "");
! 		s = s.replaceAll("\"\n\"material\" \".*\\/", " ");
  		s = s.replaceAll("\"\n\"uaxis\" \"\\[", " ");
  		s = s.replaceAll("\\] -?[0-9]*\\.?[0-9]*\"\n\"vaxis\" \"\\[", " ");
***************
*** 155,158 ****
--- 155,159 ----
  //		s = s.replaceAll(" ", "_");
  		s = s.replaceAll("( -?\\d+\\.?\\d*){8}", " 0 0 0 0.500000 0.500000 0 0 0");
+ 		s = s.toLowerCase();
  		if(s.indexOf("vaxis") != -1
  				|| s.indexOf("uaxis") != -1