s464988/AkwariumRoom
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

better collision with cuboid

Browse Source
This commit is contained in:
Maks Kulikowski 2023-02-12 16:25:44 +01:00
parent acb0e7bb2a
commit e9904895c4
1 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
cw 9/src/ex_9_1.hpp
View File

@ -776,36 +776,48 @@ void processInput(GLFWwindow* window)
glfwSetWindowShouldClose(window, true); glfwSetWindowShouldClose(window, true);
} }
float minX = -1000.f, maxX = 1000.f, minY = -1000.f, maxY = 1000.f, minZ = -1000.f, maxZ = 1000.f; //float minX = -1000.f, maxX = 1000.f, minY = -1000.f, maxY = 1000.f, minZ = -1000.f, maxZ = 1000.f;
//float minX = -6.f, maxX = -0.47f, minY = 0.65f, maxY = 2.5f, minZ = -4.4f, maxZ = 4.5f; float minX = -6.f, maxX = -0.47f, minY = 0.65f, maxY = 2.5f, minZ = -4.4f, maxZ = 4.5f;
if (glfwGetKey(window, GLFW_KEY_W) == GLFW_PRESS) { if (glfwGetKey(window, GLFW_KEY_W) == GLFW_PRESS) {
glm::vec3 newPos = spaceshipPos + spaceshipDir * moveSpeed; glm::vec3 newPos = spaceshipPos + spaceshipDir * moveSpeed;
if (newPos.x > minX && newPos.x < maxX && newPos.y > minY && newPos.y < maxY && newPos.z > minZ && newPos.z < maxZ) { if (newPos.x > minX && newPos.x < maxX) spaceshipPos.x = newPos.x;
spaceshipPos = newPos;}} if (newPos.y > minY && newPos.y < maxY) spaceshipPos.y = newPos.y;
if (newPos.z > minZ && newPos.z < maxZ) spaceshipPos.z = newPos.z;
}
if (glfwGetKey(window, GLFW_KEY_S) == GLFW_PRESS) { if (glfwGetKey(window, GLFW_KEY_S) == GLFW_PRESS) {
glm::vec3 newPos = spaceshipPos - spaceshipDir * moveSpeed; glm::vec3 newPos = spaceshipPos - spaceshipDir * moveSpeed;
if (newPos.x > minX && newPos.x < maxX && newPos.y > minY && newPos.y < maxY && newPos.z > minZ && newPos.z < maxZ) { if (newPos.x > minX && newPos.x < maxX) spaceshipPos.x = newPos.x;
spaceshipPos = newPos;}} if (newPos.y > minY && newPos.y < maxY) spaceshipPos.y = newPos.y;
if (newPos.z > minZ && newPos.z < maxZ) spaceshipPos.z = newPos.z;
}
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));
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));
if (glfwGetKey(window, GLFW_KEY_C) == GLFW_PRESS) { if (glfwGetKey(window, GLFW_KEY_C) == GLFW_PRESS) {
glm::vec3 newPos = spaceshipPos + spaceshipSide * moveSpeed; glm::vec3 newPos = spaceshipPos + spaceshipSide * moveSpeed;
if (newPos.x > minX && newPos.x < maxX && newPos.y > minY && newPos.y < maxY && newPos.z > minZ && newPos.z < maxZ) { if (newPos.x > minX && newPos.x < maxX) spaceshipPos.x = newPos.x;
spaceshipPos = newPos;}} if (newPos.y > minY && newPos.y < maxY) spaceshipPos.y = newPos.y;
if (newPos.z > minZ && newPos.z < maxZ) spaceshipPos.z = newPos.z;
}
if (glfwGetKey(window, GLFW_KEY_Z) == GLFW_PRESS) { if (glfwGetKey(window, GLFW_KEY_Z) == GLFW_PRESS) {
glm::vec3 newPos = spaceshipPos - spaceshipSide * moveSpeed; glm::vec3 newPos = spaceshipPos - spaceshipSide * moveSpeed;
if (newPos.x > minX && newPos.x < maxX && newPos.y > minY && newPos.y < maxY && newPos.z > minZ && newPos.z < maxZ) { if (newPos.x > minX && newPos.x < maxX) spaceshipPos.x = newPos.x;
spaceshipPos = newPos;}} if (newPos.y > minY && newPos.y < maxY) spaceshipPos.y = newPos.y;
if (newPos.z > minZ && newPos.z < maxZ) spaceshipPos.z = newPos.z;
}
if (glfwGetKey(window, GLFW_KEY_Q) == GLFW_PRESS) { if (glfwGetKey(window, GLFW_KEY_Q) == GLFW_PRESS) {
glm::vec3 newPos = spaceshipPos + spaceshipUp * moveSpeed; glm::vec3 newPos = spaceshipPos + spaceshipUp * moveSpeed;
if (newPos.x > minX && newPos.x < maxX && newPos.y > minY && newPos.y < maxY && newPos.z > minZ && newPos.z < maxZ) { if (newPos.x > minX && newPos.x < maxX) spaceshipPos.x = newPos.x;
spaceshipPos = newPos;}} if (newPos.y > minY && newPos.y < maxY) spaceshipPos.y = newPos.y;
if (newPos.z > minZ && newPos.z < maxZ) spaceshipPos.z = newPos.z;
}
if (glfwGetKey(window, GLFW_KEY_E) == GLFW_PRESS) { if (glfwGetKey(window, GLFW_KEY_E) == GLFW_PRESS) {
glm::vec3 newPos = spaceshipPos - spaceshipUp * moveSpeed; glm::vec3 newPos = spaceshipPos - spaceshipUp * moveSpeed;
if (newPos.x > minX && newPos.x < maxX && newPos.y > minY && newPos.y < maxY && newPos.z > minZ && newPos.z < maxZ) { if (newPos.x > minX && newPos.x < maxX) spaceshipPos.x = newPos.x;
spaceshipPos = newPos;}} if (newPos.y > minY && newPos.y < maxY) spaceshipPos.y = newPos.y;
if (newPos.z > minZ && newPos.z < maxZ) spaceshipPos.z = newPos.z;
}
/* /*
if (glfwGetKey(window, GLFW_KEY_W) == GLFW_PRESS) if (glfwGetKey(window, GLFW_KEY_W) == GLFW_PRESS)