modernize circle-tool to geode::Popup and such

Author: matcool

circle-tool/CHANGELOG.md

@@ -0,0 +1,7 @@
+## 1.2.3
+- Remake the popup using Geode's classes, preventing a touch handler leak
+  - This fixes an issue with the Better Touch Prio mod
+- Add changelog
+
+## 1.2.2 - 1.0.0
+- Port to newer GD versions

circle-tool/README.md

@@ -6,4 +6,11 @@ The tool can be found in the edit tab of the editor, which will run on the selec
 
 ![screenshot of the mod](mat.circle-tool/screenshot.png)
 
-Credit to [alkatreize](user:5625235) for the button texture!
+Credit to [alkatreize](user:5625235) for the button texture!
+
+## Usage
+
+Select some objects in the editor (ideally 2) and press the button to open the popup. \
+The mod will essentially run a macro that repeatedly copy pastes your object selection and slightly rotates it, following the options specified.
+
+For convenience, the mod selects the newly created objects, and groups them into a single undo-able action.

circle-tool/main.cpp

@@ -6,168 +6,117 @@ using namespace geode;
 using namespace cocos2d;
 using geode::cocos::CCArrayExt;
 
-class CircleToolPopup : public FLAlertLayer, TextInputDelegate, FLAlertLayerProtocol {
+class CircleToolPopup : public geode::Popup {
 public:
 	static float m_angle;
 	static float m_step;
 	static float m_fat;
 	CCLabelBMFont* m_label = nullptr;
 
-	static auto* create() {
-		auto* node = new (std::nothrow) CircleToolPopup();
-		if (node && node->init()) {
+	static CircleToolPopup* create() {
+		auto* node = new CircleToolPopup();
+		if (node->init()) {
 			node->autorelease();
+			return node;
 		} else {
 			delete node;
-			node = nullptr;
+			return nullptr;
 		}
-		return node;
 	}
 
 	bool init() override {
-		if (!this->initWithColor({0, 0, 0, 75})) return false;
+		if (!Popup::init(300, 220)) return false;
 
-		this->m_noElasticity = true;
+		this->setTitle("Circle Tool");
 
-		auto* director = CCDirector::sharedDirector();
-		geode::cocos::handleTouchPriority(this);
-		// director->getTouchDispatcher()->incrementForcePrio(69);
-		this->registerWithTouchDispatcher();
+		auto* layer = m_mainLayer;
+		auto* menu = m_buttonMenu;
 
-		auto layer = CCLayer::create();
-		auto menu = CCMenu::create();
-		this->m_mainLayer = layer;
-		this->m_buttonMenu = menu;
-		
-		layer->addChild(menu);
-		this->addChild(layer);
-
-		const float width = 300, height = 220;
-
-		const CCPoint offset = director->getWinSize() / 2.f;
-		auto bg = extension::CCScale9Sprite::create("GJ_square01.png");
-		bg->setContentSize({width, height});
-		bg->setPosition(offset);
-		menu->setPosition(offset);
-		bg->setZOrder(-2);
-		layer->addChild(bg);
-
-		auto close_btn = CCMenuItemSpriteExtra::create(
-			CCSprite::createWithSpriteFrameName("GJ_closeBtn_001.png"),
-			this, menu_selector(CircleToolPopup::on_close)
-		);
-
-		close_btn->setPosition(ccp(25.f, director->getWinSize().height - 25.f) - offset);
-		menu->addChild(close_btn);
-
-		this->setKeypadEnabled(true);
-
-
-		layer->addChild(
-			NodeFactory<CCLabelBMFont>::start("Circle Tool", "goldFont.fnt")
-			.setPosition(ccp(0, 95) + offset)
-			.setScale(0.75f)
-		);
-
-		layer->addChild(
+		layer->addChildAtPosition(
 			NodeFactory<CCLabelBMFont>::start("Arc", "goldFont.fnt")
-			.setPosition(ccp(-60, 64) + offset)
-			.setScale(0.75f)
+				.setScale(0.75f),
+			Anchor::Center, ccp(-60, 64)
 		);
-		auto angle_input = FloatInputNode::create(CCSize(60, 30), 2.f, "bigFont.fnt");
-		angle_input->set_value(m_angle);
-		angle_input->setPosition(ccp(-60, 38) + offset);
-		angle_input->callback = [&](FloatInputNode& input) {
-			m_angle = input.get_value().value_or(m_angle);
+		auto angle_input = geode::TextInput::create(60.f, "");
+		angle_input->setCommonFilter(CommonFilter::Float);
+		angle_input->setString(fmt::to_string(m_angle));
+		angle_input->setCallback([this](std::string const& str) {
+			m_angle = geode::utils::numFromString<float>(str).unwrapOr(m_angle);
 			this->update_labels();
-		};
-		this->addChild(angle_input);
-		
-		layer->addChild(
+		});
+		layer->addChildAtPosition(angle_input, Anchor::Center, ccp(-60, 38));
+
+		layer->addChildAtPosition(
 			NodeFactory<CCLabelBMFont>::start("Step", "goldFont.fnt")
-			.setPosition(ccp(60, 64) + offset)
-			.setScale(0.75f)
+				.setScale(0.75f),
+			Anchor::Center, ccp(60, 64)
 		);
-		auto step_input = FloatInputNode::create(CCSize(60, 30), 2.f, "bigFont.fnt");
-		step_input->set_value(m_step);
-		step_input->setPosition(ccp(60, 38) + offset);
-		step_input->callback = [&](FloatInputNode& input) {
-			m_step = input.get_value().value_or(m_step);
+		auto step_input = geode::TextInput::create(60.f, "");
+		step_input->setCommonFilter(CommonFilter::Float);
+		step_input->setString(fmt::to_string(m_step));
+		step_input->setCallback([this](std::string const& str) {
+			m_step = geode::utils::numFromString<float>(str).unwrapOr(m_step);
 			if (m_step == 0.f) m_step = 1.f;
 			this->update_labels();
-		};
-		this->addChild(step_input);
+		});
+		layer->addChildAtPosition(step_input, Anchor::Center, ccp(60, 38));
 
-		layer->addChild(
+		layer->addChildAtPosition(
 			NodeFactory<CCLabelBMFont>::start("Squish", "goldFont.fnt")
-			.setPosition(ccp(60, 10) + offset)
-			.setScale(0.75f)
+				.setScale(0.75f),
+			Anchor::Center, ccp(60, 10)
 		);
-		auto fat_input = FloatInputNode::create(CCSize(60, 30), 2.f, "bigFont.fnt");
-		fat_input->set_value(m_fat);
-		fat_input->setPosition(ccp(60, -16) + offset);
-		fat_input->callback = [&](FloatInputNode& input) {
-			m_fat = input.get_value().value_or(m_fat);
+		auto fat_input = geode::TextInput::create(60.f, "");
+		fat_input->setCommonFilter(CommonFilter::Float);
+		fat_input->setString(fmt::to_string(m_fat));
+		fat_input->setCallback([this](std::string const& str) {
+			m_fat = geode::utils::numFromString<float>(str).unwrapOr(m_fat);
 			this->update_labels();
-		};
-		this->addChild(fat_input);
+		});
+		layer->addChildAtPosition(fat_input, Anchor::Center, ccp(60, -16));
 
 		float button_width = 68;
-		menu->addChild(
-			make_factory(CCMenuItemSpriteExtra::create(
+		menu->addChildAtPosition(
+			CCMenuItemSpriteExtra::create(
 				ButtonSprite::create("Apply", button_width, true, "goldFont.fnt", "GJ_button_01.png", 0, 0.75f),
 				this, menu_selector(CircleToolPopup::on_apply)
-			))
-			.setPosition(button_width / 2.f + 20, -85)
+			),
+			Anchor::Center, ccp(button_width / 2.f + 20, -85)
 		);
 
-		menu->addChild(
-			make_factory(CCMenuItemSpriteExtra::create(
+		menu->addChildAtPosition(
+			CCMenuItemSpriteExtra::create(
 				ButtonSprite::create("Cancel", button_width, true, "goldFont.fnt", "GJ_button_01.png", 0, 0.75f),
-				this, menu_selector(CircleToolPopup::on_close)
-			))
-			.setPosition(button_width / -2.f - 20, -85)
+				this, menu_selector(CircleToolPopup::onClose)
+			),
+			Anchor::Center, ccp(button_width / -2.f - 20, -85)
 		);
 
 		m_label = CCLabelBMFont::create("copies: 69\nobjects: 69420", "chatFont.fnt");
 		m_label->setAlignment(kCCTextAlignmentLeft);
-		m_label->setPosition(ccp(-83, -41) + offset);
-		layer->addChild(m_label);
+		layer->addChildAtPosition(m_label, Anchor::Center, ccp(-83, -41));
 		this->update_labels();
 
 		auto info_btn = CCMenuItemSpriteExtra::create(
 			CCSprite::createWithSpriteFrameName("GJ_infoIcon_001.png"), this, menu_selector(CircleToolPopup::on_info)
 		);
-		info_btn->setPosition(ccp(-width / 2, height / 2) + ccp(20, -20));
-		menu->addChild(info_btn);
+		menu->addChildAtPosition(info_btn, Anchor::TopRight, ccp(-19, -19));
 
 		info_btn = CCMenuItemSpriteExtra::create(
 			NodeFactory<CCSprite>::start(CCSprite::createWithSpriteFrameName("GJ_infoIcon_001.png"))
 				.setScale(0.6f),
 			this, menu_selector(CircleToolPopup::on_info2)
 		);
-		info_btn->setPosition(ccp(60, 10) + ccp(42, -1.5));
-		menu->addChild(info_btn);
-
-		this->setTouchEnabled(true);
+		menu->addChildAtPosition(info_btn, Anchor::Center, ccp(60, 10) + ccp(42, -1.5));
 
 		return true;
 	}
 
-	void keyBackClicked() override {
-		this->setTouchEnabled(false);
-		this->removeFromParentAndCleanup(true);
-	}
-
-	void on_close(CCObject*) {
-		this->keyBackClicked();
-	}
-
 	void update_labels() {
 		auto objs = GameManager::sharedState()->getEditorLayer()->m_editorUI->getSelectedObjects();
 		const auto amt = static_cast<size_t>(std::ceilf(m_angle / m_step) - 1.f);
 		const auto obj_count = amt * objs->count();
-		m_label->setString(("Copies: " + std::to_string(amt) + "\nObjects: " + std::to_string(obj_count)).c_str());
+		m_label->setString(fmt::format("Copies: {}\nObjects: {}", amt, obj_count).c_str());
 	}
 
 	void on_apply(CCObject*) {
@@ -177,21 +126,21 @@ class CircleToolPopup : public FLAlertLayer, TextInputDelegate, FLAlertLayerProt
 		if (objs && objs->count()) {
 			const auto obj_count = objs->count() * amt;
 			if (obj_count > 5000) {
-				FLAlertLayer::create(this, "Warning",
-					"This will create <cy>" + std::to_string(obj_count) + "</c> objects, are you sure?",
-					"Cancel", "Ok"
-				)->show();
+				createQuickPopup("Warning",
+					fmt::format("This will create <cy>{}</c> objects, are you sure?", obj_count),
+					"Cancel", "Ok",
+					[this](auto*, bool btn2) {
+						if (btn2) {
+							this->perform();
+						}
+					}
+				);
 			} else {
 				perform();
 			}
 		}
 	}
 
-	void FLAlert_Clicked(FLAlertLayer*, bool btn2) override {
-		if (btn2)
-			perform();
-	}
-
 	void perform() {
 		auto* editor = GameManager::sharedState()->getEditorLayer();
 		auto* editor_ui = editor->m_editorUI;
@@ -204,7 +153,7 @@ class CircleToolPopup : public FLAlertLayer, TextInputDelegate, FLAlertLayerProt
 			editor_ui->onDuplicate(nullptr);
 			auto selected = editor_ui->getSelectedObjects();
 			editor_ui->rotateObjects(selected, m_step, {0.f, 0.f});
-			
+
 			const float angle = i * m_step;
 
 			if (m_fat != 0.f) {
@@ -228,15 +177,15 @@ class CircleToolPopup : public FLAlertLayer, TextInputDelegate, FLAlertLayerProt
 	}
 
 	void on_info(CCObject*) {
-		FLAlertLayer::create(this, "info", 
+		FLAlertLayer::create(nullptr, "info",
 			"This will repeatedly copy-paste and rotate the selected objects,\n"
 			"rotating by <cy>Step</c> degrees each time, until it gets to <cy>Arc</c> degrees.",
 			"ok", nullptr, 300.f
 		)->show();
 	}
 
 	void on_info2(CCObject*) {
-		FLAlertLayer::create(this, "info",
+		FLAlertLayer::create(nullptr, "info",
 			"This will move the selection up and down with the rotation angle, as to create an <cy>ellipse</c>.\n"
 			"This number will control how much it goes up and down, thus controlling how <cg>\"squished\"</c> the circle is.\n"
 			"This works best with a single object as the center, marked as <co>group parent</c>.",

circle-tool/mod.json

@@ -6,7 +6,7 @@
 		"mac": "2.2081",
 		"ios": "2.2081"
 	},
-	"version": "v1.2.2",
+	"version": "v1.2.3",
 	"id": "mat.circle-tool",
 	"name": "Circle Tool",
 	"developer": "mat",