增加Fps组建，增加小地图组建

其他修改

Author: ccsdu2004

application/CMakeLists.txt

@@ -33,4 +33,5 @@ add_subdirectory(chapter-31)
 add_subdirectory(chapter-32)
 add_subdirectory(chapter-33)
 add_subdirectory(chapter-34)
-add_subdirectory(chapter-35)
+add_subdirectory(chapter-35)
+add_subdirectory(chapter-36)

application/chapter-19/MineSweeperScene.cpp

@@ -14,7 +14,7 @@ MineSweeperScene::MineSweeperScene()
     addMessageListener(listener);
 
     tileMap = TileMap::createTileMap(TileMapType_Hex);
-    tileMap->init(18, 12, 36);
+    tileMap->init(20, 14, 64);
     tileMap->setTextVisible(true);
 
     addChild(tileMap);

application/chapter-19/SpriteForwardState.cpp

@@ -14,7 +14,7 @@ void SpriteForwardState::onEnter()
         return;
 
     auto sprite = std::dynamic_pointer_cast<MovingSprite>(getTarget().lock());
-    auto spritePosition = sprite->getPosition();
+    auto spritePosition = sprite->getCenter();
 
     if(tileMap.expired())
         return;
@@ -40,7 +40,7 @@ void SpriteForwardState::onLeave()
 
     auto sprite = std::dynamic_pointer_cast<MovingSprite>(getTarget().lock());
     sprite->setVelocity(sf::Vector2f(0, 0));
-    sprite->setPosition(targetPosition);
+    sprite->setCenter(targetPosition);
 }
 
 void SpriteForwardState::update(float deltaTime)
@@ -51,7 +51,7 @@ void SpriteForwardState::update(float deltaTime)
         return;
 
     auto sprite = std::dynamic_pointer_cast<MovingSprite>(getTarget().lock());
-    auto spritePosition = sprite->getPosition();
+    auto spritePosition = sprite->getCenter();
 
     float distance = distance2(targetPosition.x, targetPosition.y, spritePosition.x, spritePosition.y);
     if(distance < 1.0f)

application/chapter-19/main.cpp

@@ -20,7 +20,7 @@ int main()
     auto size = sf::Vector2f(900, 720);
     auto setting = sf::ContextSettings();
     setting.antialiasingLevel = 12;
-    auto window = std::make_shared<sf::RenderWindow>(sf::VideoMode(size.x, size.y), "Chapter-14",
+    auto window = std::make_shared<sf::RenderWindow>(sf::VideoMode(size.x, size.y), "Chapter-19",
                   sf::Style::Close, setting);
     window->setVerticalSyncEnabled(true);
 

application/chapter-35/SpriteForwardState.cpp

@@ -58,6 +58,6 @@ void SpriteForwardState::update(float deltaTime)
     auto spritePosition = sprite->getCenter();
 
     float distance = distance2(targetPosition.x, targetPosition.y, spritePosition.x, spritePosition.y);
-    if(distance < 2.0f)
+    if(distance < 3.0f)
         setFinished();
 }

application/chapter-35/SpriteRotateState.h

@@ -6,7 +6,7 @@
 #include <StateMachine.h>
 #include <Util.h>
 
