Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 957 vs 968 for /trunk/Source Code/Scenes/MainScene/MainScene.cpp

Diff revisions: vs.
  @@ -54,7 +54,7 @@
54 54 return;
55 55 }
56 56
57 - void MainScene::processInput(PlayerIndex idx, const U64 deltaTime) {
57 + void MainScene::processInput(PlayerIndex idx, const U64 deltaTimeUS) {
58 58 if (state().playerState(idx).cameraUpdated()) {
59 59 Camera& cam = getPlayerForIndex(idx)->getCamera();
60 60 const vec3<F32>& eyePos = cam.getEye();
  @@ -94,14 +94,14 @@
94 94 }
95 95 }
96 96
97 - Scene::processInput(idx, deltaTime);
97 + Scene::processInput(idx, deltaTimeUS);
98 98 }
99 99
100 - void MainScene::processGUI(const U64 deltaTime) {
100 + void MainScene::processGUI(const U64 deltaTimeUS) {
101 101 D64 FpsDisplay = Time::SecondsToMilliseconds(0.5);
102 102 D64 TimeDisplay = Time::SecondsToMilliseconds(1.0);
103 103
104 - if (_guiTimers[0] >= FpsDisplay) {
104 + if (_guiTimersMS[0] >= FpsDisplay) {
105 105 _GUI->modifyText(_ID("fpsDisplay"),
106 106 Util::StringFormat("FPS: %3.0f. FrameTime: %3.1f",
107 107 Time::ApplicationTimer::instance().getFps(),
  @@ -114,19 +114,19 @@
114 114 Util::StringFormat("Number of items in Render Bin: %d. Number of HiZ culled items: %d",
115 115 _context.gfx().parent().renderPassManager().getLastTotalBinSize(RenderStage::DISPLAY),
116 116 _context.gfx().getLastCullCount()));
117 - _guiTimers[0] = 0.0;
117 + _guiTimersMS[0] = 0.0;
118 118 }
119 119
120 - if (_guiTimers[1] >= TimeDisplay) {
120 + if (_guiTimersMS[1] >= TimeDisplay) {
121 121 _GUI->modifyText(_ID("timeDisplay"),
122 122 Util::StringFormat("Elapsed time: %5.0f", Time::ElapsedSeconds()));
123 - _guiTimers[1] = 0.0;
123 + _guiTimersMS[1] = 0.0;
124 124 }
125 125
126 - Scene::processGUI(deltaTime);
126 + Scene::processGUI(deltaTimeUS);
127 127 }
128 128
129 - void MainScene::processTasks(const U64 deltaTime) {
129 + void MainScene::processTasks(const U64 deltaTimeUS) {
130 130 updateLights();
131 131 D64 SunDisplay = Time::SecondsToMilliseconds(1.50);
132 132 if (_taskTimers[0] >= SunDisplay) {
  @@ -145,7 +145,7 @@
145 145 }
146 146 }
147 147
148 - Scene::processTasks(deltaTime);
148 + Scene::processTasks(deltaTimeUS);
149 149 }
150 150
151 151 bool MainScene::load(const stringImpl& name) {
  @@ -291,8 +291,8 @@
291 291
292 292 bool MainScene::loadResources(bool continueOnErrors) {
293 293 _taskTimers.push_back(0.0); // Sun
294 - _guiTimers.push_back(0.0); // Fps
295 - _guiTimers.push_back(0.0); // Time
294 + _guiTimersMS.push_back(0.0); // Fps
295 + _guiTimersMS.push_back(0.0); // Time
296 296
297 297 _sunAngle = vec2<F32>(0.0f, Angle::to_RADIANS(45.0f));
298 298 _sunvector =