Improved level design tooling, Added ui camera

4 files changed, 78 insertions, 28 deletions

diff --git a/levels/level0.txt b/levels/level0.txt
index 27dd2fc..3744ea2 100644
--- a/levels/level0.txt
+++ b/levels/level0.txt
@@ -2,18 +2,20 @@
 0x1
 #   type    posx    posy    sizex   sizey
     0	    150	    70	    1	    1
-    1 	    0	    0	    50	    1
-    1	    0	    0	    1	    50
-    1 	    200	    150	    1	    1
-    1 	    400	    250	    1	    1
-    1 	    840	    400     10	    1
+    1 	    0	    0	    25	    1
+    1	    0	    0	    1	    25
+    1 	    256	    128	    1	    1
+    1 	    448	    256	    1	    1
+    1 	    640	    384     10	    1
     2 	    900	    800     1	    1
+    1 	    100    1000     25	    1
+    1 	    1500    0	    1	    25
 # == gameplay elements ==
 # gravity inverter
 #   type    posx    posy    sizex   sizey
-    3	    650	    60	    1	    1
+    3	    640	    64	    1	    1
 # teleporter
 #   type    posx    posy    sizex   sizey   id	    link_id
-    4 	    800	    90	    1	    2	    50	    51
-    4 	    800	    490	    1	    2	    51	    50
+    4 	    832	    64	    1	    2	    50	    51
+    4 	    832	    448	    1	    2	    51	    50
 
diff --git a/source/main.cpp b/source/main.cpp
index e0b5009..ae6b5a4 100755
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -179,12 +179,18 @@ struct GLRenderer {
   u32 cq_sp;
   u32 cq_vao;
   // camera
-  b8   cam_update;
   Vec3 preset_up_dir;
+  Mat4 cam_proj;
+  // ui camera
+  b8 ui_cam_update;
+  Vec3 ui_cam_pos;
+  Vec3 ui_cam_look;
+  Mat4 ui_cam_view;
+  // game camera
+  b8   cam_update;
   Vec3 cam_pos;
   Vec3 cam_look;
   Mat4 cam_view;
-  Mat4 cam_proj;
   // Batched cq
   // batching buffer
   u32 cq_batch_sp;
@@ -576,10 +582,13 @@ void gl_render_text(GLRenderer *renderer, char* text, Vec2 position, r32 size, V
   glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
   
   glUseProgram(renderer->ui_text.sp);
-  glUniformMatrix4fv(glGetUniformLocation(renderer->ui_text.sp, "View"), 
-                     1, GL_FALSE, renderer->cam_view.buffer);
-  glUniformMatrix4fv(glGetUniformLocation(renderer->ui_text.sp, "Projection"), 
-                     1, GL_FALSE, renderer->cam_proj.buffer);
+  if (renderer->ui_cam_update) {
+      glUniformMatrix4fv(glGetUniformLocation(renderer->ui_text.sp, "View"), 
+			 1, GL_FALSE, renderer->ui_cam_view.buffer);
+      glUniformMatrix4fv(glGetUniformLocation(renderer->ui_text.sp, "Projection"), 
+			 1, GL_FALSE, renderer->cam_proj.buffer);
+      renderer->ui_cam_update = 0;
+  }
   glUniform3fv(glGetUniformLocation(renderer->ui_text.sp, "TextColor"), 1, color.data);
   glBindVertexArray(renderer->ui_text.vao);
   glBindTexture(GL_TEXTURE_2D_ARRAY, renderer->ui_text.texture_atlas_id);
@@ -852,6 +861,11 @@ int main(int argc, char* argv[])
     0.0f, (r32)scr_height*render_scale,
     0.1f, 15.0f
   );
+  // fixed_screen_camera
+  renderer.ui_cam_update = 1;
+  renderer.ui_cam_pos = renderer.cam_pos;
+  renderer.ui_cam_look = renderer.cam_look;
+  renderer.ui_cam_view = renderer.cam_view;
 
   // @section: gameplay variables
   r32 motion_scale = 2.0f;
@@ -918,6 +932,7 @@ int main(int argc, char* argv[])
       effective_force = 0.0f;
       player_velocity = Vec2{0.0f, 0.0f};
       gravity_diry = 1.0f;
+      renderer.cam_update = 1;
   }
 
   // gameplay camera movement stuff
@@ -988,6 +1003,10 @@ int main(int argc, char* argv[])
     controller.jump = 0;
     controller.toggle_gravity = 0;
 
