sapphire sdk update

Author: FireMario211

.github/workflows/build.yml

@@ -27,6 +27,10 @@ jobs:
           os: ubuntu-latest
           target: Android64
 
+        - name: iOS
+          os: macos-latest
+          target: iOS
+
     name: ${{ matrix.config.name }}
     runs-on: ${{ matrix.config.os }}
 
@@ -41,6 +45,8 @@ jobs:
           build-config: 'RelWithDebInfo'
           export-pdb: true
           combine: true
+          cli: nightly # remove after iso
+          sdk: nightly # remove after iso
           #sdk: 'nightly'
           target: ${{ matrix.config.target }}
 

CMakeLists.txt

@@ -4,6 +4,13 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
 set(CMAKE_CXX_VISIBILITY_PRESET hidden)
 set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE) # thanks dank_meme01
+if ("${CMAKE_SYSTEM_NAME}" STREQUAL "iOS" OR IOS)
+    set(CMAKE_OSX_ARCHITECTURES "arm64")
+    set(CMAKE_OSX_DEPLOYMENT_TARGET "14.0")
+    add_definitions(-DGLES_SILENCE_DEPRECATION)
+else()
+    set(CMAKE_OSX_ARCHITECTURES "arm64;x86_64")
+endif()
 include(cmake/CPM.cmake) # why do I need this, this didnt happen before
 
 project(PrismMenu VERSION 1.0.0)

changelog.md

@@ -1,3 +1,7 @@
+# v1.10.3
+    - Added Jump Hack on Mac OS
+    - Allowed speedhack audio on Mac OS
+    - Added Sapphire SDK support
 # v1.10.2
     - Fixed uncomplete level from removing secret coins
 # v1.10.1

mod.json

@@ -1,10 +1,11 @@
 {
-	"geode": "4.2.0",
-	"version": "v1.10.2",
+	"geode": "4.3.1",
+	"version": "v1.10.3",
 	"gd": {
 		"win": "2.2074",
 		"mac": "2.2074",
-		"android": "2.2074"
+		"android": "2.2074",
+		"ios": "2.2074"
 	},
 	"id": "firee.prism",
 	"name": "Prism Menu",

resources/hacks/global.json

@@ -106,7 +106,7 @@
         "desc": "Whether or not to also change the audio speed based on the speedhack value.",
         "type": "bool",
         "default": true,
-        "platforms": ["win","android32","android64"]
+        "platforms": ["win","android32","android64","mac"]
     },
     {
         "name": "Reset Speedhack",

resources/hacks/player.json

@@ -51,8 +51,7 @@
     {
         "name": "Jump Hack",
         "desc": "Allows for jumping in mid-air.",
-        "type": "bool",
-        "platforms": ["win", "android64", "android32"]
+        "type": "bool"
     },
     {
         "name": "Instant Complete",

src/Hacks/Player.cpp

@@ -29,13 +29,6 @@ class $modify(POPlayerHacks, PlayerObject) {
             m_gravityMod = gravityHack->value.floatValue;
         }
         if (Hacks::isHackEnabled("Instant Complete")) return;
-        /*log::info(fmt::format(
-            "HardStreak\n---\nx = {}, y = {}, m_waveSize = {}\nm_pulseSize = {}",
-            m_waveTrail->m_currentPoint.x,
-            m_waveTrail->m_currentPoint.y,
-            m_waveTrail->m_waveSize,
-            m_waveTrail->m_pulseSize
-        ));*/
         //if (Hacks::isHackEnabled("No Rotate")) PlayerObject::setRotation(0);
         if (!Hacks::isHackEnabled("Freeze Player")) return PlayerObject::update(dt);
     }
@@ -44,7 +37,7 @@ class $modify(POPlayerHacks, PlayerObject) {
         if (!Hacks::isHackEnabled("No Death Effect")) return PlayerObject::playerDestroyed(p0);
         m_isDead = true;
     }
-#ifndef GEODE_IS_MACOS
+#ifndef GEODE_IS_IOS
     bool pushButton(PlayerButton p0) {
         if (p0 != PlayerButton::Jump) return PlayerObject::pushButton(p0);
         float boost = 10.0F;

src/PrismButton.hpp

@@ -8,12 +8,19 @@ using namespace geode::prelude;
 // definitely not copied from eclipse!
 class PrismButton : public CCMenu {
 protected:
+#ifndef GEODE_IS_IOS
     // how many units required to begin dragging the button
     constexpr static float MIN_MOVE_DISTANCE = 30.f;
     // move progress per second
     constexpr static float MOVE_SPEED = 9.2f;
     // how many units until the button snaps to touch pos
     constexpr static float SNAP_MARGIN = 0.1f;
+#else
+    // i do not know why but the numbers are vastly different on ios
+    constexpr static float MIN_MOVE_DISTANCE = 2.5f;
+    constexpr static float MOVE_SPEED = 9.2f;
+    constexpr static float SNAP_MARGIN = 40.f;
+#endif
     cocos2d::CCPoint m_holdPosition{};
     bool m_shouldMove = false; // whether currently in move animation
     bool m_haveMoved = false; // used to determine whether we should trigger callback after release

src/UI/PrismUI.cpp

@@ -571,10 +571,10 @@ void PrismUIButton::onBtn(CCObject* ret) {
         //creditsMenu1->onClose(nullptr);
         //CreditsMenu::create()->show();
     } else if (name == "Show Graphic Options") {
-        #ifdef GEODE_IS_ANDROID 
+        #if defined(GEODE_IS_ANDROID) || defined(GEODE_IS_IOS)
         VideoOptionsLayer::create()->show();
         #else 
-        FLAlertLayer::create("Error", "This option can only be used on <cy>Android</c>!", "OK")->show();
+        FLAlertLayer::create("Error", "This option can only be used on <cy>Android</c> and <cy>iOS</c>!", "OK")->show();
         #endif
     } else if (name == "Uncomplete Level") {
         if (auto levelInfoLayer = scene->getChildByType<LevelInfoLayer>(0)) {
@@ -972,6 +972,8 @@ void PrismUI::RegenCategory() {
                 versionLabel->setString(fmt::format("{} - Android", version).c_str());
             #elif defined(GEODE_IS_MACOS)
                 versionLabel->setString(fmt::format("{} - Mac OS", version).c_str());
+            #elif defined(GEODE_IS_MACOS)
+                versionLabel->setString(fmt::format("{} - iOS", version).c_str());
             #else // TODO: when camila releases iCreate on geode, add iOS
                 versionLabel->setString(fmt::format("{} - HOW by Spu7nix", version).c_str());
             #endif

src/hacks.hpp

@@ -468,7 +468,7 @@ class Hacks {
         }
     }
     static void setPitch(float pitch) {
-#if !defined(GEODE_IS_MACOS) && !defined(GEODE_IS_IOS) // TODO: figure out why it turns to creepypasta when tuning down speedhack
+#if !defined(GEODE_IS_MACOS)
         if (!Hacks::isHackEnabled("Speedhack Audio")) {
             pitch = 1.0F;
         }