Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity
834749353a
veloren/common/src/comp/body/fish_small.rs

82 lines
2.2 KiB
Rust
Raw Normal View History

Further generalize the typed module. This enables us to automatically create configuration formats from enums or structs. For enums, we create a structure with a field for each case, representing a pattern match; the configuration format can then enter a different expression for each case. For structs, we create an enum with a variant for each field, representing projecting by that field; the configuration format selects the field to project from, and then can write a further expression on that field (for instance, it can perform another pattern match). So far we don't actually have anything that *uses* this functionality; I decided to finish it for the purpose of specifying a default lantern offset, only to discover that we already return a lantern offset from the animation crate. So I fixed it there instead.
2020-08-31 01:01:20 +00:00
use crate::{make_case_elim, make_proj_elim};
body tweak
2019-10-24 23:42:33 +00:00
use rand::{seq::SliceRandom, thread_rng};
updated dependencies and fixed stuff - replace serde_derive by feature of serde incl. source code modifications to compile - reduce futures-timer to "2.0" to be same as async_std - update notify - removed mio, bincode and lz4 compress in common as networking is now in own crate btw there is a better lz4 compress crate, which is newer than 2017 - update prometheus to 0.9 - can't update uvth yet due to usues - hashbrown to 7.2 to only need a single version - libsqlite3 update - image didn't change as there is a problem with `image 0.23` - switch old directories with newer directories-next - no num upgrade as we still depend on num 0.2 anyways - rodio and cpal upgrade - const-tewaker update - dispatch (untested) update - git2 update - iterations update
2020-07-06 14:23:08 +00:00
use serde::{Deserialize, Serialize};
body tweak
2019-10-24 23:42:33 +00:00
Further generalize the typed module. This enables us to automatically create configuration formats from enums or structs. For enums, we create a structure with a field for each case, representing a pattern match; the configuration format can then enter a different expression for each case. For structs, we create an enum with a variant for each field, representing projecting by that field; the configuration format selects the field to project from, and then can write a further expression on that field (for instance, it can perform another pattern match). So far we don't actually have anything that *uses* this functionality; I decided to finish it for the purpose of specifying a default lantern offset, only to discover that we already return a lantern offset from the animation crate. So I fixed it there instead.
2020-08-31 01:01:20 +00:00
make_proj_elim!(
body,
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
pub struct Body {
Initial fish work
2020-11-26 21:57:38 +00:00
pub species: Species,
pub body_type: BodyType,
Further generalize the typed module. This enables us to automatically create configuration formats from enums or structs. For enums, we create a structure with a field for each case, representing a pattern match; the configuration format can then enter a different expression for each case. For structs, we create an enum with a variant for each field, representing projecting by that field; the configuration format selects the field to project from, and then can write a further expression on that field (for instance, it can perform another pattern match). So far we don't actually have anything that *uses* this functionality; I decided to finish it for the purpose of specifying a default lantern offset, only to discover that we already return a lantern offset from the animation crate. So I fixed it there instead.
2020-08-31 01:01:20 +00:00
}
);
body tweak
2019-10-24 23:42:33 +00:00
impl Body {
pub fn random() -> Self {
let mut rng = thread_rng();
Initial fish work
2020-11-26 21:57:38 +00:00
let species = *(&ALL_SPECIES).choose(&mut rng).unwrap();
Self::random_with(&mut rng, &species)
}
#[inline]
pub fn random_with(rng: &mut impl rand::Rng, &species: &Species) -> Self {
let body_type = *(&ALL_BODY_TYPES).choose(rng).unwrap();
Self { species, body_type }
body tweak
2019-10-24 23:42:33 +00:00
}
}
Initial fish work
2020-11-26 21:57:38 +00:00
impl From<Body> for super::Body {
fn from(body: Body) -> Self { super::Body::FishSmall(body) }
}
Further generalize the typed module. This enables us to automatically create configuration formats from enums or structs. For enums, we create a structure with a field for each case, representing a pattern match; the configuration format can then enter a different expression for each case. For structs, we create an enum with a variant for each field, representing projecting by that field; the configuration format selects the field to project from, and then can write a further expression on that field (for instance, it can perform another pattern match). So far we don't actually have anything that *uses* this functionality; I decided to finish it for the purpose of specifying a default lantern offset, only to discover that we already return a lantern offset from the animation crate. So I fixed it there instead.
2020-08-31 01:01:20 +00:00
make_case_elim!(
Initial fish work
2020-11-26 21:57:38 +00:00
species,
Further generalize the typed module. This enables us to automatically create configuration formats from enums or structs. For enums, we create a structure with a field for each case, representing a pattern match; the configuration format can then enter a different expression for each case. For structs, we create an enum with a variant for each field, representing projecting by that field; the configuration format selects the field to project from, and then can write a further expression on that field (for instance, it can perform another pattern match). So far we don't actually have anything that *uses* this functionality; I decided to finish it for the purpose of specifying a default lantern offset, only to discover that we already return a lantern offset from the animation crate. So I fixed it there instead.
2020-08-31 01:01:20 +00:00
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
#[repr(u32)]
Initial fish work
2020-11-26 21:57:38 +00:00
pub enum Species {
Improves fish_small, new npc
2020-11-29 16:22:13 +00:00
Clownfish = 0,
Adds 3 new npcs, tusk ram new design
2021-02-18 00:41:34 +00:00
Piranha = 1,
Further generalize the typed module. This enables us to automatically create configuration formats from enums or structs. For enums, we create a structure with a field for each case, representing a pattern match; the configuration format can then enter a different expression for each case. For structs, we create an enum with a variant for each field, representing projecting by that field; the configuration format selects the field to project from, and then can write a further expression on that field (for instance, it can perform another pattern match). So far we don't actually have anything that *uses* this functionality; I decided to finish it for the purpose of specifying a default lantern offset, only to discover that we already return a lantern offset from the animation crate. So I fixed it there instead.
2020-08-31 01:01:20 +00:00
}
);
Initial fish work
2020-11-26 21:57:38 +00:00
/// Data representing per-species generic data.
///
/// NOTE: Deliberately don't (yet?) implement serialize.
#[derive(Clone, Debug, Deserialize)]
pub struct AllSpecies<SpeciesMeta> {
Improves fish_small, new npc
2020-11-29 16:22:13 +00:00
pub clownfish: SpeciesMeta,
Adds 3 new npcs, tusk ram new design
2021-02-18 00:41:34 +00:00
pub piranha: SpeciesMeta,
Initial fish work
2020-11-26 21:57:38 +00:00
}
impl<'a, SpeciesMeta> core::ops::Index<&'a Species> for AllSpecies<SpeciesMeta> {
type Output = SpeciesMeta;
#[inline]
fn index(&self, &index: &'a Species) -> &Self::Output {
match index {
Improves fish_small, new npc
2020-11-29 16:22:13 +00:00
Species::Clownfish => &self.clownfish,
Adds 3 new npcs, tusk ram new design
2021-02-18 00:41:34 +00:00
Species::Piranha => &self.piranha,
Initial fish work
2020-11-26 21:57:38 +00:00
}
}
}
Adds 3 new npcs, tusk ram new design
2021-02-18 00:41:34 +00:00
pub const ALL_SPECIES: [Species; 2] = [Species::Clownfish, Species::Piranha];
Initial fish work
2020-11-26 21:57:38 +00:00
impl<'a, SpeciesMeta: 'a> IntoIterator for &'a AllSpecies<SpeciesMeta> {
type IntoIter = std::iter::Copied<std::slice::Iter<'static, Self::Item>>;
type Item = Species;
fn into_iter(self) -> Self::IntoIter { ALL_SPECIES.iter().copied() }
}
body tweak
2019-10-24 23:42:33 +00:00
Further generalize the typed module. This enables us to automatically create configuration formats from enums or structs. For enums, we create a structure with a field for each case, representing a pattern match; the configuration format can then enter a different expression for each case. For structs, we create an enum with a variant for each field, representing projecting by that field; the configuration format selects the field to project from, and then can write a further expression on that field (for instance, it can perform another pattern match). So far we don't actually have anything that *uses* this functionality; I decided to finish it for the purpose of specifying a default lantern offset, only to discover that we already return a lantern offset from the animation crate. So I fixed it there instead.
2020-08-31 01:01:20 +00:00
make_case_elim!(
Initial fish work
2020-11-26 21:57:38 +00:00
body_type,
Further generalize the typed module. This enables us to automatically create configuration formats from enums or structs. For enums, we create a structure with a field for each case, representing a pattern match; the configuration format can then enter a different expression for each case. For structs, we create an enum with a variant for each field, representing projecting by that field; the configuration format selects the field to project from, and then can write a further expression on that field (for instance, it can perform another pattern match). So far we don't actually have anything that *uses* this functionality; I decided to finish it for the purpose of specifying a default lantern offset, only to discover that we already return a lantern offset from the animation crate. So I fixed it there instead.
2020-08-31 01:01:20 +00:00
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash, Serialize, Deserialize)]
#[repr(u32)]
Initial fish work
2020-11-26 21:57:38 +00:00
pub enum BodyType {
Female = 0,
Male = 1,
Further generalize the typed module. This enables us to automatically create configuration formats from enums or structs. For enums, we create a structure with a field for each case, representing a pattern match; the configuration format can then enter a different expression for each case. For structs, we create an enum with a variant for each field, representing projecting by that field; the configuration format selects the field to project from, and then can write a further expression on that field (for instance, it can perform another pattern match). So far we don't actually have anything that *uses* this functionality; I decided to finish it for the purpose of specifying a default lantern offset, only to discover that we already return a lantern offset from the animation crate. So I fixed it there instead.
2020-08-31 01:01:20 +00:00
}
);
Initial fish work
2020-11-26 21:57:38 +00:00
pub const ALL_BODY_TYPES: [BodyType; 2] = [BodyType::Female, BodyType::Male];
Reference in New Issue Copy Permalink