From d9c12d0b5853a899fa47b0d1d7a3e1b8dc7f2f6b Mon Sep 17 00:00:00 2001 From: Alexis Maiquez Date: Wed, 1 Sep 2021 15:30:00 +0200 Subject: [PATCH] - removed .idea folder as that shouldn't have been uploaded in the first place ~ changed g_Time to float instead of double Signed-off-by: Alexis Maiquez --- .idea/.name | 1 - .idea/misc.xml | 7 - .idea/modules.xml | 8 - .idea/temp.iml | 2 - .idea/vcs.xml | 6 - .idea/workspace.xml | 316 ------------------ main.cpp | 6 +- .../Render/Objects/Effects/CPass.cpp | 2 +- 8 files changed, 4 insertions(+), 344 deletions(-) delete mode 100644 .idea/.name delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/temp.iml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/workspace.xml diff --git a/.idea/.name b/.idea/.name deleted file mode 100644 index d0736e3..0000000 --- a/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -wallengine \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 8822db8..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index ba89347..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/temp.iml b/.idea/temp.iml deleted file mode 100644 index f08604b..0000000 --- a/.idea/temp.iml +++ /dev/null @@ -1,2 +0,0 @@ - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 92bd29a..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,316 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1530110193995 - - - - - - - - - - file://$PROJECT_DIR$/glsl/parser.cpp - 310 - - - file://$PROJECT_DIR$/glsl/parser.cpp - 317 - - - file://$PROJECT_DIR$/glsl/parser.cpp - 641 - - - file://$PROJECT_DIR$/glsl/parser.cpp - 309 - - - file://$PROJECT_DIR$/src/WallpaperEngine/Core/Objects/Images/CMaterial.cpp - 34 - - - file://$PROJECT_DIR$/src/WallpaperEngine/Render/Shaders/Compiler.cpp - 601 - - - - - \ No newline at end of file diff --git a/main.cpp b/main.cpp index 0b53678..73968fc 100644 --- a/main.cpp +++ b/main.cpp @@ -29,7 +29,7 @@ enum BACKGROUND_RUN_MODE RUN_MODE_PACKAGE = 3 }; -double g_Time; +float g_Time; using namespace WallpaperEngine::Core::Types; @@ -246,7 +246,7 @@ int main (int argc, char* argv[]) while (glfwWindowShouldClose (window) == 0) { // calculate the current time value - g_Time += static_cast (endTime - startTime) / CLOCKS_PER_SEC; + g_Time += static_cast (endTime - startTime) / CLOCKS_PER_SEC; // get the start time of the frame startTime = clock (); @@ -270,7 +270,7 @@ int main (int argc, char* argv[]) // ensure the frame time is correct to not overrun FPS if ((endTime - startTime) < minimumTime) - usleep (static_cast ((static_cast (endTime - startTime) / CLOCKS_PER_SEC) * 1000)); + usleep (static_cast ((static_cast ((minimumTime - (endTime - startTime))) / CLOCKS_PER_SEC) * 1000)); } // terminate gl diff --git a/src/WallpaperEngine/Render/Objects/Effects/CPass.cpp b/src/WallpaperEngine/Render/Objects/Effects/CPass.cpp index 1bfb684..8a9f838 100644 --- a/src/WallpaperEngine/Render/Objects/Effects/CPass.cpp +++ b/src/WallpaperEngine/Render/Objects/Effects/CPass.cpp @@ -20,7 +20,7 @@ using namespace WallpaperEngine::Render::Shaders::Variables; using namespace WallpaperEngine::Render::Objects::Effects; -extern double g_Time; +extern float g_Time; CPass::CPass (CMaterial* material, Core::Objects::Images::Materials::CPass* pass) : m_material (material),