Merging with develop

This commit is contained in:
Zoe Roux
2021-06-09 14:52:18 +02:00
40 changed files with 588 additions and 71 deletions
+2 -1
View File
@@ -26,12 +26,13 @@ namespace RAY::Drawables::Drawables3D {
//! @brief Create an model, loading a file
//! @param filePath: path to file to load
//! @param lonely: should be set to true if the entity's loaded data must be independant from others
Model(const std::string &filePath,
std::optional<std::pair<MaterialType, std::string>> texture = std::nullopt,
const RAY::Vector3 &scale = RAY::Vector3(1, 1, 1),
const RAY::Vector3 &position = {0, 0, 0},
const RAY::Vector3 &rotationAxis = RAY::Vector3(0, 1, 0),
float rotationAngle = 0);
float rotationAngle = 0, bool lonely = false);
//! @brief Create an model, loading a file
//! @param mesh: mesh to load