maelstrom/openblocks
1
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

It shrinks... and it grows!

Browse source
This commit is contained in:
maelstrom 2024-09-27 23:16:52 +02:00
parent 6b9bea7964
commit 432bb0d562
2 changed files with 47 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
src/main.cpp
View file

@ -14,6 +14,8 @@ void errorCatcher(int id, const char* str);
Camera camera(glm::vec3(0.0, 0.0, 3.0)); Camera camera(glm::vec3(0.0, 0.0, 3.0));
std::vector<Part> parts; std::vector<Part> parts;
int mode = 0;
void keyCallback(GLFWwindow* window, int key, int scancode, int action, int mods); void keyCallback(GLFWwindow* window, int key, int scancode, int action, int mods);
void processInput(GLFWwindow* window); void processInput(GLFWwindow* window);
void mouseCallback(GLFWwindow* window, double xpos, double ypos); void mouseCallback(GLFWwindow* window, double xpos, double ypos);
@ -74,6 +76,20 @@ void processInput(GLFWwindow* window) {
camera.processMovement(DIRECTION_LEFT, deltaTime); camera.processMovement(DIRECTION_LEFT, deltaTime);
if (glfwGetKey(window, GLFW_KEY_D) == GLFW_PRESS) if (glfwGetKey(window, GLFW_KEY_D) == GLFW_PRESS)
camera.processMovement(DIRECTION_RIGHT, deltaTime); camera.processMovement(DIRECTION_RIGHT, deltaTime);
if (mode == 2) {
float shiftFactor = (glfwGetKey(window, GLFW_KEY_LEFT_SHIFT) == GLFW_PRESS) ? -0.5 : 0.5;
shiftFactor *= deltaTime;
if (glfwGetKey(window, GLFW_KEY_X) == GLFW_PRESS) {
parts.back().rotation.x += shiftFactor;
}
if (glfwGetKey(window, GLFW_KEY_Y) == GLFW_PRESS) {
parts.back().rotation.y += shiftFactor;
}
if (glfwGetKey(window, GLFW_KEY_Z) == GLFW_PRESS) {
parts.back().rotation.z += shiftFactor;
}
}
} }
bool mouseCapturing = false; bool mouseCapturing = false;
@ -117,4 +133,31 @@ void keyCallback(GLFWwindow* window, int key, int scancode, int action, int mods
} }
}); });
} }
float shiftFactor = (mods & GLFW_MOD_SHIFT) ? -0.2 : 0.2;
if (mode == 0) {
if (key == GLFW_KEY_X && action == GLFW_PRESS) {
parts.back().position.x += shiftFactor;
}
if (key == GLFW_KEY_Y && action == GLFW_PRESS) {
parts.back().position.y += shiftFactor;
}
if (key == GLFW_KEY_Z && action == GLFW_PRESS) {
parts.back().position.z += shiftFactor;
}
} else if (mode == 1) {
if (key == GLFW_KEY_X && action == GLFW_PRESS) {
parts.back().scale.x += shiftFactor;
}
if (key == GLFW_KEY_Y && action == GLFW_PRESS) {
parts.back().scale.y += shiftFactor;
}
if (key == GLFW_KEY_Z && action == GLFW_PRESS) {
parts.back().scale.z += shiftFactor;
}
}
if (key == GLFW_KEY_M && action == GLFW_PRESS) mode = 0;
if (key == GLFW_KEY_E && action == GLFW_PRESS) mode = 1; // Enlarge
if (key == GLFW_KEY_R && action == GLFW_PRESS) mode = 2;
} }

5
src/rendering/renderer.cpp
View file

@ -4,6 +4,7 @@
#include <glm/ext.hpp> #include <glm/ext.hpp>
#include <glm/ext/matrix_transform.hpp> #include <glm/ext/matrix_transform.hpp>
#include <glm/glm.hpp> #include <glm/glm.hpp>
#include <glm/trigonometric.hpp>
#include <vector> #include <vector>
#include "shader.h" #include "shader.h"
@ -74,8 +75,10 @@ void render(GLFWwindow* window) {
for (Part part : parts) { for (Part part : parts) {
glm::mat4 model = glm::mat4(1.0f); glm::mat4 model = glm::mat4(1.0f);
model = glm::translate(model, part.position); model = glm::translate(model, part.position);
// model = glm::rotate(model, part.position);
model = glm::scale(model, part.scale); model = glm::scale(model, part.scale);
model = glm::rotate(model, part.rotation.x, glm::vec3(1., 0., 0.));
model = glm::rotate(model, part.rotation.y, glm::vec3(0., 1., 0.));
model = glm::rotate(model, part.rotation.z, glm::vec3(0., 0., 1.));
shader->set("model", model); shader->set("model", model);
glm::mat3 normalMatrix = glm::mat3(glm::transpose(glm::inverse(model))); glm::mat3 normalMatrix = glm::mat3(glm::transpose(glm::inverse(model)));
shader->set("normalMatrix", normalMatrix); shader->set("normalMatrix", normalMatrix);