alex/mini_gl_fb
1
0
Fork 0
mirror of https://github.com/italicsjenga/mini_gl_fb.git synced 2024-11-22 07:21:30 +11:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'window-target' of https://github.com/LoganDark/mini_gl_fb into LoganDark-window-target

Browse source
This commit is contained in:
dxb 2021-07-17 19:46:59 -04:00
parent e2e88b5933 0d3899d8d1
commit 3f86d9913b
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/core.rs
View file

@ -10,7 +10,7 @@ use gl::types::*;
use std::mem::size_of_val; use std::mem::size_of_val;
use glutin::window::WindowBuilder; use glutin::window::WindowBuilder;
use glutin::event_loop::{EventLoop, ControlFlow}; use glutin::event_loop::{EventLoop, ControlFlow, EventLoopWindowTarget};
use glutin::platform::run_return::EventLoopExtRunReturn; use glutin::platform::run_return::EventLoopExtRunReturn;
use glutin::event::{Event, WindowEvent, VirtualKeyCode, ElementState, KeyboardInput, StartCause}; use glutin::event::{Event, WindowEvent, VirtualKeyCode, ElementState, KeyboardInput, StartCause};
use std::time::Instant; use std::time::Instant;
@ -21,7 +21,7 @@ pub fn init_glutin_context<S: ToString, ET: 'static>(
window_width: f64, window_width: f64,
window_height: f64, window_height: f64,
resizable: bool, resizable: bool,
event_loop: &EventLoop<ET> event_loop: &EventLoopWindowTarget<ET>
) -> WindowedContext<PossiblyCurrent> { ) -> WindowedContext<PossiblyCurrent> {
let window_size = LogicalSize::new(window_width, window_height); let window_size = LogicalSize::new(window_width, window_height);

4
src/lib.rs
View file

@ -120,7 +120,7 @@ pub use config::{Config, ConfigBuilder};
pub use crate::core::{Internal, BufferFormat, Framebuffer}; pub use crate::core::{Internal, BufferFormat, Framebuffer};
use crate::core::ToGlType; use crate::core::ToGlType;
use glutin::event_loop::EventLoop; use glutin::event_loop::{EventLoop, EventLoopWindowTarget};
use glutin::dpi::LogicalSize; use glutin::dpi::LogicalSize;
/// Creates a non-resizable window and framebuffer with a given size in logical pixels. On HiDPI /// Creates a non-resizable window and framebuffer with a given size in logical pixels. On HiDPI
@ -153,7 +153,7 @@ pub fn gotta_go_fast<S: ToString>(
/// `get_fancy` with a custom config. However, if there is a bug in the OS/windowing system or /// `get_fancy` with a custom config. However, if there is a bug in the OS/windowing system or
/// glutin or in this library, this function exists as a possible work around (or in case for some /// glutin or in this library, this function exists as a possible work around (or in case for some
/// reason everything must be absolutely correct at window creation) /// reason everything must be absolutely correct at window creation)
pub fn get_fancy<ET: 'static>(config: Config, event_loop: &EventLoop<ET>) -> MiniGlFb { pub fn get_fancy<ET: 'static>(config: Config, event_loop: &EventLoopWindowTarget<ET>) -> MiniGlFb {
let buffer_size = config.buffer_size.unwrap_or_else(|| config.window_size.cast()); let buffer_size = config.buffer_size.unwrap_or_else(|| config.window_size.cast());
let context = core::init_glutin_context( let context = core::init_glutin_context(