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

Feature/3d #14

Merged
merged 15 commits into from
Dec 24, 2019
Merged

Feature/3d #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d3495de
Added CAD models for guard and info centre. Added grass.
UtkarshKunwar Dec 24, 2019
5965b1d
Added CAD models for food and drinks shop and exit.
UtkarshKunwar Dec 24, 2019
03d5cf7
Added missing CAD files.
UtkarshKunwar Dec 24, 2019
fde12c3
Added CAD for journalist.
UtkarshKunwar Dec 24, 2019
5ab0670
Added CAD models for festival evil guest with dancing.
UtkarshKunwar Dec 24, 2019
7e92857
Added CAD models for stages and performers.
UtkarshKunwar Dec 24, 2019
367d65c
Fixed grapic issue of border.
UtkarshKunwar Dec 24, 2019
0b607ed
Merge pull request #11 from UtkarshKunwar/feature/party_chill
RocketSumit Dec 24, 2019
362dbf5
Parameters added
RocketSumit Dec 24, 2019
1e46b8a
Fixed order of displays.
UtkarshKunwar Dec 24, 2019
fbe2215
Added switch for guards behaviour. Changed charts.
UtkarshKunwar Dec 24, 2019
8fe2683
Added legend and labels for species for 3D
UtkarshKunwar Dec 24, 2019
864b1ee
Merge pull request #13 from UtkarshKunwar/feature/legend3D
UtkarshKunwar Dec 24, 2019
d8b864a
Changed filename for submission.
UtkarshKunwar Dec 24, 2019
7df2c02
Added base file for submission.
UtkarshKunwar Dec 24, 2019
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
Binary file added includes/data/grass.jpg
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.
304 changes: 304 additions & 0 deletions includes/mesh/drinks.obj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,304 @@
####
#
# OBJ File Generated by Meshlab
#
####
# Object drinks.obj
#
# Vertices: 216
# Faces: 72
#
####
v 1000.000000 0.000000 0.000000
v 1000.000000 0.000000 1000.000000
v 625.000000 0.000000 0.000000
v 625.000000 0.000000 0.000000
v 1000.000000 0.000000 1000.000000
v 625.000000 0.000000 1000.000000
v 0.000000 0.000000 1000.000000
v 0.000000 0.000000 0.000000
v 375.000000 0.000000 1000.000000
v 375.000000 0.000000 1000.000000
v 0.000000 0.000000 0.000000
v 375.000000 0.000000 0.000000
v 0.000000 1000.000000 0.000000
v 0.000000 0.000000 0.000000
v 0.000000 1000.000000 1000.000000
v 0.000000 1000.000000 1000.000000
v 0.000000 0.000000 0.000000
v 0.000000 0.000000 1000.000000
v 1000.000000 1000.000000 1000.000000
v 1000.000000 0.000000 1000.000000
v 1000.000000 1000.000000 0.000000
v 1000.000000 1000.000000 0.000000
v 1000.000000 0.000000 1000.000000
v 1000.000000 0.000000 0.000000
v 625.000000 0.000000 1000.000000
v 1000.000000 0.000000 1000.000000
v 810.000000 800.000000 1000.000000
v 810.000000 800.000000 1000.000000
v 1000.000000 0.000000 1000.000000
v 1000.000000 1000.000000 1000.000000
v 810.000000 800.000000 1000.000000
v 1000.000000 1000.000000 1000.000000
v 760.129028 834.703613 1000.000000
v 0.000000 0.000000 1000.000000
v 375.000000 0.000000 1000.000000
v 0.000000 1000.000000 1000.000000
v 0.000000 1000.000000 1000.000000
v 375.000000 0.000000 1000.000000
v 190.000000 800.000000 1000.000000
v 409.312561 899.406128 1000.000000
v 469.621338 906.775330 1000.000000
v 500.000000 1500.000000 1000.000000
v 500.000000 1500.000000 1000.000000
v 469.621338 906.775330 1000.000000
v 530.378723 906.775330 1000.000000
v 190.000000 800.000000 1000.000000
v 239.870972 834.703613 1000.000000
v 0.000000 1000.000000 1000.000000
v 0.000000 1000.000000 1000.000000
v 239.870972 834.703613 1000.000000
v 293.582947 863.102173 1000.000000
v 0.000000 1000.000000 1000.000000
v 293.582947 863.102173 1000.000000
v 500.000000 1500.000000 1000.000000
v 500.000000 1500.000000 1000.000000
v 293.582947 863.102173 1000.000000
v 350.342834 884.776367 1000.000000
v 500.000000 1500.000000 1000.000000
v 350.342834 884.776367 1000.000000
v 409.312561 899.406128 1000.000000
v 530.378723 906.775330 1000.000000
v 590.687439 899.406128 1000.000000
v 500.000000 1500.000000 1000.000000
v 500.000000 1500.000000 1000.000000
v 590.687439 899.406128 1000.000000
v 649.657104 884.776367 1000.000000
v 500.000000 1500.000000 1000.000000
v 649.657104 884.776367 1000.000000
v 1000.000000 1000.000000 1000.000000
v 1000.000000 1000.000000 1000.000000
v 649.657104 884.776367 1000.000000
v 706.417114 863.102173 1000.000000
v 1000.000000 1000.000000 1000.000000
v 706.417114 863.102173 1000.000000
v 760.129028 834.703613 1000.000000
v 1000.000000 0.000000 0.000000
v 625.000000 0.000000 0.000000
v 1000.000000 1000.000000 0.000000
v 1000.000000 1000.000000 0.000000
v 625.000000 0.000000 0.000000
v 810.000000 800.000000 0.000000
v 375.000000 0.000000 0.000000
v 0.000000 0.000000 0.000000
v 190.000000 800.000000 0.000000
v 190.000000 800.000000 0.000000
v 0.000000 0.000000 0.000000
v 0.000000 1000.000000 0.000000
v 190.000000 800.000000 0.000000
v 0.000000 1000.000000 0.000000
v 239.870972 834.703613 0.000000
v 530.378723 906.775330 0.000000
v 469.621338 906.775330 0.000000
v 500.000000 1500.000000 0.000000
v 530.378723 906.775330 0.000000
v 500.000000 1500.000000 0.000000
v 590.687439 899.406128 0.000000
v 810.000000 800.000000 0.000000
v 760.129028 834.703613 0.000000
v 1000.000000 1000.000000 0.000000
v 1000.000000 1000.000000 0.000000
v 760.129028 834.703613 0.000000
v 706.417114 863.102173 0.000000
v 1000.000000 1000.000000 0.000000
v 706.417114 863.102173 0.000000
v 500.000000 1500.000000 0.000000
v 500.000000 1500.000000 0.000000
v 706.417114 863.102173 0.000000
v 649.657104 884.776367 0.000000
v 500.000000 1500.000000 0.000000
v 649.657104 884.776367 0.000000
v 590.687439 899.406128 0.000000
v 469.621338 906.775330 0.000000
v 409.312561 899.406128 0.000000
v 500.000000 1500.000000 0.000000
v 500.000000 1500.000000 0.000000
v 409.312561 899.406128 0.000000
v 350.342834 884.776367 0.000000
v 500.000000 1500.000000 0.000000
v 350.342834 884.776367 0.000000
v 0.000000 1000.000000 0.000000
v 0.000000 1000.000000 0.000000
v 350.342834 884.776367 0.000000
v 293.582947 863.102173 0.000000
v 0.000000 1000.000000 0.000000
v 293.582947 863.102173 0.000000
v 239.870972 834.703613 0.000000
v 500.000000 1500.000000 0.000000
v 0.000000 1000.000000 0.000000
v 500.000000 1500.000000 1000.000000
v 500.000000 1500.000000 1000.000000
v 0.000000 1000.000000 0.000000
v 0.000000 1000.000000 1000.000000
v 1000.000000 1000.000000 0.000000
v 500.000000 1500.000000 0.000000
v 1000.000000 1000.000000 1000.000000
v 1000.000000 1000.000000 1000.000000
v 500.000000 1500.000000 0.000000
v 500.000000 1500.000000 1000.000000
v 810.000000 800.000000 0.000000
v 625.000000 0.000000 0.000000
v 810.000000 800.000000 1000.000000
v 810.000000 800.000000 1000.000000
v 625.000000 0.000000 0.000000
v 625.000000 0.000000 1000.000000
v 375.000000 0.000000 0.000000
v 190.000000 800.000000 0.000000
v 375.000000 0.000000 1000.000000
v 375.000000 0.000000 1000.000000
v 190.000000 800.000000 0.000000
v 190.000000 800.000000 1000.000000
v 810.000000 800.000000 0.000000
v 810.000000 800.000000 1000.000000
v 760.129028 834.703613 0.000000
v 760.129028 834.703613 0.000000
v 810.000000 800.000000 1000.000000
v 760.129028 834.703613 1000.000000
v 760.129028 834.703613 0.000000
v 760.129028 834.703613 1000.000000
v 706.417114 863.102173 0.000000
v 706.417114 863.102173 0.000000
v 760.129028 834.703613 1000.000000
v 706.417114 863.102173 1000.000000
v 706.417114 863.102173 0.000000
v 706.417114 863.102173 1000.000000
v 649.657104 884.776367 0.000000
v 649.657104 884.776367 0.000000
v 706.417114 863.102173 1000.000000
v 649.657104 884.776367 1000.000000
v 649.657104 884.776367 0.000000
v 649.657104 884.776367 1000.000000
v 590.687439 899.406128 0.000000
v 590.687439 899.406128 0.000000
v 649.657104 884.776367 1000.000000
v 590.687439 899.406128 1000.000000
v 590.687439 899.406128 0.000000
v 590.687439 899.406128 1000.000000
v 530.378723 906.775330 0.000000
v 530.378723 906.775330 0.000000
v 590.687439 899.406128 1000.000000
v 530.378723 906.775330 1000.000000
v 530.378723 906.775330 0.000000
v 530.378723 906.775330 1000.000000
v 469.621338 906.775330 0.000000
v 469.621338 906.775330 0.000000
v 530.378723 906.775330 1000.000000
v 469.621338 906.775330 1000.000000
v 469.621338 906.775330 0.000000
v 469.621338 906.775330 1000.000000
v 409.312561 899.406128 0.000000
v 409.312561 899.406128 0.000000
v 469.621338 906.775330 1000.000000
v 409.312561 899.406128 1000.000000
v 409.312561 899.406128 0.000000
v 409.312561 899.406128 1000.000000
v 350.342834 884.776367 0.000000
v 350.342834 884.776367 0.000000
v 409.312561 899.406128 1000.000000
v 350.342834 884.776367 1000.000000
v 350.342834 884.776367 0.000000
v 350.342834 884.776367 1000.000000
v 293.582947 863.102173 0.000000
v 293.582947 863.102173 0.000000
v 350.342834 884.776367 1000.000000
v 293.582947 863.102173 1000.000000
v 293.582947 863.102173 0.000000
v 293.582947 863.102173 1000.000000
v 239.870972 834.703613 0.000000
v 239.870972 834.703613 0.000000
v 293.582947 863.102173 1000.000000
v 239.870972 834.703613 1000.000000
v 239.870972 834.703613 0.000000
v 239.870972 834.703613 1000.000000
v 190.000000 800.000000 0.000000
v 190.000000 800.000000 0.000000
v 239.870972 834.703613 1000.000000
v 190.000000 800.000000 1000.000000
# 216 vertices, 0 vertices normals

