Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 334 vs 337 for /trunk/Source Code/Core/Headers/Kernel.h

Diff revisions: vs.
  @@ -20,8 +20,8 @@
20 20
21 21 */
22 22
23 - #ifndef _KERNEL_H_
24 - #define _KERNEL_H_
23 + #ifndef _CORE_KERNEL_H_
24 + #define _CORE_KERNEL_H_
25 25
26 26 #include "Core/Headers/Application.h"
27 27 #include "Managers/Headers/CameraManager.h"
  @@ -42,7 +42,7 @@
42 42 class SceneRenderState;
43 43 class FrameListenerManager;
44 44
45 - enum RenderStage;
45 + enum RenderStage : I32;
46 46
47 47 struct FrameEvent;
48 48 class GUI;
  @@ -107,19 +107,10 @@
107 107 /// Mouse button released
108 108 bool mouseButtonReleased(const Input::MouseEvent& arg, Input::MouseButton button);
109 109
110 - inline Task* AddTask(U64 tickInterval,
111 - I32 numberOfTicks,
112 - const DELEGATE_CBK<>& threadedFunction,
113 - const DELEGATE_CBK<>& onCompletionFunction = DELEGATE_CBK<>()) {
114 - Task* taskPtr = MemoryManager_NEW Task(getThreadPool(), tickInterval, numberOfTicks, threadedFunction);
115 - taskPtr->connect(DELEGATE_BIND(&Kernel::threadPoolCompleted, this, std::placeholders::_1));
116 - if (onCompletionFunction){
117 - emplace(_threadedCallbackFunctions,
118 - static_cast<U64>(taskPtr->getGUID()), onCompletionFunction);
119 - }
120 -
121 - return taskPtr;
122 - }
110 + Task* AddTask(U64 tickInterval,
111 + I32 numberOfTicks,
112 + const DELEGATE_CBK<>& threadedFunction,
113 + const DELEGATE_CBK<>& onCompletionFunction = DELEGATE_CBK<>());
123 114
124 115 private:
125 116 static void firstLoop();
  @@ -132,24 +123,24 @@
132 123
133 124 private:
134 125 friend class SceneManager;
135 - void submitRenderCall(const RenderStage& stage,
126 + void submitRenderCall(const RenderStage& stage,
136 127 const SceneRenderState& sceneRenderState,
137 128 const DELEGATE_CBK<>& sceneRenderCallback) const;
138 129
139 130 private:
140 131 Application& _APP;
141 132 ///Access to the GPU
142 - GFXDevice& _GFX;
133 + GFXDevice& _GFX;
143 134 ///Access to the audio device
144 - SFXDevice& _SFX;
135 + SFXDevice& _SFX;
145 136 ///Access to the physics system
146 - PXDevice& _PFX;
137 + PXDevice& _PFX;
147 138 ///The graphical user interface
148 - GUI& _GUI;
139 + GUI& _GUI;
149 140 ///The input interface
150 141 Input::InputInterface& _input;
151 142 ///The SceneManager/ Scene Pool
152 - SceneManager& _sceneMgr;
143 + SceneManager& _sceneMgr;
153 144 ///Keep track of all active cameras used by the engine
154 145 CameraManager* _cameraMgr;
155 146
  @@ -167,7 +158,7 @@
167 158
168 159 static SharedLock _threadedCallbackLock;
169 160 static vectorImpl<U64 > _threadedCallbackBuffer;
170 - static hashMapImpl<U64, DELEGATE_CBK<> > _threadedCallbackFunctions;
161 + static hashMapImpl<U64, DELEGATE_CBK<> > _threadedCallbackFunctions;
171 162
172 163 //Command line arguments
173 164 I32 _argc;
  @@ -175,4 +166,5 @@
175 166 };
176 167
177 168 }; //namespace Divide
178 - #endif
169 +
170 + #endif //_CORE_KERNEL_H_