diff --git a/cw_8/src/projekt.hpp b/cw_8/src/projekt.hpp index 9aab8ab..16066c1 100644 --- a/cw_8/src/projekt.hpp +++ b/cw_8/src/projekt.hpp @@ -239,7 +239,7 @@ void renderScene(GLFWwindow* window) { float time = glfwGetTime(); updateDeltaTime(time); - drawSkybox(cubeContext, glm::translate(cameraPos), texture::cube); + //drawSkybox(cubeContext, glm::translate(cameraPos), texture::cube); //desired objects go here drawObjectSun(sunContext, glm::scale(glm::vec3(0.1f))); @@ -269,7 +269,12 @@ void renderScene(GLFWwindow* window) { drawObjectPBR(planetContext, glm::eulerAngleY(time / 3) * glm::translate(glm::vec3(0, 0, -3.f)) * glm::eulerAngleY(-1.5f * time) * glm::scale(glm::vec3(0.1f)), texture::earth_albedo, texture::earth_normal, texture::earth_ao, texture::earth_roughness, texture::earth_metallic); drawObjectPBR(planetContext, glm::eulerAngleY(time / 3) * glm::translate(glm::vec3(0, 0, -3.f)) * glm::eulerAngleY( 2.f * time) * glm::translate(glm::vec3(0.4f, 0, 0.4f)) * glm::eulerAngleY(-0.5f * time) * glm::scale(glm::vec3(0.04f)), texture::moon_albedo, texture::moon_normal, texture::moon_ao, texture::moon_roughness, texture::moon_metallic); - drawObjectPBR(stationContext, glm::translate(glm::vec3(0.f, 3.f, 0.f)) * glm::scale(glm::vec3(0.1f)) * glm::eulerAngleY(time), texture::station_albedo, texture::station_normal, texture::station_ao, texture::station_roughness, texture::station_metallic); + drawObjectPBR(stationContext, glm::translate(glm::vec3(0.f, 0.4f, 4.f)) * glm::scale(glm::vec3(0.048f)) * glm::eulerAngleY(time/4), texture::station_albedo, texture::station_normal, texture::station_ao, texture::station_roughness, texture::station_metallic); + //drawObjectPBR(stationContext, glm::translate(glm::vec3(0.f, 0.4f, 4.f)) * glm::scale(glm::vec3(0.05f)) * glm::eulerAngleY(0.5f) * glm::eulerAngleX(time/2), texture::station_albedo, texture::station_normal, texture::station_ao, texture::station_roughness, texture::station_metallic); + drawObjectPBR(stationContext, glm::translate(glm::vec3(0.f, 0.4f, 4.f)) * glm::scale(glm::vec3(0.05f)) * glm::eulerAngleY(0.5f) * glm::eulerAngleYZ(time/3.f,time*3.f), texture::station_albedo, texture::station_normal, texture::station_ao, texture::station_roughness, texture::station_metallic); + drawObjectPBR(stationContext, glm::translate(glm::vec3(0.f, 0.4f, 4.f)) * glm::scale(glm::vec3(0.052f)) * glm::eulerAngleXYZ(time/2,time/2,time/2), texture::station_albedo, texture::station_normal, texture::station_ao, texture::station_roughness, texture::station_metallic); + drawObjectPBR(stationContext, glm::translate(glm::vec3(0.f, 0.4f, 4.f)) * glm::scale(glm::vec3(0.054f)) * glm::eulerAngleX(0.5f) * glm::eulerAngleXZ(time,time), texture::station_albedo, texture::station_normal, texture::station_ao, texture::station_roughness, texture::station_metallic); + //desired objects end here glUseProgram(0); glfwSwapBuffers(window); @@ -301,7 +306,7 @@ void init(GLFWwindow* window) loadModelToContext("./models/sphere.obj", planetContext); - loadModelToContext("./models/station.max", stationContext); + loadModelToContext("./models/station3.obj", stationContext); loadModelToContext("./models/cube.obj", cubeContext); @@ -361,11 +366,18 @@ void init(GLFWwindow* window) texture::moon_ao = Core::LoadTexture("textures/moon/ao.jpg"); texture::moon_metallic = Core::LoadTexture("textures/moon/metallic.png"); - texture::station_albedo = Core::LoadTexture("textures/station/albedo.jpg"); - texture::station_normal = Core::LoadTexture("textures/station/normal.png"); - texture::station_roughness = Core::LoadTexture("textures/station/roughness.jpg"); - texture::station_ao = Core::LoadTexture("textures/station/ao.jpg"); - texture::station_metallic = Core::LoadTexture("textures/station/metallic.jpg"); + //texture::station_albedo = Core::LoadTexture("textures/station1/albedo.jpg"); + //texture::station_normal = Core::LoadTexture("textures/station1/normal.png"); + //texture::station_roughness = Core::LoadTexture("textures/station1/roughness.jpg"); + //texture::station_ao = Core::LoadTexture("textures/station1/ao.jpg"); + //texture::station_metallic = Core::LoadTexture("textures/station1/metallic.jpg"); + + + texture::station_albedo = Core::LoadTexture("textures/station2/ALUM_8L2.JPG"); + texture::station_normal = Core::LoadTexture("textures/station2/ALUM_8L4.JPG"); + texture::station_roughness = Core::LoadTexture("textures/station2/ALUM_809.JPG"); + texture::station_ao = Core::LoadTexture("textures/station2/Alum_panel1.jpg"); + texture::station_metallic = Core::LoadTexture("textures/station2/Aluminium6.jpg"); } void shutdown(GLFWwindow* window) diff --git a/cw_8/textures/station/albedo.jpg b/cw_8/textures/station1/albedo.jpg similarity index 100% rename from cw_8/textures/station/albedo.jpg rename to cw_8/textures/station1/albedo.jpg diff --git a/cw_8/textures/station/ao.jpg b/cw_8/textures/station1/ao.jpg similarity index 100% rename from cw_8/textures/station/ao.jpg rename to cw_8/textures/station1/ao.jpg diff --git a/cw_8/textures/station/metallic.jpg b/cw_8/textures/station1/metallic.jpg similarity index 100% rename from cw_8/textures/station/metallic.jpg rename to cw_8/textures/station1/metallic.jpg diff --git a/cw_8/textures/station/normal.png b/cw_8/textures/station1/normal.png similarity index 100% rename from cw_8/textures/station/normal.png rename to cw_8/textures/station1/normal.png diff --git a/cw_8/textures/station/roughness.jpg b/cw_8/textures/station1/roughness.jpg similarity index 100% rename from cw_8/textures/station/roughness.jpg rename to cw_8/textures/station1/roughness.jpg diff --git a/cw_8/textures/station2/ALUM_809.JPG b/cw_8/textures/station2/ALUM_809.JPG new file mode 100644 index 0000000..ef7ad26 Binary files /dev/null and b/cw_8/textures/station2/ALUM_809.JPG differ diff --git a/cw_8/textures/station2/ALUM_8L2.JPG b/cw_8/textures/station2/ALUM_8L2.JPG new file mode 100644 index 0000000..3ede79d Binary files /dev/null and b/cw_8/textures/station2/ALUM_8L2.JPG differ diff --git a/cw_8/textures/station2/ALUM_8L4.JPG b/cw_8/textures/station2/ALUM_8L4.JPG new file mode 100644 index 0000000..197802e Binary files /dev/null and b/cw_8/textures/station2/ALUM_8L4.JPG differ diff --git a/cw_8/textures/station2/Alum_panel1.jpg b/cw_8/textures/station2/Alum_panel1.jpg new file mode 100644 index 0000000..67d54eb Binary files /dev/null and b/cw_8/textures/station2/Alum_panel1.jpg differ diff --git a/cw_8/textures/station2/Aluminum6.jpg b/cw_8/textures/station2/Aluminum6.jpg new file mode 100644 index 0000000..e3e8e73 Binary files /dev/null and b/cw_8/textures/station2/Aluminum6.jpg differ diff --git a/cw_8/textures/station2/Lights a.gif b/cw_8/textures/station2/Lights a.gif new file mode 100644 index 0000000..c95d6a3 Binary files /dev/null and b/cw_8/textures/station2/Lights a.gif differ diff --git a/cw_8/textures/station2/lights aa.gif b/cw_8/textures/station2/lights aa.gif new file mode 100644 index 0000000..4823c1f Binary files /dev/null and b/cw_8/textures/station2/lights aa.gif differ