Skip to content

Commit

Permalink
Remove unecessary uuid
Browse files Browse the repository at this point in the history
  • Loading branch information
Indy2222 committed Feb 21, 2024
1 parent d8b806c commit 9ddc79d
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 15 deletions.
5 changes: 2 additions & 3 deletions crates/combat/src/trail.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::time::Duration;
use bevy::{
pbr::{MaterialPipeline, MaterialPipelineKey, NotShadowCaster, NotShadowReceiver},
prelude::*,
reflect::{TypePath, TypeUuid},
reflect::TypePath,
render::{
mesh::{Indices, MeshVertexBufferLayout, PrimitiveTopology},
render_resource::{
Expand Down Expand Up @@ -87,8 +87,7 @@ impl Trail {
}
}

#[derive(Asset, AsBindGroup, TypeUuid, TypePath, Debug, Clone)]
#[uuid = "560ab431-1a54-48b3-87ea-8de8d94ceafb"]
#[derive(Asset, AsBindGroup, TypePath, Debug, Clone)]
struct TrailMaterial {
#[uniform(0)]
start_time: f32,
Expand Down
5 changes: 2 additions & 3 deletions crates/map/src/size.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use bevy::{prelude::Resource, reflect::TypeUuid};
use bevy::prelude::Resource;
use glam::Vec2;
use parry2d::bounding_volume::Aabb;
use serde::{Deserialize, Serialize};
Expand All @@ -7,8 +7,7 @@ use thiserror::Error;
/// Maximum size of a side of the map in meters.
pub const MAX_MAP_SIZE: f32 = 8000.;

#[derive(Clone, Copy, Debug, TypeUuid, Serialize, Deserialize, PartialEq, Resource)]
#[uuid = "bbf80d94-c4de-4c7c-9bdc-552ef25aff4e"]
#[derive(Clone, Copy, Debug, Serialize, Deserialize, PartialEq, Resource)]
pub struct MapBounds(Vec2);

impl MapBounds {
Expand Down
5 changes: 2 additions & 3 deletions crates/signs/src/bars.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::time::Duration;
use bevy::{
pbr::{MaterialPipeline, MaterialPipelineKey, NotShadowCaster, NotShadowReceiver},
prelude::*,
reflect::{TypePath, TypeUuid},
reflect::TypePath,
render::{
mesh::{Indices, MeshVertexAttribute, MeshVertexBufferLayout},
render_resource::{
Expand Down Expand Up @@ -135,8 +135,7 @@ impl BarMesh {
}
}

#[derive(Asset, AsBindGroup, TypeUuid, TypePath, Debug, Clone)]
#[uuid = "66547498-fb0d-4fb6-a8e6-c792367e53d6"]
#[derive(Asset, AsBindGroup, TypePath, Debug, Clone)]
struct BarMaterial {
#[uniform(0)]
value: f32,
Expand Down
5 changes: 2 additions & 3 deletions crates/signs/src/line.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use ahash::AHashMap;
use bevy::prelude::*;
use bevy::reflect::{TypePath, TypeUuid};
use bevy::reflect::TypePath;
use bevy::render::render_resource::{AsBindGroup, ShaderRef};
use de_core::cleanup::DespawnOnGameExit;
use de_core::objects::Active;
Expand Down Expand Up @@ -53,8 +53,7 @@ enum LinesSet {
}

// Passed to the `rally_point.wgsl` shader
#[derive(Asset, AsBindGroup, TypeUuid, TypePath, Debug, Clone)]
#[uuid = "d0fae52d-f398-4416-9b72-9039093a6c34"]
#[derive(Asset, AsBindGroup, TypePath, Debug, Clone)]
pub struct LineMaterial {}

impl Material for LineMaterial {
Expand Down
5 changes: 2 additions & 3 deletions crates/terrain/src/shader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::{cmp::Ordering, ops::Range};
use bevy::{
asset::Asset,
pbr::MaterialExtension,
reflect::{TypePath, TypeUuid},
reflect::TypePath,
render::render_resource::{AsBindGroup, ShaderRef, ShaderType},
};
use glam::{Mat3, Vec2};
Expand All @@ -16,8 +16,7 @@ pub(crate) const CIRCLE_CAPACITY: usize = 127;
// * Keep this smaller or equal to de_types::objects::PLAYER_MAX_BUILDINGS.
pub(crate) const RECTANGLE_CAPACITY: usize = 31;

#[derive(Asset, AsBindGroup, TypeUuid, TypePath, Debug, Clone)]
#[uuid = "9e124e04-fdf1-4836-b82d-fa2f01fddb62"]
#[derive(Asset, AsBindGroup, TypePath, Debug, Clone)]
pub struct TerrainMaterial {
#[uniform(100)]
uv_scale: f32,
Expand Down

0 comments on commit 9ddc79d

Please sign in to comment.