RageCage64
/
SpaceForce
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Hey it's not working but I wanna sleep

Browse Source
main
Braydon Kains 6 years ago
parent eb3f1163aa
commit 44da525a5e
16 changed files with 496 additions and 279 deletions
Show Stats Download Patch File Download Diff File

14
Assignment3Project/Assignment3Project/Assignment3Project.vcxproj
Unescape Escape View File

@ -78,6 +78,15 @@
<Allegro_AddonFont>true</Allegro_AddonFont>
<Allegro_AddonColor>true</Allegro_AddonColor>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
<Allegro_AddonImage>true</Allegro_AddonImage>
<Allegro_AddonTTF>true</Allegro_AddonTTF>
<Allegro_AddonPrimitives>true</Allegro_AddonPrimitives>
<Allegro_AddonAudio>true</Allegro_AddonAudio>
<Allegro_AddonAcodec>true</Allegro_AddonAcodec>
<Allegro_AddonFont>true</Allegro_AddonFont>
<Allegro_AddonColor>true</Allegro_AddonColor>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<WarningLevel>Level3</WarningLevel>
@ -93,6 +102,9 @@
<SDLCheck>true</SDLCheck>
<ConformanceMode>true</ConformanceMode>
</ClCompile>
<Link>
<SubSystem>Windows</SubSystem>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
@ -128,6 +140,7 @@
<ClInclude Include="game.h" />
<ClInclude Include="game_screen.h" />
<ClInclude Include="screen.h" />
<ClInclude Include="ship.h" />
<ClInclude Include="start_screen.h" />
</ItemGroup>
<ItemGroup>
@ -135,6 +148,7 @@
<ClCompile Include="game.cpp" />
<ClCompile Include="game_screen.cpp" />
<ClCompile Include="main.cpp" />
<ClCompile Include="ship.cpp" />
<ClCompile Include="start_screen.cpp" />
</ItemGroup>
<ItemGroup>

6
Assignment3Project/Assignment3Project/Assignment3Project.vcxproj.filters
Unescape Escape View File

@ -51,6 +51,9 @@
<ClInclude Include="start_screen.h">
<Filter>Header Files\Screens</Filter>
</ClInclude>
<ClInclude Include="ship.h">
<Filter>Header Files\Assignment3</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="main.cpp">
@ -68,6 +71,9 @@
<ClCompile Include="start_screen.cpp">
<Filter>Source Files\ScreensImplement</Filter>
</ClCompile>
<ClCompile Include="ship.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />

19
Assignment3Project/Assignment3Project/bullet.cpp
Unescape Escape View File

@ -0,0 +1,19 @@
#include "bullet.h"
Bullet::Bullet() {
speed = 1.0;
height = 20;
width = 5;
}
void Bullet::reset_pos(float x, float y) {
x_pos = x;
y_pos = y;
}
void Bullet::draw() {
al_draw_filled_rectangle(x_pos, y_pos, x_pos + width, y_pos + height, al_map_rgb(0,0,0));
}
void Bullet::move(Direction dir) {
}

14
Assignment3Project/Assignment3Project/bullet.h
Unescape Escape View File

@ -0,0 +1,14 @@
#pragma once
#include <allegro5/allegro.h>
#include <allegro5/allegro_primitives.h>
#include "game_element.h"
class Bullet : public GameElement {
public:
Bullet();
void reset_pos(float x, float y);
void draw();
void move(Direction dir);
};

11
Assignment3Project/Assignment3Project/enums.h
Unescape Escape View File

@ -6,3 +6,14 @@ enum State {
End,
Exit
};
enum Direction {
U,
D,
L,
R,
UR,
UL,
DR,
DL
};

22
Assignment3Project/Assignment3Project/game.cpp
Unescape Escape View File

