Merging with develop

This commit is contained in:
Zoe Roux
2021-06-14 13:50:47 +02:00
61 changed files with 2026 additions and 924 deletions
+2 -2
View File
@@ -82,9 +82,9 @@ namespace RAY::Drawables::Drawables3D
return this->_rotationAngle;
}
Model &Model::setRotationAxis(const RAY::Vector3 &scale)
Model &Model::setRotationAxis(const RAY::Vector3 &rotationAxis)
{
this->_scale = scale;
this->_rotationAxis = rotationAxis;
return *this;
}
+1 -1
View File
@@ -68,7 +68,7 @@ namespace RAY::Drawables::Drawables3D {
float getRotationAngle(void);
//! @brief Set Rotation Axis
Model &setRotationAxis(const RAY::Vector3 &scale);
Model &setRotationAxis(const RAY::Vector3 &rotationAxis);
//! @return rotation axis
const RAY::Vector3 & getRotationAxis(void);