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

Timestamp:

Jan 26, 2006, 7:43:44 PM (19 years ago)

Author:

patrick

Message:

network: little bit more code

Location:

branches/network/src/lib/graphics/render2D

Files:

• billboard.cc (modified) (8 diffs)
• billboard.h (modified) (2 diffs)

branches/network/src/lib/graphics/render2D/billboard.cc

@@ -11 +11 @@
 ### File Specific:
    main-programmer: Patrick Boenzli
-   co-programmer: ...
 */
 
 #define DEBUG_SPECIAL_MODULE DEBUG_MODULE_WEAPON
 
-#include "image_entity.h"
+#include "billboard.h"
 
 #include "load_param.h"
@@ -25 +24 @@
 #include "glincl.h"
 #include "state.h"
+#include "p_node.h"
 
 
@@ -39 +39 @@
 {
   this->init();
-  this->loadParams(root);
+
+  if( root)
+    this->loadParams(root);
 }
 
@@ -64 +66 @@
   this->setSize(GraphicsEngine::getInstance()->getResolutionX()/10.0, GraphicsEngine::getInstance()->getResolutionY()/10.0);
 
-  this->setBindNode(this);
-  this->material = new Material;
+  //this->setBindNode(this);
+  this->material = new Material();
   this->setTexture("pictures/error_texture.png");
 }
 
 
+/**
+ *  load params
+ * @param root TiXmlElement object
+ */
 void Billboard::loadParams(const TiXmlElement* root)
 {
-  PNode::loadParams(root);
-
   LoadParam(root, "texture", this, Billboard, setTexture)
       .describe("the texture-file to load onto the Billboard");
@@ -79 +83 @@
   LoadParam(root, "size", this, Billboard, setSize)
       .describe("the size of the Billboard in Pixels");
-
-  LoadParam(root, "rotation-speed", this, Billboard, setRotationSpeed)
-      .describe("the Speed with which the Billboard should rotate");
-
-
 }
 
@@ -107 +106 @@
 
 
-/** this turns on/off the billboarding of this WorldEntity
- *
- * This means that the image will always look in the direction of the Player
+/**
+ * attaches this billboard to a parent
+ * @param pNode node to attach to
  */
-void Billboard::toggleBillboard()
+void Billboard::attachTo(PNode* pNode)
 {
-  this->bBillboarding = !this->bBillboarding;
+  this->source->setParent(pNode);
 }
 
@@ -151 +150 @@
 {
   glPushMatrix();
+
   glTranslatef(this->getAbsCoor2D().x, this->getAbsCoor2D().y, 0);
+  this->material->select();
 
-  //glRotatef(this->getAbsDir2D(), 0,0,1);
-  this->material->select();
   glBegin(GL_TRIANGLE_STRIP);
   glTexCoord2f(0, 0);
@@ -165 +164 @@
   glVertex2f(this->getSizeX2D(), this->getSizeY2D());
   glEnd();
+
   glPopMatrix();
-
 }

branches/network/src/lib/graphics/render2D/billboard.h

@@ -7 +7 @@
 #define _BILLBOARD_H
 
-#include "p_node.h"
+
 #include "element_2d.h"
-#include "event_listener.h"
 
 #include "vector.h"
@@ -32 +31 @@
     void setSize(float sizeX, float sizeY);
     void setTexture(const char* textureFile);
-    /** @param rotationSpeed the speed at what the crosshair should rotate */
-    void setRotationSpeed(float rotationSpeed) { this->rotationSpeed = rotationSpeed; };
-    void toggleBillboard();
+    void attachTo(PNode* pnode);
 
     virtual void tick(float dt);