@ -1,6 +1,4 @@
#include "game.h"
#include "start_screen.h"
#include "game_screen.h"
using std::string;
using std::map;
@ -13,13 +11,14 @@ Game::Game() {
void Game::init() {
score = 0;
state = Start;
//sprites.insert(pair<string, ALLEGRO_BITMAP*>("Title", al_load_bitmap("logo.bmp")));
sprites.insert(pair<string, ALLEGRO_BITMAP*>("Ship", al_load_bitmap("placeholder.bmp")));
//al_reserve_samples(4);
//samples.insert(pair<string, ALLEGRO_SAMPLE*>("Theme", al_load_sample("rasputin.wav")));
font = al_create_builtin_font();
}
@ -30,7 +29,22 @@ void Game::reset() {
//Run the game state machine
void Game::run() {
//Load screens
StartScreen start_screen(sprites);
GameScreen game_screen(sprites, samples);
while (state != Exit) {
switch (state) {
case Start:
start_screen.run(font);
state = start_screen.next_state;
break;
case Gameplay:
game_screen.reset();
game_screen.run(font);
state = start_screen.next_state;
break;
}
}
//Garbage collection
map<string, ALLEGRO_BITMAP*>::iterator it;

3
Assignment3Project/Assignment3Project/game.h
Unescape Escape View File

@ -11,7 +11,8 @@
#include <map>
#include "enums.h"
#include "screen.h"
#include "start_screen.h"
#include "game_screen.h"
//Game state machine, contains data global to game
class Game {

16
Assignment3Project/Assignment3Project/game_element.h
Unescape Escape View File

@ -0,0 +1,16 @@
#pragma once
#include "enums.h"
class GameElement {
public:
float x_pos;
float y_pos;
float speed;
int height;
int width;
virtual void reset_pos(float x, float y) = 0;
virtual void move() = 0;
virtual void draw(Direction dir) = 0;
};

111
Assignment3Project/Assignment3Project/game_screen.cpp
Unescape Escape View File

@ -20,7 +20,7 @@ using std::map;
using std::pair;
enum KEYS {
KEYUP, KEYDOWN, KEYSPACE, KEYCTRL, KEYH, KEYM, KEYESC
KEYUP, KEYDOWN, KEYLEFT, KEYRIGHT, KEYSPACE, KEYCTRL, KEYH, KEYM, KEYESC
};
GameScreen::GameScreen(std::map<std::string, ALLEGRO_BITMAP*> _sprites, std::map<std::string, ALLEGRO_SAMPLE*> _samples) {
@ -30,8 +30,9 @@ GameScreen::GameScreen(std::map<std::string, ALLEGRO_BITMAP*> _sprites, std::map
}
//Resets game to default values, and uses new given values
void GameScreen::reset(int _lines, int _max_catchers, int _difficulty) {
void GameScreen::reset() {
ship.set_sprite(sprites["Ship"]);
ship.reset_pos(SCREEN_W / 2, SCREEN_H / 8);
}
//If a sample needs to be played while it is still being played, it will be stopped first.
@ -50,7 +51,7 @@ void GameScreen::run(ALLEGRO_FONT* font) {
al_register_event_source(event_queue, al_get_keyboard_event_source());
ALLEGRO_TIMER* timer = NULL;
timer = al_create_timer(1.0 / FPS); //Universally a "tick" in the context of the game is 1/10 of a second.
timer = al_create_timer(1.0 / FPS);
al_register_event_source(event_queue, al_get_timer_event_source(timer));
redraw(font);
@ -64,10 +65,40 @@ void GameScreen::run(ALLEGRO_FONT* font) {
while (!exit_screen) {
ALLEGRO_EVENT ev;
al_wait_for_event(event_queue, &ev);
if (ev.type == ALLEGRO_EVENT_TIMER) {
if (ev.type == ALLEGRO_EVENT_TIMER) { //Check per frame
if (keys[KEYUP]) {
//Up is pressed!
if (keys[KEYRIGHT]) {
ship.move(UR);
}
else if (keys[KEYLEFT]) {
ship.move(UL);
}
else {
ship.move(U);
}
}
else if (keys[KEYDOWN]) {
if (keys[KEYRIGHT]) {
ship.move(DR);
}
else if (keys[KEYLEFT]) {
ship.move(DL);
}
else {
ship.move(D);
}
}
else if (keys[KEYLEFT]) {
ship.move(L);
}
else if (keys[KEYRIGHT]) {
ship.move(R);
}
//Global refresh
al_clear_to_color(al_map_rgb(0, 0, 0));
redraw(font);
al_flip_display();
}
if (ev.type == ALLEGRO_EVENT_KEY_DOWN) {
switch (ev.keyboard.keycode) {
@ -77,6 +108,12 @@ void GameScreen::run(ALLEGRO_FONT* font) {
case ALLEGRO_KEY_UP:
keys[KEYUP] = true;
break;
case ALLEGRO_KEY_RIGHT:
keys[KEYRIGHT] = true;
break;
case ALLEGRO_KEY_LEFT:
keys[KEYLEFT] = true;
break;
case ALLEGRO_KEY_SPACE:
keys[KEYSPACE] = true;
break;
@ -94,36 +131,38 @@ void GameScreen::run(ALLEGRO_FONT* font) {
keys[KEYCTRL] = true;
break;
}
if (ev.type == ALLEGRO_EVENT_KEY_UP) {
switch (ev.keyboard.keycode) {
case ALLEGRO_KEY_DOWN:
keys[KEYDOWN] = false;
break;
case ALLEGRO_KEY_UP:
keys[KEYUP] = false;
break;
case ALLEGRO_KEY_SPACE:
keys[KEYSPACE] = false;
break;
case ALLEGRO_KEY_M:
keys[KEYM] = false;
break;
case ALLEGRO_KEY_H:
keys[KEYH] = false;
break;
case ALLEGRO_KEY_ESCAPE:
keys[KEYESC] = false;
break;
case ALLEGRO_KEY_LCTRL:
case ALLEGRO_KEY_RCTRL:
keys[KEYCTRL] = false;
break;
}
}
else if (ev.type == ALLEGRO_EVENT_KEY_UP) {
switch (ev.keyboard.keycode) {
case ALLEGRO_KEY_DOWN:
keys[KEYDOWN] = false;
break;
case ALLEGRO_KEY_UP:
keys[KEYUP] = false;
break;
case ALLEGRO_KEY_RIGHT:
keys[KEYRIGHT] = false;
break;
case ALLEGRO_KEY_LEFT:
keys[KEYLEFT] = false;
break;
case ALLEGRO_KEY_SPACE:
keys[KEYSPACE] = false;
break;
case ALLEGRO_KEY_M:
keys[KEYM] = false;
break;
case ALLEGRO_KEY_H:
keys[KEYH] = false;
break;
case ALLEGRO_KEY_ESCAPE:
keys[KEYESC] = false;
break;
case ALLEGRO_KEY_LCTRL:
case ALLEGRO_KEY_RCTRL:
keys[KEYCTRL] = false;
break;
}
//Global refresh
al_clear_to_color(al_map_rgb(0, 0, 0));
redraw(font);
al_flip_display();
}
}
if (next_state != Exit) { //If the game loop was exited naturally rather than forced by Esc
@ -137,7 +176,7 @@ void GameScreen::run(ALLEGRO_FONT* font) {
//Redraw all elements of the screen
void GameScreen::redraw(ALLEGRO_FONT* font) {
ship.draw();
}
void GameScreen::back() {

11
Assignment3Project/Assignment3Project/game_screen.h
Unescape Escape View File

@ -1,23 +1,24 @@
#pragma once
#include <allegro5/allegro.h>
#include <allegro5/allegro_audio.h>
#include "screen.h"
#include "ship.h"
//Main screen for gameplay
class GameScreen : public Screen {
public:
std::map<std::string, ALLEGRO_BITMAP*> sprites;
std::map<std::string, ALLEGRO_SAMPLE*> samples;
unsigned int selected;
int max_catchers;
int catchers;
int score;
int difficulty;
int level;
bool music;
Ship ship;
GameScreen(std::map<std::string, ALLEGRO_BITMAP*> _sprites, std::map<std::string, ALLEGRO_SAMPLE*> _samples);
void reset(int _lines, int _max_catchers, int _difficulty);
void reset();
void run(ALLEGRO_FONT* font);
void redraw(ALLEGRO_FONT* font);
void back();

3
Assignment3Project/Assignment3Project/main.cpp
Unescape Escape View File

@ -27,6 +27,9 @@ int main() {
if (!al_install_keyboard()) {
fprintf(stderr, "Could not install keyboard!");
}
if (!al_init_primitives_addon()) {
fprintf(stderr, "Could not initialize primitives addon!");
}
ALLEGRO_DISPLAY* display = NULL;
display = al_create_display(SCREEN_W, SCREEN_H);

BIN
Assignment3Project/Assignment3Project/placeholder.bmp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 19 KiB

After

Width:  |  Height:  |  Size: 4.8 KiB

58
Assignment3Project/Assignment3Project/ship.cpp
Unescape Escape View File

@ -0,0 +1,58 @@
#include "ship.h"
Ship::Ship() {
speed = 1.0;
height = 40;
width = 40;
}
void Ship::reset_pos(float x, float y) {
x_pos = x;
y_pos = y;
}
void Ship::set_sprite(ALLEGRO_BITMAP* _sprite) {
sprite = _sprite;
}
void Ship::draw() {
al_draw_bitmap(sprite, x_pos, y_pos, NULL);
}
void Ship::move(Direction dir) {
float factor = 4 * speed;
switch (dir) {
case U:
y_pos -= factor;
break;
case D:
y_pos += factor;
break;
case R:
x_pos += factor;
break;
case L:
x_pos -= factor;
break;
case UR:
x_pos += factor;
y_pos -= factor;
break;
case UL:
x_pos -= factor;
y_pos -= factor;
break;
case DR:
x_pos += factor;
y_pos += factor;
break;
case DL:
x_pos -= factor;
y_pos += factor;
break;
}
}
void Ship::fire() {
}

18
Assignment3Project/Assignment3Project/ship.h
Unescape Escape View File

@ -0,0 +1,18 @@
#pragma once
#include <allegro5/allegro.h>
#include "enums.h"
#include "game_element.h"
class Ship : public GameElement {
public:
ALLEGRO_BITMAP* sprite;
Ship();
void reset_pos(float x, float y);
void set_sprite(ALLEGRO_BITMAP* _sprite);
void draw();
void move(Direction dir);
void fire();
};

11
Assignment3Project/Assignment3Project/start_screen.cpp
Unescape Escape View File

@ -64,12 +64,14 @@ void StartScreen::run(ALLEGRO_FONT * font) {
void StartScreen::redraw(ALLEGRO_FONT* font) {
//al_draw_bitmap(sprites["Title"], SCREEN_W / 2 - 240, 20, NULL); //logo
//Instructions
al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2, SCREEN_H / 2 + 10, ALLEGRO_ALIGN_CENTER, "Mr. Manager wants to run a teambuilding exercise for his employees.");
al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2, SCREEN_H / 2 + 20, ALLEGRO_ALIGN_CENTER, "Help Mr.Manager place his 5 catchers at the end of his");
al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2, SCREEN_H / 2 + 30, ALLEGRO_ALIGN_CENTER, "conveyor belts to make sure no other employees fall off.");
al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2, SCREEN_H / 2 + 40, ALLEGRO_ALIGN_CENTER, "Try to catch enough to help the team bond!");
al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2, SCREEN_H / 2 + 10, ALLEGRO_ALIGN_CENTER, "This is going to be a shootemup.");
al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2, SCREEN_H / 2 + 20, ALLEGRO_ALIGN_CENTER, "Eventually.");
al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2, SCREEN_H / 2 + 30, ALLEGRO_ALIGN_CENTER, "We'll see.");
al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2, SCREEN_H / 2 + 40, ALLEGRO_ALIGN_CENTER, "idek.");
/*
//Keys and their associated functions
al_draw_bitmap(sprites["KeyUp"], SCREEN_W / 8, SCREEN_H / 2 + 60, NULL);
al_draw_bitmap(sprites["KeyUp"], SCREEN_W / 8 + 34, SCREEN_H / 2 + 60, ALLEGRO_FLIP_VERTICAL);
@ -92,6 +94,7 @@ void StartScreen::redraw(ALLEGRO_FONT* font) {
al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2 + 70, SCREEN_H / 2 + 110, ALLEGRO_ALIGN_LEFT, "+");
al_draw_bitmap(sprites["KeyM"], SCREEN_W / 2 + 78, SCREEN_H / 2 + 100, NULL);
al_draw_text(font, al_map_rgb(255, 255, 255), SCREEN_W / 2 + 113, SCREEN_H / 1.3 - 20, ALLEGRO_ALIGN_LEFT, "Toggle Music");
*/
al_draw_text(font, al_map_rgb(255, 255, 255), 0, SCREEN_H - 10, ALLEGRO_ALIGN_LEFT, "Copyright 2019 Braydon Kains");
}

BIN
Try2.xcf
View File

Binary file not shown.
Write Preview
Loading…
Cancel
Save