Changeset 4843 in orxonox.OLD for orxonox

Timestamp:

Jul 12, 2005, 11:00:48 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: included libORXquadtree.a

Location:

orxonox/trunk/src

Files:

• Makefile.am (modified) (1 diff)
• Makefile.in (modified) (1 diff)
• lib/graphics/render2D/element_2d.cc (modified) (2 diffs)
• lib/graphics/render2D/element_2d.h (modified) (4 diffs)

orxonox/trunk/src/Makefile.am

@@ -26 +26 @@
                 lib/particles/libORXparticles.a \
                 lib/collision_detection/libORXcd.a \
+                lib/graphics/spatial_separation/libORXquadtree.a \
                 lib/tinyxml/libtinyxml.a \
                 $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)

orxonox/trunk/src/Makefile.in

@@ -278 +278 @@
                 lib/particles/libORXparticles.a \
                 lib/collision_detection/libORXcd.a \
+                lib/graphics/spatial_separation/libORXquadtree.a \
                 lib/tinyxml/libtinyxml.a \
                 $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)

orxonox/trunk/src/lib/graphics/render2D/element_2d.cc

@@ -18 +18 @@
 #include "element_2d.h"
 #include "render_2d.h"
+
+#include "graphics_engine.h"
+#include "p_node.h"
 
 using namespace std;
@@ -41 +44 @@
   Render2D::getInstance()->unregisterElement2D(this);
 }
+
+
+/**
+ * this sets the position of the Element on the screen.
+ */
+void Element2D::positioning()
+{
+  // setting the Position of this ELEM2D.
+  Vector pos;
+  if (this->bindNode)
+  {
+    GLdouble x = this->bindNode->getAbsCoor().x;
+    GLdouble y = this->bindNode->getAbsCoor().y;
+    GLdouble z = this->bindNode->getAbsCoor().z;
+    GLdouble projectPos[3];
+    gluProject(x, y, z, GraphicsEngine::modMat, GraphicsEngine::projMat, GraphicsEngine::viewPort, projectPos, projectPos+1, projectPos+2);
+    pos.x = projectPos[0] + this->position2D[0];
+    pos.y = GraphicsEngine::getInstance()->getResolutionY() - projectPos[1] + this->position2D[1];
+    pos.z = projectPos[2];
+  }
+  else
+  {
+    pos.x = this->position2D[0];
+    pos.y = this->position2D[1];
+    pos.z = 0;
+  }
+
+  glPushMatrix();
+}
+

orxonox/trunk/src/lib/graphics/render2D/element_2d.h

@@ -10 +10 @@
 
 // FORWARD DECLARATION
+class PNode;
 
 //!< An enumerator defining the Depth of a 2D-element.
@@ -19 +20 @@
   E2D_BELOW_ALL                        //!< Will be rendered below the 3D-scene. @todo make this work.
 } E2DLayer;
+
+
+typedef enum
+{
+  ELEM2D_ALIGN_LEFT,
+  ELEM2D_ALIGN_RIGHT,
+  ELEM2D_ALIGN_CENTER,
+  ELEM2D_ALIGN_SCREEN_CENTER
+} ELEM2D_ALIGNMENT;
+
 
 //! A class for ...
@@ -32 +43 @@
 
 
+  void positioning();
   virtual void draw() const = NULL;
 
@@ -39 +51 @@
    E2DLayer           layer;
 
+   ELEM2D_ALIGNMENT   alignment;
+   PNode*             bindNode;         //!< a node over which to display this 2D-element
 };