ulysse
/
2D_Engine
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: ulysse:Gestions_hitbox
Branches Tags
ulysse:main
ulysse:Gestions_hitbox
...
pull from: ulysse:main
Branches Tags
ulysse:main
ulysse:Gestions_hitbox

18 Commits
Gestions_h ... main

Author SHA1 Message Date
Ulysse Cura 49bbaaca99 Syntaxe fixes 2024-11-29 10:41:50 +01:00
Ulysse Cura 6b948eaa43 Changes the map for tests and debuging 2024-10-17 20:39:13 +02:00
Ulysse Cura 70e3c70d3d Fixing the 1 frame bug 2024-10-17 20:38:11 +02:00
Ulysse Cura 5db7b6a448 Camera changes update 2024-10-17 20:37:22 +02:00
Ulysse Cura 49d3d1ceed Making the speed a float number 2024-10-17 19:11:54 +02:00
Ulysse Cura d7c3a55068 MOVE PLAYER OUT OF OTHER ENTIY !!!!!!!! 2024-10-17 19:11:23 +02:00
Ulysse Cura 3917b4c966 Change functions names in ECS 2024-10-17 18:25:00 +02:00
Ulysse Cura a206123854 Add more useless commentary 2024-10-17 18:23:58 +02:00
Ulysse Cura 7f5984b229 Change how camera works. 2024-10-17 18:19:22 +02:00
Ulysse Cura a1d05dcf27 Using VsCode for programming !! :-) 2024-10-17 18:06:35 +02:00
Ulysse Cura 1e29f7e4a5 Merge branch 'Gestions_hitbox' into main 
# Conflicts:
#    .gitignore
 2024-09-08 14:05:49 +02:00
Ulysse Cura 8f39b26b9d Undo hitbox gestion 2024-09-08 14:05:19 +02:00
Ulysse Cura aaaa21f73a ECS/ECS.hpp is now beautiful ! 2024-09-08 13:58:06 +02:00
Ulysse Cura 4c08a56057 Merge branch 'main' into Gestions_hitbox 2024-09-08 13:36:03 +02:00
Ulysse Cura a2e70e3184 Change maps files location and fix maps error. 2024-09-08 13:30:47 +02:00
Ulysse Cura 90ceb9a86f Create a function for resolve hitboxes. 2024-09-08 13:27:35 +02:00
Ulysse Cura 947905c39a Merge branch 'main' into Gestions_hitbox 2024-09-07 18:44:44 +02:00
Ulysse Cura 7efa1036fd Disable non-used events. 2024-09-07 18:42:49 +02:00
16 changed files with 402 additions and 258 deletions
Show Stats Expand all files Collapse all files

36
.gitignore vendored
View File

@ -1,34 +1,8 @@
# ---> 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
*.exe
*.out
*.app
=======
# Executable
>>>>>>> refs/heads/Gestions_hitbox
2D_Engine

35
.vscode/tasks.json vendored Normal file
View File

