sergeypdev/engine
1
0
Fork 0
Code Issues 20 Pull Requests Actions Packages Projects 1 Releases Wiki Activity

Add toggle fullscreen and toggle vsync hotkeys, improve DPI awareness on windows

Browse Source
This commit is contained in:
sergeypdev 2024-02-12 22:38:15 +04:00
parent d21d128633
commit 2f3998ddfd
4 changed files with 58 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/shaders/mesh.glsl
View File

@ -74,8 +74,6 @@ void main() {
float gamma = 2.2;
FragColor.rgb = pow(FragColor.rgb, vec3(1.0/gamma));
FragColor.rgb = vec3(VertexOut.uv, 0);
}
#endif // FRAGMNET_SHADER

4
build.zig.zon
View File

@ -16,8 +16,8 @@
// internet connectivity.
.dependencies = .{
.SDL = .{
.url = "https://github.com/sergeypdev/SDL/tarball/b23c0ba880c53e5e98c57d2d5470c8d551a520b3",
.hash = "122080136ee910b4bec7be16e6c69cf1e7fc4f69d14f4d7d2dd1bba3c3fe30e489a3",
.url = "https://github.com/sergeypdev/SDL/tarball/fc1f821736ae929ef92d3d205cecd777b878e100",
.hash = "1220483cbb42231cb056f4ea6669894c68ccd560d3af5832d6e9c84c61844bc20b7d",
.lazy = true,
},
.@"zig-assimp" = .{

57
src/game.zig
View File

@ -61,6 +61,8 @@ pub const InitMemory = struct {
context: ?*anyopaque,
width: c_int,
height: c_int,
fullscreen: bool = false,
vsync: bool = false,
syswm_info: c.SDL_SysWMinfo = .{},
};
@ -225,6 +227,12 @@ var g_mem: *GameMemory = undefined;
var g_assetman: *AssetManager = undefined;
fn game_init_window_err(global_allocator: std.mem.Allocator) !void {
if (c.SDL_SetHint(c.SDL_HINT_WINDOWS_DPI_AWARENESS_, "1") == c.SDL_FALSE) {
std.log.debug("Failed to setup windows DPI scaling\n", .{});
}
if (c.SDL_SetHint(c.SDL_HINT_WINDOWS_DPI_SCALING, "1") == c.SDL_FALSE) {
std.log.debug("Failed to setup windows DPI scaling\n", .{});
}
// _ = DwmEnableMMCSS(1);
try sdl_try(c.SDL_Init(c.SDL_INIT_EVERYTHING));
@ -232,6 +240,7 @@ fn game_init_window_err(global_allocator: std.mem.Allocator) !void {
try sdl_try(c.SDL_GL_SetAttribute(c.SDL_GL_CONTEXT_MAJOR_VERSION, 4));
try sdl_try(c.SDL_GL_SetAttribute(c.SDL_GL_CONTEXT_MINOR_VERSION, 5));
try sdl_try(c.SDL_GL_SetAttribute(c.SDL_GL_CONTEXT_PROFILE_MASK, c.SDL_GL_CONTEXT_PROFILE_CORE));
try sdl_try(c.SDL_GL_SetAttribute(c.SDL_GL_FRAMEBUFFER_SRGB_CAPABLE, 0));
const maybe_window = c.SDL_CreateWindow(
"Learn OpenGL with Zig!",
@ -249,7 +258,7 @@ fn game_init_window_err(global_allocator: std.mem.Allocator) !void {
const context = c.SDL_GL_CreateContext(window);
_ = c.SDL_GL_SetSwapInterval(0);
try sdl_try(c.SDL_GL_SetSwapInterval(0));
g_init = try global_allocator.create(InitMemory);
g_init_exists = true;
@ -266,6 +275,8 @@ fn game_init_window_err(global_allocator: std.mem.Allocator) !void {
version.minor = c.SDL_MINOR_VERSION;
version.patch = c.SDL_PATCHLEVEL;
c.SDL_GL_GetDrawableSize(window, &g_init.width, &g_init.height);
if (c.SDL_GetWindowWMInfo(window, &g_init.syswm_info) == 0) {
const err = c.SDL_GetError();
std.log.err("Failed to get syswm info: {s}", .{err});
@ -451,7 +462,7 @@ export fn game_init(global_allocator: *std.mem.Allocator) void {
{
for (0..10) |i| {
_ = g_mem.world.addEntity(.{
.transform = .{ .pos = Vec3.new(@as(f32, @floatFromInt(i)) * 0.3, -0.03, 0) },
.transform = .{ .pos = Vec3.new(@as(f32, @floatFromInt(i)) * 0.3, 0, 0) },
.flags = .{ .mesh = true },
.mesh = .{ .handle = a.Meshes.bunny },
@ -513,6 +524,20 @@ export fn game_update() bool {
c.SDL_KEYUP, c.SDL_KEYDOWN => {
const pressed = event.key.state == c.SDL_PRESSED;
switch (event.key.keysym.scancode) {
// Toggle fullscreen
c.SDL_SCANCODE_F11 => {
if (event.type == c.SDL_KEYDOWN) {
toggleFullScreen() catch continue;
}
},
// Toggle vsync
c.SDL_SCANCODE_F10 => {
if (event.type == c.SDL_KEYDOWN) {
const newSwap: c_int = if (ginit.vsync) 0 else 1;
sdl_try(c.SDL_GL_SetSwapInterval(newSwap)) catch continue;
ginit.vsync = !ginit.vsync;
}
},
c.SDL_SCANCODE_ESCAPE => {
if (event.type == c.SDL_KEYUP) {
if (gmem.mouse_focus) {
@ -547,8 +572,7 @@ export fn game_update() bool {
c.SDL_WINDOWEVENT => {
switch (event.window.event) {
c.SDL_WINDOWEVENT_SIZE_CHANGED => {
ginit.width = event.window.data1;
ginit.height = event.window.data2;
c.SDL_GL_GetDrawableSize(ginit.window, &ginit.width, &ginit.height);
std.log.debug("w: {}, h: {}\n", .{ ginit.width, ginit.height });
gl.viewport(0, 0, ginit.width, ginit.height);
@ -723,6 +747,7 @@ export fn game_update() bool {
}
c.SDL_GL_SwapWindow(ginit.window);
c.SDL_Delay(1);
// const vblank_event: D3DKMT_WAITFORVERTICALBLANKEVENT = .{
// .hAdapter = 0,
// .hDevice = ginit.syswm_info.info.win.hdc.*,
@ -797,3 +822,27 @@ fn sdl_try(result: c_int) !void {
return error.SDLError;
}
}
fn toggleFullScreen() !void {
const ginit = g_init;
const current_flags: c.Uint32 = if (g_init.fullscreen) c.SDL_WINDOW_FULLSCREEN else 0;
const new_flags: c.Uint32 = if (g_init.fullscreen) 0 else c.SDL_WINDOW_FULLSCREEN;
const display_index = c.SDL_GetWindowDisplayIndex(ginit.window);
var mode: c.SDL_DisplayMode = undefined;
try sdl_try(c.SDL_GetDesktopDisplayMode(display_index, &mode));
// When going fullscreen set a good display mode
if (!ginit.fullscreen) {
try sdl_try(c.SDL_SetWindowDisplayMode(ginit.window, &mode));
}
try sdl_try(c.SDL_SetWindowFullscreen(ginit.window, new_flags));
errdefer {
sdl_try(c.SDL_SetWindowFullscreen(ginit.window, current_flags)) catch {
std.log.err("Failed to change fullscreen mode and then failed to restore the old fullscreen mode\n", .{});
};
}
ginit.fullscreen = !ginit.fullscreen;
}

3
src/sdl.zig
View File

@ -2,3 +2,6 @@ pub usingnamespace @cImport({
@cInclude("SDL2/SDL.h");
@cInclude("SDL2/SDL_syswm.h");
});
// When using system sdl2 library this might not be defined
pub const SDL_HINT_WINDOWS_DPI_AWARENESS_ = "SDL_WINDOWS_DPI_AWARENESS";