Removed Emitter and Particle

CMakeLists.txt

@@ -41,7 +41,6 @@ set (WARNINGS "${WARNINGS} -Wno-shorten-64-to-32 -Wno-sign-conversion")
 
 # Flags for all builds
 set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -std=c++11 ${WARNINGS}")
-set (OpenRaider_CXX_FLAGS "${OpenRaider_CXX_FLAGS} -DUSING_EMITTER")
 
 # Flags for Debug build
 set (OpenRaider_CXX_FLAGS_DEBUG "${OpenRaider_CXX_FLAGS_DEBUG} -g -O0")

ChangeLog

@@ -5,6 +5,18 @@
 
  OpenRaider (0.1.3) xythobuz <xythobuz@xythobuz.de>
 
+	[ 20140405 ]
+	* "Ported" all commands from old source
+	* Slimmed down Camera considerably
+	* Removed Emitter & Particle
+
+	[ 20140403 ]
+	* Now using "service locator" pattern for global singleton objects:
+	  http://gameprogrammingpatterns.com/service-locator.html
+	* Made abstract sound interface to provide different implementations
+	  in the future (eg. for Windows)
+	* "Backported" more commands from old source
+
 	[ 20140330 ]
 	* Fixed some segfaults relating to missing upper-bound-checks
 	  while accessing std::vectors in World/Render

include/Camera.h

