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 double definition of cast operator

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Ray/sources/Model/ModelAnimation.hpp
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;
};
}