Experiment with 3D graphics

src/asteroid.cpp

@@ -23,7 +23,7 @@ ObjectState Asteroid::update()
   position.x += velocity.x;
   position.y += velocity.y;
 
-  wrap_position(position);
+  //wrap_position(position);
 
   rotation += rotation_speed;
 
@@ -57,4 +57,7 @@ void Asteroid::draw() const noexcept
   DrawCircleLines(position.x - Game::width, position.y, size, RED);
   DrawCircleLines(position.x, position.y + Game::height, size, RED);
   DrawCircleLines(position.x, position.y - Game::height, size, RED);
+
+  const float s = 0.1f;
+  DrawSphereEx(Vector3{ position.x * s, 0.0f, position.y * s }, size * 0.2f, 4, 4, WHITE);
 }

src/bullet.cpp

@@ -8,7 +8,7 @@ ObjectState Bullet::update()
   position.x += velocity.x;
   position.y += velocity.y;
 
-  wrap_position(position);
+  //wrap_position(position);
 
   life--;
 
@@ -18,4 +18,7 @@ ObjectState Bullet::update()
 void Bullet::draw() const noexcept
 {
   DrawCircle(position.x, position.y, 2.0f, PINK);
+
+  const float s = 0.1f;
+  DrawSphereEx(Vector3{ position.x * s, 0.0f, position.y * s }, 0.2f, 4, 4, WHITE);
 }

src/external/CMakeLists.txt

@@ -19,6 +19,11 @@ SET(SUPPORT_FILEFORMAT_VOX OFF CACHE BOOL "" FORCE)
 SET(SUPPORT_FILEFORMAT_XM OFF CACHE BOOL "" FORCE)
 SET(SUPPORT_FILEFORMAT_MOD OFF CACHE BOOL "" FORCE)
 
+SET(SUPPORT_MODULE_RMODELS ON CACHE BOOL "" FORCE)
+SET(SUPPORT_FILEFORMAT_OBJ ON CACHE BOOL "" FORCE)
+SET(SUPPORT_FILEFORMAT_MTL ON CACHE BOOL "" FORCE)
+SET(SUPPORT_FILEFORMAT_GLTF ON CACHE BOOL "" FORCE)
+
 SET(GLFW_USE_HYBRID_HPG OFF CACHE BOOL "" FORCE)
 SET(GLFW_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
 SET(GLFW_BUILD_TESTS OFF CACHE BOOL "" FORCE)

src/game.cpp

@@ -30,10 +30,11 @@ void Game::init()
     asteroids->push(asteroid);
   }
 
-  camera.target   = Vector2{ static_cast<float>(width) / 2.0f, static_cast<float>(height) / 2.0f };
-  camera.offset   = Vector2{ static_cast<float>(width) / 2.0f, static_cast<float>(height) / 2.0f };
-  camera.zoom     = 1.0f;
-  camera.rotation = 0.0f;
+  camera.position = Vector3{ static_cast<float>(width) / 2.0f, static_cast<float>(height) / 2.0f, 10.0f };
+  camera.target   = Vector3{ static_cast<float>(width) / 2.0f, static_cast<float>(height) / 2.0f, 0.0f };
+  camera.up       = Vector3{ 0.0f, 0.0f, 1.0f };
+  camera.fovy     = 60.0f;
+  camera.projection = CAMERA_PERSPECTIVE;
 }
 
 void Game::update()
@@ -42,17 +43,23 @@ void Game::update()
   bullets->update();
   asteroids->update();
 
-  camera.target   = player->position;
-  camera.rotation = -player->rotation;
+  camera.position = Vector3 { 0.0f, 20.0f, 0.0f };
+  camera.target = Vector3{ player->position.x * 0.1f, player->position.y * 0.1f, 0.0f };
 }
 
 void Game::draw() noexcept
 {
-  BeginMode2D(camera);
+  BeginMode3D(camera);
   {
+    DrawCube(Vector3{ 0.0f, 0.0f, 0.0f }, 0.2f, 0.2f, 0.2f, BLUE);
+
     player->draw();
     bullets->draw();
     asteroids->draw();
+
+    DrawGrid(100, 10.0f);
+    DrawSphere(Vector3{ 0.0f, 0.0f, 0.0f }, 1.0f, RED);
+
   }
-  EndMode2D();
+  EndMode3D();
 }

