starting testing of conrod based ui

Former-commit-id: d417d2372ed95ae82e8d3766c558fb3498056987

voxygen/Cargo.toml

@@ -18,6 +18,7 @@ gfx = "0.17"
 gfx_device_gl = { version = "0.15", optional = true }
 gfx_window_glutin = "0.28"
 glutin = "0.19"
+conrod_core = "0.62"
 
 # ECS
 specs = "0.14"

voxygen/src/menu/title.rs

@@ -1,6 +1,12 @@
 // Library
 use vek::*;
 use image;
+use conrod_core::Ui;
+use conrod_core::UiBuilder;
+use conrod_core::widget::image::Image as ImageWidget;
+use conrod_core::image::Map as ImageMap;
+use conrod_core::{Positionable, Sizeable};
+use conrod_core::Widget;
 
 // Crate
 use crate::{
@@ -9,27 +15,37 @@ use crate::{
     GlobalState,
     window::Event,
     session::SessionState,
-    render::Renderer,
-    ui::{
-        Ui,
-        element::{
-            Widget,
-            image::Image,
-        },
+    render::{
+        Consts,
+        UiLocals,
+        Renderer,
+        Texture,
+        UiPipeline,
+        create_ui_quad_mesh,
     },
 };
 
 pub struct TitleState {
     ui: Ui,
+    image_map: ImageMap<Texture<UiPipeline>>,
 }
 
 impl TitleState {
     /// Create a new `TitleState`
     pub fn new(renderer: &mut Renderer) -> Self {
-        let img = Image::new(renderer, &image::open(concat!(env!("CARGO_MANIFEST_DIR"), "/test_assets/test.png")).unwrap()).unwrap();
-        let widget = Widget::new(renderer, img).unwrap();
+        let mut ui = UiBuilder::new([500.0, 500.0]).build();
+        let widget_id = ui.widget_id_generator().next();
+        let mut image_map = ImageMap::new();
+        let img = image::open(concat!(env!("CARGO_MANIFEST_DIR"), "/test_assets/test.png")).unwrap();
+        let img = renderer.create_texture(&img).unwrap();
+        let img_id = image_map.insert(img);
+        ImageWidget::new(img_id)
+            .x_y(0.0, 0.0)
+            .w_h(500.0,500.0)
+            .set(widget_id, &mut ui.set_widgets());
         Self {
-            ui: Ui::new(renderer, widget).unwrap(),
+            ui,
+            image_map
         }
     }
 }
@@ -53,20 +69,45 @@ impl PlayState for TitleState {
                 }
             }
 
-            // Clear the screen
-            global_state.window.renderer_mut().clear(BG_COLOR);
 
             // Maintain the UI
-            self.ui.maintain(global_state.window.renderer_mut());
+            //self.ui.maintain(global_state.window.renderer_mut());
 
             // Draw the UI to the screen
-            self.ui.render(global_state.window.renderer_mut());
+            //self.ui.render(global_state.window.renderer_mut());
+            if let Some(mut primitives) = Some(self.ui.draw()){//_if_changed() {
+                // Clear the screen
+                global_state.window.renderer_mut().clear(BG_COLOR);
+
+                //render the primatives one at a time
+                while let Some(prim) = primitives.next() {
+                    let mut renderer = global_state.window.renderer_mut();
+                    use conrod_core::render::{Primitive, PrimitiveKind};
+                    let Primitive {kind, scizzor, rect, ..} = prim;
+                    match kind {
+                        PrimitiveKind::Image { image_id, color, source_rect } => {
+
+                            let mut locals = renderer.create_consts(&[UiLocals::default()]).unwrap();
+                            renderer.update_consts(&mut locals, &[UiLocals::new(
+                                    [0.0, 0.0, 1.0, 1.0],
+                                )]);
+                            let model = renderer.create_model(&create_ui_quad_mesh()).unwrap();
+                            global_state.window.renderer_mut().render_ui_element(&model, &locals, self.image_map.get(&image_id).unwrap())
+                        }
+                        _ => {println!("should not reach here");}
+                    }
+                }
+
+
+                // Finish the frame
+                global_state.window.renderer_mut().flush();
+                global_state.window
+                    .swap_buffers()
+                    .expect("Failed to swap window buffers");
+            }
+
+
 
-            // Finish the frame
-            global_state.window.renderer_mut().flush();
-            global_state.window
-                .swap_buffers()
-                .expect("Failed to swap window buffers");
         }
     }
 

