Changeset 5406 in orxonox.OLD for trunk

Timestamp:

Oct 19, 2005, 6:30:07 PM (19 years ago)

Author:

bensch

Message:

orxonox/trunk: update the Element2D-tree in the right order

Location:

trunk/src

Files:

• Makefile.am (modified) (4 diffs)
• Makefile.in (modified) (4 diffs)
• lib/coord/p_node.cc (modified) (5 diffs)
• lib/coord/p_node.h (modified) (1 diff)
• lib/graphics/graphics_engine.cc (modified) (1 diff)
• lib/graphics/render2D/render_2d.cc (modified) (1 diff)
• lib/graphics/render2D/render_2d.h (modified) (1 diff)
• lib/gui/gl_gui/Makefile.am (modified) (1 diff)
• lib/gui/gl_gui/Makefile.in (modified) (1 diff)
• lib/gui/gl_gui/glgui_handler.cc (modified) (2 diffs)
• lib/gui/gl_gui/glgui_handler.h (modified) (2 diffs)
• lib/gui/gl_gui/glgui_widget.cc (modified) (1 diff)
• lib/shell/shell_completion.cc (modified) (3 diffs)
• story_entities/world.cc (modified) (1 diff)

trunk/src/Makefile.am

@@ -13 +13 @@
                        util/libORXutils.a \
                        lib/gui/gtk_gui/libORXgui.a \
-                       lib/gui/gl_gui/libORXglgui.a \
                        lib/graphics/importer/libORXimporter.a \
                        lib/graphics/libORXgraphics.a \
@@ -23 +22 @@
                        lib/graphics/spatial_separation/libORXquadtree.a \
                        lib/tinyxml/libtinyxml.a \
+                       lib/gui/gl_gui/libORXglgui.a \
                        lib/shell/libORXshell.a
 
@@ -28 +28 @@
                 lib/libORXlibs.a \
                 lib/gui/gtk_gui/libORXgui.a \
-                lib/gui/gl_gui/libORXglgui.a \
                 lib/graphics/importer/libORXimporter.a \
                 lib/graphics/libORXgraphics.a \
@@ -38 +37 @@
                 lib/graphics/spatial_separation/libORXquadtree.a \
                 lib/tinyxml/libtinyxml.a \
+                lib/gui/gl_gui/libORXglgui.a \
                 lib/shell/libORXshell.a \
                 $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)

trunk/src/Makefile.in

@@ -227 +227 @@
                        util/libORXutils.a \
                        lib/gui/gtk_gui/libORXgui.a \
-                       lib/gui/gl_gui/libORXglgui.a \
                        lib/graphics/importer/libORXimporter.a \
                        lib/graphics/libORXgraphics.a \
@@ -237 +236 @@
                        lib/graphics/spatial_separation/libORXquadtree.a \
                        lib/tinyxml/libtinyxml.a \
+                       lib/gui/gl_gui/libORXglgui.a \
                        lib/shell/libORXshell.a
 
@@ -242 +242 @@
                 lib/libORXlibs.a \
                 lib/gui/gtk_gui/libORXgui.a \
-                lib/gui/gl_gui/libORXglgui.a \
                 lib/graphics/importer/libORXimporter.a \
                 lib/graphics/libORXgraphics.a \
@@ -252 +251 @@
                 lib/graphics/spatial_separation/libORXquadtree.a \
                 lib/tinyxml/libtinyxml.a \
+                lib/gui/gl_gui/libORXglgui.a \
                 lib/shell/libORXshell.a \
                 $(GTK2_LIBS) $(GTHREAD_LIBS) $(CURL_LIBS)

trunk/src/lib/coord/p_node.cc

@@ -12 +12 @@
    main-programmer: Patrick Boenzli
    co-programmer:
-
-   @todo Smooth-Parent: delay, speed
 */
 
@@ -31 +29 @@
 #include "vector.h"
 
-//#include "vector.h"
-//#include "quaternion.h"
+#include "color.h"
 
 using namespace std;
@@ -278 +275 @@
   this->setAbsCoor(Vector(x, y, z));
 }
+
+/**
+ * @param absCoord set absolute coordinate
+ * @todo check off
+ */
+void PNode::setAbsCoorSoft (const Vector& absCoordSoft, float bias)
+{
+  if (this->toCoordinate == NULL)
+    this->toCoordinate = new Vector;
+
+  if( likely(this->parentMode & PNODE_MOVEMENT))
+  {
+      /* if you have set the absolute coordinates this overrides all other changes */
+    if (likely(this->parent != NULL))
+      *this->toCoordinate = absCoordSoft - parent->getAbsCoor ();
+    else
+      *this->toCoordinate = absCoordSoft;
+  }
+  if( this->parentMode & PNODE_ROTATE_MOVEMENT)
+  {
+    if (likely(this->parent != NULL))
+      *this->toCoordinate = absCoordSoft - parent->getAbsCoor ();
+    else
+      *this->toCoordinate = absCoordSoft;
+  }
+}
+
 
 /**
@@ -695 +719 @@
   }
 }
-#include "color.h"
 
 /**
@@ -767 +790 @@
     {
       // drawing the Dependency graph
-      if (this != NullParent::getInstance())
+     if (this != NullParent::getInstance())
       {
        glBegin(GL_LINES);

trunk/src/lib/coord/p_node.h

@@ -65 +65 @@
   void setAbsCoor (const Vector& absCoord);
   void setAbsCoor (float x, float y, float z);
+  void setAbsCoorSoft(const Vector& absCoordSoft, float bias = 1.0);
+  void setAbsCoorSoft(float x, float y, float z, float bias = 1.0);
   /** @returns the absolute position */
   inline const Vector& getAbsCoor () const { return this->absCoordinate; };

