Changeset 6779 in orxonox.OLD for branches/network/src/lib/graphics

Timestamp:

Jan 26, 2006, 6:47:01 PM (18 years ago)

Author:

patrick

Message:

network: adding a billboard

Location:

branches/network/src/lib/graphics

Files:

• Makefile.am (modified) (2 diffs)
• effects/lense_flare.cc (modified) (3 diffs)
• effects/lense_flare.h (modified) (2 diffs)
• render2D/billboard.cc (added)
• render2D/billboard.h (added)

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

@@ -13 +13 @@
                            text_engine/font.cc \
                            effects/graphics_effect.cc \
-                           effects/fog_effect.cc
+                           effects/fog_effect.cc \
+                           effects/lense_flare.cc
 
 noinst_HEADERS = graphics_engine.h \
@@ -24 +25 @@
                  text_engine/font.h \
                  effects/graphics_effect.h \
-                 effects/fog_effect.h
+                 effects/fog_effect.h \
+                 effects/lense_flare.h
 
 

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

@@ -23 +23 @@
 
 #include "glincl.h"
-
+#include "texture.h"
 
 
@@ -58 +58 @@
   GraphicsEffect::loadParams(root);
 
-//    LoadParam(root, "fog-effect", this, LenseFlare, setFogMode)
-//        .describe("sets the the fog mode {GL_LINEAR, GL_EXP, GL_EXP2}");
+    LoadParam(root, "add-flare-texture", this, LenseFlare, addFlare)
+        .describe("adds a lensflare texture to the engine");
 
 }
@@ -98 +98 @@
 {}
 
+
+/**
+ * adds a texture flare
+ * @param textureName the name of the flare texture
+ */
+void addFlare(const char* textureName)
+{
+  Texture* texture = new Texture (textureName, GL_TEXTURE);
+
+
+}
+
+

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

@@ -9 +9 @@
 #include "graphics_effect.h"
 
-#include <list>
+#include <vector>
 
 
 class TiXmlElement;
+class Light;
+class Element2D;
 
 //! A class that handles LenseFlares. The LenseFlareManager operates on this.
@@ -30 +32 @@
     virtual void draw() const;
 
+    void addFlare(const char* textureName);
+
 
   private: