Commit 05eb0d1ecbe4b438f8323d3261102c58341f60cf - zig-imgui

update for zig 0.7.0 s-ol 2 years ago

5 changed file(s) with 92 addition(s) and 90 deletion(s). Raw diff Collapse all Expand all

-4

build.zig less more

1	1	const builtin = @import("builtin");
2	2
3	3	pub fn build(b: *Builder) void {
	4	const target = b.standardTargetOptions(.{});
4	5	const mode = b.standardReleaseOptions();
5	6	const windows = b.option(bool, "windows", "create windows build") orelse false;
6	7
7	8	var exe = b.addExecutable("test", "src/main.zig");
8	9	exe.setBuildMode(mode);
9
10		if (windows) {
11		exe.setTarget(builtin.Arch.x86_64, builtin.Os.windows, builtin.Abi.gnu);
12		}
13	10
14	11	exe.linkSystemLibrary("c");
15	12	exe.linkSystemLibrary("glfw");

-0

src/c.zig less more

2	2	@cDefine("CIMGUI_DEFINE_ENUMS_AND_STRUCTS", "1");
3	3	@cInclude("cimgui.h");
4	4	@cInclude("GLFW/glfw3.h");
	5	@cInclude("lo/lo.h");
5	6	});

+30

-30

src/gl3_impl.zig less more

25	25
26	26	pub fn Init() void {
27	27	const io = c.igGetIO();
28		io.*.BackendRendererName = c"imgui_impl_gl3.zig";
	28	io.*.BackendRendererName = "imgui_impl_gl3.zig";
29	29	if (OpenGLHasDrawWithBaseVertex)
30	30	io.*.BackendFlags \|= @enumToInt(c.ImGuiBackendFlags_RendererHasVtxOffset);
31	31	// @TODO: Viewports

73	73
74	74	// @TODO: GLSL versions?
75	75	const vertex_shader_glsl: [*]const c.GLchar =
76		c\\#version 150
77		c\\uniform mat4 ProjMtx;
78		c\\in vec2 Position;
79		c\\in vec2 UV;
80		c\\in vec4 Color;
81		c\\out vec2 Frag_UV;
82		c\\out vec4 Frag_Color;
83		c\\void main()
84		c\\{
85		c\\ Frag_UV = UV;
86		c\\ Frag_Color = Color;
87		c\\ gl_Position = ProjMtx * vec4(Position.xy, 0, 1);
88		c\\}
	76	\\#version 150
	77	\\uniform mat4 ProjMtx;
	78	\\in vec2 Position;
	79	\\in vec2 UV;
	80	\\in vec4 Color;
	81	\\out vec2 Frag_UV;
	82	\\out vec4 Frag_Color;
	83	\\void main()
	84	\\{
	85	\\ Frag_UV = UV;
	86	\\ Frag_Color = Color;
	87	\\ gl_Position = ProjMtx * vec4(Position.xy, 0, 1);
	88	\\}
89	89	;
90	90
91	91	const fragment_shader_glsl: [*]const c.GLchar =
92		c\\#version 150
93		c\\uniform sampler2D Texture;
94		c\\in vec2 Frag_UV;
95		c\\in vec4 Frag_Color;
96		c\\out vec4 Out_Color;
97		c\\void main()
98		c\\{
99		c\\ Out_Color = Frag_Color * texture(Texture, Frag_UV.st);
100		c\\}
	92	\\#version 150
	93	\\uniform sampler2D Texture;
	94	\\in vec2 Frag_UV;
	95	\\in vec4 Frag_Color;
	96	\\out vec4 Out_Color;
	97	\\void main()
	98	\\{
	99	\\ Out_Color = Frag_Color * texture(Texture, Frag_UV.st);
	100	\\}
101	101	;
102	102
103	103	// Create shaders / programs

117	117	c.glLinkProgram(g_ShaderHandle);
118	118	try CheckThing(.Program, g_ShaderHandle, "shader program");
119	119
120		g_AttribLocationTex = c.glGetUniformLocation(g_ShaderHandle, c"Texture");
121		g_AttribLocationProjMtx = c.glGetUniformLocation(g_ShaderHandle, c"ProjMtx");
122		g_AttribLocationVtxPos = c.glGetAttribLocation(g_ShaderHandle, c"Position");
123		g_AttribLocationVtxUV = c.glGetAttribLocation(g_ShaderHandle, c"UV");
124		g_AttribLocationVtxColor = c.glGetAttribLocation(g_ShaderHandle, c"Color");
	120	g_AttribLocationTex = c.glGetUniformLocation(g_ShaderHandle, "Texture");
	121	g_AttribLocationProjMtx = c.glGetUniformLocation(g_ShaderHandle, "ProjMtx");
	122	g_AttribLocationVtxPos = c.glGetAttribLocation(g_ShaderHandle, "Position");
	123	g_AttribLocationVtxUV = c.glGetAttribLocation(g_ShaderHandle, "UV");
	124	g_AttribLocationVtxColor = c.glGetAttribLocation(g_ShaderHandle, "Color");
125	125
126	126	// Create buffers
127	127	c.glGenBuffers(1, &g_VboHandle);

154	154	var buf: [1024]u8 = undefined;
155	155	var length: c.GLsizei = undefined;
156	156	getInfoLogFunc(handle, buf.len, &length, &buf[0]);
157		debug.warn("{}\n", buf[0..@intCast(usize, length)]);
	157	debug.warn("{}\n", .{buf[0..@intCast(usize, length)]});
158	158	}
159	159
160	160	if (@intCast(c.GLboolean, status) == c.GL_FALSE) {
161		debug.warn("ERROR: CreateDeviceObjects: failed to compile/link {}! (with GLSL '{}')\n", desc, g_GlslVersionString);
	161	debug.warn("ERROR: CreateDeviceObjects: failed to compile/link {}! (with GLSL '{}')\n", .{ desc, g_GlslVersionString });
162	162	return error.ShaderLinkError;
163	163	}
164	164	}

