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

Don't create Consts if they are not needed

Browse Source 
Former-commit-id: 3af8652100c009afda53637b292ded67587d89d4
This commit is contained in:
Imbris 2019-05-25 19:02:57 -04:00
parent 4a8e85ef64
commit 3c7f463330
1 changed files with 36 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
voxygen/src/ui/mod.rs
View File

@ -60,7 +60,7 @@ enum DrawKind {
enum DrawCommand {
Draw { kind: DrawKind, verts: Range<usize> },
Scissor(Aabr<u16>),
WorldPos(Option<Consts<UiLocals>>),
WorldPos(Option<usize>),
}
impl DrawCommand {
fn image(verts: Range<usize>) -> DrawCommand {
@ -97,6 +97,8 @@ pub struct Ui {
// Consts for default ui drawing position (ie the interface)
interface_locals: Consts<UiLocals>,
default_globals: Consts<Globals>,
// Consts to specify positions of ingame elements (e.g. Nametags)
ingame_locals: Vec<Consts<UiLocals>>,
// Window size for updating scaling
window_resized: Option<Vec2<f64>>,
// Scaling of the ui
@ -118,6 +120,7 @@ impl Ui {
model: renderer.create_dynamic_model(100)?,
interface_locals: renderer.create_consts(&[UiLocals::default()])?,
default_globals: renderer.create_consts(&[Globals::default()])?,
ingame_locals: Vec::new(),
window_resized: None,
scale,
})
@ -229,6 +232,8 @@ impl Ui {
let window_scissor = default_scissor(renderer);
let mut current_scissor = window_scissor;
let mut ingame_local_index = 0;
enum Placement {
Interface,
// Number of primitives left to render ingame and relative scaling/resolution
@ -528,16 +533,6 @@ impl Ui {
.unwrap()
.state
.parameters;
// Finish current state
self.draw_commands.push(match current_state {
State::Plain => DrawCommand::plain(start..mesh.vertices().len()),
State::Image => DrawCommand::image(start..mesh.vertices().len()),
});
start = mesh.vertices().len();
// Push new position command
self.draw_commands.push(DrawCommand::WorldPos(Some(
renderer.create_consts(&[parameters.pos.into()]).unwrap(),
)));
let pos_in_view = view_mat * Vec4::from_point(parameters.pos);
let scale_factor = self.ui.win_w as f64
@ -546,7 +541,34 @@ impl Ui {
* (0.5 * fov as f64).tan()
* parameters.res as f64);
// Don't process ingame elements behind the camera or very far away
placement = if scale_factor > 0.1 {
placement = if scale_factor > 0.2 {
// Finish current state
self.draw_commands.push(match current_state {
State::Plain => {
DrawCommand::plain(start..mesh.vertices().len())
}
State::Image => {
DrawCommand::image(start..mesh.vertices().len())
}
});
start = mesh.vertices().len();
// Push new position command
if self.ingame_locals.len() > ingame_local_index {
renderer
.update_consts(
&mut self.ingame_locals[ingame_local_index],
&[parameters.pos.into()],
)
.unwrap();
} else {
self.ingame_locals.push(
renderer.create_consts(&[parameters.pos.into()]).unwrap(),
);
}
self.draw_commands
.push(DrawCommand::WorldPos(Some(ingame_local_index)));
ingame_local_index += 1;
p_scale_factor = ((scale_factor * 10.0).log2().round().powi(2)
/ 10.0)
.min(1.6)
@ -621,8 +643,8 @@ impl Ui {
DrawCommand::Scissor(new_scissor) => {
scissor = *new_scissor;
}
DrawCommand::WorldPos(ref pos) => {
locals = pos.as_ref().unwrap_or(&self.interface_locals);
DrawCommand::WorldPos(index) => {
locals = index.map_or(&self.interface_locals, |i| &self.ingame_locals[i]);
}
DrawCommand::Draw { kind, verts } => {
let tex = match kind {