mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-30 03:09:49 +02:00
Code Issues Projects Releases Wiki Activity

- updates from notsogood to add more player colors and splash particles and memory cleanup to G3d Viewer (thanks notsogood!)

Browse Source
This commit is contained in:
Mark Vejvoda
2010-11-03 19:03:25 +00:00
parent 6b015964bb
commit ea27375b6f
4 changed files with 445 additions and 184 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
source/g3d_viewer/renderer.h
View File

@@ -1,24 +1,24 @@
#ifndef _SHADER_G3DVIEWER_RENDERER_H_
#define _SHADER_G3DVIEWER_RENDERER_H_
/*
/*
#include "model_renderer.h"
#include "texture_manager.h"
#include "model.h"
#include "texture.h"
*/
#include "model_renderer.h"
#include "texture_manager.h"
#include "model.h"
*/
#include "model_renderer.h"
#include "texture_manager.h"
#include "model.h"
#include "texture.h"
#include "particle_renderer.h"
#include "model_manager.h"
#include "graphics_interface.h"
//#include "model_manager.h"
//#include "graphics_factory_gl.h"
//#include "model_manager.h"
//#include "graphics_factory_gl.h"
using Shared::Graphics::ModelRenderer;
using Shared::Graphics::TextureManager;
@@ -66,8 +66,12 @@ public:
enum PlayerColor{
pcRed,
pcBlue,
pcGreen,
pcYellow,
pcGreen
pcWhite,
pcCyan,
pcOrange,
pcMagenta
};
private:
@@ -84,12 +88,16 @@ private:
Texture2D *customTextureRed;
Texture2D *customTextureBlue;
Texture2D *customTextureYellow;
Texture2D *customTextureGreen;
Texture2D *customTextureYellow;
Texture2D *customTextureWhite;
Texture2D *customTextureCyan;
Texture2D *customTextureOrange;
Texture2D *customTextureMagenta;
MeshCallbackTeamColor meshCallbackTeamColor;
Renderer();
void checkGlCaps();
Renderer();
void checkGlCaps();
void checkExtension(const string &extension, const string &msg);
public: