X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=e2304337f11b3147340eed50338c0d71a718f892;hb=2e0bbc9fcc1cce3e1faeff85cc63de7f676e8077;hp=3ec99459014e6687127018e181b84b2c9b2bbea6;hpb=d997e6743dfa0df245bc3f59ee97ecd63efb3c4f;p=l2e.git

diff --git a/src/main.cpp b/src/main.cpp
index 3ec9945..e230433 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -6,25 +6,35 @@
  */
 
 #include "app/Application.h"
+#include "app/Input.h"
 #include "battle/BattleState.h"
 #include "battle/Hero.h"
 #include "battle/Monster.h"
 #include "battle/PartyLayout.h"
 #include "geometry/Point.h"
+#include "graphics/Frame.h"
+#include "graphics/Gauge.h"
 #include "graphics/Sprite.h"
+#include "sdl/InitImage.h"
 #include "sdl/InitScreen.h"
 #include "sdl/InitSDL.h"
 
 #include <exception>
 #include <iostream>
+#include <SDL.h>
+#include <SDL_image.h>
 
 using app::Application;
+using app::Input;
 using battle::BattleState;
 using battle::Hero;
 using battle::Monster;
 using battle::PartyLayout;
 using geometry::Point;
+using graphics::Frame;
+using graphics::Gauge;
 using graphics::Sprite;
+using sdl::InitImage;
 using sdl::InitScreen;
 using sdl::InitSDL;
 
@@ -37,38 +47,55 @@ int main(int argc, char **argv) {
 	const int width = 800;
 	const int height = 480;
 
-	// temporary test data
-	SDL_Surface *bg(SDL_CreateRGBSurface(0, width, height, 32, 0xFF000000, 0xFF0000, 0xFF00, 0xFF));
-	SDL_FillRect(bg, 0, SDL_MapRGB(bg->format, 0xFF, 0xFF, 0xFF));
-	SDL_Rect r;
-	r.x = 1;
-	r.y = 1;
-	r.w = width - 2;
-	r.h = height - 2;
-	SDL_FillRect(bg, &r, SDL_MapRGB(bg->format, 0, 0, 0));
-	PartyLayout monstersLayout;
-	monstersLayout.AddPosition(Point<Uint8>(50, 100));
-	monstersLayout.AddPosition(Point<Uint8>(100, 100));
-	monstersLayout.AddPosition(Point<Uint8>(150, 100));
-	monstersLayout.AddPosition(Point<Uint8>(200, 100));
-	PartyLayout heroesLayout;
-	heroesLayout.AddPosition(Point<Uint8>(27, 219));
-	heroesLayout.AddPosition(Point<Uint8>(104, 227));
-	heroesLayout.AddPosition(Point<Uint8>(66, 238));
-	heroesLayout.AddPosition(Point<Uint8>(143, 246));
-	SDL_Surface *white96(SDL_CreateRGBSurface(0, 96, 96, 32, 0xFF000000, 0xFF0000, 0xFF00, 0xFF));
-	SDL_FillRect(white96, 0, SDL_MapRGB(bg->format, 0xFF, 0xFF, 0xFF));
-	Sprite dummySprite(white96, 96, 96);
-	Monster monster;
-	monster.SetSprite(&dummySprite);
-	Hero hero;
-	hero.SetSprite(&dummySprite);
-
 	try {
 		InitSDL sdl;
+		InitImage image(IMG_INIT_PNG);
 		InitScreen screen(width, height);
 
-		BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout));
+		// temporary test data
+		SDL_Surface *bg(IMG_Load("test-data/battle-bg.png"));
+		PartyLayout monstersLayout;
+		monstersLayout.AddPosition(Point<Uint8>(50, 100));
+		monstersLayout.AddPosition(Point<Uint8>(100, 108));
+		monstersLayout.AddPosition(Point<Uint8>(150, 100));
+		monstersLayout.AddPosition(Point<Uint8>(200, 108));
+		PartyLayout heroesLayout;
+		heroesLayout.AddPosition(Point<Uint8>(27, 219));
+		heroesLayout.AddPosition(Point<Uint8>(104, 227));
+		heroesLayout.AddPosition(Point<Uint8>(66, 238));
+		heroesLayout.AddPosition(Point<Uint8>(143, 246));
+
+		SDL_Surface *monsterImg(IMG_Load("test-data/monster.png"));
+		Sprite dummySprite(monsterImg, 96, 96);
+		Monster monster;
+		monster.SetSprite(&dummySprite);
+
+		SDL_Surface *heroImg(IMG_Load("test-data/hero.png"));
+		Sprite heroSprite(heroImg, 64, 64);
+		Hero hero;
+		hero.SetName("Name");
+		hero.SetLevel(34);
+		hero.SetSprite(&heroSprite);
+		hero.SetMaxHealth(100);
+		hero.SetHealth(50);
+		hero.SetMaxMana(100);
+		hero.SetMana(0);
+		hero.SetIP(255);
+
+		SDL_Surface *attackIcons(IMG_Load("test-data/attack-type-icons.png"));
+		Sprite attackIconsSprite(attackIcons, 32, 32);
+		SDL_Surface *moveIcons(IMG_Load("test-data/move-icons.png"));
+		Sprite moveIconsSprite(moveIcons, 32, 32);
+		SDL_Surface *tagFrames(IMG_Load("test-data/tag-frames.png"));
+		Frame heroTagFrame(tagFrames, 16, 16, 1, 1, 0, 33);
+		Frame activeHeroTagFrame(tagFrames, 16, 16);
+
+		SDL_Surface *gauges(IMG_Load("test-data/gauges.png"));
+		Gauge healthGauge(gauges, 0, 16, 0, 0, 16, 6, 1, 6);
+		Gauge manaGauge(gauges, 0, 32, 0, 0, 16, 6, 1, 6);
+		Gauge ikariGauge(gauges, 0, 48, 0, 0, 16, 6, 1, 6);
+
+		BattleState *battleState(new BattleState(bg, monstersLayout, heroesLayout, &attackIconsSprite, &moveIconsSprite, &heroTagFrame, &activeHeroTagFrame, &healthGauge, &manaGauge, &ikariGauge));
 		battleState->AddMonster(monster);
 		battleState->AddMonster(monster);
 		battleState->AddMonster(monster);
@@ -78,6 +105,18 @@ int main(int argc, char **argv) {
 		battleState->AddHero(hero);
 		battleState->AddHero(hero);
 		Application app(&screen, battleState);
+		app.Buttons().MapKey(SDLK_w, Input::PAD_UP);
+		app.Buttons().MapKey(SDLK_d, Input::PAD_RIGHT);
+		app.Buttons().MapKey(SDLK_s, Input::PAD_DOWN);
+		app.Buttons().MapKey(SDLK_a, Input::PAD_LEFT);
+		app.Buttons().MapKey(SDLK_RIGHT, Input::ACTION_A);
+		app.Buttons().MapKey(SDLK_DOWN, Input::ACTION_B);
+		app.Buttons().MapKey(SDLK_UP, Input::ACTION_X);
+		app.Buttons().MapKey(SDLK_LEFT, Input::ACTION_Y);
+		app.Buttons().MapKey(SDLK_RETURN, Input::START);
+		app.Buttons().MapKey(SDLK_SPACE, Input::SELECT);
+		app.Buttons().MapKey(SDLK_RSHIFT, Input::SHOULDER_RIGHT);
+		app.Buttons().MapKey(SDLK_LSHIFT, Input::SHOULDER_LEFT);
 		app.Run();
 
 		return 0;