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

pull #28

Open
wants to merge 33 commits into
base: gh-pages
Choose a base branch
from
Open

pull #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
1f91b3d
Update README.md
maureen-n-n Mar 8, 2022
553765f
Update README.md
maureen-n-n Mar 8, 2022
a1ad24d
Update README.md
maureen-n-n Mar 8, 2022
e63ea76
Create Phase_2_Discussions
maureen-n-n Mar 8, 2022
37bd597
Update Phase_2_Discussions
maureen-n-n Mar 8, 2022
12aa138
Rename Phase_2_Discussions to Phase_2_Discussions.md
maureen-n-n Mar 8, 2022
0397309
Update Phase_2_Discussions.md
maureen-n-n Mar 8, 2022
76acedf
Create README.mb
itsket Mar 14, 2022
6ed9954
Add files via upload
itsket Mar 14, 2022
cd9a3dd
Update README.mb
itsket Mar 14, 2022
92062ef
Add files via upload
maureen-n-n Mar 14, 2022
c293da1
Create frame.png
DhruvVal Mar 14, 2022
81b1394
Add files via upload
maureen-n-n Mar 15, 2022
ce1672a
Add files via upload
MissCrispenCakes Mar 15, 2022
3443323
Add files via upload
itsket Mar 16, 2022
2059932
Create -
itsket Mar 29, 2022
d3dd34d
Add files via upload
itsket Mar 29, 2022
d2de3c8
Add files via upload
itsket Mar 30, 2022
b95b000
Delete blooming2blooming.glb
itsket Mar 30, 2022
98ff260
Add files via upload
itsket Mar 30, 2022
530ca2f
Add files via upload
itsket Mar 30, 2022
b0f2800
Delete Screen Shot 2022-03-13 at 11.53.46 PM.png
itsket Apr 5, 2022
10e320b
Delete Screen Shot 2022-03-13 at 11.53.58 PM.png
itsket Apr 5, 2022
442425f
these are the final product. (might need to slow down Animation
itsket Apr 7, 2022
5b34d62
Merge pull request #29 from robots-make-art-too/main
DhruvVal Apr 8, 2022
2a947ba
Merge pull request #30 from robots-make-art-too/Kerthana
DhruvVal Apr 8, 2022
2f387ba
push
DhruvVal Apr 10, 2022
2e321bd
.
DhruvVal Apr 10, 2022
c2e4f5e
phase3
D1cksonh Apr 19, 2022
dd209a1
task
D1cksonh Apr 19, 2022
0667188
Update Breif Description + Tasks.md
D1cksonh Apr 19, 2022
028e277
description
D1cksonh Apr 19, 2022
f215663
Update README.md
D1cksonh Apr 19, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions Phase 3 Documentation/Breif Description + Tasks.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Phase 3
## Brief description
Our AR scene shows the different stages of a Sunflower from it being planted in dirt to its final stage. The AR scene will show the stages of a flower seed being planted into dirt and being sprouted into a large flower. The goal when creating this project is to experiment with intractable augmented reality tools and also showcase the process of a seed growing into a flower. The stages being Dirt, Seed, Seed in Dirt, Sprouting and Adult Sunflower, each of the stages are. The AR can be interacted with using the keyboard and the mouse. Pressing the WASD keys can allow the camera to move around and clicking and dragging with the mouse can rotate the camera.

## What each person contributed to the group project

### Keerthana
- Created all of the 3D Models that was used for the project (dirt model, seed model, sunflower model)
- Created 2 Animations, One for the sun and One of watering a plant (Unfortunately was not used)

### Dhruv
- Coding of making the AR project
- Monitored progress of the project
- Phase 3 Documentation
- Github Organization

### Dickson
- Created and customized the Github Page
- Coding of making the AR project
- Github Organization
- Made QR code that Links to the Website
- Recorded video of project working

### Maureen
- Searched resources to be used for the project
- Created the Hiro marker for the project (Unfortunately was not used)

### Tarek
- Some minor customization to the Github Website
- Searched resources to be used for the project
9 changes: 9 additions & 0 deletions Phase 3 Documentation/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
# Here is the phase 3 documentation

## What is located here
- A pdf file of a brief description and each tasks that each group member did
- A google drive video showcasing the AR device working

## Google drive of video demos
- https://drive.google.com/drive/folders/1AolyuyLBx-47YzB2x3y7bStb2BD-LVwp?usp=sharing
- Will need you to use your YORKU email to access
4 changes: 4 additions & 0 deletions Phase_2_Discussions.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
## Group Discussion - March 8
- chose a basic idea for our 3D model and how it will function - after scanning the barcode marker for the AR scene, a model of a seed that goes into dirt that sprouts and becomes a tree that changes through out the season will display
- allocated work to everyone
- started working on making the github website
Binary file added QR code to scene/qr-code.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 5 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,14 @@
Ideas
## Ideas
- Game idea "Like the chrome dinosaur game but more advance"
- A tamagotchi game but in ar
- Something that uses a facecam

Best Contact Info
## Best Contact Info
- Dickson = Discord: Tsung#1331, Email: [email protected]
- Tarek = Discord: Crocostar27#1764, Email: [email protected]
- Maureen = Discord: plum#9307, Email: [email protected]
- Dhruv = Discord: Untamed#8696, Email: [email protected]
- Keerthana = Discord: itskueen#4716, Email: [email protected]

## Phase 3 documentation
https://github.com/robots-make-art-too/Group-14-CrocPlumTsungUntamedKueen/tree/main/Phase%203%20Documentation
195 changes: 195 additions & 0 deletions ar_marker/pattern-sprout_marker.patt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,195 @@
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 255
255 255 255 0 0 2 255 255 0 0 0 0 255 255 255 255
255 255 0 0 0 0 0 225 0 0 0 255 255 255 255 255
255 255 255 0 0 0 0 11 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 0 0 0 0 0 0 255 255 255 255 255
255 255 255 0 0 0 0 0 0 0 0 0 0 255 255 255
255 218 0 0 0 0 0 0 0 0 0 0 0 0 255 255
255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 255
255 255 255 0 0 2 255 255 0 0 0 0 255 255 255 255
255 255 0 0 0 0 0 225 0 0 0 255 255 255 255 255
255 255 255 0 0 0 0 11 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 0 0 0 0 0 0 255 255 255 255 255
255 255 255 0 0 0 0 0 0 0 0 0 0 255 255 255
255 218 0 0 0 0 0 0 0 0 0 0 0 0 255 255
255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 0 0 0 0 255 255 255
255 255 255 0 0 2 255 255 0 0 0 0 255 255 255 255
255 255 0 0 0 0 0 225 0 0 0 255 255 255 255 255
255 255 255 0 0 0 0 11 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 0 0 0 0 0 0 255 255 255 255 255
255 255 255 0 0 0 0 0 0 0 0 0 0 255 255 255
255 218 0 0 0 0 0 0 0 0 0 0 0 0 255 255
255 0 0 0 0 0 0 0 0 0 0 0 0 0 0 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255

255 255 255 255 255 255 255 255 255 255 254 233 188 226 255 255
255 255 255 255 255 255 255 255 255 255 234 155 83 215 255 255
255 253 215 219 244 254 255 255 255 245 178 55 56 213 255 255
255 250 118 72 150 229 254 255 254 209 95 11 53 213 255 255
255 251 100 21 50 174 244 255 243 158 34 3 53 213 255 255
255 254 127 21 8 118 225 255 220 108 7 3 53 213 255 255
255 255 190 62 9 82 204 253 197 74 0 3 53 213 255 255
255 255 240 166 86 71 143 188 141 46 0 3 53 213 255 255
255 255 255 242 177 76 95 167 143 50 0 3 53 213 255 255
255 255 255 250 167 51 77 195 201 81 0 3 53 213 255 255
255 255 255 235 98 16 48 176 221 110 5 3 53 213 255 255
255 255 255 215 64 5 59 184 240 149 26 3 53 213 255 255
255 255 255 215 67 22 114 218 252 195 72 7 53 213 255 255
255 255 255 238 120 100 195 250 255 236 152 35 55 213 255 255
255 255 255 254 224 225 246 255 255 254 223 128 74 214 255 255
255 255 255 255 255 255 255 255 255 255 253 226 176 224 255 255
255 255 255 255 255 255 255 255 255 255 254 233 188 226 255 255
255 255 255 255 255 255 255 255 255 255 234 155 83 215 255 255
255 253 215 219 244 254 255 255 255 245 178 55 56 213 255 255
255 250 118 72 150 229 254 255 254 209 95 11 53 213 255 255
255 251 100 21 50 174 244 255 243 158 34 3 53 213 255 255
255 254 127 21 8 118 225 255 220 108 7 3 53 213 255 255
255 255 190 62 9 82 204 253 197 74 0 3 53 213 255 255
255 255 240 166 86 71 143 188 141 46 0 3 53 213 255 255
255 255 255 242 177 76 95 167 143 50 0 3 53 213 255 255
255 255 255 250 167 51 77 195 201 81 0 3 53 213 255 255
255 255 255 235 98 16 48 176 221 110 5 3 53 213 255 255
255 255 255 215 64 5 59 184 240 149 26 3 53 213 255 255
255 255 255 215 67 22 114 218 252 195 72 7 53 213 255 255
255 255 255 238 120 100 195 250 255 236 152 35 55 213 255 255
255 255 255 254 224 225 246 255 255 254 223 128 74 214 255 255
255 255 255 255 255 255 255 255 255 255 253 226 176 224 255 255
255 255 255 255 255 255 255 255 255 255 254 233 188 226 255 255
255 255 255 255 255 255 255 255 255 255 234 155 83 215 255 255
255 253 215 219 244 254 255 255 255 245 178 55 56 213 255 255
255 250 118 72 150 229 254 255 254 209 95 11 53 213 255 255
255 251 100 21 50 174 244 255 243 158 34 3 53 213 255 255
255 254 127 21 8 118 225 255 220 108 7 3 53 213 255 255
255 255 190 62 9 82 204 253 197 74 0 3 53 213 255 255
255 255 240 166 86 71 143 188 141 46 0 3 53 213 255 255
255 255 255 242 177 76 95 167 143 50 0 3 53 213 255 255
255 255 255 250 167 51 77 195 201 81 0 3 53 213 255 255
255 255 255 235 98 16 48 176 221 110 5 3 53 213 255 255
255 255 255 215 64 5 59 184 240 149 26 3 53 213 255 255
255 255 255 215 67 22 114 218 252 195 72 7 53 213 255 255
255 255 255 238 120 100 195 250 255 236 152 35 55 213 255 255
255 255 255 254 224 225 246 255 255 254 223 128 74 214 255 255
255 255 255 255 255 255 255 255 255 255 253 226 176 224 255 255

255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
226 215 213 213 213 213 213 213 213 213 213 213 213 213 214 224
188 83 56 53 53 53 53 53 53 53 53 53 53 55 74 176
233 155 55 11 3 3 3 3 3 3 3 3 7 35 128 226
254 234 178 95 34 7 0 0 0 0 5 26 72 152 223 253
255 255 245 209 158 108 74 46 50 81 110 149 195 236 254 255
255 255 255 254 243 220 197 141 143 201 221 240 252 255 255 255
255 255 255 255 255 255 253 188 167 195 176 184 218 250 255 255
255 255 255 254 244 225 204 143 95 77 48 59 114 195 246 255
255 255 254 229 174 118 82 71 76 51 16 5 22 100 225 255
255 255 244 150 50 8 9 86 177 167 98 64 67 120 224 255
255 255 219 72 21 21 62 166 242 250 235 215 215 238 254 255
255 255 215 118 100 127 190 240 255 255 255 255 255 255 255 255
255 255 253 250 251 254 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
226 215 213 213 213 213 213 213 213 213 213 213 213 213 214 224
188 83 56 53 53 53 53 53 53 53 53 53 53 55 74 176
233 155 55 11 3 3 3 3 3 3 3 3 7 35 128 226
254 234 178 95 34 7 0 0 0 0 5 26 72 152 223 253
255 255 245 209 158 108 74 46 50 81 110 149 195 236 254 255
255 255 255 254 243 220 197 141 143 201 221 240 252 255 255 255
255 255 255 255 255 255 253 188 167 195 176 184 218 250 255 255
255 255 255 254 244 225 204 143 95 77 48 59 114 195 246 255
255 255 254 229 174 118 82 71 76 51 16 5 22 100 225 255
255 255 244 150 50 8 9 86 177 167 98 64 67 120 224 255
255 255 219 72 21 21 62 166 242 250 235 215 215 238 254 255
255 255 215 118 100 127 190 240 255 255 255 255 255 255 255 255
255 255 253 250 251 254 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255
226 215 213 213 213 213 213 213 213 213 213 213 213 213 214 224
188 83 56 53 53 53 53 53 53 53 53 53 53 55 74 176
233 155 55 11 3 3 3 3 3 3 3 3 7 35 128 226
254 234 178 95 34 7 0 0 0 0 5 26 72 152 223 253
255 255 245 209 158 108 74 46 50 81 110 149 195 236 254 255
255 255 255 254 243 220 197 141 143 201 221 240 252 255 255 255
255 255 255 255 255 255 253 188 167 195 176 184 218 250 255 255
255 255 255 254 244 225 204 143 95 77 48 59 114 195 246 255
255 255 254 229 174 118 82 71 76 51 16 5 22 100 225 255
255 255 244 150 50 8 9 86 177 167 98 64 67 120 224 255
255 255 219 72 21 21 62 166 242 250 235 215 215 238 254 255
255 255 215 118 100 127 190 240 255 255 255 255 255 255 255 255
255 255 253 250 251 254 255 255 255 255 255 255 255 255 255 255
255 255 255 255 255 255 255 255 255 255 255 255 255 255 255 255

255 255 224 176 226 253 255 255 255 255 255 255 255 255 255 255
255 255 214 74 128 223 254 255 255 246 225 224 254 255 255 255
255 255 213 55 35 152 236 255 250 195 100 120 238 255 255 255
255 255 213 53 7 72 195 252 218 114 22 67 215 255 255 255
255 255 213 53 3 26 149 240 184 59 5 64 215 255 255 255
255 255 213 53 3 5 110 221 176 48 16 98 235 255 255 255
255 255 213 53 3 0 81 201 195 77 51 167 250 255 255 255
255 255 213 53 3 0 50 143 167 95 76 177 242 255 255 255
255 255 213 53 3 0 46 141 188 143 71 86 166 240 255 255
255 255 213 53 3 0 74 197 253 204 82 9 62 190 255 255
255 255 213 53 3 7 108 220 255 225 118 8 21 127 254 255
255 255 213 53 3 34 158 243 255 244 174 50 21 100 251 255
255 255 213 53 11 95 209 254 255 254 229 150 72 118 250 255
255 255 213 56 55 178 245 255 255 255 254 244 219 215 253 255
255 255 215 83 155 234 255 255 255 255 255 255 255 255 255 255
255 255 226 188 233 254 255 255 255 255 255 255 255 255 255 255
255 255 224 176 226 253 255 255 255 255 255 255 255 255 255 255
255 255 214 74 128 223 254 255 255 246 225 224 254 255 255 255
255 255 213 55 35 152 236 255 250 195 100 120 238 255 255 255
255 255 213 53 7 72 195 252 218 114 22 67 215 255 255 255
255 255 213 53 3 26 149 240 184 59 5 64 215 255 255 255
255 255 213 53 3 5 110 221 176 48 16 98 235 255 255 255
255 255 213 53 3 0 81 201 195 77 51 167 250 255 255 255
255 255 213 53 3 0 50 143 167 95 76 177 242 255 255 255
255 255 213 53 3 0 46 141 188 143 71 86 166 240 255 255
255 255 213 53 3 0 74 197 253 204 82 9 62 190 255 255
255 255 213 53 3 7 108 220 255 225 118 8 21 127 254 255
255 255 213 53 3 34 158 243 255 244 174 50 21 100 251 255
255 255 213 53 11 95 209 254 255 254 229 150 72 118 250 255
255 255 213 56 55 178 245 255 255 255 254 244 219 215 253 255
255 255 215 83 155 234 255 255 255 255 255 255 255 255 255 255
255 255 226 188 233 254 255 255 255 255 255 255 255 255 255 255
255 255 224 176 226 253 255 255 255 255 255 255 255 255 255 255
255 255 214 74 128 223 254 255 255 246 225 224 254 255 255 255
255 255 213 55 35 152 236 255 250 195 100 120 238 255 255 255
255 255 213 53 7 72 195 252 218 114 22 67 215 255 255 255
255 255 213 53 3 26 149 240 184 59 5 64 215 255 255 255
255 255 213 53 3 5 110 221 176 48 16 98 235 255 255 255
255 255 213 53 3 0 81 201 195 77 51 167 250 255 255 255
255 255 213 53 3 0 50 143 167 95 76 177 242 255 255 255
255 255 213 53 3 0 46 141 188 143 71 86 166 240 255 255
255 255 213 53 3 0 74 197 253 204 82 9 62 190 255 255
255 255 213 53 3 7 108 220 255 225 118 8 21 127 254 255
255 255 213 53 3 34 158 243 255 244 174 50 21 100 251 255
255 255 213 53 11 95 209 254 255 254 229 150 72 118 250 255
255 255 213 56 55 178 245 255 255 255 254 244 219 215 253 255
255 255 215 83 155 234 255 255 255 255 255 255 255 255 255 255
255 255 226 188 233 254 255 255 255 255 255 255 255 255 255 255
Binary file added ar_marker/pattern-sprout_marker.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added blooming2blooming-2.glb
View file
Open in desktop
Binary file not shown.