Merge branch 'main' of https://github.com/geode-sdk/geode into what

Author: hiimjasmine00

loader/include/Geode/cocos/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.0.0)
+cmake_minimum_required(VERSION 3.21)
 
 project(cocos-headers CXX)
 

loader/include/Geode/cocos/particle_nodes/CCParticleSystem.h

@@ -487,6 +487,16 @@ class CC_DLL CCParticleSystem : public CCNode, public CCTextureProtocol
 protected:
     virtual void updateBlendFunc();
 public:
+    // @note RobTop Addition
+    bool m_bWorldPosUninitialized;
+    // @note RobTop Addition
+    CCPoint m_tWorldPos;
+    // @note RobTop Addition
+    ccColor4F m_tUniformColor;
+    // @note RobTop Addition
+    ccColor4F m_tUniformDeltaColor;
+    // @note RobTop Addition
+    bool m_bUseUniformColorMode;
         // saved/loaded in loadDefaults, loadScaledDefaults and saveDefaults
 
         // @note RobTop Addition
@@ -500,11 +510,15 @@ class CC_DLL CCParticleSystem : public CCNode, public CCTextureProtocol
         // @note RobTop Addition
         float m_fDefaultEndSize;
         // @note RobTop Addition
+        float m_fDefaultAngle;
+        // @note RobTop Addition
         float m_fDefaultModeASpeed;
         // @note RobTop Addition
         float m_fDefaultModeASpeedVar;
         // @note RobTop Addition
         CCPoint m_tDefaultPosVar;
+        // @note RobTop Addition
+        int m_nCustomParticleIndex;
 public:
     // @note RobTop Addition
     void saveDefaults(void);

loader/include/Geode/cocos/particle_nodes/CCParticleSystemQuad.h

@@ -153,6 +153,15 @@ class CC_DLL CCParticleSystemQuad : public CCParticleSystem
 
     GLuint                m_pBuffersVBO[2]; //0: vertex  1: indices
 
+    // @note Robtop Addition
+    CCRect m_tTextureRect;
+    // @note Robtop Addition
+    ccColor4B m_tQuadColor;
+    // @note Robtop Addition
+    GLushort m_uParticleIdx;
+    // @note Robtop Addition
+    GLubyte m_uOpacity;
+
 public:
     /**
      * @js ctor
@@ -227,8 +236,8 @@ class CC_DLL CCParticleSystemQuad : public CCParticleSystem
     static CCParticleSystemQuad * create(const char*, bool);
     static CCParticleSystemQuad * createWithTotalParticles(unsigned int numberOfParticles, bool);
 
-	unsigned char getOpacity();
-	void setOpacity(unsigned char);
+	GLubyte getOpacity() { return m_uOpacity; }
+	void setOpacity(GLubyte opacity) { m_uOpacity = opacity; }
 
 	void updateTexCoords();
 

loader/launcher/mac/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.3.0)
+cmake_minimum_required(VERSION 3.21)
 
 
 add_library(GeodeBootstrapper SHARED Bootstrapper.cpp)

loader/src/platform/ios/crashlog.mm

@@ -19,7 +19,7 @@
 
 // https://gist.github.com/jvranish/4441299
 
-static constexpr size_t FRAME_SIZE = 64;
+static constexpr size_t FRAME_SIZE = 128;
 static int s_signal = 0;
 static siginfo_t* s_siginfo = nullptr;
 static ucontext_t* s_context = nullptr;
@@ -70,6 +70,16 @@
     if (imageName.empty()) {
         imageName = "<Unknown>";
     }
+
+    // don't print those really long paths
+    if (
+        imageName.ends_with("Geode.ios.dylib")
+        || imageName.ends_with("GeometryJump")
+        || imageName.find("game/geode/unzipped") != std::string::npos
+    ) {
+        imageName = imageName.substr(imageName.find_last_of('/') + 1);
+    }
+
     return imageName;
 }
 
@@ -178,20 +188,20 @@ size_t getImageSize(struct mach_header_64 const* header) {
 }
 
 extern "C" void signalHandler(int signal, siginfo_t* signalInfo, void* vcontext) {
-	/*auto context = reinterpret_cast<ucontext_t*>(vcontext);
-	s_backtraceSize = backtrace(s_backtrace.data(), FRAME_SIZE);
+    /*auto context = reinterpret_cast<ucontext_t*>(vcontext);
+    s_backtraceSize = backtrace(s_backtrace.data(), FRAME_SIZE);
 
     // for some reason this is needed, dont ask me why
-	s_backtrace[2] = reinterpret_cast<void*>(context->uc_mcontext->__ss.__pc);
-	if (s_backtraceSize < FRAME_SIZE) {
-		s_backtrace[s_backtraceSize] = nullptr;
-	}*/
-
-	s_signal = signal;
-	s_siginfo = signalInfo;
-	s_context = reinterpret_cast<ucontext_t*>(vcontext);
-	char buf = '1';
-	write(s_pipe[1], &buf, 1);
+    s_backtrace[2] = reinterpret_cast<void*>(context->uc_mcontext->__ss.__pc);
+    if (s_backtraceSize < FRAME_SIZE) {
+        s_backtrace[s_backtraceSize] = nullptr;
+    }*/
+
+    s_signal = signal;
+    s_siginfo = signalInfo;
+    s_context = reinterpret_cast<ucontext_t*>(vcontext);
+    char buf = '1';
+    write(s_pipe[1], &buf, 1);
 }
 
 // https://stackoverflow.com/questions/8278691/how-to-fix-backtrace-line-number-error-in-c
