Skip to content

Commit 4ba875a

Browse files
EmeraldLocEmeraldLoc
committed
Lots of patches and junk.
1 parent 34b5552 commit 4ba875a

File tree

10 files changed

+233
-60
lines changed

10 files changed

+233
-60
lines changed

‎sm_osx.xcodeproj/project.pbxproj‎

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,27 +9,29 @@
99
/* Begin PBXBuildFile section */
1010
960D46F627D6850D0056E393 /* BuildingSteps.swift in Sources */ = {isa = PBXBuildFile; fileRef = 960D46F527D6850D0056E393 /* BuildingSteps.swift */; };
1111
9669DC5C27D5565000DE5FAB /* sm_osxApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9669DC5B27D5565000DE5FAB /* sm_osxApp.swift */; };
12-
9669DC5E27D5565000DE5FAB /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9669DC5D27D5565000DE5FAB /* ContentView.swift */; };
1312
9669DC6027D5565100DE5FAB /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9669DC5F27D5565100DE5FAB /* Assets.xcassets */; };
1413
9669DC6327D5565100DE5FAB /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 9669DC6227D5565100DE5FAB /* Preview Assets.xcassets */; };
1514
9669DC6B27D5581F00DE5FAB /* Repos.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9669DC6A27D5581F00DE5FAB /* Repos.swift */; };
1615
9669DC6D27D55CD200DE5FAB /* Patches.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9669DC6C27D55CD200DE5FAB /* Patches.swift */; };
1716
9669DC6F27D55D5300DE5FAB /* PatchesView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9669DC6E27D55D5300DE5FAB /* PatchesView.swift */; };
1817
9669DC7127D55F4700DE5FAB /* RomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 9669DC7027D55F4700DE5FAB /* RomView.swift */; };
18+
96BB22E327E274F700057915 /* RepoView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96BB22E227E274F700057915 /* RepoView.swift */; };
19+
96CF3D4227DBD8C7008A26F5 /* CompilationSpeed.swift in Sources */ = {isa = PBXBuildFile; fileRef = 96CF3D4127DBD8C7008A26F5 /* CompilationSpeed.swift */; };
1920
/* End PBXBuildFile section */
2021

2122
/* Begin PBXFileReference section */
2223
960D46F527D6850D0056E393 /* BuildingSteps.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = BuildingSteps.swift; sourceTree = "<group>"; };
2324
9669DC5827D5565000DE5FAB /* sm_osx.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = sm_osx.app; sourceTree = BUILT_PRODUCTS_DIR; };
2425
9669DC5B27D5565000DE5FAB /* sm_osxApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = sm_osxApp.swift; sourceTree = "<group>"; };
25-
9669DC5D27D5565000DE5FAB /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = "<group>"; };
2626
9669DC5F27D5565100DE5FAB /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
2727
9669DC6227D5565100DE5FAB /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = "<group>"; };
2828
9669DC6427D5565100DE5FAB /* sm_osx.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = sm_osx.entitlements; sourceTree = "<group>"; };
2929
9669DC6A27D5581F00DE5FAB /* Repos.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Repos.swift; sourceTree = "<group>"; };
3030
9669DC6C27D55CD200DE5FAB /* Patches.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Patches.swift; sourceTree = "<group>"; };
3131
9669DC6E27D55D5300DE5FAB /* PatchesView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PatchesView.swift; sourceTree = "<group>"; };
3232
9669DC7027D55F4700DE5FAB /* RomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RomView.swift; sourceTree = "<group>"; };
33+
96BB22E227E274F700057915 /* RepoView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = RepoView.swift; sourceTree = "<group>"; };
34+
96CF3D4127DBD8C7008A26F5 /* CompilationSpeed.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CompilationSpeed.swift; sourceTree = "<group>"; };
3335
/* End PBXFileReference section */
3436