src/game.hpp

@@ -21,8 +21,8 @@ class Game
   std::unique_ptr<ObjectCircularBuffer<Bullet>> bullets;
   std::unique_ptr<ObjectCircularBuffer<Asteroid>> asteroids;
 
-  static constexpr int width               = 480;
-  static constexpr int height              = 270;
+  static constexpr int width               = 960;
+  static constexpr int height              = 540;
   static constexpr float delta_time        = 1.0f / 60.0f;
   static constexpr int NUMBER_OF_ASTEROIDS = 10;
 
@@ -33,5 +33,5 @@ class Game
   void draw() noexcept;
 
 private:
-  Camera2D camera { };
+  Camera3D camera { };
 };

src/main.cpp

@@ -25,12 +25,13 @@ static float accumulator = 0.0f;
 const int window_width  = Game::width;
 const int window_height = Game::height;
 
-const bool integer_scaling = true;
+const bool integer_scaling = false;
 
 void update_draw_frame()
 {
   Game &game = Game::get();
-  static RenderPass game_render_pass(Game::width, Game::height);
+  static RenderPass game_render_pass(Game::width * 2, Game::height * 2);
+  SetTextureFilter(game_render_pass.render_texture.texture, TEXTURE_FILTER_BILINEAR);
   if (!game_render_pass.render_func)
     game_render_pass.render_func = [&]()
     {
@@ -59,8 +60,7 @@ void update_draw_frame()
   const float screen_width_float  = static_cast<float>(GetScreenWidth());
   const float screen_height_float = static_cast<float>(GetScreenHeight());
 
-  float scale =
-    std::max(std::min(screen_width_float / (float)(Game::width), screen_height_float / (float)(Game::height)), 1.0f);
+  float scale = std::min(screen_width_float / (float)(Game::width), screen_height_float / (float)(Game::height));
   if (integer_scaling)
     scale = std::floor(scale);
 

src/player.cpp

@@ -35,11 +35,12 @@ void Player::draw() noexcept
   sprite.position.y = position.y;
   sprite.draw();
 
-  DrawCircle(sprite.position.x, sprite.position.y, 2.0f, RED);
+  const float s = 0.1f;
+  DrawModelEx(model, Vector3{ position.x * s, 0.0f, position.y * s }, Vector3{ 0.0f, 1.0f, 0.0f }, -rotation, Vector3{ 1.0f, 1.0f, 1.0f }, WHITE);
 }
 
 void Player::die()
-{
+{return;
   lives--;
   position.x = Game::width / 2.0f;
   position.y = Game::height / 2.0f;
@@ -109,7 +110,7 @@ void Player::update()
     velocity.y *= max_velocity;
   }
 
-  wrap_position(position);
+  //wrap_position(position);
 
   for (size_t i = Game::get().asteroids->tail; i < Game::get().asteroids->head; i++)
   {

src/player.hpp

@@ -13,7 +13,8 @@ class Player
 {
 public:
   Sprite sprite{ "resources/test.aseprite", "idle" };
-  Vector2 position{ Game::width / 2.0f, Game::height / 2.0f };
+  Model model{ LoadModel("resources/ship.glb") };
+  Vector2 position{ 0.0f, 0.0f };
   Vector2 velocity{ 0.0f, 0.0f };
   float rotation{ 0.0f };
 

src/utils.cpp

@@ -24,14 +24,14 @@ Rectangle texture_rect_flipped(const Texture2D &texture)
 void wrap_position(Vector2 &position)
 {
   if (position.x < 0)
-    position.x = Game::width - 1;
+    position.x = Game::width * 10 - 1;
 
-  if (position.x >= Game::width)
+  if (position.x >= Game::width * 10)
     position.x = 0;
 
   if (position.y < 0)
-    position.y = Game::height - 1;
+    position.y = Game::height * 10 - 1;
 
-  if (position.y >= Game::height)
+  if (position.y >= Game::height * 10)
     position.y = 0;
 }