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

Compare commits

base: sadpmpk:a719c73c5040b4063ab0eb3dddd2204951523487
Branches Tags
sadpmpk:main
sadpmpk:level_select
sadpmpk:scene_man
..
compare: sadpmpk:d455cbc6b977bdf2a3cdf8c62cca6c1f4462b9f9
Branches Tags
sadpmpk:main
sadpmpk:level_select
sadpmpk:scene_man

No commits in common. "a719c73c5040b4063ab0eb3dddd2204951523487" and "d455cbc6b977bdf2a3cdf8c62cca6c1f4462b9f9" have entirely different histories.
a719c73c50 ... d455cbc6b9

6 changed files with 22 additions and 73 deletions
Show Stats Expand all files Collapse all files

3
scenes/editor_scene.c
View File

@ -425,12 +425,11 @@ void init_level_scene(LevelScene_t* scene)
sc_array_add(&scene->scene.systems, &moveable_update_system);
sc_array_add(&scene->scene.systems, &movement_update_system);
sc_array_add(&scene->scene.systems, &boulder_destroy_wooden_tile_system);
sc_array_add(&scene->scene.systems, &update_tilemap_system);
sc_array_add(&scene->scene.systems, &tile_collision_system);
sc_array_add(&scene->scene.systems, &update_tilemap_system);
sc_array_add(&scene->scene.systems, &hitbox_update_system);
sc_array_add(&scene->scene.systems, &player_crushing_system);
//sc_array_add(&scene->scene.systems, &update_tilemap_system);
sc_array_add(&scene->scene.systems, &state_transition_update_system);
sc_array_add(&scene->scene.systems, &player_ground_air_transition_system);
sc_array_add(&scene->scene.systems, &sprite_animation_system);

12
scenes/engine/EC/EC.h
View File

