abian/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

This was SVN commit r3527.

Browse Source
This commit is contained in:
livingaftermidnight 2006-02-17 02:02:29 +00:00
parent d6f757185f
commit ce6249cf12
1 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source/graphics/ParticleEngine.cpp
View File

@ -8,8 +8,6 @@
#include "precompiled.h"
#include "ParticleEngine.h"
#include "ogl.h"
#include "Renderer.h"
CParticleEngine *CParticleEngine::m_pInstance = 0;
CParticleEngine::CParticleEngine(void)
@ -20,9 +18,6 @@ CParticleEngine::CParticleEngine(void)
CParticleEngine::~CParticleEngine(void)
{
//// Release all resources.
//for(int i = 0; i < MAX_TEXTURES; i++)
// glDeleteTextures(1, &idTexture[i]);
}
void CParticleEngine::cleanup()
@ -68,16 +63,16 @@ void CParticleEngine::DeleteInstance()
bool CParticleEngine::initParticleSystem()
{
// Texture Loading
CTexture pTex;
pTex.SetName("art/textures/particles/sprite.tga");
// Needs error checking and testing.
idTexture[DEFAULTTEXT] = ogl_tex_load("art/textures/particles/sprite.tga");
idTexture[DEFAULTTEXT] = ogl_tex_bind(idTexture[DEFAULTTEXT], 0);
u32 flags = 0;
if(!(g_Renderer.LoadTexture(&pTex, flags)))
return false;
/*CTexture *pTex;
pTex->
CRenderer::LoadTexture(*/
g_Renderer.SetTexture(0, &pTex);
idTexture[DEFAULTTEXT] = pTex;
glBindTexture(GL_TEXTURE_2D, idTexture[DEFAULTTEXT]);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
@ -93,9 +88,7 @@ bool CParticleEngine::initParticleSystem()
bool CParticleEngine::addEmitter(CEmitter *emitter, int type, int ID)
{
// without array you could do:
//emitter->texture = type + idTextureBase;
emitter->setTexture(idTexture[type]);
emitter->setTexture(&idTexture[type]);
if(m_pHead == NULL)
{
tEmitterNode *temp = new tEmitterNode;
@ -239,7 +232,7 @@ void CParticleEngine::destroyAllEmitters(bool fade)
void CParticleEngine::EnterParticleContext(void)
{
//glEnable(GL_DEPTH_TEST); // Enable depth testing for hidden surface removal.
//glDepthMask(false);
glDepthMask(false);
//glDisable(GL_LIGHTING);
glEnable(GL_TEXTURE_2D); // Enable texture mapping.
glPushMatrix();
@ -249,7 +242,7 @@ void CParticleEngine::EnterParticleContext(void)
void CParticleEngine::LeaveParticleContext(void)
{
//glDisable(GL_DEPTH_TEST);
//glDepthMask(true);
glDepthMask(true);
//glEnable(GL_LIGHTING);
glDisable(GL_TEXTURE_2D);
glPopMatrix();