Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 151 vs 152 for /trunk/Source Code/Scenes/MainScene/Headers/MainScene.h

Diff revisions: vs.
  @@ -23,14 +23,14 @@
23 23 class Terrain;
24 24 class WaterPlane;
25 25
26 - class MainScene : public Scene{
27 -
26 + class MainScene : public Scene {
28 27 public:
29 - MainScene() : Scene(),
28 + MainScene() : Scene(),
30 29 _waterGraphNode(NULL),
31 30 _water(NULL),
32 31 _beep(NULL),
33 - _mousePressed(false){}
32 + _mousePressed(false),
33 + _freeflyCamera(false){}
34 34
35 35 /*General Scene Requirement*/
36 36 void preRender();
  @@ -39,13 +39,12 @@
39 39 bool unload();
40 40 bool loadResources(bool continueOnErrors);
41 41
42 -
43 42 private:
44 43 /*Specific Scene Requirement*/
45 44 void renderEnvironment(bool waterReflection);
46 45 bool updateLights();
47 46 void processInput();
48 - void processTasks(U32 time);
47 + void processTasks(const U32 time);
49 48 void test(boost::any a, CallbackParam b);
50 49 void onKeyDown(const OIS::KeyEvent& key);
51 50 void onKeyUp(const OIS::KeyEvent& key);
  @@ -54,12 +53,13 @@
54 53 void onMouseClickUp(const OIS::MouseEvent& key,OIS::MouseButtonID button);
55 54
56 55 private:
57 -
56 +
58 57 vec2<F32> _sunAngle;
59 58 vec4<F32> _sunvector,_sunColor;
60 59 F32 _sun_cosy;
61 60 vec2<F32> _prevMouse;
62 61 bool _mousePressed;
62 + bool _freeflyCamera;
63 63 AudioDescriptor* _beep;
64 64 vectorImpl<Terrain*> _visibleTerrains;
65 65 WaterPlane* _water;