Add coopdx and other improvements

archives/sm_osx.xcarchive/Info.plist

@@ -14,18 +14,18 @@
 		<key>CFBundleIdentifier</key>
 		<string>com.CubingStudios.sm-osx</string>
 		<key>CFBundleShortVersionString</key>
-		<string>1.3.4</string>
+		<string>1.3.5</string>
 		<key>CFBundleVersion</key>
-		<string>17</string>
+		<string>18</string>
 		<key>SigningIdentity</key>
-		<string>Apple Development: calebelm@icloud.com (VZ9N8YGDP3)</string>
+		<string>Apple Development: calebelm@outlook.com (4SR9WR9R5Q)</string>
 		<key>Team</key>
-		<string>6K864V7HLM</string>
+		<string>25RK3JMVLT</string>
 	</dict>
 	<key>ArchiveVersion</key>
 	<integer>2</integer>
 	<key>CreationDate</key>
-	<date>2023-10-28T03:00:00Z</date>
+	<date>2024-03-15T23:52:37Z</date>
 	<key>Name</key>
 	<string>sm_osx</string>
 	<key>SchemeName</key>

archives/sm_osx.xcarchive/Products/Applications/sm_osx.app/Contents/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>23A344</string>
+	<string>23C71</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>
@@ -21,29 +21,29 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.3.4</string>
+	<string>1.3.5</string>
 	<key>CFBundleSupportedPlatforms</key>
 	<array>
 		<string>MacOSX</string>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>17</string>
+	<string>18</string>
 	<key>DTCompiler</key>
 	<string>com.apple.compilers.llvm.clang.1_0</string>
 	<key>DTPlatformBuild</key>
 	<string></string>
 	<key>DTPlatformName</key>
 	<string>macosx</string>
 	<key>DTPlatformVersion</key>
-	<string>14.0</string>
+	<string>14.2</string>
 	<key>DTSDKBuild</key>
-	<string>23A334</string>
+	<string>23C53</string>
 	<key>DTSDKName</key>
-	<string>macosx14.0</string>
+	<string>macosx14.2</string>
 	<key>DTXcode</key>
-	<string>1500</string>
+	<string>1510</string>
 	<key>DTXcodeBuild</key>
-	<string>15A240d</string>
+	<string>15C65</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

archives/sm_osx.xcarchive/Products/Applications/sm_osx.app/Contents/_CodeSignature/CodeResources

@@ -10,11 +10,11 @@
 		</data>
 		<key>Resources/Assets.car</key>
 		<data>
-		wZTBpELOuOfyJCbpr5myB2uJnwA=
+		NbWbUi/xAxEszoo5KZZTZODop34=
 		</data>
 		<key>Resources/DataStore.momd/DataStore.mom</key>
 		<data>
-		AjB4QEDHV5m7OzrSaF/EeMbhJkM=
+		ylUUg/IaXqmfpMveS+zmlyOWr5M=
 		</data>
 		<key>Resources/DataStore.momd/VersionInfo.plist</key>
 		<data>
@@ -43,10 +43,10 @@
 		<dict>
 			<key>cdhash</key>
 			<data>
-			4osoXy/SWFCbhYWbHfwGtN6GlVQ=
+			KCwUGi13hNYNLBjOCM9dyb5/sdY=
 			</data>
 			<key>requirement</key>
-			<string>identifier "org.sparkle-project.Sparkle" and anchor apple generic and certificate leaf[subject.CN] = "Apple Development: calebelm@icloud.com (VZ9N8YGDP3)" and certificate 1[field.1.2.840.113635.100.6.2.1] /* exists */</string>
+			<string>identifier "org.sparkle-project.Sparkle" and anchor apple generic and certificate leaf[subject.CN] = "Apple Development: calebelm@outlook.com (4SR9WR9R5Q)" and certificate 1[field.1.2.840.113635.100.6.2.1] /* exists */</string>
 		</dict>
 		<key>Resources/AppIcon.icns</key>
 		<dict>
@@ -59,14 +59,14 @@
 		<dict>
 			<key>hash2</key>
 			<data>
-			wf40lOguvFUaxrfnHkIG1doKQ4mPsUomRC9FORlaMbk=
+			jxfnsAvjG82QX/exrdt+5QAo0v9dEke26f6Rz+ApV00=
 			</data>
 		</dict>
 		<key>Resources/DataStore.momd/DataStore.mom</key>
 		<dict>
 			<key>hash2</key>
 			<data>
