diff options
Diffstat (limited to 'core/packed_data_container.cpp')
| -rw-r--r-- | core/packed_data_container.cpp | 62 |
1 files changed, 31 insertions, 31 deletions
diff --git a/core/packed_data_container.cpp b/core/packed_data_container.cpp index 91f886ff4..5f3b87782 100644 --- a/core/packed_data_container.cpp +++ b/core/packed_data_container.cpp @@ -5,7 +5,7 @@ /* GODOT ENGINE */ /* http://www.godotengine.org */ /*************************************************************************/ -/* Copyright (c) 2007-2016 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur. */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ @@ -82,7 +82,7 @@ Variant PackedDataContainer::_iter_get_ofs(const Variant& p_iter,uint32_t p_offs if (pos<0 || pos>=size) return Variant(); - DVector<uint8_t>::Read rd=data.read(); + PoolVector<uint8_t>::Read rd=data.read(); const uint8_t *r=&rd[p_offset]; uint32_t type = decode_uint32(r); @@ -131,7 +131,7 @@ Variant PackedDataContainer::_get_at_ofs(uint32_t p_ofs,const uint8_t *p_buf,boo uint32_t PackedDataContainer::_type_at_ofs(uint32_t p_ofs) const { - DVector<uint8_t>::Read rd=data.read(); + PoolVector<uint8_t>::Read rd=data.read(); const uint8_t *r=&rd[p_ofs]; uint32_t type = decode_uint32(r); @@ -140,7 +140,7 @@ uint32_t PackedDataContainer::_type_at_ofs(uint32_t p_ofs) const { int PackedDataContainer::_size(uint32_t p_ofs) const { - DVector<uint8_t>::Read rd=data.read(); + PoolVector<uint8_t>::Read rd=data.read(); const uint8_t *r=&rd[p_ofs]; uint32_t type = decode_uint32(r); @@ -160,7 +160,7 @@ int PackedDataContainer::_size(uint32_t p_ofs) const { Variant PackedDataContainer::_key_at_ofs(uint32_t p_ofs,const Variant& p_key,bool &err) const { - DVector<uint8_t>::Read rd=data.read(); + PoolVector<uint8_t>::Read rd=data.read(); const uint8_t *r=&rd[p_ofs]; uint32_t type = decode_uint32(r); @@ -239,21 +239,21 @@ uint32_t PackedDataContainer::_pack(const Variant& p_data, Vector<uint8_t>& tmpd case Variant::VECTOR2: case Variant::RECT2: case Variant::VECTOR3: - case Variant::MATRIX32: + case Variant::TRANSFORM2D: case Variant::PLANE: case Variant::QUAT: - case Variant::_AABB: - case Variant::MATRIX3: + case Variant::RECT3: + case Variant::BASIS: case Variant::TRANSFORM: case Variant::IMAGE: case Variant::INPUT_EVENT: - case Variant::RAW_ARRAY: - case Variant::INT_ARRAY: - case Variant::REAL_ARRAY: - case Variant::STRING_ARRAY: - case Variant::VECTOR2_ARRAY: - case Variant::VECTOR3_ARRAY: - case Variant::COLOR_ARRAY: + case Variant::POOL_BYTE_ARRAY: + case Variant::POOL_INT_ARRAY: + case Variant::POOL_REAL_ARRAY: + case Variant::POOL_STRING_ARRAY: + case Variant::POOL_VECTOR2_ARRAY: + case Variant::POOL_VECTOR3_ARRAY: + case Variant::POOL_COLOR_ARRAY: case Variant::NODE_PATH: { uint32_t pos = tmpdata.size(); @@ -344,21 +344,21 @@ Error PackedDataContainer::pack(const Variant& p_data) { _pack(p_data,tmpdata,string_cache); datalen=tmpdata.size(); data.resize(tmpdata.size()); - DVector<uint8_t>::Write w = data.write(); + PoolVector<uint8_t>::Write w = data.write(); copymem(w.ptr(),tmpdata.ptr(),tmpdata.size()); return OK; } -void PackedDataContainer::_set_data(const DVector<uint8_t>& p_data) { +void PackedDataContainer::_set_data(const PoolVector<uint8_t>& p_data) { data=p_data; datalen=data.size(); } -DVector<uint8_t> PackedDataContainer::_get_data() const { +PoolVector<uint8_t> PackedDataContainer::_get_data() const { return data; } @@ -382,15 +382,15 @@ Variant PackedDataContainer::_iter_get(const Variant& p_iter){ void PackedDataContainer::_bind_methods() { - ObjectTypeDB::bind_method(_MD("_set_data"),&PackedDataContainer::_set_data); - ObjectTypeDB::bind_method(_MD("_get_data"),&PackedDataContainer::_get_data); - ObjectTypeDB::bind_method(_MD("_iter_init"),&PackedDataContainer::_iter_init); - ObjectTypeDB::bind_method(_MD("_iter_get"),&PackedDataContainer::_iter_get); - ObjectTypeDB::bind_method(_MD("_iter_next"),&PackedDataContainer::_iter_next); - ObjectTypeDB::bind_method(_MD("pack:Error","value"),&PackedDataContainer::pack); - ObjectTypeDB::bind_method(_MD("size"),&PackedDataContainer::size); + ClassDB::bind_method(_MD("_set_data"),&PackedDataContainer::_set_data); + ClassDB::bind_method(_MD("_get_data"),&PackedDataContainer::_get_data); + ClassDB::bind_method(_MD("_iter_init"),&PackedDataContainer::_iter_init); + ClassDB::bind_method(_MD("_iter_get"),&PackedDataContainer::_iter_get); + ClassDB::bind_method(_MD("_iter_next"),&PackedDataContainer::_iter_next); + ClassDB::bind_method(_MD("pack:Error","value"),&PackedDataContainer::pack); + ClassDB::bind_method(_MD("size"),&PackedDataContainer::size); - ADD_PROPERTY( PropertyInfo(Variant::RAW_ARRAY,"__data__"),_SCS("_set_data"),_SCS("_get_data")); + ADD_PROPERTY( PropertyInfo(Variant::POOL_BYTE_ARRAY,"__data__"),_SCS("_set_data"),_SCS("_get_data")); } @@ -426,11 +426,11 @@ bool PackedDataContainerRef::_is_dictionary() const { void PackedDataContainerRef::_bind_methods() { - ObjectTypeDB::bind_method(_MD("size"),&PackedDataContainerRef::size); - ObjectTypeDB::bind_method(_MD("_iter_init"),&PackedDataContainerRef::_iter_init); - ObjectTypeDB::bind_method(_MD("_iter_get"),&PackedDataContainerRef::_iter_get); - ObjectTypeDB::bind_method(_MD("_iter_next"),&PackedDataContainerRef::_iter_next); - ObjectTypeDB::bind_method(_MD("_is_dictionary"),&PackedDataContainerRef::_is_dictionary); + ClassDB::bind_method(_MD("size"),&PackedDataContainerRef::size); + ClassDB::bind_method(_MD("_iter_init"),&PackedDataContainerRef::_iter_init); + ClassDB::bind_method(_MD("_iter_get"),&PackedDataContainerRef::_iter_get); + ClassDB::bind_method(_MD("_iter_next"),&PackedDataContainerRef::_iter_next); + ClassDB::bind_method(_MD("_is_dictionary"),&PackedDataContainerRef::_is_dictionary); } |