Planet
navi homePPSaboutscreenshotsdownloaddevelopmentforum

Changeset 6779 in orxonox.OLD for branches/network


Ignore:
Timestamp:
Jan 26, 2006, 6:47:01 PM (18 years ago)
Author:
patrick
Message:

network: adding a billboard

Location:
branches/network/src
Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed

  • branches/network/src/defs/class_id.h

    r6772 r6779  
    118118  CL_VERTEX_ARRAY_MODEL         =    0x00004000,
    119119
     120
     121  CL_BILLBOARD                  =    0x10000001,
    120122
    121123  // subsuper-classes derivations taken : 1, 2, 5, a, b, c.     << THIS IS A LIST OF ALL THE DCL_MASK_SUBSUPERCLASS_ID's taken
    … …  
    262264  CL_SHADER                     =    0x00000822,
    263265  CL_FOG_EFFECT                 =    0x70000001,
     266  CL_LENSE_FLARE                =    0x70000002,
    264267
    265268  // GL-GUI

  • branches/network/src/lib/graphics/Makefile.am

    r6753 r6779  
    1313                           text_engine/font.cc \
    1414                           effects/graphics_effect.cc \
    15                            effects/fog_effect.cc
     15                           effects/fog_effect.cc \
     16                           effects/lense_flare.cc
    1617
    1718noinst_HEADERS = graphics_engine.h \
    … …  
    2425                 text_engine/font.h \
    2526                 effects/graphics_effect.h \
    26                  effects/fog_effect.h
     27                 effects/fog_effect.h \
     28                 effects/lense_flare.h
    2729
    2830

  • branches/network/src/lib/graphics/effects/lense_flare.cc

    r6776 r6779  
    2323
    2424#include "glincl.h"
    25 
     25#include "texture.h"
    2626
    2727
    … …  
    5858  GraphicsEffect::loadParams(root);
    5959
    60 //    LoadParam(root, "fog-effect", this, LenseFlare, setFogMode)
    61 //        .describe("sets the the fog mode {GL_LINEAR, GL_EXP, GL_EXP2}");
     60    LoadParam(root, "add-flare-texture", this, LenseFlare, addFlare)
     61        .describe("adds a lensflare texture to the engine");
    6262
    6363}
    … …  
    9898{}
    9999
     100
     101/**
     102 * adds a texture flare
     103 * @param textureName the name of the flare texture
     104 */
     105void addFlare(const char* textureName)
     106{
     107  Texture* texture = new Texture (textureName, GL_TEXTURE);
     108
     109
     110}
     111
     112

  • branches/network/src/lib/graphics/effects/lense_flare.h

    r6776 r6779  
    99#include "graphics_effect.h"
    1010
    11 #include <list>
     11#include <vector>
    1212
    1313
    1414class TiXmlElement;
     15class Light;
     16class Element2D;
    1517
    1618//! A class that handles LenseFlares. The LenseFlareManager operates on this.
    … …  
    3032    virtual void draw() const;
    3133
     34    void addFlare(const char* textureName);
     35
    3236
    3337  private:

  • branches/network/src/world_entities/image_entity.h

    r6634 r6779  
    11/*!
    2  * @file crosshair.h
    3   *  Definition of ...
    4 
    5 */
     2 * @file image_entity.h
     3 *  Definition of an ImageEntity
     4 */
    65
    76#ifndef _IMAGE_ENTITY_H
Note: See TracChangeset for help on using the changeset viewer.