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

Addressed comments

Browse Source
This commit is contained in:
Treeco 2024-03-23 17:22:44 +00:00
parent 86a27f2ddf
commit 36cab14859
4 changed files with 21 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/src/lod.rs
View File

@ -8,7 +8,7 @@ pub const ZONE_SIZE: u32 = 32;
bitflags::bitflags! {
#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
pub struct Flags: u8 {
pub struct InstFlags: u8 {
const SNOW_COVERED = 0b00000001;
const GLOW = 0b00000010;
}
@ -38,7 +38,7 @@ pub enum ObjectKind {
pub struct Object {
pub kind: ObjectKind,
pub pos: Vec3<i16>,
pub flags: Flags,
pub flags: InstFlags,
pub color: Rgb<u8>,
}

4
voxygen/src/render/pipelines/lod_object.rs
View File

@ -18,7 +18,7 @@ impl Vertex {
pos: Vec3<f32>,
norm: Vec3<f32>,
col: Rgb<f32>,
flags: crate::scene::lod::Flags,
flags: crate::scene::lod::VertexFlags,
) -> Self {
Self {
pos: pos.into_array(),
@ -53,7 +53,7 @@ pub struct Instance {
}
impl Instance {
pub fn new(inst_pos: Vec3<f32>, col: Rgb<u8>, flags: common::lod::Flags) -> Self {
pub fn new(inst_pos: Vec3<f32>, col: Rgb<u8>, flags: common::lod::InstFlags) -> Self {
Self {
inst_pos: inst_pos.into_array(),
inst_col: srgb_to_linear(col.map(|c| c as f32 / 255.0)).into_array(),

30
voxygen/src/scene/lod.rs
View File

@ -25,7 +25,7 @@ const MAX_OBJECT_RADIUS: i32 = 64;
bitflags::bitflags! {
#[derive(Debug, Clone, Copy)]
pub struct Flags: u8 {
pub struct VertexFlags: u8 {
// Use instance not vertex colour
const INST_COLOR = 0b00000001;
// Glow!
@ -276,25 +276,19 @@ fn make_lod_object(name: &str, renderer: &mut Renderer) -> Model<LodObjectVertex
.0
.objects()
.flat_map(|(objname, obj)| {
let mut color = objname.split('_').filter_map(|x| x.parse::<u8>().ok());
let color = color
.next()
.and_then(|r| Some(Rgb::new(r, color.next()?, color.next()?)))
.unwrap_or(Rgb::broadcast(127));
let color = srgb_to_linear(color.map(|c| (c as f32 / 255.0)));
let flags = match objname {
"InstCol" => VertexFlags::INST_COLOR,
"Glow" => VertexFlags::GLOW,
_ => VertexFlags::empty(),
};
obj.triangles().map(move |vs| {
let [a, b, c] = vs.map(|v| {
let color = {
let color = objname
.split('_')
.filter_map(|x| x.parse::<u8>().ok())
.collect::<Vec<_>>();
if color.len() >= 3 {
Rgb::new(color[0], color[1], color[2])
} else {
Rgb::broadcast(127)
}
};
let color = srgb_to_linear(color.map(|c| (c as f32 / 255.0)));
let flags = match objname {
"InstCol" => Flags::INST_COLOR,
"Glow" => Flags::GLOW,
_ => Flags::empty(),
};
LodObjectVertex::new(
v.position().into(),
v.normal().unwrap_or([0.0, 0.0, 1.0]).into(),

10
world/src/lib.rs
View File

@ -640,11 +640,11 @@ impl World {
rpos.map(|e| e as i16).with_z(col.alt as i16)
}
},
flags: lod::Flags::empty()
flags: lod::InstFlags::empty()
| if col.snow_cover {
lod::Flags::SNOW_COVERED
lod::InstFlags::SNOW_COVERED
} else {
lod::Flags::empty()
lod::InstFlags::empty()
},
color: {
let field = crate::util::RandomField::new(tree.seed);
@ -713,9 +713,9 @@ impl World {
.map(|e| e as i16)
.with_z(self.sim().get_alt_approx(wpos2d).unwrap_or(0.0) as i16),
flags: if column.snow_cover {
lod::Flags::SNOW_COVERED
lod::InstFlags::SNOW_COVERED
} else {
lod::Flags::empty()
lod::InstFlags::empty()
},
color,
}),