Fixing namespace

This commit is contained in:
Zoe Roux
2021-05-24 17:15:24 +02:00
parent 22f61db1b3
commit 6deade8ddc
13 changed files with 14 additions and 14 deletions
@@ -4,7 +4,7 @@
#include "MovableComponent.hpp"
namespace Bomberman
namespace BBM
{
MovableComponent::MovableComponent(WAL::Entity &entity)
: Component(entity)
@@ -7,7 +7,7 @@
#include "Models/Vector3.hpp"
#include "Entity/Entity.hpp"
namespace Bomberman
namespace BBM
{
//! @brief A component to place on entities that can move or be moved.
class MovableComponent : public WAL::Component
@@ -4,7 +4,7 @@
#include "PositionComponent.hpp"
namespace Bomberman
namespace BBM
{
PositionComponent::PositionComponent(WAL::Entity &entity)
: Component(entity),
@@ -7,7 +7,7 @@
#include "Models/Vector3.hpp"
#include "Component/Component.hpp"
namespace Bomberman
namespace BBM
{
//! @brief A basic position component
class PositionComponent : public WAL::Component
+1 -1
View File
@@ -9,7 +9,7 @@
#include <Scene/Scene.hpp>
namespace Bomberman
namespace BBM
{
//! @brief A class representing the current game state. This allow one to retain information between update calls.
class GameState
+2 -2
View File
@@ -8,7 +8,7 @@
#include <iostream>
#include <cmath>
namespace Bomberman
namespace BBM
{
//! @brief A Vector3 data type. (templated to allow any kind of vector3)
template<typename T>
@@ -160,7 +160,7 @@ namespace Bomberman
}
template<typename T>
std::ostream &operator<<(std::ostream &s, const Bomberman::Vector3<T> &v)
std::ostream &operator<<(std::ostream &s, const BBM::Vector3<T> &v)
{
s << "Vector3<" << typeid(T).name() << ">("<< v.x << ", " << v.y << ", " << v.z << ")";
return s;
+1 -1
View File
@@ -7,7 +7,7 @@
#include "Runner.hpp"
#include "Models/GameState.hpp"
namespace Bomberman
namespace BBM
{
void updateState(WAL::Wal &engine, GameState &state)
{
+1 -1
View File
@@ -4,7 +4,7 @@
#pragma once
namespace Bomberman
namespace BBM
{
//! @brief Start the game and run a Bomberman.
//! @return 0 on success, another value on error.
+1 -1
View File
@@ -7,7 +7,7 @@
#include "Component/Movable/MovableComponent.hpp"
#include "Wal.hpp"
namespace Bomberman
namespace BBM
{
MovableSystem::MovableSystem()
: System({
+1 -1
View File
@@ -7,7 +7,7 @@
#include "System/System.hpp"
namespace Bomberman
namespace BBM
{
//! @brief A system to handle movable entities. This system update velocity based on accelerations and positions based on velocity.
class MovableSystem : public WAL::System
+1 -1
View File
@@ -107,5 +107,5 @@ int main(int argc, char **argv)
return 1;
}
return demo();
return Bomberman::run();
return BBM::run();
}
+1 -1
View File
@@ -8,7 +8,7 @@
#include <catch2/catch.hpp>
using namespace WAL;
using namespace Bomberman;
using namespace BBM;
TEST_CASE("Create system", "[Engine][System]")
{
+1 -1
View File
@@ -7,7 +7,7 @@
#include <catch2/catch.hpp>
using namespace WAL;
using namespace Bomberman;
using namespace BBM;
TEST_CASE("Component", "[Entity]")
{