diff --git a/.DS_Store b/.DS_Store index 16f2591..e3c3151 100644 Binary files a/.DS_Store and b/.DS_Store differ diff --git a/assets/audio/music/NeuWave Project/Backup/NeuWave [2023-08-13 231721].als b/assets/audio/music/NeuWave Project/Backup/NeuWave [2023-08-13 231721].als new file mode 100644 index 0000000..0b8c31f Binary files /dev/null and b/assets/audio/music/NeuWave Project/Backup/NeuWave [2023-08-13 231721].als differ diff --git a/assets/audio/music/NeuWave Project/Backup/NeuWave [2023-08-14 195045].als b/assets/audio/music/NeuWave Project/Backup/NeuWave [2023-08-14 195045].als new file mode 100644 index 0000000..ad3a525 Binary files /dev/null and b/assets/audio/music/NeuWave Project/Backup/NeuWave [2023-08-14 195045].als differ diff --git a/assets/audio/music/NeuWave Project/Backup/NeuWave [2023-08-14 201715].als b/assets/audio/music/NeuWave Project/Backup/NeuWave [2023-08-14 201715].als new file mode 100644 index 0000000..dba147e Binary files /dev/null and b/assets/audio/music/NeuWave Project/Backup/NeuWave [2023-08-14 201715].als differ diff --git a/assets/audio/music/NeuWave Project/Backup/NeuWave [2023-08-14 202752].als b/assets/audio/music/NeuWave Project/Backup/NeuWave [2023-08-14 202752].als new file mode 100644 index 0000000..1db1d4d Binary files /dev/null and b/assets/audio/music/NeuWave Project/Backup/NeuWave [2023-08-14 202752].als differ diff --git a/assets/audio/music/NeuWave Project/Backup/NeuWave [2023-08-14 205256].als b/assets/audio/music/NeuWave Project/Backup/NeuWave [2023-08-14 205256].als new file mode 100644 index 0000000..6d820e2 Binary files /dev/null and b/assets/audio/music/NeuWave Project/Backup/NeuWave [2023-08-14 205256].als differ diff --git "a/assets/audio/music/NeuWave Project/Icon\r" "b/assets/audio/music/NeuWave Project/Icon\r" new file mode 100644 index 0000000..e69de29 diff --git a/assets/audio/music/NeuWave Project/NeuWave.als b/assets/audio/music/NeuWave Project/NeuWave.als new file mode 100644 index 0000000..237dc5b Binary files /dev/null and b/assets/audio/music/NeuWave Project/NeuWave.als differ diff --git a/assets/audio/music/NeuWave Project/neuwave.flac b/assets/audio/music/NeuWave Project/neuwave.flac new file mode 100644 index 0000000..3857436 Binary files /dev/null and b/assets/audio/music/NeuWave Project/neuwave.flac differ diff --git a/assets/audio/music/NeuWave Project/neuwave.flac.asd b/assets/audio/music/NeuWave Project/neuwave.flac.asd new file mode 100644 index 0000000..2049460 Binary files /dev/null and b/assets/audio/music/NeuWave Project/neuwave.flac.asd differ diff --git a/assets/audio/music/NeuWave Project/neuwave.ogg b/assets/audio/music/NeuWave Project/neuwave.ogg new file mode 100644 index 0000000..b6eaf6d Binary files /dev/null and b/assets/audio/music/NeuWave Project/neuwave.ogg differ diff --git a/assets/audio/music/NeuWave Project/neuwave.wav b/assets/audio/music/NeuWave Project/neuwave.wav new file mode 100644 index 0000000..7bd8e79 Binary files /dev/null and b/assets/audio/music/NeuWave Project/neuwave.wav differ diff --git a/assets/audio/music/NeuWave Project/neuwave.wav.asd b/assets/audio/music/NeuWave Project/neuwave.wav.asd new file mode 100644 index 0000000..70fd9d6 Binary files /dev/null and b/assets/audio/music/NeuWave Project/neuwave.wav.asd differ diff --git a/assets/audio/music/neuwave.ogg b/assets/audio/music/neuwave.ogg new file mode 100644 index 0000000..b6eaf6d Binary files /dev/null and b/assets/audio/music/neuwave.ogg differ diff --git a/assets/maps/kaiju-city-map.tiled-session b/assets/maps/kaiju-city-map.tiled-session index 1482017..3002db2 100644 --- a/assets/maps/kaiju-city-map.tiled-session +++ b/assets/maps/kaiju-city-map.tiled-session @@ -24,7 +24,7 @@ 3 ], "scale": 4, - "selectedLayer": -1, + "selectedLayer": 0, "viewCenter": { "x": 132.75, "y": 137.875 @@ -52,6 +52,17 @@ "y": 116.19433198380568 } }, + "kaiju-city-map2.json": { + "scale": 2, + "selectedLayer": 1, + "viewCenter": { + "x": 170, + "y": 148.25 + } + }, + "kaiju-city-ts.tsj": { + "scaleInEditor": 1 + }, "kaiju-city.tsj": { "dynamicWrapping": false, "scaleInDock": 1, @@ -76,19 +87,20 @@ }, "last.exportedFilePath": "/home/ayoungblood/projects/KaijuSaveEarth/assets/maps", "last.externalTilesetPath": "/home/ayoungblood/projects/KaijuSaveEarth/assets/maps", - "last.imagePath": "/home/ayoungblood/projects/KaijuSaveEarth/assets/maps", + "last.imagePath": "/Users/ayoungblood/Projects/KaijuSaveEarth/assets/maps", "lastUsedTilesetExportFilter": "JSON tileset files (*.tsj *.json)", - "map.height": 32, + "map.height": 40, "map.lastUsedExportFilter": "All Files (*)", "map.lastUsedFormat": "json", "map.layerDataFormat": null, "map.tileHeight": 8, "map.tileWidth": 8, - "map.width": 32, + "map.width": 40, "openFiles": [ ], "project": "kaiju-city-map.tiled-project", "recentFiles": [ + "kaiju-city-ts.tsj", "kaiju-city-map.json", "kaiju-city-map.tmj", "kaiju-city.tsj", diff --git a/assets/maps/kaiju-city-map2.json b/assets/maps/kaiju-city-map2.json new file mode 100644 index 0000000..df6836a --- /dev/null +++ b/assets/maps/kaiju-city-map2.json @@ -0,0 +1,48 @@ +{ "compressionlevel":-1, + "height":40, + "infinite":false, + "layers":[ + { + "compression":"", + "data":"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                $   $   $   $   $   $   $   !   "   #   $   $   $   $   $   $   $   !   "   #   $   $   $   $   $   $   $   $   &   '                                 4   4   4   4   4   4   4   1   2   3   4   4   4   4   4   4   4   1   2   3   4   4   4   4   4   4   4   4   6   7                                 D   D   D   D   D   D   D   A   B   C   D   D   D   D   D   D   D   A   B   C   D   D   D   D   D   D   D   E         (                              $   $   $   $   $   $   $   !   "   #   $   $   $   $   $   $   $   !   "   #   $   $   $   $   $   $   $   !   "   #   $   $   $   $   $   !   "   #   $   $   4   4   4   4   4   4   4   1   2   3   4   4   4   4   4   4   4   1   2   3   4   4   4   4   4   4   4   1   2   3   4   4   4   4   4   1   2   3   4   4   D   D   D   D   D   D   D   A   B   C   D   D   D   D   D   D   D   A   B   C   D   D   D   D   D   D   D   A   B   C   D   D   D   D   D   A   B   C   D   D                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                           $   $   $   $   $   $   $   !   "   #                        !   "   #   $   $   $   $   $   $   $   !   "   #                  !   "   #         4   4   4   4   4   4   4   1   2   3                        1   2   3   4   4   4   4   4   4   4   1   2   3                  1   2   3         D   D   D   D   D   D   D   A   B   C                        A   B   C   D   D   D   D   D   D   D   A   B   C                  A   B   C                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      !   "   #   $   $   $   $   $   $   $   !   "   #                        !   "   #   $   $   $   $   $   !   "   #                              1   2   3   4   4   4   4   4   4   4   1   2   3                        1   2   3   4   4   4   4   4   1   2   3                              A   B   C   D   D   D   D   D   D   D   A   B   C                        A   B   C   D   D   D   D   D   A   B   C                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              !   "   #   $   $   $   $   $   $   $   !   "   #   $   $   $   $   $   $   $   !   "   #                                                      1   2   3   4   4   4   4   4   4   4   1   2   3   4   4   4   4   4   4   4   1   2   3                                                      A   B   C   D   D   D   D   D   D   D   A   B   C   D   D   D   D   D   D   D   A   B   C                                                                                                                                                         ", + "encoding":"base64", + "height":40, + "id":1, + "name":"Tile Layer 1", + "opacity":1, + "type":"tilelayer", + "visible":true, + "width":40, + "x":0, + "y":0 + }, + { + "compression":"", + "data":"                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                   $   $   $   $   $   $   !   "   #   $   $   $   $   $   $   $   !   "   #   $   $   $   $   $   $   $   $   &   '                                    4   4   4   4   4   4   1   2   3   4   4   4   4   4   4   4   1   2   3   4   4   4   4   4   4   4   4   6   7                                    D   D   D   D   D   D   A   B   C   D   D   D   D   D   D   D   A   B   C   D   D   D   D   D   D   D   E         (                                 $   $   $   $   $   $   !   "   #   $   $   $   $   $   $   $   !   "   #   $   $   $   $   $   $   $   !   "   #   $   $   $   $   $   !   "   #   $         4   4   4   4   4   4   1   2   3   4   4   4   4   4   4   4   1   2   3   4   4   4   4   4   4   4   1   2   3   4   4   4   4   4   1   2   3   4         D   D   D   D   D   D   A   B   C   D   D   D   D   D   D   D   A   B   C   D   D   D   D   D   D   D   A   B   C   D   D   D   D   D   A   B   C   D                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                 $   $   $   $   $   $   !   "   #                        !   "   #   $   $   $   $   $   $   $   !   "   #                  !   "   #            4   4   4   4   4   4   1   2   3                        1   2   3   4   4   4   4   4   4   4   1   2   3                  1   2   3            D   D   D   D   D   D   A   B   C                        A   B   C   D   D   D   D   D   D   D   A   B   C                  A   B   C                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                      !   "   #   $   $   $   $   $   $   $   !   "   #                        !   "   #   $   $   $   $   $   !   "   #                              1   2   3   4   4   4   4   4   4   4   1   2   3                        1   2   3   4   4   4   4   4   1   2   3                              A   B   C   D   D   D   D   D   D   D   A   B   C                        A   B   C   D   D   D   D   D   A   B   C                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              !   "   #   $   $   $   $   $   $   $   !   "   #   $   $   $   $   $   $   $   !   "   #                                                      1   2   3   4   4   4   4   4   4   4   1   2   3   4   4   4   4   4   4   4   1   2   3                                                      A   B   C   D   D   D   D   D   D   D   A   B   C   D   D   D   D   D   D   D   A   B   C                                                                                                                                                         ", + "encoding":"base64", + "height":40, + "id":2, + "name":"Collision", + "opacity":1, + "type":"tilelayer", + "visible":true, + "width":40, + "x":0, + "y":0 + }], + "nextlayerid":3, + "nextobjectid":1, + "orientation":"orthogonal", + "renderorder":"right-down", + "tiledversion":"1.10.1", + "tileheight":8, + "tilesets":[ + { + "firstgid":1, + "source":"kaiju-city-ts.tsj" + }], + "tilewidth":8, + "type":"map", + "version":"1.10", + "width":40 +} \ No newline at end of file diff --git a/assets/maps/kaiju-city-tileset.aseprite b/assets/maps/kaiju-city-tileset.aseprite index 7699d36..0be9255 100644 Binary files a/assets/maps/kaiju-city-tileset.aseprite and b/assets/maps/kaiju-city-tileset.aseprite differ diff --git a/assets/maps/kaiju-city-ts.png b/assets/maps/kaiju-city-ts.png new file mode 100644 index 0000000..20f3543 Binary files /dev/null and b/assets/maps/kaiju-city-ts.png differ diff --git a/assets/maps/kaiju-city-ts.tsj b/assets/maps/kaiju-city-ts.tsj new file mode 100644 index 0000000..8d1a561 --- /dev/null +++ b/assets/maps/kaiju-city-ts.tsj @@ -0,0 +1,14 @@ +{ "columns":16, + "image":"kaiju-city-ts.png", + "imageheight":128, + "imagewidth":128, + "margin":0, + "name":"kaiju-city-ts", + "spacing":0, + "tilecount":256, + "tiledversion":"1.10.1", + "tileheight":8, + "tilewidth":8, + "type":"tileset", + "version":"1.10" +} \ No newline at end of file diff --git a/assets/textures/actors/chopper.aseprite b/assets/textures/actors/chopper.aseprite new file mode 100644 index 0000000..aedbe20 Binary files /dev/null and b/assets/textures/actors/chopper.aseprite differ diff --git a/assets/textures/actors/chopper.gif b/assets/textures/actors/chopper.gif new file mode 100644 index 0000000..6d42128 Binary files /dev/null and b/assets/textures/actors/chopper.gif differ diff --git a/src/ecs/ColliderComponent.h b/src/ecs/ColliderComponent.h index c11974c..341d69e 100644 --- a/src/ecs/ColliderComponent.h +++ b/src/ecs/ColliderComponent.h @@ -52,9 +52,11 @@ public: collider.x = xpos; collider.y = ypos; collider.w = collider.h = size*scale; - setTex(texture); - center.x = collider.x+collider.w/2; - center.y = collider.y+collider.h/2; + if(texture != ""){ + setTex(texture); + } + center.x = collider.x+collider.w/2; + center.y = collider.y+collider.h/2; } ColliderComponent(std::string t, int width, int height, bool hasOffset, int oX, int oY, std::string texture) @@ -62,11 +64,13 @@ public: tag = t; collider.w = width; collider.h = height; - offsetX = oX; - offsetY = oY; - setTex(texture); - center.x = collider.x+collider.w/2; - center.y = collider.y+collider.h/2; + offsetX = oX; + offsetY = oY; + if(texture != ""){ + setTex(texture); + } + center.x = collider.x+collider.w/2; + center.y = collider.y+collider.h/2; } void init() override diff --git a/src/ecs/SpriteComponent.h b/src/ecs/SpriteComponent.h index ecba3e3..8944fdc 100644 --- a/src/ecs/SpriteComponent.h +++ b/src/ecs/SpriteComponent.h @@ -80,15 +80,34 @@ public: if(fin.fail()){ std::cerr<<"ERROR opening json file: " << json << std::endl; } else if (fin.is_open()){ + printf("Opened a json file\n"); std::ifstream jsonText(json); std::ostringstream tmp; tmp << jsonText.rdbuf(); std::string aJson = tmp.str(); cJSON * animJson = cJSON_Parse(aJson.c_str()); + std::cout << "animJson: " << std::endl; + //std::cout << animJson << std::endl; + char * printOut = cJSON_Print(animJson); + std::cout << animJson << std::endl; cJSON * meta = cJSON_GetObjectItem(animJson, "meta"); + cJSON * version = cJSON_GetObjectItem(animJson, "version"); cJSON * frameTags = cJSON_GetObjectItem(meta,"frameTags"); int tagsCount = cJSON_GetArraySize(frameTags); - + std::cout << "tagsCount: " << tagsCount << std::endl; + std::cout << "version: " << version << std::endl; + const cJSON * aFrame = NULL; + const cJSON * aFrames = NULL; + aFrames =cJSON_GetObjectItemCaseSensitive(animJson, "frames"); + cJSON_ArrayForEach(aFrame, aFrames){ + cJSON *filename = cJSON_GetObjectItemCaseSensitive(aFrame, "filename"); + if (!cJSON_IsNumber(aFrame)){ + printf("Not a number\n"); + } else { + std::cout << "animation frame number: " << aFrame->valueint<< std::endl; + } + + } for (int t = 0; t < tagsCount; t++) { cJSON * animItem = cJSON_GetArrayItem(frameTags,t); @@ -98,6 +117,7 @@ public: int toFrame = cJSON_GetObjectItem(animItem, "to")->valueint; Animation anim = Animation(fromFrame,toFrame,100); animations.emplace(name, anim); + std::cout << "Animation Name: " << name << std::endl; Play(name); } } diff --git a/src/game/Game.cpp b/src/game/Game.cpp index 54ce1b9..8c2f6a7 100644 --- a/src/game/Game.cpp +++ b/src/game/Game.cpp @@ -147,14 +147,14 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g std::string kaijuTex = Game::projPath + "assets/textures/actors/kaijuturtle.png"; std::string fontTex = Game::projPath + "assets/textures/ui/ui-font-lorez5.png"; std::string textBoxTex = Game::projPath + "assets/textures/ui/ui-element-bubble.png"; - std::string musicFile = Game::projPath + "assets/audio/music/sillypuppy.ogg"; + std::string musicFile = Game::projPath + "assets/audio/music/neuwave.ogg"; std::string sfxFile = Game::projPath + "assets/audio/sfx/bwoop.wav"; assets->AddTexture("player", kaijuTex.c_str()); assets->AddTexture("font", fontTex.c_str()); assets->AddTexture("textBox", textBoxTex.c_str()); - assets->AddMusicTrack("simonZ",musicFile.c_str()); + assets->AddMusicTrack("neuwave",musicFile.c_str()); assets->AddSoundClip("bwoop",sfxFile.c_str()); @@ -179,11 +179,11 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g //ecs implementation - player.addComponent(150*gScale,100*gScale,32,32,globalScale,3); // 180,120 + player.addComponent(150*gScale,100*gScale,32,32,globalScale,2); // 180,120 player.addComponent("player", SpriteComponent::spriteAnimation, "assets/textures/actors/kaijuturtle.json"); // player.addComponent(0.0,0.0,false,false,Vector2D().Zero()); - player.addComponent("player",16*globalScale,32*globalScale, true, 2*globalScale,10*globalScale, "collider"); + player.addComponent("player",20*globalScale,20*globalScale, true, 0*globalScale,0*globalScale, ""); player.addComponent(); player.addGroup(groupPlayers); @@ -191,8 +191,8 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g levelMap.y = 0; // printf("Trying to load Tilemap\n"); - std::string mapPath = Game::projPath + "assets/maps/kaiju-city-map.json"; - gameScene.addComponent(mapPath,"kaiju-city","Tile Layer 1","Collision",gScale,player.getComponent().position.x+player.getComponent().width/2,player.getComponent().position.y+player.getComponent().height/2); //150,100 + std::string mapPath = Game::projPath + "assets/maps/kaiju-city-map2.json"; + gameScene.addComponent(mapPath,"kaiju-city-ts","Tile Layer 1","Collision",gScale,player.getComponent().position.x+player.getComponent().width/2,player.getComponent().position.y+player.getComponent().height/2); //150,100 gameScene.addGroup(groupMap); // printf("Completed loading Tilemap\n"); @@ -248,7 +248,7 @@ void Game::update() if (Mix_PlayingMusic() == 0 && gsm->currentState == GameStateManager::ST_COREGAME) { // std::cout << "Play Music Now" << std::endl; - Mix_PlayMusic(assets->GetMusicTrack("simonZ"), -1); + Mix_PlayMusic(assets->GetMusicTrack("neuwave"), -1); } if (Mix_PlayingMusic() != 0 && gsm->currentState != GameStateManager::ST_COREGAME) {