Merge branch 'develop' into renderer

# Conflicts:
#	CMakeLists.txt
#	lib/wal/CMakeLists.txt
#	sources/Component/Movable/MovableComponent.cpp
#	sources/Component/Position/PositionComponent.cpp
#	sources/Component/Position/PositionComponent.hpp
#	sources/System/Movable/MovableSystem.cpp
#	sources/System/Movable/MovableSystem.hpp
#	sources/main.cpp
This commit is contained in:
Clément Le Bihan
2021-05-26 11:31:28 +02:00
18 changed files with 204 additions and 188 deletions

View File

@@ -1,23 +0,0 @@
//
// Created by Zoe Roux on 5/17/21.
//
#include "MovableComponent.hpp"
#include "Entity/Entity.hpp"
namespace BBM
{
MovableComponent::MovableComponent(WAL::Entity &entity)
: Component(entity)
{}
WAL::Component *MovableComponent::clone(WAL::Entity &entity) const
{
return new MovableComponent(entity);
}
void MovableComponent::addForce(WAL::Vector3f force)
{
this->_acceleration += force;
}
}