s473561/Grafika_Komputerowa_Interstellar_Odyssey
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add tilting up and down for Q, E

Browse Source
This commit is contained in:
Wiktoria Grzesik 2024-01-28 18:08:51 +01:00
parent 315ea823c6
commit bdaaac6577
1 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
cw 7/src/ex_7_1.hpp
View File

@ -87,7 +87,8 @@ float aspectRatio = 1.f;
unsigned int textureID; unsigned int textureID;
float tiltAngle=0; float tiltAngleSide;
float tiltAngleUpDown;
double easeInExpo(double x) { double easeInExpo(double x) {
@ -260,7 +261,12 @@ void renderScene(GLFWwindow* window)
drawObjectTexture(shipContext, drawObjectTexture(shipContext,
glm::translate(spaceshipPos) * specshipCameraRotrationMatrix * glm::eulerAngleY(glm::pi<float>()) * glm::rotate(glm::mat4(), tiltAngle * glm::radians(30.0f), glm::vec3(0, 0, 1)) * glm::scale(glm::vec3(0.025f)), glm::translate(spaceshipPos) *
specshipCameraRotrationMatrix *
glm::eulerAngleY(glm::pi<float>()) *
glm::rotate(glm::mat4(), tiltAngleSide * glm::radians(30.0f), glm::vec3(0, 0, 1)) *
glm::rotate(glm::mat4(), tiltAngleUpDown * glm::radians(20.0f), glm::vec3(1, 0, 0)) *
glm::scale(glm::vec3(0.025f)),
texture::ship, texture::shipNormal, texture::metalnessShip, texture::roughnessShip); texture::ship, texture::shipNormal, texture::metalnessShip, texture::roughnessShip);
//drawObjectTexture(shipContext, //drawObjectTexture(shipContext,
// glm::translate(spaceshipPos) * specshipCameraRotrationMatrix * glm::eulerAngleY(glm::pi<float>())*glm::scale(glm::vec3(0.1f)), // glm::translate(spaceshipPos) * specshipCameraRotrationMatrix * glm::eulerAngleY(glm::pi<float>())*glm::scale(glm::vec3(0.1f)),
@ -461,24 +467,38 @@ void processInput(GLFWwindow* window)
spaceshipPos += spaceshipSide * moveSpeed; spaceshipPos += spaceshipSide * moveSpeed;
if (glfwGetKey(window, GLFW_KEY_Z) == GLFW_PRESS) if (glfwGetKey(window, GLFW_KEY_Z) == GLFW_PRESS)
spaceshipPos -= spaceshipSide * moveSpeed; spaceshipPos -= spaceshipSide * moveSpeed;
if (glfwGetKey(window, GLFW_KEY_Q) == GLFW_PRESS) if (glfwGetKey(window, GLFW_KEY_Q) == GLFW_PRESS){
spaceshipPos += spaceshipUp * moveSpeed; spaceshipPos += spaceshipUp * moveSpeed;
if (glfwGetKey(window, GLFW_KEY_E) == GLFW_PRESS) tiltAngleUpDown -= easeInExpo(x);
}
else {
if (tiltAngleUpDown < 0) {
tiltAngleUpDown += 0.0005;
}
}
if (glfwGetKey(window, GLFW_KEY_E) == GLFW_PRESS){
spaceshipPos -= spaceshipUp * moveSpeed; spaceshipPos -= spaceshipUp * moveSpeed;
tiltAngleUpDown += easeInExpo(x);
}
else {
if (tiltAngleUpDown > 0) {
tiltAngleUpDown -= 0.0005;
}
}
if (glfwGetKey(window, GLFW_KEY_A) == GLFW_PRESS) { if (glfwGetKey(window, GLFW_KEY_A) == GLFW_PRESS) {
spaceshipDir = glm::vec3(glm::eulerAngleY(angleSpeed) * glm::vec4(spaceshipDir, 0)); spaceshipDir = glm::vec3(glm::eulerAngleY(angleSpeed) * glm::vec4(spaceshipDir, 0));
tiltAngle -= easeInExpo(x); tiltAngleSide -= easeInExpo(x);
} else { } else {
if (tiltAngle < 0) { if (tiltAngleSide < 0) {
tiltAngle += 0.0005; tiltAngleSide += 0.0005;
} }
} }
if (glfwGetKey(window, GLFW_KEY_D) == GLFW_PRESS) { if (glfwGetKey(window, GLFW_KEY_D) == GLFW_PRESS) {
spaceshipDir = glm::vec3(glm::eulerAngleY(-angleSpeed) * glm::vec4(spaceshipDir, 0)); spaceshipDir = glm::vec3(glm::eulerAngleY(-angleSpeed) * glm::vec4(spaceshipDir, 0));
tiltAngle += easeInExpo(-x); tiltAngleSide += easeInExpo(-x);
} else { } else {
if (tiltAngle > 0) { if (tiltAngleSide > 0) {
tiltAngle -= 0.0005; tiltAngleSide -= 0.0005;
} }
} }
if (glfwGetKey(window, GLFW_KEY_G) == GLFW_PRESS) if (glfwGetKey(window, GLFW_KEY_G) == GLFW_PRESS)
@ -489,7 +509,8 @@ void processInput(GLFWwindow* window)
cameraPos = spaceshipPos - 0.5 * spaceshipDir + glm::vec3(0, 2, 0) * 0.1f; cameraPos = spaceshipPos - 0.5 * spaceshipDir + glm::vec3(0, 2, 0) * 0.1f;
cameraDir = spaceshipDir; cameraDir = spaceshipDir;
tiltAngle = fmaxf(-1, fminf(1, tiltAngle)); tiltAngleSide = fmaxf(-1, fminf(1, tiltAngleSide));
tiltAngleUpDown = fmaxf(-1, fminf(1, tiltAngleUpDown));
//cameraDir = glm::normalize(-cameraPos); //cameraDir = glm::normalize(-cameraPos);