Index: vulkan-game.cpp =================================================================== --- vulkan-game.cpp (revision 5ba732adf847f4b1e8aacbde7dc7c7c2de313697) +++ vulkan-game.cpp (revision 6104594eaf6ed43ec207e10ac8199d9e321f928f) @@ -598,13 +598,13 @@ this->startTime = high_resolution_clock::now(); - this->curTime = duration(high_resolution_clock::now() - this->startTime).count(); - - lastSpawn_asteroid = this->curTime; + curTime = duration(high_resolution_clock::now() - this->startTime).count(); + + lastSpawn_asteroid = curTime; while (!quit) { - this->prevTime = this->curTime; - this->curTime = duration(high_resolution_clock::now() - this->startTime).count(); - this->elapsedTime = this->curTime - this->prevTime; + this->prevTime = curTime; + curTime = duration(high_resolution_clock::now() - this->startTime).count(); + this->elapsedTime = curTime - this->prevTime; gui->processEvents(); @@ -705,5 +705,5 @@ model.model_transform = translate(mat4(1.0f), vec3(0.0f, -2.0f, -0.0f)) * - rotate(mat4(1.0f), this->curTime * radians(90.0f), vec3(0.0f, 0.0f, 1.0f)); + rotate(mat4(1.0f), curTime * radians(90.0f), vec3(0.0f, 0.0f, 1.0f)); model.modified = true; } @@ -727,66 +727,66 @@ } - if (this->curTime - this->lastSpawn_asteroid > this->spawnRate_asteroid) { - this->lastSpawn_asteroid = this->curTime; + if (curTime - this->lastSpawn_asteroid > this->spawnRate_asteroid) { + this->lastSpawn_asteroid = curTime; SceneObject& asteroid = addObject( asteroidObjects, asteroidPipeline, addObjectIndex(asteroidObjects.size(), - addVertexNormals({ - - // front - {{ 1.0f, 1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, - {{-1.0f, 1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, - {{-1.0f, -1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, - {{ 1.0f, 1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, - {{-1.0f, -1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, - {{ 1.0f, -1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, - - // top - {{ 1.0f, 1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, - {{-1.0f, 1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, - {{-1.0f, 1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, - {{ 1.0f, 1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, - {{-1.0f, 1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, - {{ 1.0f, 1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, - - // bottom - {{ 1.0f, -1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, - {{-1.0f, -1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, - {{-1.0f, -1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, - {{ 1.0f, -1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, - {{-1.0f, -1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, - {{ 1.0f, -1.0f, -1.0}, {0.4f, 0.4f, 0.4f}}, - - // back - {{ 1.0f, 1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, - {{-1.0f, -1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, - {{-1.0f, 1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, - {{ 1.0f, 1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, - {{ 1.0f, -1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, - {{-1.0f, -1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, - - // right - {{ 1.0f, 1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, - {{ 1.0f, 1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, - {{ 1.0f, -1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, - {{ 1.0f, 1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, - {{ 1.0f, -1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, - {{ 1.0f, -1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, - - // left - {{-1.0f, 1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, - {{-1.0f, 1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, - {{-1.0f, -1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, - {{-1.0f, 1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, - {{-1.0f, -1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, - {{-1.0f, -1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, - })), { - 0, 1, 2, 3, 4, 5, - 6, 7, 8, 9, 10, 11, - 12, 13, 14, 15, 16, 17, - 18, 19, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 29, - 30, 31, 32, 33, 34, 35, + addVertexNormals({ + + // front + {{ 1.0f, 1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, + {{-1.0f, 1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, + {{-1.0f, -1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, + {{ 1.0f, 1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, + {{-1.0f, -1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, + {{ 1.0f, -1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, + + // top + {{ 1.0f, 1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, + {{-1.0f, 1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, + {{-1.0f, 1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, + {{ 1.0f, 1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, + {{-1.0f, 1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, + {{ 1.0f, 1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, + + // bottom + {{ 1.0f, -1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, + {{-1.0f, -1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, + {{-1.0f, -1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, + {{ 1.0f, -1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, + {{-1.0f, -1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, + {{ 1.0f, -1.0f, -1.0}, {0.4f, 0.4f, 0.4f}}, + + // back + {{ 1.0f, 1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, + {{-1.0f, -1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, + {{-1.0f, 1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, + {{ 1.0f, 1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, + {{ 1.0f, -1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, + {{-1.0f, -1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, + + // right + {{ 1.0f, 1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, + {{ 1.0f, 1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, + {{ 1.0f, -1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, + {{ 1.0f, 1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, + {{ 1.0f, -1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, + {{ 1.0f, -1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, + + // left + {{-1.0f, 1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, + {{-1.0f, 1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, + {{-1.0f, -1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, + {{-1.0f, 1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, + {{-1.0f, -1.0f, -1.0f}, {0.4f, 0.4f, 0.4f}}, + {{-1.0f, -1.0f, 1.0f}, {0.4f, 0.4f, 0.4f}}, + })), { + 0, 1, 2, 3, 4, 5, + 6, 7, 8, 9, 10, 11, + 12, 13, 14, 15, 16, 17, + 18, 19, 20, 21, 22, 23, + 24, 25, 26, 27, 28, 29, + 30, 31, 32, 33, 34, 35, }, { mat4(1.0f), Index: vulkan-game.hpp =================================================================== --- vulkan-game.hpp (revision 5ba732adf847f4b1e8aacbde7dc7c7c2de313697) +++ vulkan-game.hpp (revision 6104594eaf6ed43ec207e10ac8199d9e321f928f) @@ -91,4 +91,7 @@ // them mamdatory +// TODO: Make a singleton timer class instead +static float curTime; + class VulkanGame { public: @@ -199,5 +202,5 @@ time_point startTime; - float curTime, prevTime, elapsedTime; + float prevTime, elapsedTime; float shipSpeed = 0.5f;