zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2025-12-20 21:35:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix compilation, model is a 3D drawable

Browse Source
This commit is contained in:
Bluub
2021-05-27 16:27:48 +02:00
parent 5469b6f169
commit 16ea3e3d80
4 changed files with 34 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Ray/sources/Model/Model.hpp
View File

@@ -15,7 +15,7 @@
#include <raylib.h>
#include <vector>
namespace RAY {
namespace RAY::Drawables::Drawables3D {
//! @brief Basic 3D Model type
class Model: public IRessource, public Drawables::ADrawable3D {
public:
@@ -24,7 +24,7 @@ namespace RAY {
//! @brief Create an model, loading a file
//! @param filePath: path to file to load
Model(const std::string &filePath, const RAY::Vector3 &position, const RAY::Vector3 &rotationAxis = RAY::Vector3(0, 1, 0), float rotationAngle = 0, const RAY::Vector3 &scale = RAY::Vector3(1, 1, 1));
Model(const std::string &filePath, const RAY::Vector3 &position = {0, 0, 0}, const RAY::Vector3 &rotationAxis = RAY::Vector3(0, 1, 0), float rotationAngle = 0, const RAY::Vector3 &scale = RAY::Vector3(1, 1, 1));
//! @brief Create an model, loading a file
//! @param mesh: mesh to load
@@ -69,10 +69,10 @@ namespace RAY {
float getRotationAngle(void);
//! @brief Set Rotation Axis
Model &setRotationAxix(const RAY::Vector3 &scale);
Model &setRotationAxis(const RAY::Vector3 &scale);
//! @return rotation axis
const RAY::Vector3 & getRotationAxix(void);
const RAY::Vector3 & getRotationAxis(void);
//! @brief Set Scale
Model &setScale(const RAY::Vector3 &scale);
@@ -80,6 +80,8 @@ namespace RAY {
//! @return Scale
const RAY::Vector3 & getScale(void);
void drawOn(RAY::Window &) override;
private:
//! @brief Raw data from raylib
::Model _model;