add models to makefile, add up/down movement
This commit is contained in:
parent
015368074f
commit
735f88232a
12
Makefile
12
Makefile
|
@ -6,5 +6,15 @@ default: serialize out
|
||||||
serialize: serialize.c types.h
|
serialize: serialize.c types.h
|
||||||
$(CC) $(CFLAGS) serialize.c -o $@
|
$(CC) $(CFLAGS) serialize.c -o $@
|
||||||
|
|
||||||
out: main.c types.h
|
# models
|
||||||
|
resources/plane.mod: serialize resources/plane.obj
|
||||||
|
./serialize resources/plane.obj resources/plane.mod
|
||||||
|
|
||||||
|
resources/monkey.mod: serialize resources/monkey.obj
|
||||||
|
./serialize resources/monkey.obj resources/monkey.mod
|
||||||
|
|
||||||
|
resources/iso.mod: serialize resources/iso.obj
|
||||||
|
./serialize resources/iso.obj resources/iso.mod
|
||||||
|
|
||||||
|
out: main.c types.h resources/plane.mod resources/monkey.mod resources/iso.mod
|
||||||
$(CC) $(CFLAGS) $(LIBS) main.c -o $@
|
$(CC) $(CFLAGS) $(LIBS) main.c -o $@
|
||||||
|
|
6
main.c
6
main.c
|
@ -767,6 +767,12 @@ main(void)
|
||||||
if (keyboard[SDL_SCANCODE_D]) {
|
if (keyboard[SDL_SCANCODE_D]) {
|
||||||
cam.pos = vec3_add(cam.pos, vec3_scalar_mul(cam.right, velocity));
|
cam.pos = vec3_add(cam.pos, vec3_scalar_mul(cam.right, velocity));
|
||||||
}
|
}
|
||||||
|
if (keyboard[SDL_SCANCODE_SPACE]) {
|
||||||
|
cam.pos = vec3_add(cam.pos, vec3_scalar_mul(UP, velocity));
|
||||||
|
}
|
||||||
|
if (keyboard[SDL_SCANCODE_LCTRL]) {
|
||||||
|
cam.pos = vec3_sub(cam.pos, vec3_scalar_mul(UP, velocity));
|
||||||
|
}
|
||||||
|
|
||||||
/* other events */
|
/* other events */
|
||||||
while (SDL_PollEvent(&event)) {
|
while (SDL_PollEvent(&event)) {
|
||||||
|
|
Loading…
Reference in New Issue