osu/editor
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

wipe backup

Browse source
This commit is contained in:
Michael Zhang 2022-05-09 11:50:52 -05:00
parent dfd921875c
commit ac9760cacd
Signed by: michael
GPG key ID: BDA47A31A3C8EE6B
3 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/game/events.rs
View file

@ -94,6 +94,8 @@ impl EventHandler for Game {
if px == x && py == y { if px == x && py == y {
self.handle_click(MouseButton::Left, x, y).unwrap(); self.handle_click(MouseButton::Left, x, y).unwrap();
} }
} else {
self.handle_click(MouseButton::Left, x, y).unwrap();
} }
self.left_drag_start = None; self.left_drag_start = None;
} }
@ -102,6 +104,8 @@ impl EventHandler for Game {
if px == x && py == y { if px == x && py == y {
self.handle_click(MouseButton::Right, x, y).unwrap(); self.handle_click(MouseButton::Right, x, y).unwrap();
} }
} else {
self.handle_click(MouseButton::Left, x, y).unwrap();
} }
self.right_drag_start = None; self.right_drag_start = None;
} }

9
src/game/hitobjects.rs
View file

@ -81,7 +81,9 @@ impl Game {
}; };
let circle_is_hit = current_time > ho_time; let circle_is_hit = current_time > ho_time;
if ho_time - preempt <= current_time && current_time <= end_time + fade_out_offset { if ho_time - preempt <= current_time
&& current_time <= end_time + fade_out_offset + fade_out_time
{
playfield_hitobjects.push(DrawInfo { playfield_hitobjects.push(DrawInfo {
hit_object: ho, hit_object: ho,
fade_opacity, fade_opacity,
@ -162,7 +164,7 @@ impl Game {
let spline = self.slider_cache.get(&control_points).unwrap(); let spline = self.slider_cache.get(&control_points).unwrap();
Game::render_slider_wireframe(ctx, &control_points, PLAYFIELD_BOUNDS, faded_color)?; Game::render_slider_wireframe(ctx, &control_points, PLAYFIELD_BOUNDS, faded_color)?;
if current_time > ho_time && current_time < draw_info.end_time { if current_time >= ho_time && current_time <= draw_info.end_time {
let elapsed_time = current_time - ho_time; let elapsed_time = current_time - ho_time;
let total_duration = draw_info.end_time - ho_time; let total_duration = draw_info.end_time - ho_time;
let single_duration = total_duration / info.num_repeats as f64; let single_duration = total_duration / info.num_repeats as f64;
@ -175,11 +177,14 @@ impl Game {
travel_percent = 1.0 - travel_percent; travel_percent = 1.0 - travel_percent;
} }
let travel_length = travel_percent * info.pixel_length; let travel_length = travel_percent * info.pixel_length;
let pos = spline.point_at_length(travel_length); let pos = spline.point_at_length(travel_length);
let ball_pos = [ let ball_pos = [
PLAYFIELD_BOUNDS.x + osupx_scale_x * pos.x as f32, PLAYFIELD_BOUNDS.x + osupx_scale_x * pos.x as f32,
PLAYFIELD_BOUNDS.y + osupx_scale_y * pos.y as f32, PLAYFIELD_BOUNDS.y + osupx_scale_y * pos.y as f32,
]; ];
// draw slider ball
self.skin.sliderb.draw_frame( self.skin.sliderb.draw_frame(
ctx, ctx,
(cs_real * 1.8, cs_real * 1.8), (cs_real * 1.8, cs_real * 1.8),

1
src/utils.rs
View file

@ -3,6 +3,7 @@ use std::path::{Path, PathBuf};
use anyhow::Result; use anyhow::Result;
use ggez::graphics::Rect; use ggez::graphics::Rect;
/// Case-insensitive file searching.
pub fn fuck_you_windows( pub fn fuck_you_windows(
parent: impl AsRef<Path>, parent: impl AsRef<Path>,
name: impl AsRef<str>, name: impl AsRef<str>,