3537
/* Begin PBXFrameworksBuildPhase section */
@@ -63,7 +65,6 @@
6365
isa = PBXGroup;
6466
children = (
6567
9669DC5B27D5565000DE5FAB /* sm_osxApp.swift */,
66-
9669DC5D27D5565000DE5FAB /* ContentView.swift */,
6768
9669DC5F27D5565100DE5FAB /* Assets.xcassets */,
6869
9669DC6427D5565100DE5FAB /* sm_osx.entitlements */,
6970
9669DC6127D5565100DE5FAB /* Preview Content */,
@@ -72,6 +73,8 @@
7273
9669DC6E27D55D5300DE5FAB /* PatchesView.swift */,
7374
9669DC7027D55F4700DE5FAB /* RomView.swift */,
7475
960D46F527D6850D0056E393 /* BuildingSteps.swift */,
76+
96CF3D4127DBD8C7008A26F5 /* CompilationSpeed.swift */,
77+
96BB22E227E274F700057915 /* RepoView.swift */,
7578
);
7679
path = sm_osx;
7780
sourceTree = "<group>";
@@ -114,7 +117,7 @@
114117
attributes = {
115118
BuildIndependentTargetsInParallel = 1;
116119
LastSwiftUpdateCheck = 1320;
117-
LastUpgradeCheck = 1320;
120+
LastUpgradeCheck = 1330;
118121
TargetAttributes = {
119122
9669DC5727D5565000DE5FAB = {
120123
CreatedOnToolsVersion = 13.2.1;
@@ -159,11 +162,12 @@
159162
buildActionMask = 2147483647;
160163
files = (
161164
9669DC6D27D55CD200DE5FAB /* Patches.swift in Sources */,
165+
96CF3D4227DBD8C7008A26F5 /* CompilationSpeed.swift in Sources */,
162166
9669DC7127D55F4700DE5FAB /* RomView.swift in Sources */,
163167
960D46F627D6850D0056E393 /* BuildingSteps.swift in Sources */,
164168
9669DC6F27D55D5300DE5FAB /* PatchesView.swift in Sources */,
165169
9669DC6B27D5581F00DE5FAB /* Repos.swift in Sources */,
166-
9669DC5E27D5565000DE5FAB /* ContentView.swift in Sources */,
170+
96BB22E327E274F700057915 /* RepoView.swift in Sources */,
167171
9669DC5C27D5565000DE5FAB /* sm_osxApp.swift in Sources */,
168172
);
169173
runOnlyForDeploymentPostprocessing = 0;
@@ -222,6 +226,8 @@
222226
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
223227
GCC_WARN_UNUSED_FUNCTION = YES;
224228
GCC_WARN_UNUSED_VARIABLE = YES;
229+
INFOPLIST_KEY_UILaunchScreen_Generation = NO;
230+
INFOPLIST_KEY_UIStatusBarHidden = NO;
225231
MACOSX_DEPLOYMENT_TARGET = 12.1;
226232
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
227233
MTL_FAST_MATH = YES;
@@ -277,6 +283,8 @@
277283
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
278284
GCC_WARN_UNUSED_FUNCTION = YES;
279285
GCC_WARN_UNUSED_VARIABLE = YES;
286+
INFOPLIST_KEY_UILaunchScreen_Generation = NO;
287+
INFOPLIST_KEY_UIStatusBarHidden = NO;
280288
MACOSX_DEPLOYMENT_TARGET = 12.1;
281289
MTL_ENABLE_DEBUG_INFO = NO;
282290
MTL_FAST_MATH = YES;
@@ -298,7 +306,7 @@
298306
CURRENT_PROJECT_VERSION = 1;
299307
DEVELOPMENT_ASSET_PATHS = "\"sm_osx/Preview Content\"";
300308
DEVELOPMENT_TEAM = 25RK3JMVLT;
301-
ENABLE_HARDENED_RUNTIME = NO;
309+
ENABLE_HARDENED_RUNTIME = YES;
302310
ENABLE_PREVIEWS = YES;
303311
GENERATE_INFOPLIST_FILE = YES;
304312
INFOPLIST_KEY_NSHumanReadableCopyright = "";
@@ -307,7 +315,7 @@
307315
"@executable_path/../Frameworks",
308316
);
309317
MARKETING_VERSION = 1.0;
310-
ONLY_ACTIVE_ARCH = YES;
318+
ONLY_ACTIVE_ARCH = NO;
311319
PRODUCT_BUNDLE_IDENTIFIER = "com.CubingStudios.sm-osx";
312320
PRODUCT_NAME = "$(TARGET_NAME)";
313321
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -327,7 +335,7 @@
327335
CURRENT_PROJECT_VERSION = 1;
328336
DEVELOPMENT_ASSET_PATHS = "\"sm_osx/Preview Content\"";
329337
DEVELOPMENT_TEAM = 25RK3JMVLT;
330-
ENABLE_HARDENED_RUNTIME = NO;
338+
ENABLE_HARDENED_RUNTIME = YES;
331339
ENABLE_PREVIEWS = YES;
332340
GENERATE_INFOPLIST_FILE = YES;
333341
INFOPLIST_KEY_NSHumanReadableCopyright = "";

‎sm_osx.xcodeproj/xcshareddata/xcschemes/sm_osx.xcscheme‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Scheme
3-
LastUpgradeVersion = "1320"
4-
version = "1.3">
3+
LastUpgradeVersion = "1330"
4+
version = "1.7">
55
<BuildAction
66
parallelizeBuildables = "YES"
77
buildImplicitDependencies = "YES">
@@ -23,15 +23,15 @@
2323
</BuildActionEntries>
2424
</BuildAction>
2525
<TestAction
26-
buildConfiguration = "Debug"
26+
buildConfiguration = "Release"
2727
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
2828
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
2929
shouldUseLaunchSchemeArgsEnv = "YES">
3030
<Testables>
3131
</Testables>
3232
</TestAction>
3333
<LaunchAction
34-
buildConfiguration = "Debug"
34+
buildConfiguration = "Release"
3535
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
3636
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
3737
launchStyle = "0"
@@ -50,6 +50,10 @@
5050
ReferencedContainer = "container:sm_osx.xcodeproj">
5151
</BuildableReference>
5252
</BuildableProductRunnable>
53+
<LocationScenarioReference
54+
identifier = "com.apple.dt.IDEFoundation.CurrentLocationScenarioIdentifier"
55+
referenceType = "1">
56+
</LocationScenarioReference>
5357
</LaunchAction>
5458
<ProfileAction
5559
buildConfiguration = "Release"

‎sm_osx/BuildingSteps.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ enum CompilationProcess: String {
1414
case copyingFiles = "Copying Files..."
1515
case compiling = "Compiling, this may take a while, please be patient."
1616
case finishingUp = "Finishing Up..."
17-
case finished = "Finshied!"
17+
case finished = "Finshed!"
1818
case nothing = ""
1919
case error = "Error!"
2020
case rosetta = "Make sure you are runing this app with rosetta"

‎sm_osx/CompilationSpeed.swift‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
//
2+
// CompilationSpeed.swift
3+
// sm_osx
4+
//
5+
// Created by Caleb Elmasri on 3/11/22.
6+
//
7+
8+
import Foundation
9+
10+
enum Speed: String {
11+
case slow = ""
12+
case fast = "-j2"
13+
case veryFast = "-j4"
14+
case fastest = "-j8"
15+
}

‎sm_osx/Patches.swift‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,11 @@ import Foundation
1010
enum Patches: String {
1111
case omm = "https://github.com/PeachyPeachSM64/sm64pc-omm.git"
1212
case highfps = "60Fps"
13+
case extMoveset = "Extended Moveset"
1314
case bettercam = "Better Camera"
1415
case drawdistance = "No Draw Distance"
16+
case extData = "External Data"
17+
case timeTrials = "Time Trials"
18+
case captainToadStars = "Captain Toad Stars"
1519
case nothing = ""
1620
}

‎sm_osx/PatchesView.swift‎

Lines changed: 70 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,13 @@ struct PatchesView: View {
1111

1212
var repo: Repo
1313
@State var isOmm = false
14+
@State var isToadStars = false
15+
@State var extMoveset = false
1416
@State var isFPS = false
1517
@State var isCam = false
1618
@State var isDist = false
19+
@State var extData = false
20+
@State var timeTrials = false
1721
@State var patches = [Patches]()
1822

1923
var body: some View {
@@ -40,6 +44,34 @@ struct PatchesView: View {
4044
}
4145
}
4246

47+
Toggle(isOn: $timeTrials) {
48+
Text("Time Trial")
49+
}.onChange(of: timeTrials) { _ in
50+
51+
if timeTrials {
52+
patches.append(.timeTrials)
53+
}
54+
else {
55+
if let i = patches.firstIndex(of: .timeTrials) {
56+
patches.remove(at: i)
57+
}
58+
}
59+
}
60+
61+
Toggle(isOn: $isToadStars) {
62+
Text("\(Patches.captainToadStars.rawValue)")
63+
}.onChange(of: isToadStars) { _ in
64+
65+
if isToadStars {
66+
patches.append(.captainToadStars)
67+
}
68+
else {
69+
if let i = patches.firstIndex(of: .captainToadStars) {
70+
patches.remove(at: i)
71+
}
72+
}
73+
}
74+
4375
Toggle(isOn: $isOmm) {
4476
Text("Oddysey Mario Moveset")
4577
}.onChange(of: isOmm) { _ in
@@ -53,8 +85,36 @@ struct PatchesView: View {
5385
}
5486
}
5587
}
88+
89+
Toggle(isOn: $extMoveset) {
90+
Text("External Moveset")
91+
}.onChange(of: extMoveset) { _ in
92+
93+
if extMoveset {
94+
patches.append(.extMoveset)
95+
}
96+
else {
97+
if let i = patches.firstIndex(of: .extMoveset) {
98+
patches.remove(at: i)
99+
}
100+
}
101+
}
102+
103+
Toggle(isOn: $isDist) {
104+
Text("No Draw Distance")
105+
}.onChange(of: isDist) { _ in
106+
107+
if isDist {
108+
patches.append(.drawdistance)
109+
}
110+
else {
111+
if let i = patches.firstIndex(of: .drawdistance) {
112+
patches.remove(at: i)
113+
}
114+
}
115+
}
56116
}
57-
if repo == .sm64ex || repo == .sm64ex_coop {
117+
if repo == .sm64ex || repo == .sm64ex_coop || repo == .render96ex {
58118
Toggle(isOn: $isCam) {
59119
Text("Better Camera")
60120
}.onChange(of: isCam) { _ in
@@ -69,21 +129,23 @@ struct PatchesView: View {
69129
}
70130
}
71131

72-
Toggle(isOn: $isDist) {
73-
Text("No Draw Distance")
74-
}.onChange(of: isDist) { _ in
132+
Toggle(isOn: $extData) {
133+
Text("External Data")
134+
}.onChange(of: extData) { _ in
75135

76-
if isDist {
77-
patches.append(.drawdistance)
136+
if extData {
137+
patches.append(.extData)
78138
}
79139
else {
80-
if let i = patches.firstIndex(of: .drawdistance) {
140+
if let i = patches.firstIndex(of: .extData) {
81141
patches.remove(at: i)
82142
}
83143
}
84144
}
85145
}
86-
146+
if repo == .sm64ex || repo == .render96ex {
147+
148+
}
87149

88150
NavigationLink(destination:RomView(patch: patches, repo: repo)) {
89151
Text("Next")

sm_osx/ContentView.swift renamed to sm_osx/RepoView.swift

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
//
2-
// ContentView.swift
2+
// RepoView.swift
33
// sm_osx
44
//
5-
// Created by Caleb Elmasri on 3/6/22.
5+
// Created by Caleb Elmasri on 3/16/22.
66
//
77

88
import SwiftUI
99

10-
struct ContentView: View {
10+
struct RepoView: View {
1111

1212
@State var shell = RomView(patch: [Patches](), repo: .sm64ex)
1313

@@ -28,6 +28,12 @@ struct ContentView: View {
2828
Text("sm64ex-coop (Runs via Rosetta)")
2929
.lineLimit(nil)
3030
}
31+
32+
NavigationLink(destination: PatchesView(repo: .render96ex)) {
33+
34+
Text("Render96ex")
35+
.lineLimit(nil)
36+
}
3137
}
3238
Spacer()
3339

@@ -42,8 +48,8 @@ struct ContentView: View {
4248
}
4349
}
4450

45-
struct ContentView_Previews: PreviewProvider {
51+
struct RepoView_Previews: PreviewProvider {
4652
static var previews: some View {
47-
ContentView()
53+
RepoView()
4854
}
4955
}

‎sm_osx/Repos.swift‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@ import Foundation
99

1010
enum Repo: String {
1111
case sm64ex = "https://github.com/EmeraldLoc/sm64ex.git"
12+
case render96ex = "https://github.com/EmeraldLoc/sm64ex.git --branch alpha"
1213
case sm64ex_coop = "https://github.com/djoslin0/sm64ex-coop.git"
1314
}

0 commit comments

Comments
 (0)