-
Notifications
You must be signed in to change notification settings - Fork 7
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.
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
Integration between Board Generation and Minigames #23
base: tiles
Are you sure you want to change the base?
Conversation
…board as anchor updates
…o model and collision components
…rk on displaying board outline based on camera orientation
…age) and disabled ARTrackingConfig once board has been placed
Conflicts: ARrehab/ARrehab.xcodeproj/project.pbxproj ARrehab/ARrehab/ViewManipulation.swift
…of intermediary print statements
Reflects new ViewController organization.
Shall we begin merging everything into master? I think everything is "working" at this point. TraceGame crashes occasionally but I haven't been able to reliably reproduce it... #25 Definitely still have some work to do with the background #26 and the tile coloring when the background is active #27 but perhaps we can roll this out once content / storyline is decided. |
Reorganize TraceGame, removed Experience.rcproject, added background
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
partial review.
import UIKit | ||
|
||
/* | ||
Defines the visual attributes of the 'Generate Board' button to be added to the view during board generation |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Swift Documentation.
import UIKit | ||
|
||
/* | ||
Defines the visual attributes of the 'Rotate Board' button to be added to the view during board generation |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Swift Documentation
} | ||
} | ||
|
||
func isCorner(coord: Tile.Coordinates) -> Bool{ |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add Swift Documentation.
class Minigame : Entity { | ||
|
||
/// Score / completion status of the minigame in the range [0.0, 100.0] | ||
@Published var score : Float |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Create a better definition for score.
return view | ||
}() | ||
|
||
private lazy var progressView: MultiProgressView = { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Add documentation.
import ARKit | ||
import RealityKit | ||
|
||
/* |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
turn into swift mkdwn
}) | ||
} | ||
|
||
func startMinigame(gameType: Game) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
document
|
||
// MARK: Switching between Board and Minigame | ||
extension ViewController { | ||
func addCollision() { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
document
ARrehab/ARrehab/ViewController.swift
Outdated
controller.didMove(toParent: self) | ||
} | ||
|
||
func setupMinigames(ground: AnchorEntity) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
document
|
||
/// AR View | ||
@IBOutlet var arView: ARView! | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
document variables
No description provided.