Compare commits
No commits in common. "main" and "Gestions_hitbox" have entirely different histories.
main
...
Gestions_h
|
|
@ -1,8 +1,34 @@
|
|||
# ---> C++
|
||||
# Prerequisites
|
||||
*.d
|
||||
|
||||
# Compiled Object files
|
||||
*.slo
|
||||
*.lo
|
||||
*.o
|
||||
*.obj
|
||||
|
||||
# Precompiled Headers
|
||||
*.gch
|
||||
*.pch
|
||||
|
||||
# Compiled Dynamic libraries
|
||||
*.so
|
||||
*.dylib
|
||||
*.dll
|
||||
|
||||
# Fortran module files
|
||||
*.mod
|
||||
*.smod
|
||||
|
||||
# Compiled Static libraries
|
||||
*.lai
|
||||
*.la
|
||||
*.a
|
||||
*.lib
|
||||
|
||||
<<<<<<< HEAD
|
||||
# Executables
|
||||
=======
|
||||
# Executable
|
||||
>>>>>>> refs/heads/Gestions_hitbox
|
||||
2D_Engine
|
||||
*.exe
|
||||
*.out
|
||||
*.app
|
||||
|
||||
|
|
|
|||
|
|
@ -1,35 +0,0 @@
|
|||
{
|
||||
"tasks": [
|
||||
{
|
||||
"type": "shell",
|
||||
"command": "compiler 2D_Engine",
|
||||
"label": "Compiler",
|
||||
"problemMatcher": [],
|
||||
"group": {
|
||||
"kind": "build",
|
||||
"isDefault": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "shell",
|
||||
"command": "./2D_Engine",
|
||||
"label": "Launch",
|
||||
"problemMatcher": [],
|
||||
"group": {
|
||||
"kind": "build",
|
||||
"isDefault": false
|
||||
}
|
||||
},
|
||||
{
|
||||
"type": "shell",
|
||||
"command": "compiler 2D_Engine; ./2D_Engine",
|
||||
"label": "Compiler and Launch",
|
||||
"problemMatcher": [],
|
||||
"group": {
|
||||
"kind": "build",
|
||||
"isDefault": true
|
||||
}
|
||||
}
|
||||
],
|
||||
"version": "2.0.0"
|
||||
}
|
||||
26
Camera.hpp
26
Camera.hpp
|
|
@ -13,32 +13,38 @@
|
|||
#ifndef CAMERA_HPP
|
||||
#define CAMERA_HPP
|
||||
|
||||
#include <SDL2/SDL.h> // SDL_Rect
|
||||
#include "Game.hpp" // Game::...
|
||||
#include "TileMap.hpp" // TileMap::...
|
||||
#include "Vector2D.hpp" // Vector2D class
|
||||
#include <SDL2/SDL.h> // SDL_Rect
|
||||
#include "Game.hpp" // Game::...
|
||||
#include "TileMap.hpp" // TileMap::...
|
||||
|
||||
struct Camera {
|
||||
Camera(int width, int height)
|
||||
Camera(int xpos, int ypos, int width, int height)
|
||||
{
|
||||
camR.x = xpos;
|
||||
camR.y = ypos;
|
||||
camR.w = width;
|
||||
camR.h = height;
|
||||
}
|
||||
|
||||
// Update camera
|
||||
Camera(int xpos, int ypos, int width, int height, int z) : zoom(z)
|
||||
{
|
||||
camR.x = xpos;
|
||||
camR.y = ypos;
|
||||
camR.w = width;
|
||||
camR.h = height;
|
||||
}
|
||||
|
||||
// Verifie si la caméra ne dépasse pas de la map
|
||||
void update()
|
||||
{
|
||||
camR.x = static_cast<int>(centerPos.x - (static_cast<float>(camR.w) / 2.0f));
|
||||
camR.y = static_cast<int>(centerPos.y - (static_cast<float>(camR.h) / 2.0f));
|
||||
|
||||
if(camR.x < 0) camR.x = 0;
|
||||
if(camR.y < 0) camR.y = 0;
|
||||
if(camR.x > Game::tileMap.worldWidth - camR.w) camR.x = Game::tileMap.worldWidth - camR.w;
|
||||
if(camR.y > Game::tileMap.worldHeight - camR.h) camR.y = Game::tileMap.worldHeight - camR.h;
|
||||
}
|
||||
|
||||
Vector2D<float> centerPos;
|
||||
SDL_Rect camR;
|
||||
int zoom; // TODO Zoom pas encore pris en charge
|
||||
};
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -34,7 +34,6 @@ class ChannelManager {
|
|||
return it != channels.end() ? it->second : false;
|
||||
}
|
||||
|
||||
// Verify if all given channels are in corresponding state
|
||||
bool areChannelsInState(const unordered_map<int, bool> &states)
|
||||
{
|
||||
for(const auto &state : states)
|
||||
|
|
|
|||
76
ECS/ECS.hpp
76
ECS/ECS.hpp
|
|
@ -13,23 +13,21 @@
|
|||
#define ECS_HPP
|
||||
|
||||
#include <algorithm>
|
||||
#include <array> // array
|
||||
#include <bitset> // bitset
|
||||
#include <stdexcept> // runtime_error
|
||||
#include <memory> // unique_ptr, make_unique
|
||||
#include <vector> // vector
|
||||
#include "../ChannelManager.hpp" // Class ChannelManager
|
||||
#include <array>
|
||||
#include <bitset>
|
||||
#include <stdexcept>
|
||||
#include <iostream>
|
||||
#include <memory>
|
||||
#include <vector>
|
||||
#include "../ChannelManager.hpp"
|
||||
|
||||
using std::bitset, std::array, std::vector, std::unique_ptr, std::make_unique, std::move, std::forward, std::runtime_error, std::sort, std::remove_if;
|
||||
using std::bitset, std::array, std::vector, std::unique_ptr, std::make_unique, std::move, std::forward, std::runtime_error, std::sort;
|
||||
|
||||
// Prédefinition des class Component et Entity
|
||||
class Component;
|
||||
class Entity;
|
||||
|
||||
// Type pour l'ID des Components
|
||||
using ComponentID = std::size_t;
|
||||
|
||||
// Donne un ID différent en fonction du Component donné
|
||||
inline ComponentID getComponentTypeID()
|
||||
{
|
||||
static ComponentID lastID = 0;
|
||||
|
|
@ -42,15 +40,13 @@ template<typename T> inline ComponentID getComponentTypeID() noexcept
|
|||
return typeID;
|
||||
}
|
||||
|
||||
// Nombre maximum de Components dans une Entity
|
||||
constexpr std::size_t maxComponents = 32;
|
||||
|
||||
// Definition de types pour la contenance des Components
|
||||
using ComponentBitSet = bitset<maxComponents>;
|
||||
using ComponentArray = array<Component*, maxComponents>;
|
||||
|
||||
// Definition de la class Components
|
||||
struct Component {
|
||||
class Component {
|
||||
public:
|
||||
Entity *entity;
|
||||
|
||||
virtual void init() {}
|
||||
|
|
@ -60,22 +56,18 @@ struct Component {
|
|||
virtual ~Component() {}
|
||||
};
|
||||
|
||||
// Definition de la class Entity
|
||||
class Entity {
|
||||
public:
|
||||
// Met à jours les components
|
||||
void update()
|
||||
{
|
||||
for(auto &c : m_components) c->update();
|
||||
}
|
||||
|
||||
// Dessine les components
|
||||
void draw()
|
||||
{
|
||||
for(auto &c : m_components) c->draw();
|
||||
}
|
||||
|
||||
// Ajouter un composant à l'entité
|
||||
bool isActive() const { return m_active; }
|
||||
void destroy() { m_active = false; }
|
||||
|
||||
|
|
@ -105,52 +97,40 @@ class Entity {
|
|||
return *c;
|
||||
}
|
||||
|
||||
// Vérifier si l'entité à un composant donné
|
||||
template <typename T>
|
||||
bool hasComponent() const
|
||||
{
|
||||
bool hasComponent() const {
|
||||
// Vérifier d'abord si un type exact est présent
|
||||
ComponentID id = getComponentTypeID<T>();
|
||||
if(m_componentBitSet[id])
|
||||
{
|
||||
if (m_componentBitSet[id]) {
|
||||
return true;
|
||||
}
|
||||
|
||||
// Si non, vérifier dynamiquement tous les composants pour un type dérivé
|
||||
for(const auto& c : m_components)
|
||||
{
|
||||
if (dynamic_cast<T*>(c.get()))
|
||||
{
|
||||
for (const auto& c : m_components) {
|
||||
if (dynamic_cast<T*>(c.get())) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
// Prendre un argument en tant qu'objet
|
||||
template <typename T>
|
||||
T& getComponent() const
|
||||
{
|
||||
T& getComponent() const {
|
||||
// Vérification rapide via le BitSet et l'accès direct au composant via l'array
|
||||
ComponentID id = getComponentTypeID<T>();
|
||||
if (m_componentBitSet[id])
|
||||
{
|
||||
if (m_componentBitSet[id]) {
|
||||
return *static_cast<T*>(m_componentArray[id]);
|
||||
}
|
||||
|
||||
// Vérification polymorphique avec dynamic_cast
|
||||
for (const auto& c : m_components)
|
||||
{
|
||||
if (T* t = dynamic_cast<T*>(c.get()))
|
||||
{
|
||||
for (const auto& c : m_components) {
|
||||
if (T* t = dynamic_cast<T*>(c.get())) {
|
||||
return *t;
|
||||
}
|
||||
}
|
||||
|
||||
throw runtime_error("Composant non trouvé.\n");
|
||||
}
|
||||
|
||||
// Priorité de dessin
|
||||
int draw_priority;
|
||||
|
||||
private:
|
||||
|
|
@ -166,10 +146,7 @@ class Manager {
|
|||
public:
|
||||
void update()
|
||||
{
|
||||
for(auto &e : m_entities)
|
||||
{
|
||||
e->update();
|
||||
}
|
||||
for(auto &e : m_entities) e->update();
|
||||
}
|
||||
|
||||
void draw()
|
||||
|
|
@ -178,12 +155,9 @@ class Manager {
|
|||
|
||||
for(int i {0}; i < static_cast<int>(m_entities.size()); i++) drawOrder[i] = i;
|
||||
|
||||
sort(drawOrder.begin(), drawOrder.end(),
|
||||
[this](const int &a, const int &b)
|
||||
{
|
||||
return m_entities.at(a)->draw_priority < m_entities.at(b)->draw_priority;
|
||||
}
|
||||
);
|
||||
sort(drawOrder.begin(), drawOrder.end(), [this](const int &a, const int &b) {
|
||||
return m_entities.at(a)->draw_priority < m_entities.at(b)->draw_priority;
|
||||
});
|
||||
|
||||
for(int i {0}; i < static_cast<int>(m_entities.size()); i++)
|
||||
{
|
||||
|
|
@ -193,7 +167,7 @@ class Manager {
|
|||
|
||||
void refresh()
|
||||
{
|
||||
m_entities.erase(remove_if(m_entities.begin(), m_entities.end(),
|
||||
m_entities.erase(std::remove_if(m_entities.begin(), m_entities.end(),
|
||||
[](const unique_ptr<Entity> &mEntity) {
|
||||
return !mEntity->isActive();
|
||||
}),
|
||||
|
|
@ -208,12 +182,12 @@ class Manager {
|
|||
return *e;
|
||||
}
|
||||
|
||||
size_t getNumberOfEntities() const
|
||||
std::size_t getNumberOfEntity() const
|
||||
{
|
||||
return m_entities.size();
|
||||
}
|
||||
|
||||
void destroy(std::size_t index)
|
||||
void erase(std::size_t index)
|
||||
{
|
||||
m_entities.at(index).get()->destroy();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -55,7 +55,7 @@ class HitboxComponent : public Component {
|
|||
|
||||
Vector2D<float> position{Vector2D<float>(1.0f, 1.0f)}; // Dans l'entitée (0 -> 1) 0=>tout a gauche de l'entitée, 1=>tout a droite et pareil pour le Y
|
||||
Vector2D<float> scale{Vector2D<float>(1.0f, 1.0f)}; // Par rapport à la taille initiale (0 -> 1)
|
||||
SDL_Rect hitboxR {0, 0, 0, 0};
|
||||
SDL_Rect hitboxR;
|
||||
|
||||
bool hitboxActivated {true};
|
||||
|
||||
|
|
|
|||
|
|
@ -18,7 +18,6 @@
|
|||
#include <vector>
|
||||
#include "AnimationSystem.hpp"
|
||||
#include "ECS.hpp"
|
||||
#include "HitboxComponent.hpp"
|
||||
#include "InteractableComponent.hpp"
|
||||
#include "SpriteComponent.hpp"
|
||||
#include "TransformComponent.hpp"
|
||||
|
|
@ -30,7 +29,7 @@
|
|||
|
||||
using std::lerp, std::abs, std::vector, std::sort;
|
||||
|
||||
constexpr const float EPSILON = 1e-6f;
|
||||
constexpr const float EPSILON = 1e-6f; // Tolérance
|
||||
|
||||
class PlayerSystem : public Component {
|
||||
public:
|
||||
|
|
@ -56,12 +55,7 @@ class PlayerSystem : public Component {
|
|||
#ifdef DEBUG_MODE
|
||||
void draw() override
|
||||
{
|
||||
SDL_Rect futureHitboxR = m_hitbox->hitboxR;
|
||||
futureHitboxR.x += static_cast<int>(m_transform->velocity.x * m_transform->speed);
|
||||
futureHitboxR.y += static_cast<int>(m_transform->velocity.y * m_transform->speed);
|
||||
|
||||
SDL_SetRenderDrawColor(Game::renderer, 200, 20, 18, 255);
|
||||
SDL_RenderDrawRect(Game::renderer, &futureHitboxR);
|
||||
|
||||
for(auto it {Game::entityManager.getEntities().begin() + 1}; it < Game::entityManager.getEntities().end(); it++)
|
||||
{
|
||||
|
|
@ -86,23 +80,16 @@ class PlayerSystem : public Component {
|
|||
interactableR.w += (m_interactionRange * 2);
|
||||
interactableR.h += (m_interactionRange * 2);
|
||||
|
||||
SDL_SetRenderDrawColor(Game::renderer, 200, 20, 18, 255);
|
||||
|
||||
SDL_RenderDrawRect(Game::renderer, &interactableR);
|
||||
}
|
||||
|
||||
if(it->get()->hasComponent<HitboxComponent>())
|
||||
{
|
||||
SDL_Rect intersectR;
|
||||
|
||||
if(SDL_IntersectRect(&it->get()->getComponent<HitboxComponent>().hitboxR, &m_hitbox->hitboxR, &intersectR))
|
||||
{
|
||||
SDL_SetRenderDrawColor(Game::renderer, 20, 20, 200, 255);
|
||||
SDL_RenderDrawRect(Game::renderer, &intersectR);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
SDL_Rect futureHitboxR = m_hitbox->hitboxR;
|
||||
futureHitboxR.x += static_cast<int>(m_transform->velocity.x * static_cast<float>(m_transform->speed));
|
||||
futureHitboxR.y += static_cast<int>(m_transform->velocity.y * static_cast<float>(m_transform->speed));
|
||||
|
||||
SDL_RenderDrawRect(Game::renderer, &futureHitboxR);
|
||||
|
||||
SDL_SetRenderDrawColor(Game::renderer, 20, 20, 18, 255);
|
||||
}
|
||||
#endif // DEBUG_MODE
|
||||
|
|
@ -119,8 +106,8 @@ class PlayerSystem : public Component {
|
|||
for(int i {0}; i < 2; i++)
|
||||
{
|
||||
SDL_Rect futureHitboxR = m_hitbox->hitboxR;
|
||||
if(i == 0) futureHitboxR.x += static_cast<int>(m_transform->velocity.x * m_transform->speed);
|
||||
if(i == 1) futureHitboxR.y += static_cast<int>(m_transform->velocity.y * m_transform->speed);
|
||||
if(i == 0) futureHitboxR.x += static_cast<int>(m_transform->velocity.x * static_cast<float>(m_transform->speed));
|
||||
if(i == 1) futureHitboxR.y += static_cast<int>(m_transform->velocity.y * static_cast<float>(m_transform->speed));
|
||||
|
||||
SDL_Rect hitboxTilesR;
|
||||
hitboxTilesR.x = futureHitboxR.x / (TILE_SIZE * TILEMAP_SCALE);
|
||||
|
|
@ -128,7 +115,7 @@ class PlayerSystem : public Component {
|
|||
hitboxTilesR.w = (futureHitboxR.w + futureHitboxR.x) / (TILE_SIZE * TILEMAP_SCALE);
|
||||
hitboxTilesR.h = (futureHitboxR.h + futureHitboxR.y) / (TILE_SIZE * TILEMAP_SCALE);
|
||||
|
||||
vector<int> touchedHitboxes;
|
||||
vector<int> touchedHitboxes {};
|
||||
|
||||
for(int tileY = hitboxTilesR.y; tileY <= hitboxTilesR.h; tileY++)
|
||||
{
|
||||
|
|
@ -142,26 +129,22 @@ class PlayerSystem : public Component {
|
|||
|
||||
for(const auto &touchedHitbox : touchedHitboxes)
|
||||
{
|
||||
if(touchedHitbox != 0)
|
||||
if(touchedHitbox == 1)
|
||||
{
|
||||
if(touchedHitbox == 1)
|
||||
{
|
||||
if(i == 0) m_transform->velocity.x = 0;
|
||||
if(i == 1) m_transform->velocity.y = 0;
|
||||
if(i == 0) m_transform->velocity.x = 0;
|
||||
if(i == 1) m_transform->velocity.y = 0;
|
||||
break;
|
||||
}
|
||||
else if(touchedHitbox != 0)
|
||||
{
|
||||
Game::tileMap.LoadNextMap(touchedHitbox);
|
||||
m_transform->position = Game::tileMap.getPlayerInitPos();
|
||||
|
||||
break;
|
||||
}
|
||||
else
|
||||
{
|
||||
Game::tileMap.LoadNextMap(touchedHitbox);
|
||||
m_transform->position = Game::tileMap.getPlayerInitPos();
|
||||
Game::camera.camR.x = static_cast<int>(m_transform->position.x - static_cast<float>((Game::camera.camR.w >> 1) - ((m_transform->dimension.x * m_transform->scale) / 2)));
|
||||
Game::camera.camR.y = static_cast<int>(m_transform->position.y - static_cast<float>((Game::camera.camR.h >> 1) - ((m_transform->dimension.y * m_transform->scale) / 2)));
|
||||
|
||||
Game::camera.centerPos.x = static_cast<int>(m_transform->position.x + static_cast<float>((m_transform->dimension.x * m_transform->scale) >> 1));
|
||||
Game::camera.centerPos.y = static_cast<int>(m_transform->position.y + static_cast<float>((m_transform->dimension.y * m_transform->scale) >> 1));
|
||||
|
||||
playerState = State::None;
|
||||
break;
|
||||
}
|
||||
playerState = State::None;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -171,53 +154,27 @@ class PlayerSystem : public Component {
|
|||
{
|
||||
if(it->get()->getComponent<HitboxComponent>().hitboxActivated)
|
||||
{
|
||||
SDL_Rect &entityHitboxR {it->get()->getComponent<HitboxComponent>().hitboxR};
|
||||
|
||||
SDL_Rect intersectR;
|
||||
|
||||
if(SDL_IntersectRect(&m_hitbox->hitboxR, &entityHitboxR, &intersectR))
|
||||
{
|
||||
Vector2D<int> overlap;
|
||||
overlap.x = intersectR.w;
|
||||
overlap.y = intersectR.h;
|
||||
|
||||
if(overlap.x < overlap.y)
|
||||
{
|
||||
int leftDistance = abs(entityHitboxR.x + entityHitboxR.w / 2 - m_hitbox->hitboxR.x);
|
||||
int rightDistance = abs(entityHitboxR.x + entityHitboxR.w / 2 - (m_hitbox->hitboxR.x + m_hitbox->hitboxR.w));
|
||||
|
||||
if(leftDistance > rightDistance)
|
||||
{
|
||||
m_transform->position.x -= m_transform->speed;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_transform->position.x += m_transform->speed;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
int upDistance = abs(entityHitboxR.y + entityHitboxR.h / 2 - m_hitbox->hitboxR.y);
|
||||
int downDistance = abs(entityHitboxR.y + entityHitboxR.h / 2 - (m_hitbox->hitboxR.y + m_hitbox->hitboxR.h));
|
||||
|
||||
if(upDistance > downDistance)
|
||||
{
|
||||
m_transform->position.y -= m_transform->speed;
|
||||
}
|
||||
else
|
||||
{
|
||||
m_transform->position.y += m_transform->speed;
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
SDL_Rect entityHitboxR {it->get()->getComponent<HitboxComponent>().hitboxR};
|
||||
|
||||
if(SDL_HasIntersection(&futureHitboxR, &entityHitboxR))
|
||||
{
|
||||
if(i == 0) m_transform->velocity.x = 0;
|
||||
if(i == 1) m_transform->velocity.y = 0;
|
||||
|
||||
SDL_Rect intersectR;
|
||||
|
||||
if(SDL_IntersectRect(&m_hitbox->hitboxR, &entityHitboxR, &intersectR))
|
||||
{
|
||||
if(intersectR.y > entityHitboxR.y + (entityHitboxR.h >> 1))
|
||||
{
|
||||
m_transform->position.y += static_cast<float>(intersectR.h);
|
||||
}
|
||||
else
|
||||
{
|
||||
m_transform->position.y -= static_cast<float>(intersectR.h);
|
||||
}
|
||||
}
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -259,17 +216,15 @@ class PlayerSystem : public Component {
|
|||
|
||||
void m_setCamera()
|
||||
{
|
||||
Vector2D<float> target;
|
||||
|
||||
target.x = m_transform->position.x + static_cast<float>((m_transform->dimension.x * m_transform->scale) >> 2);
|
||||
target.y = m_transform->position.y + static_cast<float>((m_transform->dimension.y * m_transform->scale) >> 2);
|
||||
float targetX = m_transform->position.x - static_cast<float>((Game::camera.camR.w >> 1) - ((m_transform->dimension.x * m_transform->scale) >> 2));
|
||||
float targetY = m_transform->position.y - static_cast<float>((Game::camera.camR.h >> 1) - ((m_transform->dimension.y * m_transform->scale) >> 2));
|
||||
|
||||
float smoothingFactor {0.08f};
|
||||
|
||||
if(playerState == State::Running) smoothingFactor = 0.12f;
|
||||
|
||||
Game::camera.centerPos.x = static_cast<int>(lerp(Game::camera.centerPos.x, target.x, smoothingFactor));
|
||||
Game::camera.centerPos.y = static_cast<int>(lerp(Game::camera.centerPos.y, target.y, smoothingFactor));
|
||||
Game::camera.camR.x = static_cast<int>(lerp(Game::camera.camR.x, targetX, smoothingFactor));
|
||||
Game::camera.camR.y = static_cast<int>(lerp(Game::camera.camR.y, targetY, smoothingFactor));
|
||||
}
|
||||
|
||||
void m_checkInteractions()
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ struct TransformComponent : public Component {
|
|||
position.zero();
|
||||
}
|
||||
|
||||
TransformComponent(Vector2D<float> pos, Vector2D<int> dim, int sc, float spd) : position(pos), speed(spd), dimension(dim), scale(sc)
|
||||
TransformComponent(Vector2D<float> pos, Vector2D<int> dim, int sc, int spd) : position(pos), speed(spd), dimension(dim), scale(sc)
|
||||
{}
|
||||
|
||||
void init() override
|
||||
|
|
@ -32,7 +32,7 @@ struct TransformComponent : public Component {
|
|||
|
||||
void update() override
|
||||
{
|
||||
position += (velocity * speed);
|
||||
position += (velocity * static_cast<float>(speed));
|
||||
|
||||
entity->draw_priority = static_cast<int>(position.y + static_cast<float>(dimension.y * scale));
|
||||
}
|
||||
|
|
@ -40,7 +40,7 @@ struct TransformComponent : public Component {
|
|||
Vector2D<float> position;
|
||||
|
||||
Vector2D<float> velocity;
|
||||
float speed {1};
|
||||
int speed {1};
|
||||
|
||||
Vector2D<int> dimension {32, 32};
|
||||
int scale {1};
|
||||
|
|
|
|||
64
Game.cpp
64
Game.cpp
|
|
@ -27,14 +27,13 @@ SDL_Renderer *Game::renderer;
|
|||
SDL_Texture *Game::textureRenderer;
|
||||
Events Game::events;
|
||||
TextureManager Game::textureManager;
|
||||
Camera Game::camera {WINDOW_WIDTH, WINDOW_HEIGHT};
|
||||
Camera Game::camera {0, 0, WINDOW_WIDTH, WINDOW_HEIGHT};
|
||||
TileMap Game::tileMap;
|
||||
MapManager Game::mapManager;
|
||||
Manager Game::entityManager;
|
||||
|
||||
Entity &player(Game::entityManager.addEntity());
|
||||
|
||||
// Game constructor
|
||||
Game::~Game()
|
||||
{
|
||||
if(renderer != NULL) SDL_DestroyRenderer(renderer);
|
||||
|
|
@ -45,10 +44,8 @@ Game::~Game()
|
|||
cerr << "Game cleaned.\n";
|
||||
}
|
||||
|
||||
// Init SDL, IMG...
|
||||
bool Game::Init()
|
||||
{
|
||||
// Init SDL
|
||||
if(SDL_Init(SDL_INIT_EVERYTHING) != 0)
|
||||
{
|
||||
cerr << "Erreur SDL_Init : " << SDL_GetError() << '\n';
|
||||
|
|
@ -56,7 +53,6 @@ bool Game::Init()
|
|||
}
|
||||
cerr << "SDL initialised successfully.\n";
|
||||
|
||||
// Init IMG
|
||||
if(IMG_Init(IMG_INIT_PNG) == 0)
|
||||
{
|
||||
cerr << "Erreur IMG_Init : " << IMG_GetError() << '\n';
|
||||
|
|
@ -64,7 +60,6 @@ bool Game::Init()
|
|||
}
|
||||
cerr << "IMG initialised successfully.\n";
|
||||
|
||||
// Create Window
|
||||
m_window = SDL_CreateWindow(WINDOW_TITLE, SDL_WINDOWPOS_CENTERED, SDL_WINDOWPOS_CENTERED, WINDOW_WIDTH, WINDOW_HEIGHT, SDL_WINDOW_SHOWN);
|
||||
if(m_window == NULL)
|
||||
{
|
||||
|
|
@ -73,48 +68,6 @@ bool Game::Init()
|
|||
}
|
||||
cerr << "Window created successfully.\n";
|
||||
|
||||
// Disable unused events
|
||||
SDL_EventType disableEvents[] = {
|
||||
// Joysticks events
|
||||
SDL_JOYAXISMOTION,
|
||||
SDL_JOYBALLMOTION,
|
||||
SDL_JOYHATMOTION,
|
||||
SDL_JOYBUTTONDOWN,
|
||||
SDL_JOYBUTTONUP,
|
||||
SDL_JOYDEVICEADDED,
|
||||
SDL_JOYDEVICEREMOVED,
|
||||
|
||||
// Game controllers events
|
||||
SDL_CONTROLLERAXISMOTION,
|
||||
SDL_CONTROLLERBUTTONDOWN,
|
||||
SDL_CONTROLLERBUTTONUP,
|
||||
SDL_CONTROLLERDEVICEADDED,
|
||||
SDL_CONTROLLERDEVICEREMOVED,
|
||||
SDL_CONTROLLERDEVICEREMAPPED,
|
||||
|
||||
// Drag & drop events
|
||||
SDL_DROPFILE,
|
||||
SDL_DROPTEXT,
|
||||
SDL_DROPBEGIN,
|
||||
SDL_DROPCOMPLETE,
|
||||
|
||||
// Tactile events
|
||||
SDL_FINGERMOTION,
|
||||
SDL_FINGERDOWN,
|
||||
SDL_FINGERUP,
|
||||
SDL_MULTIGESTURE,
|
||||
SDL_DOLLARGESTURE,
|
||||
SDL_DOLLARRECORD,
|
||||
|
||||
// Sensor event
|
||||
SDL_SENSORUPDATE,
|
||||
|
||||
// User event
|
||||
SDL_USEREVENT
|
||||
};
|
||||
for(const SDL_EventType &disableEvent : disableEvents) SDL_EventState(disableEvent, SDL_DISABLE);
|
||||
|
||||
// Create renderer
|
||||
renderer = SDL_CreateRenderer(m_window, -1, 0);
|
||||
if(renderer == NULL)
|
||||
{
|
||||
|
|
@ -123,19 +76,24 @@ bool Game::Init()
|
|||
}
|
||||
cerr << "Renderer created successfully\n\n";
|
||||
|
||||
// Load initial map and tileset
|
||||
tileMap.LoadTileset("ressources/tileset/tileset.png");
|
||||
|
||||
tileMap.LoadTileMap("ressources/maps/dungeon entry.json");
|
||||
|
||||
// Init player
|
||||
TransformComponent *p_transform = &player.addComponent<TransformComponent>(tileMap.getPlayerInitPos(), Vector2D<int>(32, 32), 2, 3.0f);
|
||||
TransformComponent *p_transform = &player.addComponent<TransformComponent>(tileMap.getPlayerInitPos(), Vector2D<int>(32, 32), 2, 3);
|
||||
player.addComponent<SpriteComponent>("ressources/heroes/knight/idle-sheet.png");
|
||||
player.addComponent<HitboxComponent>(Vector2D<float>(0.81f, 0.41f), Vector2D<float>(0.5f, 1.0f));
|
||||
InventoryComponent *p_inventory = &player.addComponent<InventoryComponent>();
|
||||
|
||||
player.addComponent<AnimationSystem>();
|
||||
player.addComponent<PlayerSystem>();
|
||||
|
||||
camera.centerPos.x = static_cast<int>(p_transform->position.x - static_cast<float>(p_transform->dimension.x) * static_cast<float>(p_transform->scale) / 2.0f);
|
||||
camera.centerPos.y = static_cast<int>(p_transform->position.y - static_cast<float>(p_transform->dimension.y) * static_cast<float>(p_transform->scale) / 2.0f);
|
||||
camera.camR.x = static_cast<int>(p_transform->position.x - static_cast<float>(camera.camR.w / 2 - p_transform->dimension.x * p_transform->scale / 2));
|
||||
camera.camR.y = static_cast<int>(p_transform->position.y - static_cast<float>(camera.camR.h / 2 - p_transform->dimension.y * p_transform->scale / 2));
|
||||
|
||||
Item &item(p_inventory->addItem());
|
||||
|
||||
item.addProperty<NameProperty>("Prout");
|
||||
|
||||
m_isRunning = true;
|
||||
|
||||
|
|
|
|||
41
TileMap.cpp
41
TileMap.cpp
|
|
@ -14,6 +14,7 @@
|
|||
#include "Camera.hpp"
|
||||
#include "Game.hpp"
|
||||
#include "MapManager.hpp"
|
||||
#include "externLibs/nlohmann/json.hpp"
|
||||
#include "TextureManager.hpp"
|
||||
#include "TileMap.hpp"
|
||||
#include "Vector2D.hpp"
|
||||
|
|
@ -22,20 +23,18 @@
|
|||
using std::string, std::exception, std::vector, std::cerr, std::runtime_error;
|
||||
using json = nlohmann::json;
|
||||
|
||||
// Load a map from memory
|
||||
void TileMap::LoadTileMap(const string &path)
|
||||
{
|
||||
// Load the map data from memory
|
||||
json *mapData = Game::mapManager.LoadMap(path);
|
||||
json *mapData;
|
||||
|
||||
mapData = Game::mapManager.LoadMap(path);
|
||||
|
||||
// Get tilemap width and height same for world
|
||||
tileMapWidth = mapData->at("TileMapWidth").get<int>();
|
||||
tileMapHeight = mapData->at("TileMapHeight").get<int>();
|
||||
|
||||
worldWidth = tileMapWidth * TILE_SIZE * TILEMAP_SCALE;
|
||||
worldHeight = tileMapHeight * TILE_SIZE * TILEMAP_SCALE;
|
||||
|
||||
// Clear layers and hitboxes and resize them
|
||||
m_tilesLayer1.clear();
|
||||
m_tilesLayer2.clear();
|
||||
m_tilesLayer3.clear();
|
||||
|
|
@ -48,7 +47,6 @@ void TileMap::LoadTileMap(const string &path)
|
|||
|
||||
hitboxes.resize(tileMapWidth * tileMapHeight);
|
||||
|
||||
// Load layers and hitboxes from map data
|
||||
string layers[] {"Layer 1","Layer 2","Layer 3", "Hitboxes"};
|
||||
|
||||
for(const string &layer : layers)
|
||||
|
|
@ -79,8 +77,6 @@ void TileMap::LoadTileMap(const string &path)
|
|||
}
|
||||
}
|
||||
|
||||
LoadEntities(mapData);
|
||||
|
||||
if(mapData->contains("PlayerInitPos"))
|
||||
{
|
||||
m_playerInitPos.x = mapData->at("PlayerInitPos").at("x").get<float>() * TILE_SIZE * TILEMAP_SCALE;
|
||||
|
|
@ -88,6 +84,7 @@ void TileMap::LoadTileMap(const string &path)
|
|||
}
|
||||
|
||||
m_nextMaps.clear();
|
||||
|
||||
for(auto it {mapData->at("NextMaps").begin()}; it < mapData->at("NextMaps").end(); it++)
|
||||
{
|
||||
NextMap nextMap;
|
||||
|
|
@ -98,22 +95,9 @@ void TileMap::LoadTileMap(const string &path)
|
|||
m_nextMaps.emplace(it->at("Number").get<int>(), nextMap);
|
||||
}
|
||||
|
||||
// Texture renderer creating
|
||||
if(Game::textureRenderer != NULL) SDL_DestroyTexture(Game::textureRenderer);
|
||||
Game::textureRenderer = SDL_CreateTexture(Game::renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET, worldWidth, worldHeight);
|
||||
if(Game::textureRenderer == NULL)
|
||||
{
|
||||
cerr << "Erreur SDL_CreateTexture : " << SDL_GetError() << '\n';
|
||||
throw runtime_error("Impossible de creer la texture de rendu.\n");
|
||||
}
|
||||
}
|
||||
|
||||
void TileMap::LoadEntities(json *mapData)
|
||||
{
|
||||
// Erase lasts entities and load news if there are some
|
||||
std::size_t numberOfEntity {Game::entityManager.getNumberOfEntity()};
|
||||
for(std::size_t i {1}; i < numberOfEntity; i++) Game::entityManager.destroy(i);
|
||||
Game::entityManager.refresh();
|
||||
|
||||
for(std::size_t i {1}; i < numberOfEntity; i++) Game::entityManager.erase(i);
|
||||
|
||||
if(mapData->contains("Entities"))
|
||||
{
|
||||
|
|
@ -130,7 +114,7 @@ void TileMap::LoadEntities(json *mapData)
|
|||
|
||||
pos = pos * TILE_SIZE * TILEMAP_SCALE;
|
||||
|
||||
e.addComponent<TransformComponent>(pos, dim, component->at("Scale").get<int>(), component->at("Speed").get<float>());
|
||||
e.addComponent<TransformComponent>(pos, dim, component->at("Scale").get<int>(), component->at("Speed").get<int>());
|
||||
}
|
||||
else if(component->at("Type").get<string>() == "SpriteComponent")
|
||||
{
|
||||
|
|
@ -172,10 +156,7 @@ void TileMap::LoadEntities(json *mapData)
|
|||
}
|
||||
}
|
||||
}
|
||||
Game::entityManager.update();
|
||||
|
||||
// Texture renderer creating
|
||||
if(Game::textureRenderer != NULL) SDL_DestroyTexture(Game::textureRenderer);
|
||||
Game::textureRenderer = SDL_CreateTexture(Game::renderer, SDL_PIXELFORMAT_RGBA8888, SDL_TEXTUREACCESS_TARGET, worldWidth, worldHeight);
|
||||
if(Game::textureRenderer == NULL)
|
||||
{
|
||||
|
|
@ -184,7 +165,6 @@ void TileMap::LoadEntities(json *mapData)
|
|||
}
|
||||
}
|
||||
|
||||
// Load the corresponding next map from memory
|
||||
void TileMap::LoadNextMap(int nextMapNumber)
|
||||
{
|
||||
NextMap nextMap = m_nextMaps.at(nextMapNumber);
|
||||
|
|
@ -194,7 +174,6 @@ void TileMap::LoadNextMap(int nextMapNumber)
|
|||
m_playerInitPos = nextMap.playerInitPos * TILE_SIZE * TILEMAP_SCALE;
|
||||
}
|
||||
|
||||
// Load a tileset
|
||||
void TileMap::LoadTileset(const string &path)
|
||||
{
|
||||
m_tileset = Game::textureManager.LoadTexture(path);
|
||||
|
|
@ -205,7 +184,6 @@ void TileMap::LoadTileset(const string &path)
|
|||
m_tilesetHeight /= TILE_SIZE;
|
||||
}
|
||||
|
||||
// Draw corresponding layer
|
||||
void TileMap::draw(int layer)
|
||||
{
|
||||
if(layer == 1)
|
||||
|
|
@ -227,7 +205,6 @@ void TileMap::draw(int layer)
|
|||
}
|
||||
}
|
||||
|
||||
// Draw the layer given
|
||||
void TileMap::m_draw(const vector<TileID> &tiles)
|
||||
{
|
||||
SDL_Rect visibleTilesR;
|
||||
|
|
@ -253,13 +230,11 @@ void TileMap::m_draw(const vector<TileID> &tiles)
|
|||
}
|
||||
}
|
||||
|
||||
// Get loaded player inital position
|
||||
Vector2D<float> TileMap::getPlayerInitPos()
|
||||
{
|
||||
return m_playerInitPos;
|
||||
}
|
||||
|
||||
// Destroy texture renderer
|
||||
TileMap::~TileMap()
|
||||
{
|
||||
if(Game::textureRenderer != NULL) SDL_DestroyTexture(Game::textureRenderer);
|
||||
|
|
|
|||
|
|
@ -17,14 +17,12 @@
|
|||
#include <string>
|
||||
#include <unordered_map>
|
||||
#include <vector>
|
||||
#include "externLibs/nlohmann/json.hpp"
|
||||
#include "Vector2D.hpp"
|
||||
|
||||
#define TILE_SIZE 16
|
||||
#define TILEMAP_SCALE 2
|
||||
|
||||
using std::string, std::vector, std::unordered_map;
|
||||
using json = nlohmann::json;
|
||||
|
||||
using TileID = int;
|
||||
|
||||
|
|
@ -38,7 +36,6 @@ class TileMap {
|
|||
TileMap() = default;
|
||||
~TileMap();
|
||||
|
||||
void LoadEntities(json *);
|
||||
void LoadTileMap(const string &);
|
||||
void LoadNextMap(int);
|
||||
void LoadTileset(const string &);
|
||||
|
|
|
|||
|
|
@ -66,7 +66,7 @@
|
|||
519,520,521,617,618,464,465,466,1,1,1,1,1,1,1,464,465,406,550,551,552,553,
|
||||
625,626,627,1,1,1,1,1,1,1,1,1,1,1,1,1,1,415,559,560,561,562,
|
||||
634,635,636,637,1,1,1,1,1,1,1,1,1,1,1,1,1,424,568,569,570,571,
|
||||
643,391,392,393,394,1,1,1,1,1,1,1,1,1,391,1,1,433,577,578,579,580,
|
||||
643,391,392,393,394,395,1,1,1,1,1,1,1,1,391,1,1,433,577,578,579,580,
|
||||
652,400,401,402,403,404,1,1,1,1,1,1,1,1,1,1,622,623,624,625,626,1,
|
||||
661,409,410,411,412,413,1,1,1,1,1,1,1,1,1,1,631,632,633,634,635,636,
|
||||
473,474,475,476,421,422,1,1,1,1,1,1,1,1,1,1,640,641,1,643,644,645,
|
||||
|
|
@ -1,115 +1,116 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<map version="1.10" tiledversion="1.11.0" orientation="orthogonal" renderorder="left-up" width="30" height="20" tilewidth="16" tileheight="16" infinite="1" nextlayerid="8" nextobjectid="1">
|
||||
<tileset firstgid="1" source="../tileset/tileset.tsx"/>
|
||||
<tileset firstgid="1" source="../../tileset/tileset.tsx"/>
|
||||
<tileset firstgid="793" source="../../../../../../snap/tiled/4555/Props.tsx"/>
|
||||
<layer id="5" name="Calque de Tuiles 1" width="30" height="20">
|
||||
<data encoding="csv">
|
||||
<chunk x="-32" y="0" width="16" height="16">
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,19,31,31,31,31,31,31,31,
|
||||
1,1,1,1,1,1,1,1,28,3,2,2,2,2,2,2,
|
||||
1,1,1,1,1,1,1,1,28,12,11,10,11,11,11,11,
|
||||
1,1,1,1,1,1,1,1,28,154,155,155,155,155,155,155,
|
||||
1,1,1,1,1,1,1,1,28,163,157,173,173,173,173,173,
|
||||
1,1,1,1,1,1,1,1,28,163,165,21,22,22,22,22,
|
||||
1,1,1,1,1,1,1,1,28,163,165,29,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,28,163,165,29,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,28,163,165,29,1,1,1,1
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
9,9,9,9,9,9,9,9,19,31,31,31,31,31,31,31,
|
||||
9,9,9,9,9,9,9,9,28,3,2,2,2,2,2,2,
|
||||
9,9,9,9,9,9,9,9,28,12,11,11,11,11,11,11,
|
||||
9,9,9,9,9,9,9,9,28,154,155,155,155,155,155,155,
|
||||
9,9,9,9,9,9,9,9,28,163,157,173,173,173,173,173,
|
||||
9,9,9,9,9,9,9,9,28,163,165,21,22,22,22,22,
|
||||
9,9,9,9,9,9,9,9,28,163,165,29,9,9,9,9,
|
||||
9,9,9,9,9,9,9,9,28,163,165,29,9,9,9,9,
|
||||
9,9,9,9,9,9,9,9,28,163,165,29,9,9,9,9
|
||||
</chunk>
|
||||
<chunk x="-16" y="0" width="16" height="16">
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
19,1,1,20,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
28,1,1,29,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
32,1,1,30,31,31,31,31,31,31,31,31,31,31,31,31,
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
19,9,9,20,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
28,9,9,29,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
32,9,9,30,31,31,31,31,31,31,31,31,31,31,31,31,
|
||||
7,154,156,6,2,2,2,2,2,2,2,2,2,2,2,2,
|
||||
16,163,165,15,11,11,11,11,11,11,11,11,10,11,11,11,
|
||||
16,163,165,15,11,11,11,11,11,11,11,11,11,11,11,11,
|
||||
155,167,166,155,155,155,155,155,155,155,155,155,155,155,155,155,
|
||||
173,173,173,173,173,173,173,173,173,173,158,157,173,173,173,173,
|
||||
22,22,22,22,22,22,22,22,22,23,163,165,21,22,22,22,
|
||||
1,1,1,1,1,1,1,1,1,28,163,165,29,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,28,163,165,29,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,28,159,160,29,1,1,1
|
||||
9,9,9,9,9,9,9,9,9,28,163,165,29,9,9,9,
|
||||
9,9,9,9,9,9,9,9,9,28,163,165,29,9,9,9,
|
||||
9,9,9,9,9,9,9,9,9,28,159,160,29,9,9,9
|
||||
</chunk>
|
||||
<chunk x="0" y="0" width="16" height="16">
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
31,31,1,1,31,20,1,1,1,1,1,1,1,1,1,1,
|
||||
2,2,1,1,4,29,1,1,1,1,1,1,1,1,1,1,
|
||||
11,11,1,1,13,29,1,1,1,1,1,1,1,1,1,1,
|
||||
155,155,155,155,156,29,1,1,1,1,1,1,1,1,1,1,
|
||||
173,173,173,173,174,29,1,1,1,1,1,1,1,1,1,1,
|
||||
22,22,22,22,22,38,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
31,31,31,31,31,20,9,9,9,9,9,9,9,9,9,9,
|
||||
2,2,2,2,4,29,9,9,9,9,9,9,9,9,9,9,
|
||||
11,11,11,11,13,29,9,9,9,9,9,9,9,9,9,9,
|
||||
155,155,155,155,156,29,9,9,9,9,9,9,9,9,9,9,
|
||||
173,173,173,173,174,29,9,9,9,9,9,9,9,9,9,9,
|
||||
22,22,22,22,22,38,9,9,9,9,9,9,9,9,9,9,
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9
|
||||
</chunk>
|
||||
<chunk x="-32" y="16" width="16" height="16">
|
||||
1,1,1,1,1,1,1,1,28,163,165,29,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,28,163,165,29,1,1,1,1,
|
||||
1,1,1,19,31,31,31,31,32,1,1,30,31,31,31,31,
|
||||
1,1,1,28,3,2,2,2,7,1,1,6,2,2,2,2,
|
||||
1,1,1,28,12,11,11,11,16,1,1,15,11,11,11,11,
|
||||
1,1,1,28,199,200,200,200,200,200,200,200,200,200,200,201,
|
||||
1,1,1,28,208,209,209,236,209,209,209,209,209,209,209,210,
|
||||
1,1,1,28,208,209,209,209,209,209,236,209,236,209,209,210,
|
||||
1,1,1,28,208,209,209,209,209,209,209,209,209,209,209,210,
|
||||
1,1,1,28,208,209,236,209,209,209,209,209,236,209,209,210,
|
||||
1,1,1,28,217,218,218,218,218,218,218,218,218,218,218,219,
|
||||
1,1,1,37,22,22,22,22,22,22,22,22,22,22,22,22,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
|
||||
9,9,9,9,9,9,9,9,28,163,165,29,9,9,9,9,
|
||||
9,9,9,9,9,9,9,9,28,163,165,29,9,9,9,9,
|
||||
9,9,9,19,31,31,31,31,32,164,164,30,31,31,31,31,
|
||||
9,9,9,28,3,2,2,2,7,1,1,6,2,2,2,2,
|
||||
9,9,9,28,12,11,11,11,16,1,1,15,11,11,11,11,
|
||||
9,9,9,28,199,200,200,200,200,200,200,200,200,200,200,201,
|
||||
9,9,9,28,208,209,209,236,209,209,209,209,209,209,209,210,
|
||||
9,9,9,28,208,209,209,209,209,209,236,209,236,209,209,210,
|
||||
9,9,9,28,208,209,209,209,209,209,209,209,209,209,209,210,
|
||||
9,9,9,28,208,209,236,209,209,209,209,209,236,209,209,210,
|
||||
9,9,9,28,217,218,218,218,218,218,218,218,218,218,218,219,
|
||||
9,9,9,37,22,22,22,22,22,22,22,22,22,22,22,22,
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9
|
||||
</chunk>
|
||||
<chunk x="-16" y="16" width="16" height="16">
|
||||
1,1,1,1,1,1,1,1,1,28,168,169,29,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,28,154,156,29,1,1,1,
|
||||
9,9,9,9,9,9,9,9,9,28,168,169,29,9,9,9,
|
||||
9,9,9,9,9,9,9,9,9,28,154,156,29,9,9,9,
|
||||
43,31,31,31,31,31,31,31,31,32,163,165,30,31,31,31,
|
||||
47,3,2,2,2,2,2,2,2,7,163,165,6,2,2,2,
|
||||
47,10,11,11,11,11,11,11,11,16,163,165,15,11,11,11,
|
||||
47,12,11,11,11,11,11,11,11,16,163,165,15,11,11,11,
|
||||
47,154,155,155,155,155,155,155,155,155,167,166,155,155,155,155,
|
||||
47,163,164,164,164,164,164,164,164,164,164,164,164,164,164,164,
|
||||
47,163,164,164,164,164,164,164,164,164,39,40,164,164,164,164,
|
||||
47,163,164,164,164,164,164,164,164,164,48,49,164,164,183,164,
|
||||
47,163,164,164,164,164,181,182,164,164,6,7,164,164,164,164,
|
||||
47,172,173,173,173,158,190,191,164,164,15,16,164,164,164,164,
|
||||
53,22,22,22,23,163,164,164,164,164,164,164,164,164,193,164,
|
||||
1,1,1,1,28,172,173,173,173,173,173,173,173,173,173,173,
|
||||
1,1,1,1,37,22,22,22,22,22,1,1,22,22,22,22,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
|
||||
47,163,164,164,164,164,164,164,164,164,48,49,164,164,164,164,
|
||||
47,163,164,164,164,164,164,164,164,164,6,7,164,164,164,164,
|
||||
47,172,173,173,173,158,164,164,164,164,15,16,164,164,164,164,
|
||||
53,22,22,22,23,163,164,164,164,164,164,164,164,164,164,164,
|
||||
9,9,9,9,28,172,173,173,173,173,173,173,173,173,173,173,
|
||||
9,9,9,9,37,22,22,22,22,22,9,9,22,22,22,22,
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9
|
||||
</chunk>
|
||||
<chunk x="0" y="16" width="16" height="16">
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
31,31,31,31,31,20,1,1,1,1,1,1,1,1,1,1,
|
||||
2,2,2,2,4,386,31,1,1,31,20,1,1,1,1,1,
|
||||
11,11,11,11,13,234,3,1,1,4,29,1,1,1,1,1,
|
||||
155,155,155,155,156,243,12,1,1,13,29,1,1,1,1,1,
|
||||
164,164,164,164,165,173,154,155,155,156,29,1,1,1,1,1,
|
||||
164,164,164,164,165,25,172,173,173,174,29,1,1,1,1,1,
|
||||
164,164,164,164,165,368,22,22,22,22,38,1,1,1,1,1,
|
||||
164,164,164,164,165,29,1,1,1,1,1,1,1,1,1,1,
|
||||
157,173,173,173,174,29,1,1,1,1,1,1,1,1,1,1,
|
||||
165,21,22,22,22,38,1,1,1,1,1,1,1,1,1,1,
|
||||
174,29,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
22,38,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
31,31,31,31,31,20,9,9,9,9,9,9,9,9,9,9,
|
||||
2,2,2,2,4,386,31,31,31,31,20,9,9,9,9,9,
|
||||
11,11,11,11,13,234,3,2,2,4,29,9,9,9,9,9,
|
||||
155,155,155,155,156,243,12,11,11,13,29,9,9,9,9,9,
|
||||
164,164,164,164,164,173,155,155,155,156,29,9,9,9,9,9,
|
||||
164,164,164,164,165,25,173,173,173,174,29,9,9,9,9,9,
|
||||
164,164,164,164,165,368,22,22,22,22,38,9,9,9,9,9,
|
||||
164,164,164,164,165,29,9,9,9,9,9,9,9,9,9,9,
|
||||
157,173,173,173,174,29,9,9,9,9,9,9,9,9,9,9,
|
||||
165,21,22,22,22,38,9,9,9,9,9,9,9,9,9,9,
|
||||
174,29,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
22,38,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
|
||||
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9
|
||||
</chunk>
|
||||
</data>
|
||||
</layer>
|
||||
|
|
@ -125,7 +126,7 @@
|
|||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,10,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
|
|
@ -139,11 +140,11 @@
|
|||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,31,31,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,834,835,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,859,860,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,10,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
|
|
@ -162,8 +163,8 @@
|
|||
1,1,57,58,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,66,67,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,75,76,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
0,253,206,256,207,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,251,260,242,216,1,1,1,1,1,1,1,1,1,1,1,
|
||||
969,207,206,242,207,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,254,1,216,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
|
|
@ -172,9 +173,9 @@
|
|||
<chunk x="-32" y="16" width="16" height="16">
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,773,774,1,1,1,1,1,1,773,774,773,774,
|
||||
1,1,1,1,782,783,751,752,753,1,1,1,782,783,782,783,
|
||||
1,1,1,1,1,1,1,1,1,350,351,1,1,1,1,1,
|
||||
1,1,1,1,773,774,0,0,1,834,835,1,773,774,773,774,
|
||||
1,1,1,1,782,783,751,752,753,859,860,1,782,783,782,783,
|
||||
1,1,1,1,791,792,760,761,762,1,1,1,791,792,791,792,
|
||||
1,1,1,1,1,771,772,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,780,781,1,1,1,1,1,1,1,1,1,
|
||||
|
|
@ -192,7 +193,7 @@
|
|||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,701,1,1,1,701,1,1,1,1,1,1,701,1,
|
||||
1,1,1,710,1,1,1,710,1,1,1,1,1,1,710,1,
|
||||
1,10,1,710,1,1,1,710,1,1,1,1,1,1,710,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
|
|
@ -212,11 +213,11 @@
|
|||
1,1,701,1,1,1,1,57,58,1,1,1,1,1,1,1,
|
||||
1,1,710,1,1,1,1,66,67,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,75,76,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,252,260,251,260,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,261,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,252,260,256,260,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,261,1,1,994,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,794,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,819,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
|
|
@ -251,9 +252,9 @@
|
|||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,809,810,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,963,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,988,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
|
|
@ -284,15 +285,15 @@
|
|||
<chunk x="-32" y="16" width="16" height="16">
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,341,342,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,395,396,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,387,809,810,369,1,1,1,1,
|
||||
1,1,1,1,1,1,0,0,1,1,0,1,0,0,0,0,
|
||||
1,1,1,1,924,929,882,928,1,1,0,1,929,930,930,931,
|
||||
1,1,1,1,0,929,0,0,1,1,1,991,932,932,929,814,
|
||||
1,1,1,1,1,911,1,1,1,1,1,1,1,1,1,839,
|
||||
1,1,1,1,1,1,825,1,848,849,1,1,1,850,851,1,
|
||||
1,1,1,1,1,1,1,1,873,874,881,1,1,875,876,1,
|
||||
1,1,1,1,917,1,1,1,1,738,1,1,1,1,1,1,
|
||||
1,1,1,1,942,991,1,1,1,747,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
|
|
@ -308,10 +309,10 @@
|
|||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,183,1,
|
||||
1,1,1,1,1,1,181,182,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,190,191,1,1,1,1,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,193,1,
|
||||
1,1,1,1,1,1,1,1,1,1,341,342,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,350,351,1,1,1,1,
|
||||
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
|
||||
Binary file not shown.
Binary file not shown.
|
After Width: | Height: | Size: 8.0 KiB |
Loading…
Reference in New Issue