diff options
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | src/main.c | 6 | ||||
-rw-r--r-- | src/main.h | 2 |
3 files changed, 8 insertions, 2 deletions
@@ -15,7 +15,7 @@ $(OBJDIR): mkdir ${OBJDIR} $(OBJDIR)/%.o: $(SRCDIR)/%.c - ${CC} -g -c $< -o $@ ${CFLAGS} ${INCLUDE} + ${CC} -c $< -o $@ ${CFLAGS} ${INCLUDE} build: $(OBJS) ${CC} $^ -o ${BIN} ${DLIBS} @@ -118,6 +118,10 @@ processCameraInput(GLFWwindow *window, struct Camera *camObj, float deltaTime) camObj->position = linearVec3Add(camObj->position, tmp); } + if (glfwGetKey(window, GLFW_KEY_DOWN)) scale -= 0.1 * speed; + if (glfwGetKey(window, GLFW_KEY_UP)) scale += 0.1 * speed; + if (glfwGetKey(window, GLFW_KEY_ENTER)) scale = 1; + /* * Mouse Input */ @@ -331,7 +335,7 @@ int main(int argc, char *argv[]) proj = linearPerspective(35, (float)width / height, 0.1, 100); T = linearTranslate(0.0, 0.0, 0.0); R = linearRotate(0, 1.0, 0.0, 0.0); - S = linearScale(1, 1, 1); + S = linearScale(scale, scale, scale); model = linearMat4Muln(3, T, R, S); glUseProgram(shader); @@ -1 +1,3 @@ #define vec3(x, y, z) linearVec3(x, y, z).vector + +static float scale = 1; |