-			actPOuvflOBUMDBL54SoXVavzZPoWdk/UpYdfj0WZmA=
+			LmfzSJktNFYZUpwA8NsR5jSIwbyVSKaKUw5C0kbwfOs=
 			</data>
 		</dict>
 		<key>Resources/DataStore.momd/VersionInfo.plist</key>

archives/sm_osx.xcarchive/dSYMs/sm_osx.app.dSYM/Contents/Info.plist

@@ -13,8 +13,8 @@
 		<key>CFBundleSignature</key>
 		<string>????</string>
 		<key>CFBundleShortVersionString</key>
-		<string>1.3.4</string>
+		<string>1.3.5</string>
 		<key>CFBundleVersion</key>
-		<string>17</string>
+		<string>18</string>
 	</dict>
 </plist>

sm_osx.xcodeproj/project.pbxproj

@@ -455,10 +455,10 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 17;
+				CURRENT_PROJECT_VERSION = 18;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"sm_osx/Preview Content\"";
-				DEVELOPMENT_TEAM = 6K864V7HLM;
+				DEVELOPMENT_TEAM = 25RK3JMVLT;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -471,7 +471,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.3.4;
+				MARKETING_VERSION = 1.3.5;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.CubingStudios.sm-osx";
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -491,10 +491,10 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 17;
+				CURRENT_PROJECT_VERSION = 18;
 				DEAD_CODE_STRIPPING = YES;
 				DEVELOPMENT_ASSET_PATHS = "\"sm_osx/Preview Content\"";
-				DEVELOPMENT_TEAM = 6K864V7HLM;
+				DEVELOPMENT_TEAM = 25RK3JMVLT;
 				ENABLE_HARDENED_RUNTIME = YES;
 				ENABLE_PREVIEWS = YES;
 				GENERATE_INFOPLIST_FILE = YES;
@@ -507,7 +507,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 13.0;
-				MARKETING_VERSION = 1.3.4;
+				MARKETING_VERSION = 1.3.5;
 				ONLY_ACTIVE_ARCH = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = "com.CubingStudios.sm-osx";
 				PRODUCT_NAME = "$(TARGET_NAME)";

sm_osx/CompilationView.swift

@@ -183,9 +183,9 @@ struct CompilationView: View {
                             }
                         } else {
                             if developmentEnvironment {
-                                execDir = "\(FileManager.default.homeDirectoryForCurrentUser.path())SM64Repos/\(repo)/build/us_pc/sm64.us.f3dex2e"
+                                execDir = "\(FileManager.default.homeDirectoryForCurrentUser.path())SM64Repos/\(repo)/build/us_pc/\(repo == .sm64coopdx ? "sm64coopdx" : "sm64.us.f3dex2e")"
                             } else {
-                                execDir = "\(FileManager.default.homeDirectoryForCurrentUser.path())SM64Repos/\(execPath)/sm64.us.f3dex2e"
+                                execDir = "\(FileManager.default.homeDirectoryForCurrentUser.path())SM64Repos/\(execPath)/\(repo == .sm64coopdx ? "sm64coopdx" : "sm64.us.f3dex2e")"
                             }
                         }
 