@@ -1,6 +1,6 @@
 /*!
  * \file include/Camera.h
- * \brief OpenGL camera class
+ * \brief Camera class
  *
  * \author Mongoose
  * \author xythobuz
@@ -23,7 +23,7 @@ enum camera_command {
 };
 
 /*!
- * \brief OpenGL camera class
+ * \brief Camera class
  */
 class Camera {
 public:

include/Emitter.h

@@ -1,179 +0,0 @@
-/*!
- * \file include/Emitter.h
- * \brief Particle emitter class.
- *
- * \author Mongoose
- */
-
-#ifndef _EMITTER_H_
-#define _EMITTER_H_
-
-#include "Particle.h"
-
-/*!
- * \brief Particle emitter class.
- */
-class Emitter {
-public:
-
-    /*!
-     * \brief Flags an Emitter can have
-     */
-    typedef enum {
-        fUseFrustumCulling = (1 << 0), //!< Use frustum culling
-        fUseDepthSorting   = (1 << 1)  //!< Use depth sorting
-    } EmitterFlags;
-
-
-    /*!
-     * \brief Constructs an object of Emitter
-     * \param name valid C string
-     * \param n greater than 0
-     */
-    Emitter(const char *name, int n);
-
-    /*!
-     * \brief Deconstructs an object of Emitter
-     */
-    ~Emitter();
-
-    /*!
-     * \brief Get the particles
-     * \returns array of Particles
-     */
-    Particle *Particles();
-
-    /*!
-     * \brief Number of particles emitted
-     * \returns Number of particles emitted
-     */
-    int Count();
-
-    /*!
-     * \brief Sets position of emitter in 3D space
-     * \param x X coordinate
-     * \param y Y coordinate
-     * \param z Z coordinate
-     */
-    void Pos(float x, float y, float z);
-
-    /*!
-     * \brief Returns position of emitter in 3D space
-     * \param x Where X coordinate will be stored
-     * \param y Where Y coordinate will be stored
-     * \param z Where Z coordinate will be stored
-     */
-    void Pos(float *x, float *y, float *z);
-
-    /*!
-     * \brief Sets orientation of emitter in 3D space
-     * \param x X coordinate
-     * \param y Y coordinate
-     * \param z Z coordinate
-     */
-    void Orientation(float x, float y, float z);
-
-    /*!
-     * \brief Returns orientation of emitter in 3D space
-     * \param x Where X coordinate will be stored
-     * \param y Where Y coordinate will be stored
-     * \param z Where Z coordinate will be stored
-     */
-    void Orientation(float *x, float *y, float *z);
-
-    /*!
-     * \brief Get the flags of this Emitter
-     * \returns EmitterFlags
-     */
-    unsigned int Flags();
-
-    /*!
-     * \brief Set or Unset a flag
-     * \param flag EmitterFlag to change
-     * \param op new state (true - set)
-     */
-    void Flags(unsigned int flag, bool op);
-
-    /*!
-     * \brief Allocates the particle array and sets the count.
-     * If the array has been allocated previously it will be
-     * deallocated and a new one made.
-     * \param n new size, greater than 0
-     */
-    void ParticleArray(int n);
-
-    /*!
-     * \brief Renders the particles
-     */
-    void Draw();
-
-    /*!
-     * \brief Sets the emitters name
-     * \param name is a valid C string
-     */
-    void Name(const char *name);
-
-    /*!
-     * \brief Resets all particle texture ids
-     * \param id new id
-     * \sa Particle::TextureId()
-     */
-    void SetTextureId(int id);
-
-    /*!
-     * \brief Set the texture id for a range of particles in the array
-     * \param particle_start start of range
-     * \param particle_end end of range
-     * \param id new id
-     * \sa Particle::TextureId()
-     */
-    void TextureId(unsigned int particle_start, unsigned int particle_end, int id);
-
-    /*!
-     * \brief Set the color of a range of particles in the array
-     * \param particle_start start of range
-     * \param particle_end end of range
-     * \param r new red part of color (0.0 to 1.0)
-     * \param g new green part of color (0.0 to 1.0)
-     * \param b new blue part of color (0.0 to 1.0)
-     * \sa Particle::Color()
-     */
-    void Color(unsigned int particle_start, unsigned int particle_end, float r, float g, float b);
-
-    /*!
-     * \brief Set the speed of a range of particles in the array.
-     * Take note that the speed starts out at 2000, and lower means faster.
-     * \param particle_start start of range
-     * \param particle_end end of range
-     * \param x X speed
-     * \param y Y speed
-     * \param z Z speed
-     * \sa Particle::Speed
-     */
-    void Speed(unsigned int particle_start, unsigned int particle_end, float x, float y, float z);
-
-    /*!
-     * \brief Let a force (eg. Gravity) act on a range of particles in the array
-     * \param particle_start start of range
-     * \param particle_end end of range
-     * \param x X force
-     * \param y Y force
-     * \param z Z force
-     * \sa Particle::Force()
-     */
-    void Force(unsigned int particle_start, unsigned int particle_end, float x, float y, float z);
-
-    static vec_t mFrustum[6][4]; //!< View Volume copy
-
-private:
-    static int compareParticleDist(const void *voidA, const void *voidB);
-
-    char *_name;         //!< Emitter name
-    unsigned int _flags; //!< Emitter flags
-    vec3_t _pos;         //!< Position in 3D space
-    vec3_t _mangle;      //!< Oreintation in 3D space
-    Particle *_particle; //!< Array of particles
-    unsigned int _count; //!< Particle count
-};
-
-#endif

include/Particle.h

@@ -1,119 +0,0 @@
-/*!
- * \file include/Particle.h
- * \brief Particle system base header
- *
- * \author Mongoose
- */
-
-#ifndef _PARTICLE_H_
-#define _PARTICLE_H_
-
-#include "math/math.h"
-
-/*!
- * \brief Partcle systems atomic base
- */
-class Particle {
-public:
-
-    /*!
-     * \brief Constructs an object of Sound
-     */
-    Particle();
-
-    /*!
-     * \brief Toggles active state of particle
-     * \param active new state
-     */
-    void setActive(bool active);
-
-    /*!
-     * \brief Sets gravity/force acting on particle
-     * \param x X part of force vector
-     * \param y Y part
-     * \param z Z part
-     */
-    void Force(float x, float y, float z);
-
-    /*!
-     * \brief Resets particle to defaults
-     */
-    void Reset();
-
-    /*!
-     * \brief Sets gravity/force acting on particle
-     * \note speed inits at 2000, lower is faster
-     * \param x X part of speed vector
-     * \param y Y part
-     * \param z Z part
-     */
-    void Speed(float x, float y, float z);
-
-    /*!
-     * \brief Sets new particle coloring
-     * \note White {1.0, 1.0, 1.0} is the init color
-     * \param r Red part, from 0.0 to 1.0
-     * \param g Green part, from 0.0 to 1.0
-     * \param b Blue part, from 0.0 to 1.0
-     */
-    void Color(float r, float g, float b);
-
-    /*!
-     * \brief Returns position of particle in 3 space
-     * \param x not NULL!
-     * \param y not NULL!
-     * \param z not NULL!
-     */
-    void Pos(float *x, float *y, float *z);
-
-    /*!
-     * \brief Returns current color of particle
-     * \param r not NULL!
-     * \param g not NULL!
-     * \param b not NULL!
-     */
-    void Color(float *r, float *g, float *b);
-
-    /*!
-     * \brief Returns current life (blend) of particle
-     * \returns fade of particle
-     */
-    float Life();
-
-    /*!
-     * \brief Adjusts for particle life cycle
-     */
-    void Update();
-
-    /*!
-     * \brief Returns texture binding for this particle
-     * \returns texture id
-     */
-    int Texture();
-
-    /*!
-     * \brief Returns active value
-     * \returns state
-     */
-    bool isActive();
-
-    /*!
-     * \brief Set the texture for this particle
-     * \param t new texture id
-     */
-    void TextureId(int t);
-
-
-private:
-    bool _active;  //!< Is this particle in use?
-    float _life;   //!< Life of particle
-    float _blend;  //!< Blend amount or fade
-    int _texture;  //!< Texture polygon to use
-    vec3_t _pos;   //!< Current position in 3 space
-    vec3_t _color; //!< Current color
-    vec3_t _dir;   //!< Current direction
-    vec3_t _force; //!< Current force or 'gravity'
-    vec3_t _speed; //!< Speed of particle movement
-};
-
-#endif

include/Render.h

@@ -20,10 +20,6 @@
 #include "Texture.h"
 #include "Camera.h"
 
-#ifdef USING_EMITTER
-#include "Emitter.h"
-#endif
-
 /*!
  * \brief The GL light class
  */
@@ -96,22 +92,21 @@ public:
     } RenderMode;
 
     typedef enum {
-        fParticles              = (1 << 0),
-        fPortals                = (1 << 1),
-        fRoomAlpha              = (1 << 2),
-        fViewModel              = (1 << 3),
-        fSprites                = (1 << 4),
-        fRoomModels             = (1 << 5),
-        fEntityModels           = (1 << 6),
-        fFog                    = (1 << 7),
-        fUsePortals             = (1 << 8),
-        fGL_Lights              = (1 << 9),
-        fOneRoom                = (1 << 10),
-        fRenderPonytail         = (1 << 11),
-        // fMultiTexture           = (1 << 12), //! \todo Whats up with Multitexture stuff? Where is it needed?
-        fUpdateRoomListPerFrame = (1 << 13),
-        fAnimateAllModels       = (1 << 14),
-        fAllRooms               = (1 << 15)
+        fPortals                = (1 << 0),
+        fRoomAlpha              = (1 << 1),
+        fViewModel              = (1 << 2),
+        fSprites                = (1 << 3),
+        fRoomModels             = (1 << 4),
+        fEntityModels           = (1 << 5),
+        fFog                    = (1 << 6),
+        fUsePortals             = (1 << 7),
+        fGL_Lights              = (1 << 8),
+        fOneRoom                = (1 << 9),
+        fRenderPonytail         = (1 << 10),
+        // fMultiTexture           = (1 << 11), //! \todo Whats up with Multitexture stuff? Where is it needed?
+        fUpdateRoomListPerFrame = (1 << 12),
+        fAnimateAllModels       = (1 << 13),
+        fAllRooms               = (1 << 14)
     } RenderFlags;
 
     typedef enum {
@@ -167,20 +162,6 @@ public:
                             unsigned int *nextId);
 
     /*!
-     * \brief Initializes Emitter.
-     *
-     * Emitter is set up for rendering with 2 textures in
-     * a overhead rain or snow like pattern.
-     * Textures have to be initialized!
-     * \param name valid C-String name
-     * \param size valid size
-     * \param snowTex1 valid first texture
-     * \param snowTex2 valid second texture
-     */
-    void initEmitter(const char *name, unsigned int size,
-                          unsigned int snowTex1, unsigned int snowTex2);
-
-    /*!
      * Removes current world/entity/etc geometry
      */
     void ClearWorld();
