Changed folder structure, moved files.
This commit is contained in:
parent
2be3f13810
commit
bb3ecf637b
28 changed files with 677 additions and 678 deletions
|
@ -9,13 +9,13 @@
|
|||
|
||||
#include <Thor/Graphics.hpp>
|
||||
|
||||
#include "util/Instances.h"
|
||||
#include "abstract/Character.h"
|
||||
#include "sprite/Cover.h"
|
||||
#include "sprite/Enemy.h"
|
||||
#include "sprites/Cover.h"
|
||||
#include "sprites/Enemy.h"
|
||||
#include "types/Instances.h"
|
||||
#include "types/String.h"
|
||||
#include "util/Loader.h"
|
||||
#include "util/ResourceManager.h"
|
||||
#include "util/String.h"
|
||||
|
||||
/// Goal amount of frames per second.
|
||||
const int Game::FPS_GOAL = 60;
|
||||
|
|
|
@ -15,11 +15,11 @@
|
|||
|
||||
#include <Box2D/Box2D.h>
|
||||
|
||||
#include "Pathfinder.h"
|
||||
#include "TileManager.h"
|
||||
#include "sprite/Player.h"
|
||||
#include "sprites/TileManager.h"
|
||||
#include "sprites/Player.h"
|
||||
#include "types/String.h"
|
||||
#include "util/Collection.h"
|
||||
#include "util/String.h"
|
||||
#include "util/Pathfinder.h"
|
||||
|
||||
class Player;
|
||||
class Collection;
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
#include <Thor/Vectors.hpp>
|
||||
|
||||
#include "../sprite/Body.h"
|
||||
#include "../sprites/Body.h"
|
||||
#include "../util/Log.h"
|
||||
|
||||
const String Character::KEY_HEALTH = "health";
|
||||
|
|
|
@ -12,8 +12,8 @@
|
|||
|
||||
#include "Sprite.h"
|
||||
#include "../items/Weapon.h"
|
||||
#include "../util/Instances.h"
|
||||
#include "../util/String.h"
|
||||
#include "../types/Instances.h"
|
||||
#include "../types/String.h"
|
||||
#include "../util/Yaml.h"
|
||||
|
||||
class Weapon;
|
||||
|
|
|
@ -10,8 +10,8 @@
|
|||
|
||||
#include <Box2D/Box2D.h>
|
||||
|
||||
#include "../util/String.h"
|
||||
#include "../util/Vector.h"
|
||||
#include "../types/String.h"
|
||||
#include "../types/Vector.h"
|
||||
#include "../util/Yaml.h"
|
||||
|
||||
class Yaml;
|
||||
|
|
|
@ -13,8 +13,8 @@
|
|||
#include <Thor/Resources.hpp>
|
||||
|
||||
#include "Physical.h"
|
||||
#include "../util/String.h"
|
||||
#include "../util/Vector.h"
|
||||
#include "../types/String.h"
|
||||
#include "../types/Vector.h"
|
||||
#include "../util/Yaml.h"
|
||||
|
||||
class Physical;
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
#define DG_BULLET_H_
|
||||
|
||||
#include "../particle/Particle.h"
|
||||
#include "../util/String.h"
|
||||
#include "../types/String.h"
|
||||
#include "../util/Yaml.h"
|
||||
|
||||
class Particle;
|
||||
|
|
|
@ -10,9 +10,9 @@
|
|||
|
||||
#include <Thor/Particles.hpp>
|
||||
|
||||
#include "../util/Instances.h"
|
||||
#include "../abstract/Physical.h"
|
||||
#include "../particle/Emitter.h"
|
||||
#include "../types/Instances.h"
|
||||
#include "../util/Yaml.h"
|
||||
|
||||
class Emitter;
|
||||
|
|
0
source/sprite/Body.cpp → source/sprites/Body.cpp
Executable file → Normal file
0
source/sprite/Body.cpp → source/sprites/Body.cpp
Executable file → Normal file
0
source/sprite/Body.h → source/sprites/Body.h
Executable file → Normal file
0
source/sprite/Body.h → source/sprites/Body.h
Executable file → Normal file
0
source/sprite/Cover.cpp → source/sprites/Cover.cpp
Executable file → Normal file
0
source/sprite/Cover.cpp → source/sprites/Cover.cpp
Executable file → Normal file
0
source/sprite/Cover.h → source/sprites/Cover.h
Executable file → Normal file
0
source/sprite/Cover.h → source/sprites/Cover.h
Executable file → Normal file
|
@ -8,10 +8,10 @@
|
|||
#ifndef DG_ENEMY_H_
|
||||
#define DG_ENEMY_H
|
||||
|
||||
#include "../util/Instances.h"
|
||||
#include "../types/Instances.h"
|
||||
#include "../abstract/Character.h"
|
||||
#include "../util/Collection.h"
|
||||
#include "../util/Vector.h"
|
||||
#include "../types/Vector.h"
|
||||
#include "../util/Yaml.h"
|
||||
|
||||
class Character;
|
|
@ -9,9 +9,9 @@
|
|||
|
||||
#include <Thor/Vectors.hpp>
|
||||
|
||||
#include "../util/Vector.h"
|
||||
#include "../items/Weapon.h"
|
||||
#include "../util/String.h"
|
||||
#include "../types/String.h"
|
||||
#include "../types/Vector.h"
|
||||
|
||||
/**
|
||||
* Initializes Sprite.
|
|
@ -11,11 +11,11 @@
|
|||
#include <SFML/System.hpp>
|
||||
#include <SFML/Graphics.hpp>
|
||||
|
||||
#include "../util/Instances.h"
|
||||
#include "../Pathfinder.h"
|
||||
#include "../abstract/Character.h"
|
||||
#include "../items/Weapon.h"
|
||||
#include "../util/Vector.h"
|
||||
#include "../types/Instances.h"
|
||||
#include "../types/Vector.h"
|
||||
#include "../util/Pathfinder.h"
|
||||
#include "../util/Yaml.h"
|
||||
|
||||
class Character;
|
8
source/TileManager.cpp → source/sprites/TileManager.cpp
Executable file → Normal file
8
source/TileManager.cpp → source/sprites/TileManager.cpp
Executable file → Normal file
|
@ -9,10 +9,10 @@
|
|||
|
||||
#include <Thor/Resources.hpp>
|
||||
|
||||
#include "abstract/Sprite.h"
|
||||
#include "util/Loader.h"
|
||||
#include "util/ResourceManager.h"
|
||||
#include "util/String.h"
|
||||
#include "../abstract/Sprite.h"
|
||||
#include "../types/String.h"
|
||||
#include "../util/Loader.h"
|
||||
#include "../util/ResourceManager.h"
|
||||
|
||||
const Vector2i TileManager::TILE_SIZE = Vector2i(100, 100);
|
||||
|
6
source/TileManager.h → source/sprites/TileManager.h
Executable file → Normal file
6
source/TileManager.h → source/sprites/TileManager.h
Executable file → Normal file
|
@ -14,9 +14,9 @@
|
|||
|
||||
#include <Box2D/Box2D.h>
|
||||
|
||||
#include "util/Vector.h"
|
||||
#include "abstract/Sprite.h"
|
||||
#include "util/String.h"
|
||||
#include "../abstract/Sprite.h"
|
||||
#include "../types/Vector.h"
|
||||
#include "../types/String.h"
|
||||
|
||||
class Sprite;
|
||||
|
|
@ -10,9 +10,9 @@
|
|||
|
||||
#include <Box2D/Box2D.h>
|
||||
|
||||
#include "../Pathfinder.h"
|
||||
#include "../TileManager.h"
|
||||
#include "Collection.h"
|
||||
#include "../sprites/TileManager.h"
|
||||
#include "../util/Collection.h"
|
||||
#include "../util/Pathfinder.h"
|
||||
|
||||
class Pathfinder;
|
||||
class TileManager;
|
0
source/util/Vector.h → source/types/Vector.h
Executable file → Normal file
0
source/util/Vector.h → source/types/Vector.h
Executable file → Normal file
|
@ -16,7 +16,7 @@
|
|||
|
||||
#include <Thor/Resources.hpp>
|
||||
|
||||
#include "Singleton.h"
|
||||
#include "../abstract/Singleton.h"
|
||||
|
||||
template <class T>
|
||||
class Singleton;
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
|
||||
#include <iostream>
|
||||
|
||||
#include "Vector.h"
|
||||
#include "../types/Vector.h"
|
||||
|
||||
/**
|
||||
* Logging functions for different levels.
|
||||
|
|
|
@ -23,8 +23,7 @@
|
|||
#include <boost/graph/filtered_graph.hpp>
|
||||
#include <boost/graph/astar_search.hpp>
|
||||
|
||||
#include "util/Log.h"
|
||||
#include <typeinfo>
|
||||
#include "../util/Log.h"
|
||||
|
||||
// Boost interface type declarations.
|
||||
enum class Direction;
|
|
@ -10,8 +10,8 @@
|
|||
|
||||
#include <Box2D/Box2D.h>
|
||||
|
||||
#include "abstract/Physical.h"
|
||||
#include "util/Vector.h"
|
||||
#include "../abstract/Physical.h"
|
||||
#include "../types/Vector.h"
|
||||
|
||||
/**
|
||||
* Interface class for Boost Graph A* library.
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
#include <Thor/Resources.hpp>
|
||||
|
||||
#include "Singleton.h"
|
||||
#include "../abstract/Singleton.h"
|
||||
|
||||
template <class T>
|
||||
class Singleton;
|
||||
|
|
|
@ -12,8 +12,8 @@
|
|||
|
||||
#include <yaml-cpp/yaml.h>
|
||||
|
||||
#include "String.h"
|
||||
#include "Vector.h"
|
||||
#include "../types/String.h"
|
||||
#include "../types/Vector.h"
|
||||
|
||||
namespace details {};
|
||||
|
||||
|
|
Reference in a new issue