Compare commits
No commits in common. 'master' and 'firstTest' have entirely different histories.
@ -1,153 +0,0 @@
|
||||
//
|
||||
// GameVM.swift
|
||||
// DouShouQiIOS
|
||||
//
|
||||
// Created by Pierre FERREIRA on 12/06/2024.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import DouShouQiModel
|
||||
import SpriteKit
|
||||
import SwiftUI
|
||||
|
||||
/**
|
||||
* GameVM
|
||||
* Cette classe est utilisée pour gérer la logique du jeu
|
||||
*/
|
||||
class GameVM : ObservableObject, Identifiable {
|
||||
|
||||
@Published var game: Game
|
||||
|
||||
@Published var gameScene: GameScene
|
||||
@Published var isGameOver: Bool = false
|
||||
|
||||
///Error
|
||||
@Published var hasError : Bool = false
|
||||
|
||||
///Message
|
||||
@Published var displayMessage : String = ""
|
||||
|
||||
public init(withGame _game : Game, andScene _gameScene : GameScene) {
|
||||
|
||||
self.game = _game
|
||||
self.gameScene = _gameScene
|
||||
|
||||
///Abonnement aux événements
|
||||
self.game.addGameStartedListener(onGameStart)
|
||||
self.game.addPlayerNotifiedListener(onPlayerNotified)
|
||||
self.game.addMoveChosenCallbacksListener(onMoveChosen)
|
||||
self.game.addInvalidMoveCallbacksListener(onInvalidMove)
|
||||
self.game.addBoardChangedListener(onBoardChanged)
|
||||
self.game.addGameOverListener(onGameOver)
|
||||
//self.game?.addGameChangedListener({}) - //? cas persistance
|
||||
|
||||
self.subscribesToMeeple()
|
||||
|
||||
///Lancement du jeu
|
||||
Task{
|
||||
try! await self.game.start()
|
||||
}
|
||||
}
|
||||
|
||||
/// Début du jeu
|
||||
func onGameStart(board : Board){
|
||||
displayMessage = "==>> 🎉 GAME STARTS! 🎉 <<=="
|
||||
self.gameScene.displayBoard(board)
|
||||
}
|
||||
|
||||
/// Notification du joueur
|
||||
func onPlayerNotified(board : Board, player : Player) async{
|
||||
if player is HumanPlayer {
|
||||
displayMessage = "Player \(player.id == .player1 ? "🟡 1" : "🔴 2") - \(player.name), it's your turn!"
|
||||
}
|
||||
else {
|
||||
do{
|
||||
_ = try await player.chooseMove(in: board, with: self.game.rules)
|
||||
}
|
||||
catch{
|
||||
hasError = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/// Mouvement choisi
|
||||
func onMoveChosen(board : Board, move : Move, player : Player){
|
||||
///Récupération du Meeple :
|
||||
let movedPiece = board.grid[move.rowOrigin][move.columnOrigin]
|
||||
let meeples = gameScene.pieces[move.owner]
|
||||
|
||||
let meeple = meeples?.first(where: {
|
||||
$0.key == movedPiece.piece?.animal
|
||||
})
|
||||
meeple?.value.cellPosition = CGPoint(x: move.rowDestination, y: move.columnDestination)
|
||||
|
||||
}
|
||||
|
||||
///Mouvement invalide
|
||||
func onInvalidMove(board : Board, move : Move, player : Player, result : Bool){
|
||||
displayMessage = "⚠️⚠️⚠️⚠️ Invalid Move detected: \(move) by \(player.name) (\(player.id))"
|
||||
|
||||
if result { ///* invalidité terminante
|
||||
if let piece = board.grid[move.rowDestination][move.columnDestination].piece{
|
||||
let meeples = gameScene.pieces[player.id == .player1 ? .player2 : .player1]
|
||||
let meeple = meeples?.first(where: {
|
||||
$0.key == piece.animal
|
||||
})
|
||||
meeple?.value.parent?.removeChildren(in: [meeple!.value])
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
///* invalidité non terminante
|
||||
let piece = board.grid[move.rowOrigin][move.columnOrigin]
|
||||
let meeples = gameScene.pieces[move.owner]
|
||||
let meeple = meeples?.first(where: {
|
||||
$0.key == piece.piece?.animal
|
||||
})
|
||||
|
||||
meeple?.value.cellPosition = CGPoint(x: move.rowOrigin, y: move.columnOrigin);
|
||||
}
|
||||
|
||||
///Changement de plateau
|
||||
func onBoardChanged(board : Board){
|
||||
/// Bruit d'un placement de pion ?
|
||||
}
|
||||
|
||||
///Fin du jeu
|
||||
func onGameOver(board : Board, result : Result, winner : Player?){
|
||||
displayMessage = "Game Over!!!"
|
||||
isGameOver = true ///Gestion par l'appelant
|
||||
}
|
||||
|
||||
///*Meeples
|
||||
///Abonnement aux mouvements des Meeples
|
||||
func subscribesToMeeple(){
|
||||
for meeple in gameScene.pieces[.player1]!{
|
||||
meeple.value.observers.append(meepleMoved)
|
||||
}
|
||||
for meeple in gameScene.pieces[.player2]!{
|
||||
meeple.value.observers.append(meepleMoved)
|
||||
}
|
||||
}
|
||||
|
||||
///*Mouvement d'un Meeple
|
||||
func meepleMoved(spriteMeeple: SpriteMeeple, startX: Int, startY: Int, endX: Int, endY: Int) async{
|
||||
let owner : Owner = game.board.grid[startX][startY].piece!.owner
|
||||
let otherPlayer : Owner = self.game.rules.getNextPlayer()
|
||||
|
||||
let move: Move = Move(of: owner, fromRow: startX, andFromColumn: startY, toRow: endX, andToColumn: endY)
|
||||
if(otherPlayer != owner){ ///Mauvais Joueur pour ce jeton
|
||||
onInvalidMove(board: game.board, move: move, player: game.players[otherPlayer]!, result: false)
|
||||
return
|
||||
}
|
||||
|
||||
if let player: HumanPlayer = game.players[owner] as? HumanPlayer{
|
||||
try! await player.chooseMove(move)
|
||||
}
|
||||
// else { ///! IMPOSSIBLE DE CAST LE JOUEUR HUMAIN ==> SIGABRT
|
||||
// let player: HumanPlayer = game.players[.player1] as! HumanPlayer
|
||||
// try! await player.chooseMove(move)
|
||||
// }
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,53 +0,0 @@
|
||||
//
|
||||
// ImagePicker.swift
|
||||
// DouShouQiIOS
|
||||
//
|
||||
// Created by Pierre FERREIRA on 17/06/2024.
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
|
||||
/// ImagePicker
|
||||
/// Classe récupéré d'internet pour permettre de choisir une image dans la galerie
|
||||
struct ImagePicker: UIViewControllerRepresentable {
|
||||
@Environment(\.presentationMode) private var presentationMode
|
||||
var sourceType: UIImagePickerController.SourceType = .photoLibrary
|
||||
@Binding var selectedImage: UIImage
|
||||
|
||||
func makeUIViewController(context: UIViewControllerRepresentableContext<ImagePicker>) -> UIImagePickerController {
|
||||
|
||||
let imagePicker = UIImagePickerController()
|
||||
imagePicker.allowsEditing = false
|
||||
imagePicker.sourceType = sourceType
|
||||
imagePicker.delegate = context.coordinator
|
||||
|
||||
return imagePicker
|
||||
}
|
||||
|
||||
func updateUIViewController(_ uiViewController: UIImagePickerController, context: UIViewControllerRepresentableContext<ImagePicker>) {
|
||||
|
||||
}
|
||||
|
||||
func makeCoordinator() -> Coordinator {
|
||||
Coordinator(self)
|
||||
}
|
||||
|
||||
final class Coordinator: NSObject, UIImagePickerControllerDelegate, UINavigationControllerDelegate {
|
||||
|
||||
var parent: ImagePicker
|
||||
|
||||
init(_ parent: ImagePicker) {
|
||||
self.parent = parent
|
||||
}
|
||||
|
||||
func imagePickerController(_ picker: UIImagePickerController, didFinishPickingMediaWithInfo info: [UIImagePickerController.InfoKey : Any]) {
|
||||
|
||||
if let image = info[UIImagePickerController.InfoKey.originalImage] as? UIImage {
|
||||
parent.selectedImage = image
|
||||
}
|
||||
|
||||
parent.presentationMode.wrappedValue.dismiss()
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@ -1,6 +0,0 @@
|
||||
{
|
||||
"info" : {
|
||||
"author" : "xcode",
|
||||
"version" : 1
|
||||
}
|
||||
}
|
||||
@ -1,21 +0,0 @@
|
||||
//
|
||||
// StubbedPlayers.swift
|
||||
// DouShouQiIOS
|
||||
//
|
||||
// Created by Pierre FERREIRA on 12/06/2024.
|
||||
//
|
||||
|
||||
import Foundation
|
||||
import DouShouQiModel
|
||||
|
||||
// Liste de joueurs fictifs afin de tester l'application.
|
||||
struct StubbedPlayers{
|
||||
|
||||
//(Joueurs populaires de Gun-gi)//
|
||||
let meruem : PlayerVM = PlayerVM(with: Player(withName: "Meruemu", andId: .player1)!)
|
||||
let kumogi : PlayerVM = PlayerVM(with: Player(withName: "Kumogi", andId: .player2)!)
|
||||
|
||||
func getStubbedPlayer() -> [PlayerVM] {
|
||||
return [meruem, kumogi]
|
||||
}
|
||||
}
|
||||
@ -1,95 +0,0 @@
|
||||
//
|
||||
// PlayerSelect.swift
|
||||
// DouShouQiIOS
|
||||
//
|
||||
// Created by Pierre FERREIRA on 17/06/2024.
|
||||
//
|
||||
|
||||
import SwiftUI
|
||||
|
||||
/// PlayerSelect
|
||||
/// Cette vue est utilisée pour sélectionner un joueur
|
||||
struct PlayerSelect: View {
|
||||
@State private var image = UIImage()
|
||||
@State private var showSheet = false
|
||||
|
||||
|
||||
var versus : Bool
|
||||
var body: some View {
|
||||
ZStack {
|
||||
Rectangle().fill(Color.bgColor).ignoresSafeArea()
|
||||
VStack {
|
||||
VStack{
|
||||
Text("Joueur 1")
|
||||
|
||||
HStack {
|
||||
Image(uiImage: self.image)
|
||||
.resizable()
|
||||
.cornerRadius(50)
|
||||
.frame(width: 100, height: 100)
|
||||
.background(Color.black.opacity(0.2))
|
||||
.aspectRatio(contentMode: .fill)
|
||||
.clipShape(Circle())
|
||||
|
||||
ClassicTextDisplay(text: "Change photo")
|
||||
.onTapGesture {
|
||||
showSheet = true
|
||||
}
|
||||
}
|
||||
.padding(.horizontal, 20)
|
||||
.sheet(isPresented: $showSheet) {
|
||||
ImagePicker(sourceType: .photoLibrary, selectedImage: self.$image)
|
||||
}
|
||||
|
||||
TextField("Entrez un nom ici",text: .constant(""))
|
||||
}.foregroundStyle(.primary)
|
||||
.padding(20)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: 16)
|
||||
.stroke(Color.player1, lineWidth: 5)
|
||||
)
|
||||
.padding(40)
|
||||
|
||||
if (versus){
|
||||
|
||||
VStack{
|
||||
Text("Joueur 1")
|
||||
|
||||
HStack {
|
||||
Image(uiImage: self.image)
|
||||
.resizable()
|
||||
.cornerRadius(50)
|
||||
.frame(width: 100, height: 100)
|
||||
.background(Color.black.opacity(0.2))
|
||||
.aspectRatio(contentMode: .fill)
|
||||
.clipShape(Circle())
|
||||
|
||||
ClassicTextDisplay(text: "Change photo")
|
||||
.onTapGesture {
|
||||
showSheet = true
|
||||
}
|
||||
}
|
||||
.padding(.horizontal, 20)
|
||||
.sheet(isPresented: $showSheet) {
|
||||
ImagePicker(sourceType: .photoLibrary, selectedImage: self.$image)
|
||||
}
|
||||
|
||||
TextField("Entrez un nom ici",text: .constant(""))
|
||||
}.foregroundStyle(.primary)
|
||||
.padding(20)
|
||||
.overlay(
|
||||
RoundedRectangle(cornerRadius: 16)
|
||||
.stroke(Color.player2, lineWidth: 5)
|
||||
)
|
||||
.padding(40)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct PlayerSelect_Previews: PreviewProvider {
|
||||
static var previews: some View {
|
||||
PlayerSelect(versus: true)
|
||||
}
|
||||
}
|
||||
@ -1,64 +1,2 @@
|
||||
# SwiftUiTp
|
||||
|
||||
Projet de DouShouQi avec SwiftUI-SpriteKit et ARKit
|
||||
|
||||
## Overview
|
||||
|
||||
Ce projet est une implémentation du jeu de société traditionnel chinois Dou Shou Qi, également connu sous le nom de Jeu de la Jungle, pour les appareils iOS. Il s'agit d'un jeu stratégique à deux joueurs dans lequel chaque joueur contrôle huit pions représentants différents animaux ayant des rangs et des pouvoirs variés. L'objectif est de capturer la tanière de l'adversaire ou d'éliminer toutes les pièces adverses.
|
||||
|
||||
## Technologies utilisées
|
||||
|
||||
- **Swift** : Le principal langage de programmation pour le développement d'applications iOS.
|
||||
- **SpriteKit** : Une puissante infrastructure de rendu graphique et d'animation intégrée à iOS pour la création de jeux en 2D.
|
||||
- **Xcode** : L'environnement de développement intégré (IDE) pour macOS, utilisé pour le développement d'applications iOS.
|
||||
|
||||
## Features
|
||||
- Gestion d'un thème sombre en fonction du thème du device
|
||||
- Menu
|
||||
- Affichage d'une historique dynamique en fonction de données stubées
|
||||
- ARKIT : Affichage d'une component Board dans un WorldPannel, sans la logique de jeu
|
||||
- (SpriteKit) Affichage d'une board dynamique en 2D, mais lié qu'avec une partie des règles de jeu
|
||||
- Jetons personnalisés
|
||||
- Gestion des mouvements invalides
|
||||
|
||||
|
||||
## Featuresn't
|
||||
- L'applications n'a pas d'options multilingue
|
||||
- Aucune persistance de données
|
||||
- Création de joueur non géré
|
||||
- Impossibilité de lancer une partie
|
||||
- Impossibilité de lancer le jeu contre une IA
|
||||
- Modification des joueurs commencée, mais abandonnée car j'ai perdu trop de temps dessus, et qu'il aurait fallu recoder le modèle pour cette simple fonctionnalité (cela m'a permis quand même de toucher au Binding)
|
||||
|
||||
## Erreur
|
||||
Une erreur SIGABRT est levée lors d'une cast d'un ``Player?`` en ``HumainPlayer``, je n'ai pas réussi à régler ce problème.
|
||||
Possible problèmes dû au nettoyage car aucuns test n'a été effectué ensuite.
|
||||
|
||||
|
||||
|
||||
|
||||
# :construction_worker: Développeur
|
||||
|
||||
- Pierre FERREIRA : pierre.ferreira@etu.uca.fr
|
||||
|
||||
<div align="center">
|
||||
<a href = "https://codefirst.iut.uca.fr/git/pierre.ferreira">
|
||||
<img src="https://codefirst.iut.uca.fr/git/avatars/edbacace5f621ae77077f206ebdcee27?size=870" width="50" >
|
||||
</a>
|
||||
|
||||
© IUT - Auvergne
|
||||
</div>
|
||||
|
||||
---
|
||||
|
||||
|
||||
<div style="display: flex; align-items: center;">
|
||||
<p><i><strong>While writing this README, I was listening to...</strong></i></p>
|
||||
<a href="https://www.youtube.com/watch?v=TaRleMb7eH0" target="_blank" style="text-decoration: none;">
|
||||
<img src="https://img.youtube.com/vi/TaRleMb7eH0/0.jpg" alt="YouTube Thumbnail" style="width: 120px; margin-right: 10px;">
|
||||
</a>
|
||||
<div>
|
||||
<p><strong>Pure Vessel - Hollow Knight OST Extended</strong></p>
|
||||
<p><em>Team Cherry - (2017)</em></p>
|
||||
</div>
|
||||
</div>
|
||||
Loading…
Reference in new issue