voxygen/test_assets/font/OFL.txt

@@ -0,0 +1,94 @@
+Copyright (c) 2011-2012 by Sorkin Type Co (www.sorkintype.com),
+with Reserved Font Name "Metamorphous".
+
+This Font Software is licensed under the SIL Open Font License, Version 1.1.
+This license is copied below, and is also available with a FAQ at:
+http://scripts.sil.org/OFL
+
+
+-----------------------------------------------------------
+SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
+-----------------------------------------------------------
+
+PREAMBLE
+The goals of the Open Font License (OFL) are to stimulate worldwide
+development of collaborative font projects, to support the font creation
+efforts of academic and linguistic communities, and to provide a free and
+open framework in which fonts may be shared and improved in partnership
+with others.
+
+The OFL allows the licensed fonts to be used, studied, modified and
+redistributed freely as long as they are not sold by themselves. The
+fonts, including any derivative works, can be bundled, embedded, 
+redistributed and/or sold with any software provided that any reserved
+names are not used by derivative works. The fonts and derivatives,
+however, cannot be released under any other type of license. The
+requirement for fonts to remain under this license does not apply
+to any document created using the fonts or their derivatives.
+
+DEFINITIONS
+"Font Software" refers to the set of files released by the Copyright
+Holder(s) under this license and clearly marked as such. This may
+include source files, build scripts and documentation.
+
+"Reserved Font Name" refers to any names specified as such after the
+copyright statement(s).
+
+"Original Version" refers to the collection of Font Software components as
+distributed by the Copyright Holder(s).
+
+"Modified Version" refers to any derivative made by adding to, deleting,
+or substituting -- in part or in whole -- any of the components of the
+Original Version, by changing formats or by porting the Font Software to a
+new environment.
+
+"Author" refers to any designer, engineer, programmer, technical
+writer or other person who contributed to the Font Software.
+
+PERMISSION & CONDITIONS
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of the Font Software, to use, study, copy, merge, embed, modify,
+redistribute, and sell modified and unmodified copies of the Font
+Software, subject to the following conditions:
+
+1) Neither the Font Software nor any of its individual components,
+in Original or Modified Versions, may be sold by itself.
+
+2) Original or Modified Versions of the Font Software may be bundled,
+redistributed and/or sold with any software, provided that each copy
+contains the above copyright notice and this license. These can be
+included either as stand-alone text files, human-readable headers or
+in the appropriate machine-readable metadata fields within text or
+binary files as long as those fields can be easily viewed by the user.
+
+3) No Modified Version of the Font Software may use the Reserved Font
+Name(s) unless explicit written permission is granted by the corresponding
+Copyright Holder. This restriction only applies to the primary font name as
+presented to the users.
+
+4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
+Software shall not be used to promote, endorse or advertise any
+Modified Version, except to acknowledge the contribution(s) of the
+Copyright Holder(s) and the Author(s) or with their explicit written
+permission.
+
+5) The Font Software, modified or unmodified, in part or in whole,
+must be distributed entirely under this license, and must not be
+distributed under any other license. The requirement for fonts to
+remain under this license does not apply to any document created
+using the Font Software.
+
+TERMINATION
+This license becomes null and void if any of the above conditions are
+not met.
+
+DISCLAIMER
+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
+OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
+COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
+DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
+OTHER DEALINGS IN THE FONT SOFTWARE.