summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorvaxerski <43317083+vaxerski@users.noreply.github.com>2022-04-24 17:01:39 +0200
committervaxerski <43317083+vaxerski@users.noreply.github.com>2022-04-24 17:01:39 +0200
commitd79837633027838a334db182e37f6ad6712cd248 (patch)
tree16c783f51fc86693d2dd0cb393c03418e1f5b5ed /src
parentc279b08b3d9ff2b343ceedaf5efcd9fb9988098f (diff)
assert -> rassert for animatedvariable
Diffstat (limited to 'src')
-rw-r--r--src/helpers/AnimatedVariable.hpp30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/helpers/AnimatedVariable.hpp b/src/helpers/AnimatedVariable.hpp
index 197e5d4e..6fb62654 100644
--- a/src/helpers/AnimatedVariable.hpp
+++ b/src/helpers/AnimatedVariable.hpp
@@ -23,56 +23,56 @@ public:
// gets the current vector value (real time)
const Vector2D& vec() const {
- ASSERT(m_eVarType == AVARTYPE_VECTOR);
+ RASSERT(m_eVarType == AVARTYPE_VECTOR, "Tried to access vec() of AVARTYPE %i!", m_eVarType);
return m_vValue;
}
// gets the current float value (real time)
const float& fl() const {
- ASSERT(m_eVarType == AVARTYPE_FLOAT);
+ RASSERT(m_eVarType == AVARTYPE_FLOAT, "Tried to access fl() of AVARTYPE %i!", m_eVarType);
return m_fValue;
}
// gets the current color value (real time)
const CColor& col() const {
- ASSERT(m_eVarType == AVARTYPE_COLOR);
+ RASSERT(m_eVarType == AVARTYPE_COLOR, "Tried to access col() of AVARTYPE %i!", m_eVarType);
return m_cValue;
}
// gets the goal vector value
const Vector2D& goalv() const {
- ASSERT(m_eVarType == AVARTYPE_VECTOR);
+ RASSERT(m_eVarType == AVARTYPE_VECTOR, "Tried to access goalv() of AVARTYPE %i!", m_eVarType);
return m_vGoal;
}
// gets the goal float value
const float& goalf() const {
- ASSERT(m_eVarType == AVARTYPE_FLOAT);
+ RASSERT(m_eVarType == AVARTYPE_FLOAT, "Tried to access goalf() of AVARTYPE %i!", m_eVarType);
return m_fGoal;
}
// gets the goal color value
const CColor& goalc() const {
- ASSERT(m_eVarType == AVARTYPE_COLOR);
+ RASSERT(m_eVarType == AVARTYPE_COLOR, "Tried to access goalc() of AVARTYPE %i!", m_eVarType);
return m_cGoal;
}
void operator=(const Vector2D& v) {
- ASSERT(m_eVarType == AVARTYPE_VECTOR);
+ RASSERT(m_eVarType == AVARTYPE_VECTOR, "Tried to access =v of AVARTYPE %i!", m_eVarType);
m_vGoal = v;
animationBegin = std::chrono::system_clock::now();
m_vBegun = m_vValue;
}
void operator=(const float& v) {
- ASSERT(m_eVarType == AVARTYPE_FLOAT);
+ RASSERT(m_eVarType == AVARTYPE_FLOAT, "Tried to access =f of AVARTYPE %i!", m_eVarType);
m_fGoal = v;
animationBegin = std::chrono::system_clock::now();
m_fBegun = m_fValue;
}
void operator=(const CColor& v) {
- ASSERT(m_eVarType == AVARTYPE_COLOR);
+ RASSERT(m_eVarType == AVARTYPE_COLOR, "Tried to access =c of AVARTYPE %i!", m_eVarType);
m_cGoal = v;
animationBegin = std::chrono::system_clock::now();
m_cBegun = m_cValue;
@@ -80,7 +80,7 @@ public:
// Sets the actual stored value, without affecting the goal, but resets the timer
void setValue(const Vector2D& v) {
- ASSERT(m_eVarType == AVARTYPE_VECTOR);
+ RASSERT(m_eVarType == AVARTYPE_VECTOR, "Tried to access setValue(v) of AVARTYPE %i!", m_eVarType);
m_vValue = v;
animationBegin = std::chrono::system_clock::now();
m_vBegun = m_vValue;
@@ -88,7 +88,7 @@ public:
// Sets the actual stored value, without affecting the goal, but resets the timer
void setValue(const float& v) {
- ASSERT(m_eVarType == AVARTYPE_FLOAT);
+ RASSERT(m_eVarType == AVARTYPE_FLOAT, "Tried to access setValue(f) of AVARTYPE %i!", m_eVarType);
m_fValue = v;
animationBegin = std::chrono::system_clock::now();
m_vBegun = m_vValue;
@@ -96,7 +96,7 @@ public:
// Sets the actual stored value, without affecting the goal, but resets the timer
void setValue(const CColor& v) {
- ASSERT(m_eVarType == AVARTYPE_COLOR);
+ RASSERT(m_eVarType == AVARTYPE_COLOR, "Tried to access setValue(c) of AVARTYPE %i!", m_eVarType);
m_cValue = v;
animationBegin = std::chrono::system_clock::now();
m_vBegun = m_vValue;
@@ -104,21 +104,21 @@ public:
// Sets the actual value and goal
void setValueAndWarp(const Vector2D& v) {
- ASSERT(m_eVarType == AVARTYPE_VECTOR);
+ RASSERT(m_eVarType == AVARTYPE_VECTOR, "Tried to access setValueAndWarp(v) of AVARTYPE %i!", m_eVarType);
m_vGoal = v;
warp();
}
// Sets the actual value and goal
void setValueAndWarp(const float& v) {
- ASSERT(m_eVarType == AVARTYPE_FLOAT);
+ RASSERT(m_eVarType == AVARTYPE_FLOAT, "Tried to access setValueAndWarp(f) of AVARTYPE %i!", m_eVarType);
m_fGoal = v;
warp();
}
// Sets the actual value and goal
void setValueAndWarp(const CColor& v) {
- ASSERT(m_eVarType == AVARTYPE_COLOR);
+ RASSERT(m_eVarType == AVARTYPE_COLOR, "Tried to access setValueAndWarp(c) of AVARTYPE %i!", m_eVarType);
m_cGoal = v;
warp();
}