f 1 2 3
f 4 5 6
f 7 8 9
f 10 11 12
f 13 14 15
f 16 17 18
f 19 20 21
f 22 23 24
f 25 26 27
f 28 29 30
f 31 32 33
f 34 35 36
f 37 38 39
f 40 41 42
f 43 44 45
f 46 47 48
f 49 50 51
f 52 53 54
f 55 56 57
f 58 59 60
f 61 62 63
f 64 65 66
f 67 68 69
f 70 71 72
f 73 74 75
f 76 77 78
f 79 80 81
f 82 83 84
f 85 86 87
f 88 89 90
f 91 92 93
f 94 95 96
f 97 98 99
f 100 101 102
f 103 104 105
f 106 107 108
f 109 110 111
f 112 113 114
f 115 116 117
f 118 119 120
f 121 122 123
f 124 125 126
f 127 128 129
f 130 131 132
f 133 134 135
f 136 137 138
f 139 140 141
f 142 143 144
f 145 146 147
f 148 149 150
f 151 152 153
f 154 155 156
f 157 158 159
f 160 161 162
f 163 164 165
f 166 167 168
f 169 170 171
f 172 173 174
f 175 176 177
f 178 179 180
f 181 182 183
f 184 185 186
f 187 188 189
f 190 191 192
f 193 194 195
f 196 197 198
f 199 200 201
f 202 203 204
f 205 206 207
f 208 209 210
f 211 212 213
f 214 215 216
# 72 faces, 0 coords texture

# End of File
Loading