Fixed types consts and camera tracking offset
This commit is contained in:
parent
0eddd47532
commit
4aefbc031e
|
|
@ -1 +1 @@
|
||||||
Subproject commit 6ce19277e54e0c56be105d8edac118aa3f41ba67
|
Subproject commit 60b58036a98698ddf63bb2b2baa384d780c1b3d3
|
||||||
|
|
@ -50,7 +50,7 @@ int physics_system_update(component_t *component)
|
||||||
{
|
{
|
||||||
physics_system_data_t *system_data = component->data;
|
physics_system_data_t *system_data = component->data;
|
||||||
transform_component_data_t *transform_component_data = system_data->transform_component->data;
|
transform_component_data_t *transform_component_data = system_data->transform_component->data;
|
||||||
hitbox_component_data_t *hitbox_component_data = system_data->hitbox_component->data;
|
const hitbox_component_data_t *hitbox_component_data = system_data->hitbox_component->data;
|
||||||
|
|
||||||
system_data->velocity.x = lerp_time(system_data->velocity.x, system_data->target_velocity.x * system_data->speed, system_data->smoothing_factor, game.delta_time_ms);
|
system_data->velocity.x = lerp_time(system_data->velocity.x, system_data->target_velocity.x * system_data->speed, system_data->smoothing_factor, game.delta_time_ms);
|
||||||
system_data->velocity.y = lerp_time(system_data->velocity.y, system_data->target_velocity.y * system_data->speed, system_data->smoothing_factor, game.delta_time_ms);
|
system_data->velocity.y = lerp_time(system_data->velocity.y, system_data->target_velocity.y * system_data->speed, system_data->smoothing_factor, game.delta_time_ms);
|
||||||
|
|
@ -78,7 +78,7 @@ static inline int action_detect_solve_entities_collision(elem_t *elem, void *arg
|
||||||
|
|
||||||
physics_system_data_t *system_data = physics_system->data;
|
physics_system_data_t *system_data = physics_system->data;
|
||||||
transform_component_data_t * transform_component_data = system_data->transform_component->data;
|
transform_component_data_t * transform_component_data = system_data->transform_component->data;
|
||||||
hitbox_component_data_t *hitbox_component_data = system_data->hitbox_component->data;
|
const hitbox_component_data_t *hitbox_component_data = system_data->hitbox_component->data;
|
||||||
|
|
||||||
const entity_t *target_entity = elem->data;
|
const entity_t *target_entity = elem->data;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -177,7 +177,7 @@ static inline int action_detect_activate_interact(elem_t *elem, void *arg)
|
||||||
{
|
{
|
||||||
entity_t *target_entity = elem->data;
|
entity_t *target_entity = elem->data;
|
||||||
|
|
||||||
const player_system_data_t *system_data = arg;
|
player_system_data_t *system_data = arg;
|
||||||
physics_system_data_t *physics_system_data = system_data->physics_system->data;
|
physics_system_data_t *physics_system_data = system_data->physics_system->data;
|
||||||
|
|
||||||
component_t *target_interact_component = entity_get_component(target_entity, INTERACT_COMPONENT);
|
component_t *target_interact_component = entity_get_component(target_entity, INTERACT_COMPONENT);
|
||||||
|
|
|
||||||
|
|
@ -51,8 +51,8 @@ int game_init(void)
|
||||||
.h = 32.0f
|
.h = 32.0f
|
||||||
};
|
};
|
||||||
|
|
||||||
game.camera.tracking_pos = (fvector2d_t *)&transform_component_data->bounds;
|
game.camera.tracking_pos = (fvector2d_t *)&transform_component_data->bounds; // dangerous if fvector2d_t or frect_t change definition
|
||||||
game.camera.tracking_center_offset = (fvector2d_t) {
|
game.camera.tracking_center_offset = (vector2d_t) {
|
||||||
.x = transform_component_data->bounds.w / 2,
|
.x = transform_component_data->bounds.w / 2,
|
||||||
.y = transform_component_data->bounds.h / 2
|
.y = transform_component_data->bounds.h / 2
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue