fix double definition of cast operator

This commit is contained in:
arthur.jamet
2021-05-23 19:22:49 +02:00
parent 7bab6e8b55
commit 77534276ef
6 changed files with 13 additions and 14 deletions
+4 -3
View File
@@ -59,14 +59,15 @@ namespace RAY {
//! @param texture the texture to apply
bool setTextureToMaterial(MaterialType materialType, const RAY::Texture &texture);
//! @brief A RAY Model is cast-able in libray's model
operator ::Model() const;
//! @return The number of bones in the model
int getBoneCount() const;
private:
//! @brief Raw data from raylib
::Model _model;
INTERNAL:
//! @brief A RAY Model is cast-able in libray's model
operator ::Model() const;
};
};
+6 -6
View File
@@ -25,12 +25,6 @@ namespace RAY {
//! @brief A model animation is assignable
ModelAnimation &operator=(const ModelAnimation &) = default;
//! @brief Castin Object to raw model animation pointer
operator ::ModelAnimation *();
//! @brief Castin Object to raw model animation pointer
operator ::ModelAnimation() const;
//! @brief Returns the current frame the animation is at
size_t getFrameCounter() const;
@@ -49,7 +43,13 @@ namespace RAY {
private:
::ModelAnimation &_animation;
INTERNAL:
size_t _frameCounter;
//! @brief Castin Object to raw model animation pointer
operator ::ModelAnimation *();
//! @brief Castin Object to raw model animation pointer
operator ::ModelAnimation() const;
};
}