Skip to content

Commit

Permalink
Cargo fmt, cleaned up repo
Browse files Browse the repository at this point in the history
  • Loading branch information
villuna committed Jul 25, 2024
1 parent 679b82c commit 064b557
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 11 deletions.
3 changes: 0 additions & 3 deletions scratch.md

This file was deleted.

3 changes: 2 additions & 1 deletion src/game/taiko_mode/scene.rs
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,8 @@ impl GameState for TaikoMode {
hit_target,
} => {
self.results.drumrolls += 1;
self.balloon_display.hit(hits_left, hit_target, &mut ctx.renderer);
self.balloon_display
.hit(hits_left, hit_target, &mut ctx.renderer);

if hits_left == 0 {
self.next_note_index = note_index + 1;
Expand Down
3 changes: 1 addition & 2 deletions src/game/taiko_mode/ui.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,14 @@ use crate::game::{RenderContext, TextureCache};
use crate::render::shapes::{LinearGradient, Shape, ShapeBuilder, SolidColour};
use crate::render::text::BuildTextWithRenderer;
use crate::render::texture::{AnimatedSprite, AnimatedSpriteBuilder, Frame, Sprite, SpriteBuilder};
use crate::render::{Renderable, Renderer, rgb};
use crate::render::{rgb, Renderable, Renderer};
use kaku::{FontSize, HorizontalAlignment, Text, TextBuilder, VerticalAlignment};
use lyon::geom::point;
use lyon::lyon_tessellation::{BuffersBuilder, StrokeOptions};
use lyon::path::Path;
use std::time::Instant;
use wgpu::RenderPass;


use super::note::{TaikoModeBarline, TaikoModeNote};

// Colours
Expand Down
15 changes: 10 additions & 5 deletions src/render/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,22 @@ use self::texture::SpriteInstance;
macro_rules! rgba {
($r:expr, $g:expr, $b:expr, $a:expr) => {
[
{$r} as f32 / 255.,
{$g} as f32 / 255.,
{$b} as f32 / 255.,
{$a} as f32 / 255.,
{ $r } as f32 / 255.,
{ $g } as f32 / 255.,
{ $b } as f32 / 255.,
{ $a } as f32 / 255.,
]
};
}

macro_rules! rgb {
($r:expr, $g:expr, $b:expr) => {
[{$r} as f32 / 255., {$g} as f32 / 255., {$b} as f32 / 255., 1.]
[
{ $r } as f32 / 255.,
{ $g } as f32 / 255.,
{ $b } as f32 / 255.,
1.,
]
};
}

Expand Down

0 comments on commit 064b557

Please sign in to comment.