Merge branch 'master' of github.com:Faerbit/swp

camera.cc

@@ -42,7 +42,6 @@ void Camera::setIsPhysicsCamera(bool val)
     usePhysicsCamera = val;
 }
 void Camera::updateRotation(glm::vec2 rotation) {
-    this->rotation += rotation;
     if((this->rotation.x + rotation.x) >= 1.57f) {
         this->rotation.x = 1.57;
         this->rotation.y += rotation.y;

data/geometry/brazier.obj

@@ -0,0 +1,900 @@
+# Blender v2.72 (sub 0) OBJ File: 'brazier.blend'
+# www.blender.org
+o Sphere
+v -0.206259 0.074443 0.000000
+v -0.177814 0.022240 -0.000000
+v -0.138333 -0.021604 0.000000
+v -0.092545 -0.048601 -0.000000
+v -0.043512 -0.058613 0.000000
+v -0.000171 -0.064835 0.001133
+v -0.202296 0.074443 -0.040241
+v -0.174396 0.022240 -0.034691
+v -0.135674 -0.021604 -0.026988
+v -0.090768 -0.048601 -0.018056
+v -0.042679 -0.058614 -0.008490
+v -0.000193 -0.064836 0.001335
+v -0.190560 0.074444 -0.078933
+v -0.164277 0.022240 -0.068047
+v -0.127801 -0.021604 -0.052938
+v -0.085504 -0.048601 -0.035418
+v -0.040208 -0.058615 -0.016656
+v -0.000256 -0.064838 0.001528
+v -0.171500 0.074444 -0.114594
+v -0.147848 0.022241 -0.098791
+v -0.115019 -0.021604 -0.076856
+v -0.076951 -0.048601 -0.051419
+v -0.036187 -0.058615 -0.024180
+v -0.000351 -0.064838 0.001705
+v -0.145849 0.074444 -0.145849
+v -0.125737 0.022241 -0.125737
+v -0.097818 -0.021603 -0.097819
+v -0.065443 -0.048601 -0.065443
+v -0.030776 -0.058615 -0.030776
+v -0.000479 -0.064838 0.001861
+v -0.114593 0.074444 -0.171500
+v -0.098791 0.022241 -0.147848
+v -0.076856 -0.021604 -0.115020
+v -0.051419 -0.048601 -0.076952
+v -0.024180 -0.058615 -0.036188
+v -0.000635 -0.064838 0.001989
+v -0.078933 0.074444 -0.190560
+v -0.068048 0.022240 -0.164277
+v -0.052940 -0.021604 -0.127802
+v -0.035419 -0.048601 -0.085505
+v -0.016655 -0.058615 -0.040209
+v -0.000813 -0.064838 0.002085
+v -0.040240 0.074443 -0.202296
+v -0.034691 0.022240 -0.174396
+v -0.026989 -0.021604 -0.135674
+v -0.018056 -0.048601 -0.090768
+v -0.008490 -0.058614 -0.042680
+v -0.001005 -0.064836 0.002147
+v 0.000000 0.074443 -0.206259
+v 0.000000 0.022240 -0.177814
+v 0.000000 -0.021604 -0.138334
+v 0.000000 -0.048601 -0.092545
+v 0.000000 -0.058613 -0.043512
+v -0.001207 -0.064835 0.002170
+v 0.040241 0.074443 -0.202296
+v 0.034691 0.022240 -0.174396
+v 0.026990 -0.021604 -0.135674
+v 0.018057 -0.048601 -0.090768
+v 0.008491 -0.058614 -0.042679
+v -0.001409 -0.064836 0.002147
+v 0.078934 0.074444 -0.190560
+v 0.068049 0.022240 -0.164277
+v 0.052941 -0.021604 -0.127802
+v 0.035419 -0.048601 -0.085505
+v 0.016656 -0.058615 -0.040209
+v -0.001601 -0.064838 0.002085
+v 0.114594 0.074444 -0.171500
+v 0.098792 0.022241 -0.147848
+v 0.076857 -0.021604 -0.115020
+v 0.051419 -0.048601 -0.076952
+v 0.024181 -0.058615 -0.036188
+v -0.001779 -0.064838 0.001989
+v 0.145850 0.074444 -0.145849
+v 0.125738 0.022241 -0.125737
+v 0.097819 -0.021603 -0.097819
+v 0.065444 -0.048601 -0.065443
+v 0.030776 -0.058615 -0.030776
+v -0.001935 -0.064838 0.001861
+v 0.171500 0.074444 -0.114594
+v 0.147848 0.022241 -0.098791
+v 0.115020 -0.021604 -0.076857
+v 0.076952 -0.048601 -0.051419
+v 0.036188 -0.058615 -0.024180
+v -0.002063 -0.064838 0.001705
+v 0.190560 0.074444 -0.078934
+v 0.164278 0.022240 -0.068048
+v 0.127802 -0.021604 -0.052940
+v 0.085505 -0.048601 -0.035419
+v 0.040209 -0.058615 -0.016656
+v -0.002159 -0.064838 0.001528
+v 0.202297 0.074443 -0.040241
+v 0.174396 0.022240 -0.034691
+v 0.135675 -0.021604 -0.026989
+v 0.090769 -0.048601 -0.018056
+v 0.042680 -0.058614 -0.008490
+v -0.000095 -0.064873 0.002787
+v 0.206259 0.074443 0.000000
+v 0.177814 0.022240 0.000000
+v 0.138334 -0.021604 0.000000
+v 0.092545 -0.048601 0.000000
+v 0.043512 -0.058613 0.000000
+v -0.002244 -0.064835 0.001133
+v 0.202296 0.074443 0.040241
+v 0.174396 0.022240 0.034691
+v 0.135675 -0.021604 0.026989
+v 0.090768 -0.048601 0.018056
+v 0.042680 -0.058614 0.008490
+v -0.002221 -0.064836 0.000932
+v 0.190560 0.074444 0.078934
+v 0.164277 0.022240 0.068048
+v 0.127802 -0.021604 0.052940
+v 0.085505 -0.048601 0.035419
+v 0.040209 -0.058615 0.016656
+v -0.002159 -0.064838 0.000739
+v 0.171500 0.074444 0.114594
+v 0.147848 0.022241 0.098791
+v 0.115020 -0.021604 0.076856
+v 0.076952 -0.048601 0.051419
+v 0.036188 -0.058615 0.024180
+v -0.002063 -0.064838 0.000561
+v 0.145850 0.074444 0.145849
+v 0.125737 0.022241 0.125737
+v 0.097819 -0.021603 0.097819
+v 0.065443 -0.048601 0.065443
+v 0.030776 -0.058615 0.030776
+v -0.001935 -0.064838 0.000405
+v 0.114596 0.074444 0.171500
+v 0.098792 0.022241 0.147848
+v 0.076857 -0.021604 0.115019
+v 0.051419 -0.048601 0.076951
+v 0.024180 -0.058615 0.036187
+v -0.001779 -0.064838 0.000277
+v 0.078937 0.074444 0.190561
+v 0.068049 0.022240 0.164277
+v 0.052941 -0.021604 0.127802
+v 0.035419 -0.048601 0.085504
+v 0.016656 -0.058615 0.040208
+v -0.001601 -0.064838 0.000182
+v 0.040242 0.074443 0.202296
+v 0.034692 0.022240 0.174396
+v 0.026989 -0.021604 0.135674
+v 0.018056 -0.048601 0.090768
+v 0.008491 -0.058614 0.042679
+v -0.001409 -0.064836 0.000119
+v 0.000001 0.074443 0.206259
+v 0.000000 0.022240 0.177814
+v 0.000000 -0.021604 0.138333
+v 0.000000 -0.048601 0.092545
+v 0.000000 -0.058613 0.043512
+v -0.001207 -0.064835 0.000097
+v -0.040240 0.074443 0.202296
+v -0.034690 0.022240 0.174396
+v -0.026988 -0.021604 0.135674
+v -0.018056 -0.048601 0.090768
+v -0.008490 -0.058614 0.042679
+v -0.001005 -0.064836 0.000119
+v -0.078933 0.074443 0.190560
+v -0.068047 0.022240 0.164277
+v -0.052938 -0.021604 0.127800
+v -0.035418 -0.048601 0.085504
+v -0.016655 -0.058615 0.040208
+v -0.000813 -0.064838 0.000182
+v -0.114593 0.074444 0.171500
+v -0.098791 0.022241 0.147848
+v -0.076855 -0.021604 0.115019
+v -0.051418 -0.048601 0.076951
+v -0.024180 -0.058615 0.036187
+v -0.000635 -0.064838 0.000277
+v -0.145849 0.074444 0.145849
+v -0.125737 0.022241 0.125737
+v -0.097818 -0.021603 0.097818
+v -0.065443 -0.048601 0.065443
+v -0.030775 -0.058615 0.030776
+v -0.000479 -0.064838 0.000405
+v -0.171500 0.074444 0.114595
+v -0.147848 0.022241 0.098792
+v -0.115019 -0.021604 0.076856
+v -0.076951 -0.048601 0.051419
+v -0.036187 -0.058615 0.024180
+v -0.000351 -0.064838 0.000561
+v -0.190560 0.074444 0.078936
+v -0.164277 0.022240 0.068049
+v -0.127801 -0.021604 0.052940
+v -0.085504 -0.048601 0.035419
+v -0.040208 -0.058615 0.016656
+v -0.000255 -0.064838 0.000739
+v -0.202296 0.074443 0.040242
+v -0.174396 0.022240 0.034691
+v -0.135674 -0.021604 0.026989
+v -0.090768 -0.048601 0.018056
+v -0.042679 -0.058614 0.008490
+v -0.000193 -0.064836 0.000932
+vt 0.400434 0.581993
+vt 0.277843 0.683336
+vt 0.245196 0.635053
+vt -0.019936 0.928964
+vt -0.095981 0.817622
+vt 0.091348 0.717129
+vt 0.497914 0.501351
+vt 0.384880 0.559128
+vt 0.142656 0.794953
+vt -0.217314 1.091389
+vt -0.319485 0.933354
+vt 0.222744 0.581262
+vt -0.147708 0.692821
+vt 0.056654 0.631279
+vt 0.496530 0.499668
+vt 0.374151 0.534018
+vt -0.386707 0.760623
+vt 0.211274 0.524178
+vt -0.173247 0.560590
+vt 0.368578 0.507480
+vt 0.494884 0.495615
+vt 0.037987 0.540924
+vt -0.417890 0.580601
+vt 0.211042 0.465974
+vt -0.172955 0.426749
+vt 0.368309 0.481404
+vt 0.494872 0.493389
+vt 0.037508 0.448527
+vt -0.413803 0.400965
+vt 0.222830 0.409040
+vt 0.373715 0.455912
+vt -0.145296 0.296121
+vt 0.056713 0.358303
+vt 0.495297 0.491207
+vt -0.379295 0.225127
+vt 0.245328 0.355529
+vt 0.384399 0.431028
+vt -0.093003 0.173036
+vt 0.093106 0.273982
+vt -0.310725 0.057018
+vt 0.277814 0.307469
+vt 0.399899 0.408599
+vt -0.017088 0.063125
+vt 0.497647 0.487423
+vt 0.143994 0.197458
+vt -0.209038 -0.096053
+vt 0.319035 0.266818
+vt 0.419736 0.389345
+vt 0.076716 -0.031270
+vt 0.499268 0.485958
+vt 0.209076 0.132089
+vt -0.076837 -0.222277
+vt 0.367124 0.234751
+vt 0.188588 -0.102734
+vt 0.286345 0.081998
+vt 0.442700 0.373994
+vt 0.074712 -0.323067
+vt 0.420492 0.212728
+vt 0.311153 -0.153304
+vt 0.371221 0.048103
+vt 0.500897 0.484805
+vt 0.467627 0.363429
+vt 0.244806 -0.388346
+vt 0.476982 0.201466
+vt 0.441015 -0.178308
+vt 0.502837 0.484057
+vt 0.493779 0.357940
+vt 0.460381 0.029856
+vt 0.421297 -0.418514
+vt 0.534526 0.201195
+vt 0.572486 -0.178208
+vt 0.519450 0.357645
+vt 0.507106 0.483718
+vt 0.551493 0.029312
+vt 0.597142 -0.414714
+vt 0.590836 0.212747
+vt 0.544556 0.362982
+vt 0.700959 -0.151545
+vt 0.640544 0.047977
+vt 0.769344 -0.381637
+vt 0.643848 0.234803
+vt 0.569058 0.373488
+vt 0.822351 -0.100952
+vt 0.723969 0.083442
+vt 0.509225 0.484186
+vt 0.934421 -0.315813
+vt 0.691616 0.266686
+vt 0.591279 0.388668
+vt 0.931302 -0.027319
+vt 0.511160 0.485076
+vt 0.799963 0.133158
+vt 1.085586 -0.217937
+vt 0.732239 0.307236
+vt 0.610533 0.408075
+vt 1.025553 0.064035
+vt 0.514198 0.487933
+vt 0.865291 0.196933
+vt 1.211593 -0.090197
+vt 0.764584 0.354659
+vt 1.097881 0.173559
+vt 0.915901 0.272929
+vt 0.626041 0.430526
+vt 1.313695 0.057296
+vt 0.787095 0.407523
+vt 1.150075 0.294225
+vt 0.950741 0.356828
+vt 0.515435 0.489490
+vt 0.636866 0.455153
+vt 1.381782 0.223910
+vt 0.798973 0.463750
+vt 1.177354 0.422827
+vt 0.642656 0.481217
+vt 0.516955 0.493441
+vt 0.970210 0.445428
+vt 1.415803 0.398153
+vt 0.799899 0.521303
+vt 1.179871 0.553934
+vt 0.643238 0.506949
+vt 0.517062 0.495616
+vt 0.972153 0.536501
+vt 1.416402 0.573192
+vt 0.788953 0.577909
+vt 0.638173 0.532193
+vt 1.155893 0.683073
+vt 0.954917 0.626183
+vt 0.516738 0.497770
+vt 1.387751 0.746122
+vt 0.767321 0.631443
+vt 0.627893 0.556983
+vt 1.107749 0.806050
+vt 0.920688 0.710954
+vt 0.515952 0.499760
+vt 1.326094 0.913176
+vt 0.735660 0.679825
+vt 0.612839 0.579603
+vt 1.036324 0.918356
+vt 0.870495 0.787501
+vt 0.514794 0.501518
+vt 1.231981 1.067456
+vt 0.695105 0.721160
+vt 0.593440 0.599340
+vt 0.943467 1.014406
+vt 0.513290 0.502922
+vt 0.807062 0.854369
+vt 1.107646 1.202031
+vt 0.647375 0.754114
+vt 0.833260 1.090068
+vt 0.730635 0.906335
+vt 0.570767 0.615203
+vt 0.956621 1.310844
+vt 0.593984 0.777074
+vt 0.710522 1.144845
+vt 0.645732 0.942190
+vt 0.511544 0.504238
+vt 0.545792 0.626208
+vt 0.784597 1.382931
+vt 0.537095 0.789165
+vt 0.579006 1.173324
+vt 0.509548 0.505227
+vt 0.519314 0.632019
+vt 0.555803 0.962240
+vt 0.604540 1.418513
+vt 0.478856 0.790046
+vt 0.444789 1.175745
+vt 0.493232 0.632526
+vt 0.505157 0.505841
+vt 0.463292 0.964132
+vt 0.423906 1.418514
+vt 0.421653 0.778832
+vt 0.467650 0.627341
+vt 0.312816 1.150395
+vt 0.372422 0.946134
+vt 0.502974 0.505409
+vt 0.245942 1.387657
+vt 0.367701 0.756769
+vt 0.442619 0.616858
+vt 0.187571 1.099877
+vt 0.287093 0.910595
+vt 0.501013 0.504400
+vt 0.074752 1.321984
+vt 0.319090 0.724531
+vt 0.419968 0.601581
+vt 0.074805 1.025032
+vt 0.499305 0.503028
+vt 0.209315 0.860156
+vt -0.082010 1.222341
+vt 0.495505 0.497731
+vt 0.496300 0.489195
+vt 0.504935 0.483678
+vt 0.512856 0.486308
+vt 0.516373 0.491367
+vt 0.507382 0.505833
+vn -0.172900 -0.984900 -0.000100
+vn -0.367800 -0.929900 0.000000
+vn -0.360800 -0.929900 -0.071700
+vn -0.818600 -0.574400 0.000000
+vn -0.802900 -0.574400 -0.159700
+vn -0.626200 -0.769600 -0.124600
+vn 0.140400 0.990100 0.000800
+vn -0.169300 -0.985000 -0.033600
+vn -0.638400 -0.769600 0.000000
+vn -0.878100 -0.478500 -0.000000
+vn -0.861200 -0.478500 -0.171300
+vn -0.339900 -0.929900 -0.140700
+vn -0.756300 -0.574400 -0.313200
+vn -0.589900 -0.769600 -0.244300
+vn 0.135000 0.990100 0.037500
+vn -0.159100 -0.985000 -0.065900
+vn -0.811200 -0.478500 -0.336000
+vn -0.305900 -0.929900 -0.204400
+vn -0.680700 -0.574400 -0.454700
+vn -0.142700 -0.985100 -0.095500
+vn 0.115300 0.990200 0.078800
+vn -0.530900 -0.769600 -0.354700
+vn -0.730100 -0.478500 -0.487800
+vn -0.260100 -0.929900 -0.260100
+vn -0.578800 -0.574300 -0.578800
+vn -0.121000 -0.985200 -0.121200
+vn 0.097800 0.990400 0.098100
+vn -0.451500 -0.769600 -0.451500
+vn -0.620900 -0.478500 -0.620900
+vn -0.204400 -0.929900 -0.305800
+vn -0.094800 -0.985300 -0.142100
+vn -0.454700 -0.574300 -0.680700
+vn -0.354700 -0.769600 -0.530900
+vn 0.077500 0.990500 0.113900
+vn -0.487800 -0.478500 -0.730100
+vn -0.140700 -0.929900 -0.339900
+vn -0.064900 -0.985400 -0.157500
+vn -0.313200 -0.574400 -0.756300
+vn -0.244300 -0.769600 -0.589900
+vn -0.336000 -0.478500 -0.811300
+vn -0.071700 -0.929900 -0.360800
+vn -0.032800 -0.985400 -0.166800
+vn -0.159700 -0.574400 -0.802900
+vn 0.036000 0.990800 0.130400
+vn -0.124500 -0.769600 -0.626200
+vn -0.171300 -0.478500 -0.861200
+vn 0.000000 -0.929900 -0.367800
+vn 0.000100 -0.985500 -0.169600
+vn 0.000000 -0.574300 -0.818600
+vn -0.000200 0.991100 0.133300
+vn 0.000000 -0.769600 -0.638400
+vn 0.000000 -0.478500 -0.878100
+vn 0.071700 -0.929900 -0.360800
+vn 0.159700 -0.574400 -0.802900
+vn 0.124500 -0.769600 -0.626200
+vn 0.032900 -0.985500 -0.166100
+vn 0.171300 -0.478500 -0.861200
+vn 0.140700 -0.929900 -0.339900
+vn 0.313200 -0.574400 -0.756300
+vn 0.244300 -0.769600 -0.589900
+vn -0.035800 0.991100 0.128500
+vn 0.064600 -0.985600 -0.156300
+vn 0.336000 -0.478500 -0.811300
+vn 0.204400 -0.929900 -0.305800
+vn 0.454700 -0.574300 -0.680700
+vn -0.057200 0.991000 0.120900
+vn 0.093900 -0.985600 -0.140500
+vn 0.354700 -0.769600 -0.530900
+vn 0.487800 -0.478500 -0.730100
+vn 0.260100 -0.929900 -0.260100
+vn 0.578800 -0.574300 -0.578800
+vn 0.119400 -0.985600 -0.119400
+vn -0.094300 0.991000 0.094600
+vn 0.451500 -0.769600 -0.451500
+vn 0.620900 -0.478500 -0.620900
+vn 0.305800 -0.929900 -0.204400
+vn 0.140500 -0.985600 -0.093800
+vn 0.680700 -0.574300 -0.454700
+vn 0.530900 -0.769600 -0.354700
+vn 0.730100 -0.478500 -0.487800
+vn 0.339900 -0.929900 -0.140700
+vn 0.156300 -0.985600 -0.064600
+vn 0.756300 -0.574400 -0.313200
+vn 0.589900 -0.769600 -0.244300
+vn -0.110400 0.991000 0.075500
+vn 0.811300 -0.478500 -0.336000
+vn 0.360800 -0.929900 -0.071700
+vn 0.166000 -0.985600 -0.032900
+vn 0.802900 -0.574400 -0.159700
+vn -0.143800 0.984600 -0.099300
+vn 0.626200 -0.769600 -0.124500
+vn 0.861200 -0.478500 -0.171300
+vn 0.367800 -0.929900 0.000000
+vn 0.169500 -0.985500 -0.000100
+vn 0.818600 -0.574300 0.000000
+vn -0.121300 0.991400 0.048300
+vn 0.638400 -0.769600 0.000000
+vn 0.878100 -0.478500 0.000000
+vn 0.360800 -0.929900 0.071700
+vn 0.802900 -0.574400 0.159700
+vn 0.626200 -0.769600 0.124500
+vn 0.166600 -0.985400 0.032800
+vn 0.861200 -0.478500 0.171300
+vn 0.339900 -0.929900 0.140700
+vn 0.756300 -0.574400 0.313200
+vn 0.589900 -0.769600 0.244300
+vn -0.130100 0.990900 -0.035800
+vn 0.157400 -0.985400 0.064900
+vn 0.811300 -0.478500 0.336000
+vn 0.305800 -0.929900 0.204400
+vn 0.680700 -0.574400 0.454700
+vn 0.142000 -0.985300 0.094700
+vn -0.113800 0.990500 -0.077200
+vn 0.530900 -0.769600 0.354700
+vn 0.730100 -0.478500 0.487800
+vn 0.260100 -0.929900 0.260100
+vn 0.578800 -0.574300 0.578800
+vn 0.121100 -0.985200 0.120900
+vn -0.097900 0.990400 -0.097500
+vn 0.451500 -0.769600 0.451500
+vn 0.620900 -0.478500 0.620900
+vn 0.204400 -0.929900 0.305800
+vn 0.095400 -0.985100 0.142600
+vn 0.454800 -0.574400 0.680700
+vn 0.354700 -0.769600 0.530900
+vn -0.078500 0.990300 -0.114900
+vn 0.487800 -0.478500 0.730100
+vn 0.140700 -0.929900 0.339900
+vn 0.065800 -0.985100 0.158900
+vn 0.313200 -0.574400 0.756300
+vn 0.244300 -0.769600 0.589900
+vn -0.059800 0.990200 -0.126400
+vn 0.336000 -0.478500 0.811200
+vn 0.071700 -0.929900 0.360800
+vn 0.033600 -0.985000 0.169200
+vn 0.159700 -0.574400 0.802900
+vn 0.124500 -0.769600 0.626200
+vn -0.037400 0.990200 -0.134800
+vn 0.171300 -0.478500 0.861200
+vn 0.000000 -0.929900 0.367800
+vn 0.000100 -0.984900 0.172800
+vn 0.000000 -0.574400 0.818600
+vn -0.000300 0.990100 -0.140100
+vn 0.000000 -0.769600 0.638400
+vn -0.000000 -0.478500 0.878100
+vn -0.071700 -0.929900 0.360800
+vn -0.159700 -0.574400 0.802900
+vn -0.124600 -0.769600 0.626200
+vn -0.033500 -0.984900 0.169900
+vn -0.171300 -0.478500 0.861200
+vn -0.140700 -0.929900 0.339900
+vn -0.313200 -0.574400 0.756300
+vn -0.244300 -0.769600 0.589900
+vn 0.037400 0.989900 -0.136900
+vn -0.066200 -0.984800 0.160300
+vn -0.336000 -0.478500 0.811200
+vn -0.204400 -0.929900 0.305900
+vn -0.454700 -0.574400 0.680700
+vn 0.060800 0.989700 -0.129500
+vn -0.096400 -0.984800 0.144400
+vn -0.354700 -0.769600 0.530900
+vn -0.487800 -0.478500 0.730100
+vn -0.260100 -0.929900 0.260100
+vn -0.578800 -0.574300 0.578800
+vn -0.122800 -0.984800 0.122800
+vn 0.101600 0.989600 -0.101500
+vn -0.451500 -0.769600 0.451500
+vn -0.620900 -0.478500 0.620900
+vn -0.305800 -0.929900 0.204400
+vn -0.144400 -0.984800 0.096400
+vn -0.680700 -0.574400 0.454800
+vn -0.530900 -0.769600 0.354700
+vn 0.118800 0.989700 -0.080500
+vn -0.730100 -0.478500 0.487800
+vn -0.339900 -0.929900 0.140700
+vn -0.160300 -0.984800 0.066200
+vn -0.756300 -0.574400 0.313200
+vn -0.589900 -0.769600 0.244300
+vn 0.129700 0.989700 -0.060700
+vn -0.811200 -0.478500 0.336000
+vn -0.360800 -0.929900 0.071700
+vn -0.170000 -0.984900 0.033500
+vn -0.802900 -0.574400 0.159700
+vn 0.137200 0.989900 -0.036900
+vn -0.626200 -0.769600 0.124500
+vn -0.861200 -0.478500 0.171300
+vn 0.127000 0.990100 0.059900
+vn 0.058300 0.990600 0.123900
+vn -0.075100 0.991000 0.110400
+vn -0.055700 -0.768300 -0.637700
+vn -0.123700 0.990600 -0.058100
+vn 0.080500 0.989700 -0.118700
+s 1
+f 5/1/1 4/2/2 10/3/3
+f 2/4/4 8/5/5 9/6/6
+f 6/7/7 5/1/1 11/8/8
+f 4/2/2 3/9/9 9/6/6
+f 1/10/10 7/11/11 8/5/5
+f 11/8/8 10/3/3 16/12/12
+f 8/5/5 14/13/13 15/14/14
+f 12/15/15 11/8/8 17/16/16
+f 10/3/3 9/6/6 15/14/14
+f 8/5/5 7/11/11 13/17/17
+f 17/16/16 16/12/12 22/18/18
+f 15/14/14 14/13/13 20/19/19
+f 17/16/16 23/20/20 24/21/21
+f 16/12/12 15/14/14 21/22/22
+f 14/13/13 13/17/17 19/23/23
+f 23/20/20 22/18/18 28/24/24
+f 21/22/22 20/19/19 26/25/25
+f 23/20/20 29/26/26 30/27/27
+f 22/18/18 21/22/22 27/28/28
+f 20/19/19 19/23/23 25/29/29
+f 28/24/24 34/30/30 35/31/31
+f 26/25/25 32/32/32 33/33/33
+f 29/26/26 35/31/31 36/34/34
+f 27/28/28 33/33/33 34/30/30
+f 25/29/29 31/35/35 32/32/32
+f 34/30/30 40/36/36 41/37/37
+f 32/32/32 38/38/38 39/39/39
+f 36/34/34 35/31/31 41/37/37
+f 33/33/33 39/39/39 40/36/36
+f 31/35/35 37/40/40 38/38/38
+f 40/36/36 46/41/41 47/42/42
+f 39/39/39 38/38/38 44/43/43
+f 41/37/37 47/42/42 48/44/44
+f 39/39/39 45/45/45 46/41/41
+f 37/40/40 43/46/46 44/43/43
+f 46/41/41 52/47/47 53/48/48
+f 45/45/45 44/43/43 50/49/49
+f 47/42/42 53/48/48 54/50/50
+f 45/45/45 51/51/51 52/47/47
+f 44/43/43 43/46/46 49/52/52
+f 53/48/48 52/47/47 58/53/53
+f 50/49/49 56/54/54 57/55/55
+f 54/50/50 53/48/48 59/56/56
+f 52/47/47 51/51/51 57/55/55
+f 49/52/52 55/57/57 56/54/54
+f 59/56/56 58/53/53 64/58/58
+f 56/54/54 62/59/59 63/60/60
+f 60/61/61 59/56/56 65/62/62
+f 58/53/53 57/55/55 63/60/60
+f 55/57/57 61/63/63 62/59/59
+f 65/62/62 64/58/58 70/64/64
+f 63/60/60 62/59/59 68/65/65
+f 66/66/66 65/62/62 71/67/67
+f 64/58/58 63/60/60 69/68/68
+f 62/59/59 61/63/63 67/69/69
+f 71/67/67 70/64/64 76/70/70
+f 69/68/68 68/65/65 74/71/71
+f 71/67/67 77/72/72 78/73/73
+f 70/64/64 69/68/68 75/74/74
+f 68/65/65 67/69/69 73/75/75
+f 76/70/70 82/76/76 83/77/77
+f 74/71/71 80/78/78 81/79/79
+f 78/73/73 77/72/72 83/77/77
+f 75/74/74 81/79/79 82/76/76
+f 73/75/75 79/80/80 80/78/78
+f 82/76/76 88/81/81 89/82/82
+f 80/78/78 86/83/83 87/84/84
+f 84/85/85 83/77/77 89/82/82
+f 81/79/79 87/84/84 88/81/81
+f 79/80/80 85/86/86 86/83/83
+f 88/81/81 94/87/87 95/88/88
+f 87/84/84 86/83/83 92/89/89
+f 90/90/90 89/82/82 95/88/88
+f 87/84/84 93/91/91 94/87/87
+f 85/86/86 91/92/92 92/89/89
+f 94/87/87 100/93/93 101/94/94
+f 93/91/91 92/89/89 98/95/95
+f 95/88/88 101/94/94 102/96/96
+f 93/91/91 99/97/97 100/93/93
+f 92/89/89 91/92/92 97/98/98
+f 101/94/94 100/93/93 106/99/99
+f 98/95/95 104/100/100 105/101/101
+f 102/96/96 101/94/94 107/102/102
+f 100/93/93 99/97/97 105/101/101
+f 97/98/98 103/103/103 104/100/100
+f 107/102/102 106/99/99 112/104/104
+f 104/100/100 110/105/105 111/106/106
+f 108/107/107 107/102/102 113/108/108
+f 106/99/99 105/101/101 111/106/106
+f 104/100/100 103/103/103 109/109/109
+f 113/108/108 112/104/104 118/110/110
+f 111/106/106 110/105/105 116/111/111
+f 113/108/108 119/112/112 120/113/113
+f 112/104/104 111/106/106 117/114/114
+f 110/105/105 109/109/109 115/115/115
+f 119/112/112 118/110/110 124/116/116
+f 117/114/114 116/111/111 122/117/117
+f 119/112/112 125/118/118 126/119/119
+f 118/110/110 117/114/114 123/120/120
+f 116/111/111 115/115/115 121/121/121
+f 124/116/116 130/122/122 131/123/123
+f 122/117/117 128/124/124 129/125/125
+f 125/118/118 131/123/123 132/126/126
+f 123/120/120 129/125/125 130/122/122
+f 121/121/121 127/127/127 128/124/124
+f 130/122/122 136/128/128 137/129/129
+f 128/124/124 134/130/130 135/131/131
+f 131/123/123 137/129/129 138/132/132
+f 129/125/125 135/131/131 136/128/128
+f 127/127/127 133/133/133 134/130/130
+f 136/128/128 142/134/134 143/135/135
+f 134/130/130 140/136/136 141/137/137
+f 137/129/129 143/135/135 144/138/138
+f 135/131/131 141/137/137 142/134/134
+f 133/133/133 139/139/139 140/136/136
+f 142/134/134 148/140/140 149/141/141
+f 141/137/137 140/136/136 146/142/142
+f 143/135/135 149/141/141 150/143/143
+f 141/137/137 147/144/144 148/140/140
+f 139/139/139 145/145/145 146/142/142
+f 149/141/141 148/140/140 154/146/146
+f 146/142/142 152/147/147 153/148/148
+f 150/143/143 149/141/141 155/149/149
+f 148/140/140 147/144/144 153/148/148
+f 145/145/145 151/150/150 152/147/147
+f 155/149/149 154/146/146 160/151/151
+f 152/147/147 158/152/152 159/153/153
+f 156/154/154 155/149/149 161/155/155
+f 154/146/146 153/148/148 159/153/153
+f 152/147/147 151/150/150 157/156/156
+f 161/155/155 160/151/151 166/157/157
+f 159/153/153 158/152/152 164/158/158
+f 162/159/159 161/155/155 167/160/160
+f 160/151/151 159/153/153 165/161/161
+f 158/152/152 157/156/156 163/162/162
+f 167/160/160 166/157/157 172/163/163
+f 165/161/161 164/158/158 170/164/164
+f 167/160/160 173/165/165 174/166/166
+f 166/157/157 165/161/161 171/167/167
+f 164/158/158 163/162/162 169/168/168
+f 172/163/163 178/169/169 179/170/170
+f 170/164/164 176/171/171 177/172/172
+f 173/165/165 179/170/170 180/173/173
+f 171/167/167 177/172/172 178/169/169
+f 169/168/168 175/174/174 176/171/171
+f 178/169/169 184/175/175 185/176/176
+f 176/171/171 182/177/177 183/178/178
+f 179/170/170 185/176/176 186/179/179
+f 177/172/172 183/178/178 184/175/175
+f 175/174/174 181/180/180 182/177/177
+f 184/175/175 190/181/181 191/182/182
+f 183/178/178 182/177/177 188/183/183
+f 185/176/176 191/182/182 192/184/184
+f 183/178/178 189/185/185 190/181/181
+f 181/180/180 187/186/186 188/183/183
+f 190/181/181 4/2/2 5/1/1
+f 189/185/185 188/183/183 2/4/4
+f 191/182/182 5/1/1 6/7/7
+f 189/185/185 3/9/9 4/2/2
+f 187/186/186 1/10/10 2/4/4
+f 11/8/8 5/1/1 10/3/3
+f 3/9/9 2/4/4 9/6/6
+f 12/15/15 6/7/7 11/8/8
+f 10/3/3 4/2/2 9/6/6
+f 2/4/4 1/10/10 8/5/5
+f 17/16/16 11/8/8 16/12/12
+f 9/6/6 8/5/5 15/14/14
+f 18/187/187 12/15/15 17/16/16
+f 16/12/12 10/3/3 15/14/14
+f 14/13/13 8/5/5 13/17/17
+f 23/20/20 17/16/16 22/18/18
+f 21/22/22 15/14/14 20/19/19
+f 18/187/187 17/16/16 24/21/21
+f 22/18/18 16/12/12 21/22/22
+f 20/19/19 14/13/13 19/23/23
+f 29/26/26 23/20/20 28/24/24
+f 27/28/28 21/22/22 26/25/25
+f 24/21/21 23/20/20 30/27/27
+f 28/24/24 22/18/18 27/28/28
+f 26/25/25 20/19/19 25/29/29
+f 29/26/26 28/24/24 35/31/31
+f 27/28/28 26/25/25 33/33/33
+f 30/27/27 29/26/26 36/34/34
+f 28/24/24 27/28/28 34/30/30
+f 26/25/25 25/29/29 32/32/32
+f 35/31/31 34/30/30 41/37/37
+f 33/33/33 32/32/32 39/39/39
+f 42/188/188 36/34/34 41/37/37
+f 34/30/30 33/33/33 40/36/36
+f 32/32/32 31/35/35 38/38/38
+f 41/37/37 40/36/36 47/42/42
+f 45/45/45 39/39/39 44/43/43
+f 42/188/188 41/37/37 48/44/44
+f 40/36/36 39/39/39 46/41/41
+f 38/38/38 37/40/40 44/43/43
+f 47/42/42 46/41/41 53/48/48
+f 51/51/51 45/45/45 50/49/49
+f 48/44/44 47/42/42 54/50/50
+f 46/41/41 45/45/45 52/47/47
+f 50/49/49 44/43/43 49/52/52
+f 59/56/56 53/48/48 58/53/53
+f 51/51/51 50/49/49 57/55/55
+f 60/61/61 54/50/50 59/56/56
+f 58/53/53 52/47/47 57/55/55
+f 50/49/49 49/52/52 56/54/54
+f 65/62/62 59/56/56 64/58/58
+f 57/55/55 56/54/54 63/60/60
+f 66/66/66 60/61/61 65/62/62
+f 64/58/58 58/53/53 63/60/60
+f 56/54/54 55/57/57 62/59/59
+f 71/67/67 65/62/62 70/64/64
+f 69/68/68 63/60/60 68/65/65
+f 72/189/189 66/66/66 71/67/67
+f 70/64/64 64/58/58 69/68/68
+f 68/65/65 62/59/59 67/69/69
+f 77/72/72 71/67/67 76/70/70
+f 75/74/74 69/68/68 74/71/71
+f 72/189/189 71/67/67 78/73/73
+f 76/70/70 70/64/64 75/74/74
+f 74/71/71 68/65/65 73/75/75
+f 77/72/72 76/70/70 83/77/77
+f 75/74/74 74/71/71 81/79/79
+f 84/85/85 78/73/73 83/77/77
+f 76/70/70 75/74/74 82/76/76
+f 74/71/71 73/75/75 80/78/78
+f 83/77/77 82/76/76 89/82/82
+f 81/79/79 80/78/78 87/84/84
+f 90/90/90 84/85/85 89/82/82
+f 82/76/76 81/79/79 88/81/81
+f 80/78/78 79/80/80 86/83/83
+f 89/82/82 88/81/81 95/88/88
+f 93/91/91 87/84/84 92/89/89
+f 96/190/190 90/90/90 95/88/88
+f 88/81/81 87/84/84 94/87/87
+f 86/83/83 85/86/86 92/89/89
+f 95/88/88 94/87/87 101/94/94
+f 99/97/97 93/91/91 98/95/95
+f 96/190/190 95/88/88 102/96/96
+f 94/87/87 93/91/91 100/93/93
+f 98/95/95 92/89/89 97/98/98
+f 107/102/102 101/94/94 106/99/99
+f 99/97/97 98/95/95 105/101/101
+f 108/107/107 102/96/96 107/102/102
+f 106/99/99 100/93/93 105/101/101
+f 98/95/95 97/98/98 104/100/100
+f 113/108/108 107/102/102 112/104/104
+f 105/101/101 104/100/100 111/106/106
+f 114/191/191 108/107/107 113/108/108
+f 112/104/104 106/99/99 111/106/106
+f 110/105/105 104/100/100 109/109/109
+f 119/112/112 113/108/108 118/110/110
+f 117/114/114 111/106/106 116/111/111
+f 114/191/191 113/108/108 120/113/113
+f 118/110/110 112/104/104 117/114/114
+f 116/111/111 110/105/105 115/115/115
+f 125/118/118 119/112/112 124/116/116
+f 123/120/120 117/114/114 122/117/117
+f 120/113/113 119/112/112 126/119/119
+f 124/116/116 118/110/110 123/120/120
+f 122/117/117 116/111/111 121/121/121
+f 125/118/118 124/116/116 131/123/123
+f 123/120/120 122/117/117 129/125/125
+f 126/119/119 125/118/118 132/126/126
+f 124/116/116 123/120/120 130/122/122
+f 122/117/117 121/121/121 128/124/124
+f 131/123/123 130/122/122 137/129/129
+f 129/125/125 128/124/124 135/131/131
+f 132/126/126 131/123/123 138/132/132
+f 130/122/122 129/125/125 136/128/128
+f 128/124/124 127/127/127 134/130/130
+f 137/129/129 136/128/128 143/135/135
+f 135/131/131 134/130/130 141/137/137
+f 138/132/132 137/129/129 144/138/138
+f 136/128/128 135/131/131 142/134/134
+f 134/130/130 133/133/133 140/136/136
+f 143/135/135 142/134/134 149/141/141
+f 147/144/144 141/137/137 146/142/142
+f 144/138/138 143/135/135 150/143/143
+f 142/134/134 141/137/137 148/140/140
+f 140/136/136 139/139/139 146/142/142
+f 155/149/149 149/141/141 154/146/146
+f 147/144/144 146/142/142 153/148/148
+f 156/154/154 150/143/143 155/149/149
+f 154/146/146 148/140/140 153/148/148
+f 146/142/142 145/145/145 152/147/147
+f 161/155/155 155/149/149 160/151/151
+f 153/148/148 152/147/147 159/153/153
+f 162/159/159 156/154/154 161/155/155
+f 160/151/151 154/146/146 159/153/153
+f 158/152/152 152/147/147 157/156/156
+f 167/160/160 161/155/155 166/157/157
+f 165/161/161 159/153/153 164/158/158
+f 168/192/192 162/159/159 167/160/160
+f 166/157/157 160/151/151 165/161/161
+f 164/158/158 158/152/152 163/162/162
+f 173/165/165 167/160/160 172/163/163
+f 171/167/167 165/161/161 170/164/164
+f 168/192/192 167/160/160 174/166/166
+f 172/163/163 166/157/157 171/167/167
+f 170/164/164 164/158/158 169/168/168
+f 173/165/165 172/163/163 179/170/170
+f 171/167/167 170/164/164 177/172/172
+f 174/166/166 173/165/165 180/173/173
+f 172/163/163 171/167/167 178/169/169
+f 170/164/164 169/168/168 176/171/171
+f 179/170/170 178/169/169 185/176/176
+f 177/172/172 176/171/171 183/178/178
+f 180/173/173 179/170/170 186/179/179
+f 178/169/169 177/172/172 184/175/175
+f 176/171/171 175/174/174 182/177/177
+f 185/176/176 184/175/175 191/182/182
+f 189/185/185 183/178/178 188/183/183
+f 186/179/179 185/176/176 192/184/184
+f 184/175/175 183/178/178 190/181/181
+f 182/177/177 181/180/180 188/183/183
+f 191/182/182 190/181/181 5/1/1
+f 3/9/9 189/185/185 2/4/4
+f 192/184/184 191/182/182 6/7/7
+f 190/181/181 189/185/185 4/2/2
+f 188/183/183 187/186/186 2/4/4

data/geometry/hint.obj

@@ -0,0 +1,15 @@
+# Blender v2.72 (sub 0) OBJ File: 'hint.blend'
+# www.blender.org
+o Plane
+v -1.000000 0.000000 1.000000
+v 1.000000 0.000000 1.000000
+v -1.000000 0.000000 -1.000000
+v 1.000000 0.000000 -1.000000
+vt 0.999900 0.000100
+vt 0.999900 0.999900
+vt 0.000100 0.999900
+vt 0.000100 0.000100
+vn 0.000000 1.000000 0.000000
+s off
+f 2/1/1 4/2/1 3/3/1
+f 1/4/1 2/1/1 3/3/1

data/levels/Compositions.xml

@@ -252,6 +252,8 @@
 
 
 
+
+
 <!-- Bridge Block on Pillar-->
 <composition>
     <typeID>160</typeID>

graphics.cc

@@ -145,7 +145,7 @@ void Graphics::render(double time)
     framebuffer->bind(); 
     glClear(GL_DEPTH_BUFFER_BIT);
     glm::vec3 sunVector = (level->getCameraCenter()->getPosition() + level->getDirectionalLight()->getPosition());
-    glm::mat4 depthViewProjectionMatrix =  glm::ortho<float>(-farPlane/2.0f, farPlane/2.0f, -farPlane/2.0f, farPlane/2.0f, -farPlane/2.0f, farPlane/2.0f) * 
+    glm::mat4 depthViewProjectionMatrix =  glm::ortho<float>(-farPlane/1.5f, farPlane/1.5f, -farPlane/1.5f, farPlane/1.5f, -farPlane/1.5f, farPlane/1.5f) *
         glm::lookAt(sunVector, level->getCameraCenter()->getPosition(), glm::vec3(0,1,0));
     level->render(depthShader, false, &depthViewProjectionMatrix);
     if (!framebuffer->isFrameBufferObjectComplete()) {

level.cc

@@ -57,6 +57,8 @@ void Level::render(ACGL::OpenGL::SharedShaderProgram shader, bool lightingPass,
 }
 
 void Level::update(float runTime, glm::vec2 mouseDelta, bool wPressed, bool aPressed, bool sPressed, bool dPressed,bool kPressed, bool lPressed) {
+    physics.takeUpdateStep(runTime);
+    
     // Ignore first two mouse updates, because they are incorrect
     // DON'T try to move this functionallity elsewhere
     static int i = 0;
@@ -89,8 +91,6 @@ void Level::update(float runTime, glm::vec2 mouseDelta, bool wPressed, bool aPre
     if(lPressed)
         camera.setIsPhysicsCamera(false);
     
-    physics.takeUpdateStep(runTime);
-    
     cameraCenter->setPosition(physics.getPos(0));
     cameraCenter->setRotation(physics.getRotation(0));