cone

assets/models/cone.obj

@@ -1,22 +1,6 @@
-# Blender 3.6.4
+# Blender v3.6.4 OBJ File: ''
 # www.blender.org
 o Cone
-v 0.000000 -1.000000 1.000000
-v -0.195090 -1.000000 0.980785
-v -0.382683 -1.000000 0.923880
-v -0.555570 -1.000000 0.831470
-v -0.707107 -1.000000 0.707107
-v -0.831470 -1.000000 0.555570
-v -0.923880 -1.000000 0.382683
-v -0.980785 -1.000000 0.195090
-v -1.000000 -1.000000 0.000000
-v -0.980785 -1.000000 -0.195090
-v -0.923880 -1.000000 -0.382683
-v -0.831470 -1.000000 -0.555570
-v -0.707107 -1.000000 -0.707107
-v -0.555570 -1.000000 -0.831470
-v -0.382683 -1.000000 -0.923880
-v -0.195090 -1.000000 -0.980785
 v 0.000000 -1.000000 -1.000000
 v 0.195090 -1.000000 -0.980785
 v 0.382683 -1.000000 -0.923880
@@ -33,67 +17,148 @@ v 0.707107 -1.000000 0.707107
 v 0.555570 -1.000000 0.831470
 v 0.382683 -1.000000 0.923880
 v 0.195090 -1.000000 0.980785
+v 0.000000 -1.000000 1.000000
+v -0.195090 -1.000000 0.980785
+v -0.382683 -1.000000 0.923880
+v -0.555570 -1.000000 0.831470
+v -0.707107 -1.000000 0.707107
+v -0.831470 -1.000000 0.555570
+v -0.923880 -1.000000 0.382683
+v -0.980785 -1.000000 0.195090
+v -1.000000 -1.000000 0.000000
+v -0.980785 -1.000000 -0.195090
+v -0.923880 -1.000000 -0.382683
+v -0.831470 -1.000000 -0.555570
+v -0.707107 -1.000000 -0.707107
+v -0.555570 -1.000000 -0.831470
+v -0.382683 -1.000000 -0.923880
+v -0.195090 -1.000000 -0.980785
 v 0.000000 1.000000 0.000000
