dendy
/
usg
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

This commit is contained in:
Dendy 2022-07-29 14:41:30 +02:00
parent bdc73aad4b acc3cd890d
commit c9fe252019
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/MainMenu.zig
View File

@ -53,8 +53,8 @@ fn getTab(self: *Self) MenuTab {
} }
pub fn tick(self: *Self) State { pub fn tick(self: *Self) State {
const sel = self.getSel(); //const sel = self.getSel();
const tab = self.getTab(); //const tab = self.getTab();
var key_state = SDL.getKeyboardState(); var key_state = SDL.getKeyboardState();
for (self.action_list) |*action| { for (self.action_list) |*action| {
@ -72,11 +72,11 @@ pub fn tick(self: *Self) State {
action.*.call(self); action.*.call(self);
} }
} }
std.debug.print( //std.debug.print(
\\Tab: {s} //\\Tab: {s}
\\Selection: {s} //\\Selection: {s}
\\ //\\
, .{ tab.name, sel.name }); //, .{ tab.name, sel.name });
return self.state; return self.state;
} }

6
src/main.zig
View File

@ -19,6 +19,8 @@ pub fn main() !void {
try SDL.image.init(.{ .jpg = true }); try SDL.image.init(.{ .jpg = true });
mainLoop: while (true) { mainLoop: while (true) {
const start = SDL.getTicks64();
while (SDL.pollEvent()) |ev| { while (SDL.pollEvent()) |ev| {
switch (ev) { switch (ev) {
.quit => break :mainLoop, .quit => break :mainLoop,
@ -26,17 +28,15 @@ pub fn main() !void {
} }
} }
const start = SDL.getTicks64();
current_state = switch (current_state) { current_state = switch (current_state) {
.main_menu => main_menu.tick(), .main_menu => main_menu.tick(),
.game => game.tick(), .game => game.tick(),
}; };
renderer.render(); renderer.render();
const delay = SDL.getTicks64() - start; const delay = SDL.getTicks64() - start;
std.debug.print("{} ms\n", .{delay}); std.debug.print("{} ms\n", .{delay});
if (delay < 16) { if (delay < 16) {
SDL.delay(16 - @intCast(u32, delay)); SDL.delay(16 - @intCast(u32, delay));