From e70dbd5b3b428d516d2e190c2e117f6eed62b01b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20Le=20Bihan?= Date: Wed, 26 May 2021 17:21:01 +0200 Subject: [PATCH] adding operator* for vector3f to please ZOE the tyrant --- CMakeLists.txt | 2 +- sources/Models/Vector3.cpp | 13 +++++++++++++ sources/Models/Vector3.hpp | 8 +++++++- sources/System/Renderer/Renderer3DSystem.hpp | 2 +- 4 files changed, 22 insertions(+), 3 deletions(-) create mode 100644 sources/Models/Vector3.cpp diff --git a/CMakeLists.txt b/CMakeLists.txt index 75052c49..dc167f05 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -33,7 +33,7 @@ set(SOURCES add_executable(bomberman sources/main.cpp ${SOURCES} - ) + sources/Models/Vector3.cpp) target_include_directories(bomberman PUBLIC sources) target_link_libraries(bomberman PUBLIC wal ray) diff --git a/sources/Models/Vector3.cpp b/sources/Models/Vector3.cpp new file mode 100644 index 00000000..d46f5ca9 --- /dev/null +++ b/sources/Models/Vector3.cpp @@ -0,0 +1,13 @@ +// +// Created by cbihan on 26/05/2021. +// + +#include "Vector3.hpp" + +namespace BBM +{ + RAY::Vector3 operator*(const Vector3f &v) + { + return {v.x, v.y, v.z}; + } +} \ No newline at end of file diff --git a/sources/Models/Vector3.hpp b/sources/Models/Vector3.hpp index 81a61cf3..0edd7a64 100644 --- a/sources/Models/Vector3.hpp +++ b/sources/Models/Vector3.hpp @@ -7,6 +7,7 @@ #include #include +#include "Vector/Vector3.hpp" namespace BBM { @@ -157,7 +158,12 @@ namespace BBM typedef Vector3 Vector3f; typedef Vector3 Vector3u; typedef Vector3 Vector3i; -} // namespace WAL + + RAY::Vector3 operator*(const Vector3f &v); +} + + + template std::ostream &operator<<(std::ostream &s, const BBM::Vector3 &v) diff --git a/sources/System/Renderer/Renderer3DSystem.hpp b/sources/System/Renderer/Renderer3DSystem.hpp index fe813318..cc376e61 100644 --- a/sources/System/Renderer/Renderer3DSystem.hpp +++ b/sources/System/Renderer/Renderer3DSystem.hpp @@ -36,7 +36,7 @@ namespace BBM auto &comp = entity.getComponent>(); auto &pos = entity.getComponent(); - comp.member.setPosition(Utils::toRAY(pos.position)); + comp.member.setPosition(*pos.position); comp.member.drawOn(this->_window); }