voxel/kubi
1
1
Fork 0
mirror of https://github.com/griffi-gh/kubi.git synced 2024-11-25 16:28:42 -06:00
Code Issues Packages Projects Releases Wiki Activity

minor changes

Browse source
This commit is contained in:
griffi-gh 2023-11-21 19:33:05 +01:00
parent 7dc33c2dce
commit f7210e4dec
1 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
kubi/src/rendering.rs
View file

@ -7,7 +7,12 @@ use winit::{
dpi::PhysicalSize dpi::PhysicalSize
}; };
use glium::{Display, Surface, Version, Api}; use glium::{Display, Surface, Version, Api};
use glutin::{surface::WindowSurface, display::{GetGlDisplay, GlDisplay}, context::NotCurrentGlContext}; use glutin::{
prelude::*,
context::ContextAttributesBuilder,
surface::{WindowSurface, SurfaceAttributesBuilder},
display::GetGlDisplay,
};
use glam::{Vec3, UVec2}; use glam::{Vec3, UVec2};
use crate::{events::WindowResizedEvent, settings::{GameSettings, FullscreenMode}}; use crate::{events::WindowResizedEvent, settings::{GameSettings, FullscreenMode}};
@ -88,7 +93,7 @@ impl Renderer {
let display_builder = glutin_winit::DisplayBuilder::new().with_window_builder(Some(wb)); let display_builder = glutin_winit::DisplayBuilder::new().with_window_builder(Some(wb));
let config_template_builder = glutin::config::ConfigTemplateBuilder::new(); let config_template_builder = glutin::config::ConfigTemplateBuilder::new();
let (window, gl_config) = display_builder let (window, gl_config) = display_builder
.build(&event_loop, config_template_builder, |mut configs| { .build(event_loop, config_template_builder, |mut configs| {
configs.next().unwrap() configs.next().unwrap()
}) })
.unwrap(); .unwrap();
@ -96,7 +101,7 @@ impl Renderer {
// Now we get the window size to use as the initial size of the Surface // Now we get the window size to use as the initial size of the Surface
let (width, height): (u32, u32) = window.inner_size().into(); let (width, height): (u32, u32) = window.inner_size().into();
let attrs = glutin::surface::SurfaceAttributesBuilder::<glutin::surface::WindowSurface>::new().build( let attrs = SurfaceAttributesBuilder::<WindowSurface>::new().build(
window.raw_window_handle(), window.raw_window_handle(),
NonZeroU32::new(width).unwrap(), NonZeroU32::new(width).unwrap(),
NonZeroU32::new(height).unwrap(), NonZeroU32::new(height).unwrap(),
@ -104,7 +109,7 @@ impl Renderer {
// Finally we can create a Surface, use it to make a PossiblyCurrentContext and create the glium Display // Finally we can create a Surface, use it to make a PossiblyCurrentContext and create the glium Display
let surface = unsafe { gl_config.display().create_window_surface(&gl_config, &attrs).unwrap() }; let surface = unsafe { gl_config.display().create_window_surface(&gl_config, &attrs).unwrap() };
let context_attributes = glutin::context::ContextAttributesBuilder::new().build(Some(window.raw_window_handle())); let context_attributes = ContextAttributesBuilder::new().build(Some(window.raw_window_handle()));
let current_context = unsafe { let current_context = unsafe {
gl_config.display().create_context(&gl_config, &context_attributes).expect("failed to create context") gl_config.display().create_context(&gl_config, &context_attributes).expect("failed to create context")
}.make_current(&surface).unwrap(); }.make_current(&surface).unwrap();