@ -26,11 +26,6 @@ typedef enum ComponentEnum {
CMOVEABLE_T,
} ComponentEnum_t;
typedef enum MovementMode {
REGULAR_MOVEMENT = 0,
KINEMATIC_MOVEMENT,
}MovementMode_t;
typedef struct _CBBox_t {
Vector2 size;
Vector2 offset;
@ -41,14 +36,13 @@ typedef struct _CBBox_t {
typedef struct _CTransform_t {
Vector2 prev_position;
Vector2 prev_velocity;
Vector2 position;
Vector2 velocity;
Vector2 prev_velocity;
Vector2 accel;
Vector2 fric_coeff;
int8_t grav_delay;
int8_t grav_timer;
MovementMode_t movement_mode;
} CTransform_t;
typedef struct _CMovementState_t {
@ -108,13 +102,13 @@ typedef struct _CContainer_t {
typedef struct _CHitBoxes_t {
Rectangle boxes[2];
uint8_t n_boxes;
uint8_t atk;
bool strong;
} CHitBoxes_t;
typedef struct _CHurtbox_t {
Vector2 offset;
Vector2 size;
uint8_t def;
bool fragile;
} CHurtbox_t;
// Credits to bedroomcoders.co.uk for this

74
scenes/game_systems.c
View File

@ -912,6 +912,8 @@ void moveable_update_system(Scene_t* scene)
if (p_moveable->gridmove)
{
memset(&p_ctransform->velocity, 0, sizeof(p_ctransform->velocity));
memset(&p_ctransform->accel, 0, sizeof(p_ctransform->velocity));
float remaining_distance = p_moveable->target_pos.x - p_ctransform->position.x;
if (fabs(remaining_distance) < 0.1)
{
@ -919,7 +921,6 @@ void moveable_update_system(Scene_t* scene)
p_ctransform->position = p_moveable->target_pos;
p_moveable->gridmove = false;
p_bbox->solid = true;
p_ctransform->movement_mode = REGULAR_MOVEMENT;
}
else if (remaining_distance > 0.1)
{
@ -928,7 +929,6 @@ void moveable_update_system(Scene_t* scene)
else
{
p_ctransform->position.x += (remaining_distance < -p_moveable->move_speed) ? -p_moveable->move_speed : remaining_distance;
memset(&p_ctransform->velocity, 0, sizeof(p_ctransform->velocity));
}
}
@ -1035,9 +1035,6 @@ void moveable_update_system(Scene_t* scene)
p_bbox->solid = false;
p_moveable->prev_pos = p_ctransform->position;
p_moveable->target_pos = Vector2Scale((Vector2){tile_x,tile_y2}, TILE_SIZE);
memset(&p_ctransform->velocity, 0, sizeof(p_ctransform->velocity));
memset(&p_ctransform->accel, 0, sizeof(p_ctransform->accel));
p_ctransform->movement_mode = KINEMATIC_MOVEMENT;
}
}
@ -1122,9 +1119,6 @@ void player_pushing_system(Scene_t* scene)
p_other_moveable->gridmove = true;
p_other_moveable->prev_pos = p_other_ct->position;
p_other_moveable->target_pos = target_pos;
memset(&p_ctransform->velocity, 0, sizeof(p_ctransform->velocity));
memset(&p_ctransform->accel, 0, sizeof(p_ctransform->accel));
p_other_ct->movement_mode = KINEMATIC_MOVEMENT;
}
}
}
@ -1143,15 +1137,11 @@ void movement_update_system(Scene_t* scene)
sc_map_foreach(&scene->ent_manager.component_map[CTRANSFORM_COMP_T], ent_idx, p_ctransform)
{
p_ctransform->prev_velocity = p_ctransform->velocity;
if (p_ctransform->movement_mode == REGULAR_MOVEMENT)
{
p_ctransform->velocity =
Vector2Add(
p_ctransform->velocity,
Vector2Scale(p_ctransform->accel, delta_time)
);
}
p_ctransform->velocity =
Vector2Add(
p_ctransform->velocity,
Vector2Scale(p_ctransform->accel, delta_time)
);
float mag = Vector2Length(p_ctransform->velocity);
p_ctransform->velocity = Vector2Scale(
@ -1169,7 +1159,8 @@ void movement_update_system(Scene_t* scene)
p_ctransform->position,
Vector2Scale(p_ctransform->velocity, delta_time)
);
memset(&p_ctransform->accel, 0, sizeof(p_ctransform->accel));
p_ctransform->accel.x = 0;
p_ctransform->accel.y = 0;
// Level boundary collision
Entity_t* p_ent = get_entity(&scene->ent_manager, ent_idx);
@ -1212,8 +1203,8 @@ void player_ground_air_transition_system(Scene_t* scene)
sc_map_foreach_value(&scene->ent_manager.entities_map[PLAYER_ENT_TAG], p_player)
{
CJump_t* p_cjump = get_component(p_player, CJUMP_COMP_T);
const CMovementState_t* p_mstate = get_component(p_player, CMOVEMENTSTATE_T);
const CPlayerState_t* p_pstate = get_component(p_player, CPLAYERSTATE_T);
CMovementState_t* p_mstate = get_component(p_player, CMOVEMENTSTATE_T);
CPlayerState_t* p_pstate = get_component(p_player, CPLAYERSTATE_T);
// Handle Ground<->Air Transition
bool in_water = (p_mstate->water_state & 1);
@ -1240,6 +1231,7 @@ void player_ground_air_transition_system(Scene_t* scene)
void state_transition_update_system(Scene_t* scene)
{
LevelSceneData_t* data = &(CONTAINER_OF(scene, LevelScene_t, scene)->data);
//Entity_t* p_ent;
CMovementState_t* p_mstate;
unsigned long ent_idx;
@ -1385,7 +1377,6 @@ void hitbox_update_system(Scene_t* scene)
if (p_other_hurtbox == NULL) continue;
CTransform_t* p_other_ct = get_component(p_other_ent, CTRANSFORM_COMP_T);
Vector2 hurtbox_pos = Vector2Add(p_other_ct->position, p_other_hurtbox->offset);
if (p_hitbox->atk <= p_other_hurtbox->def) continue;
Vector2 overlap;
if (
@ -1395,12 +1386,14 @@ void hitbox_update_system(Scene_t* scene)
)
)
{
if (!p_other_hurtbox->fragile) continue;
//if (p_other_ent->m_tag == CRATES_ENT_TAG)
{
CBBox_t* p_bbox = get_component(p_ent, CBBOX_COMP_T);
CPlayerState_t* p_pstate = get_component(p_ent, CPLAYERSTATE_T);
if (
// TODO: Check Material of the crates
p_ctransform->position.y + p_bbox->size.y <= p_other_ct->position.y
)
{
@ -1435,43 +1428,6 @@ void hitbox_update_system(Scene_t* scene)
}
}
void boulder_destroy_wooden_tile_system(Scene_t* scene)
{
LevelSceneData_t* data = &(CONTAINER_OF(scene, LevelScene_t, scene)->data);
TileGrid_t tilemap = data->tilemap;
Entity_t* p_boulder;
sc_map_foreach_value(&scene->ent_manager.entities_map[BOULDER_ENT_TAG], p_boulder)
{
const CTransform_t* p_ctransform = get_component(p_boulder, CTRANSFORM_COMP_T);
const CBBox_t* p_bbox = get_component(p_boulder, CBBOX_COMP_T);
if (p_ctransform->velocity.y <= 0) continue;
unsigned int tile_idx = get_tile_idx(
p_ctransform->position.x + p_bbox->half_size.x,
p_ctransform->position.y + p_bbox->size.y,
tilemap.width
);
unsigned int tile_x = (p_ctransform->position.x + p_bbox->half_size.x) / TILE_SIZE;
if (tilemap.tiles[tile_idx].tile_type == ONEWAY_TILE)
{
tilemap.tiles[tile_idx].tile_type = EMPTY_TILE;
tilemap.tiles[tile_idx].solid = NOT_SOLID;
if (tile_x > 0 && tilemap.tiles[tile_idx - 1].tile_type == ONEWAY_TILE)
{
tilemap.tiles[tile_idx - 1].tile_type = EMPTY_TILE;
tilemap.tiles[tile_idx - 1].solid = NOT_SOLID;
}
if (tile_x < tilemap.width && tilemap.tiles[tile_idx + 1].tile_type == ONEWAY_TILE)
{
tilemap.tiles[tile_idx + 1].tile_type = EMPTY_TILE;
tilemap.tiles[tile_idx + 1].solid = NOT_SOLID;
}
}
}
}
void sprite_animation_system(Scene_t* scene)
{
unsigned int ent_idx;
@ -1535,6 +1491,7 @@ void camera_update_system(Scene_t* scene)
void init_level_scene_data(LevelSceneData_t* data)
{
//sc_map_init_32(&data->collision_events, 128, 0);
data->game_viewport = LoadRenderTexture(VIEWABLE_MAP_WIDTH*TILE_SIZE, VIEWABLE_MAP_HEIGHT*TILE_SIZE);
data->game_rec = (Rectangle){25, 25, VIEWABLE_MAP_WIDTH*TILE_SIZE, VIEWABLE_MAP_HEIGHT*TILE_SIZE};
data->cam = (Camera2D){0};
@ -1544,5 +1501,6 @@ void init_level_scene_data(LevelSceneData_t* data)
void term_level_scene_data(LevelSceneData_t* data)
{
//sc_map_term_32(&data->collision_events);
UnloadRenderTexture(data->game_viewport); // Unload render texture
}

1
scenes/game_systems.h
View File

@ -18,7 +18,6 @@ void state_transition_update_system(Scene_t* scene);
void update_tilemap_system(Scene_t* scene);
void hitbox_update_system(Scene_t* scene);
void sprite_animation_system(Scene_t* scene);
void boulder_destroy_wooden_tile_system(Scene_t* scene);
void camera_update_system(Scene_t* scene);
void player_dir_reset_system(Scene_t* scene);
void player_respawn_system(Scene_t* scene);

4
scenes/items_ent.c
View File

@ -16,7 +16,7 @@ Entity_t* create_crate(EntityManager_t* ent_manager, Assets_t* assets, bool meta
add_component(p_crate, CTILECOORD_COMP_T);
CHurtbox_t* p_hurtbox = add_component(p_crate, CHURTBOX_T);
p_hurtbox->size = p_bbox->size;
p_hurtbox->def = metal ? 2 : 1;
p_hurtbox->fragile = !metal;
return p_crate;
}
@ -37,6 +37,6 @@ Entity_t* create_boulder(EntityManager_t* ent_manager, Assets_t* assets)
p_cmove->move_speed = 8;
CHurtbox_t* p_hurtbox = add_component(p_boulder, CHURTBOX_T);
p_hurtbox->size = p_bbox->size;
p_hurtbox->def = 2;
p_hurtbox->fragile = false;
return p_boulder;
}

1
scenes/player_ent.c
View File

@ -83,7 +83,6 @@ Entity_t* create_player(EntityManager_t* ent_manager, Assets_t* assets)
.width = p_bbox->size.x + 2,
.height = p_bbox->size.y - 1,
};
p_hitbox->atk = 2;
CSprite_t* p_cspr = add_component(p_ent, CSPRITE_T);
p_cspr->sprites = player_sprite_map;
p_cspr->transition_func = &player_sprite_transition_func;