Changeset 1466 for code/branches

Timestamp:

May 28, 2008, 11:40:06 PM (16 years ago)

Author:

janise

Message:

compositors and shader work with hacks. added a directional light

Location:

code/branches/network/src/orxonox

Files:

• GraphicsEngine.cc (modified) (2 diffs)
• GraphicsEngine.h (modified) (1 diff)
• Orxonox.cc (modified) (3 diffs)
• objects/Model.cc (modified) (2 diffs)

code/branches/network/src/orxonox/GraphicsEngine.cc

@@ -48 +48 @@
 #include "console/InGameConsole.h"
 
+#include "core/ConsoleCommand.h"
+#include <OgreSceneManager.h>
+#include <OgreCompositorManager.h>
+#include <OgreViewport.h>
+
 namespace orxonox {
-
+  
+  SetConsoleCommandShortcut(GraphicsEngine, CompositorBloomOn).setAccessLevel(AccessLevel::User);
+  SetConsoleCommandShortcut(GraphicsEngine, CompositorMotionBlurOn).setAccessLevel(AccessLevel::User);
+  SetConsoleCommandShortcut(GraphicsEngine, CompositorBloomOff).setAccessLevel(AccessLevel::User);
+  SetConsoleCommandShortcut(GraphicsEngine, CompositorMotionBlurOff).setAccessLevel(AccessLevel::User);
   /**
     @brief Returns the singleton instance and creates it the first time.
@@ -369 +378 @@
     CommandExecutor::execute("exit", false);
   }
+
+  //HACK!!
+  void GraphicsEngine::CompositorBloomOn()
+  {
+    Ogre::SceneManager* mSceneMgr = GraphicsEngine::getSingleton().getSceneManager();
+    Ogre::Viewport* mViewport = mSceneMgr->getCurrentViewport();
+    Ogre::CompositorManager::getSingleton().addCompositor(mViewport, "Bloom");
+    Ogre::CompositorManager::getSingleton().setCompositorEnabled(mViewport, "Bloom", true);
+  }
+  void GraphicsEngine::CompositorBloomOff()
+  {
+    Ogre::SceneManager* mSceneMgr = GraphicsEngine::getSingleton().getSceneManager();
+    Ogre::Viewport* mViewport = mSceneMgr->getCurrentViewport();
+    Ogre::CompositorManager::getSingleton().setCompositorEnabled(mViewport, "Bloom", false);
+  }
+
+  void GraphicsEngine::CompositorMotionBlurOn()
+  {
+    Ogre::SceneManager* mSceneMgr = GraphicsEngine::getSingleton().getSceneManager();
+    Ogre::Viewport* mViewport = mSceneMgr->getCurrentViewport();
+    Ogre::CompositorManager::getSingleton().addCompositor(mViewport, "MotionBlur");
+    Ogre::CompositorManager::getSingleton().setCompositorEnabled(mViewport, "MotionBlur", true);
+  }
+  void GraphicsEngine::CompositorMotionBlurOff()
+  {
+    Ogre::SceneManager* mSceneMgr = GraphicsEngine::getSingleton().getSceneManager();
+    Ogre::Viewport* mViewport = mSceneMgr->getCurrentViewport();
+    Ogre::CompositorManager::getSingleton().setCompositorEnabled(mViewport, "MotionBlur", false);
+  }
 }

code/branches/network/src/orxonox/GraphicsEngine.h

@@ -83 +83 @@
             static GraphicsEngine* getSingletonPtr() { return &getSingleton(); }
 
+            //HACK!!!
+            void static CompositorBloomOn();
+            void static CompositorBloomOff();
+            void static CompositorMotionBlurOn();
+            void static CompositorMotionBlurOff();
+
+
         private:
             // don't mess with singletons

code/branches/network/src/orxonox/Orxonox.cc

@@ -70 +70 @@
 // objects and tools
 #include "hud/HUD.h"
+#include <Ogre.h>
+
+#include "GraphicsEngine.h"
 
 // FIXME: is this really file scope?
@@ -340 +343 @@
     Level* startlevel = new Level("levels/sample.oxw");
     Loader::open(startlevel);
-
+    
+
+    Ogre::SceneManager* mSceneMgr = GraphicsEngine::getSingleton().getSceneManager();
+    mSceneMgr->setAmbientLight(ColourValue(0.4,0.4,0.4));
+    Ogre::Light* dirlight = mSceneMgr->createLight("Light1");
+
+       dirlight->setType(Ogre::Light::LT_DIRECTIONAL);
+       dirlight->setDirection(Vector3( 0, 1, 5 ));
+       dirlight->setDiffuseColour(ColourValue(0.6, 0.6, 0.4));
+       dirlight->setSpecularColour(ColourValue(1.0, 1.0, 1.0));
+    
     return true;
   }
@@ -380 +393 @@
     clock_t time = 0;
 
+    //Ogre::SceneManager* mSceneMgr = GraphicsEngine::getSingleton().getSceneManager();
+    //Ogre::Viewport* mViewport = mSceneMgr->getCurrentViewport();
+    
+    //Ogre::CompositorManager::getSingleton().addCompositor(mViewport, "Bloom");
+    //Ogre::CompositorManager::getSingleton().addCompositor(mViewport, "MotionBlur");
+
     COUT(3) << "Orxonox: Starting the main loop." << std::endl;
           while (!bAbort_)

code/branches/network/src/orxonox/objects/Model.cc

@@ -34 +34 @@
 #include "GraphicsEngine.h"
 #include "core/XMLPort.h"
+
+#include <OgreEntity.h>
+#include <OgreMesh.h>
+#include <OgreHardwareVertexBuffer.h>
+#include <OgreMeshManager.h>
+
 
 namespace orxonox
@@ -77 +83 @@
         this->mesh_.setMesh(meshSrc_);
         this->attachObject(this->mesh_.getEntity());
+
+        //HACK!!
+        if ((this->meshSrc_ == "assff.mesh") || (this->meshSrc_ == "ast1.mesh") || (this->meshSrc_ == "ast2.mesh") || (this->meshSrc_ == "ast3.mesh") || (this->meshSrc_ == "ast4.mesh") ||(this->meshSrc_ == "ast5.mesh") || (this->meshSrc_ == "ast6.mesh"))
+        {
+          Ogre::MeshPtr pMesh = this->mesh_.getEntity()->getMesh();
+          //set Mesh to tangentspace 
+          unsigned short src, dest;
+          if (!pMesh->suggestTangentVectorBuildParams(Ogre::VES_TANGENT, src, dest))
+          {
+            pMesh->buildTangentVectors(Ogre::VES_TANGENT, src, dest);
+          }
+          if ((this->meshSrc_ == "assff.mesh"))
+          {
+            (this->mesh_.getEntity())->setMaterialName("Assff/BumpMap");
+          }
+          else
+          {
+            (this->mesh_.getEntity())->setMaterialName("Asteroid/BumpMap");
+          }
+
+
+        }
         COUT(4) << "Loader (Model.cc): Created model" << std::endl;
       }