update merge request as requested by JoeyDeVries: no auto or GLtypes

This commit is contained in:
N. Pattakos
2022-01-10 00:45:44 +01:00
parent 1be7d8ab3e
commit 93be6f82ab
59 changed files with 260 additions and 260 deletions

View File

@@ -160,7 +160,7 @@ int main()
{
// per-frame time logic
// --------------------
auto currentFrame = static_cast<GLfloat>(glfwGetTime());
float currentFrame = static_cast<float>(glfwGetTime());
deltaTime = currentFrame - lastFrame;
lastFrame = currentFrame;
@@ -411,8 +411,8 @@ void framebuffer_size_callback(GLFWwindow* window, int width, int height)
// -------------------------------------------------------
void mouse_callback(GLFWwindow* window, double xposIn, double yposIn)
{
auto xpos = static_cast<GLfloat>(xposIn);
auto ypos = static_cast<GLfloat>(yposIn);
float xpos = static_cast<float>(xposIn);
float ypos = static_cast<float>(yposIn);
if (firstMouse)
{
lastX = xpos;
@@ -433,7 +433,7 @@ void mouse_callback(GLFWwindow* window, double xposIn, double yposIn)
// ----------------------------------------------------------------------
void scroll_callback(GLFWwindow* window, double xoffset, double yoffset)
{
camera.ProcessMouseScroll(static_cast<GLfloat>(yoffset));
camera.ProcessMouseScroll(static_cast<float>(yoffset));
}
// utility function for loading a 2D texture from file