diff --git a/assets/maps/testmapb64.tmx b/assets/maps/testmapb64.tmx index 413a88e..237968e 100644 --- a/assets/maps/testmapb64.tmx +++ b/assets/maps/testmapb64.tmx @@ -1,9 +1,9 @@ - + -          #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   &   #   #   #   #   #   *   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   &   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   (   (   #   #   #   #   #   #   #   #   #   #   *   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   (   (   (   (   (   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   (   (   (   #   #   (   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   ,   ,   ,   ,   ,   ,   ,   #   #   #   ,   ,   ,   ,   -   .   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   -   .   ,   ,   ,   ,   ,   ,   -   .   ,   -   .   ,   ,   ,            )   *   +   #   #   #   #   (   (   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   ,   ,   ,   ,   ,   -   .   #   #            #   #   *   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   ,   ,   ,   ,   -   .   #   #            ,   -   .   .   #   #   #   #   #   #   #   #   #   #   #   #   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   -   .   #   #   ,   -   .   #   ,   ,   ,   ,   ,   -   .   .   .   ,   ,   ,   ,   ,   ,   ,   ,   -   ,   ,   ,   ,   ,   ,   -   .   ,   ,   ,   ,   ,   ,   -   .   .   ,   ,   ,   ,   ,   -   .            #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   ,   ,   -   .   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   -   .   ,   ,   ,   ,   ,   -   .   #   #   #   #   #   #   #   #   ,   -   .   .   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   ,   ,   ,   ,   ,   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #    + %   %   %   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   (   (   (   %         #   #   #   &   #   #   #   #   #   *   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   (   %      %   #   #   #   &   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   (   #   (            %   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   (   #   #   #            #   %   #   #   #   (   (   #   #   #   #   #   #   #   #   #   #   *   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   (   #   #   #   #            #   #   %   #   (   (   (   (   (   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   #   #   #   #   (   #   #   #   #   #            #   #   #   %   (   (   #   #   (   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   (   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   ,   ,   ,   ,   ,   ,   ,   #   #   #   ,   ,   ,   ,   -   .   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   -   .   ,   ,   ,   ,   ,   ,   -   .   ,   -   .   ,   ,   ,            )   *   +   #   #   #   #   (   (   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   ,   ,   ,   ,   ,   -   .   #   #            #   #   *   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   ,   ,   ,   ,   -   .   #   #            ,   -   .   .   #   #   #   #   #   #   #   #   #   #   #   #   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   -   .   #   #   ,   -   .   #   ,   ,   ,   ,   ,   -   .   .   .   ,   ,   ,   ,   ,   ,   ,   ,   -   ,   ,   ,   ,   ,   ,   -   .   ,   ,   ,   ,   ,   ,   -   .   .   ,   ,   ,   ,   ,   -   .            #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   ,   ,   -   .   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #            #   #   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   -   .   ,   ,   ,   ,   ,   -   .   #   #   #   #   #   #   #   #   ,   -   .   .   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   ,   ,   ,   ,   ,   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   '   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   "   #   #   #   #   #   #   #   #   #   #   #   '   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   "   #   #   #   #   #   #   #   #   #   '   #   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   "   #   #   #   #   #   #   #   '   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   #   #   #   #   #   #   #   #   #   #   #   #   ,   -   .   .   #   #   #   "   #   #   #   '   #   '   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   "   #   "   '   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   "   '   '   '   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   #   "   "   "    diff --git a/build/BeagleRescue b/build/BeagleRescue index fce9530..08a39da 100755 Binary files a/build/BeagleRescue and b/build/BeagleRescue differ diff --git a/src/ecs/KeyboardController.h b/src/ecs/KeyboardController.h index 56ba412..c583b92 100644 --- a/src/ecs/KeyboardController.h +++ b/src/ecs/KeyboardController.h @@ -43,20 +43,24 @@ public: { case SDLK_UP: if(Game::gsm->currentState == GameStateManager::ST_COREGAME){ + if(transform->position.y>0){ transform->velocity.y = -1; // if(Game::playerIsGrounded){ sprite->Play("Walk"); // } sprite->spriteFlip = SDL_FLIP_NONE; + } } break; case SDLK_DOWN: if(Game::gsm->currentState == GameStateManager::ST_COREGAME){ + if(transform->position.yvelocity.y = 1; // if(Game::playerIsGrounded){ sprite->Play("Walk"); // } sprite->spriteFlip = SDL_FLIP_NONE; + } } break; case SDLK_LEFT: @@ -69,11 +73,13 @@ public: // } // transform->lastSafePos = Vector2D(transform->position.x,transform->position.y); // printf("lastSafePos .x: %g .y: %g \n",transform->lastSafePos.x,transform->lastSafePos.y); + if(transform->position.x>0){ transform->velocity.x = -1; // if(Game::playerIsGrounded){ sprite->Play("Walk"); // } sprite->spriteFlip = SDL_FLIP_NONE; + } } break; case SDLK_RIGHT: @@ -85,11 +91,13 @@ public: // Do a pre-check for tile-based smooth algorithm // ========= // int intersectionTileX = collider->center.x; + if(transform->position.xvelocity.x = 1; // if(Game::playerIsGrounded){ sprite->Play("Walk"); // } sprite->spriteFlip = SDL_FLIP_HORIZONTAL; + } } break; // case SDLK_a: diff --git a/src/ecs/TileMapComponent.h b/src/ecs/TileMapComponent.h index 4354d60..9750bd0 100644 --- a/src/ecs/TileMapComponent.h +++ b/src/ecs/TileMapComponent.h @@ -31,6 +31,8 @@ public: int globalScale; std::vector tileSet; std::vector destRects; +// std::tuple oPosition; + std::vector> initialPositions; // std::array destRects; int totalTiles; @@ -41,16 +43,18 @@ public: SDL_DestroyTexture(texture); } - TileMapComponent(tmxparser::TmxMap loadedMap, int gScale) + TileMapComponent(tmxparser::TmxMap loadedMap, int gScale, int offsetX, int offsetY) { map = loadedMap; std::string texturePath = "assets/textures/tiles/" + loadedMap.tilesetCollection[0].name + ".png"; Game::assets->AddTexture(map.tilesetCollection[0].name, texturePath.c_str()); setTex(map.tilesetCollection[0].name); globalScale = gScale; +// =========== Setup Tile Set =========== totalTiles = map.tilesetCollection[0].colCount*map.tilesetCollection[0].rowCount; // std::cout << "Number of Tiles: " << totalTiles << std::endl; tileSet.resize(totalTiles); + for (int r=0;r ogPos = std::make_tuple(thisRect.x,thisRect.y); + initialPositions[elem] = ogPos; destRects[elem] = thisRect; // std::cout << "destRects[" << elem << "].x = " << destRects[elem].x << "].y = " << destRects[elem].y << "].w = " << destRects[elem].w << std::endl; } @@ -92,16 +90,9 @@ public: { if (Game::gsm->currentState == GameStateManager::ST_COREGAME){ - for (int i=0;i 0) - destRects[i].x = destRects[i].x - Game::pVel.x; - if (Game::pVel.y > 0) - destRects[i].y = destRects[i].y - Game::pVel.y; - if (Game::pVel.x < 0) - destRects[i].x = destRects[i].x - Game::pVel.x; - if (Game::pVel.y < 0) - destRects[i].y = destRects[i].y - Game::pVel.y; - + for (int i=0;i(initialPositions[i]) - Game::camera.x; + destRects[i].y = std::get<1>(initialPositions[i]) - Game::camera.y; } } } @@ -110,9 +101,9 @@ public: { //iterate through rows and columns of the map to draw the tiles // First cycle through rows - for (int r = 0;rAddSoundClip("bark2","assets/audio/sfx/Bark2.wav"); // map = new Map("terrain",globalScale,16); - - gameScene.addComponent(map,gScale); - gameScene.addGroup(groupMap); // std::string myText = "Find lost puppies!\nThey need your help!"; std::string myText = "Press U to Start"; @@ -179,24 +176,24 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g my9Slice = new UINineSlice("textBox"); my9Slice->MakeSlices("textBox",32,32,14,16,14,16,myDestRect,globalScale,Game::groupUI_Layer0); - uiInfo.addComponent(camera.w-94,10,72,96,gScale); + uiInfo.addComponent((camera.w-94)*gScale,10*gScale,72,96,gScale); // uiInfo.addComponent("font", "CollisionHori: Vert: Jump: P.y : P.dy: YVec: ", 8, 12, 1); uiInfo.addComponent("font", "Camera CamX: CamY: P.x: P.y : P.dy: YVec: ", 8, 12, gScale); uiInfo.addGroup(groupUI_Layer3); - uiCamXInfo.addComponent(camera.w-48,24,40,12,gScale); - uiCamXInfo.addComponent("font", "nan", 8, 12, 1); + uiCamXInfo.addComponent((camera.w-48)*gScale,24*gScale,40,12,gScale); + uiCamXInfo.addComponent("font", "nan", 8, 12, gScale); uiCamXInfo.addGroup(groupUI_Layer3); - uiCamYInfo.addComponent(camera.w-48,36,40,12,gScale); + uiCamYInfo.addComponent((camera.w-48)*gScale,36*gScale,40,12,gScale); uiCamYInfo.addComponent("font", "nan", 8, 12, 1); uiCamYInfo.addGroup(groupUI_Layer3); - uiPlayerXInfo.addComponent(camera.w-48,48,40,12,gScale); + uiPlayerXInfo.addComponent((camera.w-48)*gScale,48*gScale,40,12,gScale); uiPlayerXInfo.addComponent("font", "nan", 8, 12, 1); uiPlayerXInfo.addGroup(groupUI_Layer3); - uiPlayerYInfo.addComponent(camera.w-48,60,40,12,gScale); + uiPlayerYInfo.addComponent((camera.w-48)*gScale,60*gScale,40,12,gScale); uiPlayerYInfo.addComponent("font", "nan", 8, 12, 1); uiPlayerYInfo.addGroup(groupUI_Layer3); @@ -216,7 +213,7 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g //ecs implementation // player.addComponent(860*globalScale,640*globalScale,22,42,globalScale); - player.addComponent(150*globalScale,100*globalScale,22,42,globalScale); // 180,120 + player.addComponent(150,100,22,42,globalScale); // 180,120 player.addComponent("player", SpriteComponent::spriteAnimation, "assets/textures/actors/firefighter.json"); // player.addComponent(0.0,0.0,false,false,Vector2D().Zero()); @@ -224,6 +221,9 @@ void Game::init(const char *title, int width, int height, bool fullscreen, int g player.addComponent(); player.addGroup(groupPlayers); + gameScene.addComponent(map,gScale,player.getComponent().position.x+player.getComponent().width/2,player.getComponent().position.y+player.getComponent().height/2); //150,100 + gameScene.addGroup(groupMap); + playerPosition = Vector2D().Zero(); pVel = Vector2D().Zero(); @@ -330,23 +330,25 @@ void Game::update() uiCamYInfo.getComponent().updateString(std::to_string(camera.y)); int playerX = player.getComponent().position.x; int playerY = player.getComponent().position.y; + uiPlayerXInfo.getComponent().updateString(std::to_string(playerX)); uiPlayerYInfo.getComponent().updateString(std::to_string(playerY)); + playerPosition.x = playerX; playerPosition.y = playerY; pVel.x = player.getComponent().velocity.x; pVel.y = player.getComponent().velocity.y; - if(camera.x < 0) - camera.x = 0; - if (camera.y < 0) - camera.y = 0; - if (camera.x > levelMap.w-camera.w) - camera.x = levelMap.w-camera.w; - if (camera.y > levelMap.h-camera.h) - camera.y = levelMap.h-camera.h; +// if(camera.x < 0) +// camera.x = 0; +// if (camera.y < 0) +// camera.y = 0; +// if (camera.x > levelMap.w-camera.w*1.5-player.getComponent().width) +// camera.x = levelMap.w-camera.w*1.5-player.getComponent().width; +// if (camera.y > levelMap.h-camera.h*1.5-player.getComponent().height) +// camera.y = levelMap.h-camera.h*1.5-player.getComponent().height; if (Game::debugCollisionBoxes) { for (auto& c: colliders) diff --git a/src/game/Game.hpp b/src/game/Game.hpp index fec8230..4e1a545 100644 --- a/src/game/Game.hpp +++ b/src/game/Game.hpp @@ -45,6 +45,7 @@ public: static Vector2D playerPosition; static Vector2D pVel; static SDL_Rect camera; + static SDL_Rect levelMap; static AssetManager* assets; static GameStateManager* gsm; std::string BoolToString(bool b);