paoda/zgui
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: paoda:5b2b64a9dedd91f0cbf69ccb7a0a5ebf1fdf1691
Branches Tags
paoda:upstream paoda:sdl2 paoda:mach
..
compare: paoda:70d7c0dc02484de5226e8fe0f1284ac781826252
Branches Tags
paoda:sdl2 paoda:upstream paoda:mach

9 Commits
5b2b64a9de ... 70d7c0dc02

Author SHA1 Message Date
Rekai Musuka
70d7c0dc02 Merge branch 'sdl2-opengl3-backend' into fork 2023-03-26 19:52:55 -05:00
Rekai Musuka
55efe08bdf chore: explicitly link SDL2 
TODO: What happens on Windows? macOS?
 2023-03-26 19:38:50 -05:00
Rekai Musuka
78922b64ea fix: vcpkg stores SDL.h under SDL2 folder 
macOS and Linux seem to not, so in order to get CI working again I
should make use of the preprocessor.

FIXME: I think this makes vcpkg a **hard** requirement which perhaps
isn't ideal if I want ZBA to be as easy to build as possible. I should
try ensuring that building w/out vcpkg works as well
 2023-03-26 19:35:02 -05:00
Rekai Musuka
b051d0c406 feat: add sdl2-opengl3 backend impl 2023-03-26 19:35:02 -05:00
Rekai Musuka
5432027535 chore: handle all cases of enum 2023-03-26 19:32:46 -05:00
Rekai Musuka
bcd0e8be1f chore: combine render() and draw() in backend 2023-03-26 19:32:46 -05:00
Rekai Musuka
cd2b3923a4 feat: add backend impl for glfw+opengl3 2023-03-26 19:32:46 -05:00
Rekai Musuka
d9b80ff062 feat: add glfw+opengl3 backend option to build.zig 2023-03-26 19:29:19 -05:00
Rekai Musuka
5e306e4dfa chore: add necessary imgui files for opengl3 2023-03-26 19:25:31 -05:00
4 changed files with 9 additions and 27 deletions
Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -1,2 +0,0 @@
/zig-cache
/zig-out

23
build.zig
View File

@@ -105,30 +105,9 @@ pub fn package(
zgui_c_cpp.linkSystemLibraryName("dwmapi"); zgui_c_cpp.linkSystemLibraryName("dwmapi");
}, },
.sdl2_opengl3 => { .sdl2_opengl3 => {
if (target.isWindows()) blk: {
// see: https://github.com/MasterQ32/SDL.zig/blob/37f4ba9e31bea895fa19ef8b90d1f51111e52e67/Sdk.zig#L182-L199
zgui_c_cpp.addVcpkgPaths(if (args.options.shared) .dynamic else .static) catch break :blk;
const vcpkg_triplet = zgui_c_cpp.target.vcpkgTriplet(b.allocator, if (args.options.shared) .Dynamic else .Static) catch |e| {
std.debug.panic("failed to determing vcpkg triplet: {}", .{e});
};
defer b.allocator.free(vcpkg_triplet);
const include_path = b.pathJoin(&.{ b.vcpkg_root.found, "installed", vcpkg_triplet, "include", "SDL2" });
zgui_c_cpp.include_dirs.append(.{ .raw_path = include_path }) catch @panic("out of memory");
const bin_path = zgui_c_cpp.vcpkg_bin_path orelse @panic("vcpkg paths were found, so vcpkg_bin_path should be set ");
const dll_path = std.fs.path.join(b.allocator, &.{ bin_path, "SDL2.dll" }) catch @panic("out of memory");
std.fs.cwd().access(dll_path, .{}) catch break :blk;
b.installBinFile(dll_path, "SDL2.dll");
}
zgui_c_cpp.linkSystemLibrary("SDL2");
zgui_c_cpp.addCSourceFile(thisDir() ++ "/libs/imgui/backends/imgui_impl_sdl.cpp", cflags); zgui_c_cpp.addCSourceFile(thisDir() ++ "/libs/imgui/backends/imgui_impl_sdl.cpp", cflags);
zgui_c_cpp.addCSourceFile(thisDir() ++ "/libs/imgui/backends/imgui_impl_opengl3.cpp", cflags); zgui_c_cpp.addCSourceFile(thisDir() ++ "/libs/imgui/backends/imgui_impl_opengl3.cpp", cflags);
zgui_c_cpp.linkSystemLibrary("SDL2");
}, },
.no_backend => {}, .no_backend => {},
} }

9
libs/imgui/backends/imgui_impl_sdl.cpp
View File

@@ -67,8 +67,13 @@
#include "imgui_impl_sdl.h" #include "imgui_impl_sdl.h"
// SDL // SDL
#include <SDL.h> #if defined(__WIN32__)
#include <SDL_syswm.h> #include <SDL2/SDL.h>
#include <SDL2/SDL_syswm.h>
#else
#include <SDL.h>
#include <SDL_syswm.h>
#endif
#if defined(__APPLE__) #if defined(__APPLE__)
#include <TargetConditionals.h> #include <TargetConditionals.h>

2
src/main.zig
View File

@@ -9,9 +9,9 @@ pub const version = @import("std").SemanticVersion{ .major = 0, .minor = 9, .pat
pub usingnamespace @import("gui.zig"); pub usingnamespace @import("gui.zig");
pub const plot = @import("plot.zig"); pub const plot = @import("plot.zig");
pub const backend = switch (@import("zgui_options").backend) { pub const backend = switch (@import("zgui_options").backend) {
.glfw_wgpu => @import("backend_glfw_wgpu.zig"),
.glfw_opengl3 => @import("backend_glfw_opengl3.zig"), .glfw_opengl3 => @import("backend_glfw_opengl3.zig"),
.sdl2_opengl3 => @import("backend_sdl2_opengl3.zig"), .sdl2_opengl3 => @import("backend_sdl2_opengl3.zig"),
.glfw_wgpu => @import("backend_glfw_wgpu.zig"),
.win32_dx12 => .{}, // TODO: .win32_dx12 => .{}, // TODO:
.no_backend => .{}, .no_backend => .{},
}; };