Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 167 vs 168 for /trunk/Source Code/Core/Headers/Kernel.h

Diff revisions: vs.
  @@ -29,7 +29,7 @@
29 29
30 30 class GUI;
31 31 class Task;
32 - class Camera;
32 + class Scene;
33 33 class PXDevice;
34 34 class GFXDevice;
35 35 class SFXDevice;
  @@ -46,6 +46,7 @@
46 46 class JoyStickEvent;
47 47 enum MouseButtonID;
48 48 }
49 + struct FrameEvent;
49 50 class InputInterface;
50 51 ///The kernel is the main interface to our engine components:
51 52 ///-video
  @@ -108,8 +109,8 @@
108 109
109 110 private:
110 111 static void FirstLoop();
111 - bool MainLoopScene();
112 - bool presentToScreen();
112 + bool MainLoopScene(FrameEvent& evt);
113 + bool presentToScreen(FrameEvent& evt);
113 114
114 115 private:
115 116 Application& _APP;
  @@ -123,12 +124,12 @@
123 124 GUI& _GUI;
124 125 ///The SceneManager/ Scene Pool
125 126 SceneManager& _sceneMgr;
127 + ///The active scene
128 + Scene* _activeScene;
126 129 ///The ShaderMAnager
127 130 ShaderManager& _shaderMgr;
128 131 ///The manager class responsible for sending frame update events
129 132 FrameListenerManager& _frameMgr;
130 - ///Pointer to the current camera
131 - Camera* _camera;
132 133 ///Access to all of the input devices
133 134 InputInterface& _inputInterface;
134 135 ///General light management and rendering (individual lights are handled by each scene)