diff --git a/.gitignore b/.gitignore index b3c37a6..9b03851 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -*.exe *.o -*.layout -*.log \ No newline at end of file +*.exe +*.log +*.layout \ No newline at end of file diff --git a/SoDlib/SoDLib.depend b/SoDlib/SoDLib.depend index 20f769b..6d956ed 100644 --- a/SoDlib/SoDLib.depend +++ b/SoDlib/SoDLib.depend @@ -1,751 +1 @@ # depslib dependency file v1.0 -1378195931 source:d:\git\sod\sodlib\hgeanim.cpp - - -1378195935 d:\git\sod\hge181\include\hgeanim.h - "hgesprite.h" - -1378195935 d:\git\sod\hge181\include\hgesprite.h - "hge.h" - "hgerect.h" - -1378195935 d:\git\sod\hge181\include\hge.h - - -1378195935 d:\git\sod\hge181\include\hgerect.h - -1378195931 source:d:\git\sod\sodlib\hgecolor.cpp - - - -1378195935 d:\git\sod\hge181\include\hgecolor.h - "hge.h" - -1378195931 source:d:\git\sod\sodlib\hgefont.cpp - - - - -1378195935 d:\git\sod\hge181\include\hgefont.h - "hge.h" - "hgesprite.h" - -1378195931 source:d:\git\sod\sodlib\hgegui.cpp - - -1378195935 d:\git\sod\hge181\include\hgegui.h - "hge.h" - "hgesprite.h" - "hgerect.h" - -1378195931 source:d:\git\sod\sodlib\hgeguictrls.cpp - - - - - -1378195935 d:\git\sod\hge181\include\hgeguictrls.h - "hge.h" - "hgesprite.h" - "hgefont.h" - "hgerect.h" - "hgegui.h" - -1378195931 source:d:\git\sod\sodlib\hgerect.cpp - - - -1378195931 source:d:\git\sod\sodlib\hgesprite.cpp - - - -1378195931 source:d:\git\sod\sodlib\src\animation.cpp - "Animation.h" - -1378195931 d:\git\sod\sodlib\include\animation.h - - -1378305217 d:\git\sod\sodlib\include\sodlib.h - - - - - - - - - - - - - - - - - - - - - - - -1378195931 d:\git\sod\box2d\box2d.h - - - - - - - - - - - - - - - - - - - - - - - - - - - - -1378195931 d:\git\sod\box2d\common\b2settings.h - - - -1378195931 d:\git\sod\box2d\common\b2draw.h - - -1378195931 d:\git\sod\box2d\common\b2math.h - - - - - - -1378195931 d:\git\sod\box2d\common\b2timer.h - - -1378195931 d:\git\sod\box2d\collision\shapes\b2circleshape.h - - -1378195931 d:\git\sod\box2d\collision\shapes\b2shape.h - - - - -1378195931 d:\git\sod\box2d\common\b2blockallocator.h - - -1378195931 d:\git\sod\box2d\collision\b2collision.h - - - -1378195931 d:\git\sod\box2d\collision\shapes\b2edgeshape.h - - -1378195931 d:\git\sod\box2d\collision\shapes\b2chainshape.h - - -1378195931 d:\git\sod\box2d\collision\shapes\b2polygonshape.h - - -1378195931 d:\git\sod\box2d\collision\b2broadphase.h - - - - - -1378195931 d:\git\sod\box2d\collision\b2dynamictree.h - - - -1378195931 d:\git\sod\box2d\common\b2growablestack.h - - - -1378195931 d:\git\sod\box2d\collision\b2distance.h - - -1378195931 d:\git\sod\box2d\collision\b2timeofimpact.h - - - -1378195931 d:\git\sod\box2d\dynamics\b2body.h - - - - -1378195931 d:\git\sod\box2d\dynamics\b2fixture.h - - - - -1378195931 d:\git\sod\box2d\dynamics\b2worldcallbacks.h - - -1378195931 d:\git\sod\box2d\dynamics\b2timestep.h - - -1378195931 d:\git\sod\box2d\dynamics\b2world.h - - - - - - - -1378195931 d:\git\sod\box2d\common\b2stackallocator.h - - -1378195931 d:\git\sod\box2d\dynamics\b2contactmanager.h - - -1378195931 d:\git\sod\box2d\dynamics\contacts\b2contact.h - - - - - -1378195931 d:\git\sod\box2d\dynamics\joints\b2distancejoint.h - - -1378195931 d:\git\sod\box2d\dynamics\joints\b2joint.h - - -1378195931 d:\git\sod\box2d\dynamics\joints\b2frictionjoint.h - - -1378195931 d:\git\sod\box2d\dynamics\joints\b2gearjoint.h - - -1378195931 d:\git\sod\box2d\dynamics\joints\b2wheeljoint.h - - -1378195931 d:\git\sod\box2d\dynamics\joints\b2mousejoint.h - - -1378195931 d:\git\sod\box2d\dynamics\joints\b2prismaticjoint.h - - -1378195931 d:\git\sod\box2d\dynamics\joints\b2pulleyjoint.h - - -1378195931 d:\git\sod\box2d\dynamics\joints\b2revolutejoint.h - - -1378195931 d:\git\sod\box2d\dynamics\joints\b2ropejoint.h - - -1378195931 d:\git\sod\box2d\dynamics\joints\b2weldjoint.h - - -1378195931 d:\git\sod\sodlib\include\tinyxml.h - - - - - - - - - "tinystr.h" - -1378195931 d:\git\sod\sodlib\include\tinystr.h - - - -1378195931 d:\git\sod\sodlib\include\exception.h - - - -1378383264 d:\git\sod\sodlib\include\game.h - - -1378195931 d:\git\sod\sodlib\include\construction.h - - -1378195931 d:\git\sod\sodlib\include\characteractioncause.h - - -1378195931 d:\git\sod\sodlib\include\characteractioneffect.h - - -1378195931 d:\git\sod\sodlib\include\characteraction.h - - -1378195931 d:\git\sod\sodlib\include\characterhotspot.h - - -1378286669 d:\git\sod\sodlib\include\character.h - - -1378195931 d:\git\sod\sodlib\include\nonplayercharacter.h - - -1378195931 d:\git\sod\sodlib\include\playercharacter.h - - -1379673826 d:\git\sod\sodlib\include\groundline.h - - -1378306187 d:\git\sod\sodlib\include\mapanimation.h - - -1378195931 d:\git\sod\sodlib\include\debugdraw.h - - -1378195931 d:\git\sod\sodlib\include\guiwindow.h - - - -1378195931 d:\git\sod\sodlib\include\hgeguimenuitem.h - - -1378195931 source:d:\git\sod\sodlib\src\characteraction.cpp - "CharacterAction.h" - -1378195931 source:d:\git\sod\sodlib\src\characteractioncause.cpp - "CharacterActionCause.h" - -1378195931 source:d:\git\sod\sodlib\src\characteractioneffect.cpp - "CharacterActionEffect.h" - -1378195931 source:d:\git\sod\sodlib\src\characterhotspot.cpp - "CharacterHotSpot.h" - -1378195931 source:d:\git\sod\sodlib\src\construction.cpp - "Construction.h" - -1378195931 source:d:\git\sod\sodlib\src\debugdraw.cpp - "DebugDraw.h" - -1378195931 source:d:\git\sod\sodlib\src\exception.cpp - "Exception.h" - -1380120262 source:d:\git\sod\sodlib\src\game.cpp - "Game.h" - -1379673918 source:d:\git\sod\sodlib\src\groundline.cpp - "GroundLine.h" - -1378195931 source:d:\git\sod\sodlib\src\guiwindow.cpp - "GUIWindow.h" - -1378195931 source:d:\git\sod\sodlib\src\hgeguimenuitem.cpp - "hgeGUIMenuItem.h" - -1378305920 source:d:\git\sod\sodlib\src\mapanimation.cpp - "MapAnimation.h" - -1378195931 source:d:\git\sod\sodlib\src\nonplayercharacter.cpp - "NonPlayerCharacter.h" - -1378195931 source:d:\git\sod\sodlib\src\playercharacter.cpp - "PlayerCharacter.h" - -1378195931 source:d:\git\sod\sodlib\tinystr.cpp - "tinystr.h" - -1378293644 source:d:\git\sod\sodlib\tinyxml.cpp - - - - "tinyxml.h" - -1378195931 source:d:\git\sod\sodlib\tinyxmlerror.cpp - "tinyxml.h" - -1378195931 source:d:\git\sod\sodlib\tinyxmlparser.cpp - - - "tinyxml.h" - - -1380119661 source:d:\git\sod\sodlib\src\character.cpp - "Character.h" - -1342709300 source:d:\work\git\sod\sodlib\hgeanim.cpp - - -1177328880 d:\work\git\sod\hge181\include\hgeanim.h - "hgesprite.h" - -1177592146 d:\work\git\sod\hge181\include\hgesprite.h - "hge.h" - "hgerect.h" - -1202820504 d:\work\git\sod\hge181\include\hge.h - - -1176893286 d:\work\git\sod\hge181\include\hgerect.h - -1353254303 source:d:\work\git\sod\sodlib\hgecolor.cpp - - - -1176893286 d:\work\git\sod\hge181\include\hgecolor.h - "hge.h" - -1340106432 source:d:\work\git\sod\sodlib\hgefont.cpp - - - - -1184932634 d:\work\git\sod\hge181\include\hgefont.h - "hge.h" - "hgesprite.h" - -1347216209 source:d:\work\git\sod\sodlib\hgegui.cpp - - -1198253000 d:\work\git\sod\hge181\include\hgegui.h - "hge.h" - "hgesprite.h" - "hgerect.h" - -1347216223 source:d:\work\git\sod\sodlib\hgeguictrls.cpp - - - - - -1176893286 d:\work\git\sod\hge181\include\hgeguictrls.h - "hge.h" - "hgesprite.h" - "hgefont.h" - "hgerect.h" - "hgegui.h" - -1340106537 source:d:\work\git\sod\sodlib\hgerect.cpp - - - -1340106505 source:d:\work\git\sod\sodlib\hgesprite.cpp - - - -1354471331 source:d:\work\git\sod\sodlib\src\animation.cpp - "Animation.h" - -1354450463 d:\work\git\sod\sodlib\include\animation.h - - -1378318649 d:\work\git\sod\sodlib\include\sodlib.h - - - - - - - - - - - - - - - - - - - - - - - -1314999540 d:\work\git\sod\box2d\box2d.h - - - - - - - - - - - - - - - - - - - - - - - - - - - - -1315003762 d:\work\git\sod\box2d\common\b2settings.h - - - -1301211102 d:\work\git\sod\box2d\common\b2draw.h - - -1315061282 d:\work\git\sod\box2d\common\b2math.h - - - - - - -1315770396 d:\work\git\sod\box2d\common\b2timer.h - - -1300947420 d:\work\git\sod\box2d\collision\shapes\b2circleshape.h - - -1313941794 d:\work\git\sod\box2d\collision\shapes\b2shape.h - - - - -1300947420 d:\work\git\sod\box2d\common\b2blockallocator.h - - -1307265762 d:\work\git\sod\box2d\collision\b2collision.h - - - -1314820388 d:\work\git\sod\box2d\collision\shapes\b2edgeshape.h - - -1314819744 d:\work\git\sod\box2d\collision\shapes\b2chainshape.h - - -1300947420 d:\work\git\sod\box2d\collision\shapes\b2polygonshape.h - - -1301221404 d:\work\git\sod\box2d\collision\b2broadphase.h - - - - - -1308948390 d:\work\git\sod\box2d\collision\b2dynamictree.h - - - -1300947420 d:\work\git\sod\box2d\common\b2growablestack.h - - - -1300947420 d:\work\git\sod\box2d\collision\b2distance.h - - -1300947420 d:\work\git\sod\box2d\collision\b2timeofimpact.h - - - -1315048344 d:\work\git\sod\box2d\dynamics\b2body.h - - - - -1315032742 d:\work\git\sod\box2d\dynamics\b2fixture.h - - - - -1314034002 d:\work\git\sod\box2d\dynamics\b2worldcallbacks.h - - -1315769532 d:\work\git\sod\box2d\dynamics\b2timestep.h - - -1315134398 d:\work\git\sod\box2d\dynamics\b2world.h - - - - - - - -1300947420 d:\work\git\sod\box2d\common\b2stackallocator.h - - -1300947420 d:\work\git\sod\box2d\dynamics\b2contactmanager.h - - -1305747220 d:\work\git\sod\box2d\dynamics\contacts\b2contact.h - - - - - -1315123384 d:\work\git\sod\box2d\dynamics\joints\b2distancejoint.h - - -1315135600 d:\work\git\sod\box2d\dynamics\joints\b2joint.h - - -1315134678 d:\work\git\sod\box2d\dynamics\joints\b2frictionjoint.h - - -1315134934 d:\work\git\sod\box2d\dynamics\joints\b2gearjoint.h - - -1315135552 d:\work\git\sod\box2d\dynamics\joints\b2wheeljoint.h - - -1315135612 d:\work\git\sod\box2d\dynamics\joints\b2mousejoint.h - - -1315326328 d:\work\git\sod\box2d\dynamics\joints\b2prismaticjoint.h - - -1315135320 d:\work\git\sod\box2d\dynamics\joints\b2pulleyjoint.h - - -1315132774 d:\work\git\sod\box2d\dynamics\joints\b2revolutejoint.h - - -1315154614 d:\work\git\sod\box2d\dynamics\joints\b2ropejoint.h - - -1315131064 d:\work\git\sod\box2d\dynamics\joints\b2weldjoint.h - - -1305386698 d:\work\git\sod\sodlib\include\tinyxml.h - - - - - - - - - "tinystr.h" - -1305386698 d:\work\git\sod\sodlib\include\tinystr.h - - - -1341679979 d:\work\git\sod\sodlib\include\exception.h - - - -1380139829 d:\work\git\sod\sodlib\include\game.h - - -1357404989 d:\work\git\sod\sodlib\include\construction.h - - -1364108541 d:\work\git\sod\sodlib\include\characteractioncause.h - - -1364063182 d:\work\git\sod\sodlib\include\characteractioneffect.h - - -1363970119 d:\work\git\sod\sodlib\include\characteraction.h - - -1363631441 d:\work\git\sod\sodlib\include\characterhotspot.h - - -1378235018 d:\work\git\sod\sodlib\include\character.h - - -1364058630 d:\work\git\sod\sodlib\include\nonplayercharacter.h - - -1364063810 d:\work\git\sod\sodlib\include\playercharacter.h - - -1380139584 d:\work\git\sod\sodlib\include\groundline.h - - -1378318649 d:\work\git\sod\sodlib\include\mapanimation.h - - -1363638071 d:\work\git\sod\sodlib\include\debugdraw.h - - -1364326445 d:\work\git\sod\sodlib\include\guiwindow.h - - - -1353419913 d:\work\git\sod\sodlib\include\hgeguimenuitem.h - - -1380135621 source:d:\work\git\sod\sodlib\src\character.cpp - "Character.h" - -1363970124 source:d:\work\git\sod\sodlib\src\characteraction.cpp - "CharacterAction.h" - -1377893052 source:d:\work\git\sod\sodlib\src\characteractioncause.cpp - "CharacterActionCause.h" - -1364069426 source:d:\work\git\sod\sodlib\src\characteractioneffect.cpp - "CharacterActionEffect.h" - -1363634098 source:d:\work\git\sod\sodlib\src\characterhotspot.cpp - "CharacterHotSpot.h" - -1377717553 source:d:\work\git\sod\sodlib\src\construction.cpp - "Construction.h" - -1363640969 source:d:\work\git\sod\sodlib\src\debugdraw.cpp - "DebugDraw.h" - -1341681952 source:d:\work\git\sod\sodlib\src\exception.cpp - "Exception.h" - -1377939083 source:d:\work\git\sod\sodlib\src\guiwindow.cpp - "GUIWindow.h" - -1357574814 source:d:\work\git\sod\sodlib\src\hgeguimenuitem.cpp - "hgeGUIMenuItem.h" - -1378318649 source:d:\work\git\sod\sodlib\src\mapanimation.cpp - "MapAnimation.h" - -1364067025 source:d:\work\git\sod\sodlib\src\nonplayercharacter.cpp - "NonPlayerCharacter.h" - -1364067049 source:d:\work\git\sod\sodlib\src\playercharacter.cpp - "PlayerCharacter.h" - -1305386698 source:d:\work\git\sod\sodlib\tinystr.cpp - "tinystr.h" - -1378318649 source:d:\work\git\sod\sodlib\tinyxml.cpp - - - - "tinyxml.h" - -1305386698 source:d:\work\git\sod\sodlib\tinyxmlerror.cpp - "tinyxml.h" - -1305386698 source:d:\work\git\sod\sodlib\tinyxmlparser.cpp - - - "tinyxml.h" - - -1380137852 source:d:\work\git\sod\sodlib\src\game.cpp - "Game.h" - -1380139809 source:d:\work\git\sod\sodlib\src\groundline.cpp - "GroundLine.h" - diff --git a/SoDlib/SoDlib.cbp b/SoDlib/SoDlib.cbp index eef372c..fc449c2 100644 --- a/SoDlib/SoDlib.cbp +++ b/SoDlib/SoDlib.cbp @@ -62,6 +62,7 @@ + @@ -81,6 +82,7 @@ + diff --git a/SoDlib/SoDlib.layout b/SoDlib/SoDlib.layout deleted file mode 100644 index 9eeafbc..0000000 --- a/SoDlib/SoDlib.layout +++ /dev/null @@ -1,206 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/SoDlib/include/Character.h b/SoDlib/include/Character.h index 515e0a7..3d05cdd 100644 --- a/SoDlib/include/Character.h +++ b/SoDlib/include/Character.h @@ -24,6 +24,7 @@ class Character void turn(); void run(float speed); void jump(b2Vec2 speed); + void move(float dx, float dy); void setAnim(int anim); diff --git a/SoDlib/include/Game.h b/SoDlib/include/Game.h index 786f37a..f9b80bc 100644 --- a/SoDlib/include/Game.h +++ b/SoDlib/include/Game.h @@ -45,14 +45,17 @@ class Game Character* loadPlayerCharacter(char * fn, b2Vec2 origin); Character* loadNonPlayerCharacter(char * fn, b2Vec2 origin); b2Fixture* loadFixture(b2Body* body, TiXmlElement* elem); - void addGroundLine(GroundLine* newGL); void addMapAnimation(MapAnimation* newMA); + void addGroundLine(GroundLine* newGL); void addMapAnimation(MapAnimation* newMA); void addPlatform(Platform* newPlatform); void loadMap(char* fn); int getCharactersCount(); Character* getCharacter(int index); int getGroundLinesCount(); - GroundLine* getGroundLine(int index); + GroundLine* getGroundLine(int index); + + int getMapAnimationsCount(); + MapAnimation* getMapAnimation(int index); HGE* getHge(); b2World* getWorld(); @@ -93,7 +96,8 @@ class Game hgeTriple whiteTriple; GroundLine** groundLines; int groundLinesCount; - MapAnimation** mapAnimations; int mapAnimationsCount; + MapAnimation** mapAnimations; int mapAnimationsCount; + Platform** platforms; int platformsCount; char** animationNames; int animationsCount; Character** characters; diff --git a/SoDlib/include/GroundLine.h b/SoDlib/include/GroundLine.h index 678874f..ad9dc6f 100644 --- a/SoDlib/include/GroundLine.h +++ b/SoDlib/include/GroundLine.h @@ -20,6 +20,7 @@ class GroundLine float horizontalDistanceTo(float x); float distanceTo(float x, float y); void debugDraw(), debugDraw(DWORD color); + void move(float dx, float dy); protected: b2Vec2 startPoint, endPoint; float k, inversedK; diff --git a/SoDlib/include/MapAnimation.h b/SoDlib/include/MapAnimation.h index 7dbec27..93fe0f3 100644 --- a/SoDlib/include/MapAnimation.h +++ b/SoDlib/include/MapAnimation.h @@ -10,6 +10,7 @@ class MapAnimation virtual ~MapAnimation(); void draw(bool schematicMode); + void move(float dx, float dy); protected: float x, y, angle; hgeAnimation* animation; diff --git a/SoDlib/include/Platform.h b/SoDlib/include/Platform.h new file mode 100644 index 0000000..e034edf --- /dev/null +++ b/SoDlib/include/Platform.h @@ -0,0 +1,27 @@ +#ifndef PLATFORM_H +#define PLATFORM_H + +#include + +class Platform +{ + public: + Platform(Game* game, TiXmlElement* elem); + virtual ~Platform(); + + void update(float dt); + + bool characterOn(int charIndex); + protected: + Game* game; + int groundLinesCount, animationsCount; + int* groundLines; int *animations; + int spotsCount; + float* spotX; float* spotY; float* spotAngle; float* spotTime; + + float currentTime; float currentSpotStart; int currentSpot; + float currentX, currentY; + private: +}; + +#endif // PLATFORM_H diff --git a/SoDlib/include/SoDlib.h b/SoDlib/include/SoDlib.h index 5e2a33c..94c33cd 100644 --- a/SoDlib/include/SoDlib.h +++ b/SoDlib/include/SoDlib.h @@ -10,6 +10,7 @@ class Character; class PlayerCharacter; class NonPlayerCharacter; class GroundLine; +class Platform; class MapAnimation; class DebugDraw; class Game; @@ -38,6 +39,7 @@ typedef bool (*menuCallback)(hgeGUIMenuItem* sender); #include #include #include +#include #include #include diff --git a/SoDlib/libSoDlib.a b/SoDlib/libSoDlib.a index 5614be5..e301d92 100644 Binary files a/SoDlib/libSoDlib.a and b/SoDlib/libSoDlib.a differ diff --git a/SoDlib/obj/Debug/hgeanim.o b/SoDlib/obj/Debug/hgeanim.o deleted file mode 100644 index 119456c..0000000 Binary files a/SoDlib/obj/Debug/hgeanim.o and /dev/null differ diff --git a/SoDlib/obj/Debug/hgecolor.o b/SoDlib/obj/Debug/hgecolor.o deleted file mode 100644 index c6a0fbe..0000000 Binary files a/SoDlib/obj/Debug/hgecolor.o and /dev/null differ diff --git a/SoDlib/obj/Debug/hgefont.o b/SoDlib/obj/Debug/hgefont.o deleted file mode 100644 index a881f11..0000000 Binary files a/SoDlib/obj/Debug/hgefont.o and /dev/null differ diff --git a/SoDlib/obj/Debug/hgegui.o b/SoDlib/obj/Debug/hgegui.o deleted file mode 100644 index 71d7eba..0000000 Binary files a/SoDlib/obj/Debug/hgegui.o and /dev/null differ diff --git a/SoDlib/obj/Debug/hgeguictrls.o b/SoDlib/obj/Debug/hgeguictrls.o deleted file mode 100644 index 3e7a6f5..0000000 Binary files a/SoDlib/obj/Debug/hgeguictrls.o and /dev/null differ diff --git a/SoDlib/obj/Debug/hgerect.o b/SoDlib/obj/Debug/hgerect.o deleted file mode 100644 index 172c9a3..0000000 Binary files a/SoDlib/obj/Debug/hgerect.o and /dev/null differ diff --git a/SoDlib/obj/Debug/hgesprite.o b/SoDlib/obj/Debug/hgesprite.o deleted file mode 100644 index 1827105..0000000 Binary files a/SoDlib/obj/Debug/hgesprite.o and /dev/null differ diff --git a/SoDlib/obj/Debug/src/Animation.o b/SoDlib/obj/Debug/src/Animation.o deleted file mode 100644 index af36cb7..0000000 Binary files a/SoDlib/obj/Debug/src/Animation.o and /dev/null differ diff --git a/SoDlib/obj/Debug/src/Character.o b/SoDlib/obj/Debug/src/Character.o deleted file mode 100644 index 7789d23..0000000 Binary files a/SoDlib/obj/Debug/src/Character.o and /dev/null differ diff --git a/SoDlib/obj/Debug/src/CharacterAction.o b/SoDlib/obj/Debug/src/CharacterAction.o deleted file mode 100644 index ac2cbc9..0000000 Binary files a/SoDlib/obj/Debug/src/CharacterAction.o and /dev/null differ diff --git a/SoDlib/obj/Debug/src/CharacterActionCause.o b/SoDlib/obj/Debug/src/CharacterActionCause.o deleted file mode 100644 index c56c4af..0000000 Binary files a/SoDlib/obj/Debug/src/CharacterActionCause.o and /dev/null differ diff --git a/SoDlib/obj/Debug/src/CharacterActionEffect.o b/SoDlib/obj/Debug/src/CharacterActionEffect.o deleted file mode 100644 index 0a8254a..0000000 Binary files a/SoDlib/obj/Debug/src/CharacterActionEffect.o and /dev/null differ diff --git a/SoDlib/obj/Debug/src/CharacterHotSpot.o b/SoDlib/obj/Debug/src/CharacterHotSpot.o deleted file mode 100644 index d77f2a4..0000000 Binary files a/SoDlib/obj/Debug/src/CharacterHotSpot.o and /dev/null differ diff --git a/SoDlib/obj/Debug/src/Construction.o b/SoDlib/obj/Debug/src/Construction.o deleted file mode 100644 index 092952e..0000000 Binary files a/SoDlib/obj/Debug/src/Construction.o and /dev/null differ diff --git a/SoDlib/obj/Debug/src/DebugDraw.o b/SoDlib/obj/Debug/src/DebugDraw.o deleted file mode 100644 index ae8582f..0000000 Binary files a/SoDlib/obj/Debug/src/DebugDraw.o and /dev/null differ diff --git a/SoDlib/obj/Debug/src/Exception.o b/SoDlib/obj/Debug/src/Exception.o deleted file mode 100644 index 27f5c10..0000000 Binary files a/SoDlib/obj/Debug/src/Exception.o and /dev/null differ diff --git a/SoDlib/obj/Debug/src/GUIWindow.o b/SoDlib/obj/Debug/src/GUIWindow.o deleted file mode 100644 index a1f3ffe..0000000 Binary files a/SoDlib/obj/Debug/src/GUIWindow.o and /dev/null differ diff --git a/SoDlib/obj/Debug/src/Game.o b/SoDlib/obj/Debug/src/Game.o deleted file mode 100644 index 9fa2654..0000000 Binary files a/SoDlib/obj/Debug/src/Game.o and /dev/null differ diff --git a/SoDlib/obj/Debug/src/GroundLine.o b/SoDlib/obj/Debug/src/GroundLine.o deleted file mode 100644 index 741e26b..0000000 Binary files a/SoDlib/obj/Debug/src/GroundLine.o and /dev/null differ diff --git a/SoDlib/obj/Debug/src/MapAnimation.o b/SoDlib/obj/Debug/src/MapAnimation.o deleted file mode 100644 index a284d1e..0000000 Binary files a/SoDlib/obj/Debug/src/MapAnimation.o and /dev/null differ diff --git a/SoDlib/obj/Debug/src/NPCharacter.o b/SoDlib/obj/Debug/src/NPCharacter.o deleted file mode 100644 index 801a50e..0000000 Binary files a/SoDlib/obj/Debug/src/NPCharacter.o and /dev/null differ diff --git a/SoDlib/obj/Debug/src/NonPlayerCharacter.o b/SoDlib/obj/Debug/src/NonPlayerCharacter.o deleted file mode 100644 index f29b94a..0000000 Binary files a/SoDlib/obj/Debug/src/NonPlayerCharacter.o and /dev/null differ diff --git a/SoDlib/obj/Debug/src/PlayerCharacter.o b/SoDlib/obj/Debug/src/PlayerCharacter.o deleted file mode 100644 index a85351a..0000000 Binary files a/SoDlib/obj/Debug/src/PlayerCharacter.o and /dev/null differ diff --git a/SoDlib/obj/Debug/src/hgeGUIMenuItem.o b/SoDlib/obj/Debug/src/hgeGUIMenuItem.o deleted file mode 100644 index 3e9999c..0000000 Binary files a/SoDlib/obj/Debug/src/hgeGUIMenuItem.o and /dev/null differ diff --git a/SoDlib/obj/Debug/tinystr.o b/SoDlib/obj/Debug/tinystr.o deleted file mode 100644 index 648f7d5..0000000 Binary files a/SoDlib/obj/Debug/tinystr.o and /dev/null differ diff --git a/SoDlib/obj/Debug/tinyxml.o b/SoDlib/obj/Debug/tinyxml.o deleted file mode 100644 index d0ef213..0000000 Binary files a/SoDlib/obj/Debug/tinyxml.o and /dev/null differ diff --git a/SoDlib/obj/Debug/tinyxmlerror.o b/SoDlib/obj/Debug/tinyxmlerror.o deleted file mode 100644 index cd6d1d7..0000000 Binary files a/SoDlib/obj/Debug/tinyxmlerror.o and /dev/null differ diff --git a/SoDlib/obj/Debug/tinyxmlparser.o b/SoDlib/obj/Debug/tinyxmlparser.o deleted file mode 100644 index 1c17512..0000000 Binary files a/SoDlib/obj/Debug/tinyxmlparser.o and /dev/null differ diff --git a/SoDlib/src/Character.cpp b/SoDlib/src/Character.cpp index e6cedc0..98d89d8 100644 --- a/SoDlib/src/Character.cpp +++ b/SoDlib/src/Character.cpp @@ -359,45 +359,45 @@ void Character::update(float dt) position += (dt * speed); } + for (int i = 0; i < actionsCounts[currentAnimation]; i++) { + if (actions[currentAnimation][i]->take(game, this)) { + } + } + float h = position.y; - for (int i = 0; i < game->getGroundLinesCount(); i++) { + for (int i = 0; i < game->getGroundLinesCount(); i++) {///Обработаем все стены if (game->getGroundLine(i)->getType() == GROUND_LINE_TYPE_WALL) { - if (game->getGroundLine(i)->getK() > 0) {///Линия сверху вниз + if ( - position.y - halfHeight < game->getGroundLine(i)->getEndPoint().y///Верхняя точка героя выше нижней точки линии - && position.y + halfHeight > game->getGroundLine(i)->getStartPoint().y///Или нижняя героя ниже верхней линии + position.y - halfHeight + 0.1f < game->getGroundLine(i)->getBottom()///Верхняя точка героя выше нижней точки линии + && position.y + halfHeight - 0.1f > game->getGroundLine(i)->getTop()///Или нижняя героя ниже верхней линии ) { ///Если середина была слева от линии, а правый край теперь справа if (prevPosition.x < game->getGroundLine(i)->xAt(position.y) && position.x + halfWidth > game->getGroundLine(i)->xAt(position.y)) { - position.x = game->getGroundLine(i)->xAt(position.y) - halfWidth;///Ставим к стенке (слева) + ///Ставим к стенке (слева) + if (onGround == -1) { + position.x = game->getGroundLine(i)->xAt(position.y) - halfWidth; + } else { + position = prevPosition; + } speed.x = 0;///Останавливаем - printf("bump on right\n"); } else if (prevPosition.x > game->getGroundLine(i)->xAt(position.y) && position.x - halfWidth < game->getGroundLine(i)->xAt(position.y)) { ///То же самое направо от стенки - position.x = game->getGroundLine(i)->xAt(position.y) + halfWidth; - speed.x = 0; - printf("bump on left\n"); - } - } - } else {///Все то же самое для линии снизу вверх - if ( - position.y - halfHeight < game->getGroundLine(i)->getStartPoint().y - && position.y + halfHeight > game->getGroundLine(i)->getEndPoint().y - ) { - if (prevPosition.x < game->getGroundLine(i)->xAt(position.y) && position.x + halfWidth > game->getGroundLine(i)->xAt(position.y)) { - position.x = game->getGroundLine(i)->xAt(position.y) - halfWidth; - speed.x = 0; - printf("bump on right\n"); - } else if (prevPosition.x > game->getGroundLine(i)->xAt(position.y) && position.x - halfWidth < game->getGroundLine(i)->xAt(position.y)) { - position.x = game->getGroundLine(i)->xAt(position.y) + halfWidth; + if (onGround == -1) { + position.x = game->getGroundLine(i)->xAt(position.y) + halfWidth; + } else { + position = prevPosition; + } speed.x = 0; - printf("bump on left\n"); } } - } - } else { + + } + } + for (int i = 0; i < game->getGroundLinesCount(); i++) {///Теперь все полы/потолки + if (game->getGroundLine(i)->getType() == GROUND_LINE_TYPE_FLOOR) { if ( - position.x > game->getGroundLine(i)->getStartPoint().x && position.x < game->getGroundLine(i)->getEndPoint().x + position.x + halfWidth > game->getGroundLine(i)->getStartPoint().x && position.x - halfWidth < game->getGroundLine(i)->getEndPoint().x ) { float highY, lowY; if (game->getGroundLine(i)->getK() > 0) { @@ -435,12 +435,6 @@ void Character::update(float dt) // speed.y = 0; // } - - for (int i = 0; i < actionsCounts[currentAnimation]; i++) { - if (actions[currentAnimation][i]->take(game, this)) { - } - } - if (onGround > -1) { if ( position.x - halfWidth > game->getGroundLine(onGround)->getEndPoint().x || @@ -487,6 +481,11 @@ void Character::jump(b2Vec2 speed) //speed.y = 6 * speed.y; //position.y -= 2; +} + +void Character::move(float dx, float dy) +{ + position.x += dx; position.y += dy; } void Character::setAnim(int anim) diff --git a/SoDlib/src/Game.cpp b/SoDlib/src/Game.cpp index 2df4fdc..cabaa98 100644 --- a/SoDlib/src/Game.cpp +++ b/SoDlib/src/Game.cpp @@ -13,8 +13,10 @@ Game::Game(HGE * hge) hge->System_SetState(HGE_SCREENBPP, 32); hge->System_SetState(HGE_FPS, 60); - groundLines = new GroundLine*[1000]; groundLinesCount = 0; - mapAnimations = new MapAnimation*[1000]; mapAnimationsCount = 0; + //groundLines = new GroundLine*[1000]; + groundLinesCount = 0; + //mapAnimations = new MapAnimation*[1000]; + mapAnimationsCount = 0; characters = new Character*[100]; charactersCount = 0; @@ -186,12 +188,15 @@ void Game::updateWorld(float dt) //world->Step(timeStep, velocityIterations, positionIterations); for (int i = 0; i < charactersCount; i++) { characters[i]->update(dt); + } + for (int i = 0; i < platformsCount; i++) { + platforms[i]->update(dt); } cameraPos = characters[0]->getPosition() - b2Vec2(0.5 * screenWidth / pixelsPerMeter, 0.5 * screenHeight / pixelsPerMeter); } bool Game::updateControls() { - // Process keys + /// Process keys if (hge->Input_GetKeyState(HGEK_ESCAPE)) return true; if (hge->Input_KeyDown(HGEK_TAB)) schematicDrawMode = !schematicDrawMode; //if (hge->Input_KeyDown(HGEK_SPACE)) loadConstruction("box.xml", b2Vec2(10 + hge->Random_Float(-1, 1), 0)); @@ -200,12 +205,9 @@ bool Game::updateControls() void Game::startDraw() { - // Begin rendering quads. - // This function must be called - // before any actual rendering. hge->Gfx_BeginScene(); - // Clear screen with skyblue color + /// Clear screen with skyblue color DWORD color = 0x7fc7ff; if (schematicDrawMode) { color = 0; @@ -217,7 +219,7 @@ void Game::endDraw() { gui->Render(); - // End rendering and update the screen + /// End rendering and update the screen hge->Gfx_EndScene(); } @@ -576,6 +578,11 @@ void Game::addMapAnimation(MapAnimation* newMA) { mapAnimations[mapAnimationsCount] = newMA; mapAnimationsCount++; +} +void Game::addPlatform(Platform* newPlatform) +{ + platforms[platformsCount] = newPlatform; + platformsCount++; } int Game::getCharactersCount() @@ -612,6 +619,19 @@ GroundLine* Game::getGroundLine(int index) } else { return NULL; } +} + +int Game::getMapAnimationsCount() +{ + return mapAnimationsCount; +} +MapAnimation* Game::getMapAnimation(int index) +{ + if (index < mapAnimationsCount) { + return mapAnimations[index]; + } else { + return NULL; + } } float Game::worldX(float screenX) @@ -740,6 +760,12 @@ void Game::loadMap(char* fn) if (root->Attribute("height")) { mapHeight = atof(root->Attribute("height")); } + mapAnimationsCount = atoi(root->Attribute("animations")); + mapAnimations = new MapAnimation*[mapAnimationsCount]; + groundLinesCount = atoi(root->Attribute("ground_lines")); + groundLines = new GroundLine*[groundLinesCount]; + platformsCount = atoi(root->Attribute("platforms")); + platforms = new Platform*[platformsCount]; TiXmlElement* element = root->FirstChildElement("animation"); int i = 0; @@ -753,23 +779,35 @@ void Game::loadMap(char* fn) hgeAnimation* animation = loadAnimation(animationName); delete animationName; - addMapAnimation(new MapAnimation(this, animation, x, y, angle)); + mapAnimations[i] = new MapAnimation(this, animation, x, y, angle); i++; element = element->NextSiblingElement("animation"); } mapAnimationsCount = i; + i = 0; element = root->FirstChildElement("ground_line"); while (element) { printf("loading ground line...\n"); - addGroundLine(new GroundLine(this, atof(element->Attribute("x1")), atof(element->Attribute("y1")), atof(element->Attribute("x2")), atof(element->Attribute("y2")))); + groundLines[i] = new GroundLine(this, atof(element->Attribute("x1")), atof(element->Attribute("y1")), atof(element->Attribute("x2")), atof(element->Attribute("y2"))); i++; element = element->NextSiblingElement("ground_line"); } groundLinesCount = i; + + i = 0; + element = root->FirstChildElement("platform"); + while (element) { + printf("loading platform...\n"); + platforms[i] = new Platform(this, element); + + i++; + element = element->NextSiblingElement("platform"); + } + platformsCount = i; } else { printf("failed\n"); } diff --git a/SoDlib/src/GroundLine.cpp b/SoDlib/src/GroundLine.cpp index d7f86b8..519fa8e 100644 --- a/SoDlib/src/GroundLine.cpp +++ b/SoDlib/src/GroundLine.cpp @@ -3,6 +3,10 @@ GroundLine::GroundLine(Game* game, float x1, float y1, float x2, float y2) { this->game = game; + if (x1 == x2) + x2 += 0.0001f; +// if (y1 == y2) +// y2 += 0.0001f; if (x1 < x2) { startPoint.x = x1; startPoint.y = y1; @@ -155,3 +159,9 @@ float GroundLine::distanceTo(float x, float y) { return distanceToSegment(startPoint.x, startPoint.y, endPoint.x, endPoint.y, x, y); } + +void GroundLine::move(float dx, float dy) +{ + startPoint.x += dx; startPoint.y += dy; + endPoint.x += dx; endPoint.y += dy; +} diff --git a/SoDlib/src/MapAnimation.cpp b/SoDlib/src/MapAnimation.cpp index d3879f8..e16bd31 100644 --- a/SoDlib/src/MapAnimation.cpp +++ b/SoDlib/src/MapAnimation.cpp @@ -24,3 +24,8 @@ void MapAnimation::draw(bool schematicMode) game->getScaleFactor() ); } + +void MapAnimation::move(float dx, float dy) +{ + x += dx; y += dy; +} diff --git a/SoDlib/src/Platform.cpp b/SoDlib/src/Platform.cpp new file mode 100644 index 0000000..98daf90 --- /dev/null +++ b/SoDlib/src/Platform.cpp @@ -0,0 +1,103 @@ +#include "Platform.h" + +Platform::Platform(Game* game, TiXmlElement* element) +{ + this->game = game; + + groundLinesCount = atoi(element->Attribute("ground_lines")); + animationsCount = atoi(element->Attribute("animations")); + groundLines = new int[groundLinesCount]; + animations = new int[animationsCount]; + + spotsCount = atoi(element->Attribute("spots")); + spotX = new float[spotsCount]; + spotY = new float[spotsCount]; + spotAngle = new float[spotsCount]; + spotTime = new float[spotsCount]; + + int j = 0; + TiXmlElement* child = element->FirstChildElement("ground_line"); + while (child) { + groundLines[j] = atoi(child->Attribute("index")); + j++; + child = child->NextSiblingElement("ground_line"); + } + + j = 0; + child = element->FirstChildElement("animation"); + while (child) { + animations[j] = atoi(child->Attribute("index")); + j++; + child = child->NextSiblingElement("animation"); + } + + j = 0; + child = element->FirstChildElement("spot"); + while (child) { + spotTime[j] = atof(child->Attribute("time")); + spotX[j] = atof(child->Attribute("x")); + spotY[j] = atof(child->Attribute("y")); + spotAngle[j] = atof(child->Attribute("angle")); + j++; + child = child->NextSiblingElement("spot"); + } + + currentSpot = 0; + currentTime = 0.0f; + currentSpotStart = 0.0f; + currentX = 0; + currentY = 0; +} + +Platform::~Platform() +{ + //dtor +} + +void Platform::update(float dt) +{ + currentTime += dt; + if (currentTime > currentSpotStart + spotTime[currentSpot]) { + ///Переходим к следующему положению + if (currentSpot == spotsCount - 1) { + currentTime -= (currentSpotStart + spotTime[currentSpot]); + currentSpotStart = 0; + currentSpot = 0; + } else { + currentSpotStart += spotTime[currentSpot]; + currentSpot++; + } + } + float prevX = 0; float prevY = 0; + if (currentSpot > 0) { + prevX = spotX[currentSpot - 1]; + prevY = spotY[currentSpot - 1]; + } + float progress = (currentTime - currentSpotStart) / spotTime[currentSpot]; + float x = prevX + (spotX[currentSpot] - prevX) * progress; + float y = prevY + (spotY[currentSpot] - prevY) * progress; + float dx = x - currentX; float dy = y - currentY; + + for (int i = 0; i < game->getCharactersCount(); i++) { + if (characterOn(i)) { + game->getCharacter(i)->move(dx, dy); + } + } + for (int i = 0; i < groundLinesCount; i++) { + game->getGroundLine(groundLines[i])->move(dx, dy); + } + for (int i = 0; i < animationsCount; i++) { + game->getMapAnimation(animations[i])->move(dx, dy); + } + currentX = x; currentY = y; +} + +bool Platform::characterOn(int charIndex) +{ + Character* character = game->getCharacter(charIndex); + for (int i = 0; i < groundLinesCount; i++) { + if (character->getOnGround() == groundLines[i]) + return true; + } + return false; +} diff --git a/characterEditor/bin/Debug/animations.xml b/characterEditor/bin/Debug/animations.xml index 1b81add..5ad560a 100644 --- a/characterEditor/bin/Debug/animations.xml +++ b/characterEditor/bin/Debug/animations.xml @@ -1,7 +1,8 @@ - - - - - - + + + + + + + diff --git a/characterEditor/bin/Debug/characterEditor.exe b/characterEditor/bin/Debug/characterEditor.exe deleted file mode 100644 index ce43b1d..0000000 Binary files a/characterEditor/bin/Debug/characterEditor.exe and /dev/null differ diff --git a/characterEditor/bin/Debug/character_editor.log b/characterEditor/bin/Debug/character_editor.log deleted file mode 100644 index 4e16e60..0000000 --- a/characterEditor/bin/Debug/character_editor.log +++ /dev/null @@ -1,19 +0,0 @@ -HGE Started.. - -HGE version: 1.80 -Date: 25.09.2013, 18:19:24 - -Application: SoD character editor -OS: Windows 6.1.7601 -Memory: 4158584K total, 1005172K free - -D3D Driver: igdumdx32.dll -Description: Intel(R) G41 Express Chipset -Version: 8.15.10.2302 -Mode: 1600 x 900 x X8R8G8B8 - -Init done. - - -Finishing.. -The End. diff --git a/characterEditor/bin/Debug/disabled_icon.xml b/characterEditor/bin/Debug/disabled_icon.xml new file mode 100644 index 0000000..b762286 --- /dev/null +++ b/characterEditor/bin/Debug/disabled_icon.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/characterEditor/bin/Debug/icons.png b/characterEditor/bin/Debug/icons.png new file mode 100644 index 0000000..e357131 Binary files /dev/null and b/characterEditor/bin/Debug/icons.png differ diff --git a/characterEditor/bin/Debug/mage.xml b/characterEditor/bin/Debug/mage.xml new file mode 100644 index 0000000..d1b42d0 --- /dev/null +++ b/characterEditor/bin/Debug/mage.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/characterEditor/bin/Debug/mage/body.png b/characterEditor/bin/Debug/mage/body.png new file mode 100644 index 0000000..fb5f719 Binary files /dev/null and b/characterEditor/bin/Debug/mage/body.png differ diff --git a/characterEditor/bin/Debug/mage/body.png.xml b/characterEditor/bin/Debug/mage/body.png.xml new file mode 100644 index 0000000..c592055 --- /dev/null +++ b/characterEditor/bin/Debug/mage/body.png.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/characterEditor/bin/Debug/mage/fist.png b/characterEditor/bin/Debug/mage/fist.png new file mode 100644 index 0000000..259d9eb Binary files /dev/null and b/characterEditor/bin/Debug/mage/fist.png differ diff --git a/characterEditor/bin/Debug/mage/fist.png.xml b/characterEditor/bin/Debug/mage/fist.png.xml new file mode 100644 index 0000000..bbcb57a --- /dev/null +++ b/characterEditor/bin/Debug/mage/fist.png.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/characterEditor/bin/Debug/mage/foot.png b/characterEditor/bin/Debug/mage/foot.png new file mode 100644 index 0000000..58d3cfb Binary files /dev/null and b/characterEditor/bin/Debug/mage/foot.png differ diff --git a/characterEditor/bin/Debug/mage/foot.png.xml b/characterEditor/bin/Debug/mage/foot.png.xml new file mode 100644 index 0000000..be63ec2 --- /dev/null +++ b/characterEditor/bin/Debug/mage/foot.png.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/characterEditor/bin/Debug/mage/head.png b/characterEditor/bin/Debug/mage/head.png new file mode 100644 index 0000000..a265c23 Binary files /dev/null and b/characterEditor/bin/Debug/mage/head.png differ diff --git a/characterEditor/bin/Debug/mage/head.png.xml b/characterEditor/bin/Debug/mage/head.png.xml new file mode 100644 index 0000000..a946456 --- /dev/null +++ b/characterEditor/bin/Debug/mage/head.png.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/characterEditor/bin/Debug/mage/mage.png b/characterEditor/bin/Debug/mage/mage.png new file mode 100644 index 0000000..12a1901 Binary files /dev/null and b/characterEditor/bin/Debug/mage/mage.png differ diff --git a/characterEditor/bin/Debug/mage/mage.png.xml b/characterEditor/bin/Debug/mage/mage.png.xml new file mode 100644 index 0000000..ac15244 --- /dev/null +++ b/characterEditor/bin/Debug/mage/mage.png.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/characterEditor/bin/Debug/mage/open_hand.png b/characterEditor/bin/Debug/mage/open_hand.png new file mode 100644 index 0000000..716d9c8 Binary files /dev/null and b/characterEditor/bin/Debug/mage/open_hand.png differ diff --git a/characterEditor/bin/Debug/mage/open_hand.png.xml b/characterEditor/bin/Debug/mage/open_hand.png.xml new file mode 100644 index 0000000..f693bd3 --- /dev/null +++ b/characterEditor/bin/Debug/mage/open_hand.png.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/characterEditor/bin/Debug/mage/open_hand2.png b/characterEditor/bin/Debug/mage/open_hand2.png new file mode 100644 index 0000000..0ab5416 Binary files /dev/null and b/characterEditor/bin/Debug/mage/open_hand2.png differ diff --git a/characterEditor/bin/Debug/mage/open_hand2.png.xml b/characterEditor/bin/Debug/mage/open_hand2.png.xml new file mode 100644 index 0000000..be9369f --- /dev/null +++ b/characterEditor/bin/Debug/mage/open_hand2.png.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/characterEditor/bin/Debug/mage/staff.png b/characterEditor/bin/Debug/mage/staff.png new file mode 100644 index 0000000..bb87846 Binary files /dev/null and b/characterEditor/bin/Debug/mage/staff.png differ diff --git a/characterEditor/bin/Debug/mage/staff.png.xml b/characterEditor/bin/Debug/mage/staff.png.xml new file mode 100644 index 0000000..c9d945a --- /dev/null +++ b/characterEditor/bin/Debug/mage/staff.png.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/characterEditor/bin/Debug/rat.xml b/characterEditor/bin/Debug/rat.xml new file mode 100644 index 0000000..5ad560a --- /dev/null +++ b/characterEditor/bin/Debug/rat.xml @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/characterEditor/bin/Debug/rat/arm.png b/characterEditor/bin/Debug/rat/arm.png new file mode 100644 index 0000000..7501111 Binary files /dev/null and b/characterEditor/bin/Debug/rat/arm.png differ diff --git a/characterEditor/bin/Debug/rat/arm.png.xml b/characterEditor/bin/Debug/rat/arm.png.xml new file mode 100644 index 0000000..20aef12 --- /dev/null +++ b/characterEditor/bin/Debug/rat/arm.png.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/characterEditor/bin/Debug/rat/body.png b/characterEditor/bin/Debug/rat/body.png new file mode 100644 index 0000000..56599c6 Binary files /dev/null and b/characterEditor/bin/Debug/rat/body.png differ diff --git a/characterEditor/bin/Debug/rat/body.png.xml b/characterEditor/bin/Debug/rat/body.png.xml new file mode 100644 index 0000000..a50ae35 --- /dev/null +++ b/characterEditor/bin/Debug/rat/body.png.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/characterEditor/bin/Debug/rat/head.png b/characterEditor/bin/Debug/rat/head.png new file mode 100644 index 0000000..276ccbb Binary files /dev/null and b/characterEditor/bin/Debug/rat/head.png differ diff --git a/characterEditor/bin/Debug/rat/head.png.xml b/characterEditor/bin/Debug/rat/head.png.xml new file mode 100644 index 0000000..3311d40 --- /dev/null +++ b/characterEditor/bin/Debug/rat/head.png.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/characterEditor/bin/Debug/rat/head2.png b/characterEditor/bin/Debug/rat/head2.png new file mode 100644 index 0000000..74701cc Binary files /dev/null and b/characterEditor/bin/Debug/rat/head2.png differ diff --git a/characterEditor/bin/Debug/rat/head2.png.xml b/characterEditor/bin/Debug/rat/head2.png.xml new file mode 100644 index 0000000..5666cd0 --- /dev/null +++ b/characterEditor/bin/Debug/rat/head2.png.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/characterEditor/bin/Debug/rat/leg.png b/characterEditor/bin/Debug/rat/leg.png new file mode 100644 index 0000000..10e597d Binary files /dev/null and b/characterEditor/bin/Debug/rat/leg.png differ diff --git a/characterEditor/bin/Debug/rat/leg.png.xml b/characterEditor/bin/Debug/rat/leg.png.xml new file mode 100644 index 0000000..11b5ead --- /dev/null +++ b/characterEditor/bin/Debug/rat/leg.png.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/characterEditor/bin/Debug/rat/rat.png b/characterEditor/bin/Debug/rat/rat.png new file mode 100644 index 0000000..c07b5da Binary files /dev/null and b/characterEditor/bin/Debug/rat/rat.png differ diff --git a/characterEditor/bin/Debug/rat/tail.png b/characterEditor/bin/Debug/rat/tail.png new file mode 100644 index 0000000..df92af6 Binary files /dev/null and b/characterEditor/bin/Debug/rat/tail.png differ diff --git a/characterEditor/bin/Debug/rat/tail.png.xml b/characterEditor/bin/Debug/rat/tail.png.xml new file mode 100644 index 0000000..3cccfd8 --- /dev/null +++ b/characterEditor/bin/Debug/rat/tail.png.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/characterEditor/bin/Debug/rat/tail2.png b/characterEditor/bin/Debug/rat/tail2.png new file mode 100644 index 0000000..180b8d8 Binary files /dev/null and b/characterEditor/bin/Debug/rat/tail2.png differ diff --git a/characterEditor/bin/Debug/rat/tail2.png.xml b/characterEditor/bin/Debug/rat/tail2.png.xml new file mode 100644 index 0000000..5ac7024 --- /dev/null +++ b/characterEditor/bin/Debug/rat/tail2.png.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/characterEditor/bin/Debug/resize_icon.xml b/characterEditor/bin/Debug/resize_icon.xml new file mode 100644 index 0000000..691b8b6 --- /dev/null +++ b/characterEditor/bin/Debug/resize_icon.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/characterEditor/bin/Debug/test.xml b/characterEditor/bin/Debug/test.xml index 4af223d..c06d55e 100644 --- a/characterEditor/bin/Debug/test.xml +++ b/characterEditor/bin/Debug/test.xml @@ -1,14 +1,12 @@ - - - - - - - - - - + + + + + + + + @@ -17,18 +15,14 @@ - - - - - - - - - - - + + + + + + + @@ -38,39 +32,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + @@ -78,51 +43,23 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + - - - - - - - - - - + + + + + + + + @@ -132,78 +69,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/characterEditor/characterEditor.layout b/characterEditor/characterEditor.layout deleted file mode 100644 index a1066e7..0000000 --- a/characterEditor/characterEditor.layout +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/characterEditor/main.cpp b/characterEditor/main.cpp index dd249b6..8aed048 100644 --- a/characterEditor/main.cpp +++ b/characterEditor/main.cpp @@ -17,6 +17,7 @@ const int MODE_CAMERA_MOVE = 8; const int MODE_ANIM_ROTATE = 9; const int MODE_LAYER_DRAG = 10; const int MODE_ANIM_CONTEXT_MENU = 11; +const int MODE_RESIZE_CHARACTER = 12; const int MODE_PLAYING = 20; @@ -110,6 +111,8 @@ bool drawBoxes = true; HTEXTURE bgTex; hgeFont* fnt; +hgeAnimation* disabledIcon; hgeAnimation* resizeIcon; + hgeQuad grayQuad; void resetMode() @@ -1316,6 +1319,11 @@ bool FrameFunc() mode = MODE_ANGLE_DRAG; } } + + if (sqrt(pow(x - game->screenX(characterWidth * 0.5), 2) + pow(y - game->screenY(-characterHeight * 0.5), 2)) < 5) { + ///Если мышка возле угла прямоугольника, показывающего размер, то будем менять размер + mode = MODE_RESIZE_CHARACTER; + } } if (game->getHge()->Input_KeyDown(HGEK_LBUTTON) && game->getHge()->Input_GetKeyState(HGEK_SHIFT)) { selectedBody = getPointedBody(x, y); @@ -1617,6 +1625,17 @@ bool FrameFunc() resetMode(); } break; + case MODE_RESIZE_CHARACTER: + characterWidth = worldX * 2; + characterHeight = -worldY * 2; + if (characterWidth < 0) + characterWidth = 0; + if (characterHeight < 0) + characterHeight = 0; + if (game->getHge()->Input_KeyUp(HGEK_LBUTTON)) { + resetMode(); + } + break; } return game->update(false); @@ -1635,8 +1654,20 @@ bool RenderFunc() // game->getHge()->Gfx_RenderLine(game->screenX(0.5), game->screenY(-characterHeight), game->screenX(0.5), game->screenY(0), 0x55000000); // game->drawArc(game->screenX(0), game->screenY(0), 50 * game->getScaleFactor(), M_PI, 2 * M_PI, 0x55000000, 0); // game->getHge()->Gfx_RenderLine(game->screenX(-10), game->screenY(0.5), game->screenX(10), game->screenY(0.5), 0x55000000); + ///Положение мышки на экране и в мире + float x, y; + game->getHge()->Input_GetMousePos(&x, &y); + float worldX = game->worldX(x); + float worldY = game->worldY(y); + ///Добавление анимации в пул + float insertX = x; float insertY = y; + if (insertX < 1300) insertX = 1300; if (insertY < 450) insertY = 450; + ///Прямоугольник, показывающий размер персонажа в мире game->drawRect(game->screenX(0), game->screenY(0), characterWidth * 0.5 * game->getFullScale(), characterHeight * 0.5 * game->getFullScale(), 0, 0x55000000, 0); + if (sqrt(pow(x - game->screenX(characterWidth * 0.5), 2) + pow(y - game->screenY(-characterHeight * 0.5), 2)) < 5) { + resizeIcon->Render(x, y);///Нарисуем иконку, если мышка возле правого верхнего угла + } for (int index = 0; index < bodiesCount; index++) { int i = animLayer(index); @@ -1710,13 +1741,6 @@ bool RenderFunc() } } - float x, y; - game->getHge()->Input_GetMousePos(&x, &y); - float worldX = game->worldX(x); - float worldY = game->worldY(y); - float insertX = x; float insertY = y; - if (insertX < 1300) insertX = 1300; if (insertY < 450) insertY = 450; - //game->getHge()->Gfx_RenderLine(game->screenX(0) - 10, game->screenY(0) - 10, game->screenX(0) + 10, game->screenY(0) + 10, 0xFF000000); //game->getHge()->Gfx_RenderLine(game->screenX(0) - 10, game->screenY(0) + 10, game->screenX(0) + 10, game->screenY(0) - 10, 0xFF000000); @@ -2046,6 +2070,9 @@ int WINAPI WinMain(HINSTANCE, HINSTANCE, LPSTR, int) fnt = new hgeFont("font1.fnt"); + disabledIcon = game->loadAnimation("disabled_icon.xml"); + resizeIcon = game->loadAnimation("resize_icon.xml"); + grayQuad.v[0].x = 1300; grayQuad.v[0].y = 0; grayQuad.v[0].col = 0xFFAAAAAA; grayQuad.v[0].z = 1; grayQuad.v[1].x = 1600; grayQuad.v[1].y = 0; grayQuad.v[1].col = 0xFFAAAAAA; grayQuad.v[1].z = 1; grayQuad.v[2].x = 1600; grayQuad.v[2].y = 900; grayQuad.v[2].col = 0xFFAAAAAA; grayQuad.v[2].z = 1; diff --git a/characterEditor/obj/Debug/main.o b/characterEditor/obj/Debug/main.o deleted file mode 100644 index 2b142ca..0000000 Binary files a/characterEditor/obj/Debug/main.o and /dev/null differ diff --git a/constructionEditor/bin/Debug/constructionEditor.exe b/constructionEditor/bin/Debug/constructionEditor.exe deleted file mode 100644 index 9c5f2c4..0000000 Binary files a/constructionEditor/bin/Debug/constructionEditor.exe and /dev/null differ diff --git a/constructionEditor/bin/Debug/construction_editor.log b/constructionEditor/bin/Debug/construction_editor.log deleted file mode 100644 index 01831bc..0000000 --- a/constructionEditor/bin/Debug/construction_editor.log +++ /dev/null @@ -1,19 +0,0 @@ -HGE Started.. - -HGE version: 1.80 -Date: 02.12.2012, 16:21:58 - -Application: SoD construction editor -OS: Windows 5.1.2600 -Memory: 2097151K total, 2020744K free - -D3D Driver: nv4_disp.dll -Description: NVIDIA GeForce 9600M GS -Version: 6.14.12.6658 -Mode: 800 x 600 x X8R8G8B8 - -Init done. - - -Finishing.. -The End. diff --git a/constructionEditor/constructionEditor.layout b/constructionEditor/constructionEditor.layout deleted file mode 100644 index 1053280..0000000 --- a/constructionEditor/constructionEditor.layout +++ /dev/null @@ -1,4 +0,0 @@ - - - - diff --git a/constructionEditor/obj/Debug/main.o b/constructionEditor/obj/Debug/main.o deleted file mode 100644 index 013a42d..0000000 Binary files a/constructionEditor/obj/Debug/main.o and /dev/null differ diff --git a/mapEditor/bin/Debug/map.xml b/mapEditor/bin/Debug/map.xml index 2547bcb..35ec295 100644 --- a/mapEditor/bin/Debug/map.xml +++ b/mapEditor/bin/Debug/map.xml @@ -1,12 +1,16 @@ - + - + + + + + @@ -15,8 +19,12 @@ - + + + + + diff --git a/mapEditor/bin/Debug/mapEditor.exe b/mapEditor/bin/Debug/mapEditor.exe deleted file mode 100644 index cff377e..0000000 Binary files a/mapEditor/bin/Debug/mapEditor.exe and /dev/null differ diff --git a/mapEditor/bin/Debug/map_editor.log b/mapEditor/bin/Debug/map_editor.log deleted file mode 100644 index e8e14ba..0000000 --- a/mapEditor/bin/Debug/map_editor.log +++ /dev/null @@ -1,19 +0,0 @@ -HGE Started.. - -HGE version: 1.80 -Date: 25.09.2013, 23:42:20 - -Application: SoD map editor -OS: Windows 5.1.2600 -Memory: 2097151K total, 1939320K free - -D3D Driver: nv4_disp.dll -Description: NVIDIA GeForce 9600M GS -Version: 6.14.12.6658 -Mode: 1600 x 900 x X8R8G8B8 - -Init done. - - -Finishing.. -The End. diff --git a/mapEditor/main.cpp b/mapEditor/main.cpp index e22bc72..4c63380 100644 --- a/mapEditor/main.cpp +++ b/mapEditor/main.cpp @@ -203,6 +203,9 @@ bool saveMap(char* fn) TiXmlElement* root = new TiXmlElement( "map" ); root->SetAttribute("animations", animationsCount); root->SetAttribute("ground_lines", groundLinesCount); + root->SetAttribute("platforms", platformsCount); + root->SetDoubleAttribute("width", width); + root->SetDoubleAttribute("height", height); for (int i = 0; i < animationsCount; i++) { TiXmlElement* element = new TiXmlElement( "animation" ); @@ -318,7 +321,7 @@ bool loadMap(char* fn) i = 0; element = root->FirstChildElement("platform"); while (element) { - int j =0; + int j = 0; TiXmlElement* child = element->FirstChildElement("ground_line"); while (child) { platformGroundLines[i][j] = atoi(child->Attribute("index")); diff --git a/mapEditor/mapEditor.layout b/mapEditor/mapEditor.layout deleted file mode 100644 index 67807d3..0000000 --- a/mapEditor/mapEditor.layout +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/mapEditor/obj/Debug/main.o b/mapEditor/obj/Debug/main.o deleted file mode 100644 index a922896..0000000 Binary files a/mapEditor/obj/Debug/main.o and /dev/null differ diff --git a/plainlandsGame/bin/Debug/mage.xml b/plainlandsGame/bin/Debug/mage.xml new file mode 100644 index 0000000..e6847cf --- /dev/null +++ b/plainlandsGame/bin/Debug/mage.xml @@ -0,0 +1,236 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plainlandsGame/bin/Debug/mage/body.png b/plainlandsGame/bin/Debug/mage/body.png new file mode 100644 index 0000000..fb5f719 Binary files /dev/null and b/plainlandsGame/bin/Debug/mage/body.png differ diff --git a/plainlandsGame/bin/Debug/mage/body.png.xml b/plainlandsGame/bin/Debug/mage/body.png.xml new file mode 100644 index 0000000..c592055 --- /dev/null +++ b/plainlandsGame/bin/Debug/mage/body.png.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/plainlandsGame/bin/Debug/mage/fist.png b/plainlandsGame/bin/Debug/mage/fist.png new file mode 100644 index 0000000..259d9eb Binary files /dev/null and b/plainlandsGame/bin/Debug/mage/fist.png differ diff --git a/plainlandsGame/bin/Debug/mage/fist.png.xml b/plainlandsGame/bin/Debug/mage/fist.png.xml new file mode 100644 index 0000000..bbcb57a --- /dev/null +++ b/plainlandsGame/bin/Debug/mage/fist.png.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/plainlandsGame/bin/Debug/mage/foot.png b/plainlandsGame/bin/Debug/mage/foot.png new file mode 100644 index 0000000..58d3cfb Binary files /dev/null and b/plainlandsGame/bin/Debug/mage/foot.png differ diff --git a/plainlandsGame/bin/Debug/mage/foot.png.xml b/plainlandsGame/bin/Debug/mage/foot.png.xml new file mode 100644 index 0000000..be63ec2 --- /dev/null +++ b/plainlandsGame/bin/Debug/mage/foot.png.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/plainlandsGame/bin/Debug/mage/head.png b/plainlandsGame/bin/Debug/mage/head.png new file mode 100644 index 0000000..a265c23 Binary files /dev/null and b/plainlandsGame/bin/Debug/mage/head.png differ diff --git a/plainlandsGame/bin/Debug/mage/head.png.xml b/plainlandsGame/bin/Debug/mage/head.png.xml new file mode 100644 index 0000000..a946456 --- /dev/null +++ b/plainlandsGame/bin/Debug/mage/head.png.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/plainlandsGame/bin/Debug/mage/mage.png b/plainlandsGame/bin/Debug/mage/mage.png new file mode 100644 index 0000000..12a1901 Binary files /dev/null and b/plainlandsGame/bin/Debug/mage/mage.png differ diff --git a/plainlandsGame/bin/Debug/mage/mage.png.xml b/plainlandsGame/bin/Debug/mage/mage.png.xml new file mode 100644 index 0000000..ac15244 --- /dev/null +++ b/plainlandsGame/bin/Debug/mage/mage.png.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/plainlandsGame/bin/Debug/mage/open_hand.png b/plainlandsGame/bin/Debug/mage/open_hand.png new file mode 100644 index 0000000..716d9c8 Binary files /dev/null and b/plainlandsGame/bin/Debug/mage/open_hand.png differ diff --git a/plainlandsGame/bin/Debug/mage/open_hand.png.xml b/plainlandsGame/bin/Debug/mage/open_hand.png.xml new file mode 100644 index 0000000..f693bd3 --- /dev/null +++ b/plainlandsGame/bin/Debug/mage/open_hand.png.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/plainlandsGame/bin/Debug/mage/open_hand2.png b/plainlandsGame/bin/Debug/mage/open_hand2.png new file mode 100644 index 0000000..0ab5416 Binary files /dev/null and b/plainlandsGame/bin/Debug/mage/open_hand2.png differ diff --git a/plainlandsGame/bin/Debug/mage/open_hand2.png.xml b/plainlandsGame/bin/Debug/mage/open_hand2.png.xml new file mode 100644 index 0000000..be9369f --- /dev/null +++ b/plainlandsGame/bin/Debug/mage/open_hand2.png.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/plainlandsGame/bin/Debug/mage/staff.png b/plainlandsGame/bin/Debug/mage/staff.png new file mode 100644 index 0000000..bb87846 Binary files /dev/null and b/plainlandsGame/bin/Debug/mage/staff.png differ diff --git a/plainlandsGame/bin/Debug/mage/staff.png.xml b/plainlandsGame/bin/Debug/mage/staff.png.xml new file mode 100644 index 0000000..c9d945a --- /dev/null +++ b/plainlandsGame/bin/Debug/mage/staff.png.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/plainlandsGame/bin/Debug/map.xml b/plainlandsGame/bin/Debug/map.xml index a585ef8..35ec295 100644 --- a/plainlandsGame/bin/Debug/map.xml +++ b/plainlandsGame/bin/Debug/map.xml @@ -1,11 +1,15 @@ - + + + + + @@ -15,10 +19,12 @@ - - - + + + + + diff --git a/plainlandsGame/bin/Debug/plainlandsGame.exe b/plainlandsGame/bin/Debug/plainlandsGame.exe deleted file mode 100644 index 8729534..0000000 Binary files a/plainlandsGame/bin/Debug/plainlandsGame.exe and /dev/null differ diff --git a/plainlandsGame/bin/Debug/rat.xml b/plainlandsGame/bin/Debug/rat.xml new file mode 100644 index 0000000..c06d55e --- /dev/null +++ b/plainlandsGame/bin/Debug/rat.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plainlandsGame/bin/Debug/rat/arm.png b/plainlandsGame/bin/Debug/rat/arm.png new file mode 100644 index 0000000..7501111 Binary files /dev/null and b/plainlandsGame/bin/Debug/rat/arm.png differ diff --git a/plainlandsGame/bin/Debug/rat/arm.png.xml b/plainlandsGame/bin/Debug/rat/arm.png.xml new file mode 100644 index 0000000..20aef12 --- /dev/null +++ b/plainlandsGame/bin/Debug/rat/arm.png.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/plainlandsGame/bin/Debug/rat/body.png b/plainlandsGame/bin/Debug/rat/body.png new file mode 100644 index 0000000..56599c6 Binary files /dev/null and b/plainlandsGame/bin/Debug/rat/body.png differ diff --git a/plainlandsGame/bin/Debug/rat/body.png.xml b/plainlandsGame/bin/Debug/rat/body.png.xml new file mode 100644 index 0000000..a50ae35 --- /dev/null +++ b/plainlandsGame/bin/Debug/rat/body.png.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/plainlandsGame/bin/Debug/rat/head.png b/plainlandsGame/bin/Debug/rat/head.png new file mode 100644 index 0000000..276ccbb Binary files /dev/null and b/plainlandsGame/bin/Debug/rat/head.png differ diff --git a/plainlandsGame/bin/Debug/rat/head.png.xml b/plainlandsGame/bin/Debug/rat/head.png.xml new file mode 100644 index 0000000..3311d40 --- /dev/null +++ b/plainlandsGame/bin/Debug/rat/head.png.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/plainlandsGame/bin/Debug/rat/head2.png b/plainlandsGame/bin/Debug/rat/head2.png new file mode 100644 index 0000000..74701cc Binary files /dev/null and b/plainlandsGame/bin/Debug/rat/head2.png differ diff --git a/plainlandsGame/bin/Debug/rat/head2.png.xml b/plainlandsGame/bin/Debug/rat/head2.png.xml new file mode 100644 index 0000000..5666cd0 --- /dev/null +++ b/plainlandsGame/bin/Debug/rat/head2.png.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/plainlandsGame/bin/Debug/rat/leg.png b/plainlandsGame/bin/Debug/rat/leg.png new file mode 100644 index 0000000..10e597d Binary files /dev/null and b/plainlandsGame/bin/Debug/rat/leg.png differ diff --git a/plainlandsGame/bin/Debug/rat/leg.png.xml b/plainlandsGame/bin/Debug/rat/leg.png.xml new file mode 100644 index 0000000..11b5ead --- /dev/null +++ b/plainlandsGame/bin/Debug/rat/leg.png.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/plainlandsGame/bin/Debug/rat/rat.png b/plainlandsGame/bin/Debug/rat/rat.png new file mode 100644 index 0000000..c07b5da Binary files /dev/null and b/plainlandsGame/bin/Debug/rat/rat.png differ diff --git a/plainlandsGame/bin/Debug/rat/tail.png b/plainlandsGame/bin/Debug/rat/tail.png new file mode 100644 index 0000000..df92af6 Binary files /dev/null and b/plainlandsGame/bin/Debug/rat/tail.png differ diff --git a/plainlandsGame/bin/Debug/rat/tail.png.xml b/plainlandsGame/bin/Debug/rat/tail.png.xml new file mode 100644 index 0000000..3cccfd8 --- /dev/null +++ b/plainlandsGame/bin/Debug/rat/tail.png.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/plainlandsGame/bin/Debug/rat/tail2.png b/plainlandsGame/bin/Debug/rat/tail2.png new file mode 100644 index 0000000..180b8d8 Binary files /dev/null and b/plainlandsGame/bin/Debug/rat/tail2.png differ diff --git a/plainlandsGame/bin/Debug/rat/tail2.png.xml b/plainlandsGame/bin/Debug/rat/tail2.png.xml new file mode 100644 index 0000000..5ac7024 --- /dev/null +++ b/plainlandsGame/bin/Debug/rat/tail2.png.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/plainlandsGame/bin/Debug/sod.log b/plainlandsGame/bin/Debug/sod.log deleted file mode 100644 index b28932b..0000000 --- a/plainlandsGame/bin/Debug/sod.log +++ /dev/null @@ -1,19 +0,0 @@ -HGE Started.. - -HGE version: 1.80 -Date: 25.09.2013, 22:08:02 - -Application: plainlands game -OS: Windows 5.1.2600 -Memory: 2097151K total, 2097151K free - -D3D Driver: nv4_disp.dll -Description: NVIDIA GeForce 9600M GS -Version: 6.14.12.6658 -Mode: 1600 x 900 x X8R8G8B8 - -Init done. - - -Finishing.. -The End. diff --git a/plainlandsGame/obj/Debug/main.o b/plainlandsGame/obj/Debug/main.o deleted file mode 100644 index 9f7dd34..0000000 Binary files a/plainlandsGame/obj/Debug/main.o and /dev/null differ diff --git a/plainlandsGame/obj/Release/main.o b/plainlandsGame/obj/Release/main.o deleted file mode 100644 index 549ba08..0000000 Binary files a/plainlandsGame/obj/Release/main.o and /dev/null differ diff --git a/plainlandsGame/plainlandsGame.depend b/plainlandsGame/plainlandsGame.depend index c7ac813..2031395 100644 --- a/plainlandsGame/plainlandsGame.depend +++ b/plainlandsGame/plainlandsGame.depend @@ -1062,3 +1062,288 @@ 1378195931 d:\www\git\sod\sodlib\include\hgeguimenuitem.h +1380118164 source:d:\git\sod\plainlandsgame\main.cpp + + + + + + + +1378195935 d:\git\sod\hge181\include\hge.h + + +1378195935 d:\git\sod\hge181\include\hgefont.h + "hge.h" + "hgesprite.h" + +1378195935 d:\git\sod\hge181\include\hgesprite.h + "hge.h" + "hgerect.h" + +1378195935 d:\git\sod\hge181\include\hgerect.h + +1378195935 d:\git\sod\hge181\include\hgeanim.h + "hgesprite.h" + +1378195931 d:\git\sod\box2d\box2d.h + + + + + + + + + + + + + + + + + + + + + + + + + + + + +1378195931 d:\git\sod\box2d\common\b2settings.h + + + +1378195931 d:\git\sod\box2d\common\b2draw.h + + +1378195931 d:\git\sod\box2d\common\b2math.h + + + + + + +1378195931 d:\git\sod\box2d\common\b2timer.h + + +1378195931 d:\git\sod\box2d\collision\shapes\b2circleshape.h + + +1378195931 d:\git\sod\box2d\collision\shapes\b2shape.h + + + + +1378195931 d:\git\sod\box2d\common\b2blockallocator.h + + +1378195931 d:\git\sod\box2d\collision\b2collision.h + + + +1378195931 d:\git\sod\box2d\collision\shapes\b2edgeshape.h + + +1378195931 d:\git\sod\box2d\collision\shapes\b2chainshape.h + + +1378195931 d:\git\sod\box2d\collision\shapes\b2polygonshape.h + + +1378195931 d:\git\sod\box2d\collision\b2broadphase.h + + + + + +1378195931 d:\git\sod\box2d\collision\b2dynamictree.h + + + +1378195931 d:\git\sod\box2d\common\b2growablestack.h + + + +1378195931 d:\git\sod\box2d\collision\b2distance.h + + +1378195931 d:\git\sod\box2d\collision\b2timeofimpact.h + + + +1378195931 d:\git\sod\box2d\dynamics\b2body.h + + + + +1378195931 d:\git\sod\box2d\dynamics\b2fixture.h + + + + +1378195931 d:\git\sod\box2d\dynamics\b2worldcallbacks.h + + +1378195931 d:\git\sod\box2d\dynamics\b2timestep.h + + +1378195931 d:\git\sod\box2d\dynamics\b2world.h + + + + + + + +1378195931 d:\git\sod\box2d\common\b2stackallocator.h + + +1378195931 d:\git\sod\box2d\dynamics\b2contactmanager.h + + +1378195931 d:\git\sod\box2d\dynamics\contacts\b2contact.h + + + + + +1378195931 d:\git\sod\box2d\dynamics\joints\b2distancejoint.h + + +1378195931 d:\git\sod\box2d\dynamics\joints\b2joint.h + + +1378195931 d:\git\sod\box2d\dynamics\joints\b2frictionjoint.h + + +1378195931 d:\git\sod\box2d\dynamics\joints\b2gearjoint.h + + +1378195931 d:\git\sod\box2d\dynamics\joints\b2wheeljoint.h + + +1378195931 d:\git\sod\box2d\dynamics\joints\b2mousejoint.h + + +1378195931 d:\git\sod\box2d\dynamics\joints\b2prismaticjoint.h + + +1378195931 d:\git\sod\box2d\dynamics\joints\b2pulleyjoint.h + + +1378195931 d:\git\sod\box2d\dynamics\joints\b2revolutejoint.h + + +1378195931 d:\git\sod\box2d\dynamics\joints\b2ropejoint.h + + +1378195931 d:\git\sod\box2d\dynamics\joints\b2weldjoint.h + + +1378305217 d:\git\sod\sodlib\include\sodlib.h + + + + + + + + + + + + + + + + + + + + + + + +1378195935 d:\git\sod\hge181\include\hgegui.h + "hge.h" + "hgesprite.h" + "hgerect.h" + +1378195935 d:\git\sod\hge181\include\hgeguictrls.h + "hge.h" + "hgesprite.h" + "hgefont.h" + "hgerect.h" + "hgegui.h" + +1378195935 d:\git\sod\hge181\include\hgecolor.h + "hge.h" + +1378195931 d:\git\sod\sodlib\include\tinyxml.h + + + + + + + + + "tinystr.h" + +1378195931 d:\git\sod\sodlib\include\tinystr.h + + + +1378195931 d:\git\sod\sodlib\include\exception.h + + + +1380185565 d:\git\sod\sodlib\include\game.h + + +1378195931 d:\git\sod\sodlib\include\construction.h + + +1378195931 d:\git\sod\sodlib\include\characteractioncause.h + + +1378195931 d:\git\sod\sodlib\include\characteractioneffect.h + + +1378195931 d:\git\sod\sodlib\include\characteraction.h + + +1378195931 d:\git\sod\sodlib\include\characterhotspot.h + + +1378286669 d:\git\sod\sodlib\include\character.h + + +1378195931 d:\git\sod\sodlib\include\nonplayercharacter.h + + +1378195931 d:\git\sod\sodlib\include\playercharacter.h + + +1380185565 d:\git\sod\sodlib\include\groundline.h + + +1378306187 d:\git\sod\sodlib\include\mapanimation.h + + +1378195931 d:\git\sod\sodlib\include\debugdraw.h + + +1378195931 d:\git\sod\sodlib\include\guiwindow.h + + + +1378195931 d:\git\sod\sodlib\include\hgeguimenuitem.h + + diff --git a/plainlandsGame/plainlandsGame.layout b/plainlandsGame/plainlandsGame.layout deleted file mode 100644 index 569d535..0000000 --- a/plainlandsGame/plainlandsGame.layout +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/sod.workspace.layout b/sod.workspace.layout deleted file mode 100644 index 44ebb52..0000000 --- a/sod.workspace.layout +++ /dev/null @@ -1,5 +0,0 @@ - - - - -