asdcf

Author: TheSillyDoggo

changelog.md

@@ -1,3 +1,7 @@
+# 1.7.2
+
+- Fixed memory leak while playing a level
+
 # 1.7.1
 
 - Fixed not being able to type decimals in label inputs

mod.json

@@ -1,6 +1,6 @@
 {
 	"geode": "3.8.1",
-	"version": "v1.7.1",
+	"version": "v1.7.2",
 	"gd": {
 		"win": "2.206",
 		"android": "2.206",
@@ -22,7 +22,8 @@
 			"resources/*.png",
 			"resources/*.glsl",
 			"resources/*.hlsl",
-			"resources/*.wav"
+			"resources/*.wav",
+			"resources/*.md"
         ],
 		"sprites": [
 			"resources/sprites/*.png"

resources/label-help.md

@@ -0,0 +1,25 @@
+# Variables
+Variables are special values that you can put in the format of your label.
+These are all the variables provided by QOLMod and what they do:
+
+**isLevel** | If you are in the level (not the editor)
+**isEditor** | If you are playtesting from the editor
+
+**attempt** | Current Attempt
+**fps** | Average Frames Per Second for the last second
+
+**player1_cps** | Clicks Per Second of Player 1
+**player2_cps** | Clicks Per Second of Player 2
+**total_cps** | Both of these numbers added together
+
+**player1_clicks** | Total clicks of Player 1
+**player2_clicks** | Total clicks of Player 2
+**total_clicks** | Both of these numbers added together
+
+**noclip_deaths** | How many times you've died in noclip
+**noclip_accuracy** | How much time you've spent dead with noclip on
+
+## Level Only (Shows as **null** in editor)
+
+**bestRun_from** | The percentage that your best run was from
+**bestRun_to**   | The percentage that your best run was to

src/Labels/LabelNode.cpp

@@ -16,6 +16,8 @@ bool LabelNode::init(LabelModule* mod)
 
 std::string LabelNode::getFormatString()
 {
+    return mod->format;
+
     if (mod->presetType == 1)
         return ".";
 
@@ -48,8 +50,21 @@ void LabelNode::update(float dt)
 
     if (!script)
     {
+        CC_SAFE_DELETE(script);
+
         return this->setString(fmt::format("Error Compiling Script: {}", res.getMessage()).c_str());
     }
+
+    std::chrono::milliseconds duration(static_cast<long long>(ColourUtility::totalSessionTime * 1000));
+
+    auto hours = std::chrono::duration_cast<std::chrono::hours>(duration);
+    duration -= hours;
+    auto minutes = std::chrono::duration_cast<std::chrono::minutes>(duration);
+    duration -= minutes;
+    auto seconds = std::chrono::duration_cast<std::chrono::seconds>(duration);
+
+    std::time_t currentTime = std::time(nullptr);
+    std::tm* localTime = std::localtime(&currentTime);
 
     script->setVariable("attempt", rift::Value::integer(LabelLayer::get()->getAttempts()));
     script->setVariable("fps", rift::Value::floating(LabelLayer::get()->getFPS()));
@@ -62,21 +77,10 @@ void LabelNode::update(float dt)
     script->setVariable("player2_clicks", rift::Value::integer(LabelLayer::get()->getClicks(true)));
     script->setVariable("total_clicks", rift::Value::integer(LabelLayer::get()->getTotalClicks()));
 
-    std::chrono::milliseconds duration(static_cast<long long>(ColourUtility::totalSessionTime * 1000));
-
-    auto hours = std::chrono::duration_cast<std::chrono::hours>(duration);
-    duration -= hours;
-    auto minutes = std::chrono::duration_cast<std::chrono::minutes>(duration);
-    duration -= minutes;
-    auto seconds = std::chrono::duration_cast<std::chrono::seconds>(duration);
-
     script->setVariable("session_seconds", rift::Value::integer(seconds.count()));
     script->setVariable("session_minutes", rift::Value::integer(minutes.count()));
     script->setVariable("session_hours", rift::Value::integer(hours.count()));
 
-    std::time_t currentTime = std::time(nullptr);
-    std::tm* localTime = std::localtime(&currentTime);
-
     script->setVariable("clock_seconds", rift::Value::integer(localTime->tm_sec));
     script->setVariable("clock_minutes", rift::Value::integer(localTime->tm_min));
     script->setVariable("clock_hours", rift::Value::integer(localTime->tm_hour));
@@ -110,6 +114,8 @@ void LabelNode::update(float dt)
         as<CCNode*>(this->getChildren()->objectAtIndex(0))->setScale(2.25f);
         as<CCNode*>(this->getChildren()->objectAtIndex(0))->setAnchorPoint(ccp(0.2f, 0.35f));
     }
+
+    CC_SAFE_DELETE(script);
 }
 
 LabelNode* LabelNode::create(LabelModule* mod)

src/Layers/BetterMDPopup.cpp

@@ -0,0 +1,43 @@
+#include "BetterMDPopup.hpp"
+
+bool BetterMDPopup::init(FLAlertLayerProtocol* delegate, char const* title, gd::string desc, char const* btn1, char const* btn2, float width, bool scroll, float height, float textScale)
+{
+    if (!FLAlertLayer::init(delegate, title, desc, btn1, btn2, width, scroll, height, textScale))
+        return false;
+
+    desc = utils::string::replace(desc, "\n", "\n\n");
+
+    m_scrollingLayer->setVisible(false);
+
+    auto md = MDTextArea::create(desc, ccp(365, 175));
+    md->setPosition(CCDirector::get()->getWinSize() / 2);
+
+    md->setTouchEnabled(true);
+
+    auto content = public_cast(md, m_content);
+
+    for (auto child : CCArrayExt<CCNode*>(content->getChildren()))
+    {
+        //child->setPositionX(child->getPositionX() + content->getContentWidth() / 2);
+    }
+
+    m_mainLayer->addChild(md, 69);
+
+    handleTouchPriority(this);
+
+    return true;
+}
+
+BetterMDPopup* BetterMDPopup::create(FLAlertLayerProtocol* delegate, char const* title, gd::string desc, char const* btn1, char const* btn2, float width, bool scroll, float height, float textScale)
+{
+    auto pRet = new BetterMDPopup();
+
+    if (pRet && pRet->init(delegate, title, desc, btn1, btn2, width, scroll, height, textScale))
+    {
+        pRet->autorelease();
+        return pRet;
+    }
+
+    CC_SAFE_DELETE(pRet);
+    return nullptr;
+}

src/Layers/BetterMDPopup.hpp

@@ -0,0 +1,15 @@
+#pragma once
+
+#include <Geode/Geode.hpp>
+
+#include "SillyBaseLayer.h"
+
+using namespace geode::prelude;
+
+class BetterMDPopup : public FLAlertLayer
+{
+    public:
+        bool init(FLAlertLayerProtocol* delegate, char const* title, gd::string desc, char const* btn1, char const* btn2, float width, bool scroll, float height, float textScale);
+
+        static BetterMDPopup* create(FLAlertLayerProtocol* delegate, char const* title, gd::string desc, char const* btn1, char const* btn2, float width, bool scroll, float height, float textScale);
+};

src/Layers/EditLabelPopup.cpp

@@ -2,6 +2,7 @@
 #include "../Client/AndroidUI.h"
 #include "ChooseFontPopup.hpp"
 #include "../UI/LabelEventCell.hpp"
+#include "BetterMDPopup.hpp"
 
 // static ButtonSprite* create(char const* caption, int width, int p2, float scale, bool absolute, char const* font, char const* bg, float height);
 #define ANCHOR_BTN(__anchor, __text) \
@@ -265,7 +266,8 @@ void EditLabelPopup::customSetup()
     infoMenu = CCMenu::create();
     infoMenu->setPosition(CCPointZero);
 
-    auto formatInfo = InfoAlertButton::create("Format Label Help", "This is the format help", 0.8f);
+    auto formatInfo = CCMenuItemSpriteExtra::create(CCSprite::createWithSpriteFrameName("GJ_infoIcon_001.png"), this, menu_selector(EditLabelPopup::onFormatInfo));
+    formatInfo->getNormalImage()->setScale(0.8f);
     formatInfo->setPosition(size + ccp(-16, -16));
 
     infoMenu->addChild(formatInfo);
@@ -392,6 +394,14 @@ void EditLabelPopup::updateList()
     err->setVisible(scroll->m_contentLayer->getChildrenCount() == 0);
 }
 
