diff --git a/Levels/Geometry/torch.obj b/Levels/Geometry/torch.obj new file mode 100644 index 0000000..a7ce613 --- /dev/null +++ b/Levels/Geometry/torch.obj @@ -0,0 +1,266 @@ +# Blender v2.71 (sub 0) OBJ File: 'torch.blend' +# www.blender.org +o Cylinder +v 0.000000 -1.000000 -0.087051 +v -0.000000 1.000000 -0.191513 +v 0.016983 -1.000000 -0.085379 +v 0.037362 1.000000 -0.187833 +v 0.033313 -1.000000 -0.080425 +v 0.073289 1.000000 -0.176935 +v 0.048363 -1.000000 -0.072380 +v 0.106399 1.000000 -0.159237 +v 0.061555 -1.000000 -0.061555 +v 0.135420 1.000000 -0.135420 +v 0.072380 -1.000000 -0.048363 +v 0.159237 1.000000 -0.106399 +v 0.080425 -1.000000 -0.033313 +v 0.176935 1.000000 -0.073289 +v 0.085379 -1.000000 -0.016983 +v 0.187833 1.000000 -0.037362 +v 0.087051 -1.000000 -0.000000 +v 0.191513 1.000000 0.000000 +v 0.085379 -1.000000 0.016983 +v 0.187833 1.000000 0.037362 +v 0.080425 -1.000000 0.033313 +v 0.176935 1.000000 0.073289 +v 0.072380 -1.000000 0.048363 +v 0.159237 1.000000 0.106399 +v 0.061555 -1.000000 0.061555 +v 0.135420 1.000000 0.135420 +v 0.048363 -1.000000 0.072380 +v 0.106399 1.000000 0.159237 +v 0.033313 -1.000000 0.080425 +v 0.073289 1.000000 0.176935 +v 0.016983 -1.000000 0.085379 +v 0.037362 1.000000 0.187833 +v -0.000000 -1.000000 0.087051 +v -0.000000 1.000000 0.191513 +v -0.016983 -1.000000 0.085379 +v -0.037362 1.000000 0.187833 +v -0.033313 -1.000000 0.080425 +v -0.073289 1.000000 0.176935 +v -0.048363 -1.000000 0.072380 +v -0.106399 1.000000 0.159237 +v -0.061555 -1.000000 0.061555 +v -0.135420 1.000000 0.135420 +v -0.072381 -1.000000 0.048363 +v -0.159237 1.000000 0.106399 +v -0.080425 -1.000000 0.033313 +v -0.176935 1.000000 0.073289 +v -0.085379 -1.000000 0.016983 +v -0.187833 1.000000 0.037362 +v -0.087051 -1.000000 -0.000000 +v -0.191513 1.000000 -0.000000 +v -0.085379 -1.000000 -0.016983 +v -0.187833 1.000000 -0.037362 +v -0.080425 -1.000000 -0.033313 +v -0.176935 1.000000 -0.073289 +v -0.072380 -1.000000 -0.048363 +v -0.159237 1.000000 -0.106399 +v -0.061554 -1.000000 -0.061555 +v -0.135420 1.000000 -0.135420 +v -0.048363 -1.000000 -0.072381 +v -0.106399 1.000000 -0.159237 +v -0.033313 -1.000000 -0.080425 +v -0.073289 1.000000 -0.176935 +v -0.016983 -1.000000 -0.085379 +v -0.037362 1.000000 -0.187833 +vt 0.173159 0.324353 +vt 0.355490 0.133897 +vt 0.388961 0.169345 +vt 0.188374 0.340465 +vt 0.418692 0.207984 +vt 0.201889 0.358028 +vt 0.444379 0.249421 +vt 0.213565 0.376862 +vt 0.465761 0.293235 +vt 0.223285 0.396777 +vt 0.482621 0.338980 +vt 0.230950 0.417570 +vt 0.494787 0.386190 +vt 0.236481 0.439028 +vt 0.502136 0.434385 +vt 0.239822 0.460935 +vt 0.504593 0.483075 +vt 0.240940 0.483066 +vt 0.502132 0.531764 +vt 0.239822 0.505197 +vt 0.494779 0.579957 +vt 0.236481 0.527103 +vt 0.482609 0.627165 +vt 0.230950 0.548561 +vt 0.465746 0.672906 +vt 0.223286 0.569353 +vt 0.444361 0.716715 +vt 0.213567 0.589266 +vt 0.418672 0.758148 +vt 0.201891 0.608099 +vt 0.388940 0.796782 +vt 0.188377 0.625660 +vt 0.355468 0.832224 +vt 0.173163 0.641770 +vt 0.318596 0.864115 +vt 0.156403 0.656266 +vt 0.278700 0.892129 +vt 0.138269 0.669000 +vt 0.236185 0.915982 +vt 0.118944 0.679843 +vt 0.191483 0.935431 +vt 0.098625 0.688683 +vt 0.145050 0.950278 +vt 0.077519 0.695432 +vt 0.097357 0.960373 +vt 0.055840 0.700021 +vt 0.048890 0.965612 +vt 0.033810 0.702402 +vt 0.000142 0.965943 +vt 0.011651 0.702553 +vt 0.011637 0.263556 +vt 0.000142 0.000142 +vt 0.048895 0.000476 +vt 0.033797 0.263708 +vt 0.097366 0.005719 +vt 0.055829 0.266091 +vt 0.145063 0.015817 +vt 0.077509 0.270681 +vt 0.191499 0.030670 +vt 0.098617 0.277432 +vt 0.236203 0.050124 +vt 0.118937 0.286274 +vt 0.278720 0.073982 +vt 0.138263 0.297119 +vt 0.635136 0.466957 +vt 0.594601 0.439872 +vt 0.560128 0.405399 +vt 0.533043 0.364864 +vt 0.514387 0.319824 +vt 0.504876 0.272009 +vt 0.504876 0.223258 +vt 0.514387 0.175443 +vt 0.533044 0.130402 +vt 0.560129 0.089866 +vt 0.594602 0.055394 +vt 0.635137 0.028309 +vt 0.680177 0.009653 +vt 0.727992 0.000142 +vt 0.776744 0.000142 +vt 0.824559 0.009653 +vt 0.869599 0.028309 +vt 0.910135 0.055395 +vt 0.944607 0.089867 +vt 0.971691 0.130402 +vt 0.990347 0.175442 +vt 0.999858 0.223257 +vt 0.999858 0.272009 +vt 0.990347 0.319823 +vt 0.971691 0.364863 +vt 0.944606 0.405398 +vt 0.910133 0.439871 +vt 0.869598 0.466956 +vt 0.824557 0.485613 +vt 0.776743 0.495124 +vt 0.727992 0.495124 +vt 0.680177 0.485613 +vt 0.156399 0.309855 +vt 0.318618 0.102002 +vt 0.545660 0.520522 +vt 0.564085 0.508211 +vt 0.584558 0.499731 +vt 0.606292 0.495408 +vt 0.628452 0.495407 +vt 0.650186 0.499730 +vt 0.670659 0.508211 +vt 0.689084 0.520522 +vt 0.704753 0.536191 +vt 0.717065 0.554616 +vt 0.725545 0.575089 +vt 0.729868 0.596823 +vt 0.729868 0.618983 +vt 0.725545 0.640717 +vt 0.717065 0.661190 +vt 0.704754 0.679615 +vt 0.689084 0.695284 +vt 0.670659 0.707596 +vt 0.650185 0.716076 +vt 0.628452 0.720399 +vt 0.606292 0.720399 +vt 0.584558 0.716076 +vt 0.564085 0.707595 +vt 0.545660 0.695284 +vt 0.529990 0.679615 +vt 0.517679 0.661190 +vt 0.509199 0.640717 +vt 0.504876 0.618983 +vt 0.504876 0.596824 +vt 0.509199 0.575090 +vt 0.517679 0.554617 +vt 0.529991 0.536192 +vn 0.097900 -0.051900 -0.993800 +vn 0.289900 -0.051900 -0.955700 +vn 0.470800 -0.051900 -0.880700 +vn 0.633500 -0.051900 -0.772000 +vn 0.772000 -0.051900 -0.633500 +vn 0.880700 -0.051900 -0.470800 +vn 0.955700 -0.051900 -0.289900 +vn 0.993800 -0.051900 -0.097900 +vn 0.993800 -0.051900 0.097900 +vn 0.955700 -0.051900 0.289900 +vn 0.880700 -0.051900 0.470800 +vn 0.772000 -0.051900 0.633500 +vn 0.633500 -0.051900 0.772000 +vn 0.470800 -0.051900 0.880700 +vn 0.289900 -0.051900 0.955700 +vn 0.097900 -0.051900 0.993800 +vn -0.097900 -0.051900 0.993800 +vn -0.289900 -0.051900 0.955600 +vn -0.470800 -0.051900 0.880700 +vn -0.633500 -0.051900 0.772000 +vn -0.772000 -0.051900 0.633500 +vn -0.880700 -0.051900 0.470800 +vn -0.955700 -0.051900 0.289900 +vn -0.993800 -0.051900 0.097900 +vn -0.993800 -0.051900 -0.097900 +vn -0.955600 -0.051900 -0.289900 +vn -0.880700 -0.051900 -0.470800 +vn -0.772000 -0.051900 -0.633500 +vn -0.633500 -0.051900 -0.772000 +vn -0.470800 -0.051900 -0.880700 +vn 0.000000 1.000000 0.000000 +vn -0.097900 -0.051900 -0.993800 +vn -0.289900 -0.051900 -0.955700 +vn 0.000000 -1.000000 0.000000 +s off +f 1/1/1 2/2/1 4/3/1 3/4/1 +f 3/4/2 4/3/2 6/5/2 5/6/2 +f 5/6/3 6/5/3 8/7/3 7/8/3 +f 7/8/4 8/7/4 10/9/4 9/10/4 +f 9/10/5 10/9/5 12/11/5 11/12/5 +f 11/12/6 12/11/6 14/13/6 13/14/6 +f 13/14/7 14/13/7 16/15/7 15/16/7 +f 15/16/8 16/15/8 18/17/8 17/18/8 +f 17/18/9 18/17/9 20/19/9 19/20/9 +f 19/20/10 20/19/10 22/21/10 21/22/10 +f 21/22/11 22/21/11 24/23/11 23/24/11 +f 23/24/12 24/23/12 26/25/12 25/26/12 +f 25/26/13 26/25/13 28/27/13 27/28/13 +f 27/28/14 28/27/14 30/29/14 29/30/14 +f 29/30/15 30/29/15 32/31/15 31/32/15 +f 31/32/16 32/31/16 34/33/16 33/34/16 +f 33/34/17 34/33/17 36/35/17 35/36/17 +f 35/36/18 36/35/18 38/37/18 37/38/18 +f 37/38/19 38/37/19 40/39/19 39/40/19 +f 39/40/20 40/39/20 42/41/20 41/42/20 +f 41/42/21 42/41/21 44/43/21 43/44/21 +f 43/44/22 44/43/22 46/45/22 45/46/22 +f 45/46/23 46/45/23 48/47/23 47/48/23 +f 47/48/24 48/47/24 50/49/24 49/50/24 +f 49/51/25 50/52/25 52/53/25 51/54/25 +f 51/54/26 52/53/26 54/55/26 53/56/26 +f 53/56/27 54/55/27 56/57/27 55/58/27 +f 55/58/28 56/57/28 58/59/28 57/60/28 +f 57/60/29 58/59/29 60/61/29 59/62/29 +f 59/62/30 60/61/30 62/63/30 61/64/30 +f 4/65/31 2/66/31 64/67/31 62/68/31 60/69/31 58/70/31 56/71/31 54/72/31 52/73/31 50/74/31 48/75/31 46/76/31 44/77/31 42/78/31 40/79/31 38/80/31 36/81/31 34/82/31 32/83/31 30/84/31 28/85/31 26/86/31 24/87/31 22/88/31 20/89/31 18/90/31 16/91/31 14/92/31 12/93/31 10/94/31 8/95/31 6/96/31 +f 63/97/32 64/98/32 2/2/32 1/1/32 +f 61/64/33 62/63/33 64/98/33 63/97/33 +f 1/99/34 3/100/34 5/101/34 7/102/34 9/103/34 11/104/34 13/105/34 15/106/34 17/107/34 19/108/34 21/109/34 23/110/34 25/111/34 27/112/34 29/113/34 31/114/34 33/115/34 35/116/34 37/117/34 39/118/34 41/119/34 43/120/34 45/121/34 47/122/34 49/123/34 51/124/34 53/125/34 55/126/34 57/127/34 59/128/34 61/129/34 63/130/34 diff --git a/level.cc b/level.cc index f2bf3be..0a0bd91 100644 --- a/level.cc +++ b/level.cc @@ -30,8 +30,17 @@ void Level::load(ACGL::OpenGL::SharedShaderProgram shader) { glm::vec3(0.0f, 0.0f, 0.0f), shader); //add player to phy this->physics.addPlayer(0.75f,0.0f,5.0f,0.0f,1.0f,0); + objects.push_back(object); physics.addStaticGroundPlane(); + + Model torchModel = Model("torch.obj", 0.75f); + Material torchMaterial = Material("torchTexture.png", 0.1f, 0.3f, 0.7f, 10.0f); + //Create object + Object torchObject = Object(torchModel, torchMaterial, glm::vec3(-3.0f, 5.0f, 0.0f), + glm::vec3(0.0f, 1.0472f, 0.0f), glm::vec3(0.0f, 0.0f, 0.0f), + glm::vec3(0.0f, 0.0f, 0.0f), shader); + objects.push_back(torchObject); @@ -53,7 +62,6 @@ void Level::load(ACGL::OpenGL::SharedShaderProgram shader) { glm::vec3(-0.5f*(float)this->terrain.getHeightmapHeight(), 0.0f, -0.5f*(float)this->terrain.getHeightmapWidth()), glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3(0.0f, 0.0f, 0.0f), glm::vec3(0.0f, 0.0f, 0.0f), shader); - objects.push_back(object); objects.push_back(terrainObject); cameraCenter = &objects[0]; }