port to 2.208, fix memleaks, reduce copies

Author: prevter

.gitmodules

@@ -1,3 +0,0 @@
-[submodule "ext/cereal"]
-	path = ext/cereal
-	url = https://github.com/USCiLab/cereal

CMakeLists.txt

@@ -28,7 +28,7 @@ endif()
 
 if (CMAKE_SYSTEM_NAME STREQUAL "Windows")
     add_compile_definitions(WIN32_LEAN_AND_MEAN=1)
-    target_link_libraries(${PROJECT_NAME} Crypt32)
+    target_link_libraries(${PROJECT_NAME} crypt32)
 endif()
 
 set(USE_ZLIB OFF)
@@ -45,12 +45,12 @@ set(MBEDTLS_AS_SUBPROJECT OFF)
 set(DISABLE_PACKAGE_CONFIG_AND_INSTALL OFF)
 set(MBEDTLS_FATAL_WARNINGS OFF)
 
-CPMAddPackage("gh:TechStudent10/mbedtls#fc79213")
-
+CPMAddPackage("gh:TechStudent10/mbedtls#4d80dd5")
 set(MBEDTLS_INCLUDE_DIRS "${mbedtls_SOURCE_DIR}/include")
 set(MBEDTLS_LIBRARY "mbedtls")
 set(MBEDX509_LIBRARY "mbedx509")
 set(MBEDCRYPTO_LIBRARY "mbedcrypto")
+set(MBEDTLS_LIBRARIES ${MBEDTLS_LIBRARY} ${MBEDX509_LIBRARY} ${MBEDCRYPTO_LIBRARY})
 
 CPMAddPackage("gh:machinezone/IXWebSocket#dc8807e")
 install(TARGETS mbedtls mbedx509 mbedcrypto EXPORT mbedtls-targets)
@@ -65,7 +65,15 @@ endif()
 target_compile_definitions(${PROJECT_NAME} PRIVATE CR_EXPORTING)
 
 target_include_directories(${PROJECT_NAME} PRIVATE ${ixwebsocket_SOURCE_DIR})
-target_include_directories(${PROJECT_NAME} PRIVATE "${CMAKE_SOURCE_DIR}/ext/cereal/include")
+
+CPMAddPackage(
+    NAME cereal
+    GITHUB_REPOSITORY USCiLab/cereal
+    GIT_TAG 22a1b36
+    DOWNLOAD_ONLY ON
+)
+
+target_include_directories(${PROJECT_NAME} PRIVATE "${cereal_SOURCE_DIR}/include")
 
 target_link_libraries(${PROJECT_NAME} ixwebsocket)
 

ext/cereal

@@ -1,10 +1,10 @@
 {
-	"geode": "4.1.2",
+	"geode": "5.3.0",
 	"gd": {
-		"win": "2.2074",
-		"android": "2.2074",
-		"mac": "2.2074",
-		"ios": "2.2074"
+		"win": "2.2081",
+		"android": "2.2081",
+		"mac": "2.2081",
+		"ios": "2.2081"
 	},
 	"id": "techstudent10.creation_rotation",
 	"name": "Creation Rotation",
@@ -19,18 +19,10 @@
 			"resources/certs/*.pem"
 		]
 	},
