yodaluca23/Pomelo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

New Update

Browse Source
This commit is contained in:
Stossy11 2024-12-01 12:52:27 +11:00
parent e76a82be9f
commit 310a339433
7 changed files with 317 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Pomelo.xcodeproj/project.pbxproj
View File

@ -79,6 +79,7 @@
4E4AF1312C92867F00BBF2DE /* libteakra.xcframework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 38C846C82C1DCE8900331706 /* libteakra.xcframework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
4E5855E32CB6770F00047C2A /* AskForJIT.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E5855E22CB6770F00047C2A /* AskForJIT.swift */; };
4E5855E62CB6776C00047C2A /* utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 4E5855E52CB6776C00047C2A /* utils.m */; };
4E8A15ED2CED7C5400E53177 /* DisclamerView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E8A15EC2CED7C5000E53177 /* DisclamerView.swift */; };
4EA0AA602CB6845700B51C64 /* JITEnabler.m in Sources */ = {isa = PBXBuildFile; fileRef = 4EA0AA5F2CB6845700B51C64 /* JITEnabler.m */; };
4EC662B02CAA1229000DBC5F /* SwiftUIJoystick in Frameworks */ = {isa = PBXBuildFile; productRef = 4EC662AF2CAA1229000DBC5F /* SwiftUIJoystick */; };
4EC662B42CAA1257000DBC5F /* JoystickView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4EC662B32CAA1254000DBC5F /* JoystickView.swift */; };
@ -199,6 +200,7 @@
4E5855E42CB6776C00047C2A /* utils.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = utils.h; sourceTree = "<group>"; };
4E5855E52CB6776C00047C2A /* utils.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = utils.m; sourceTree = "<group>"; };
4E7E03662C9667D200C10AFD /* OpenGLES.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = OpenGLES.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS18.0.sdk/System/Library/Frameworks/OpenGLES.framework; sourceTree = DEVELOPER_DIR; };
4E8A15EC2CED7C5000E53177 /* DisclamerView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DisclamerView.swift; sourceTree = "<group>"; };
4EA0AA592CB6785B00B51C64 /* Sudachi.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Sudachi.xcodeproj; path = Sudachi/Sudachi.xcodeproj; sourceTree = "<group>"; };
4EA0AA5F2CB6845700B51C64 /* JITEnabler.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = JITEnabler.m; sourceTree = "<group>"; };
4EC662B32CAA1254000DBC5F /* JoystickView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = JoystickView.swift; sourceTree = "<group>"; };
@ -461,6 +463,7 @@
386F6F2E2C42E62200C62EBE /* SettingsViews */ = {
isa = PBXGroup;
children = (
4E8A15EB2CED7C4800E53177 /* Disclamer */,
4EE4734E2CDEE7AB000A010C /* Apple ID Login */,
4EE593FD2C5FA1C4000939C4 /* AppIcon */,
38020F572C43AFD400029E9A /* CoreSettings */,
@ -585,6 +588,14 @@
path = FolderMonitor;
sourceTree = "<group>";
};
4E8A15EB2CED7C4800E53177 /* Disclamer */ = {
isa = PBXGroup;
children = (
4E8A15EC2CED7C5000E53177 /* DisclamerView.swift */,
);
path = Disclamer;
sourceTree = "<group>";
};
4EA0AA5A2CB6785B00B51C64 /* Products */ = {
isa = PBXGroup;
children = (
@ -831,6 +842,7 @@
3841946A2C4E4D2B00396613 /* MetalView.swift in Sources */,
3841946B2C4E4D2B00396613 /* SudachiEmulationScreenView.swift in Sources */,
499A5E0F2C74A22D00EC0925 /* GameButtonListView.swift in Sources */,
4E8A15ED2CED7C5400E53177 /* DisclamerView.swift in Sources */,
4EE462BF2CB5708800BF268E /* Zoomable.swift in Sources */,
3841946C2C4E4D2B00396613 /* ControllerView.swift in Sources */,
38B7FE022C7610A600D274FB /* AirPlay.swift in Sources */,

17
Pomelo/ContentView.swift
View File

@ -19,6 +19,20 @@ struct ContentView: View {
@AppStorage("showMetalHUD") var showMetalHUD: Bool = false
@AppStorage("canShowMetalHUD") var canShowMetalHUD: Bool = false
@State var core = Core(games: [], root: FileManager.default.urls(for: .documentDirectory, in: .userDomainMask)[0])
@AppStorage("disclamerAgreed") var dismisseddisclamer = false
var binding: Binding<Bool> {
.init(
get: { !dismisseddisclamer },
set: { dismisseddisclamer in
self.dismisseddisclamer = !dismisseddisclamer
}
)
}
var body: some View {
//NavView(core: $core) // pain and suffering
LibraryView(urlgame: $urlgame, core: core)
@ -31,6 +45,9 @@ struct ContentView: View {
urlgame = core.games.first(where: { String(describing: $0.programid) == text }) // i had .map(\.self) here that broke compiling on other Xcode versions
}
})
.sheet(isPresented: binding, content: {
LegalDisclaimerView(isinsettings: false)
})
.onAppear() {
Air.play(AnyView(
Text("Select Game")

2
Pomelo/Emulation/EmulationHandlers/SudachiEmulationHandler.swift
View File

@ -49,7 +49,7 @@ class SudachiEmulationViewModel: ObservableObject {
// startGameTimer() // Start the timer when the game starts
DispatchQueue.global(qos: .userInteractive).async { [self] in
DispatchQueue.global(qos: .userInitiated).async { [self] in
if let sudachiGame = self.sudachiGame {
if sudachiGame.fileURL == URL(string: "BootMii") {
self.sudachi.bootMii()

229
Pomelo/LibraryViews/GameList/GameListView.swift
View File

@ -7,68 +7,65 @@
//
import SwiftUI
import Foundation
import UIKit
import UniformTypeIdentifiers
import Sudachi
struct GameListView: View {
@Binding var core: Core
@Binding var selectedGame: PomeloGame?
@State private var alapsedtime: [String: TimeInterval] = [:] // Loaded later
@State private var hourminssecs: Int = 0 // Tracks display format for elapsed time
@State private var alapsedtime: [String: TimeInterval] = [:]
@State private var hourminssecs: Int = 0
@State var timeString: String = ""
@State private var gameOrder: [String] = []
@State private var draggingItem: PomeloGame?
var body: some View {
ScrollView(.horizontal, showsIndicators: false) {
HStack(spacing: 0) {
ForEach(core.games.prefix(12)) { game in
ForEach(reorderedGames, id: \.title) { game in
GameIconView(game: game, selectedGame: $selectedGame)
.onAppear {
if let gametime = alapsedtime[game.title] {
switch hourminssecs {
case 0:
timeString = String(format: "%.2f hours", gametime / 3600)
case 1:
timeString = String(format: "%.2f minutes", gametime / 60)
case 2:
timeString = String(format: "%.2f seconds", gametime)
default:
timeString = "0"
}
}
updateTimeString(for: game)
}
.contextMenu {
if let gametime = alapsedtime[game.title] {
Button {
hourminssecs = (hourminssecs + 1) % 3
switch hourminssecs {
case 0:
timeString = String(format: "%.2f hours", gametime / 3600)
case 1:
timeString = String(format: "%.2f minutes", gametime / 60)
case 2:
timeString = String(format: "%.2f seconds", gametime)
default:
timeString = "0"
}
} label: {
Text("Time Elapsed: \(timeString)")
}
contextMenu(for: game)
}
.onDrag {
draggingItem = game
return NSItemProvider(object: game.title as NSString)
}
.onDrop(of: [UTType.plainText], isTargeted: nil) { providers in
guard let draggingItem = draggingItem else { return false }
// Get the destination index
let destinationIndex = reorderedGames.firstIndex(where: { $0.title == game.title }) ?? 0
// Get the source index
let sourceIndex = reorderedGames.firstIndex(where: { $0.title == draggingItem.title }) ?? 0
// Don't do anything if dropping on itself
if sourceIndex == destinationIndex {
return false
}
// Update the game order
var updatedOrder = gameOrder
if updatedOrder.isEmpty {
updatedOrder = reorderedGames.map { $0.title }
}
let movingTitle = updatedOrder.remove(at: sourceIndex)
// If dropping after the item
if sourceIndex < destinationIndex {
updatedOrder.insert(movingTitle, at: destinationIndex - 1)
} else {
Text("Time Elapsed: 0")
}
Button {
UIPasteboard.general.string = String(describing: game.programid)
} label: {
Text("Game ID: \(String(describing: game.programid))")
}
Button {
saveImageToIconsFolder(gameImageData: game.imageData, imageName: game.title)
} label: {
Text("Save Icon")
updatedOrder.insert(movingTitle, at: destinationIndex)
}
gameOrder = updatedOrder
saveGameOrderToFile()
return true
}
}
@ -91,15 +88,69 @@ struct GameListView: View {
}
.onAppear {
loadElapsedTime()
selectedGame = core.games.first
loadGameOrderFromFile()
}
}
// Function to load elapsed time
private func loadElapsedTime() {
alapsedtime = loadElapsedTimeFromJSON()
private var reorderedGames: [PomeloGame] {
if gameOrder.isEmpty {
// Remove duplicates by converting to Set and back to Array
let uniqueGames = Array(Set(core.games))
return uniqueGames
}
// Create a dictionary for quick lookup of indices, keeping only the first occurrence of each title
var orderDict: [String: Int] = [:]
for (index, title) in gameOrder.enumerated() {
if orderDict[title] == nil {
orderDict[title] = index
}
}
// Sort games based on the order dictionary
return core.games.sorted { game1, game2 in
let index1 = orderDict[game1.title] ?? Int.max
let index2 = orderDict[game2.title] ?? Int.max
return index1 < index2
}
}
private func updateTimeString(for game: PomeloGame) {
if let gametime = alapsedtime[game.title] {
switch hourminssecs {
case 0: timeString = String(format: "%.2f hours", gametime / 3600)
case 1: timeString = String(format: "%.2f minutes", gametime / 60)
case 2: timeString = String(format: "%.2f seconds", gametime)
default: timeString = "0"
}
}
}
private func contextMenu(for game: PomeloGame) -> some View {
Group {
if let gametime = alapsedtime[game.title] {
Button {
hourminssecs = (hourminssecs + 1) % 3
updateTimeString(for: game)
} label: {
Text("Time Elapsed: \(timeString)")
}
} else {
Text("Time Elapsed: 0")
}
Button {
UIPasteboard.general.string = String(describing: game.programid)
} label: {
Text("Game ID: \(String(describing: game.programid))")
}
Button {
saveImageToIconsFolder(gameImageData: game.imageData, imageName: game.title)
} label: {
Text("Save Icon")
}
}
}
func saveImageToIconsFolder(gameImageData: Data, imageName: String) {
// Convert Data to UIImage
if let image = UIImage(data: gameImageData) {
@ -163,4 +214,82 @@ struct GameListView: View {
return (doestitleexist, doesprodexist)
}
private func loadGameOrderFromFile() {
let fileURL = getOrderFileURL()
guard let data = try? Data(contentsOf: fileURL),
let savedOrder = try? JSONDecoder().decode([String].self, from: data) else {
print("No saved game order found or failed to decode.")
// Remove duplicates when creating initial order
gameOrder = Array(Set(core.games.map { $0.title }))
saveGameOrderToFile()
return
}
// Remove duplicates from saved order while maintaining order of first occurrence
var seenTitles = Set<String>()
gameOrder = savedOrder.filter { title in
guard !seenTitles.contains(title) else { return false }
seenTitles.insert(title)
return core.games.contains { $0.title == title }
}
// Add any new games to the end of the order
let existingTitles = Set(gameOrder)
let newGames = core.games.filter { !existingTitles.contains($0.title) }
gameOrder.append(contentsOf: newGames.map { $0.title })
}
private func saveGameOrderToFile() {
let fileURL = getOrderFileURL()
do {
let data = try JSONEncoder().encode(gameOrder)
try data.write(to: fileURL, options: .atomic)
} catch {
print("Failed to save game order: \(error)")
}
}
private func getOrderFileURL() -> URL {
let documentsDirectory = FileManager.default.urls(for: .documentDirectory, in: .userDomainMask).first!
return documentsDirectory.appendingPathComponent("gameOrder.json")
}
private func loadElapsedTime() {
alapsedtime = loadElapsedTimeFromJSON()
}
}
// Drop Delegate for reordering
struct GameDropDelegate: DropDelegate {
let currentGame: PomeloGame
@Binding var games: [PomeloGame]
@Binding var gameOrder: [String]
let saveOrder: () -> Void
func performDrop(info: DropInfo) -> Bool {
guard let item = info.itemProviders(for: [UTType.plainText]).first else {
return false
}
item.loadItem(forTypeIdentifier: UTType.plainText.identifier) { data, _ in
DispatchQueue.main.async {
if let string = data as? String, let draggedGame = games.first(where: { $0.title == string }) {
// Update game order
if let fromIndex = games.firstIndex(of: draggedGame),
let toIndex = games.firstIndex(of: currentGame) {
games.move(fromOffsets: IndexSet(integer: fromIndex), toOffset: toIndex)
gameOrder = games.map { $0.title }
saveOrder()
}
}
}
}
return true
}
}

3
Pomelo/PomeloApp.swift
View File

@ -44,7 +44,8 @@ struct PomeloApp: App {
"MVK_CONFIG_USE_METAL_ARGUMENT_BUFFERS": "1",
"MVK_USE_METAL_PRIVATE_API": "1",
"MVK_CONFIG_RESUME_LOST_DEVICE": "1",
"MVK_CONFIG_USE_METAL_PRIVATE_API": "1"
"MVK_CONFIG_USE_METAL_PRIVATE_API": "1",
// "MVK_CONFIG_ALLOW_METAL_NON_STANDARD_IMAGE_COPIES": "1"
]
settings.forEach { strins in

90
Pomelo/SettingsViews/Disclamer/DisclamerView.swift Normal file
View File

@ -0,0 +1,90 @@
//
// DisclamerView.swift
// Pomelo
//
// Created by Stossy11 on 20/11/2024.
// Copyright © 2024 Stossy11. All rights reserved.
//
import SwiftUI
struct LegalDisclaimerView: View {
@AppStorage("disclamerAgreed") var dismisseddisclamer = false
@State private var navigateToApp = false
@Environment(\.dismiss) var dismiss
@State var agreedToDisclaimer: Bool = false
@State var isinsettings: Bool
@State var timestapped = 0
var body: some View {
ScrollView {
VStack(alignment: .leading, spacing: 20) {
Text("Terms and Conditions")
.font(.largeTitle)
.bold()
.padding(.bottom, 10)
Text("""
This software is an emulator provided for educational and personal use purposes only. By using this software, you agree to the following terms and conditions:
1. You are solely responsible for obtaining game files (ROMs) and system keys from your legally owned devices and games. These files must be obtained in compliance with your local copyright laws.
2. The creators and maintainers of this emulator strictly prohibit the illegal distribution, duplication, or use of copyrighted material. Any use of this software that violates copyright law is entirely your responsibility.
3. This emulator is intended only for users who own the original hardware and software. By proceeding, you confirm that you own the games and hardware for which you are using this software.
4. The developers of this emulator disclaim all liability for damages, losses, or legal consequences resulting from the use of this software. The responsibility for compliance with copyright and intellectual property laws rests entirely with you, the user.
5. By using this software, you agree that you are solely liable for any misuse, and you absolve the developers of all responsibility for how this emulator is used.
6. Any ROM you play on this emulator is your responsibility, including ensuring that its usage complies with all applicable laws and regulations. The developers hold no liability for improper use.
Failure to agree to these terms means you are not permitted to use this software and could result in legal issues. \(!isinsettings ? "Please exit now if you do not agree." : "") \((timestapped > 10) ? "(or in other words just piracy is on you / not allowed)" : "")
""")
.font(.body)
.padding()
.background(Color(.secondarySystemBackground))
.cornerRadius(10)
.onTapGesture {
timestapped += 1
}
if !isinsettings {
Toggle(isOn: $agreedToDisclaimer) {
Text("I have read and agree to the terms above.")
.font(.headline)
.foregroundColor(agreedToDisclaimer ? .green : .primary)
}
.padding()
if agreedToDisclaimer {
Button {
dismisseddisclamer = false
dismiss()
} label: {
Text("Proceed to Pomelo")
.frame(maxWidth: .infinity)
.padding()
.background(Color.blue)
.foregroundColor(.white)
.cornerRadius(10)
}
.padding(.top, 20)
} else {
Text("You must agree to the terms before proceeding.")
.foregroundColor(.red)
.font(.caption)
.padding(.top, 10)
}
}
}
.padding()
}
.navigationTitle("Disclaimer")
}
}

16
Pomelo/SettingsViews/SettingsView.swift
View File

@ -170,6 +170,22 @@ struct SettingsView: View {
.padding(.horizontal)
}
NavigationLink(destination: LegalDisclaimerView(isinsettings: true)) {
Rectangle()
.fill(Color(uiColor: UIColor.secondarySystemBackground)) // Set the fill color (optional)
.cornerRadius(10) // Apply rounded corners
.frame(width: .infinity, height: 50) // Set the desired dimensions
.overlay() {
HStack {
Text("Terms and Conditions")
.foregroundColor(.primary)
.padding()
Spacer()
}
}
}
.padding()
HStack(alignment: .center) {
Spacer()