diff --git a/ECS/Components/Texture.h b/ECS/Components/Texture.h index 21d3b46..c9ab2d8 100644 --- a/ECS/Components/Texture.h +++ b/ECS/Components/Texture.h @@ -64,9 +64,6 @@ struct Texture { void addNormalmap(const std::string& path, Settings settings) { normal_id = loadTexture(path, settings); } - - - }; #endif //ECSGAME_TEXTURE_H diff --git a/Resources/Facade01_col.jpg b/Resources/Facade001_2K_Color.jpg similarity index 100% rename from Resources/Facade01_col.jpg rename to Resources/Facade001_2K_Color.jpg diff --git a/Resources/Facade001_2K_Color.png b/Resources/Facade001_2K_Color.png new file mode 100644 index 0000000..d5c7356 Binary files /dev/null and b/Resources/Facade001_2K_Color.png differ diff --git a/Resources/Facade001_2K_Displacement.jpg b/Resources/Facade001_2K_Displacement.jpg new file mode 100644 index 0000000..58ca82b Binary files /dev/null and b/Resources/Facade001_2K_Displacement.jpg differ diff --git a/Resources/Facade001_2K_Metalness.jpg b/Resources/Facade001_2K_Metalness.jpg new file mode 100644 index 0000000..deb2645 Binary files /dev/null and b/Resources/Facade001_2K_Metalness.jpg differ diff --git a/Resources/Facade001_2K_Normal.jpg b/Resources/Facade001_2K_Normal.jpg new file mode 100644 index 0000000..0d9e3db Binary files /dev/null and b/Resources/Facade001_2K_Normal.jpg differ diff --git a/Resources/Facade001_2K_Roughness.jpg b/Resources/Facade001_2K_Roughness.jpg new file mode 100644 index 0000000..b770885 Binary files /dev/null and b/Resources/Facade001_2K_Roughness.jpg differ diff --git a/Resources/Glass.png b/Resources/Glass.png deleted file mode 100644 index d79a8a2..0000000 Binary files a/Resources/Glass.png and /dev/null differ diff --git a/Resources/Grass.jpg b/Resources/Grass.jpg deleted file mode 100644 index 82957dd..0000000 Binary files a/Resources/Grass.jpg and /dev/null differ diff --git a/Resources/Grass_Normal.jpg b/Resources/Grass_Normal.jpg deleted file mode 100644 index b4b04da..0000000 Binary files a/Resources/Grass_Normal.jpg and /dev/null differ diff --git a/Resources/Ground003_2K_Color.jpg b/Resources/Ground003_2K_Color.jpg new file mode 100644 index 0000000..2db3197 Binary files /dev/null and b/Resources/Ground003_2K_Color.jpg differ diff --git a/Resources/Ground003_2K_Displacement.jpg b/Resources/Ground003_2K_Displacement.jpg new file mode 100644 index 0000000..030077c Binary files /dev/null and b/Resources/Ground003_2K_Displacement.jpg differ diff --git a/Resources/Ground003_2K_Normal.jpg b/Resources/Ground003_2K_Normal.jpg new file mode 100644 index 0000000..e20aa38 Binary files /dev/null and b/Resources/Ground003_2K_Normal.jpg differ diff --git a/Resources/Ground003_2K_Roughness.jpg b/Resources/Ground003_2K_Roughness.jpg new file mode 100644 index 0000000..4b9d428 Binary files /dev/null and b/Resources/Ground003_2K_Roughness.jpg differ diff --git a/Resources/Marble.jpg b/Resources/Marble.jpg deleted file mode 100644 index a5b1607..0000000 Binary files a/Resources/Marble.jpg and /dev/null differ diff --git a/Resources/Marble010_2K_Color.jpg b/Resources/Marble010_2K_Color.jpg new file mode 100644 index 0000000..3fa72ee Binary files /dev/null and b/Resources/Marble010_2K_Color.jpg differ diff --git a/Resources/Marble010_2K_Displacement.jpg b/Resources/Marble010_2K_Displacement.jpg new file mode 100644 index 0000000..e679b42 Binary files /dev/null and b/Resources/Marble010_2K_Displacement.jpg differ diff --git a/Resources/Marble010_2K_Normal.jpg b/Resources/Marble010_2K_Normal.jpg new file mode 100644 index 0000000..3c51d5a Binary files /dev/null and b/Resources/Marble010_2K_Normal.jpg differ diff --git a/Resources/Marble010_2K_Roughness.jpg b/Resources/Marble010_2K_Roughness.jpg new file mode 100644 index 0000000..77945a6 Binary files /dev/null and b/Resources/Marble010_2K_Roughness.jpg differ diff --git a/Resources/Gold.jpg b/Resources/Metal007_2K_Color.jpg similarity index 100% rename from Resources/Gold.jpg rename to Resources/Metal007_2K_Color.jpg diff --git a/Resources/Metal007_2K_Displacement.jpg b/Resources/Metal007_2K_Displacement.jpg new file mode 100644 index 0000000..3ba6989 Binary files /dev/null and b/Resources/Metal007_2K_Displacement.jpg differ diff --git a/Resources/Metal007_2K_Metalness.jpg b/Resources/Metal007_2K_Metalness.jpg new file mode 100644 index 0000000..5b0211e Binary files /dev/null and b/Resources/Metal007_2K_Metalness.jpg differ diff --git a/Resources/Metal007_2K_Normal.jpg b/Resources/Metal007_2K_Normal.jpg new file mode 100644 index 0000000..73584f1 Binary files /dev/null and b/Resources/Metal007_2K_Normal.jpg differ diff --git a/Resources/Metal007_2K_Roughness.jpg b/Resources/Metal007_2K_Roughness.jpg new file mode 100644 index 0000000..2f00540 Binary files /dev/null and b/Resources/Metal007_2K_Roughness.jpg differ diff --git a/Resources/Wood.jpg b/Resources/Wood048_2K_Color.jpg similarity index 100% rename from Resources/Wood.jpg rename to Resources/Wood048_2K_Color.jpg diff --git a/Resources/Wood048_2K_Displacement.jpg b/Resources/Wood048_2K_Displacement.jpg new file mode 100644 index 0000000..2edd8ed Binary files /dev/null and b/Resources/Wood048_2K_Displacement.jpg differ diff --git a/Resources/Wood048_2K_Normal.jpg b/Resources/Wood048_2K_Normal.jpg new file mode 100644 index 0000000..7b25e83 Binary files /dev/null and b/Resources/Wood048_2K_Normal.jpg differ diff --git a/Resources/Wood048_2K_Roughness.jpg b/Resources/Wood048_2K_Roughness.jpg new file mode 100644 index 0000000..7f36715 Binary files /dev/null and b/Resources/Wood048_2K_Roughness.jpg differ diff --git a/Resources/tex.png b/Resources/tex.png deleted file mode 100644 index dbf64c7..0000000 Binary files a/Resources/tex.png and /dev/null differ diff --git a/main.cpp b/main.cpp index b5f3180..c220764 100644 --- a/main.cpp +++ b/main.cpp @@ -118,38 +118,33 @@ int main() { monkey->assign(); monkey->assign(std::vector{ObjMesh("Resources/Monkey.obj",ObjMesh::Settings(0.0, 8.0, 0.4, 0.6)), ObjMesh("Resources/MonkeySimple.obj", ObjMesh::Settings(8.0, 100.0, 0.4, 0.6))}); - monkey->assign("Resources/Marble.jpg", Texture::Settings(true), false); + monkey->assign("Resources/Marble010_2K_Color.jpg", Texture::Settings(true), false); + monkey->get()->addNormalmap("Resources/Marble010_2K_Normal.jpg", Texture::Settings(true)); monkey->assign(glm::vec3(0.0, 0.3, 0.0), 0.5); monkey->assign(0.6, 0.6); monkey->get()->set_origin(glm::vec3(0.0f, 2.0f, -6.0f)); - - Entity *monkey2 = world->create(); - monkey2->assign(); - monkey2->assign(std::vector{ObjMesh("Resources/Monkey.obj",ObjMesh::Settings(0.0, 8.0, 0.4, 0.6)), - ObjMesh("Resources/MonkeySimple.obj", ObjMesh::Settings(8.0, 100.0, 0.4, 0.6))}); - monkey2->assign("Resources/Marble.jpg", Texture::Settings(true), false); - monkey2->assign(glm::vec3(0.0, 0.3, 0.0), 0.5); - monkey2->assign(0.6, 0.6); - monkey2->get()->set_origin(glm::vec3(-5.0f, 2.0f, -20.0f)); Entity *wall1 = world->create(); wall1->assign(); wall1->assign(ObjMesh("Resources/Wall.obj", ObjMesh::Settings())); - wall1->assign("Resources/Glass.png", Texture::Settings(true), true); + wall1->assign("Resources/Facade001_2K_Color.png", Texture::Settings(true), true); + wall1->get()->addNormalmap("Resources/Facade001_2K_Normal.jpg", Texture::Settings(true)); wall1->assign(0.2, 0.8); wall1->get()->set_origin(glm::vec3(0.0f, 0.0f, -2.0f)); Entity *wall2 = world->create(); wall2->assign(); wall2->assign(ObjMesh("Resources/Wall.obj", ObjMesh::Settings())); - wall2->assign("Resources/Glass.png", Texture::Settings(true), true); + wall2->assign("Resources/Facade001_2K_Color.png", Texture::Settings(true), true); + wall2->get()->addNormalmap("Resources/Facade001_2K_Normal.jpg", Texture::Settings(true)); wall2->assign(0.2, 0.8); wall2->get()->set_origin(glm::vec3(0.0f, 0.0f, -10.0f)); Entity *wall3 = world->create(); wall3->assign(); wall3->assign(ObjMesh("Resources/Wall.obj", ObjMesh::Settings())); - wall3->assign("Resources/Glass.png", Texture::Settings(true), true); + wall3->assign("Resources/Facade001_2K_Color.png", Texture::Settings(true), true); + wall3->get()->addNormalmap("Resources/Facade001_2K_Normal.jpg", Texture::Settings(true)); wall3->assign(0.2, 0.8); wall3->get()->set_origin(glm::vec3(4.0f, 0.0f, -6.0f)); wall3->get()->rotate(90.0, glm::vec3(0.0, 1.0, 0.0)); @@ -157,7 +152,8 @@ int main() { Entity *wall4 = world->create(); wall4->assign(); wall4->assign(ObjMesh("Resources/Wall.obj", ObjMesh::Settings())); - wall4->assign("Resources/Glass.png", Texture::Settings(true), true); + wall4->assign("Resources/Facade001_2K_Color.png", Texture::Settings(true), true); + wall4->get()->addNormalmap("Resources/Facade001_2K_Normal.jpg", Texture::Settings(true)); wall4->assign(0.2, 0.8); wall4->get()->set_origin(glm::vec3(-4.0f, 0.0f, -6.0f)); wall4->get()->rotate(90.0, glm::vec3(0.0, 1.0, 0.0)); @@ -165,15 +161,16 @@ int main() { Entity *ground = world->create(); ground->assign(); ground->assign(ObjMesh("Resources/Ground.obj", ObjMesh::Settings())); - ground->assign("Resources/Grass.jpg", Texture::Settings(true), false); - ground->get()->addNormalmap("Resources/Grass_Normal.jpg", Texture::Settings(true)); + ground->assign("Resources/Ground003_2K_Color.jpg", Texture::Settings(true), false); + ground->get()->addNormalmap("Resources/Ground003_2K_Normal.jpg", Texture::Settings(true)); ground->assign(1.0, 0.0); ground->get()->set_origin(glm::vec3(0.0f, 0.0f, 0.0f)); Entity *bench = world->create(); bench->assign(); bench->assign(ObjMesh("Resources/bench.obj", ObjMesh::Settings())); - bench->assign("Resources/Wood.jpg", Texture::Settings(true), false); + bench->assign("Resources/Wood048_2K_Color.jpg", Texture::Settings(true), false); + bench->get()->addNormalmap("Resources/Wood048_2K_Normal.jpg", Texture::Settings(true)); bench->assign(0.8, 0.2); bench->get()->set_origin(glm::vec3(8.0f, 0.0f, 0.0f)); bench->get()->rotate(-90.0, glm::vec3(0.0, 1.0, 0.0)); @@ -181,7 +178,8 @@ int main() { Entity *ring = world->create(); ring->assign(); ring->assign(ObjMesh("Resources/ring.obj", ObjMesh::Settings())); - ring->assign("Resources/Gold.jpg", Texture::Settings(true), false); + ring->assign("Resources/Metal007_2K_Color.jpg", Texture::Settings(true), false); + ring->get()->addNormalmap("Resources/Metal007_2K_Normal.jpg", Texture::Settings(true)); ring->assign(0.1, 0.9); ring->get()->set_origin(glm::vec3(-5.0f, 2.0f, 0.0f)); @@ -206,6 +204,7 @@ int main() { renderSystem->render(world, defaultShader, shadowShader, debugShader); ring->get()->rotate(delta * 100.0, glm::vec3(0.0, 1.0, 0.0)); + sun->get()->direction = glm::normalize(glm::vec3(glm::rotate(glm::mat4(1), (float)elapsed_time, glm::vec3(0.0, 1.0, 0.0)) * glm::vec4(1.0, 1.0, 1.0, 0.0))); /* Swap front and back buffers */ glfwSwapBuffers(window);