@ -0,0 +1,35 @@
{
"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
View File

@ -13,38 +13,32 @@
#ifndef CAMERA_HPP
#define CAMERA_HPP
#include <SDL2/SDL.h> // SDL_Rect
#include "Game.hpp" // Game::...
#include "TileMap.hpp" // TileMap::...
#include <SDL2/SDL.h> // SDL_Rect
#include "Game.hpp" // Game::...
#include "TileMap.hpp" // TileMap::...
#include "Vector2D.hpp" // Vector2D class
struct Camera {
Camera(int xpos, int ypos, int width, int height)
Camera(int width, int height)
{
camR.x = xpos;
camR.y = ypos;
camR.w = width;
camR.h = height;
}
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
// Update camera
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

1
ChannelManager.hpp
View File

@ -34,6 +34,7 @@ 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
View File

@ -13,21 +13,23 @@
#define ECS_HPP
#include <algorithm>
#include <array>
#include <bitset>
#include <stdexcept>
#include <iostream>
#include <memory>
#include <vector>
#include "../ChannelManager.hpp"
#include <array> // array
#include <bitset> // bitset
#include <stdexcept> // runtime_error
#include <memory> // unique_ptr, make_unique
#include <vector> // vector
#include "../ChannelManager.hpp" // Class ChannelManager
using std::bitset, std::array, std::vector, std::unique_ptr, std::make_unique, std::move, std::forward, std::runtime_error, std::sort;
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;
// 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;
@ -40,13 +42,15 @@ 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>;
class Component {
public:
// Definition de la class Components
struct Component {
Entity *entity;
virtual void init() {}
@ -56,18 +60,22 @@ class 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; }
@ -97,40 +105,52 @@ 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:
@ -146,7 +166,10 @@ class Manager {
public:
void update()
{
for(auto &e : m_entities) e->update();
for(auto &e : m_entities)
{
e->update();
}
}
void draw()
@ -155,9 +178,12 @@ 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++)
{
@ -167,7 +193,7 @@ class Manager {
void refresh()
{
m_entities.erase(std::remove_if(m_entities.begin(), m_entities.end(),
m_entities.erase(remove_if(m_entities.begin(), m_entities.end(),
[](const unique_ptr<Entity> &mEntity) {
return !mEntity->isActive();
}),
@ -182,12 +208,12 @@ class Manager {
return *e;
}
std::size_t getNumberOfEntity() const
size_t getNumberOfEntities() const
{
return m_entities.size();
}
void erase(std::size_t index)
void destroy(std::size_t index)
{
m_entities.at(index).get()->destroy();
}

2
ECS/HitboxComponent.hpp
View File

@ -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;
SDL_Rect hitboxR {0, 0, 0, 0};
bool hitboxActivated {true};

129
ECS/PlayerSystem.hpp
View File

@ -18,6 +18,7 @@
#include <vector>
#include "AnimationSystem.hpp"
#include "ECS.hpp"
#include "HitboxComponent.hpp"
#include "InteractableComponent.hpp"
#include "SpriteComponent.hpp"
#include "TransformComponent.hpp"
@ -29,7 +30,7 @@
using std::lerp, std::abs, std::vector, std::sort;
constexpr const float EPSILON = 1e-6f; // Tolérance
constexpr const float EPSILON = 1e-6f;
class PlayerSystem : public Component {
public:
@ -55,7 +56,12 @@ 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++)
{
@ -80,16 +86,23 @@ 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
@ -106,8 +119,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 * static_cast<float>(m_transform->speed));
if(i == 1) futureHitboxR.y += static_cast<int>(m_transform->velocity.y * static_cast<float>(m_transform->speed));
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);
SDL_Rect hitboxTilesR;
hitboxTilesR.x = futureHitboxR.x / (TILE_SIZE * TILEMAP_SCALE);
@ -115,7 +128,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++)
{
@ -129,22 +142,26 @@ class PlayerSystem : public Component {
for(const auto &touchedHitbox : touchedHitboxes)
{
if(touchedHitbox == 1)
if(touchedHitbox != 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();
if(touchedHitbox == 1)
{
if(i == 0) m_transform->velocity.x = 0;
if(i == 1) m_transform->velocity.y = 0;
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)));
break;
}
else
{
Game::tileMap.LoadNextMap(touchedHitbox);
m_transform->position = Game::tileMap.getPlayerInitPos();
playerState = State::None;
break;
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;
}
}
}
@ -154,27 +171,53 @@ class PlayerSystem : public Component {
{
if(it->get()->getComponent<HitboxComponent>().hitboxActivated)
{
SDL_Rect entityHitboxR {it->get()->getComponent<HitboxComponent>().hitboxR};
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;
}
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;
}
}
@ -216,15 +259,17 @@ class PlayerSystem : public Component {
void m_setCamera()
{
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));
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 smoothingFactor {0.08f};
if(playerState == State::Running) smoothingFactor = 0.12f;
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));
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));
}
void m_checkInteractions()

6
ECS/TransformComponent.hpp
View File

@ -22,7 +22,7 @@ struct TransformComponent : public Component {
position.zero();
}
TransformComponent(Vector2D<float> pos, Vector2D<int> dim, int sc, int spd) : position(pos), speed(spd), dimension(dim), scale(sc)
TransformComponent(Vector2D<float> pos, Vector2D<int> dim, int sc, float 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 * static_cast<float>(speed));
position += (velocity * 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;
int speed {1};
float speed {1};
Vector2D<int> dimension {32, 32};
int scale {1};

64
Game.cpp
View File

@ -27,13 +27,14 @@ SDL_Renderer *Game::renderer;
SDL_Texture *Game::textureRenderer;
Events Game::events;
TextureManager Game::textureManager;
Camera Game::camera {0, 0, WINDOW_WIDTH, WINDOW_HEIGHT};
Camera Game::camera {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);
@ -44,8 +45,10 @@ 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';
@ -53,6 +56,7 @@ bool Game::Init()
}
cerr << "SDL initialised successfully.\n";
// Init IMG
if(IMG_Init(IMG_INIT_PNG) == 0)
{
cerr << "Erreur IMG_Init : " << IMG_GetError() << '\n';
@ -60,6 +64,7 @@ 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)
{
@ -68,6 +73,48 @@ 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)
{
@ -76,24 +123,19 @@ 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");
TransformComponent *p_transform = &player.addComponent<TransformComponent>(tileMap.getPlayerInitPos(), Vector2D<int>(32, 32), 2, 3);
// Init player
TransformComponent *p_transform = &player.addComponent<TransformComponent>(tileMap.getPlayerInitPos(), Vector2D<int>(32, 32), 2, 3.0f);
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.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");
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);
m_isRunning = true;

41
TileMap.cpp
View File

@ -14,7 +14,6 @@
#include "Camera.hpp"
#include "Game.hpp"
#include "MapManager.hpp"
#include "externLibs/nlohmann/json.hpp"
#include "TextureManager.hpp"
#include "TileMap.hpp"
#include "Vector2D.hpp"
@ -23,18 +22,20 @@
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)
{
json *mapData;
mapData = Game::mapManager.LoadMap(path);
// Load the map data from memory
json *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();
@ -47,6 +48,7 @@ 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)
@ -77,6 +79,8 @@ 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;
@ -84,7 +88,6 @@ void TileMap::LoadTileMap(const string &path)
}
m_nextMaps.clear();
for(auto it {mapData->at("NextMaps").begin()}; it < mapData->at("NextMaps").end(); it++)
{
NextMap nextMap;
@ -95,9 +98,22 @@ void TileMap::LoadTileMap(const string &path)
m_nextMaps.emplace(it->at("Number").get<int>(), nextMap);
}
std::size_t numberOfEntity {Game::entityManager.getNumberOfEntity()};
// 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");
}
}
for(std::size_t i {1}; i < numberOfEntity; i++) Game::entityManager.erase(i);
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();
if(mapData->contains("Entities"))
{
@ -114,7 +130,7 @@ void TileMap::LoadTileMap(const string &path)
pos = pos * TILE_SIZE * TILEMAP_SCALE;
e.addComponent<TransformComponent>(pos, dim, component->at("Scale").get<int>(), component->at("Speed").get<int>());
e.addComponent<TransformComponent>(pos, dim, component->at("Scale").get<int>(), component->at("Speed").get<float>());
}
else if(component->at("Type").get<string>() == "SpriteComponent")
{
@ -156,7 +172,10 @@ void TileMap::LoadTileMap(const string &path)
}
}
}
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)
{
@ -165,6 +184,7 @@ void TileMap::LoadTileMap(const string &path)
}
}
// Load the corresponding next map from memory
void TileMap::LoadNextMap(int nextMapNumber)
{
NextMap nextMap = m_nextMaps.at(nextMapNumber);
@ -174,6 +194,7 @@ 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);
@ -184,6 +205,7 @@ void TileMap::LoadTileset(const string &path)
m_tilesetHeight /= TILE_SIZE;
}
// Draw corresponding layer
void TileMap::draw(int layer)
{
if(layer == 1)
@ -205,6 +227,7 @@ void TileMap::draw(int layer)
}
}
// Draw the layer given
void TileMap::m_draw(const vector<TileID> &tiles)
{
SDL_Rect visibleTilesR;
@ -230,11 +253,13 @@ 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);

