liz/flipperzero-firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[FL-1427] Dolphin: new assets and engine rework (#546)

Browse Source
This commit is contained in:
its your bedtime
2021-08-05 23:49:04 +03:00
committed by GitHub
parent 5741ed2bd5
commit 9c38efd4ef
118 changed files with 1055 additions and 419 deletions
Download Patch File Download Diff File Expand all files Collapse all files
applications/dolphin/scenes/scene_controls.c
+24 -35
View File
@@ -6,43 +6,31 @@ void dolphin_scene_handle_user_input(SceneState* state, InputEvent* input) {
furi_assert(state);
furi_assert(input);
// dolphin_scene_debug
if(input->type == InputTypeShort) {
if(input->key == InputKeyUp) {
state->debug = !state->debug;
}
}
// toggle mind control on any user interaction
state->last_group = state->frame_group;
if(input->type == InputTypePress) {
if(input->key == InputKeyLeft || input->key == InputKeyRight || input->key == InputKeyOk) {
state->action = MINDCONTROL;
}
state->action = MINDCONTROL;
}
// zoom poc for tests
if(input->type == InputTypePress) {
if(input->key == InputKeyDown) {
state->zoom_v = SPEED_X;
}
} else if(input->type == InputTypeRelease) {
if(input->key == InputKeyDown) {
state->zoom_v = -SPEED_X * 2;
state->dialog_progress = 0;
}
}
// mind control
if(state->action == MINDCONTROL) {
if(input->type == InputTypePress) {
if(input->key == InputKeyRight) {
state->player_flipped = false;
state->player_v.y = 0;
state->player_v.x = SPEED_X;
} else if(input->key == InputKeyLeft) {
state->player_flipped = true;
state->player_v.y = 0;
state->player_v.x = -SPEED_X;
}
} else if(input->type == InputTypeRelease) {
if(input->key == InputKeyRight || input->key == InputKeyLeft) {
} else if(input->key == InputKeyUp) {
state->player_v.x = 0;
state->player_v.y = -SPEED_Y;
} else if(input->key == InputKeyDown) {
state->player_v.x = 0;
state->player_v.y = SPEED_Y;
}
}
if(input->type == InputTypeRelease) {
state->player_v.x = 0;
state->player_v.y = 0;
} else if(input->type == InputTypeShort) {
if(input->key == InputKeyOk) {
state->prev_action = MINDCONTROL;
@@ -59,13 +47,14 @@ void dolphin_scene_coordinates(SceneState* state, uint32_t dt) {
// global pos
state->player_global.x = CLAMP(state->player_global.x + state->player_v.x, WORLD_WIDTH, 0);
state->player_global.y = CLAMP(state->player_global.y + state->player_v.y, WORLD_HEIGHT, 0);
// zoom handlers
state->scene_zoom = CLAMP(state->scene_zoom + state->zoom_v, SCENE_ZOOM, 0);
state->player.x = CLAMP(state->player.x - (state->zoom_v * (SPEED_X * 2)), DOLPHIN_CENTER, 0);
state->player.y = CLAMP(state->player.y - (state->zoom_v * SPEED_X / 2), DOLPHIN_DEFAULT_Y, 3);
//center screen
state->screen.x = state->player_global.x - state->player.x;
state->player_anim = (state->player_global.x / 10) % 2;
// nudge camera postition
if(state->player_global.x > 170) {
state->player.x =
CLAMP(state->player.x - state->player_v.x / 2, DOLPHIN_CENTER, -DOLPHIN_WIDTH / 2);
} else if(state->player_global.x < 70) {
state->player.x =
CLAMP(state->player.x - state->player_v.x / 2, DOLPHIN_WIDTH * 2, DOLPHIN_CENTER);
}
}