+
+    IVec2 mouse_position;
+    IVec2 mouse_position_world;
+    IVec2 mouse_position_clamped;
     SDL_Event ev;
     while(SDL_PollEvent(&ev))
     {
@@ -997,6 +1016,19 @@ int main(int argc, char* argv[])
           {
             game_running = 0;
           } break;
+	case (SDL_MOUSEMOTION):
+	  {
+	      SDL_GetMouseState(&mouse_position.x, &mouse_position.y);
+	      // flip mouse y to map it Y at Top -> Y at Bottom (like in maths)
+	      mouse_position.y = scr_height*state.render_scale.y - mouse_position.y;
+	      // get mouse world position
+	      mouse_position_world.x = mouse_position.x + (s32)renderer.cam_pos.x;
+	      mouse_position_world.y = mouse_position.y + (s32)renderer.cam_pos.y;
+	      // clamp mouse position based off of the grids we draw (this will make level object placement easier)
+	      mouse_position_clamped.x = mouse_position_world.x - (mouse_position_world.x % (s32)(atom_size.x));
+	      mouse_position_clamped.y = mouse_position_world.y - (mouse_position_world.y % (s32)(atom_size.y));
+
+	  } break;
         case (SDL_KEYDOWN):
           {
             if (ev.key.keysym.sym == SDLK_w)
@@ -1506,8 +1538,8 @@ int main(int argc, char* argv[])
 
 	// @step: player is at the edge of the screen
 	// get players visible bounds (padding around the player to consider it be visible for the camera)
-	Vec2 vis_lb = player.bounds.lb - (Vec2{40.0f, 60.0f} * state.render_scale);
-	Vec2 vis_rt = player.bounds.rt + (Vec2{40.0f, 60.0f} * state.render_scale);
+	Vec2 vis_lb = player.bounds.lb - (Vec2{120.0f, 60.0f} * state.render_scale);
+	Vec2 vis_rt = player.bounds.rt + (Vec2{120.0f, 60.0f} * state.render_scale);
 	Rect vis_bounds;
 	vis_bounds.lb = vis_lb;
 	vis_bounds.rt = vis_rt;
@@ -1629,7 +1661,6 @@ int main(int argc, char* argv[])
     
     // @section: rendering
     // @step: render draw lines
-#if 1
     {
 	// @step: draw vertical lines
 	s32 line_index = (s32)state.camera_bounds.lb.x/atom_size.x;
@@ -1682,7 +1713,6 @@ int main(int argc, char* argv[])
 	}
 	gl_line_flush(&renderer);
     }
-#endif
 
     // render_entities
     for (int i = 0; i < state.game_level.entity_count; i++) {
@@ -1760,6 +1790,22 @@ int main(int argc, char* argv[])
     //               28.0f*render_scale,                     // size
     //               Vec3{0.0f, 0.0f, 0.0f});   // color
 
+    sprintf(fmt_buffer, "GridX: %d, GridY: %d", mouse_position_clamped.x, mouse_position_clamped.y);
+    gl_render_text(
+	    &renderer,
+	    fmt_buffer,
+	    Vec2{0.0f, 0.0f},
+	    28.0f*render_scale,
+	    Vec3{0.0f, 0.0f, 0.0f});
+
+    sprintf(fmt_buffer, "WorldMouseX: %d, WorldMouseY: %d", mouse_position_world.x, mouse_position_world.y);
+    gl_render_text(
+	    &renderer,
+	    fmt_buffer,
+	    Vec2{0.0f, 40.0f},
+	    28.0f*render_scale,
+	    Vec3{0.0f, 0.0f, 0.0f});
+
     SDL_GL_SwapWindow(window);
 
     update_frame_timer(&timer);
diff --git a/source/math.h b/source/math.h
index b189c89..da7744b 100755
--- a/source/math.h
+++ b/source/math.h
@@ -51,12 +51,12 @@ u32 clampi(u32 x, u32 bottom, u32 top)
 // ==== Vector Math ====
 union IVec2 {
   struct {
-    u32 x;
-    u32 y;
+    s32 x;
+    s32 y;
   };
-  u32 data[2];
+  s32 data[2];
 
-  IVec2 operator+(u32 scaler) {
+  IVec2 operator+(s32 scaler) {
     IVec2 res;
     res.x = this->x + scaler;
     res.y = this->y + scaler;
@@ -72,7 +72,7 @@ union IVec2 {
     return res;
   }
 
-  IVec2 operator-(u32 scaler) {
+  IVec2 operator-(s32 scaler) {
     IVec2 res;
     res.x = this->x - scaler;
     res.y = this->y - scaler;
@@ -88,7 +88,7 @@ union IVec2 {
     return res;
   }
 
-  IVec2 operator*(u32 scaler) {
+  IVec2 operator*(s32 scaler) {
     IVec2 res;
     res.x = this->x * scaler;
     res.y = this->y * scaler;
@@ -104,7 +104,7 @@ union IVec2 {
     return res;
   }
 
-  IVec2 operator/(u32 scaler) {
+  IVec2 operator/(s32 scaler) {
     SDL_assert(scaler != 0);
     IVec2 res;
     res.x = this->x / scaler;
diff --git a/source/todo.txt b/source/todo.txt
index 165d963..efc8285 100644
--- a/source/todo.txt
+++ b/source/todo.txt
@@ -28,17 +28,19 @@ DONE:
 in the level file.
 - Added invert gravity mechanic
 - teleport block mechanic
-
-DOING:
 - improve level design features
     * add lines for easier distinction
     * get world position via mouse
+- setup ui camera
+
+DOING:
+- Fix camera jerk on level load
 
 BLOCKED:
 - Audio: figure out what the correct audio sound for jumping will be.
 
 TODO:
-- Fix camera jerk on level load
+- Refactor level loading functions
 - Make camera pan a continuous function, discrete steps are too jerky.
 - Update camera follower for centering player in view (with limits) after
   a few seconds (maybe like 2 seconds)