godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #20573 from hpvb/fix-nested-vector-cow 

Fix nested Vectors
This commit is contained in:
Hein-Pieter van Braam 2018-08-05 22:31:51 +02:00 committed by GitHub
parent d5d83b754d 2d98b40d47
commit b5a20d21f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/cowdata.h
View File

@ -100,6 +100,7 @@ private:
} }
void _unref(void *p_data); void _unref(void *p_data);
void _ref(const CowData *p_from);
void _ref(const CowData &p_from); void _ref(const CowData &p_from);
void _copy_on_write(); void _copy_on_write();
@ -300,6 +301,11 @@ Error CowData<T>::resize(int p_size) {
return OK; return OK;
} }
template <class T>
void CowData<T>::_ref(const CowData *p_from) {
_ref(*p_from);
}
template <class T> template <class T>
void CowData<T>::_ref(const CowData &p_from) { void CowData<T>::_ref(const CowData &p_from) {

49
core/vector.h
View File

@ -44,17 +44,16 @@
template <class T> template <class T>
class VectorWriteProxy { class VectorWriteProxy {
friend class Vector<T>; friend class Vector<T>;
Vector<T> &_parent; CowData<T> *_parent;
_FORCE_INLINE_ VectorWriteProxy(Vector<T> &parent) : _FORCE_INLINE_ VectorWriteProxy(CowData<T> *parent) :
_parent(parent){}; _parent(parent){};
VectorWriteProxy(const VectorWriteProxy<T> &p_other);
public: public:
_FORCE_INLINE_ T &operator[](int p_index) { _FORCE_INLINE_ T &operator[](int p_index) {
CRASH_BAD_INDEX(p_index, _parent.size()); CRASH_BAD_INDEX(p_index, _parent->size());
return _parent.ptrw()[p_index]; return _parent->ptrw()[p_index];
} }
}; };
@ -62,39 +61,39 @@ template <class T>
class Vector { class Vector {
friend class VectorWriteProxy<T>; friend class VectorWriteProxy<T>;
CowData<T> _cowdata; CowData<T> *_cowdata;
public: public:
VectorWriteProxy<T> write; VectorWriteProxy<T> write;
bool push_back(const T &p_elem); bool push_back(const T &p_elem);
void remove(int p_index) { _cowdata.remove(p_index); } void remove(int p_index) { _cowdata->remove(p_index); }
void erase(const T &p_val) { void erase(const T &p_val) {
int idx = find(p_val); int idx = find(p_val);
if (idx >= 0) remove(idx); if (idx >= 0) remove(idx);
}; };
void invert(); void invert();
_FORCE_INLINE_ T *ptrw() { return _cowdata.ptrw(); } _FORCE_INLINE_ T *ptrw() { return _cowdata->ptrw(); }
_FORCE_INLINE_ const T *ptr() const { return _cowdata.ptr(); } _FORCE_INLINE_ const T *ptr() const { return _cowdata->ptr(); }
_FORCE_INLINE_ void clear() { resize(0); } _FORCE_INLINE_ void clear() { resize(0); }
_FORCE_INLINE_ bool empty() const { return _cowdata.empty(); } _FORCE_INLINE_ bool empty() const { return _cowdata->empty(); }
_FORCE_INLINE_ T get(int p_index) { return _cowdata.get(p_index); } _FORCE_INLINE_ T get(int p_index) { return _cowdata->get(p_index); }
_FORCE_INLINE_ const T get(int p_index) const { return _cowdata.get(p_index); } _FORCE_INLINE_ const T get(int p_index) const { return _cowdata->get(p_index); }
_FORCE_INLINE_ void set(int p_index, const T &p_elem) { _cowdata.set(p_index, p_elem); } _FORCE_INLINE_ void set(int p_index, const T &p_elem) { _cowdata->set(p_index, p_elem); }
_FORCE_INLINE_ int size() const { return _cowdata.size(); } _FORCE_INLINE_ int size() const { return _cowdata->size(); }
Error resize(int p_size) { return _cowdata.resize(p_size); } Error resize(int p_size) { return _cowdata->resize(p_size); }
_FORCE_INLINE_ const T &operator[](int p_index) const { return _cowdata.get(p_index); } _FORCE_INLINE_ const T &operator[](int p_index) const { return _cowdata->get(p_index); }
Error insert(int p_pos, const T &p_val) { return _cowdata.insert(p_pos, p_val); } Error insert(int p_pos, const T &p_val) { return _cowdata->insert(p_pos, p_val); }
void append_array(const Vector<T> &p_other); void append_array(const Vector<T> &p_other);
template <class C> template <class C>
void sort_custom() { void sort_custom() {
int len = _cowdata.size(); int len = _cowdata->size();
if (len == 0) if (len == 0)
return; return;
@ -110,7 +109,7 @@ public:
void ordered_insert(const T &p_val) { void ordered_insert(const T &p_val) {
int i; int i;
for (i = 0; i < _cowdata.size(); i++) { for (i = 0; i < _cowdata->size(); i++) {
if (p_val < operator[](i)) { if (p_val < operator[](i)) {
break; break;
@ -136,13 +135,19 @@ public:
} }
_FORCE_INLINE_ Vector() : _FORCE_INLINE_ Vector() :
write(VectorWriteProxy<T>(*this)) {} _cowdata(new CowData<T>()),
write(VectorWriteProxy<T>(_cowdata)) {}
_FORCE_INLINE_ Vector(const Vector &p_from) : _FORCE_INLINE_ Vector(const Vector &p_from) :
write(VectorWriteProxy<T>(*this)) { _cowdata._ref(p_from._cowdata); } _cowdata(new CowData<T>()),
write(VectorWriteProxy<T>(_cowdata)) { _cowdata->_ref(p_from._cowdata); }
inline Vector &operator=(const Vector &p_from) { inline Vector &operator=(const Vector &p_from) {
_cowdata._ref(p_from._cowdata); _cowdata->_ref(p_from._cowdata);
return *this; return *this;
} }
_FORCE_INLINE_ ~Vector() {
delete _cowdata;
}
}; };
template <class T> template <class T>