Merge pull request #28 from Alphalaneous/thumbnail-popup

cdc-sys · web-flow · commit 0af4b009c65e · 2024-08-03T14:12:05.000+02:00
Thumbnail Popup and Crash Fixes
diff --git a/src/ImageCache.cpp b/src/ImageCache.cpp
@@ -11,6 +11,8 @@ ImageCache::ImageCache(){
 
 void ImageCache::addImage(CCImage* image, std::string key){
 
+    if(!image) return;
+
     if(m_imageDict->count() >= Mod::get()->getSettingValue<int64_t>("cache-limit")){
         m_imageDict->removeObjectForKey(static_cast<CCString*>(m_imageDict->allKeys()->objectAtIndex(0))->getCString());
     }
diff --git a/src/ThumbnailPopup.cpp b/src/ThumbnailPopup.cpp
@@ -8,22 +8,17 @@ using namespace geode::prelude;
 #include "utils.hpp"
 #include "ImageCache.hpp"
 
-void ThumbnailPopup::onDownload(CCObject*sender){
+void ThumbnailPopup::onDownload(CCObject* sender){
     std::string URL = fmt::format("https://raw.githubusercontent.com/cdc-sys/level-thumbnails/main/thumbs/{}.png", m_levelID);
     CCApplication::sharedApplication()->openURL(URL.c_str());
 }
 
-void ThumbnailPopup::openDiscordServerPopup(){
-    if (Mod::get()->getSavedValue<bool>("discord-ad-shown")){
-        return;
-    }
-    else{
-        Mod::get()->setSavedValue<bool>("discord-ad-shown",true);
-    }
+void ThumbnailPopup::openDiscordServerPopup(CCObject* sender){
+    
     createQuickPopup(
         "Uh Oh!",
         "Hm.. This level seems to not have a <cj>Thumbnail</c>...\n"
-        "Worry not! You can join our <cg>Discord Server</c> and submit a thumbnail <cy>YOURSELF!</c>\n<cb>(Don't worry, you can always find the server link in the mod about page..)</c>",
+        "Worry not! You can join our <cg>Discord Server</c> and submit a thumbnail <cy>YOURSELF!</c>",
         "No Thanks", "JOIN!",
         [this](auto, bool btn2) {
             if (btn2) {
@@ -36,17 +31,63 @@ void ThumbnailPopup::openDiscordServerPopup(){
 bool ThumbnailPopup::setup(int id) {
     m_noElasticity = false;
     auto winSize = CCDirector::sharedDirector()->getWinSize();
+    setID("ThumbnailPopup");
+    setTitle("");
+
+    CCScale9Sprite* border = CCScale9Sprite::create("GJ_square07.png");
+    border->setContentSize(m_bgSprite->getContentSize());
+    border->setPosition(m_bgSprite->getPosition());
+    border->setZOrder(2);
+
+    CCLayerColor* mask = CCLayerColor::create({255, 255, 255});
+    mask->setContentSize({391, 220});
+    mask->setPosition({m_bgSprite->getContentSize().width / 2 - 391/2, m_bgSprite->getContentSize().height/2 - 220/2});
+
+    m_bgSprite->setColor({50,50,50});
+
+    m_clippingNode = CCClippingNode::create();
+    m_clippingNode->setContentSize(m_bgSprite->getContentSize());
+    m_clippingNode->setStencil(mask);
+    m_clippingNode->setZOrder(1);
 
-    setTitle("Thumbnail");
+    m_mainLayer->addChild(border);
+    m_mainLayer->addChild(m_clippingNode);
 
-    CCMenu* downloadMenu = CCMenu::create();
     CCSprite* downloadSprite = CCSprite::createWithSpriteFrameName("GJ_downloadBtn_001.png");
-    m_downloadBtn = CCMenuItemSpriteExtra::create(downloadSprite,this,menu_selector(ThumbnailPopup::onDownload));
+    m_downloadBtn = CCMenuItemSpriteExtra::create(downloadSprite, this, menu_selector(ThumbnailPopup::onDownload));
     m_downloadBtn->setEnabled(false);
     m_downloadBtn->setColor({125,125,125});
-    downloadMenu->setPosition({m_mainLayer->getContentWidth()-28,30});
-    downloadMenu->addChild(m_downloadBtn);
-    m_mainLayer->addChild(downloadMenu);
+   
+    m_downloadBtn->setPosition({m_mainLayer->getContentSize().width - 5, 5});
+
+    m_buttonMenu->addChild(m_downloadBtn);
+
+    CCSprite* recenterSprite = CCSprite::createWithSpriteFrameName("GJ_undoBtn_001.png");
+    CCMenuItemSpriteExtra* recenterBtn = CCMenuItemSpriteExtra::create(recenterSprite, this, menu_selector(ThumbnailPopup::recenter));
+
+    recenterBtn->setPosition({5, 5});
+    m_buttonMenu->addChild(recenterBtn);
+
+    #ifndef GEODE_IS_WINDOWS
+        recenterBtn->setVisible(false);
+    #endif
+
+    ButtonSprite* infoSprite = ButtonSprite::create("More Info");
+    m_infoBtn = CCMenuItemSpriteExtra::create(infoSprite, this, menu_selector(ThumbnailPopup::openDiscordServerPopup));
+
+    m_infoBtn->setPosition({m_mainLayer->getContentSize().width/2, 6});
+    m_infoBtn->setVisible(false);
+    m_infoBtn->setZOrder(3);
+
+    m_buttonMenu->addChild(m_infoBtn);
+
+    m_theFunny = CCLabelBMFont::create("Hey there! OwO", "bigFont.fnt");
+    m_theFunny->setPosition(m_bgSprite->getPosition());
+    m_theFunny->setVisible(false);
+    m_theFunny->setScale(0.25f);
+
+    m_mainLayer->addChild(m_theFunny);
+
     m_loadingCircle->setParentLayer(m_mainLayer);
     m_loadingCircle->setPosition({ -70,-40 });
     m_loadingCircle->setScale(1.f);
@@ -77,7 +118,6 @@ bool ThumbnailPopup::setup(int id) {
                         imageCreationFinished(m_image);
                     });
                 });
-                m_loadingCircle->fadeAndRemove();
                 imageThread.detach();
             }
         }
@@ -96,28 +136,52 @@ void ThumbnailPopup::imageCreationFinished(CCImage* image){
     onDownloadFinished(CCSprite::createWithTexture(texture));
 }
 
-void ThumbnailPopup::onDownloadFinished(CCSprite* sprite) {
+void ThumbnailPopup::recenter(CCObject* sender){
+
+    if(CCNode* node = m_clippingNode->getChildByID("thumbnail")) {
+        node->setPosition({m_mainLayer->getContentWidth()/2,m_mainLayer->getContentHeight()/2});
+        node->stopAllActions();
+        float scale = m_maxHeight/node->getContentSize().height;
+        node->setUserObject("new-scale", CCFloat::create(scale));
+        node->setScale(scale);
+    }
+}
+
+void ThumbnailPopup::onDownloadFinished(CCSprite* image) {
     // thanks for fucking this up sheepdotcom
     m_downloadBtn->setEnabled(true);
     m_downloadBtn->setColor({255,255,255});
-    CCSprite* image = sprite;
-    image->setScale(0.65f / levelthumbs::getQualityMultiplier());
-    image->setPosition({(m_mainLayer->getContentWidth()/2),(m_mainLayer->getContentHeight()/2)-10.f});
-    m_mainLayer->addChild(image);
+
+    float scale = m_maxHeight/image->getContentSize().height;
+    image->setScale(scale);
+    image->setUserObject("scale", CCFloat::create(scale));
+    image->setPosition({m_mainLayer->getContentWidth()/2,m_mainLayer->getContentHeight()/2});
+
+    image->setID("thumbnail");
+    m_clippingNode->addChild(image);
+    m_loadingCircle->fadeAndRemove();
 }
 
 void ThumbnailPopup::onDownloadFail() {
     // thanks for the image cvolton ;)
     CCSprite* image = CCSprite::create("noThumb.png"_spr);
-    image->setScale(0.65f );
-    image->setPosition({(m_mainLayer->getContentWidth()/2),(m_mainLayer->getContentHeight()/2)-10.f});
-    m_mainLayer->addChild(image);
+    float scale = m_maxHeight/image->getContentSize().height;
+    image->setScale(scale);
+    image->setUserObject("scale", CCFloat::create(scale));
+    image->setPosition({m_mainLayer->getContentWidth()/2, m_mainLayer->getContentHeight()/2});
+    image->setID("thumbnail");
+
+    m_infoBtn->setVisible(true);
+    m_theFunny->setVisible(true);
+    m_clippingNode->addChild(image);
+    m_loadingCircle->fadeAndRemove();
+
 }
 
 ThumbnailPopup* ThumbnailPopup::create(int id) {
     auto ret = new ThumbnailPopup();
     ret->m_levelID = id;
-    if (ret && ret->initAnchored(420, 240, -1, "GJ_square01.png")) {
+    if (ret && ret->initAnchored(395, 225, -1, "GJ_square05.png")) {
         ret->autorelease();
         return ret;
     }
diff --git a/src/ThumbnailPopup.hpp b/src/ThumbnailPopup.hpp
@@ -7,17 +7,22 @@ using namespace geode::prelude;
 class ThumbnailPopup : public Popup<int> {
 protected:
     int m_levelID;
+    float m_maxHeight = 220;
     EventListener<web::WebTask> m_downloadListener;
     LoadingCircle* m_loadingCircle = LoadingCircle::create();
     CCMenuItemSpriteExtra* m_downloadBtn;
+    CCMenuItemSpriteExtra* m_infoBtn;
+    CCClippingNode* m_clippingNode;
     Ref<CCImage> m_image;
+    CCLabelBMFont* m_theFunny;
 
     bool setup(int id) override;
     void onDownloadFinished(CCSprite* sprite);
     void onDownloadFail();
     void imageCreationFinished(CCImage* image);
-    void onDownload(CCObject*sender);
-    void openDiscordServerPopup();
+    void onDownload(CCObject* sender);
+    void openDiscordServerPopup(CCObject* sender);
+    void recenter(CCObject* sender);
 
 public:
     static ThumbnailPopup* create(int id);
diff --git a/src/Zoom.cpp b/src/Zoom.cpp
@@ -0,0 +1,148 @@
+#include "Zoom.hpp"
+
+#ifdef GEODE_IS_WINDOWS
+
+#include <Geode/modify/CCMouseDispatcher.hpp>
+#include <Geode/modify/CCEGLView.hpp>
+#include <Geode/modify/CCScheduler.hpp>
+
+Zoom* Zoom::instance = nullptr;
+
+bool checkIfInside(CCLayer* layer, CCPoint pos){
+    float x = layer->getPosition().x - layer->getContentSize().width * layer->getAnchorPoint().x;
+    float y = layer->getPosition().y - layer->getContentSize().height * layer->getAnchorPoint().y;
+    float width = layer->getContentSize().width;
+    float height = layer->getContentSize().height;
+
+    CCRect r = {x, y, width, height};
+
+    CCPoint local = CCScene::get()->convertToNodeSpace(pos);
+
+    return r.containsPoint(local);
+}
+
+void Zoom::doZoom(float y){
+
+    float zoom = 0.1f * (y > 0 ? -1 : 1);
+    auto pos = getMousePos();
+
+    CCNode* thumbnailPopup = CCScene::get()->getChildByID("ThumbnailPopup");
+    if (!thumbnailPopup) return;
+
+    CCLayer* popupLayer = getChildOfType<CCLayer>(thumbnailPopup, 0);
+    if(!popupLayer) return;
+
+    CCNode* thumbnail = thumbnailPopup->getChildByIDRecursive("thumbnail");
+    if(!thumbnail) return;
+
+    if(!checkIfInside(popupLayer, pos)) return;
+
+    CCSize contentSize = thumbnail->getContentSize();
+
+    float oldScale = thumbnail->getScale();
+
+    if(CCFloat* val = static_cast<CCFloat*>(thumbnail->getUserObject("new-scale"))){
+        oldScale = val->getValue();
+    }
+
+    float newScale;
+    float origScale = static_cast<CCFloat*>(thumbnail->getUserObject("scale"))->getValue();
+
+    if (zoom < 0) {
+        newScale = oldScale / (1 - zoom);
+    } else {
+        newScale = oldScale * (1 + zoom);
+    }
+
+    if (newScale < origScale * 0.75) {
+        newScale = origScale * 0.75;
+    }
+
+    if (newScale > origScale * 100) {
+        newScale = origScale * 100;
+    }
+    
+    float currentScale = thumbnail->getScale();
+
+    auto prevPos = thumbnail->convertToNodeSpace(pos);
+    thumbnail->setScale(newScale);
+    auto newPos = thumbnail->convertToWorldSpace(prevPos);
+    thumbnail->setScale(currentScale);
+    thumbnail->setUserObject("new-scale", CCFloat::create(newScale));
+
+    thumbnail->stopAllActions();
+    thumbnail->runAction(CCMoveTo::create(0.1, thumbnail->getPosition() + pos - newPos));
+    thumbnail->runAction(CCScaleTo::create(0.1, newScale));
+}
+
+void Zoom::update(float dt){
+    auto pos = getMousePos();
+    auto lastMousePos = m_lastMousePos;
+
+    CCNode* thumbnailPopup = CCScene::get()->getChildByID("ThumbnailPopup");
+    if (!thumbnailPopup) return;
+
+    CCLayer* popupLayer = getChildOfType<CCLayer>(thumbnailPopup, 0);
+    if(!popupLayer) return;
+
+    CCNode* thumbnail = thumbnailPopup->getChildByIDRecursive("thumbnail");
+    if(!thumbnail) return;
+
+    m_deltaMousePos = CCPoint{ pos.x - lastMousePos.x, pos.y - lastMousePos.y };
+    m_lastMousePos = pos;
+
+    if(!checkIfInside(popupLayer, pos) && !m_isDragging) return;
+
+    if (m_isTouching) {
+
+        m_isDragging = true;
+        m_deltaMousePos = thumbnailPopup->convertToNodeSpace(m_deltaMousePos) ;
+       
+        CCPoint pos = thumbnail->getPosition();
+
+        CCPoint newPos = pos + m_deltaMousePos;
+
+        float posX = newPos.x;
+        float posY = newPos.y;
+
+
+        thumbnail->setPosition({posX, posY});
+    }
+    else {
+        m_isDragging = false;
+    }
+}
+
+class $modify(CCScheduler) {
+    virtual void update(float dt) {
+        Zoom::get()->update(dt);
+        CCScheduler::update(dt);
+    }
+};
+
+class $modify(CCMouseDispatcher) {
+    bool dispatchScrollMSG(float y, float x) {
+        Zoom::get()->doZoom(y);
+        return CCMouseDispatcher::dispatchScrollMSG(y, x);
+    }
+};
+
+class $modify(CCEGLView) {
+    void onGLFWMouseCallBack(GLFWwindow* window, int button, int action, int mods) {
+        if (button == GLFW_MOUSE_BUTTON_LEFT) {
+            switch(action){
+                case GLFW_PRESS: {
+                    Zoom::get()->m_isTouching = true;
+                    break;
+                }
+                case GLFW_RELEASE: {
+                    Zoom::get()->m_isTouching = false;
+                    break;
+                }
+            }
+        }
+        CCEGLView::onGLFWMouseCallBack(window, button, action, mods);
+    }
+};
+
+#endif
diff --git a/src/Zoom.hpp b/src/Zoom.hpp
@@ -0,0 +1,34 @@
+#pragma once
+
+#ifndef __ZOOM_H
+#define __ZOOM_H
+
+#include <Geode/Geode.hpp>
+
+using namespace geode::prelude;
+
+class Zoom {
+
+protected:
+    static Zoom* instance;
+    CCPoint m_lastMousePos;
+    CCPoint m_deltaMousePos;
+    bool m_isDragging = false;
+public:
+    bool m_isTouching = false;
+
+    void onScroll(float x, float y);
+    void update(float dt);
+    void doZoom(float zoom);
+
+    static Zoom* get(){
+
+        if (!instance) {
+            instance = new Zoom();
+        };
+        return instance;
+    }
+};
+
+
+#endif
diff --git a/src/main.cpp b/src/main.cpp

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@ ImageCache::ImageCache(){`
`11`	`11`
`12`	`12`	`void ImageCache::addImage(CCImage* image, std::string key){`
`13`	`13`
	`14`	`+ if(!image) return;`
	`15`	`+`
`14`	`16`	`if(m_imageDict->count() >= Mod::get()->getSettingValue<int64_t>("cache-limit")){`
`15`	`17`	`m_imageDict->removeObjectForKey(static_cast<CCString*>(m_imageDict->allKeys()->objectAtIndex(0))->getCString());`
`16`	`18`	`}`