mirror of
https://github.com/Relintai/pmlpp.git
synced 2025-03-14 22:58:50 +01:00
Swapped the x, y arguments of the getters/setters in MLPPMatrix. This is how all the code expects them already.
This commit is contained in:
parent
0fe6f73fb8
commit
d33ceabe47
@ -160,7 +160,7 @@ public:
|
|||||||
CRASH_COND_MSG(!_data, "Out of memory");
|
CRASH_COND_MSG(!_data, "Out of memory");
|
||||||
}
|
}
|
||||||
|
|
||||||
_FORCE_INLINE_ int calculate_index(int p_index_x, int p_index_y) const {
|
_FORCE_INLINE_ int calculate_index(int p_index_y, int p_index_x) const {
|
||||||
return p_index_y * _size.y + p_index_x;
|
return p_index_y * _size.y + p_index_x;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -173,34 +173,34 @@ public:
|
|||||||
return _data[p_index];
|
return _data[p_index];
|
||||||
}
|
}
|
||||||
|
|
||||||
_FORCE_INLINE_ real_t get_element(int p_index_x, int p_index_y) const {
|
_FORCE_INLINE_ real_t get_element(int p_index_y, int p_index_x) const {
|
||||||
ERR_FAIL_INDEX_V(p_index_x, _size.x, 0);
|
ERR_FAIL_INDEX_V(p_index_x, _size.x, 0);
|
||||||
ERR_FAIL_INDEX_V(p_index_y, _size.y, 0);
|
ERR_FAIL_INDEX_V(p_index_y, _size.y, 0);
|
||||||
|
|
||||||
return _data[p_index_y * _size.y + p_index_x];
|
return _data[p_index_y * _size.y + p_index_x];
|
||||||
}
|
}
|
||||||
_FORCE_INLINE_ real_t get_element(int p_index_x, int p_index_y) {
|
_FORCE_INLINE_ real_t get_element(int p_index_y, int p_index_x) {
|
||||||
ERR_FAIL_INDEX_V(p_index_x, _size.x, 0);
|
ERR_FAIL_INDEX_V(p_index_x, _size.x, 0);
|
||||||
ERR_FAIL_INDEX_V(p_index_y, _size.y, 0);
|
ERR_FAIL_INDEX_V(p_index_y, _size.y, 0);
|
||||||
|
|
||||||
return _data[p_index_y * _size.y + p_index_x];
|
return _data[p_index_y * _size.y + p_index_x];
|
||||||
}
|
}
|
||||||
|
|
||||||
_FORCE_INLINE_ real_t get_element_bind(int p_index_x, int p_index_y) const {
|
_FORCE_INLINE_ real_t get_element_bind(int p_index_y, int p_index_x) const {
|
||||||
ERR_FAIL_INDEX_V(p_index_x, _size.x, 0);
|
ERR_FAIL_INDEX_V(p_index_x, _size.x, 0);
|
||||||
ERR_FAIL_INDEX_V(p_index_y, _size.y, 0);
|
ERR_FAIL_INDEX_V(p_index_y, _size.y, 0);
|
||||||
|
|
||||||
return static_cast<real_t>(_data[p_index_y * _size.y + p_index_x]);
|
return static_cast<real_t>(_data[p_index_y * _size.y + p_index_x]);
|
||||||
}
|
}
|
||||||
|
|
||||||
_FORCE_INLINE_ void set_element(int p_index_x, int p_index_y, real_t p_val) {
|
_FORCE_INLINE_ void set_element(int p_index_y, int p_index_x, real_t p_val) {
|
||||||
ERR_FAIL_INDEX(p_index_x, _size.x);
|
ERR_FAIL_INDEX(p_index_x, _size.x);
|
||||||
ERR_FAIL_INDEX(p_index_y, _size.y);
|
ERR_FAIL_INDEX(p_index_y, _size.y);
|
||||||
|
|
||||||
_data[p_index_y * _size.y + p_index_x] = p_val;
|
_data[p_index_y * _size.y + p_index_x] = p_val;
|
||||||
}
|
}
|
||||||
|
|
||||||
_FORCE_INLINE_ void set_element_bind(int p_index_x, int p_index_y, real_t p_val) {
|
_FORCE_INLINE_ void set_element_bind(int p_index_y, int p_index_x, real_t p_val) {
|
||||||
ERR_FAIL_INDEX(p_index_x, _size.x);
|
ERR_FAIL_INDEX(p_index_x, _size.x);
|
||||||
ERR_FAIL_INDEX(p_index_y, _size.y);
|
ERR_FAIL_INDEX(p_index_y, _size.y);
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user