From 0c41c0b432dc483568d719cf7a0d521e8dadaa0c Mon Sep 17 00:00:00 2001
From: Nick Fitzgerald <fitzgen@gmail.com>
Date: Wed, 19 Sep 2018 13:18:48 -0700
Subject: [PATCH 1/2] examples(webgl): stop using old window static methods
These were removed and replaced with normal methods on window and a standalone
function to get the global window.
---
examples/webgl/src/lib.rs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/examples/webgl/src/lib.rs b/examples/webgl/src/lib.rs
index d584f71d..8250f2b7 100755
--- a/examples/webgl/src/lib.rs
+++ b/examples/webgl/src/lib.rs
@@ -8,7 +8,7 @@ use web_sys::{WebGlProgram, WebGlRenderingContext, WebGlShader};
#[wasm_bindgen]
pub fn draw() {
- let document = web_sys::Window::document().unwrap();
+ let document = web_sys::window().unwrap().document().unwrap();
let canvas = document.get_element_by_id("canvas").unwrap();
let canvas: web_sys::HtmlCanvasElement = canvas
.dyn_into::<web_sys::HtmlCanvasElement>()
From 5a267d109a20c63c568fdf84fe131e6b6114739e Mon Sep 17 00:00:00 2001
From: Nick Fitzgerald <fitzgen@gmail.com>
Date: Wed, 19 Sep 2018 13:19:41 -0700
Subject: [PATCH 2/2] examples(webgl): run rustfmt
---
examples/webgl/src/lib.rs | 13 ++++++-------
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/examples/webgl/src/lib.rs b/examples/webgl/src/lib.rs
index 8250f2b7..69c635f5 100755
--- a/examples/webgl/src/lib.rs
+++ b/examples/webgl/src/lib.rs
@@ -57,18 +57,17 @@ pub fn draw() {
Some(&vert_array.buffer()),
WebGlRenderingContext::STATIC_DRAW,
);
- context.vertex_attrib_pointer_with_i32(0,
- 3,
- WebGlRenderingContext::FLOAT,
- false,
- 0,
- 0);
+ context.vertex_attrib_pointer_with_i32(0, 3, WebGlRenderingContext::FLOAT, false, 0, 0);
context.enable_vertex_attrib_array(0);
context.clear_color(0.0, 0.0, 0.0, 1.0);
context.clear(WebGlRenderingContext::COLOR_BUFFER_BIT);
- context.draw_arrays(WebGlRenderingContext::TRIANGLES, 0, (vertices.len() / 3) as i32);
+ context.draw_arrays(
+ WebGlRenderingContext::TRIANGLES,
+ 0,
+ (vertices.len() / 3) as i32,
+ );
}
pub fn compile_shader(