+48

-48

src/glfw_impl.zig less more

14	14	var g_ClientApi: ClientApi = .Unknown;
15	15	var g_Time: f64 = 0.0;
16	16	var g_MouseJustPressed = [_]bool{false} ** 5;
17		var g_MouseCursors = [_]?c.GLFWcursor{null} * @enumToInt(c.ImGuiMouseCursor_COUNT);
	17	var g_MouseCursors = [_]?c.GLFWcursor{null} * c.ImGuiMouseCursor_COUNT;
18	18	var g_WantUpdateMonitors = true;
19	19
20	20	// Chain GLFW callbacks for main viewport:

30	30
31	31	// Setup back-end capabilities flags
32	32	const io = c.igGetIO();
33		io.*.BackendFlags \|= @enumToInt(c.ImGuiBackendFlags_HasMouseCursors); // We can honor GetMouseCursor() values (optional)
34		io.*.BackendFlags \|= @enumToInt(c.ImGuiBackendFlags_HasSetMousePos); // We can honor io.WantSetMousePos requests (optional, rarely used)
35		if (false) io.*.BackendFlags \|= @enumToInt(c.ImGuiBackendFlags_PlatformHasViewports); // We can create multi-viewports on the Platform side (optional)
	33	io.*.BackendFlags \|= c.ImGuiBackendFlags_HasMouseCursors; // We can honor GetMouseCursor() values (optional)
	34	io.*.BackendFlags \|= c.ImGuiBackendFlags_HasSetMousePos; // We can honor io.WantSetMousePos requests (optional, rarely used)
	35	if (false) io.*.BackendFlags \|= c.ImGuiBackendFlags_PlatformHasViewports; // We can create multi-viewports on the Platform side (optional)
36	36	if (false and @hasField(c, "GLFW_HAS_GLFW_HOVERED") and builtin.os == builtin.Os.windows) {
37		io.*.BackendFlags \|= @enumToInt(ImGuiBackendFlags_HasMouseHoveredViewport); // We can set io.MouseHoveredViewport correctly (optional, not easy)
38		}
39		io.*.BackendPlatformName = c"imgui_impl_glfw.zig";
	37	io.*.BackendFlags \|= ImGuiBackendFlags_HasMouseHoveredViewport; // We can set io.MouseHoveredViewport correctly (optional, not easy)
	38	}
	39	io.*.BackendPlatformName = "imgui_impl_glfw.zig";
