mirror of
https://github.com/JoeyDeVries/LearnOpenGL.git
synced 2026-01-30 20:13:22 +08:00
Source/model tweaks for updated revision.
This commit is contained in:
@@ -20,8 +20,8 @@ void processInput(GLFWwindow *window);
|
||||
unsigned int loadTexture(const char *path);
|
||||
|
||||
// settings
|
||||
const unsigned int SCR_WIDTH = 1280;
|
||||
const unsigned int SCR_HEIGHT = 720;
|
||||
const unsigned int SCR_WIDTH = 800;
|
||||
const unsigned int SCR_HEIGHT = 600;
|
||||
bool blinn = false;
|
||||
bool blinnKeyPressed = false;
|
||||
|
||||
|
||||
@@ -20,8 +20,8 @@ void processInput(GLFWwindow *window);
|
||||
unsigned int loadTexture(const char *path, bool gammaCorrection);
|
||||
|
||||
// settings
|
||||
const unsigned int SCR_WIDTH = 1280;
|
||||
const unsigned int SCR_HEIGHT = 720;
|
||||
const unsigned int SCR_WIDTH = 800;
|
||||
const unsigned int SCR_HEIGHT = 600;
|
||||
bool gammaEnabled = false;
|
||||
bool gammaKeyPressed = false;
|
||||
|
||||
|
||||
@@ -23,8 +23,8 @@ void renderCube();
|
||||
void renderQuad();
|
||||
|
||||
// settings
|
||||
const unsigned int SCR_WIDTH = 1280;
|
||||
const unsigned int SCR_HEIGHT = 720;
|
||||
const unsigned int SCR_WIDTH = 800;
|
||||
const unsigned int SCR_HEIGHT = 600;
|
||||
|
||||
// camera
|
||||
Camera camera(glm::vec3(0.0f, 0.0f, 3.0f));
|
||||
|
||||
@@ -23,8 +23,8 @@ void renderCube();
|
||||
void renderQuad();
|
||||
|
||||
// settings
|
||||
const unsigned int SCR_WIDTH = 1280;
|
||||
const unsigned int SCR_HEIGHT = 720;
|
||||
const unsigned int SCR_WIDTH = 800;
|
||||
const unsigned int SCR_HEIGHT = 600;
|
||||
|
||||
// camera
|
||||
Camera camera(glm::vec3(0.0f, 0.0f, 3.0f));
|
||||
|
||||
@@ -23,8 +23,8 @@ void renderCube();
|
||||
void renderQuad();
|
||||
|
||||
// settings
|
||||
const unsigned int SCR_WIDTH = 1280;
|
||||
const unsigned int SCR_HEIGHT = 720;
|
||||
const unsigned int SCR_WIDTH = 800;
|
||||
const unsigned int SCR_HEIGHT = 600;
|
||||
|
||||
// camera
|
||||
Camera camera(glm::vec3(0.0f, 0.0f, 3.0f));
|
||||
|
||||
@@ -22,8 +22,8 @@ void renderScene(const Shader &shader);
|
||||
void renderCube();
|
||||
|
||||
// settings
|
||||
const unsigned int SCR_WIDTH = 1280;
|
||||
const unsigned int SCR_HEIGHT = 720;
|
||||
const unsigned int SCR_WIDTH = 800;
|
||||
const unsigned int SCR_HEIGHT = 600;
|
||||
bool shadows = true;
|
||||
bool shadowsKeyPressed = false;
|
||||
|
||||
|
||||
@@ -22,8 +22,8 @@ void renderScene(const Shader &shader);
|
||||
void renderCube();
|
||||
|
||||
// settings
|
||||
const unsigned int SCR_WIDTH = 1280;
|
||||
const unsigned int SCR_HEIGHT = 720;
|
||||
const unsigned int SCR_WIDTH = 800;
|
||||
const unsigned int SCR_HEIGHT = 600;
|
||||
bool shadows = true;
|
||||
bool shadowsKeyPressed = false;
|
||||
|
||||
|
||||
@@ -21,8 +21,8 @@ unsigned int loadTexture(const char *path);
|
||||
void renderQuad();
|
||||
|
||||
// settings
|
||||
const unsigned int SCR_WIDTH = 1280;
|
||||
const unsigned int SCR_HEIGHT = 720;
|
||||
const unsigned int SCR_WIDTH = 800;
|
||||
const unsigned int SCR_HEIGHT = 600;
|
||||
|
||||
// camera
|
||||
Camera camera(glm::vec3(0.0f, 0.0f, 3.0f));
|
||||
|
||||
@@ -21,8 +21,8 @@ unsigned int loadTexture(const char *path);
|
||||
void renderQuad();
|
||||
|
||||
// settings
|
||||
const unsigned int SCR_WIDTH = 1280;
|
||||
const unsigned int SCR_HEIGHT = 720;
|
||||
const unsigned int SCR_WIDTH = 800;
|
||||
const unsigned int SCR_HEIGHT = 600;
|
||||
float heightScale = 0.1;
|
||||
|
||||
// camera
|
||||
|
||||
@@ -21,8 +21,8 @@ unsigned int loadTexture(const char *path);
|
||||
void renderQuad();
|
||||
|
||||
// settings
|
||||
const unsigned int SCR_WIDTH = 1280;
|
||||
const unsigned int SCR_HEIGHT = 720;
|
||||
const unsigned int SCR_WIDTH = 800;
|
||||
const unsigned int SCR_HEIGHT = 600;
|
||||
float heightScale = 0.1;
|
||||
|
||||
// camera
|
||||
|
||||
@@ -21,8 +21,8 @@ unsigned int loadTexture(const char *path);
|
||||
void renderQuad();
|
||||
|
||||
// settings
|
||||
const unsigned int SCR_WIDTH = 1280;
|
||||
const unsigned int SCR_HEIGHT = 720;
|
||||
const unsigned int SCR_WIDTH = 800;
|
||||
const unsigned int SCR_HEIGHT = 600;
|
||||
float heightScale = 0.1;
|
||||
|
||||
// camera
|
||||
|
||||
@@ -22,8 +22,8 @@ void renderQuad();
|
||||
void renderCube();
|
||||
|
||||
// settings
|
||||
const unsigned int SCR_WIDTH = 1280;
|
||||
const unsigned int SCR_HEIGHT = 720;
|
||||
const unsigned int SCR_WIDTH = 800;
|
||||
const unsigned int SCR_HEIGHT = 600;
|
||||
bool hdr = true;
|
||||
bool hdrKeyPressed = false;
|
||||
float exposure = 1.0f;
|
||||
|
||||
@@ -22,8 +22,8 @@ void renderQuad();
|
||||
void renderCube();
|
||||
|
||||
// settings
|
||||
const unsigned int SCR_WIDTH = 1280;
|
||||
const unsigned int SCR_HEIGHT = 720;
|
||||
const unsigned int SCR_WIDTH = 800;
|
||||
const unsigned int SCR_HEIGHT = 600;
|
||||
bool bloom = true;
|
||||
bool bloomKeyPressed = false;
|
||||
float exposure = 1.0f;
|
||||
|
||||
@@ -21,8 +21,8 @@ void renderQuad();
|
||||
void renderCube();
|
||||
|
||||
// settings
|
||||
const unsigned int SCR_WIDTH = 1280;
|
||||
const unsigned int SCR_HEIGHT = 720;
|
||||
const unsigned int SCR_WIDTH = 880;
|
||||
const unsigned int SCR_HEIGHT = 600;
|
||||
|
||||
// camera
|
||||
Camera camera(glm::vec3(0.0f, 0.0f, 5.0f));
|
||||
|
||||
@@ -21,8 +21,8 @@ void renderQuad();
|
||||
void renderCube();
|
||||
|
||||
// settings
|
||||
const unsigned int SCR_WIDTH = 1280;
|
||||
const unsigned int SCR_HEIGHT = 720;
|
||||
const unsigned int SCR_WIDTH = 800;
|
||||
const unsigned int SCR_HEIGHT = 600;
|
||||
|
||||
// camera
|
||||
Camera camera(glm::vec3(0.0f, 0.0f, 5.0f));
|
||||
|
||||
Reference in New Issue
Block a user