Source/model tweaks for updated revision.

This commit is contained in:
Joey de Vries
2020-05-04 10:57:08 +02:00
parent 66d51ae668
commit f36653f736
41 changed files with 2067 additions and 20932 deletions

View File

@@ -21,8 +21,8 @@ unsigned int loadTexture(const char *path);
unsigned int loadCubemap(vector<std::string> faces);
// 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));
@@ -195,7 +195,7 @@ int main()
// load textures
// -------------
unsigned int cubeTexture = loadTexture(FileSystem::getPath("resources/textures/marble.jpg").c_str());
unsigned int cubeTexture = loadTexture(FileSystem::getPath("resources/textures/container.jpg").c_str());
vector<std::string> faces
{