@@ -342,10 +323,6 @@ private:
     int mLock;
     int mSkyMesh;                         //!< Skymesh model id
     bool mSkyMeshRotation;                //!< Should Skymesh be rotated?
-
-#ifdef USING_EMITTER
-    Emitter *mEmitter;                    //!< Particle emitter test
-#endif
 };
 
 #endif

src/CMakeLists.txt

@@ -33,13 +33,11 @@ set (LIBS ${LIBS} ${ZLIB_LIBRARIES})
 # Set Source files
 set (SRCS ${SRCS} "Camera.cpp")
 set (SRCS ${SRCS} "Console.cpp")
-set (SRCS ${SRCS} "Emitter.cpp")
 set (SRCS ${SRCS} "Game.cpp")
 set (SRCS ${SRCS} "main.cpp")
 set (SRCS ${SRCS} "Menu.cpp")
 set (SRCS ${SRCS} "Mesh.cpp")
 set (SRCS ${SRCS} "OpenRaider.cpp")
-set (SRCS ${SRCS} "Particle.cpp")
 set (SRCS ${SRCS} "Render.cpp")
 set (SRCS ${SRCS} "SkeletalModel.cpp")
 set (SRCS ${SRCS} "Sound.cpp")
@@ -93,8 +91,7 @@ if (APPLE)
     set (SRCS ${SRCS} ${MAC_ICON})
 
     # Copy Data