40	40
41	41	// Keyboard mapping. ImGui will use those indices to peek into the io.KeysDown[] array.
42		io.*.KeyMap[@enumToInt(c.ImGuiKey_Tab)] = c.GLFW_KEY_TAB;
43		io.*.KeyMap[@enumToInt(c.ImGuiKey_LeftArrow)] = c.GLFW_KEY_LEFT;
44		io.*.KeyMap[@enumToInt(c.ImGuiKey_RightArrow)] = c.GLFW_KEY_RIGHT;
45		io.*.KeyMap[@enumToInt(c.ImGuiKey_UpArrow)] = c.GLFW_KEY_UP;
46		io.*.KeyMap[@enumToInt(c.ImGuiKey_DownArrow)] = c.GLFW_KEY_DOWN;
47		io.*.KeyMap[@enumToInt(c.ImGuiKey_PageUp)] = c.GLFW_KEY_PAGE_UP;
48		io.*.KeyMap[@enumToInt(c.ImGuiKey_PageDown)] = c.GLFW_KEY_PAGE_DOWN;
49		io.*.KeyMap[@enumToInt(c.ImGuiKey_Home)] = c.GLFW_KEY_HOME;
50		io.*.KeyMap[@enumToInt(c.ImGuiKey_End)] = c.GLFW_KEY_END;
51		io.*.KeyMap[@enumToInt(c.ImGuiKey_Insert)] = c.GLFW_KEY_INSERT;
52		io.*.KeyMap[@enumToInt(c.ImGuiKey_Delete)] = c.GLFW_KEY_DELETE;
53		io.*.KeyMap[@enumToInt(c.ImGuiKey_Backspace)] = c.GLFW_KEY_BACKSPACE;
54		io.*.KeyMap[@enumToInt(c.ImGuiKey_Space)] = c.GLFW_KEY_SPACE;
55		io.*.KeyMap[@enumToInt(c.ImGuiKey_Enter)] = c.GLFW_KEY_ENTER;
56		io.*.KeyMap[@enumToInt(c.ImGuiKey_Escape)] = c.GLFW_KEY_ESCAPE;
57		io.*.KeyMap[@enumToInt(c.ImGuiKey_KeyPadEnter)] = c.GLFW_KEY_KP_ENTER;
58		io.*.KeyMap[@enumToInt(c.ImGuiKey_A)] = c.GLFW_KEY_A;
59		io.*.KeyMap[@enumToInt(c.ImGuiKey_C)] = c.GLFW_KEY_C;
60		io.*.KeyMap[@enumToInt(c.ImGuiKey_V)] = c.GLFW_KEY_V;
61		io.*.KeyMap[@enumToInt(c.ImGuiKey_X)] = c.GLFW_KEY_X;
62		io.*.KeyMap[@enumToInt(c.ImGuiKey_Y)] = c.GLFW_KEY_Y;
63		io.*.KeyMap[@enumToInt(c.ImGuiKey_Z)] = c.GLFW_KEY_Z;
	42	io.*.KeyMap[c.ImGuiKey_Tab] = c.GLFW_KEY_TAB;
	43	io.*.KeyMap[c.ImGuiKey_LeftArrow] = c.GLFW_KEY_LEFT;
	44	io.*.KeyMap[c.ImGuiKey_RightArrow] = c.GLFW_KEY_RIGHT;
	45	io.*.KeyMap[c.ImGuiKey_UpArrow] = c.GLFW_KEY_UP;
	46	io.*.KeyMap[c.ImGuiKey_DownArrow] = c.GLFW_KEY_DOWN;
	47	io.*.KeyMap[c.ImGuiKey_PageUp] = c.GLFW_KEY_PAGE_UP;
	48	io.*.KeyMap[c.ImGuiKey_PageDown] = c.GLFW_KEY_PAGE_DOWN;
	49	io.*.KeyMap[c.ImGuiKey_Home] = c.GLFW_KEY_HOME;
	50	io.*.KeyMap[c.ImGuiKey_End] = c.GLFW_KEY_END;
	51	io.*.KeyMap[c.ImGuiKey_Insert] = c.GLFW_KEY_INSERT;
	52	io.*.KeyMap[c.ImGuiKey_Delete] = c.GLFW_KEY_DELETE;
	53	io.*.KeyMap[c.ImGuiKey_Backspace] = c.GLFW_KEY_BACKSPACE;
	54	io.*.KeyMap[c.ImGuiKey_Space] = c.GLFW_KEY_SPACE;
	55	io.*.KeyMap[c.ImGuiKey_Enter] = c.GLFW_KEY_ENTER;
	56	io.*.KeyMap[c.ImGuiKey_Escape] = c.GLFW_KEY_ESCAPE;
	57	io.*.KeyMap[c.ImGuiKey_KeyPadEnter] = c.GLFW_KEY_KP_ENTER;
	58	io.*.KeyMap[c.ImGuiKey_A] = c.GLFW_KEY_A;
	59	io.*.KeyMap[c.ImGuiKey_C] = c.GLFW_KEY_C;
	60	io.*.KeyMap[c.ImGuiKey_V] = c.GLFW_KEY_V;
	61	io.*.KeyMap[c.ImGuiKey_X] = c.GLFW_KEY_X;
	62	io.*.KeyMap[c.ImGuiKey_Y] = c.GLFW_KEY_Y;
	63	io.*.KeyMap[c.ImGuiKey_Z] = c.GLFW_KEY_Z;
