Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feat/player move #16

Merged
merged 2 commits into from Mar 21, 2024
Merged

Feat/player move #16

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bde976e
wip: Player movement
Junyi00 Mar 20, 2024
a00b9ef
feat: Simple movement logic
Junyi00 Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 8 additions & 4 deletions star-dash/star-dash.xcodeproj/project.pbxproj
View file
Open in desktop
Expand Up @@ -76,6 +76,7 @@
4E8660622BA0964A0035530D /* Obstacle.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E8660612BA0964A0035530D /* Obstacle.swift */; };
4E8660642BA096600035530D /* Tool.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E8660632BA096600035530D /* Tool.swift */; };
4E8660662BA097D40035530D /* PhysicsConstants.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4E8660652BA097D40035530D /* PhysicsConstants.swift */; };
E638B9CF2BAB3C5D00931CC2 /* TeleportEvent.swift in Sources */ = {isa = PBXBuildFile; fileRef = E638B9CE2BAB3C5D00931CC2 /* TeleportEvent.swift */; };
E64361102BA4C2CD003850FD /* SpriteModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = E643610A2BA4C2CC003850FD /* SpriteModule.swift */; };
E64361112BA4C2CD003850FD /* SyncModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = E643610B2BA4C2CC003850FD /* SyncModule.swift */; };
E64361122BA4C2CD003850FD /* ObjectModule.swift in Sources */ = {isa = PBXBuildFile; fileRef = E643610C2BA4C2CC003850FD /* ObjectModule.swift */; };
Expand Down Expand Up @@ -200,6 +201,7 @@
4E8660612BA0964A0035530D /* Obstacle.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Obstacle.swift; sourceTree = "<group>"; };
4E8660632BA096600035530D /* Tool.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Tool.swift; sourceTree = "<group>"; };
4E8660652BA097D40035530D /* PhysicsConstants.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PhysicsConstants.swift; sourceTree = "<group>"; };
E638B9CE2BAB3C5D00931CC2 /* TeleportEvent.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TeleportEvent.swift; sourceTree = "<group>"; };
E643610A2BA4C2CC003850FD /* SpriteModule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SpriteModule.swift; sourceTree = "<group>"; };
E643610B2BA4C2CC003850FD /* SyncModule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SyncModule.swift; sourceTree = "<group>"; };
E643610C2BA4C2CC003850FD /* ObjectModule.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ObjectModule.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -313,6 +315,7 @@
14E2478D2BA22FCE0071FFC0 /* MoveEvent.swift */,
143AA38B2BA4D3E3009C28E7 /* JumpEvent.swift */,
14D14B722BA5A3CD00386C3B /* RemoveEvent.swift */,
E638B9CE2BAB3C5D00931CC2 /* TeleportEvent.swift */,
);
path = CommonEvents;
sourceTree = "<group>";
Expand Down Expand Up @@ -760,6 +763,7 @@
E6A7451B2BA0C1890080C1BE /* PlayerView.swift in Sources */,
46D418282BA5D6800091A38B /* Floor+Collidable.swift in Sources */,
46D418222BA5D4E60091A38B /* Obstacle+Collidable.swift in Sources */,
E638B9CF2BAB3C5D00931CC2 /* TeleportEvent.swift in Sources */,
E6A745162BA057040080C1BE /* MTKRenderer.swift in Sources */,
E6A745182BA057040080C1BE /* Renderer.swift in Sources */,
143AA3972BA4E0D9009C28E7 /* PickupCollectibleEvent.swift in Sources */,
Expand Down Expand Up @@ -980,7 +984,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = VFS4882B2L;
DEVELOPMENT_TEAM = EBN5NJJVSU;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "star-dash/Info.plist";
Expand All @@ -995,7 +999,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = "junyi-star-dash";
PRODUCT_BUNDLE_IDENTIFIER = "junyi-sd";
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
Expand All @@ -1014,7 +1018,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = VFS4882B2L;
DEVELOPMENT_TEAM = EBN5NJJVSU;
ENABLE_USER_SCRIPT_SANDBOXING = NO;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = "star-dash/Info.plist";
Expand All @@ -1029,7 +1033,7 @@
"@executable_path/Frameworks",
);
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = "junyi-star-dash";
PRODUCT_BUNDLE_IDENTIFIER = "junyi-sd";
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
SUPPORTS_MACCATALYST = NO;
Expand Down
3 changes: 2 additions & 1 deletion star-dash/star-dash/Constants/PhysicsConstants.swift
View file
Open in desktop
Expand Up @@ -38,8 +38,9 @@ struct PhysicsConstants {
static let obstacle = CGSize(width: 60, height: 60)
static let tool = CGSize(width: 60, height: 60)
static let wall = CGSize(width: 60, height: 60)
static let floor = CGSize(width: 60, height: 60)
static let floor = CGSize(width: 300, height: 60)
}

