lenn/LearnOpenGL
1
0
Fork 0
mirror of https://github.com/JoeyDeVries/LearnOpenGL.git synced 2026-01-30 20:13:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

12
src/6.pbr/1.1.lighting/lighting.cpp
View File

@@ -115,7 +115,7 @@ int main()
{
// per-frame time logic
// --------------------
auto currentFrame = static_cast<GLfloat>(glfwGetTime());
float currentFrame = static_cast<float>(glfwGetTime());
deltaTime = currentFrame - lastFrame;
lastFrame = currentFrame;
@@ -215,8 +215,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)
{
@@ -238,13 +238,13 @@ 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));
}
// renders (and builds at first invocation) a sphere
// -------------------------------------------------
unsigned int sphereVAO = 0;
GLsizei indexCount;
unsigned int indexCount;
void renderSphere()
{
if (sphereVAO == 0)
@@ -300,7 +300,7 @@ void renderSphere()
}
oddRow = !oddRow;
}
indexCount = static_cast<GLsizei>(indices.size());
indexCount = static_cast<unsigned int>(indices.size());
std::vector<float> data;
for (unsigned int i = 0; i < positions.size(); ++i)

12
src/6.pbr/1.2.lighting_textured/lighting_textured.cpp
View File

@@ -120,7 +120,7 @@ int main()
{
// per-frame time logic
// --------------------
auto currentFrame = static_cast<GLfloat>(glfwGetTime());
float currentFrame = static_cast<float>(glfwGetTime());
deltaTime = currentFrame - lastFrame;
lastFrame = currentFrame;
@@ -226,8 +226,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)
{
@@ -249,13 +249,13 @@ 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));
}
// renders (and builds at first invocation) a sphere
// -------------------------------------------------
unsigned int sphereVAO = 0;
GLsizei indexCount;
unsigned int indexCount;
void renderSphere()
{
if (sphereVAO == 0)
@@ -311,7 +311,7 @@ void renderSphere()
}
oddRow = !oddRow;
}
indexCount = static_cast<GLsizei>(indices.size());
indexCount = static_cast<unsigned int>(indices.size());
std::vector<float> data;
for (unsigned int i = 0; i < positions.size(); ++i)

10
src/6.pbr/2.1.1.ibl_irradiance_conversion/ibl_irradiance_conversion.cpp
View File

@@ -214,7 +214,7 @@ int main()
{
// per-frame time logic
// --------------------
auto currentFrame = static_cast<GLfloat>(glfwGetTime());
float currentFrame = static_cast<float>(glfwGetTime());
deltaTime = currentFrame - lastFrame;
lastFrame = currentFrame;
@@ -331,8 +331,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)
{
@@ -360,7 +360,7 @@ void scroll_callback(GLFWwindow* window, double xoffset, double yoffset)
// renders (and builds at first invocation) a sphere
// -------------------------------------------------
unsigned int sphereVAO = 0;
GLsizei indexCount;
unsigned int indexCount;
void renderSphere()
{
if (sphereVAO == 0)
@@ -416,7 +416,7 @@ void renderSphere()
}
oddRow = !oddRow;
}
indexCount = static_cast<GLsizei>(indices.size());
indexCount = static_cast<unsigned int>(indices.size());
std::vector<float> data;
for (unsigned int i = 0; i < positions.size(); ++i)

12
src/6.pbr/2.1.2.ibl_irradiance/ibl_irradiance.cpp
View File

@@ -255,7 +255,7 @@ int main()
{
// per-frame time logic
// --------------------
auto currentFrame = static_cast<GLfloat>(glfwGetTime());
float currentFrame = static_cast<float>(glfwGetTime());
deltaTime = currentFrame - lastFrame;
lastFrame = currentFrame;
@@ -371,8 +371,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)
{
@@ -394,13 +394,13 @@ 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));
}
// renders (and builds at first invocation) a sphere
// -------------------------------------------------
unsigned int sphereVAO = 0;
GLsizei indexCount;
unsigned int indexCount;
void renderSphere()
{
if (sphereVAO == 0)
@@ -456,7 +456,7 @@ void renderSphere()
}
oddRow = !oddRow;
}
indexCount = static_cast<GLsizei>(indices.size());
indexCount = static_cast<unsigned int>(indices.size());
std::vector<float> data;
for (unsigned int i = 0; i < positions.size(); ++i)

12
src/6.pbr/2.2.1.ibl_specular/ibl_specular.cpp
View File

@@ -343,7 +343,7 @@ int main()
{
// per-frame time logic
// --------------------
auto currentFrame = static_cast<GLfloat>(glfwGetTime());
float currentFrame = static_cast<float>(glfwGetTime());
deltaTime = currentFrame - lastFrame;
lastFrame = currentFrame;
@@ -469,8 +469,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)
{
@@ -492,13 +492,13 @@ 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));
}
// renders (and builds at first invocation) a sphere
// -------------------------------------------------
unsigned int sphereVAO = 0;
GLsizei indexCount;
unsigned int indexCount;
void renderSphere()
{
if (sphereVAO == 0)
@@ -554,7 +554,7 @@ void renderSphere()
}
oddRow = !oddRow;
}
indexCount = static_cast<GLsizei>(indices.size());
indexCount = static_cast<unsigned int>(indices.size());
std::vector<float> data;
for (unsigned int i = 0; i < positions.size(); ++i)

8
src/6.pbr/2.2.2.ibl_specular_textured/ibl_specular_textured.cpp
View File

@@ -380,7 +380,7 @@ int main()
{
// per-frame time logic
// --------------------
auto currentFrame = static_cast<GLfloat>(glfwGetTime());
float currentFrame = static_cast<float>(glfwGetTime());
deltaTime = currentFrame - lastFrame;
lastFrame = currentFrame;
@@ -569,8 +569,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)
{
@@ -592,7 +592,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));
}
// renders (and builds at first invocation) a sphere