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 -2
View File
@@ -19,9 +19,9 @@ namespace RAY::Drawables::Drawables3D {
const RAY::Vector3 &scale,
const RAY::Vector3 &position,
const RAY::Vector3 &rotationAxis,
float rotationAngle)
float rotationAngle, bool lonely)
: ADrawable3D(position, WHITE),
_model(_modelsCache.fetch(filename)),
_model(_modelsCache.fetch(filename, lonely)),
_rotationAxis(rotationAxis),
_rotationAngle(rotationAngle),
_scale(scale)