Skip to content

Commit

Permalink
remove all defunct prefab code
Browse files Browse the repository at this point in the history
  • Loading branch information
ezpuzz committed Jan 4, 2021
1 parent b3be81b commit e487917
Show file tree
Hide file tree
Showing 38 changed files with 11 additions and 3,776 deletions.
4 changes: 1 addition & 3 deletions amethyst_animation/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,12 @@ pub use minterpolate::{InterpolationFunction, InterpolationPrimitive};
pub use self::{
bundle::{AnimationBundle, SamplingBundle, VertexSkinningBundle},
material::{MaterialChannel, MaterialPrimitive},
prefab::{AnimatablePrefab, AnimationHierarchyPrefab, AnimationPrefab, AnimationSetPrefab},
resources::{
Animation, AnimationCommand, AnimationControl, AnimationControlSet, AnimationHierarchy,
AnimationSampling, AnimationSet, ApplyData, BlendMethod, ControlState, DeferStartRelation,
EndControl, RestState, Sampler, SamplerControl, SamplerControlSet, StepDirection,
},
skinning::{Joint, JointPrefab, Skin, SkinPrefab, SkinnablePrefab, VertexSkinningSystem},
skinning::{Joint, Skin, VertexSkinningSystem},
sprite::{SpriteRenderChannel, SpriteRenderPrimitive},
systems::{
AnimationControlSystem, AnimationProcessor, SamplerInterpolationSystem, SamplerProcessor,
Expand All @@ -81,7 +80,6 @@ pub use self::{

mod bundle;
mod material;
mod prefab;
mod resources;
mod skinning;
mod sprite;
Expand Down
258 changes: 0 additions & 258 deletions amethyst_animation/src/prefab.rs

This file was deleted.

6 changes: 2 additions & 4 deletions amethyst_animation/src/resources.rs
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
use std::{cmp::Ordering, fmt::Debug, hash::Hash, marker, time::Duration};

use amethyst_assets::{Asset, AssetStorage, Handle, PrefabData};
use amethyst_assets::{Asset, AssetStorage, Handle};
use amethyst_core::{
ecs::prelude::{Component, DenseVecStorage, Entity, VecStorage, WriteStorage},
shred::SystemData,
timing::{duration_to_secs, secs_to_duration},
};
use amethyst_derive::PrefabData;
use amethyst_error::Error;
use derivative::Derivative;
use fnv::FnvHashMap;
Expand Down Expand Up @@ -104,8 +103,7 @@ where
}

/// Define the rest state for a component on an entity
#[derive(Debug, Clone, Deserialize, Serialize, PrefabData)]
#[prefab(Component)]
#[derive(Debug, Clone, Deserialize, Serialize)]
pub struct RestState<T>
where
T: AnimationSampling + Clone,
Expand Down
Loading

0 comments on commit e487917

Please sign in to comment.