static let jumpImpulse = CGVector(dx: 0, dy: 80)
static let runVelocity = CGVector(dx: 50, dy: 0)
}
5 changes: 3 additions & 2 deletions star-dash/star-dash/Events/CommonEvents/JumpEvent.swift
View file
Open in desktop
Expand Up @@ -25,10 +25,11 @@ class JumpEvent: Event {
}

guard let playerComponent = target.component(ofType: PlayerComponent.self, ofEntity: entityId),
!playerComponent.isJumping else {
playerComponent.canJump else {
return
}
playerComponent.isJumping = true
playerComponent.canJump = false
playerComponent.canMove = false

physicsSystem.applyImpulse(to: entityId, impulse: jumpImpulse)
}
Expand Down
11 changes: 6 additions & 5 deletions star-dash/star-dash/Events/CommonEvents/MoveEvent.swift
View file
Open in desktop
Expand Up @@ -11,18 +11,19 @@ class MoveEvent: Event {
let timestamp: Date
let entityId: EntityId

let destination: CGPoint
let toLeft: Bool

init(on entityId: EntityId, to destination: CGPoint) {
init(on entityId: EntityId, toLeft: Bool) {
timestamp = Date.now
self.entityId = entityId
self.destination = destination
self.toLeft = toLeft
}

func execute(on target: EventModifiable) {
guard let positionSystem = target.system(ofType: PositionSystem.self) else {
guard let physicsComponent = target.component(ofType: PhysicsComponent.self, ofEntity: entityId) else {
return
}
positionSystem.move(entityId: entityId, to: destination)

physicsComponent.velocity = (toLeft ? -1 : 1) * PhysicsConstants.runVelocity
}
}
22 changes: 22 additions & 0 deletions star-dash/star-dash/Events/CommonEvents/TeleportEvent.swift
View file
Open in desktop
@@ -0,0 +1,22 @@
import Foundation

class TeleportEvent: Event {
let timestamp: Date
let entityId: EntityId

let destination: CGPoint

init(on entityId: EntityId, to destination: CGPoint) {
timestamp = Date.now
self.entityId = entityId
self.destination = destination
}

func execute(on target: EventModifiable) {
guard let positionSystem = target.system(ofType: PositionSystem.self) else {
return
}

positionSystem.move(entityId: entityId, to: destination)
}
}
3 changes: 2 additions & 1 deletion star-dash/star-dash/Events/ContactEvents/PlayerFloorContactEvent.swift
View file
Open in desktop
Expand Up @@ -19,6 +19,7 @@ class PlayerFloorContactEvent: Event {
return
}

playerComponent.isJumping = false
playerComponent.canJump = true
playerComponent.canMove = true
}
}
2 changes: 1 addition & 1 deletion star-dash/star-dash/Events/PlayerEvents/RespawnEvent.swift
View file
Open in desktop
Expand Up @@ -20,6 +20,6 @@ class RespawnEvent: Event {
}