-    set (MAC_DATA "../data/OpenRaider.ini" "../data/test.ttf")
-    set (MAC_DATA ${MAC_DATA} "../data/snow.tga" "../data/snow2.tga" "../data/splash.tga")
+    set (MAC_DATA "../data/OpenRaider.ini" "../data/test.ttf" "../data/splash.tga")
     set_source_files_properties (${MAC_DATA} PROPERTIES MACOSX_PACKAGE_LOCATION Resources/defaults)
     set (SRCS ${SRCS} ${MAC_DATA})
 endif (APPLE)

src/Camera.cpp

@@ -1,6 +1,6 @@
 /*!
  * \file src/Camera.cpp
- * \brief OpenGL camera class
+ * \brief Camera class
  *
  * \author Mongoose
  * \author xythobuz
@@ -9,7 +9,6 @@
 #include <stdio.h>
 #include <math.h>
 
-#include "main.h"
 #include "Camera.h"
 
 Camera::Camera() {

src/Emitter.cpp

@@ -1,243 +0,0 @@
-/*!
- * \file src/Emitter.cpp
- * \brief Particle emitter class.
- *
- * \author Mongoose
- */
-
-#include <stdlib.h>
-#include <string.h>
-#include <stdio.h>
-
-#ifdef __APPLE__
-#include <OpenGL/gl.h>
-#else
-#include <GL/gl.h>
-#endif
-
-#include "Emitter.h"
-
-vec_t Emitter::mFrustum[6][4];
-
-int Emitter::compareParticleDist(const void *voidA, const void *voidB) {
-    Particle *a = const_cast<Particle *>(static_cast<const Particle *>(voidA));
-    Particle *b = const_cast<Particle *>(static_cast<const Particle *>(voidB));
-    float x, y, z, distA, distB;
-
-    if (!a || !b)
-        return -1; // error really
-
-    a->Pos(&x, &y, &z);
-    distA = (Emitter::mFrustum[5][0] * x +
-            Emitter::mFrustum[5][1] * y +
-            Emitter::mFrustum[5][2] * z +
-            Emitter::mFrustum[5][3]);
-
-    b->Pos(&x, &y, &z);
-    distB = (Emitter::mFrustum[5][0] * x +
-            Emitter::mFrustum[5][1] * y +
-            Emitter::mFrustum[5][2] * z +
-            Emitter::mFrustum[5][3]);
-
-    // reverse less/greater than
-    // less than
-    if (distA > distB)
-        return -1;
-
-    // greater than ( no need for equal )
-    return 1;
-}
-
-Emitter::Emitter(const char *name, int n) {
-    _name = NULL;
-    _flags = 0;
-    _particle = NULL;
-    _count = 0;
-    _pos[0] = _pos[1] = _pos[2] = 0.0;
-    _mangle[0] = _mangle[1] = _mangle[2] = 0.0;
-
-    Name(name);
-    ParticleArray(n);
-}
-
-Emitter::~Emitter() {
-    if (_name)
-        delete [] _name;
-
-    if (_particle)
-        delete [] _particle;
-
-    _count = 0;
-}
-
-Particle *Emitter::Particles() {
-    return _particle;
-}
-
-
-int Emitter::Count() {
-    return _count;
-}
-
-void Emitter::Pos(float *x, float *y, float *z) {
-    *x = _pos[0];
-    *y = _pos[1];
-    *z = _pos[2];
-}
-
-void Emitter::Pos(float x, float y, float z) {
-    _pos[0] = x;
-    _pos[1] = y;
-    _pos[2] = z;
-}
-
-void Emitter::Orientation(float *x, float *y, float *z) {
-    *x = _mangle[0];
-    *y = _mangle[1];
-    *z = _mangle[2];
-}
-
-void Emitter::Orientation(float x, float y, float z) {
-    _mangle[0] = x;
-    _mangle[1] = y;
-    _mangle[2] = z;
-}
-
-unsigned int Emitter::Flags() {
-    return _flags;
-}
-
-void Emitter::Flags(unsigned int flag, bool op) {
-    _flags |= flag;
-
-    if (!op)
-        _flags ^= flag;
-}
-
-void Emitter::ParticleArray(int n) {
-    if (n) {
-        if (_particle) {
-            _count = 0;
-            delete [] _particle;
-        }
-
-        _count = n;
-        _particle = new Particle[_count];
-    }
-}
-
-void Emitter::Name(const char *name) {
-    if (name && name[0]) {
-        if (_name)
-            delete [] _name;
-
-        int l = strlen(name);
-        _name = new char[l+1];
-
-        // Mongoose 2002.01.09, Mongoose says 'Only you can prevent overflows'
-        strncpy(_name, name, l);
-        _name[l] = 0;
-    }
-}
-
-void Emitter::SetTextureId(int id) {
-    for (unsigned int i = 0; i < _count; i++)
-        _particle[i].TextureId(id);
-}
-
-void Emitter::TextureId(unsigned int particle_start, unsigned int particle_end, int id) {
-    if ((particle_start < _count) && (particle_end > 0 && particle_end <= _count) && (particle_start < particle_end)) {
-        for (unsigned int i = particle_start; i < particle_end; i++)
-            _particle[i].TextureId(id);
-    }
-}
-
-void Emitter::Color(unsigned int particle_start, unsigned int particle_end, float r, float g, float b) {
-    if ((particle_start < _count) && (particle_end > 0 && particle_end <= _count) && (particle_start < particle_end)) {
-        for (unsigned int i = particle_start; i < particle_end; i++)
-            _particle[i].Color(r, g, b);
-    }
-}
-
-void Emitter::Speed(unsigned int particle_start, unsigned int particle_end, float x, float y, float z) {
-    if ((particle_start < _count) && (particle_end > 0 && particle_end <= _count) && (particle_start < particle_end)) {
-        for (unsigned int i = particle_start; i < particle_end; i++)
-            _particle[i].Speed(x, y, z);
-    }
-}
-
-void Emitter::Force(unsigned int particle_start, unsigned int particle_end, float x, float y, float z) {
-    if ((particle_start < _count) && (particle_end > 0 && particle_end <= _count) && (particle_start < particle_end)) {
-        for (unsigned int i = particle_start; i < particle_end; i++)
-            _particle[i].Force(x, y, z);
-    }
-}
-
-void Emitter::Draw() {
-    unsigned int i, p;
-    float x, y, z;
-    float r, g, b;
-    float life;
-
-    if (!_count || !_particle) {
-        printf("Emitter::Draw> No particles!\n");
-        return;
-    }
-
-    glPushMatrix();
-
-    //glRotatef(_mangle[0], 1.0, 0.0, 0.0);
-    //glRotatef(_mangle[1], 0.0, 1.0, 0.0);
-    //glRotatef(_mangle[2], 0.0, 0.0, 1.0);
-    //glTranslatef(_pos[0], _pos[1], _pos[2]);
-
-    if (_flags & fUseDepthSorting)
-        qsort(_particle, _count, sizeof(Particle), compareParticleDist);
-
-    for (i = 0; i < _count; i++) {
-        if (_particle[i].isActive()) {
-            _particle[i].Pos(&x, &y, &z);
-
-            if (_flags & fUseFrustumCulling) {
-                for (p = 0; p < 6; ++p) {
-                    if (((mFrustum[p][0] * x) + (mFrustum[p][1] * y) + (mFrustum[p][2] * z) + mFrustum[p][3]) < 0) {
-                        _particle[i].setActive(false);
-                        break;
-                    }
-                }
-
-                if (!_particle[i].isActive())
-                    continue;
-            }
-
-            _particle[i].Color(&r, &g, &b);
-            life = _particle[i].Life();
-
-            // Mongoose 2002.01.01, Removed Texture agent dep
-            glBindTexture(GL_TEXTURE_2D, _particle[i].Texture());
-
-            // Alpha is determined by life, which is affected by blend amount
-            glColor4f(r, g, b, life);
-
-            // Render tristrip quad
-            glBegin(GL_TRIANGLE_STRIP);
-            glTexCoord2d(1.0, 1.0);
-            glVertex3f(x + 0.5f, y + 0.5f, z);
-
-            glTexCoord2d(0.0, 1.0);
-            glVertex3f(x - 0.5f, y + 0.5f, z);
-
-            glTexCoord2d(1.0, 0.0);
-            glVertex3f(x + 0.5f, y - 0.5f, z);
-
-            glTexCoord2d(0.0, 0.0);
-            glVertex3f(x - 0.5f, y - 0.5f, z);
-            glEnd();
-
-            // Update particle's attributes for it's life cycle
-            _particle[i].Update();
-        }
-    }
-
-    glPopMatrix();
-}