trunk/src/lib/graphics/graphics_engine.cc

@@ -508 +508 @@
 void GraphicsEngine::update(float dt)
 {
-  NullElement2D::getInstance()->update2D(dt);
+  Render2D::getInstance()->update(dt);
 }
 

trunk/src/lib/graphics/render2D/render_2d.cc

@@ -52 +52 @@
 
 /**
+ * updates all the 2d-elements
+ * @param dt the timestep since last dt
+ */
+void Render2D::update(float dt)
+{
+  NullElement2D::getInstance()->update2D(dt);
+}
+
+
+/**
  * ticks all the 2d-elements
  * @param dt the timestep since last dt

trunk/src/lib/graphics/render2D/render_2d.h

@@ -22 +22 @@
     inline static Render2D* getInstance() { if (!singletonRef) singletonRef = new Render2D();  return singletonRef; };
 
+    void update(float dt);
     void tick(float dt);
     void draw(short layer) const;

trunk/src/lib/gui/gl_gui/Makefile.am

@@ -10 +10 @@
 
 libORXglgui_a_SOURCES = glmenu/glmenu_imagescreen.cc \
-                        glgui_handler.cc \
-                        glgui_mainwidget.cc \
+                        glgui_handler.cc \
+                        glgui_mainwidget.cc \
                         glgui_widget.cc \
                         glgui_button.cc \

trunk/src/lib/gui/gl_gui/Makefile.in

@@ -202 +202 @@
 libORXglgui_a_CPPFLAGS = -DBUILD_ORXONOX
 libORXglgui_a_SOURCES = glmenu/glmenu_imagescreen.cc \
-                        glgui_handler.cc \
-                        glgui_mainwidget.cc \
+                        glgui_handler.cc \
+                        glgui_mainwidget.cc \
                         glgui_widget.cc \
                         glgui_button.cc \

trunk/src/lib/gui/gl_gui/glgui_handler.cc

@@ -18 +18 @@
 #include "glgui_handler.h"
 #include "event_handler.h"
+
+#include "glgui_mainwidget.h"
 
 using namespace std;
@@ -63 +65 @@
 
 }
+
+void GLGuiHandler::draw()
+{
+  GLGuiMainWidget::getInstance()->draw2D(E2D_LAYER_TOP);
+}
+
+
+void GLGuiHandler::tick(float dt)
+{
+
+}

trunk/src/lib/gui/gl_gui/glgui_handler.h

@@ -17 +17 @@
   virtual ~GLGuiHandler(void);
   /** @returns a Pointer to the only object of this Class */
-  inline static GLGuiHandler* getInstance(void) { if (!singletonRef) singletonRef = new GLGuiHandler();  return singletonRef; };
+  inline static GLGuiHandler* getInstance(void) { if (!GLGuiHandler::singletonRef) GLGuiHandler::singletonRef = new GLGuiHandler();  return GLGuiHandler::singletonRef; };
 
   void activate();
@@ -24 +24 @@
 
   virtual void process(const Event &event);
+  void draw();
+  void tick(float dt);
 
  private:

trunk/src/lib/gui/gl_gui/glgui_widget.cc

@@ -50 +50 @@
   this->clickable = true;
   this->setVisibility(GLGUI_WIDGET_DEFAULT_VISIBLE);
-  this->setParent2D((Element2D*)NULL);
+//  this->setParent2D((Element2D*)NULL);
 
   this->backMat = NULL;

trunk/src/lib/shell/shell_completion.cc

@@ -33 +33 @@
 /**
  * standard constructor
-*/
+ */
 ShellCompletion::ShellCompletion(ShellInput* input)
 {
@@ -43 +43 @@
 /**
  * standard deconstructor
-*/
+ */
 ShellCompletion::~ShellCompletion ()
 {
@@ -299 +299 @@
 
 /**
- * searches for classes, which beginn with completionBegin
+ * @brief searches for classes, which beginn with completionBegin
  * @param inputList the List to parse through
  * @param completionBegin the beginning string

trunk/src/story_entities/world.cc

@@ -924 +924 @@
 {
   GarbageCollector::getInstance()->update();
+  GraphicsEngine::getInstance()->update(this->dtS);
   NullParent::getInstance()->update (this->dtS);
-  GraphicsEngine::getInstance()->update(this->dtS);
 
   SoundEngine::getInstance()->update();