+void EditLabelPopup::onFormatInfo(CCObject* sender)
+{
+    auto res = utils::file::readString(Mod::get()->getResourcesDir() / "label-help.md");
+    auto text = res.unwrapOr(fmt::format("Error reading file: {}", res.unwrapErr()));
+
+    BetterMDPopup::create(nullptr, "Label Format Help", text, "OK", nullptr, 420, true, 69, 1.0f)->show();
+}
+
 void EditLabelPopup::onAddEvent(CCObject* sender)
 {
     if (dropdown->getSelectedIndex() == 0)

src/Layers/EditLabelPopup.hpp

@@ -29,6 +29,7 @@ class EditLabelPopup : public SillyBaseLayer
         void onChangeAnchor(CCObject* sender);
         void onClose(CCObject* sender);
         void onAddEvent(CCObject* sender);
+        void onFormatInfo(CCObject* sender);
 
         void updateList();
 

src/main.cpp

@@ -135,16 +135,6 @@ class $modify (MenuLayer)
         if (!MenuLayer::init())
             return false;
 
-        #ifdef __APPLE__
-        #include <OpenGL/gl.h>
-
-        GLint                       sync = 0;
-        CGLContextObj               ctx = CGLGetCurrentContext();
-
-        CGLSetParameter(ctx, kCGLCPSwapInterval, &sync);
-        #endif
-
-
         if (!v)
         {
             if (Client::get()->useImGuiUI())