-	"dependencies": [
-		{
-			"id": "cvolton.level-id-api",
-			"version": ">=v1.1.0",
-			"importance": "required"
-		},
-		{
-            "id": "geode.node-ids",
-            "version": ">=v1.17.0",
-            "importance": "required"
-        }
-	],
+	"dependencies": {
+		"cvolton.level-id-api": ">=v2.0.0",
+		"geode.node-ids": ">=v1.23.0"
+	},
 	"settings": {
 		"server-url": {
 			"name": "Server URL",

mod.json

@@ -5,15 +5,19 @@
 
 AdminPanel* AdminPanel::create() {
     auto ret = new AdminPanel;
-    if (ret->initAnchored(220.f, 265.f)) {
+    if (ret->init()) {
         ret->autorelease();
         return ret;
     }
     delete ret;
     return nullptr;
 }
 
-bool AdminPanel::setup() {
+bool AdminPanel::init() {
+    if (!Popup::init(220.f, 265.f)) {
+        return false;
+    }
+
     this->setTitle("Administrator Panel");
 
     auto usernameInput = TextInput::create(100.f, "Username");

src/admin/layers/AdminPanel.cpp

@@ -3,9 +3,9 @@
 
 using namespace geode::prelude;
 
-class AdminPanel : public geode::Popup<> {
+class AdminPanel : public geode::Popup {
 protected:
-    bool setup() override;
+    bool init() override;
 public:
     static AdminPanel* create();
 };

src/admin/layers/AdminPanel.hpp

@@ -9,15 +9,19 @@
 
 AuthPopup* AuthPopup::create() {
     auto ret = new AuthPopup;
-    if (ret->initAnchored(140.f, 140.f)) {
+    if (ret->init()) {
         ret->autorelease();
         return ret;
     }
     delete ret;
     return nullptr;
 }
 
-bool AuthPopup::setup() {
+bool AuthPopup::init() {
+    if (!Popup::init(140.f, 140.f)) {
+        return false;
+    }
+
     m_noElasticity = true;
     this->setTitle("Admin Authorization");
 
@@ -41,7 +45,7 @@ bool AuthPopup::setup() {
         }
     );
 
-    nm.on<AuthorizedUserPacket>([this](AuthorizedUserPacket*) {
+    nm.on<AuthorizedUserPacket>([this](AuthorizedUserPacket) {
         AdminPanel::create()->show();
     });
 

src/admin/layers/AuthPopup.cpp

@@ -3,9 +3,9 @@
 
 using namespace geode::prelude;
 
-class AuthPopup : public geode::Popup<> {
+class AuthPopup : public geode::Popup {
 protected:
-    bool setup() override;
+    bool init() override;
 public:
     static AuthPopup* create();
 };

src/admin/layers/AuthPopup.hpp

@@ -4,7 +4,7 @@
 
 ChatPanel* ChatPanel::create() {
     auto ret = new ChatPanel;
-    if (ret->initAnchored(350.f, 280.f)) {
+    if (ret->init()) {
         ret->autorelease();
         return ret;
     }
@@ -14,18 +14,22 @@ ChatPanel* ChatPanel::create() {
 
 void ChatPanel::initialize() {
     // initialize the listeners n' stuff if they havent already
-    if (!ChatPanel::hasInitialized) {
+    if (!hasInitialized) {
         auto& nm = NetworkManager::get();
-        nm.on<MessageSentPacket>([](MessageSentPacket* packet) {
-            ChatPanel::messages.push_back(packet->message);
-            ChatPanel::messagesQueue.push_back(packet->message);
+        nm.on<MessageSentPacket>([](MessageSentPacket packet) {
+            messages.push_back(packet.message);
+            messagesQueue.push_back(std::move(packet.message));
         });
 
-        ChatPanel::hasInitialized = true;
+        hasInitialized = true;
     }
 }
 
-bool ChatPanel::setup() {
+bool ChatPanel::init() {
+    if (!Popup::init(350.f, 280.f)) {
+        return false;
+    }
+
     this->setTitle("Chat");
 
     ChatPanel::initialize();
@@ -93,7 +97,7 @@ bool ChatPanel::setup() {
     return true;
 }
 
-void ChatPanel::renderMessage(Message message) {
+void ChatPanel::renderMessage(Message const& message) {
     auto msgNode = CCNode::create();
     auto msgText = TextArea::create(
         fmt::format("<cy>{}</c>: {}", message.author.name, message.message),
@@ -117,18 +121,18 @@ void ChatPanel::renderMessage(Message message) {
 }
 
 void ChatPanel::updateMessages(float dt) {
-    for (auto message : ChatPanel::messagesQueue) {
+    for (auto const& message : messagesQueue) {
         renderMessage(message);
     }
-    ChatPanel::messagesQueue.clear();
+    messagesQueue.clear();
 }
 
 void ChatPanel::clearMessages() {
-    ChatPanel::messages.clear();
+    messages.clear();
 
     auto& nm = NetworkManager::get();
     nm.unbind<MessageSentPacket>();
-    ChatPanel::hasInitialized = false;
+    hasInitialized = false;
 }
 
 void ChatPanel::sendMessage() {
@@ -142,11 +146,11 @@ void ChatPanel::sendMessage() {
     messageInput->setString("");
 }
 
-void ChatPanel::keyDown(cocos2d::enumKeyCodes keycode) {
+void ChatPanel::keyDown(cocos2d::enumKeyCodes keycode, double timestamp) {
     if (keycode == cocos2d::KEY_Enter && CCIMEDispatcher::sharedDispatcher()->hasDelegate()) {
         log::debug("sending via keybind");
         sendMessage();
     } else {
-        geode::Popup<>::keyDown(keycode);
+        Popup::keyDown(keycode, timestamp);
     }
 }

src/layers/ChatPanel.cpp

@@ -4,7 +4,7 @@
 
 using namespace geode::prelude;
 
-class ChatPanel : public geode::Popup<> {
+class ChatPanel : public geode::Popup {
 protected:
     float m_width;
     float m_height;
@@ -13,16 +13,16 @@ class ChatPanel : public geode::Popup<> {
     inline static std::vector<Message> messages = {};
     inline static std::vector<Message> messagesQueue = {};
 
-    ScrollLayer* scrollLayer;
-    TextInput* messageInput;
+    ScrollLayer* scrollLayer = nullptr;
+    TextInput* messageInput = nullptr;
 
-    bool setup() override;
+    bool init() override;
 
     void sendMessage();
-    void renderMessage(Message message);
+    void renderMessage(Message const& message);
     void updateMessages(float dt);
 
-    void keyDown(cocos2d::enumKeyCodes) override;
+    void keyDown(cocos2d::enumKeyCodes, double) override;
 public:
     static ChatPanel* create();