zoriya/Bomberman
1
0
Fork 0
mirror of https://github.com/zoriya/Bomberman.git synced 2025-12-20 13:25:10 +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

41
lib/Ray/sources/Model/Model.cpp
View File

@@ -8,46 +8,47 @@
#include "Model/Model.hpp"
#include "Exceptions/RayError.hpp"
RAY::Model::Model(const std::string &filePath, const RAY::Vector3 &position, const RAY::Vector3 &rotationAxis, float rotationAngle, const RAY::Vector3 &scale):
ADrawable3D(position, WHITE), _model(LoadModel(filename.c_str()), position, rotationAxis, rotationAngle, scale)
RAY::Drawables::Drawables3D::Model::Model(const std::string &filename, const RAY::Vector3 &position, const RAY::Vector3 &rotationAxis, float rotationAngle, const RAY::Vector3 &scale):
ADrawable3D(position, WHITE), _model(LoadModel(filename.c_str())),
_rotationAxis(rotationAxis), _rotationAngle(rotationAngle), _scale(scale)
{
}
RAY::Model::Model(const Mesh &mesh):
_model(LoadModelFromMesh(mesh))
RAY::Drawables::Drawables3D::Model::Model(const Mesh &mesh)
: ADrawable3D({0, 0, 0}, WHITE), _model(LoadModelFromMesh(mesh))
{
}
RAY::Model::~Model()
RAY::Drawables::Drawables3D::Model::~Model()
{
this->unload();
}
bool RAY::Model::load(const std::string &filename)
bool RAY::Drawables::Drawables3D::Model::load(const std::string &filename)
{
this->_model = LoadModel(filename.c_str());
return true;
}
bool RAY::Model::load(const Mesh &mesh)
bool RAY::Drawables::Drawables3D::Model::load(const Mesh &mesh)
{
this->_model = LoadModelFromMesh(mesh);
return true;
}
bool RAY::Model::unload()
bool RAY::Drawables::Drawables3D::Model::unload()
{
UnloadModel(this->_model);
return true;
}
bool RAY::Model::unloadKeepMeshes()
bool RAY::Drawables::Drawables3D::Model::unloadKeepMeshes()
{
UnloadModelKeepMeshes(_model);
return true;
}
bool RAY::Model::setAnimation(const RAY::ModelAnimation &animation)
bool RAY::Drawables::Drawables3D::Model::setAnimation(const RAY::ModelAnimation &animation)
{
if (!IsModelAnimationValid(this->_model, animation))
throw RAY::Exception::NotCompatibleError("The animation is not compatible with the model");
@@ -55,56 +56,56 @@ bool RAY::Model::setAnimation(const RAY::ModelAnimation &animation)
return true;
}
bool RAY::Model::setTextureToMaterial(RAY::Model::MaterialType materialType, const RAY::Texture &texture)
bool RAY::Drawables::Drawables3D::Model::setTextureToMaterial(RAY::Drawables::Drawables3D::Model::MaterialType materialType, const RAY::Texture &texture)
{
SetMaterialTexture(&this->_model.materials[materialType], materialType, texture);
return true;
}
RAY::Model::operator ::Model() const
RAY::Drawables::Drawables3D::Model::operator ::Model() const
{
return this->_model;
}
int RAY::Model::getBoneCount() const
int RAY::Drawables::Drawables3D::Model::getBoneCount() const
{
return this->_model.boneCount;
}
RAY::Model &RAY::Model::setRotationAngle(float rotationAngle)
RAY::Drawables::Drawables3D::Model &RAY::Drawables::Drawables3D::Model::setRotationAngle(float rotationAngle)
{
this->_rotationAngle = rotationAngle;
return *this;
}
float RAY::Model::getRotationAngle(void)
float RAY::Drawables::Drawables3D::Model::getRotationAngle(void)
{
return this->_rotationAngle;
}
RAY::Model &RAY::Model::setRotationAxix(const RAY::Vector3 &scale)
RAY::Drawables::Drawables3D::Model &RAY::Drawables::Drawables3D::Model::setRotationAxis(const RAY::Vector3 &scale)
{
this->_scale = scale;
return *this;
}
const RAY::Vector3 &RAY::Model::getRotationAxix(void)
const RAY::Vector3 &RAY::Drawables::Drawables3D::Model::getRotationAxis(void)
{
return this->_rotationAxis;
}
RAY::Model &RAY::Model::setScale(const RAY::Vector3 &scale)
RAY::Drawables::Drawables3D::Model &RAY::Drawables::Drawables3D::Model::setScale(const RAY::Vector3 &scale)
{
this->_scale = scale;
return *this;
}
const RAY::Vector3 &RAY::Model::getScale(void)
const RAY::Vector3 &RAY::Drawables::Drawables3D::Model::getScale(void)
{
return this->_scale;
}
void RAY::Model::drawOn(RAY::Window &)
void RAY::Drawables::Drawables3D::Model::drawOn(RAY::Window &)
{
DrawModelEx(this->_model, this->_position, this->_rotationAxis, this->_rotationAngle, this->_scale, this->_color);
}