src/Menu.cpp

@@ -140,8 +140,11 @@ void Menu::handleKeyboard(KeyboardButton key, bool pressed) {
             handleKeyboard(up, true);
     } else if (key == enter) {
         char *tmp = bufferString("load %s", getOpenRaider().mMapList[mCursor]);
-        if (getOpenRaider().command(tmp) == 0)
+        if (getOpenRaider().command(tmp) == 0) {
             setVisible(false);
+        } else {
+            //! \todo Display something if an error occurs
+        }
         delete [] tmp;
     }
 }

src/OpenRaider.cpp

@@ -458,22 +458,6 @@ int OpenRaider::command(const char *command, std::vector<char *> *args) {
             getConsole().print("Invalid use of upf-command!");
             return -31;
         }
-    } else if (strcmp(command, "particle") == 0) {
-        if (args->size() > 0) {
-            bool b;
-            if (readBool(args->at(0), &b) < 0) {
-                getConsole().print("Pass BOOL to particle command!");
-                return -32;
-            }
-            if (b)
-                getRender().setFlags(Render::fParticles);
-            else
-                getRender().clearFlags(Render::fParticles);
-            getConsole().print("Particles are now %s", b ? "on" : "off");
-        } else {
-            getConsole().print("Invalid use of particle-command!");
-            return -33;
-        }
     } else if (strcmp(command, "sprite") == 0) {
         if (args->size() > 0) {
             bool b;
@@ -631,7 +615,6 @@ int OpenRaider::command(const char *command, std::vector<char *> *args) {
             getConsole().print("  portal    - BOOL");
             getConsole().print("  vis       - BOOL - Use Portals");
             getConsole().print("  upf       - BOOL - Update Room List Per Frame");
-            getConsole().print("  particle  - BOOL");
             getConsole().print("  sprite    - BOOL");
             getConsole().print("  roommodel - BOOL");
             getConsole().print("  entmodel  - BOOL");

src/Particle.cpp

@@ -1,162 +0,0 @@
-/*!
- * \file src/Particle.cpp
- * \brief Particle system base implementation
- *
- * \author Mongoose
- */
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <assert.h>
-
-#include "Particle.h"
-
-Particle::Particle()
-{
-    setActive(true);
-    TextureId(0);
-    Speed(2000.0f, 2000.0f, 2000.0f);
-    Color(1.0f, 1.0f, 1.0f);
-    Force(0.0f, 0.8f, 0.0f);
-
-    Reset();
-}
-
-
-void Particle::TextureId(int id)
-{
-    _texture = id;
-}
-
-
-void Particle::setActive(bool active)
-{
-    _active = active;
-}
-
-
-void Particle::Speed(float x, float y, float z)
-{
-    _speed[0] = x;
-    _speed[1] = y;
-    _speed[2] = z;
-}
-
-
-void Particle::Color(float r, float g, float b)
-{
-    _color[0] = r;
-    _color[1] = g;
-    _color[2] = b;
-}
-
-
-void Particle::Force(float x, float y, float z)
-{
-    _force[0] = x;
-    _force[1] = y;
-    _force[2] = z;
-}
-
-
-void Particle::Reset()
-{
-    // Mongoose 2002.01.01, Ah, how old is that code?
-#ifdef OBSOLETE
-    _active = true;
-    _life = 1.0;
-    _blend = (float)(rand() % 100) / 1000.0 + 0.003;
-
-    _pos[0] = _pos[1] = _pos[2] = 0.0;
-
-    _dir[0] = (float)((rand() % 50) - 26.0) * 10.0;
-    _dir[1] = (float)((rand() % 50) - 25.0) * 10.0;
-    _dir[2] = _dir[1];
-
-    _force[0] = 0.0;
-    _force[1] = -0.8;
-    _force[2] = 0.0;
-#else
-    //! \fixme _blend prob should have nonstatic range
-    _blend = (float)(0.003 + (0.1 * rand() / (RAND_MAX + 1.0))); // high order
-    //_blend = (float)(rand() % 100) / 1000.0 + 0.003;
-
-    //! \fixme Reset these using some nonstatic functions and values later
-    _life = 1.0;
-
-    _pos[0] = _pos[1] = _pos[2] = 0.0;
-
-    _dir[0] = (float)(-26.0 + (50.0 * rand() / (RAND_MAX + 1.0))); // high order
-    _dir[0] *= 10.0;
-    //_dir[0] = (float)((rand() % 50) - 26.0) * 10.0;
-    _dir[1] = (float)(-25.0 + (50.0 * rand() / (RAND_MAX + 1.0))); // high order
-    _dir[1] *= 10.0;
-    //_dir[1] = (float)((rand() % 50) - 25.0) * 10.0;
-    _dir[2] = _dir[1];
-#endif
-}
-
-
-void Particle::Pos(float *x, float *y, float *z)
-{
-    assert(x != NULL);
-    assert(y != NULL);
-    assert(z != NULL);
-
-    *x = _pos[0];
-    *y = _pos[1];
-    *z = _pos[2];
-}
-
-
-void Particle::Color(float *r, float *g, float *b)
-{
-    assert(r != NULL);
-    assert(g != NULL);
-    assert(b != NULL);
-
-    *r = _color[0];
-    *g = _color[1];
-    *b = _color[2];
-}
-
-
-float Particle::Life()
-{
-    return _life;
-}
-
-
-void Particle::Update()
-{
-    // Adjust particle position
-    _pos[0] += _dir[0] / _speed[0];
-    _pos[1] += _dir[1] / _speed[1];
-    _pos[2] += _dir[2] / _speed[2];
-
-    // Adjust particle direction
-    _dir[0] += _force[0];
-    _dir[1] += _force[1];
-    _dir[2] += _force[2];
-
-    // Adjust particle blending/life
-    _life -= _blend;
-
-    // Reset 'dead' OR fully blended particles
-    if (_life < 0.0)
-    {
-        Reset();
-    }
-}
-
-
-int Particle::Texture()
-{
-    return _texture;
-}
-
-
-bool Particle::isActive()
-{
-    return _active;
-}

src/Render.cpp

@@ -18,10 +18,6 @@
 #include <math.h>
 #include <string.h>
 
-#ifdef USING_EMITTER
-#include "Emitter.h"
-#endif
-
 #include "global.h"
 #include "main.h"
 #include "Game.h"
@@ -89,15 +85,12 @@ bool compareRoomDist(const void *voidA, const void *voidB)
 
 Render::Render()
 {
-#ifdef USING_EMITTER
-    mEmitter = 0x0;
-#endif
     mSkyMesh = -1;
     mSkyMeshRotation = false;
     mMode = Render::modeDisabled;
     mLock = 0;
     mFlags = (fRoomAlpha | fViewModel | fSprites |
-            fRoomModels | fEntityModels | // fParticles |
+            fRoomModels | fEntityModels |
             fUsePortals | fUpdateRoomListPerFrame);
 
     mNextTextureId = NULL;
@@ -148,8 +141,7 @@ void Render::initTextures(char *textureDir, unsigned int *numLoaded,
         unsigned int *nextId)
 {
     char filename[128];
-    int snow1_id;
-    int snow2_id;
+    int bg;
     unsigned int numTextures = 0;
     unsigned char color[4];
 
@@ -176,62 +168,17 @@ void Render::initTextures(char *textureDir, unsigned int *numLoaded,
     snprintf(filename, 126, "%s/%s", textureDir, "splash.tga");
     filename[127] = 0;
 
-    if (mTexture.loadTGA(filename) > -1)
-        numTextures++;
-
-    snprintf(filename, 126, "%s/%s", textureDir, "snow.tga");
-    filename[127] = 0;
-
-    if ((snow1_id = mTexture.loadTGA(filename)) > -1)
-        numTextures++;
-
-    snprintf(filename, 126, "%s/%s", textureDir, "snow2.tga");
-    filename[127] = 0;
-
-    if ((snow2_id = mTexture.loadTGA(filename)) > -1)
+    if ((bg = mTexture.loadTGA(filename)) > -1)
         numTextures++;
 
     // Weird that it isn't linear, must be some storage deal in Texture
     // I forgot about Id allocation
-    *nextId = snow2_id;
-
-    // Setup particle system test
-    initEmitter("Snow test", 650, snow1_id, snow2_id);
+    *nextId = bg;
 
     *numLoaded = numTextures;
 }
 
 
-void Render::initEmitter(const char *name, unsigned int size,
-        unsigned int snowTex1, unsigned int snowTex2)
-{
-#ifdef USING_EMITTER
-    if (mEmitter)
-        delete mEmitter; // Public, so avoid possible leak
-
-    // Mongoose 2002.01.01, Screwing around with particle emitter test
-    //   note this is backwards b/c load screen is rendered upsidedown
-    //mEmitter = new Emitter(/*name*/"snow", size);
-    mEmitter = new Emitter(name, size);
-    mEmitter->SetTextureId(snowTex1 + 2); //! \fixme What's up with this +2 offset?
-    mEmitter->TextureId(120, 280, snowTex2 + 2);
-    mEmitter->TextureId(400, 450, snowTex2 + 2);
-    mEmitter->TextureId(500, 550, snowTex2 + 2);
-
-    // Mongoose 2002.01.01, Varing force and speed should look
-    //   like varing mass/SA in wind, maybe
-    mEmitter->Speed(0, 150, 3500, 3000, 3500);
-    mEmitter->Speed(150, 350, 3000, 4000, 3000);
-    mEmitter->Speed(400, 500, 2000, 5000, 2000);
-    mEmitter->Speed(400, 500, 2000, 5000, 2000);
-    mEmitter->Force(100, 200, 0.0, 7.0, 0.0);
-    mEmitter->Force(200, 300, 0.0, 5.0, 0.0);
-    mEmitter->Force(300, 500, 0.0, 10.0, 0.0);
-    mEmitter->Force(500, 650, 0.0, 9.0, 0.0);
-#endif
-}
-
-
 void Render::ClearWorld()
 {
     getGame().mLara = NULL;
@@ -249,14 +196,6 @@ void Render::ClearWorld()
             delete mModels[i];
     }
     mModels.clear();
-
-#ifdef USING_EMITTER
-    if (mEmitter)
-    {
-        delete mEmitter;
-        mEmitter = 0x0;
-    }
-#endif
 }
 
 
@@ -712,37 +651,9 @@ void Render::display()
         }
     }
 
-#ifdef USING_EMITTER_IN_GAME
-    // Mongoose 2002.01.01, Test particle prototype in game
-    if (EMIT && mFlags & RENDER_F_PARTICLES)
-    {
-        glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-
-        glPushMatrix();
-        glLoadIdentity();
-
-        glEnable(GL_BLEND);
-        glRotatef(180.0, 1.0, 0.0, 0.0);
-        glTranslatef(0.0, -820.0, 575.0);
-        glScalef(80.0, 80.0, 80.0);
-
-        EMIT->Draw();
-
-        glPopMatrix();
-
-        // Mongoose 2002.03.26, Account for particle system
-        //   not using new binds by setting WHITE texture here
-        mTexture.bindTextureId(0);
-    }
-#endif
-
     if (mMode == Render::modeWireframe)
         glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
 
-#ifdef USING_EMITTER
-    glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-#endif
-
     // Mongoose 2002.01.01, Test matrix ops
 #ifdef DEBUG_MATRIX
     if (gl_test_val())
@@ -798,28 +709,6 @@ void Render::drawLoadScreen()
     if (mFlags & Render::fGL_Lights)
         glEnable(GL_LIGHTING);
 
-#ifdef USING_EMITTER
-    // Mongoose 2002.01.01, Test particle prototype on load screen
-    if (mEmitter && mFlags & Render::fParticles)
-    {
-        glPushMatrix();
-        glLoadIdentity();
-
-        glEnable(GL_BLEND);
-        glRotatef(180.0, 1.0, 0.0, 0.0);
-        glTranslatef(0.0, -820.0, 575.0);
-        glScalef(80.0, 80.0, 80.0);
-
-        // Update view volume for vising
-        updateViewVolume();
-        mViewVolume.getFrustum(mEmitter->mFrustum);
-        mEmitter->Flags(Emitter::fUseDepthSorting, true);
-        mEmitter->Draw();
-
-        glPopMatrix();
-    }
-#endif
-
     glFlush();
 }