Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 114 vs 116 for /trunk/Source Code/Managers/Headers/CameraManager.h

Diff revisions: vs.
  @@ -15,23 +15,27 @@
15 15 along with DIVIDE Framework. If not, see <http://www.gnu.org/licenses/>.
16 16 */
17 17
18 - #include "core.h"
19 18 #ifndef _CAMERA_MANAGER_H
20 19 #define _CAMERA_MANAGER_H
21 20
22 - #include "BaseCache.h"
21 + #include "core.h"
23 22 #include "Rendering/Camera/Headers/Camera.h"
24 23
25 - class FreeFlyCamera;
26 - DEFINE_SINGLETON_EXT1(CameraManager,BaseCache)
24 + DEFINE_SINGLETON(CameraManager)
25 + typedef unordered_map<std::string, Camera*> CameraPool;
27 26
28 27 public:
29 28 Camera* const getActiveCamera();
30 29 void setActiveCamera(const std::string& name);
30 + void addNewCamera(const std::string& cameraName, Camera* const camera);
31 +
32 + private:
33 + CameraManager();
34 + ~CameraManager();
31 35
32 36 private:
33 - CameraManager() {_camera = NULL;}
34 37 Camera* _camera;
38 + CameraPool _cameraPool;
35 39
36 40 END_SINGLETON
37 41