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

Compare commits

base: sadpmpk:c64ef906e03c2a76e9e7853248fe025055ff5216
Branches Tags
sadpmpk:main
sadpmpk:level_select
sadpmpk:scene_man
..
compare: sadpmpk:72c27ed92ec035d77e2f9d2fc8a6223b0c21f064
Branches Tags
sadpmpk:main
sadpmpk:level_select
sadpmpk:scene_man

No commits in common. "c64ef906e03c2a76e9e7853248fe025055ff5216" and "72c27ed92ec035d77e2f9d2fc8a6223b0c21f064" have entirely different histories.
c64ef906e0 ... 72c27ed92e

3 changed files with 75 additions and 58 deletions
Show Stats Expand all files Collapse all files

10
engine/AABB.c
View File

@ -3,17 +3,13 @@
uint8_t find_1D_overlap(Vector2 l1, Vector2 l2, float* overlap) uint8_t find_1D_overlap(Vector2 l1, Vector2 l2, float* overlap)
{ {
// No Overlap // No Overlap
if (l1.y < l2.x || l2.y < l1.x) return 0; if (l1.y <= l2.x || l2.y <= l1.x) return 0;
if ( if (l1.x >= l2.x && l1.y <= l2.y)
(l1.x >= l2.x && l1.y <= l2.y)
|| (l2.x >= l1.x && l2.y <= l1.y)
)
{ {
// Complete Overlap, any direction is possible // Complete Overlap, any direction is possible
// Cannot give a singular value, but return something anyways // Cannot give a singular value, but return something anyways
//*overlap = l2.y-l2.x + l1.y-l1.x; *overlap = l2.y-l2.x + l1.y-l1.x;
*overlap = fmin(fabs(l2.y-l2.x), fabs(l1.y-l1.x));
return 2; return 2;
} }
//Partial overlap //Partial overlap

1
engine/EC.h
View File

@ -59,7 +59,6 @@ typedef struct _CMovementState_t {
uint8_t ground_state; uint8_t ground_state;
uint8_t water_state; uint8_t water_state;
uint8_t x_dir; uint8_t x_dir;
float water_overlap;
} CMovementState_t; } CMovementState_t;
// This is to store the occupying tiles // This is to store the occupying tiles

122
scenes/game_systems.c
View File

@ -875,20 +875,11 @@ void friction_coefficient_update_system(Scene_t* scene)
// Friction // Friction
if (p_mstate != NULL) if (p_mstate != NULL && p_mstate->water_state & 1)
{ {
// Apply water friction // Apply water friction
// Consistent in all direction // Consistent in all direction
p_ct->fric_coeff = Vector2Add( p_ct->fric_coeff = (Vector2){-WATER_FRICTION, -WATER_FRICTION};
Vector2Scale(
(Vector2){-WATER_FRICTION, -WATER_FRICTION},
p_mstate->water_overlap
),
Vector2Scale(
(Vector2){-GROUND_X_FRICTION, -GROUND_Y_FRICTION},
(1 - p_mstate->water_overlap)
)
);
} }
else else
{ {
@ -927,14 +918,35 @@ void global_external_forces_system(Scene_t* scene)
if (!(p_mstate->ground_state & 1)) if (!(p_mstate->ground_state & 1))
{ {
p_ctransform->accel = Vector2Multiply( // Only apply upthrust if center is in water
Vector2Add( // If need more accuracy, need to find area of overlap
p_ctransform->accel, if (p_mstate->water_state & 1)
Vector2Scale(UPTHRUST, p_mstate->water_overlap) {
), Vector2 player_center = (Vector2){
p_ctransform->shape_factor .x = p_ctransform->position.x + p_bbox->half_size.x,
); .y = p_ctransform->position.y + p_bbox->half_size.y,
};
unsigned int tile_idx = get_tile_idx(
player_center.x,
player_center.y,
data->tilemap.width
);
if (data->tilemap.tiles[tile_idx].water_level > 0)
{
uint32_t water_height = data->tilemap.tiles[tile_idx].water_level * WATER_BBOX_STEP;
Rectangle box = {
.x = (tile_idx % data->tilemap.width) * data->tilemap.tile_size,
.y = (tile_idx / data->tilemap.width + 1) * data->tilemap.tile_size - water_height,
.width = data->tilemap.tile_size,
.height = water_height,
};
if (point_in_AABB(player_center, box))
{
p_ctransform->accel = Vector2Multiply(Vector2Add(p_ctransform->accel, UPTHRUST), p_ctransform->shape_factor);
}
}
}
p_ctransform->accel = Vector2Add(p_ctransform->accel, GRAVITY); p_ctransform->accel = Vector2Add(p_ctransform->accel, GRAVITY);
} }
@ -1395,44 +1407,54 @@ void state_transition_update_system(Scene_t* scene)
p_ctransform->grav_timer = p_ctransform->grav_delay; p_ctransform->grav_timer = p_ctransform->grav_delay;
} }
// Upthrust depends on water overlapping bool in_water = false;
unsigned int tile_x1 = (p_ctransform->position.x) / TILE_SIZE; if (!(p_mstate->water_state & 1))
unsigned int tile_y1 = (p_ctransform->position.y) / TILE_SIZE;
unsigned int tile_x2 = (p_ctransform->position.x + p_bbox->size.x) / TILE_SIZE;
unsigned int tile_y2 = (p_ctransform->position.y + p_bbox->size.y) / TILE_SIZE;
float water_area = 0;
for (unsigned int tile_y = tile_y1; tile_y <= tile_y2; tile_y++)
{ {
for (unsigned int tile_x = tile_x1; tile_x <= tile_x2; tile_x++) Vector2 player_center = (Vector2){
.x = p_ctransform->position.x + p_bbox->half_size.x,
.y = p_ctransform->position.y + p_bbox->half_size.y,
};
unsigned int tile_idx = get_tile_idx(
player_center.x,
player_center.y,
data->tilemap.width
);
if (data->tilemap.tiles[tile_idx].water_level > 0)
{ {
unsigned int tile_idx = tile_y * data->tilemap.width + tile_x; uint32_t water_height = data->tilemap.tiles[tile_idx].water_level * WATER_BBOX_STEP;
if (data->tilemap.tiles[tile_idx].water_level > 0) Rectangle box = {
{ .x = (tile_idx % data->tilemap.width) * data->tilemap.tile_size,
uint32_t water_height = data->tilemap.tiles[tile_idx].water_level * WATER_BBOX_STEP; .y = (tile_idx / data->tilemap.width + 1) * data->tilemap.tile_size - water_height,
Vector2 water_tl = { .width = data->tilemap.tile_size,
.x = (tile_idx % data->tilemap.width) * data->tilemap.tile_size, .height = water_height,
.y = (tile_idx / data->tilemap.width + 1) * data->tilemap.tile_size - water_height}; };
Vector2 water_sz = { in_water = point_in_AABB(player_center, box);
.x = data->tilemap.tile_size, }
.y = water_height, }
}; else
{
Vector2 overlap; unsigned int tile_x1 = (p_ctransform->position.x) / TILE_SIZE;
if (find_AABB_overlap( unsigned int tile_y1 = (p_ctransform->position.y) / TILE_SIZE;
unsigned int tile_x2 = (p_ctransform->position.x + p_bbox->size.x) / TILE_SIZE;
unsigned int tile_y2 = (p_ctransform->position.y + p_bbox->size.y) / TILE_SIZE;
for (unsigned int tile_y = tile_y1; tile_y <= tile_y2; tile_y++)
{
for (unsigned int tile_x = tile_x1; tile_x <= tile_x2; tile_x++)
{
unsigned int tile_idx = tile_y * data->tilemap.width + tile_x;
if (data->tilemap.tiles[tile_idx].water_level == 0) continue;
uint32_t water_height = data->tilemap.tiles[tile_idx].water_level * WATER_BBOX_STEP;
Vector2 tl = {tile_x * data->tilemap.tile_size, (tile_y + 1) * data->tilemap.tile_size - water_height};
in_water |= find_AABB_overlap(
p_ctransform->position, p_bbox->size, p_ctransform->position, p_bbox->size,
water_tl, water_sz, &overlap tl, (Vector2){data->tilemap.tile_size, water_height}
)) , NULL
{ ) > 0;
water_area += fabs(overlap.x * overlap.y);
}
} }
} }
} }
p_mstate->water_overlap = water_area/(p_bbox->size.x * p_bbox->size.y);
bool in_water = p_mstate->water_overlap > 0;
p_mstate->ground_state <<= 1; p_mstate->ground_state <<= 1;
p_mstate->ground_state |= on_ground? 1:0; p_mstate->ground_state |= on_ground? 1:0;
p_mstate->ground_state &= 3; p_mstate->ground_state &= 3;
@ -1844,7 +1866,7 @@ void airtimer_update_system(Scene_t* scene)
Vector2 point_to_check = { Vector2 point_to_check = {
(p_movement->x_dir == 0) ? p_ctransform->position.x : p_ctransform->position.x + p_bbox->size.x, (p_movement->x_dir == 0) ? p_ctransform->position.x : p_ctransform->position.x + p_bbox->size.x,
p_ctransform->position.y + p_bbox->half_size.y / 2, p_ctransform->position.y + p_bbox->half_size.y,
}; };
unsigned int tile_idx = get_tile_idx( unsigned int tile_idx = get_tile_idx(