Merge pull request #97 from AnonymusRaccoon/map_generator

Map generator
This commit is contained in:
Clément Le Bihan
2021-06-01 20:53:39 +02:00
committed by GitHub
16 changed files with 656 additions and 360 deletions

View File

@@ -16,10 +16,10 @@ namespace RAY::Drawables::Drawables3D {
Model::Model(const std::string &filename,
std::optional<std::pair<MaterialType, std::string>> texture,
const RAY::Vector3 &scale,
const RAY::Vector3 &position,
const RAY::Vector3 &rotationAxis,
float rotationAngle,
const RAY::Vector3 &scale)
float rotationAngle)
: ADrawable3D(position, WHITE),
_model(_modelsCache.fetch(filename)),
_rotationAxis(rotationAxis),