64	64
65	65	// @TODO: Clipboard
66	66	// io.SetClipboardTextFn = ImGui_ImplGlfw_SetClipboardText;
67	67	// io.GetClipboardTextFn = ImGui_ImplGlfw_GetClipboardText;
68	68	io.*.ClipboardUserData = g_Window;
69	69
70		g_MouseCursors[@enumToInt(c.ImGuiMouseCursor_Arrow)] = c.glfwCreateStandardCursor(c.GLFW_ARROW_CURSOR);
71		g_MouseCursors[@enumToInt(c.ImGuiMouseCursor_TextInput)] = c.glfwCreateStandardCursor(c.GLFW_IBEAM_CURSOR);
72		g_MouseCursors[@enumToInt(c.ImGuiMouseCursor_ResizeAll)] = c.glfwCreateStandardCursor(c.GLFW_ARROW_CURSOR); // FIXME: GLFW doesn't have this.
73		g_MouseCursors[@enumToInt(c.ImGuiMouseCursor_ResizeNS)] = c.glfwCreateStandardCursor(c.GLFW_VRESIZE_CURSOR);
74		g_MouseCursors[@enumToInt(c.ImGuiMouseCursor_ResizeEW)] = c.glfwCreateStandardCursor(c.GLFW_HRESIZE_CURSOR);
75		g_MouseCursors[@enumToInt(c.ImGuiMouseCursor_ResizeNESW)] = c.glfwCreateStandardCursor(c.GLFW_ARROW_CURSOR); // FIXME: GLFW doesn't have this.
76		g_MouseCursors[@enumToInt(c.ImGuiMouseCursor_ResizeNWSE)] = c.glfwCreateStandardCursor(c.GLFW_ARROW_CURSOR); // FIXME: GLFW doesn't have this.
77		g_MouseCursors[@enumToInt(c.ImGuiMouseCursor_Hand)] = c.glfwCreateStandardCursor(c.GLFW_HAND_CURSOR);
	70	g_MouseCursors[c.ImGuiMouseCursor_Arrow] = c.glfwCreateStandardCursor(c.GLFW_ARROW_CURSOR);
	71	g_MouseCursors[c.ImGuiMouseCursor_TextInput] = c.glfwCreateStandardCursor(c.GLFW_IBEAM_CURSOR);
	72	g_MouseCursors[c.ImGuiMouseCursor_ResizeAll] = c.glfwCreateStandardCursor(c.GLFW_ARROW_CURSOR); // FIXME: GLFW doesn't have this.
	73	g_MouseCursors[c.ImGuiMouseCursor_ResizeNS] = c.glfwCreateStandardCursor(c.GLFW_VRESIZE_CURSOR);
	74	g_MouseCursors[c.ImGuiMouseCursor_ResizeEW] = c.glfwCreateStandardCursor(c.GLFW_HRESIZE_CURSOR);
	75	g_MouseCursors[c.ImGuiMouseCursor_ResizeNESW] = c.glfwCreateStandardCursor(c.GLFW_ARROW_CURSOR); // FIXME: GLFW doesn't have this.
	76	g_MouseCursors[c.ImGuiMouseCursor_ResizeNWSE] = c.glfwCreateStandardCursor(c.GLFW_ARROW_CURSOR); // FIXME: GLFW doesn't have this.
	77	g_MouseCursors[c.ImGuiMouseCursor_Hand] = c.glfwCreateStandardCursor(c.GLFW_HAND_CURSOR);
