nortega/spaceshipsim
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Forgot to update x and y variables.

Browse Source
This commit is contained in:
Nicolás Ortega Froysa 2018-03-25 18:02:09 +02:00
parent b41719855a
commit 8e10be3ea9
No known key found for this signature in database
GPG Key ID: FEC70E3BAE2E69BF
2 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main.c
View File

@ -106,6 +106,9 @@ int main() {
evnt_mngr_deinit(); evnt_mngr_deinit();
al_destroy_display(display); al_destroy_display(display);
#ifdef DEBUG
puts("Destroyed display.");
#endif
al_shutdown_primitives_addon(); al_shutdown_primitives_addon();
#ifdef DEBUG #ifdef DEBUG
puts("Shutdown primitives addon."); puts("Shutdown primitives addon.");

26
src/ship.c
View File

@ -23,12 +23,13 @@
#include <math.h> #include <math.h>
#include <assert.h> #include <assert.h>
#include <allegro5/allegro_primitives.h> #include <allegro5/allegro_primitives.h>
#include <stdio.h>
#ifndef M_PI #ifndef M_PI
# define M_PI 3.14159265f # define M_PI 3.14159265f
#endif #endif
#define ACCEL 10.0f #define ACCEL 0.5f
#define TURN_ACCEL (M_PI / FPS) // turn at pi radians / sec #define TURN_ACCEL (M_PI / FPS) // turn at pi radians / sec
#define SHIP_RADIUS 10.0f // radius of the ship in pixels #define SHIP_RADIUS 10.0f // radius of the ship in pixels
@ -42,6 +43,18 @@ void ship_init(struct ship *ship, int x, int y) {
void ship_update(struct ship *ship) { void ship_update(struct ship *ship) {
assert(ship); assert(ship);
if(key_is_down(KEY_RIGHT))
ship->direction += TURN_ACCEL;
if(key_is_down(KEY_LEFT))
ship->direction -= TURN_ACCEL;
// keep direction within bounds
if(ship->direction >= M_PI * 2)
ship->direction -= M_PI * 2;
else if(ship->direction < 0)
ship->direction += M_PI * 2;
if(key_is_down(KEY_UP)) if(key_is_down(KEY_UP))
{ {
ship->velX += cos(ship->direction) * ACCEL; ship->velX += cos(ship->direction) * ACCEL;
@ -53,16 +66,9 @@ void ship_update(struct ship *ship) {
ship->velX -= cos(ship->direction) * (ACCEL / 2); ship->velX -= cos(ship->direction) * (ACCEL / 2);
ship->velY -= sin(ship->direction) * (ACCEL / 2); ship->velY -= sin(ship->direction) * (ACCEL / 2);
} }
if(key_is_down(KEY_RIGHT))
ship->direction += TURN_ACCEL;
if(key_is_down(KEY_LEFT))
ship->direction -= TURN_ACCEL;
// keep direction within bounds ship->x += ship->velX;
if(ship->direction >= M_PI * 2) ship->y += ship->velY;
ship->direction -= M_PI * 2;
else if(ship->direction < 0)
ship->direction += M_PI * 2;
} }
void ship_draw(struct ship *ship) { void ship_draw(struct ship *ship) {