3
TileMap.hpp
View File

@ -17,12 +17,14 @@
#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;
@ -36,6 +38,7 @@ class TileMap {
TileMap() = default;
~TileMap();
void LoadEntities(json *);
void LoadTileMap(const string &);
void LoadNextMap(int);
void LoadTileset(const string &);

BIN
ressources/Test/Test map dungeon.ase
View File

Binary file not shown.

BIN
ressources/Test/Test map dungeon.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.0 KiB

2
ressources/Test/Maps/dungeon entry.tmx → ressources/TiledMaps/dungeon entry.tmx
View File

@ -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,395,1,1,1,1,1,1,1,1,391,1,1,433,577,578,579,580,
643,391,392,393,394,1,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,

0
ressources/Test/Maps/map dungeon 1.tmx → ressources/TiledMaps/map dungeon 1.tmx
View File

239
ressources/Test/Maps/map dungeon 2.tmx → ressources/TiledMaps/map dungeon 2.tmx
View File

@ -1,116 +1,115 @@
<?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="793" source="../../../../../../snap/tiled/4555/Props.tsx"/>
<tileset firstgid="1" source="../tileset/tileset.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">
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
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
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
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
</chunk>
<chunk x="-16" y="0" width="16" height="16">
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
9,9,9,9,9,9,9,9,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,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,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,
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,11,11,11,11,
16,163,165,15,11,11,11,11,11,11,11,11,10,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,
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
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
</chunk>
<chunk x="0" y="0" width="16" height="16">
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,9,
9,9,9,9,9,9,9,9,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
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,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
</chunk>
<chunk x="-32" y="16" width="16" height="16">
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
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
</chunk>
<chunk x="-16" y="16" width="16" height="16">
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,
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,
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,12,11,11,11,11,11,11,11,16,163,165,15,11,11,11,
47,10,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,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
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
</chunk>
<chunk x="0" y="16" width="16" height="16">
9,9,9,9,9,9,9,9,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
1,1,1,1,1,1,1,1,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
</chunk>
</data>
</layer>
@ -126,7 +125,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,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,
@ -140,11 +139,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,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,
@ -163,8 +162,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,
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,
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,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
@ -173,9 +172,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,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,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,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,
@ -193,7 +192,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,10,1,710,1,1,1,710,1,1,1,1,1,1,710,1,
1,1,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,
@ -213,11 +212,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,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,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,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,
@ -252,9 +251,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,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,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
@ -285,15 +284,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,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,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,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
@ -309,10 +308,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,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,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
1,1,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,350,351,1,1,1,1,
1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,