sadpmpk
/
HATPC
1
0
Fork 0
Code Issues 11 Pull Requests Projects 4 Releases Wiki Activity

Fix crouch regression on low ceiling 

Changelog:
- Fix crouch not holding when ceiling is too low for uncrouch
  - This is due to a removal of the check for low ceiling. However,
    the current state of the crouch action needs to be stored.
    So, use second bit of the is_crouch for this in player state.
- Remove bit fields in player state. Optimise later if need be
- Draw entities over tiles, and gridlines over entities
  - This is to prevent water covering the entities
  - rework this in the future maybe
scene_man
En Yi 2023-01-15 00:14:24 +08:00
parent 6fc2317647
commit a485922d5d
3 changed files with 43 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components.h
View File

@ -67,8 +67,8 @@ typedef enum PlayerState
typedef struct _CPlayerState_t
{
Vector2 player_dir;
uint8_t jump_pressed: 1;
uint8_t is_crouch: 1;
uint8_t jump_pressed;
uint8_t is_crouch;
}CPlayerState_t;
typedef enum ContainerItem

4
constants.h
View File

@ -10,10 +10,10 @@
#define PLAYER_WIDTH 30
#define PLAYER_HEIGHT 55
#define PLAYER_C_WIDTH 48
#define PLAYER_C_WIDTH 30
#define PLAYER_C_HEIGHT 30
#define PLAYER_C_YOFFSET 25
#define PLAYER_C_XOFFSET 9
#define PLAYER_C_XOFFSET 0
#define PLAYER_MAX_SPEED 1000
#define Y_FRICTION 0.98

61
scene_impl.c
View File

@ -203,24 +203,6 @@ static void level_scene_render_func(Scene_t* scene)
TileGrid_t tilemap = data->tilemap;
Entity_t *p_ent;
sc_map_foreach_value(&scene->ent_manager.entities, p_ent)
{
CTransform_t* p_ct = get_component(&scene->ent_manager, p_ent, CTRANSFORM_COMP_T);
CBBox_t* p_bbox = get_component(&scene->ent_manager, p_ent, CBBOX_COMP_T);
Color colour;
switch(p_ent->m_tag)
{
case PLAYER_ENT_TAG:
colour = RED;
break;
case CRATES_ENT_TAG:
colour = BROWN;
break;
default:
colour = BLACK;
}
DrawRectangle(p_ct->position.x, p_ct->position.y, p_bbox->size.x, p_bbox->size.y, colour);
}
for (size_t i=0; i<tilemap.n_tiles;++i)
{
@ -245,6 +227,25 @@ static void level_scene_render_func(Scene_t* scene)
}
}
sc_map_foreach_value(&scene->ent_manager.entities, p_ent)
{
CTransform_t* p_ct = get_component(&scene->ent_manager, p_ent, CTRANSFORM_COMP_T);
CBBox_t* p_bbox = get_component(&scene->ent_manager, p_ent, CBBOX_COMP_T);
Color colour;
switch(p_ent->m_tag)
{
case PLAYER_ENT_TAG:
colour = RED;
break;
case CRATES_ENT_TAG:
colour = BROWN;
break;
default:
colour = BLACK;
}
DrawRectangle(p_ct->position.x, p_ct->position.y, p_bbox->size.x, p_bbox->size.y, colour);
}
// Draw tile grid
for (size_t i=0; i<tilemap.width;++i)
{
@ -271,7 +272,7 @@ static void level_scene_render_func(Scene_t* scene)
DrawText(buffer, tilemap.width * TILE_SIZE + 1, 60, 12, BLACK);
sprintf(buffer, "Cooldown: %u", p_cjump->cooldown_timer);
DrawText(buffer, (tilemap.width + 3) * TILE_SIZE + 1, 60, 12, BLACK);
sprintf(buffer, "Crouch: %s", p_pstate->is_crouch? "YES":"NO");
sprintf(buffer, "Crouch: %u", p_pstate->is_crouch);
DrawText(buffer, tilemap.width * TILE_SIZE + 1, 90, 12, BLACK);
sprintf(buffer, "Water: %s", p_mstate->water_state & 1? "YES":"NO");
DrawText(buffer, tilemap.width * TILE_SIZE + 1, 120, 12, BLACK);
@ -325,6 +326,22 @@ static void player_movement_input_system(Scene_t* scene)
//else
{
if (p_pstate->is_crouch == 0b01)
{
Vector2 test_pos = p_ctransform->position;
Vector2 test_bbox = {PLAYER_WIDTH, PLAYER_HEIGHT};
Vector2 top = {0, 0};
test_pos.x += PLAYER_C_XOFFSET;
test_pos.y -= PLAYER_C_YOFFSET;
if (!check_collision_at(test_pos, test_bbox, &tilemap, top))
{
p_pstate->is_crouch >>= 1;
}
}
else
{
p_pstate->is_crouch >>= 1;
}
if (p_cjump->cooldown_timer > 0) p_cjump->cooldown_timer--;
// Jumps is possible as long as you have a jump
@ -334,7 +351,7 @@ static void player_movement_input_system(Scene_t* scene)
bool jump_valid = true;
// Check Jump from crouch
if(p_pstate->is_crouch)
if(p_pstate->is_crouch & 1)
{
Vector2 test_pos = p_ctransform->position;
Vector2 test_bbox = {PLAYER_WIDTH, PLAYER_HEIGHT};
@ -422,7 +439,7 @@ static void player_bbox_update_system(Scene_t *scene)
}
}
Vector2 new_bbox;
if(p_pstate->is_crouch)
if(p_pstate->is_crouch & 1)
{
new_bbox.x = PLAYER_C_WIDTH;
new_bbox.y = PLAYER_C_HEIGHT;
@ -881,7 +898,7 @@ void level_do_action(Scene_t *scene, ActionType_t action, bool pressed)
break;
case ACTION_DOWN:
p_playerstate->player_dir.y = (pressed)? 1 : 0;
p_playerstate->is_crouch = pressed;
p_playerstate->is_crouch |= (pressed)? 0b10 : 0;
break;
case ACTION_LEFT:
p_playerstate->player_dir.x = (pressed)? -1 : 0;