@@ -208,7 +208,7 @@ struct CompilationView: View {
 
                                 launcherRepo.title = "\(repo == .custom ? customRepo.name : "\(repo)")"
                                 launcherRepo.isEditing = false
-                                launcherRepo.path = "~/SM64Repos/\(execPath)/\(customRepo.customEndFileName.isEmpty || repo != .custom ? "sm64.us.f3dex2e" : customRepo.customEndFileName)"
+                                launcherRepo.path = "~/SM64Repos/\(execPath)/\(customRepo.customEndFileName.isEmpty || repo != .custom ? repo == .sm64coopdx ? "sm64coopdx" : "sm64.us.f3dex2e" : customRepo.customEndFileName)"
                                 launcherRepo.args = ""
                                 launcherRepo.id = UUID()
 

sm_osx/CustomRepo.swift

@@ -5,6 +5,7 @@ struct CustomRepo: Hashable {
     var name = ""
     var customEndFileName = ""
     var cloneURL = ""
+    var branch = ""
     var buildFlags = ""
     var useOsxBuildFlag = true
     var x86_64 = false

sm_osx/CustomRepoView.swift

@@ -31,6 +31,13 @@ struct CustomRepoView: View {
                                 .replacingOccurrences(of: " ", with: "")
                             customRepo.cloneURL = filteredCloneURL
                         }
+                    TextField("Branch", text: $customRepo.branch)
+                        .onChange(of: customRepo.cloneURL) { _ in
+                            let filteredCloneURL
+                                = customRepo.cloneURL
+                                .replacingOccurrences(of: " ", with: "")
+                            customRepo.cloneURL = filteredCloneURL
+                        }
                     TextField("Build Flags", text: $customRepo.buildFlags)
                     TextField("Exec File Name (Usually leave empty)", text: $customRepo.customEndFileName)
                         .onChange(of: customRepo.customEndFileName) { _ in

sm_osx/Enums.swift

@@ -8,13 +8,15 @@ public enum Repo: String {
     case moonshine = "https://github.com/EmeraldLoc/sm64-moonshine"
     case render96ex = "https://github.com/EmeraldLoc/Render96ex"
     case sm64ex_coop = "https://github.com/djoslin0/sm64ex-coop.git"
+    case sm64coopdx = "https://github.com/coop-deluxe/sm64coopdx"
     case sm64ex_coop_dev = "https://github.com/sm64ex-coop-dev/sm64ex-coop.git -b dev"
     case custom = "custom"
 }
 
 public enum Patches: String {
     case highfps = "60Fps"
     case debug = "Debug"
+    case dev = "Dev"
     case extMoveset = "Extended Moveset"
     case bettercam = "Better Camera"
     case drawdistance = "No Draw Distance"

sm_osx/LauncherGridView.swift

@@ -129,12 +129,12 @@ struct LauncherGridView: View {
                             }
 
                         } label: {
-                            Text(Image(systemName: "chevron.down"))
-                                .fontWeight(.bold)
+                            Image(systemName: "chevron.down")
                         }
                     }
                     .menuIndicator(.hidden)
                     .fixedSize()
+                    .bold()
                     .padding(.bottom)
 
                     Spacer()

sm_osx/PatchesView.swift

@@ -12,6 +12,7 @@ struct PatchesView: View {
     @State var isDist = false
     @State var extData = false
     @State var debug = false
+    @State var dev = false
     @State var timeTrials = false
     @State var isQOLFeat = false
     @State var isQOLFix = false
@@ -31,12 +32,11 @@ struct PatchesView: View {
             GroupBox {
                 HStack {
                     VStack(alignment: .leading) {
-                        if repo == .sm64ex_coop || repo == .sm64ex_coop_dev {
+                        if repo == .sm64ex_coop || repo == .sm64ex_coop_dev || repo == .sm64coopdx {
                             Toggle(isOn: $debug) {
                                 Text("Debug")
                                     .lineLimit(nil)
                             }.onChange(of: debug) { _ in
-
                                 if debug {
                                     patches.append(.debug)
                                 }
@@ -48,12 +48,27 @@ struct PatchesView: View {
                             }
                         }
 
+                        if repo == .sm64coopdx {
+                            Toggle(isOn: $dev) {
+                                Text("Development Branch")
+                                    .lineLimit(nil)
+                            }.onChange(of: dev) { _ in
+                                if dev {
+                                    patches.append(.dev)
+                                }
+                                else {
+                                    if let i = patches.firstIndex(of: .dev) {
+                                        patches.remove(at: i)
+                                    }
+                                }
+                            }
+                        }
+
                         if repo == .sm64ex || repo == .sm64ex_alo {
                             Toggle(isOn: $isFPS) {
                                 Text("60 FPS")
                                     .lineLimit(nil)
                             }.onChange(of: isFPS) { _ in
-
                                 if isFPS {
                                     patches.append(.highfps)
                                 }
@@ -111,8 +126,8 @@ struct PatchesView: View {
                             }
                         }
 
-                        if repo == .sm64ex || repo == .sm64ex_coop || repo == .render96ex || repo == .moonshine || repo == .sm64ex_alo || repo == .sm64ex_coop_dev {
-                            if repo != .sm64ex_coop && repo != .sm64ex_coop_dev {
+                        if repo == .sm64ex || repo == .sm64ex_coop || repo == .render96ex || repo == .moonshine || repo == .sm64ex_alo || repo == .sm64ex_coop_dev || repo == .sm64coopdx {
+                            if repo != .sm64ex_coop && repo != .sm64ex_coop_dev && repo != .sm64coopdx {
                                 Toggle(isOn: $isCam) {
                                     Text("Better Camera")
                                         .lineLimit(nil)
@@ -129,7 +144,7 @@ struct PatchesView: View {
                                 }
                             }
 
-                            if repo != .moonshine && repo != .sm64ex_alo && repo != .sm64ex_coop && repo != .sm64ex_coop_dev {
+                            if repo != .moonshine && repo != .sm64ex_alo && repo != .sm64ex_coop && repo != .sm64ex_coop_dev && repo != .sm64coopdx {
                                 Toggle(isOn: $extData) {
                                     Text("External Data")
                                         .lineLimit(nil)
@@ -147,7 +162,7 @@ struct PatchesView: View {
                             }
                         }
 
-                        if repo != .sm64ex_coop && repo != .sm64ex_coop_dev {
+                        if repo != .sm64ex_coop && repo != .sm64ex_coop_dev && repo != .sm64coopdx {
                             Toggle(isOn: $isDist) {
                                 Text("No Draw Distance")
                                     .lineLimit(nil)

sm_osx/RepoView.swift

@@ -31,6 +31,10 @@ struct RepoView: View {
                                     .lineLimit(nil)
                                     .tag(Repo.sm64ex_coop)
 
+                                Text("sm64coopdx")
+                                    .lineLimit(nil)
+                                    .tag(Repo.sm64coopdx)
+
                                 if devMode {
                                     Text("sm64ex-coop-dev (Only for devs)")
                                         .lineLimit(nil)

sm_osx/RomView.swift

@@ -53,10 +53,10 @@ struct RomView: View {
 
         //clone the repo
         if repo == .custom {
-            commandsCompile.append("echo 'sm_osx: Starting Clone' && cd ~/SM64Repos && rm -rf \(customRepo.name) && git clone \(customRepo.cloneURL) \(customRepo.name) && ")
+            commandsCompile.append("echo 'sm_osx: Starting Clone' && cd ~/SM64Repos && rm -rf \(customRepo.name) && git clone \(customRepo.cloneURL) \(customRepo.name) \(customRepo.branch.isEmpty ? "" : "-b \(customRepo.branch)") && ")
             print("Custom Repo Name: \(customRepo.cloneURL)")
         } else {
-            commandsCompile.append("echo 'sm_osx: Starting Clone' && cd ~/SM64Repos && rm -rf \(repo) && git clone \(repo.rawValue) \(repo) && ")
+            commandsCompile.append("echo 'sm_osx: Starting Clone' && cd ~/SM64Repos && rm -rf \(repo) && git clone \(repo.rawValue) \(repo) \(patch.contains(.dev) ? "-b dev" : "") && ")
         }
 
         //copy files
@@ -106,7 +106,7 @@ struct RomView: View {
             } else {
                 compilationCommand = "cd ~/SM64Repos/\(customRepo.name) && gmake \(customRepo.useOsxBuildFlag ? "OSX_BUILD=1" : "") \(customRepo.buildFlags) \(compSpeed.rawValue) &&"
             }
-        } else if repo == .sm64ex_coop || repo == .sm64ex_coop_dev {
+        } else if repo == .sm64ex_coop || repo == .sm64ex_coop_dev || repo == .sm64coopdx {
             compilationCommand = "cd ~/SM64Repos/\(repo) && gmake OSX_BUILD=1 USE_APP=0 EXTERNAL_DATA=0 DEBUG=\(debug) COLOR=0 \(compSpeed.rawValue) && "
         }
         else if repo == .sm64ex_alo {
@@ -154,7 +154,7 @@ struct RomView: View {
             }
         }
 
-        if repo == .sm64ex_coop || repo == .sm64ex_coop_dev || (repo == .custom && customRepo.x86_64) {
+        if repo == .custom && customRepo.x86_64 {
             commandsCompile.append("brew install glew sdl2;")
             recompileCommands.append("brew install glew sdl2;")
         }