Index: new-game.cpp =================================================================== --- new-game.cpp (revision 809ce169f0d59f7ae6c3baf93229105b1ef66cb9) +++ new-game.cpp (revision 81f28c061f7eb8c79fb08d3263447f4c9142a249) @@ -377,10 +377,113 @@ obj.shader_program = color_sp; obj.points = { - 0.0f, 0.5f, 0.0f, - -0.5f, -0.5f, 0.0f, - 0.5f, -0.5f, 0.0f, - 0.5f, -0.5f, 0.0f, - -0.5f, -0.5f, 0.0f, - 0.0f, 0.5f, 0.0f, + //back + -0.5f, 0.3f, 0.0f, + -0.5f, 0.0f, 0.0f, + 0.5f, 0.0f, 0.0f, + -0.5f, 0.3f, 0.0f, + 0.5f, 0.0f, 0.0f, + 0.5f, 0.3f, 0.0f, + + // left back + -0.5f, 0.3f, -2.0f, + -0.5f, 0.0f, -2.0f, + -0.5f, 0.0f, 0.0f, + -0.5f, 0.3f, -2.0f, + -0.5f, 0.0f, 0.0f, + -0.5f, 0.3f, 0.0f, + + // right back + 0.5f, 0.3f, 0.0f, + 0.5f, 0.0f, 0.0f, + 0.5f, 0.0f, -2.0f, + 0.5f, 0.3f, 0.0f, + 0.5f, 0.0f, -2.0f, + 0.5f, 0.3f, -2.0f, + + // left mid + -0.25f, 0.3f, -3.0f, + -0.25f, 0.0f, -3.0f, + -0.5f, 0.0f, -2.0f, + -0.25f, 0.3f, -3.0f, + -0.5f, 0.0f, -2.0f, + -0.5f, 0.3f, -2.0f, + + // right mid + 0.5f, 0.3f, -2.0f, + 0.5f, 0.0f, -2.0f, + 0.25f, 0.0f, -3.0f, + 0.5f, 0.3f, -2.0f, + 0.25f, 0.0f, -3.0f, + 0.25f, 0.3f, -3.0f, + + // left front + 0.0f, 0.0f, -3.5f, + -0.25f, 0.0f, -3.0f, + -0.25f, 0.3f, -3.0f, + + // right front + 0.25f, 0.3f, -3.0f, + 0.25f, 0.0f, -3.0f, + 0.0f, 0.0f, -3.5f, + + // top back + -0.5f, 0.3f, -2.0f, + -0.5f, 0.3f, 0.0f, + 0.5f, 0.3f, 0.0f, + -0.5f, 0.3f, -2.0f, + 0.5f, 0.3f, 0.0f, + 0.5f, 0.3f, -2.0f, + + // top mid + -0.25f, 0.3f, -3.0f, + -0.5f, 0.3f, -2.0f, + 0.5f, 0.3f, -2.0f, + -0.25f, 0.3f, -3.0f, + 0.5f, 0.3f, -2.0f, + 0.25f, 0.3f, -3.0f, + + // top front + -0.25f, 0.3f, -3.0f, + 0.25f, 0.3f, -3.0f, + 0.0f, 0.0f, -3.5f, + + // left wing start back + -1.5f, 0.3f, 0.0f, + -1.5f, 0.0f, 0.0f, + -0.5f, 0.0f, 0.0f, + -1.5f, 0.3f, 0.0f, + -0.5f, 0.0f, 0.0f, + -0.5f, 0.3f, 0.0f, + + // left wing start top + -0.5f, 0.3f, -0.3f, + -1.3f, 0.3f, -0.3f, + -1.5f, 0.3f, 0.0f, + -0.5f, 0.3f, -0.3f, + -1.5f, 0.3f, 0.0f, + -0.5f, 0.3f, 0.0f, + + // left wing start front + -0.5f, 0.3f, -0.3f, + -0.5f, 0.0f, -0.3f, + -1.3f, 0.0f, -0.3f, + -0.5f, 0.3f, -0.3f, + -1.3f, 0.0f, -0.3f, + -1.3f, 0.3f, -0.3f, + + // left wing end outside + -1.5f, 0.3f, 0.0f, + -2.2f, 0.15f, -0.8f, + -1.5f, 0.0f, 0.0f, + + // left wing end top + -1.3f, 0.3f, -0.3f, + -2.2f, 0.15f, -0.8f, + -1.5f, 0.3f, 0.0f, + + // left wing end front + -1.3f, 0.0f, -0.3f, + -2.2f, 0.15f, -0.8f, + -1.3f, 0.3f, -0.3f, }; obj.colors = { @@ -391,4 +494,91 @@ 0.0f, 0.0f, 0.3f, 0.0f, 0.0f, 0.3f, + + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, + 0.0f, 0.0f, 0.3f, }; obj.texcoords = { @@ -399,4 +589,91 @@ 0.0f, 0.0f, 1.0f, 0.0f, + + 1.0f, 1.0f, + 0.0f, 1.0f, + 0.0f, 0.0f, + 1.0f, 1.0f, + 0.0f, 0.0f, + 1.0f, 0.0f, + + 1.0f, 1.0f, + 0.0f, 1.0f, + 0.0f, 0.0f, + 1.0f, 1.0f, + 0.0f, 0.0f, + 1.0f, 0.0f, + + 1.0f, 1.0f, + 0.0f, 1.0f, + 0.0f, 0.0f, + 1.0f, 1.0f, + 0.0f, 0.0f, + 1.0f, 0.0f, + + 1.0f, 1.0f, + 0.0f, 1.0f, + 0.0f, 0.0f, + 1.0f, 1.0f, + 0.0f, 0.0f, + 1.0f, 0.0f, + + 1.0f, 1.0f, + 0.0f, 1.0f, + 0.0f, 0.0f, + + 1.0f, 1.0f, + 0.0f, 1.0f, + 0.0f, 0.0f, + + 1.0f, 1.0f, + 0.0f, 1.0f, + 0.0f, 0.0f, + 1.0f, 1.0f, + 0.0f, 0.0f, + 1.0f, 0.0f, + + 1.0f, 1.0f, + 0.0f, 1.0f, + 0.0f, 0.0f, + 1.0f, 1.0f, + 0.0f, 0.0f, + 1.0f, 0.0f, + + 1.0f, 1.0f, + 0.0f, 1.0f, + 0.0f, 0.0f, + + 1.0f, 1.0f, + 0.0f, 1.0f, + 0.0f, 0.0f, + 1.0f, 1.0f, + 0.0f, 0.0f, + 1.0f, 0.0f, + + 1.0f, 1.0f, + 0.0f, 1.0f, + 0.0f, 0.0f, + 1.0f, 1.0f, + 0.0f, 0.0f, + 1.0f, 0.0f, + + 1.0f, 1.0f, + 0.0f, 1.0f, + 0.0f, 0.0f, + 1.0f, 1.0f, + 0.0f, 0.0f, + 1.0f, 0.0f, + + 1.0f, 1.0f, + 0.0f, 1.0f, + 0.0f, 0.0f, + + 1.0f, 1.0f, + 0.0f, 1.0f, + 0.0f, 0.0f, + + 1.0f, 1.0f, + 0.0f, 1.0f, + 0.0f, 0.0f, }; obj.selected_colors = { @@ -481,4 +758,5 @@ cam_pos = vec3(0.0f, 0.0f, 2.0f); + //cam_pos = vec3(-2.1f, -1.5f, -1.5f); // Good position for checking ship faces float cam_yaw = 0.0f * 2.0f * 3.14159f / 360.0f; float cam_pitch = 0.0f * 2.0f * 3.14159f / 360.0f;