@@ -223,9 +233,9 @@ size_t getImageSize(struct mach_header_64 const* header) {
     std::stringstream stacktrace;
 
     auto messages = backtrace_symbols(s_backtrace.data(), s_backtraceSize);
-	if (s_backtraceSize < FRAME_SIZE) {
-		messages[s_backtraceSize] = nullptr;
-	}
+    if (s_backtraceSize < FRAME_SIZE) {
+        messages[s_backtraceSize] = nullptr;
+    }
 
     std::stringstream lines(addr2Line());
 
@@ -272,7 +282,7 @@ size_t getImageSize(struct mach_header_64 const* header) {
             std::getline(stream, function);
 
             cutoff = function.find("+");
-            stream = std::stringstream(function.substr(cutoff));
+            stream = std::stringstream(function.substr(cutoff + 1));
             stream >> offset;
             function = geode::utils::string::trim(function.substr(0, cutoff));
 
@@ -285,13 +295,25 @@ size_t getImageSize(struct mach_header_64 const* header) {
                 free(demangle);
             }
 
+            // don't display the (function + offset) part if it will be bogus.
+            // the first case (0x0) happens with hook handlers, while the second happens because
+            // GD exports a few fmt symbols, so backtrace_symbols thinks every function in GD is the last fmt symbol in the binary
+            if (function == "0x0" || (binary == "GeometryJump" && offset > 0x1000)) {
+                function = "";
+            }
+
             if (auto image = imageFromAddress(reinterpret_cast<void*>(address))) {
                 stacktrace << "- " << getImageName(image) << " + " << std::showbase << std::hex << (address - (uintptr_t)image->imageLoadAddress) << std::dec;
             }
             else {
-                stacktrace << "- " << binary << " @ " << std::showbase << std::hex << address << std::dec;
+                stacktrace << "- " << binary;
             }
-            stacktrace << " (" << function << " + " << offset << ") @ " << std::showbase << std::hex << address << std::dec << "\n";
+
+            if (!function.empty()) {
+                stacktrace << " (" << function << " + " << offset << ")";
+            }
+
+            stacktrace << " @ " << std::showbase << std::hex << address << std::dec << "\n";
         }
     }
 
@@ -352,7 +374,7 @@ static void handlerThread() {
     while (read(s_pipe[0], &buf, 1) != 0) {
         auto signalAddress = reinterpret_cast<void*>(s_context->uc_mcontext->__ss.__pc);
         // as you can tell, i moved code from signalHandler to here
-	if (s_context) {
+        if (s_context) {
             //s_backtraceSize = backtrace(s_backtrace.data(), FRAME_SIZE);
             // i can't use 2 because then it'll show the actual stacktrace to be lower than what it actually is
             s_backtrace[s_backtraceSize++] = signalAddress;
@@ -366,15 +388,15 @@ static void handlerThread() {
                 void** frame = reinterpret_cast<void**>(current_fp);
                 void* next_fp = frame[0];
                 void* lr = frame[1];
-                
+
                 if (next_fp == current_fp || lr == nullptr) break;
-                
+
                 s_backtrace[s_backtraceSize++] = lr;
                 current_fp = next_fp;
             }
         }
-	Mod* faultyMod = modFromAddress(signalAddress);
-    
+        Mod* faultyMod = modFromAddress(signalAddress);
+
         // Mod* faultyMod = nullptr;
         // for (int i = 1; i < s_backtraceSize; ++i) {
         //     auto mod = modFromAddress(s_backtrace[i]);
@@ -387,7 +409,7 @@ static void handlerThread() {
 
         log::error("Geode crashed!\n{}", text);
         std::_Exit(EXIT_FAILURE);
-	//s_signal = 0;
+        //s_signal = 0;
     }
 }
 

loader/src/ui/GeodeUI.cpp

@@ -269,10 +269,12 @@ class ModLogoSprite : public CCNode {
         }
     }
     void setSprite(ByteVector&& data, bool postEvent) {
-        auto image = Ref(new CCImage());
+        auto image = new CCImage();
         image->initWithImageData(data.data(), data.size());
 
         auto texture = CCTextureCache::get()->addUIImage(image, m_modID.c_str());
+        image->release();
+
         this->setSprite(CCSprite::createWithTexture(texture), postEvent);
     }