Changeset 6781 in orxonox.OLD

Timestamp:

Jan 26, 2006, 7:15:22 PM (18 years ago)

Author:

patrick

Message:

network: billboard compiles again

Location:

branches/network/src

Files:

• lib/graphics/render2D/billboard.cc (modified) (6 diffs)
• lib/graphics/render2D/billboard.h (modified) (4 diffs)
• world_entities/image_entity.cc (modified) (3 diffs)
• world_entities/image_entity.h (modified) (1 diff)

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

@@ -62 +62 @@
 
   this->setLayer(E2D_LAYER_TOP);
-  this->setRotationSpeed(5);
   this->setSize(GraphicsEngine::getInstance()->getResolutionX()/10.0, GraphicsEngine::getInstance()->getResolutionY()/10.0);
 
@@ -68 +67 @@
   this->material = new Material;
   this->setTexture("pictures/error_texture.png");
-  this->bBillboarding = false;
 }
 
@@ -85 +83 @@
       .describe("the Speed with which the Billboard should rotate");
 
-  LoadParam(root, "billboarding", this, Billboard, toggleBillboard)
-      .describe("sets the Billboard to always look in the direction of the Player");
+
 }
 
@@ -126 +123 @@
 void Billboard::tick(float dt)
 {
-  // let the crosshair rotate
-  //this->shiftDir2D(dt * rotationSpeed);
-
-
   float z = 0.0f;
   glReadPixels ((int)this->getAbsCoor2D().x,
@@ -138 +131 @@
                  GL_FLOAT,
                  &z);
-
 
   GLdouble objX=.0, objY=.0, objZ=.0;
@@ -150 +142 @@
                &objY,
                &objZ );
-
-  //this->setAbsCoor(objX, objY, objZ);
 }
 
 
 /**
- * draws the crosshair
+ * draws the billboard
  */
 void Billboard::draw() const

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

@@ -4 +4 @@
  */
 
-#ifndef _IMAGE_ENTITY_H
-#define _IMAGE_ENTITY_H
+#ifndef _BILLBOARD_H
+#define _BILLBOARD_H
 
 #include "p_node.h"
@@ -14 +14 @@
 
 
-// FORWARD DECLARATION
+
 class Model;
 class Material;
@@ -20 +20 @@
 
 //! A class that enables the
-class Billboard : public PNode, public Element2D {
+class Billboard :  public Element2D
+{
 
   public:
@@ -38 +39 @@
     virtual void draw() const;
 
+
   private:
-    Material*        material;             //!< a material for the Aim.
+    Material*        material;             //!< a material for the Billboard
     float            rotationSpeed;        //!< Speed of the Rotation.
-    bool             bBillboarding;        //!< true if billboarding is on
+
+    PNode*           source;               //!< the source attached to it
+
 };
 
-#endif /* _IMAGE_ENTITY_H */
+#endif /* _BILLBOARD_H */

branches/network/src/world_entities/image_entity.cc

@@ -49 +49 @@
 {
   if (this->material)
-  delete this->material;
-
-  // delete what has to be deleted here
-
-  GraphicsEngine::showMouse(true);
-  GraphicsEngine::stealWMEvents(false);
+    delete this->material;
 }
 
@@ -90 +85 @@
       .describe("the Speed with which the ImageEntity should rotate");
 
-  LoadParam(root, "billboarding", this, ImageEntity, toggleBillboard)
-      .describe("sets the ImageEntity to always look in the direction of the Player");
+  LoadParam(root, "billboarding", this, ImageEntity, toggleBillboarding)
+      .describe("sets the Billboard to always look in the direction of the Player");
 }
 
@@ -119 +114 @@
  * This means that the image will always look in the direction of the Player
  */
-void ImageEntity::toggleBillboard()
+void ImageEntity::toggleBillboarding()
 {
   this->bBillboarding = !this->bBillboarding;

branches/network/src/world_entities/image_entity.h

@@ -33 +33 @@
   /** @param rotationSpeed the speed at what the crosshair should rotate */
   void setRotationSpeed(float rotationSpeed) { this->rotationSpeed = rotationSpeed; };
-  void toggleBillboard();
+  void toggleBillboarding();
 
   virtual void tick(float dt);