Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 254 vs 258 for /trunk/Source Code/Scenes/Headers/Scene.h

Diff revisions: vs.
  @@ -157,6 +157,7 @@
157 157
158 158 typedef Unordered_map<std::string, ParticleEmitter *> ParticleEmitterMap;
159 159 ParticleEmitterMap _particleEmitters;
160 +
160 161 private:
161 162 vectorImpl<Task_ptr> _tasks;
162 163 ///Contains all game related info for the scene (wind speed, visibility ranges, etc)
  @@ -193,6 +194,9 @@
193 194 void clearPhysics();
194 195 /**End loading and unloading logic*/
195 196
197 + // returns true if the camera was moved/rotated/etc
198 + bool defaultCameraControls();
199 +
196 200 Light* addDefaultLight();
197 201 Sky* addDefaultSky();
198 202 Camera* addDefaultCamera();//Default camera
  @@ -221,7 +225,7 @@
221 225 virtual bool onKeyDown(const OIS::KeyEvent& key);
222 226 virtual bool onKeyUp(const OIS::KeyEvent& key);
223 227 virtual bool onJoystickMoveAxis(const OIS::JoyStickEvent& key,I8 axis,I32 deadZone);
224 - virtual bool onJoystickMovePOV(const OIS::JoyStickEvent& key,I8 pov){ return true; }
228 + virtual bool onJoystickMovePOV(const OIS::JoyStickEvent& key, I8 pov);
225 229 virtual bool onJoystickButtonDown(const OIS::JoyStickEvent& key,I8 button){ return true;}
226 230 virtual bool onJoystickButtonUp(const OIS::JoyStickEvent& key, I8 button) { return true; }
227 231 virtual bool sliderMoved( const OIS::JoyStickEvent &arg, I8 index) { return true; }