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

Fix rebase

Browse Source
This commit is contained in:
James Melkonian 2022-02-03 21:33:43 -08:00 committed by Sam
parent fcb0f8d8f0
commit 14080da693
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
world/src/site2/gen.rs
View File

@ -880,14 +880,6 @@ impl<'a> PrimitiveRef<'a> {
pub fn repeat(self, offset: Vec3<i32>, count: i32) -> PrimitiveRef<'a> {
self.painter.prim(Primitive::repeat(self, offset, count))
}
pub fn translate(self, trans: Vec3<i32>) -> PrimitiveRef<'a> {
self.painter.prim(Primitive::translate(self, trans))
}
pub fn rotate(self, rot: Mat3<i32>) -> PrimitiveRef<'a> {
self.painter.prim(Primitive::rotate(self, rot))
}
}
pub trait Structure {

2
world/src/site2/mod.rs
View File

@ -967,7 +967,7 @@ impl Site {
PlotKind::Workshop(workshop) => workshop.render_collect(self, canvas),
PlotKind::Castle(castle) => castle.render_collect(self, canvas),
PlotKind::Dungeon(dungeon) => dungeon.render_collect(self, canvas),
PlotKind::Gnarling(gnarling) => gnarling.render_collect(self, &canvas.land()),
PlotKind::Gnarling(gnarling) => gnarling.render_collect(self, &canvas),
PlotKind::GiantTree(giant_tree) => giant_tree.render_collect(self, canvas),
_ => continue,
};