-s 0
-f 1 33 2
-f 2 33 3
-f 3 33 4
-f 4 33 5
-f 5 33 6
-f 6 33 7
-f 7 33 8
-f 8 33 9
-f 9 33 10
-f 10 33 11
-f 11 33 12
-f 12 33 13
-f 13 33 14
-f 14 33 15
-f 15 33 16
-f 16 33 17
-f 17 33 18
-f 18 33 19
-f 19 33 20
-f 20 33 21
-f 21 33 22
-f 22 33 23
-f 23 33 24
-f 24 33 25
-f 25 33 26
-f 26 33 27
-f 27 33 28
-f 28 33 29
-f 29 33 30
-f 30 33 31
-f 16 24 32
-f 31 33 32
-f 32 33 1
-f 32 1 2
-f 2 3 4
-f 4 5 6
-f 6 7 8
-f 8 9 10
-f 10 11 12
-f 12 13 14
-f 14 15 16
-f 16 17 18
-f 18 19 20
-f 20 21 22
-f 22 23 24
-f 24 25 26
-f 26 27 28
-f 28 29 30
-f 30 31 32
-f 32 2 4
-f 4 6 8
-f 8 10 12
-f 12 14 16
-f 16 18 20
-f 20 22 24
-f 24 26 28
-f 28 30 32
-f 32 4 8
-f 8 12 16
-f 16 20 24
-f 24 28 32
-f 32 8 16
+vt 0.250000 0.490000
+vt 0.250000 0.250000
+vt 0.296822 0.485388
+vt 0.341844 0.471731
+vt 0.383337 0.449553
+vt 0.419706 0.419706
+vt 0.449553 0.383337
+vt 0.471731 0.341844
+vt 0.485388 0.296822
+vt 0.490000 0.250000
+vt 0.485388 0.203178
+vt 0.471731 0.158156
+vt 0.449553 0.116663
+vt 0.419706 0.080294
+vt 0.383337 0.050447
+vt 0.341844 0.028269
+vt 0.296822 0.014612
+vt 0.250000 0.010000
+vt 0.203178 0.014612
+vt 0.158156 0.028269
+vt 0.116663 0.050447
+vt 0.080294 0.080294
+vt 0.050447 0.116663
+vt 0.028269 0.158156
+vt 0.014612 0.203178
+vt 0.010000 0.250000
+vt 0.014612 0.296822
+vt 0.028269 0.341844
+vt 0.050447 0.383337
+vt 0.080294 0.419706
+vt 0.116663 0.449553
+vt 0.158156 0.471731
+vt 0.796822 0.014612
+vt 0.514612 0.203178
+vt 0.703178 0.485388
+vt 0.203178 0.485388
+vt 0.750000 0.490000
+vt 0.796822 0.485388
+vt 0.841844 0.471731
+vt 0.883337 0.449553
+vt 0.919706 0.419706
+vt 0.949553 0.383337
+vt 0.971731 0.341844
+vt 0.985388 0.296822
+vt 0.990000 0.250000
+vt 0.985388 0.203178
+vt 0.971731 0.158156
+vt 0.949553 0.116663
+vt 0.919706 0.080294
+vt 0.883337 0.050447
+vt 0.841844 0.028269
+vt 0.750000 0.010000
+vt 0.703178 0.014612
+vt 0.658156 0.028269
+vt 0.616663 0.050447
+vt 0.580294 0.080294
+vt 0.550447 0.116663
+vt 0.528269 0.158156
+vt 0.510000 0.250000
+vt 0.514612 0.296822
+vt 0.528269 0.341844
+vt 0.550447 0.383337
+vt 0.580294 0.419706
+vt 0.616663 0.449553
+vt 0.658156 0.471731
+s off
+f 1/1 33/2 2/3
+f 2/3 33/2 3/4
+f 3/4 33/2 4/5
+f 4/5 33/2 5/6
+f 5/6 33/2 6/7
+f 6/7 33/2 7/8
+f 7/8 33/2 8/9
+f 8/9 33/2 9/10
+f 9/10 33/2 10/11
+f 10/11 33/2 11/12
+f 11/12 33/2 12/13
+f 12/13 33/2 13/14
+f 13/14 33/2 14/15
+f 14/15 33/2 15/16
+f 15/16 33/2 16/17
+f 16/17 33/2 17/18
+f 17/18 33/2 18/19
+f 18/19 33/2 19/20
+f 19/20 33/2 20/21
+f 20/21 33/2 21/22
+f 21/22 33/2 22/23
+f 22/23 33/2 23/24
+f 23/24 33/2 24/25
+f 24/25 33/2 25/26
+f 25/26 33/2 26/27
+f 26/27 33/2 27/28
+f 27/28 33/2 28/29
+f 28/29 33/2 29/30
+f 29/30 33/2 30/31
+f 30/31 33/2 31/32
+f 16/33 24/34 32/35
+f 31/32 33/2 32/36
+f 32/36 33/2 1/1
+f 32/35 1/37 2/38
+f 2/38 3/39 4/40
+f 4/40 5/41 6/42
+f 6/42 7/43 8/44
+f 8/44 9/45 10/46
+f 10/46 11/47 12/48
+f 12/48 13/49 14/50
+f 14/50 15/51 16/33
+f 16/33 17/52 18/53
+f 18/53 19/54 20/55
+f 20/55 21/56 22/57
+f 22/57 23/58 24/34
+f 24/34 25/59 26/60
+f 26/60 27/61 28/62
+f 28/62 29/63 30/64
+f 30/64 31/65 32/35
+f 32/35 2/38 8/44
+f 2/38 4/40 8/44
+f 4/40 6/42 8/44
+f 8/44 10/46 16/33
+f 10/46 12/48 16/33
+f 12/48 14/50 16/33
+f 16/33 18/53 24/34
+f 18/53 20/55 24/34
+f 20/55 22/57 24/34
+f 24/34 26/60 32/35
+f 26/60 28/62 32/35
+f 28/62 30/64 32/35
+f 32/35 8/44 16/33

include/types/player.h

@@ -35,12 +35,12 @@ public:
         // William continues to load assets on the first frame.
         if (engine->frameCount == 1) {
             geometry.load("assets/models/cube.obj");
-            //geometry.scale(0.5f);
+            geometry.scale(0.75f);
             position = {0,-2,0};
         }
         //Rotate
         //std::cout << "Occluded: " << occluded << std::endl;
-        this->angle.y = 255*engine->frameDelta;
+        this->angle.y = 64*engine->frameDelta;
         //this->angle.x = 1;
         geometry.rotate(angle);
         boundingBox = BoundingBox::calculateAABB(&geometry);

src/types/camera.cpp

@@ -10,9 +10,12 @@ void Camera::update()
 
 }
 
-LinearAlgebra::Matrix4x4 Camera::GetViewMatrix() {
-    //return glm::lookAt(position, position + angle, UP);
-}
+//I couldn't figure out how to construct a mat4x4 with that data.
+
+//LinearAlgebra::Matrix4x4 Camera::GetViewMatrix() {
+    //GLfloat matrix[16];
+    //glGetFloatv(GL_MODELVIEW_MATRIX, matrix);
+//}
 void Camera::modeBinds() {
     if (engine->window->keyDown(SCANCODE::ZERO)) {
         takingScreenshot = true;
@@ -93,6 +96,7 @@ void Camera::render() {
     //this->angle.clamp();
     glRotatef(angle.x,1.0f, 0.0f, 0.0f);
     glRotatef(-angle.y,0.0f, 1.0f, 0.0f);
+    glRotatef(angle.z,0.0f, 0.0f, 1.0f);
 
     glTranslatef(0.0f, 0.0f, 0.0f);
     gluLookAt(position.x, position.y, position.z,   // camera position
@@ -100,10 +104,6 @@ void Camera::render() {
               upVector.x,upVector.y,upVector.z);
 }
 void Camera::post_render() {
-    if (this->takingScreenshot) {
-        engine->takeScreenshot();
-        takingScreenshot = false;
-    }
     this->ticksAlive++;
 }