add different seabed
This commit is contained in:
parent
0e5d73c49d
commit
ffd6bfbb56
90395
grafika_projekt/models/seabed.obj
Normal file
90395
grafika_projekt/models/seabed.obj
Normal file
File diff suppressed because it is too large
Load Diff
@ -389,7 +389,7 @@ void renderScene()
|
|||||||
|
|
||||||
|
|
||||||
glm::mat4 submarineInitialTransformation = glm::translate(glm::vec3(0, -0.5, -0.4)) * glm::rotate(glm::radians(180.0f), glm::vec3(0, 1, 0)) * glm::scale(glm::vec3(0.25f));
|
glm::mat4 submarineInitialTransformation = glm::translate(glm::vec3(0, -0.5, -0.4)) * glm::rotate(glm::radians(180.0f), glm::vec3(0, 1, 0)) * glm::scale(glm::vec3(0.25f));
|
||||||
glm::mat4 floorTransformation = glm::translate(glm::vec3(-50, -skyboxVerticeParameter, 50)) * glm::rotate(glm::radians(0.f), glm::vec3(0, 1, 0)) * glm::scale(glm::vec3(100.f));
|
glm::mat4 floorTransformation = glm::translate(glm::vec3(-50, -40, 50)) * glm::rotate(glm::radians(0.f), glm::vec3(0, 1, 0)) * glm::scale(glm::vec3(1.f));
|
||||||
|
|
||||||
glm::mat4 submarineModelMatrix = glm::translate(cameraPos + cameraDir) * glm::mat4_cast(glm::inverse(rotation)) * submarineInitialTransformation;
|
glm::mat4 submarineModelMatrix = glm::translate(cameraPos + cameraDir) * glm::mat4_cast(glm::inverse(rotation)) * submarineInitialTransformation;
|
||||||
|
|
||||||
@ -546,8 +546,8 @@ void init()
|
|||||||
loadModelToContext("models/sphere.obj", bubbleContext);
|
loadModelToContext("models/sphere.obj", bubbleContext);
|
||||||
textureBubble = Core::LoadTexture("textures/bubble.png");
|
textureBubble = Core::LoadTexture("textures/bubble.png");
|
||||||
|
|
||||||
loadModelToContext("models/floor.obj", floorContext);
|
loadModelToContext("models/seabed.obj", floorContext);
|
||||||
textureFloor = Core::LoadTexture("textures/floor.jpg");
|
textureFloor = Core::LoadTexture("textures/seabed.jpg");
|
||||||
|
|
||||||
generateBubbleArray();
|
generateBubbleArray();
|
||||||
initCube();
|
initCube();
|
||||||
|
BIN
grafika_projekt/textures/seabed.jpg
Normal file
BIN
grafika_projekt/textures/seabed.jpg
Normal file
Binary file not shown.
After Width: | Height: | Size: 433 KiB |
Loading…
Reference in New Issue
Block a user