7cc5c4f330d47060/geode
1
0
Fork 0
mirror of https://github.com/geode-sdk/geode.git synced 2024-11-27 01:45:35 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

change ccdictionaryext api sorry

Browse source
This commit is contained in:
matcool 2024-01-09 02:13:44 -03:00
parent 198948319b
commit e1b7b1f4be
2 changed files with 46 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
loader/include/Geode/cocos/cocoa/CCDictionary.h vendored
View file

@ -417,7 +417,6 @@ public:
* @note For internal usage, we need to declare this member variable as public since it's used in UT_HASH. * @note For internal usage, we need to declare this member variable as public since it's used in UT_HASH.
*/ */
CCDictElement* m_pElements; CCDictElement* m_pElements;
private:
/** The support type of dictionary, it's confirmed when setObject is invoked. */ /** The support type of dictionary, it's confirmed when setObject is invoked. */
enum CCDictType enum CCDictType

77
loader/include/Geode/utils/cocos.hpp
View file

@ -903,11 +903,27 @@ namespace geode::cocos {
} }
}; };
template <typename _Type> /**
* A templated wrapper over CCArray, providing easy iteration and indexing.
* This will keep ownership of the given CCArray*.
*
* @tparam Type Pointer to a type that inherits CCObject.
*
* @example
* CCArrayExt<GameObject*> objects = PlayLayer::get()->m_objects;
* // Easy indexing, giving you the type you assigned
* GameObject* myObj = objects[2];
*
* // Easy iteration using c++ range-based for loops
* for (auto* obj : objects) {
* log::info("{}", obj->m_objectID);
* }
*/
template <typename Type>
class CCArrayExt { class CCArrayExt {
protected: protected:
Ref<cocos2d::CCArray> m_arr; Ref<cocos2d::CCArray> m_arr;
using T = std::remove_pointer_t<_Type>; using T = std::remove_pointer_t<Type>;
public: public:
using value_type = T; using value_type = T;
@ -980,7 +996,7 @@ namespace geode::cocos {
cocos2d::CCDictElement* m_ptr; cocos2d::CCDictElement* m_ptr;
std::pair<K, T> operator*() { std::pair<K, T> operator*() {
if constexpr (std::is_same<K, std::string>::value) { if constexpr (std::is_same_v<K, std::string> || std::is_same_v<K, gd::string>) {
return {m_ptr->getStrKey(), static_cast<T>(m_ptr->getObject())}; return {m_ptr->getStrKey(), static_cast<T>(m_ptr->getObject())};
} }
else { else {
@ -1027,42 +1043,41 @@ namespace geode::cocos {
} }
}; };
template <typename K, typename T> /**
* A templated wrapper over CCDictionary, providing easy iteration and indexing.
* This will keep ownership of the given CCDictionary*.
*
* @tparam Key Type of the key. MUST only be int or gd::string or std::string.
* @tparam ValuePtr Pointer to a type that inherits CCObject.
*
* @example
* CCDictionaryExt<std::string, GJGameLevel*> levels = getSomeDict();
* // Easy indexing, giving you the type you assigned
* GJGameLevel* myLvl = levels["Cube Adventures"];
*
* // Easy iteration using c++ range-based for loops
* for (auto [name, level] : levels) {
* log::info("{}: {}", name, level->m_levelID);
* }
*/
template <typename Key, typename ValuePtr>
struct CCDictionaryExt { struct CCDictionaryExt {
protected: protected:
cocos2d::CCDictionary* m_dict; Ref<cocos2d::CCDictionary> m_dict;
public: public:
CCDictionaryExt() : m_dict(cocos2d::CCDictionary::create()) { CCDictionaryExt() : m_dict(cocos2d::CCDictionary::create()) {}
m_dict->retain();
}
CCDictionaryExt(cocos2d::CCDictionary* dict) : m_dict(dict) { CCDictionaryExt(cocos2d::CCDictionary* dict) : m_dict(dict) {}
m_dict->retain();
}
CCDictionaryExt(CCDictionaryExt const& d) : m_dict(d.m_dict) { CCDictionaryExt(CCDictionaryExt const& d) : m_dict(d.m_dict) {}
m_dict->retain();
}
CCDictionaryExt(CCDictionaryExt&& d) : m_dict(d.m_dict) { CCDictionaryExt(CCDictionaryExt&& d) : m_dict(d.m_dict) {
d.m_dict = nullptr; d.m_dict = nullptr;
} }
~CCDictionaryExt() {
if (m_dict) m_dict->release();
}
CCDictionaryExt& operator=(cocos2d::CCDictionary* d) {
m_dict->release();
m_dict = d;
m_dict->retain();
return *this;
}
auto begin() { auto begin() {
return CCDictIterator<K, T*>(m_dict->m_pElements); return CCDictIterator<Key, ValuePtr>(m_dict->m_pElements);
} }
// do not use this // do not use this
@ -1074,11 +1089,11 @@ namespace geode::cocos {
return m_dict->count(); return m_dict->count();
} }
auto operator[](K key) { auto operator[](const Key& key) {
auto ret = static_cast<T*>(m_dict->objectForKey(key)); auto ret = static_cast<ValuePtr>(m_dict->objectForKey(key));
if (!ret) m_dict->setObject(cocos2d::CCNode::create(), key); if (!ret) m_dict->setObject(cocos2d::CCObject::create(), key);
return CCDictEntry<K, T*>(key, m_dict); return CCDictEntry<Key, ValuePtr>(key, m_dict);
} }
size_t count(K key) { size_t count(K key) {