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

rewrite/address/remove some ui TODOs and comments

Browse Source 
Former-commit-id: bbcbb0ee6e8d4049ad98a5cea6274ce9ef0027e0
This commit is contained in:
Imberflur 2019-02-22 22:16:12 -05:00 committed by Imbris
parent 1962320f7e
commit 71da6e6588
3 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
voxygen/src/menu/test_hud.rs
View File

@ -37,7 +37,7 @@ widget_ids!{
}
}
// TODO: make macro to mimic widget_ids! for images ids or find another solution to simplify addition of new images to the code.
// TODO: make macro to mimic widget_ids! for images ids or find another solution to simplify addition of new images.
struct Imgs {
menu_button: ImgId,
bag: ImgId,

7
voxygen/src/render/texture.rs
View File

@ -79,18 +79,15 @@ impl<P: Pipeline> Texture<P> {
Ok(Self {
tex,
srv,
// TODO: is this the right sampler?
sampler: factory.create_sampler(gfx::texture::SamplerInfo::new(
gfx::texture::FilterMethod::Scale,
//this is what conrod's gfx backend uses but i want to see the other one first to compare
//gfx::texture::FilterMethod::Bilinear
gfx::texture::FilterMethod::Bilinear,
gfx::texture::WrapMode::Clamp,
)),
_phantom: PhantomData,
})
}
// Updates a texture with the given data (used for updating the GlyphCache texture)
// Updates a texture with the given data (used for updating the glyph cache texture)
pub fn update(
&self,
encoder: &mut gfx::Encoder<gfx_backend::Resources, gfx_backend::CommandBuffer>,

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

@ -1,4 +1,3 @@
// TODO: cache entire UI render (would be somewhat pointless if we are planning on constantly animated ui)
// TODO: figure out proper way to propagate events down to the ui
// Library
@ -49,8 +48,7 @@ pub struct Cache {
// TODO: Should functions be returning UiError instead of Error?
impl Cache {
pub fn new(renderer: &mut Renderer) -> Result<Self, Error> {
// TODO: remove map if it is uneeded(or remove this comment)
let (w, h) = renderer.get_resolution().map(|e| e).into_tuple();
let (w, h) = renderer.get_resolution().into_tuple();
const SCALE_TOLERANCE: f32 = 0.1;
const POSITION_TOLERANCE: f32 = 0.1;
@ -79,7 +77,7 @@ pub struct Ui {
ui: CrUi,
image_map: Map<Texture<UiPipeline>>,
cache: Cache,
// Primatives to draw on the next render
// Draw commands for the next render
draw_commands: Vec<DrawCommand>,
}
@ -121,7 +119,7 @@ impl Ui {
pub fn maintain(&mut self, renderer: &mut Renderer) {
let ref mut ui = self.ui;
// Gather primatives and recreate "mesh" only if ui_changed
// Regenerate draw commands and associated models only if ui_changed
if let Some(mut primitives) = ui.draw_if_changed() {
self.draw_commands.clear();
let mut mesh = Mesh::new();
@ -142,18 +140,7 @@ impl Ui {
while let Some(prim) = primitives.next() {
// TODO: Use scizzor
let Primitive {kind, scizzor, id, rect} = prim;
// Transform from conrod to our render coords
// Conrod uses the center of the screen as the origin
// Up & Right are positive directions
/*let x = rect.left();
let y = rect.top();
let (w, h) = rect.w_h();
let bounds = [
(x / ui.win_w + 0.5) as f32,
(-1.0 * (y / ui.win_h) + 0.5) as f32,
(w / ui.win_w) as f32,
(h / ui.win_h) as f32
];*/
use conrod_core::render::PrimitiveKind;
match kind {
// TODO: use source_rect
@ -188,7 +175,6 @@ impl Ui {
// Texture coordinates range:
// - left to right: 0.0 to 1.0
// - bottom to top: 1.0 to 0.0
// Note bottom and top are flipped in comparison to glium so that we don't need to flip images when loading
/*let (uv_l, uv_r, uv_t, uv_b) = match source_rect {
Some(src_rect) => {
let (l, r, b, t) = src_rect.l_r_b_t();