X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmain.cpp;h=841dc616f35cee60c181ee43324b29f197942ac1;hb=f89e79ad6fdc3009657e81f3dc3765d661f4899c;hp=b4be5be0cb327ea3a2c3a462384bdcdc480ede7b;hpb=c182086fbc039ec2b943b4d109597ccc481b7ba4;p=l2e.git diff --git a/src/main.cpp b/src/main.cpp index b4be5be..841dc61 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -17,10 +17,13 @@ #include "common/Item.h" #include "common/Spell.h" #include "geometry/Point.h" +#include "geometry/Vector.h" +#include "graphics/ComplexAnimation.h" #include "graphics/Font.h" #include "graphics/Frame.h" #include "graphics/Gauge.h" #include "graphics/Menu.h" +#include "graphics/SimpleAnimation.h" #include "graphics/Sprite.h" #include "sdl/InitImage.h" #include "sdl/InitScreen.h" @@ -42,10 +45,13 @@ using common::Inventory; using common::Item; using common::Spell; using geometry::Point; +using geometry::Vector; +using graphics::ComplexAnimation; using graphics::Font; using graphics::Frame; using graphics::Gauge; using graphics::Menu; +using graphics::SimpleAnimation; using graphics::Sprite; using sdl::InitImage; using sdl::InitScreen; @@ -60,6 +66,8 @@ int main(int argc, char **argv) { const int width = 800; const int height = 480; + const int framerate = 33; + try { InitSDL sdl; InitImage image(IMG_INIT_PNG); @@ -68,15 +76,15 @@ int main(int argc, char **argv) { // temporary test data SDL_Surface *bg(IMG_Load("test-data/battle-bg.png")); PartyLayout monstersLayout; - monstersLayout.AddPosition(Point(88, 104)); - monstersLayout.AddPosition(Point(128, 104)); - monstersLayout.AddPosition(Point(168, 104)); - monstersLayout.AddPosition(Point(208, 104)); + monstersLayout.AddPosition(Point(88, 88)); + monstersLayout.AddPosition(Point(128, 88)); + monstersLayout.AddPosition(Point(168, 88)); + monstersLayout.AddPosition(Point(208, 88)); PartyLayout heroesLayout; - heroesLayout.AddPosition(Point(48, 152)); - heroesLayout.AddPosition(Point(128, 152)); - heroesLayout.AddPosition(Point(80, 168)); - heroesLayout.AddPosition(Point(160, 168)); + heroesLayout.AddPosition(Point(48, 136)); + heroesLayout.AddPosition(Point(128, 136)); + heroesLayout.AddPosition(Point(80, 152)); + heroesLayout.AddPosition(Point(160, 152)); SDL_Surface *monsterImg(IMG_Load("test-data/monster.png")); Sprite dummySprite(monsterImg, 64, 64); @@ -97,6 +105,27 @@ int main(int argc, char **argv) { maxim.SetMaxMana(20); maxim.SetMana(20); maxim.SetIP(0); + ComplexAnimation maximAttackAnimation(&maximSprite, framerate); + // TODO: cross check double frames; could be related to differences in framerates + maximAttackAnimation.AddFrames(1, 0, Vector(0, 0), 7); // TODO: maybe this could also be a pause before the battle animation + maximAttackAnimation.AddFrames(1, 0, Vector(4, -1), 2); + maximAttackAnimation.AddFrames(2, 0, Vector(4, -2), 2); + maximAttackAnimation.AddFrames(2, 0, Vector(6, -2), 2); + maximAttackAnimation.AddFrames(2, 1, Vector(6, -1), 1); + maximAttackAnimation.AddFrames(2, 1, Vector(3, -1), 2); + maximAttackAnimation.AddFrames(2, 1, Vector(0, 0), 1); + maximAttackAnimation.AddFrames(2, 2, Vector(0, 0), 2); + maximAttackAnimation.AddFrames(2, 2, Vector(2, 0), 1); + maximAttackAnimation.AddFrames(1, 0, Vector(0, 0), 7); // TODO: maybe this could also be a pause between two animations + maxim.SetAttackAnimation(&maximAttackAnimation); + ComplexAnimation maximSpellAnimation(&maximSprite, 5 * framerate); + maximSpellAnimation.AddFrames(3, 0, Vector(), 2); + maximSpellAnimation.AddFrame(3, 1); + maxim.SetSpellAnimation(&maximSpellAnimation); + SDL_Surface *maximMeleeImg(IMG_Load("test-data/melee-maxim.png")); + Sprite maximMeleeSprite(maximMeleeImg, 96, 96); + SimpleAnimation maximMeleeAnimation(&maximMeleeSprite, 2 * framerate, 4); + maxim.SetMeleeAnimation(&maximMeleeAnimation); SDL_Surface *selanImg(IMG_Load("test-data/selan.png")); Sprite selanSprite(selanImg, 64, 64); @@ -109,6 +138,28 @@ int main(int argc, char **argv) { selan.SetMaxMana(23); selan.SetMana(23); selan.SetIP(1); + ComplexAnimation selanAttackAnimation(&selanSprite, framerate); + selanAttackAnimation.AddFrames(1, 0, Vector(4, 0), 2); + selanAttackAnimation.AddFrame(1, 0, Vector(8, 2)); + selanAttackAnimation.AddFrame(2, 0, Vector(10, 4)); + selanAttackAnimation.AddFrame(2, 0, Vector(14, 4)); + selanAttackAnimation.AddFrames(2, 0, Vector(12, 2), 3); + selanAttackAnimation.AddFrames(2, 1, Vector(14, 2), 2); + selanAttackAnimation.AddFrame(2, 1, Vector(2, 0)); + selanAttackAnimation.AddFrame(2, 2, Vector(-2, -4)); + selanAttackAnimation.AddFrame(2, 2, Vector(-8, -8)); + selanAttackAnimation.AddFrame(2, 2); + selan.SetAttackAnimation(&selanAttackAnimation); + ComplexAnimation selanSpellAnimation(&selanSprite, framerate); + selanSpellAnimation.AddFrames(2, 0, Vector(), 3); + selanSpellAnimation.AddFrames(2, 1, Vector(), 2); + selanSpellAnimation.AddFrames(2, 2, Vector(), 3); + selanSpellAnimation.AddFrames(2, 3, Vector(), 2); + selan.SetSpellAnimation(&selanSpellAnimation); + SDL_Surface *selanMeleeImg(IMG_Load("test-data/melee-selan.png")); + Sprite selanMeleeSprite(selanMeleeImg, 96, 96); + SimpleAnimation selanMeleeAnimation(&selanMeleeSprite, 2 * framerate, 4); + selan.SetMeleeAnimation(&selanMeleeAnimation); SDL_Surface *guyImg(IMG_Load("test-data/guy.png")); Sprite guySprite(guyImg, 64, 64); @@ -121,6 +172,22 @@ int main(int argc, char **argv) { guy.SetMaxMana(0); guy.SetMana(0); guy.SetIP(254); + ComplexAnimation guyAttackAnimation(&guySprite, framerate); + guyAttackAnimation.AddFrames(1, 0, Vector(-4, 0), 2); + guyAttackAnimation.AddFrames(1, 0, Vector(-8, 0), 2); + guyAttackAnimation.AddFrames(2, 0, Vector(-8, 0), 2); + guyAttackAnimation.AddFrame(2, 0, Vector(-4, 0)); + guyAttackAnimation.AddFrames(2, 0, Vector(), 2); + guyAttackAnimation.AddFrame(2, 1); + guyAttackAnimation.AddFrame(2, 1, Vector(4, 0)); + guyAttackAnimation.AddFrame(2, 1, Vector(10, 0)); + guyAttackAnimation.AddFrame(2, 2, Vector(10, 0)); + guyAttackAnimation.AddFrame(2, 2); + guy.SetAttackAnimation(&guyAttackAnimation); + SDL_Surface *guyMeleeImg(IMG_Load("test-data/melee-guy.png")); + Sprite guyMeleeSprite(guyMeleeImg, 96, 96); + SimpleAnimation guyMeleeAnimation(&guyMeleeSprite, 2 * framerate, 4); + guy.SetMeleeAnimation(&guyMeleeAnimation); SDL_Surface *dekarImg(IMG_Load("test-data/dekar.png")); Sprite dekarSprite(dekarImg, 64, 64); @@ -133,6 +200,26 @@ int main(int argc, char **argv) { dekar.SetMaxMana(0); dekar.SetMana(0); dekar.SetIP(255); + ComplexAnimation dekarAttackAnimation(&dekarSprite, framerate); + dekarAttackAnimation.AddFrame(1, 0, Vector(4, 0)); + dekarAttackAnimation.AddFrame(1, 0, Vector(8, 2)); + dekarAttackAnimation.AddFrame(2, 0, Vector(12, 4)); + dekarAttackAnimation.AddFrame(2, 0, Vector(16, 4)); + dekarAttackAnimation.AddFrames(2, 0, Vector(10, 2), 4); + dekarAttackAnimation.AddFrame(2, 1, Vector(6, 2)); + dekarAttackAnimation.AddFrame(2, 1, Vector()); + dekarAttackAnimation.AddFrame(2, 2, Vector(-2, 0)); + dekarAttackAnimation.AddFrames(2, 2, Vector(0, 0), 3); + dekar.SetAttackAnimation(&dekarAttackAnimation); + ComplexAnimation dekarSpellAnimation(&dekarSprite, framerate); + dekarSpellAnimation.AddFrames(2, 0, Vector(), 6); + dekarSpellAnimation.AddFrames(2, 1, Vector(), 2); + dekarSpellAnimation.AddFrames(2, 2, Vector(), 3); + dekar.SetSpellAnimation(&dekarSpellAnimation); + SDL_Surface *dekarMeleeImg(IMG_Load("test-data/melee-dekar.png")); + Sprite dekarMeleeSprite(dekarMeleeImg, 96, 96); + SimpleAnimation dekarMeleeAnimation(&dekarMeleeSprite, 2 * framerate, 4); + dekar.SetMeleeAnimation(&dekarMeleeAnimation); battle::Resources battleRes; @@ -158,6 +245,37 @@ int main(int argc, char **argv) { Font largeFont(&largeFontSprite, 0, -2); battleRes.titleFont = &largeFont; + battleRes.numberAnimationPrototype = ComplexAnimation(0, framerate); + battleRes.numberAnimationPrototype.AddFrame(0, 0); + battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -26)); + battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -42)); + battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -48)); + battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -42)); + battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -26)); + battleRes.numberAnimationPrototype.AddFrame(0, 0); + battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -12)); + battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -20)); + battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -24)); + battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -20)); + battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -12)); + battleRes.numberAnimationPrototype.AddFrame(0, 0); + battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -6)); + battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -10)); + battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -12)); + battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -10)); + battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -6)); + battleRes.numberAnimationPrototype.AddFrames(0, 0, Vector(), 14); + battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -36)); + battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -32)); + battleRes.numberAnimationPrototype.AddFrame(0, 0, Vector(0, -18)); + + SDL_Surface *bigNumbersImg(IMG_Load("test-data/big-numbers.png")); + Sprite bigNumbersSprite(bigNumbersImg, 16, 32); + battleRes.bigNumberSprite = &bigNumbersSprite; + SDL_Surface *bigGreenNumbersImg(IMG_Load("test-data/big-green-numbers.png")); + Sprite bigGreenNumbersSprite(bigGreenNumbersImg, 16, 32); + battleRes.greenNumberSprite = &bigGreenNumbersSprite; + SDL_Surface *heroTagImg(IMG_Load("test-data/hero-tag-sprites.png")); Sprite heroTagSprite(heroTagImg, 32, 16); battleRes.heroTagLabels = &heroTagSprite; @@ -339,6 +457,10 @@ int main(int argc, char **argv) { battleRes.itemMenuHeadline = "Please choose an item."; battleRes.itemMenuPrototype = Menu(&normalFont, &disabledFont, &handCursorSprite, 15, 6, 8, 16, 1, 32, 2, ':'); + SDL_Surface *swordAttackImg(IMG_Load("test-data/attack-sword.png")); + Sprite swordAttackSprite(swordAttackImg, 96, 96); + SimpleAnimation swordAttackAnimation(&swordAttackSprite, 2 * framerate, 4); + Item zircoSword; zircoSword.SetName("Zirco sword"); zircoSword.SetMenuIcon(&swordIcon); @@ -348,6 +470,7 @@ int main(int argc, char **argv) { firestorm.GetTargetingMode().TargetAllEnemies(); firestorm.SetPhysical(); zircoSword.SetIkari(&firestorm); + zircoSword.SetAttackAnimation(&swordAttackAnimation); maxim.SetWeapon(&zircoSword); Item zirconArmor; zirconArmor.SetName("Zircon armor"); @@ -409,7 +532,7 @@ int main(int argc, char **argv) { thundershriek.GetTargetingMode().TargetAllEnemies(); thundershriek.SetPhysical(); zircoWhip.SetIkari(&thundershriek); - selan.SetWeapon(&zircoWhip); +// selan.SetWeapon(&zircoWhip); Item zirconPlate; zirconPlate.SetName("Zircon plate"); zirconPlate.SetMenuIcon(&armorIcon); @@ -470,7 +593,7 @@ int main(int argc, char **argv) { torrent.GetTargetingMode().TargetAllEnemies(); torrent.SetPhysical(); zircoAx.SetIkari(&torrent); - guy.SetWeapon(&zircoAx); +// guy.SetWeapon(&zircoAx); guy.SetArmor(&zirconArmor); Item megaShield; megaShield.SetName("Mega shield"); @@ -514,7 +637,7 @@ int main(int argc, char **argv) { dragonRush.GetTargetingMode().TargetSingleEnemy(); dragonRush.SetPhysical(); lizardBlow.SetIkari(&dragonRush); - dekar.SetWeapon(&lizardBlow); +// dekar.SetWeapon(&lizardBlow); Item holyRobe; holyRobe.SetName("Holy robe"); holyRobe.SetMenuIcon(&armorIcon);