-#define ROTATE_SPEED 24.0f
+#define ROTATE_SPEED 18.0f
 
 class SpriteTurnLeftState : public State
 {

application/chapter-36/CMakeLists.txt

@@ -0,0 +1,21 @@
+
+add_executable(chapter-36 main.cpp
+    SpriteIdleState.h
+    SpriteIdleState.cpp
+    SpriteForwardState.h
+    SpriteForwardState.cpp
+    SpriteRotateState.h
+    SpriteRotateState.cpp
+    SpriteErrorState.h
+    SpriteErrorState.cpp
+    WayFindingScene.cpp
+    WayFindingScene.h
+    WayFindingTank.cpp
+    WayFindingTank.h
+    WayFindingTileVisitor.cpp
+    WayFindingTileVisitor.h
+    WayFindingState.cpp
+    WayFindingState.h
+    )
+
+target_link_libraries(chapter-36 framework sfml-system sfml-graphics sfml-window)

application/chapter-36/SpriteAnimationState.cpp

@@ -0,0 +1,54 @@
+#include <MovingSprite.h>
+#include "MineSweeperScene.h"
+#include "SpriteAnimationState.h"
+
+void SpriteAnimationState::onEnter()
+{
+    if(getTarget().expired())
+        return;
+
+    if(scene.expired())
+        return;
+
+    auto tileMap = scene.lock()->getTileMap();
+    auto sprite = std::dynamic_pointer_cast<Sprite>(getTarget().lock());
+    auto spritePosition = sprite->getPosition();
+    auto tileIndex = tileMap->getTileIndexByWorldPosition(spritePosition.x, spritePosition.y);
+    tileID = getTileIDByPosition(tileIndex.x, tileIndex.y);
+
+    //animation->setPosition(sprite->getPosition().x * 0.5, 0.5 * sprite->getPosition().y);
+    auto box = animation->getBoundingBox();
+    animation->setPosition(box.width, box.height);
+    sprite->addChild(animation);
+    animation->start();
+}
+
+void SpriteAnimationState::onLeave()
+{
+    getTarget().lock()->removeChild(animation);
+    if(scene.expired())
+        return;
+}
+
+void SpriteAnimationState::update(float deltaTime)
+{
+
+}
+
+AnimationPointer SpriteAnimationState::createAnimation()
+{
+    std::vector<sf::IntRect> areas;
+
+    for(int i = 0; i < 6; i++) {
+        auto area = sf::IntRect(i * 85, 0, 85, 85);
+        areas.push_back(area);
+    }
+
+    std::shared_ptr<Animation> animation = std::make_shared<Animation>();
+    animation->setDurationPerFrame(0.2f);
+    animation->setSingleShot(true);
+
+    animation->setBackgroundColor(sf::Color::White);
+    animation->setTexture("../resource/images/blast2.png", areas);
+    return animation;
+}

application/chapter-36/SpriteAnimationState.h

@@ -0,0 +1,33 @@
+#pragma once
+#include <Animation.h>
+#include <StateMachine.h>
+
+class WayFindingScene;
+
+class SpriteAnimationState : public State
+{
+public:
+    SpriteAnimationState(std::shared_ptr<WayFindingScene> inputScene, ObjectPointer inputSprite):
+        State(inputSprite),
+        scene(inputScene)
+    {
+        animation = createAnimation();
+        auto fn = std::bind(&SpriteAnimationState::onFinished, this);
+        animation->finished.connect(fn);
+    }
+public:
+    void onEnter() override;
+    void onLeave() override;
+    void update(float deltaTime) override;
+private:
+    void onFinished()
+    {
+        setFinished();
+    }
+
+    AnimationPointer createAnimation();
+private:
+    std::shared_ptr<Animation> animation;
+    std::weak_ptr<WayFindingScene> scene;
+    uint32_t tileID;
+};

application/chapter-36/SpriteErrorState.cpp

@@ -0,0 +1,19 @@
+#include "SpriteErrorState.h"
+
+SpriteErrorState::SpriteErrorState()
+{
+    setName("error");
+}
+
+void SpriteErrorState::update(float deltaTime)
+{
+    (void)deltaTime;
+}
+
+void SpriteErrorState::onEnter()
+{
+}
+
+void SpriteErrorState::onLeave()
+{
+}

application/chapter-36/SpriteErrorState.h

@@ -0,0 +1,13 @@
+#pragma once
+#include <StateMachine.h>
+
+class SpriteErrorState final : public State
+{
+public:
+    SpriteErrorState();
+public:
+    void update(float deltaTime) override;
+private:
+    void onEnter() override;
+    void onLeave() override;
+};

application/chapter-36/SpriteForwardState.cpp

@@ -0,0 +1,69 @@
+#include <Util.h>
+#include "SpriteForwardState.h"
+
+SpriteForwardState::SpriteForwardState(std::shared_ptr<TileMap> inputTileMap, ObjectPointer inputSprite):
+    State(inputSprite),
+    tileMap(inputTileMap)
+{
+    setName("forward");
+}
+
+void SpriteForwardState::onEnter()
+{
+    if(getTarget().expired())
+        return;
+
+    auto sprite = std::dynamic_pointer_cast<MovingSprite>(getTarget().lock());
+    auto spritePosition = sprite->getCenter();
+
+    if(tileMap.expired())
+        return;
+
+    auto tileMapPointer = tileMap.lock();
+    auto tileIndex = tileMapPointer->getTileIndexByWorldPosition(spritePosition.x, spritePosition.y);
+    std::optional<sf::Vector2i> option = tileMap.lock()->getAdjacentTileByDirection(tileIndex.x, tileIndex.y, (TileDirection)(int)sprite->getRotate());
+    if(option.has_value()) {
+        tileIndex = option.value();
+        auto tile = tileMapPointer->getTileByIndex(tileIndex.x, tileIndex.y);
+        targetPosition = tile->getPosition();
+
+        auto diffPosition = targetPosition - spritePosition;
+        sprite->setVelocity(sf::Vector2f(diffPosition.x * FORWARD_SPEED, diffPosition.y * FORWARD_SPEED));
+    }
+
+    lastDistance = std::numeric_limits<float>::max();
+}
+
+void SpriteForwardState::onLeave()
+{
+    if(getTarget().expired())
+        return;
+
+    auto sprite = std::dynamic_pointer_cast<MovingSprite>(getTarget().lock());
+    sprite->setVelocity(sf::Vector2f(0, 0));
+    sprite->setCenter(targetPosition);
+
+    std::shared_ptr<TileMap> tileMapPointer = tileMap.lock();
+
+    auto tile = tileMapPointer->getTileIndexByWorldPosition(targetPosition.x, targetPosition.y);
+    tileMapPointer->getTileByIndex(tile)->setFillColor(sf::Color(120, 180, 120, 120));
+}
+
+void SpriteForwardState::update(float deltaTime)
+{
+    (void)deltaTime;
+
+    if(getTarget().expired())
+        return;
+
+    auto sprite = std::dynamic_pointer_cast<MovingSprite>(getTarget().lock());
+    auto spritePosition = sprite->getCenter();
+
+    float distance = distance2(targetPosition.x, targetPosition.y, spritePosition.x, spritePosition.y);
+    if(distance <= lastDistance)
+        lastDistance = distance;
+    else {
+        sprite->setCenter(targetPosition);
+        setFinished();
+    }
+}

application/chapter-36/SpriteForwardState.h

@@ -0,0 +1,23 @@
+#pragma once
+#include <cmath>
+#include <optional>
+#include <MovingSprite.h>
+#include <StateMachine.h>
+#include <TileMap.h>
+#include <Util.h>
+
+#define FORWARD_SPEED 3.0f
+
+class SpriteForwardState : public State
+{
+public:
+    SpriteForwardState(std::shared_ptr<TileMap> inputTileMap, ObjectPointer inputSprite);
+public:
+    void onEnter() override;
+    void onLeave() override;
+    void update(float deltaTime) override;
+private:
+    std::weak_ptr<TileMap> tileMap;
+    sf::Vector2f targetPosition;
+    float lastDistance = 0;
+};

application/chapter-36/SpriteIdleState.cpp

@@ -0,0 +1,27 @@
+#include "SpriteIdleState.h"
+
+SpriteIdleState::SpriteIdleState(std::shared_ptr<TileMap> inputTileMap,
+                                 ObjectPointer inputTank):
+    State(inputTank)
+{
+    setName("idle");
+    tileMapWeak = inputTileMap;
+    tankWeak = std::dynamic_pointer_cast<WayFindingTank>(inputTank);
+}
+
+void SpriteIdleState::onEnter()
+{
+    //std::cout << "enter idel" << std::endl;
+}
+
+void SpriteIdleState::onLeave()
+{
+    // std::cout << "enter leave" << std::endl;
+}
+
+void SpriteIdleState::update(float deltaTime)
+{
+    (void)deltaTime;
+    setFinished();
+}
+

application/chapter-36/SpriteIdleState.h

@@ -0,0 +1,19 @@
+#pragma once
+#include <StateMachine.h>
+#include <TileMap.h>
+#include "WayFindingTank.h"
+
+class WayFindingTank;
+class SpriteIdleState : public State
+{
+public:
+    SpriteIdleState() = delete;
+    SpriteIdleState(std::shared_ptr<TileMap> inputTileMap, ObjectPointer inputTank);
+public:
+    void onEnter() override;
+    void onLeave() override;
+    void update(float deltaTime) override;
+private:
+    std::weak_ptr<TileMap> tileMapWeak;
+    std::weak_ptr<WayFindingTank> tankWeak;
+};