Changeset 8740 in orxonox.OLD for trunk/src

Timestamp:

Jun 23, 2006, 11:22:37 AM (18 years ago)

Author:

bensch

Message:

orxonox/trunk: now the elements are draw correctly

Location:

trunk/src

Files:

• lib/graphics/graphics_engine.cc (modified) (1 diff)
• lib/gui/gl/glgui_button.cc (modified) (1 diff)
• story_entities/game_world.cc (modified) (10 diffs)
• story_entities/game_world.h (modified) (1 diff)
• story_entities/menu/glgui_imagebutton.cc (modified) (3 diffs)
• story_entities/menu/glgui_imagebutton.h (modified) (3 diffs)

trunk/src/lib/graphics/graphics_engine.cc

@@ -615 +615 @@
       dynamic_cast<GraphicsEffect*>(*it)->draw();
   }
-  GraphicsEngine::storeMatrices();
   Shader::suspendShader();
   Render2D::getInstance()->draw(E2D_LAYER_BOTTOM, E2D_LAYER_ABOVE_ALL);

trunk/src/lib/gui/gl/glgui_button.cc

@@ -100 +100 @@
   bool GLGuiButton::processEvent(const Event& event)
   {
-    if (event.type == SDLK_SPACE && !event.bPressed)
+    if (event.type == SDLK_SPACE)
     {
-      emit(released());
+      if (event.bPressed)
+        emit(pushed());
+      else
+        emit(released());
       return true;
     }

trunk/src/story_entities/game_world.cc

@@ -193 +193 @@
   //b->setName("b");
 
-  
+
   LoadParamXML(root, "ScriptManager", &this->scriptManager, ScriptManager, loadParams);
 
@@ -305 +305 @@
     this->tick ();
 
-    
+
     /* update the state */
-    this->update ();
-
-    
+    //this->update (); /// LESS REDUNDANCY.
+    PNode::getNullParent()->updateNode(this->dtS);
+
+
     /* collision detection */
     this->collisionDetection ();
@@ -317 +318 @@
     /* check the game rules */
     this->checkGameRules();
-    
+
     /* update the state */
     this->update ();
@@ -438 +439 @@
   PNode::getNullParent()->updateNode (this->dtS);
   OrxSound::SoundEngine::getInstance()->update();
+
+  this->applyCameraSettings();
   GraphicsEngine::getInstance()->update(this->dtS);
 }
@@ -515 +518 @@
 
 
+void GameWorld::applyCameraSettings()
+{
+  this->dataTank->localCamera->apply ();
+  this->dataTank->localCamera->project ();
+  GraphicsEngine::storeMatrices();
+}
+
+
 
 /**
@@ -523 +534 @@
     // clear buffer
   glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
-  glLoadIdentity();
+//  glLoadIdentity();
 
   const std::list<BaseObject*>* reflectedWaters;
@@ -536 +547 @@
 
       //camera and light
-      this->dataTank->localCamera->apply ();
-      this->dataTank->localCamera->project ();
+      //this->dataTank->localCamera->apply ();
+      //this->dataTank->localCamera->project ();
 
       LightManager::getInstance()->draw();
@@ -565 +576 @@
     // clear buffer
   glClear( GL_COLOR_BUFFER_BIT|GL_DEPTH_BUFFER_BIT);
-  glLoadIdentity();
+  //glLoadIdentity();
 
   const std::list<BaseObject*>* reflectedWaters;
@@ -578 +589 @@
 
       //camera and light
-      this->dataTank->localCamera->apply ();
-      this->dataTank->localCamera->project ();
+      //this->dataTank->localCamera->apply ();
+      //this->dataTank->localCamera->project ();
       // prepare for reflection rendering
       mw->activateRefraction();
@@ -607 +618 @@
 
 
-  glEnable(GL_DEPTH_TEST);
-  glEnable(GL_LIGHTING);
-
-  // set camera
-  this->dataTank->localCamera->apply ();
-  this->dataTank->localCamera->project ();
+  // glEnable(GL_DEPTH_TEST);
+  // glEnable(GL_LIGHTING);
+
+  // set Lighting
   LightManager::getInstance()->draw();
 
+  /* Draw the BackGround */
   this->drawEntityList(State::getObjectManager()->getObjectList(OM_BACKGROUND));
   engine->drawBackgroundElements();

trunk/src/story_entities/game_world.h

@@ -73 +73 @@
     virtual void collisionReaction();
 
+    void applyCameraSettings();
     void drawEntityList(const ObjectManager::EntityList& drawList ) const;
     virtual void renderPassReflection();

trunk/src/story_entities/menu/glgui_imagebutton.cc

@@ -38 +38 @@
   void GLGuiImageButton::releasing(const Vector2D& pos, bool focused)
   {
+    GLGuiPushButton::releasing(pos, focused);
     if (focused)
       this->emit(startLevel(this->levelID));
@@ -55 +56 @@
   {
     GLGuiPushButton::showing();
-    this->image->show();
+
+    //this->image->show();
   }
 
@@ -62 +64 @@
     GLGuiPushButton::hiding();
 
-    this->image->hide();
+    //this->image->hide();
+  }
+
+  bool GLGuiImageButton::processEvent(const Event& event)
+  {
+    if (event.type == SDLK_SPACE)
+    {
+      if (event.bPressed)
+  //      emit(pushed());
+        ;
+      else
+      {
+//        emit(released());
+        emit(startLevel(this->levelID));
+      }
+      return true;
+    }
+    return false;
   }
 
 
+
 }

trunk/src/story_entities/menu/glgui_imagebutton.h

@@ -1 +1 @@
 /*!
- * @file shell.h
- * Definition of a on-screen-shell
+ * @file glgui_imagebutton.h
  *
- * @todo Buffer Display in different Colors for different debug mode.
- * @todo choose color of the Font and the background.
  */
 
@@ -25 +22 @@
 
 
+    void push();
+    void release();
+
     DeclareSignal1(startLevel, int);
 
@@ -35 +35 @@
     virtual void hiding();
 
-
+    virtual bool processEvent(const Event& event);
   private:
     unsigned int        levelID;