Changeset 3196 for code/trunk/src/orxonox/overlays/map/Map.cc
- Timestamp:
- Jun 20, 2009, 9:20:47 AM (15 years ago)
- Location:
- code/trunk
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
code/trunk
- Property svn:mergeinfo changed
/code/branches/pch (added) merged: 3114-3118,3124-3125,3127-3131,3133,3138-3194
- Property svn:mergeinfo changed
-
code/trunk/src/orxonox/overlays/map/Map.cc
r3110 r3196 24 24 * 25 25 */ 26 26 27 #include "Map.h" 27 28 28 29 #include <string> 29 #include "util/String.h" 30 31 #include <OgreBorderPanelOverlayElement.h> 32 #include <OgreCamera.h> 33 #include <OgreEntity.h> 34 #include <OgreHardwarePixelBuffer.h> 35 #include <OgreMaterialManager.h> 36 #include <OgreMovablePlane.h> 37 #include <OgreOverlay.h> 38 #include <OgreOverlayContainer.h> 39 #include <OgreOverlayManager.h> 40 #include <OgrePass.h> 41 #include <OgreRenderTexture.h> 42 #include <OgreResourceGroupManager.h> 43 #include <OgreRoot.h> 30 44 #include <OgreSceneManager.h> 31 45 #include <OgreSceneNode.h> 32 #include <OgreEntity.h> 33 #include <OgreNode.h> 34 35 36 #include <OgreRenderWindow.h> 37 #include <OgreRenderTexture.h> 46 #include <OgreTechnique.h> 38 47 #include <OgreTexture.h> 48 #include <OgreTextureManager.h> 39 49 #include <OgreViewport.h> 40 50 41 #include <OgreMaterialManager.h> 42 #include <OgreRoot.h> 43 #include <OgreHardwarePixelBuffer.h> 51 #include "core/ConsoleCommand.h" 52 #include "core/CoreIncludes.h" 53 #include "core/XMLPort.h" 54 #include "interfaces/RadarViewable.h" 55 #include "objects/Scene.h" 56 #include "objects/controllers/HumanController.h" 57 #include "objects/worldentities/CameraPosition.h" 44 58 #include "objects/worldentities/ControllableEntity.h" 45 #include "objects/worldentities/CameraPosition.h"46 47 #include <OgreOverlay.h>48 #include <OgreMovablePlane.h>49 #include <OgreOverlayElement.h>50 #include <OgreOverlayManager.h>51 #include <OgreOverlayContainer.h>52 #include "core/CoreIncludes.h"53 #include "core/ConfigValueIncludes.h"54 #include "core/ConsoleCommand.h"55 #include "objects/Scene.h"56 #include "objects/RadarViewable.h"57 #include "objects/controllers/HumanController.h"58 59 59 60 namespace orxonox … … 264 265 } 265 266 266 Ogre::MaterialPtr Map::createRenderCamera(Ogre::Camera * cam, std::stringmatName)267 Ogre::MaterialPtr Map::createRenderCamera(Ogre::Camera * cam, const std::string& matName) 267 268 { 268 269 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); … … 400 401 } 401 402 403 // HACK! 404 void Map::hackDestroyMap() 405 { 406 Map::OverlayMaterial_.setNull(); 407 } 408 402 409 void Map::tick(float dt) 403 410 {
Note: See TracChangeset
for help on using the changeset viewer.