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

Compare commits

base: sadpmpk:ce0ca96c6793cc73f8e2588380c4726ca5550661
Branches Tags
sadpmpk:main
sadpmpk:level_select
sadpmpk:scene_man
...
compare: sadpmpk:8bf1957e1e5f2c74e77e8e2d92b1f3c377b31d40
Branches Tags
sadpmpk:main
sadpmpk:level_select
sadpmpk:scene_man

2 Commits
ce0ca96c67 ... 8bf1957e1e

Author SHA1 Message Date
En Yi 8bf1957e1e Fix incorrect velocity reflection on collision 2024-09-26 21:31:24 +08:00
En Yi 9854654d61 Slightly resize UI for spawning urchin 2024-09-26 20:46:58 +08:00
2 changed files with 23 additions and 18 deletions
Show Stats Expand all files Collapse all files

12
scenes/editor_scene.c
View File

@ -38,12 +38,12 @@ static bool metal_toggle = false;
static bool crate_activation = false; static bool crate_activation = false;
#define MAX_URCHIN_SPAWN_SPD 20 #define MAX_URCHIN_SPAWN_SPD 20
#define URCHIN_SPAWN_UI_RADIUS 40 #define URCHIN_SPAWN_UI_RADIUS 52
#define URCHIN_SPAWN_UI_DIVISION 10 #define URCHIN_SPAWN_UI_DIVISION 13
#define URCHIN_SPAWN_UI_N (URCHIN_SPAWN_UI_RADIUS / URCHIN_SPAWN_UI_DIVISION) #define URCHIN_SPAWN_UI_N (URCHIN_SPAWN_UI_RADIUS / URCHIN_SPAWN_UI_DIVISION)
#define URCHIN_SPAWN_ANGLE_DIVISION 45 #define URCHIN_SPAWN_ANGLE_DIVISION 45
#define URCHIN_SPAWN_UI_ANGLE_N (360 / URCHIN_SPAWN_ANGLE_DIVISION) #define URCHIN_SPAWN_UI_ANGLE_N (360 / URCHIN_SPAWN_ANGLE_DIVISION)
#define URCHIN_VELOCITY_SCALE 10 #define URCHIN_VELOCITY_SCALE 8
static Vector2 urchin_spawn_vec = {0,0}; static Vector2 urchin_spawn_vec = {0,0};
static Vector2 urchin_click_pos = {0,0}; static Vector2 urchin_click_pos = {0,0};
@ -850,8 +850,8 @@ static void toggle_block_system(Scene_t* scene, ActionType_t action, bool presse
Entity_t* p_ent = create_urchin(&scene->ent_manager); Entity_t* p_ent = create_urchin(&scene->ent_manager);
if (p_ent != NULL) if (p_ent != NULL)
{ {
p_ent->position.x = (tile_idx % tilemap.width) * tilemap.tile_size + (tilemap.tile_size >> 1); p_ent->position.x = (tile_idx % tilemap.width) * tilemap.tile_size;
p_ent->position.y = (tile_idx / tilemap.width) * tilemap.tile_size + (tilemap.tile_size >> 1); p_ent->position.y = (tile_idx / tilemap.width) * tilemap.tile_size;
CTransform_t* p_ct = get_component(p_ent, CTRANSFORM_COMP_T); CTransform_t* p_ct = get_component(p_ent, CTRANSFORM_COMP_T);
p_ct->velocity = Vector2Scale(urchin_spawn_vec, URCHIN_VELOCITY_SCALE); p_ct->velocity = Vector2Scale(urchin_spawn_vec, URCHIN_VELOCITY_SCALE);
} }
@ -1268,7 +1268,7 @@ void init_sandbox_scene(LevelScene_t* scene)
scene->data.tilemap.tiles = all_tiles; scene->data.tilemap.tiles = all_tiles;
init_level_scene_data( init_level_scene_data(
&scene->data, MAX_N_TILES, all_tiles, &scene->data, MAX_N_TILES, all_tiles,
(Rectangle){25, 25, VIEWABLE_EDITOR_MAP_WIDTH*TILE_SIZE, VIEWABLE_EDITOR_MAP_HEIGHT*TILE_SIZE} (Rectangle){10, 10, VIEWABLE_EDITOR_MAP_WIDTH*TILE_SIZE, VIEWABLE_EDITOR_MAP_HEIGHT*TILE_SIZE}
); );
scene->data.sm.state_functions[LEVEL_STATE_STARTING] = at_level_start; scene->data.sm.state_functions[LEVEL_STATE_STARTING] = at_level_start;
scene->data.sm.state_functions[LEVEL_STATE_RUNNING] = NULL; scene->data.sm.state_functions[LEVEL_STATE_RUNNING] = NULL;

25
scenes/game_systems.c
View File

@ -822,26 +822,31 @@ void tile_collision_system(Scene_t* scene)
); );
} }
} }
} }
} }
if (
((collide_side & (1<<3)) && (p_ctransform->velocity.x < 0)) // Check X first
|| ((collide_side & (1<<2)) && (p_ctransform->velocity.x > 0)) if ((collide_side & (1<<2)) || (collide_side & (1<<3)))
) {
Vector2 check_pos = p_ent->position;
check_pos.x += p_ctransform->velocity.x * scene->delta_time;
if (check_collision_at(p_ent, check_pos, p_bbox->size, &tilemap))
{ {
p_ctransform->velocity.x *= -p_ctransform->bounce_coeff; p_ctransform->velocity.x *= -p_ctransform->bounce_coeff;
} }
}
if ( // Check Y next
((collide_side & (1<<1)) && (p_ctransform->velocity.y < 0)) if ((collide_side & (1<<1)) || (collide_side & (1)))
|| ((collide_side & (1)) && (p_ctransform->velocity.y > 0)) {
) Vector2 check_pos = p_ent->position;
check_pos.y += p_ctransform->velocity.y * scene->delta_time;
if (check_collision_at(p_ent, check_pos, p_bbox->size, &tilemap))
{ {
p_ctransform->velocity.y *= -p_ctransform->bounce_coeff; p_ctransform->velocity.y *= -p_ctransform->bounce_coeff;
} }
}
float decimal; float decimal;
float fractional = modff(p_ent->position.x, &decimal); float fractional = modff(p_ent->position.x, &decimal);