Changeset 3154 for code/branches/pch/src/orxonox/overlays/map/Map.cc

Timestamp:

Jun 13, 2009, 4:30:37 PM (15 years ago)

Author:

rgrieder

Message:

Tried to reduce dependencies in the core. There wasn't much to achieve though…

File:

• code/branches/pch/src/orxonox/overlays/map/Map.cc (modified) (3 diffs)

code/branches/pch/src/orxonox/overlays/map/Map.cc

@@ -31 +31 @@
 #include <OgreBorderPanelOverlayElement.h>
 #include <OgreCamera.h>
+#include <OgreEntity.h>
 #include <OgreHardwarePixelBuffer.h>
 #include <OgreMaterialManager.h>
@@ -50 +51 @@
 #include "core/ConsoleCommand.h"
 #include "core/CoreIncludes.h"
-#include "core/Iterator.h"
+#include "core/ObjectList.h"
 #include "core/XMLPort.h"
 #include "objects/Scene.h"
@@ -265 +266 @@
     }
 
-    Ogre::MaterialPtr Map::createRenderCamera(Ogre::Camera * cam, std::string matName)
+    Ogre::MaterialPtr Map::createRenderCamera(Ogre::Camera * cam, const std::string& matName)
     {
         Ogre::TexturePtr rttTex = Ogre::TextureManager::getSingleton().createManual(matName+"_tex", Ogre::ResourceGroupManager::DEFAULT_RESOURCE_GROUP_NAME, Ogre::TEX_TYPE_2D, 512, 512, 0, Ogre::PF_R8G8B8, Ogre::TU_RENDERTARGET);