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

Add shape factor to control upthrust and friction

scene_man
En Yi 2023-07-25 20:39:42 +08:00
parent f6c5fa10fd
commit f81029b482
5 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scenes/editor_scene.c
View File

@ -562,7 +562,7 @@ static void toggle_block_system(Scene_t* scene)
new_type = tilemap.tiles[tile_idx].tile_type;
if (tilemap.tiles[tile_idx].water_level < MAX_WATER_LEVEL)
{
tilemap.tiles[tile_idx].water_level++;
tilemap.tiles[tile_idx].water_level = MAX_WATER_LEVEL;
}
break;
case TOGGLE_AIR_POCKET:

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

@ -48,6 +48,7 @@ typedef struct _CTransform_t {
Vector2 velocity;
Vector2 accel;
Vector2 fric_coeff;
Vector2 shape_factor;
int8_t grav_delay;
int8_t grav_timer;
MovementMode_t movement_mode;

7
scenes/game_systems.c
View File

@ -896,7 +896,7 @@ void global_external_forces_system(Scene_t* scene)
if (point_in_AABB(player_center, box))
{
p_ctransform->accel = Vector2Add(p_ctransform->accel, UPTHRUST);
p_ctransform->accel = Vector2Multiply(Vector2Add(p_ctransform->accel, UPTHRUST), p_ctransform->shape_factor);
}
}
}
@ -906,7 +906,10 @@ void global_external_forces_system(Scene_t* scene)
// Friction
p_ctransform->accel = Vector2Add(
p_ctransform->accel,
Vector2Multiply(p_ctransform->fric_coeff, p_ctransform->velocity)
Vector2Multiply(
Vector2Multiply(p_ctransform->fric_coeff, p_ctransform->velocity),
p_ctransform->shape_factor
)
);
if (p_bbox == NULL) continue; //Do not proceed if no bbox

3
scenes/items_ent.c
View File

@ -13,6 +13,7 @@ Entity_t* create_crate(EntityManager_t* ent_manager, Assets_t* assets, bool meta
CTransform_t* p_ctransform = add_component(p_crate, CTRANSFORM_COMP_T);
p_ctransform->grav_delay = 5;
p_ctransform->shape_factor = metal ? (Vector2){0.7,0.7} : (Vector2){0.8,0.8} ;
add_component(p_crate, CMOVEMENTSTATE_T);
add_component(p_crate, CTILECOORD_COMP_T);
CHurtbox_t* p_hurtbox = add_component(p_crate, CHURTBOX_T);
@ -41,6 +42,7 @@ Entity_t* create_boulder(EntityManager_t* ent_manager, Assets_t* assets)
CTransform_t* p_ctransform = add_component(p_boulder, CTRANSFORM_COMP_T);
p_ctransform->grav_delay = 5;
p_ctransform->active = true;
p_ctransform->shape_factor = (Vector2){0.6, 0.6};
add_component(p_boulder, CMOVEMENTSTATE_T);
add_component(p_boulder, CTILECOORD_COMP_T);
CMoveable_t* p_cmove = add_component(p_boulder, CMOVEABLE_T);
@ -107,6 +109,7 @@ Entity_t* create_bomb(EntityManager_t* ent_manager, Assets_t* assets, Vector2 la
CTransform_t* p_ctransform = add_component(p_bomb, CTRANSFORM_COMP_T);
p_ctransform->active = true;
p_ctransform->shape_factor = (Vector2){0.1, 0.1};
p_ctransform->movement_mode = REGULAR_MOVEMENT;
p_ctransform->position.x += (TILE_SIZE - 25) / 2;
p_ctransform->position.y += (TILE_SIZE - 25) / 2;

1
scenes/player_ent.c
View File

@ -61,6 +61,7 @@ Entity_t* create_player(EntityManager_t* ent_manager, Assets_t* assets)
set_bbox(p_bbox, PLAYER_WIDTH, PLAYER_HEIGHT);
CTransform_t* p_ct = add_component(p_ent, CTRANSFORM_COMP_T);
p_ct->active = true;
p_ct->shape_factor = (Vector2){1, 1};
CJump_t* p_cjump = add_component(p_ent, CJUMP_COMP_T);
p_cjump->jump_speed = 680;