Changeset 3196 for code/trunk/src/orxonox/overlays/map/Map.h
- 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.h
r3101 r3196 25 25 */ 26 26 27 #ifndef _M AP_H__28 #define _M AP_H__27 #ifndef _Map_H__ 28 #define _Map_H__ 29 29 30 #include <string>31 30 #include "OrxonoxPrereqs.h" 32 #include <OgrePrerequisites.h>33 #include <OgreSceneManager.h>34 #include <OgreSceneNode.h>35 #include <OgreEntity.h>36 #include <OgreOverlay.h>37 #include <OgreOverlayElement.h>38 #include <OgreOverlayManager.h>39 #include <OgreOverlayContainer.h>40 #include <OgreMovablePlane.h>41 31 42 #include <OgreBorderPanelOverlayElement.h> 43 #include <OgreTextAreaOverlayElement.h> 32 #include <OgreMaterial.h> 44 33 34 #include "util/UtilPrereqs.h" 35 #include "interfaces/Tickable.h" 45 36 #include "overlays/OrxonoxOverlay.h" 46 #include "objects/Tickable.h"47 48 49 37 50 38 namespace orxonox … … 55 43 public: // functions 56 44 Map(BaseObject* creator); 57 ~Map();45 virtual ~Map(); 58 46 59 47 virtual void XMLPort(Element& xmlElement, XMLPort::Mode mode); … … 61 49 virtual void changedOwner(); 62 50 63 static Ogre::MaterialPtr createRenderCamera(Ogre::Camera * cam, std::stringmatName);51 static Ogre::MaterialPtr createRenderCamera(Ogre::Camera * cam, const std::string& matName); 64 52 65 53 static void openMap(); 54 // HACK! 55 static void hackDestroyMap(); 66 56 67 57 //Not yet implemented … … 126 116 } 127 117 128 #endif /* _M AP_H__ */118 #endif /* _Map_H__ */
Note: See TracChangeset
for help on using the changeset viewer.