78	78
79	79	// Chain GLFW callbacks: our callbacks will call the user's previously installed callbacks, if any.
80	80	g_PrevUserCallbackMousebutton = null;

91	91	// Our mouse update function expect PlatformHandle to be filled for the main viewport
92	92	const main_viewport = c.igGetMainViewport();
93	93	main_viewport.*.PlatformHandle = g_Window;
94		if (builtin.os == builtin.Os.windows)
95		main_viewport.*.PlatformHandleRaw = c.glfwGetWin32Window(g_Window);
	94	// if (builtin.os == builtin.Os.windows)
	95	// main_viewport.*.PlatformHandleRaw = c.glfwGetWin32Window(g_Window);
96	96
97	97	// @TODO: Platform Interface (Viewport)
98		if (io.*.ConfigFlags & @enumToInt(c.ImGuiConfigFlags_ViewportsEnable) != 0)
	98	if (io.*.ConfigFlags & c.ImGuiConfigFlags_ViewportsEnable != 0)
99	99	unreachable;
100	100	// ImGui_ImplGlfw_InitPlatformInterface();
101	101

206	206	var mouse_x: f64 = undefined;
207	207	var mouse_y: f64 = undefined;
208	208	c.glfwGetCursorPos(window, &mouse_x, &mouse_y);
209		if (io.*.ConfigFlags & @enumToInt(c.ImGuiConfigFlags_ViewportsEnable) != 0) {
	209	if (io.*.ConfigFlags & c.ImGuiConfigFlags_ViewportsEnable != 0) {
210	210	// Multi-viewport mode: mouse position in OS absolute coordinates (io.MousePos is (0,0) when the mouse is on the upper-left of the primary monitor)
211	211	var window_x: c_int = undefined;
212	212	var window_y: c_int = undefined;

229	229
230	230	fn UpdateMouseCursor() void {
231	231	const io = c.igGetIO();
232		if (io.*.ConfigFlags & @enumToInt(c.ImGuiConfigFlags_NoMouseCursorChange) != 0 or c.glfwGetInputMode(g_Window, c.GLFW_CURSOR) == c.GLFW_CURSOR_DISABLED)
	232	if (io.*.ConfigFlags & c.ImGuiConfigFlags_NoMouseCursorChange != 0 or c.glfwGetInputMode(g_Window, c.GLFW_CURSOR) == c.GLFW_CURSOR_DISABLED)
233	233	return;
234	234
235	235	const imgui_cursor = c.igGetMouseCursor();

237	237	var n: usize = 0;
238	238	while (n < @intCast(usize, platform_io.*.Viewports.Size)) : (n += 1) {
239	239	const window = @ptrCast(c.GLFWwindow, platform_io..Viewports.Data[n].*.PlatformHandle);
240		if (imgui_cursor == @enumToInt(c.ImGuiMouseCursor_None) or io.*.MouseDrawCursor) {
	240	if (imgui_cursor == c.ImGuiMouseCursor_None or io.*.MouseDrawCursor) {
241	241	// Hide OS mouse cursor if imgui is drawing it or if it wants no cursor
242	242	c.glfwSetInputMode(window, c.GLFW_CURSOR, c.GLFW_CURSOR_HIDDEN);
243	243	} else {
244	244	// Show OS mouse cursor
245	245	// FIXME-PLATFORM: Unfocused windows seems to fail changing the mouse cursor with GLFW 3.2, but 3.3 works here.
246		c.glfwSetCursor(window, if (g_MouseCursors[@intCast(usize, imgui_cursor)]) \|cursor\| cursor else g_MouseCursors[@enumToInt(c.ImGuiMouseCursor_Arrow)]);
	246	c.glfwSetCursor(window, if (g_MouseCursors[@intCast(usize, imgui_cursor)]) \|cursor\| cursor else g_MouseCursors[c.ImGuiMouseCursor_Arrow]);
247	247	c.glfwSetInputMode(window, c.GLFW_CURSOR, c.GLFW_CURSOR_NORMAL);
248	248	}
249	249	}

254	254	}
255	255
256	256	// GLFW Callbacks
257		extern fn Callback_MouseButton(window: ?*c.GLFWwindow, button: c_int, action: c_int, mods: c_int) void {
	257	fn Callback_MouseButton(window: ?*c.GLFWwindow, button: c_int, action: c_int, mods: c_int) callconv(.C) void {
258	258	if (g_PrevUserCallbackMousebutton) \|prev\| {
259	259	prev(window, button, action, mods);
260	260	}

267	267	g_MouseJustPressed[button_u] = true;
268	268	}
269	269
270		extern fn Callback_Scroll(window: ?*c.GLFWwindow, dx: f64, dy: f64) void {
	270	fn Callback_Scroll(window: ?*c.GLFWwindow, dx: f64, dy: f64) callconv(.C) void {
271	271	if (g_PrevUserCallbackScroll) \|prev\| {
272	272	prev(window, dx, dy);
273	273	}

277	277	io.*.MouseWheel += @floatCast(f32, dy);
278	278	}
279	279
280		extern fn Callback_Key(window: ?*c.GLFWwindow, key: c_int, scancode: c_int, action: c_int, modifiers: c_int) void {
	280	fn Callback_Key(window: ?*c.GLFWwindow, key: c_int, scancode: c_int, action: c_int, modifiers: c_int) callconv(.C) void {
281	281	if (g_PrevUserCallbackKey) \|prev\| {
282	282	prev(window, key, scancode, action, modifiers);
283	283	}

300	300	io..KeySuper = io..KeysDown[c.GLFW_KEY_LEFT_SUPER] or io.*.KeysDown[c.GLFW_KEY_RIGHT_SUPER];
301	301	}
302	302
303		extern fn Callback_Char(window: ?*c.GLFWwindow, char: c_uint) void {
	303	fn Callback_Char(window: ?*c.GLFWwindow, char: c_uint) callconv(.C) void {
304	304	if (g_PrevUserCallbackChar) \|prev\| {
305	305	prev(window, char);
306	306	}

+12

-8

src/main.zig less more

5	5	const glfw_impl = @import("glfw_impl.zig");
6	6	const gl3_impl = @import("gl3_impl.zig");
7	7
8		extern fn errorCallback(err: c_int, description: [*c]const u8) void {
9		panic("Error: {}\n", description);
	8	fn errorCallback(err: c_int, description: [*c]const u8) callconv(.C) void {
	9	panic("Error: {}\n", .{ description });
10	10	}
11	11
12	12	var window: *c.GLFWwindow = undefined;
	13
	14	fn handleStuff(path: [*c]const u8, x: i32, y: i32) callconv(.C) bool {
	15	return true;
	16	}
13	17
14	18	pub fn main() !void {
15	19	_ = c.glfwSetErrorCallback(errorCallback);
16	20
17	21	if (c.glfwInit() == c.GL_FALSE) {
18		panic("GLFW init failure\n");
	22	panic("GLFW init failure\n", .{});
19	23	}
20	24	defer c.glfwTerminate();
21	25

30	34
31	35	const window_width = 640;
32	36	const window_height = 480;
33		window = c.glfwCreateWindow(window_width, window_height, c"ImGUI Test", null, null) orelse {
34		panic("unable to create window\n");
	37	window = c.glfwCreateWindow(window_width, window_height, "ImGUI Test", null, null) orelse {
	38	panic("unable to create window\n", .{});
35	39	};
36	40	defer c.glfwDestroyWindow(window);
37	41

42	46	defer c.igDestroyContext(context);
43	47
44	48	const io = c.igGetIO();
45		io.*.ConfigFlags \|= @enumToInt(c.ImGuiConfigFlags_NavEnableKeyboard);
46		// io.*.ConfigFlags \|= @enumToInt(c.ImGuiConfigFlags_DockingEnable);
47		// io.*.ConfigFlags \|= @enumToInt(c.ImGuiConfigFlags_ViewportsEnable);
	49	io.*.ConfigFlags \|= c.ImGuiConfigFlags_NavEnableKeyboard;
	50	io.*.ConfigFlags \|= c.ImGuiConfigFlags_DockingEnable;
	51	// io.*.ConfigFlags \|= c.ImGuiConfigFlags_ViewportsEnable;
48	52
49	53	const style = c.igGetStyle();
50	54	c.igStyleColorsDark(style);