func execute(on target: EventModifiable) {
target.add(event: MoveEvent(on: entityId, to: newPosition))
target.add(event: TeleportEvent(on: entityId, to: newPosition))
}
}
3 changes: 2 additions & 1 deletion star-dash/star-dash/GameEngine/Components/PlayerComponent.swift
View file
Open in desktop
Expand Up @@ -3,7 +3,8 @@ import Foundation
class PlayerComponent: Component {

let playerIndex: Int
var isJumping = false
var canJump = true
var canMove = true

init(id: ComponentId, entityId: EntityId, playerIndex: Int) {
self.playerIndex = playerIndex
Expand Down
9 changes: 8 additions & 1 deletion star-dash/star-dash/GameEngine/GameEngine.swift
View file
Open in desktop
Expand Up @@ -43,8 +43,15 @@ class GameEngine {
eventManager.add(event: JumpEvent(on: playerEntityId, by: PhysicsConstants.jumpImpulse))
}

func handlePlayerMove() {
func handlePlayerMove(toLeft: Bool) {
guard let playerEntityId = entityManager.playerEntityId(),
let physicsComponent = entityManager.component(ofType: PhysicsComponent.self, of: playerEntityId),
let playerComponent = entityManager.component(ofType: PlayerComponent.self, of: playerEntityId),
playerComponent.canMove else {
return
}

eventManager.add(event: MoveEvent(on: playerEntityId, toLeft: toLeft))
}

private func setUpSystems() {
Expand Down
2 changes: 1 addition & 1 deletion star-dash/star-dash/Rendering/ControlViewDelegate.swift
View file
Open in desktop
@@ -1,5 +1,5 @@
protocol ControlViewDelegate: AnyObject {

func joystickMoved(isLeft: Bool)
func joystickMoved(toLeft: Bool)
func jumpButtonPressed()
}
4 changes: 2 additions & 2 deletions star-dash/star-dash/Rendering/MTKRenderer/ControlView.swift
View file
Open in desktop
Expand Up @@ -58,7 +58,7 @@

// MARK: Gesture handler methods

@objc func jumpButtonTapped() {

Check failure on line 61 in star-dash/star-dash/Rendering/MTKRenderer/ControlView.swift

View workflow job for this annotation

GitHub Actions / build 

Attributes should be on their own lines in functions and types, but on the same line as variables and imports. (attributes)
controlViewDelegate?.jumpButtonPressed()
}

Expand All @@ -85,7 +85,7 @@
joystickView?.returnJoystick()
}

@objc func handlePan(_ gesture: UIPanGestureRecognizer) {

Check failure on line 88 in star-dash/star-dash/Rendering/MTKRenderer/ControlView.swift

View workflow job for this annotation

GitHub Actions / build 

Attributes should be on their own lines in functions and types, but on the same line as variables and imports. (attributes)
guard let joystickView = self.joystickView else {
return
}
Expand All @@ -98,12 +98,12 @@

if shouldSendMoveEvent(location: location) {
let isLeft = gesture.location(in: joystickView).x < joystickView.center.x
controlViewDelegate?.joystickMoved(isLeft: isLeft)
controlViewDelegate?.joystickMoved(toLeft: isLeft)
}
}
}

private func shouldSendMoveEvent(location: CGPoint) -> Bool {
false
true
}
}
4 changes: 2 additions & 2 deletions star-dash/star-dash/Rendering/MTKRenderer/MTKRenderer.swift
View file
Open in desktop
Expand Up @@ -70,8 +70,8 @@ extension MTKRenderer: MTKViewDelegate {
}

extension MTKRenderer: ControlViewDelegate {
func joystickMoved(isLeft: Bool) {
viewDelegate?.joystickMoved(isLeft: isLeft)
func joystickMoved(toLeft: Bool) {
viewDelegate?.joystickMoved(toLeft: toLeft)
}

func jumpButtonPressed() {
Expand Down
2 changes: 1 addition & 1 deletion star-dash/star-dash/Rendering/ViewDelegate.swift
View file
Open in desktop
@@ -1,5 +1,5 @@
protocol ViewDelegate: AnyObject {

func joystickMoved(isLeft: Bool)
func joystickMoved(toLeft: Bool)
func jumpButtonPressed()
}
4 changes: 2 additions & 2 deletions star-dash/star-dash/ViewController.swift
View file
Open in desktop
Expand Up @@ -80,8 +80,8 @@ extension ViewController: SDSceneDelegate {

extension ViewController: ViewDelegate {

func joystickMoved(isLeft: Bool) {

func joystickMoved(toLeft: Bool) {
gameEngine?.handlePlayerMove(toLeft: toLeft)
}

func jumpButtonPressed() {
Expand Down