From 633ac6cc977daffba030b84459fba77c67b901f5 Mon Sep 17 00:00:00 2001 From: realtradam Date: Sat, 14 May 2022 01:44:34 -0400 Subject: small cleanup --- build.zig | 2 ++ shadersample.png | Bin 0 -> 18073 bytes src/main.zig | 23 ++++++++++++++++++----- 3 files changed, 20 insertions(+), 5 deletions(-) create mode 100644 shadersample.png diff --git a/build.zig b/build.zig index f8394ee..ffbdc68 100644 --- a/build.zig +++ b/build.zig @@ -11,6 +11,8 @@ pub fn build(b: *std.build.Builder) void { // between Debug, ReleaseSafe, ReleaseFast, and ReleaseSmall. const mode = b.standardReleaseOptions(); + // wasm32-freestanding-musl + const exe = b.addExecutable("testraylib", "src/main.zig"); exe.linkSystemLibrary("c"); exe.linkSystemLibrary("raylib"); diff --git a/shadersample.png b/shadersample.png new file mode 100644 index 0000000..7c8ef0b Binary files /dev/null and b/shadersample.png differ diff --git a/src/main.zig b/src/main.zig index 4c4dca5..638a639 100644 --- a/src/main.zig +++ b/src/main.zig @@ -24,7 +24,7 @@ var shader_stretcher: Shader = undefined; var shader_colour_splitter: Shader = undefined; var shader_pixalizer: Shader = undefined; -var slider: f32 = 0; +var slider: f32 = -105; const slider_max: f32 = 0; const slider_min: f32 = -250; @@ -209,7 +209,7 @@ pub fn main() !void { return; }; - slider = ray.GuiSlider(ray.Rectangle{ .x = 70, .y = 32 * scale + 24 + 10, .width = (64 * scale) - 128, .height = 30 }, "Curve Amount", @ptrCast([*c]const u8, slider_str), slider, slider_min, slider_max); + slider = ray.GuiSlider(ray.Rectangle{ .x = 70, .y = 32 * scale + 24 + 10, .width = (64 * scale) - 128, .height = 30 }, "Curve", @ptrCast([*c]const u8, slider_str), slider, slider_min, slider_max); if (delay == execute_delay) { chip8.emulate_cycles(1); @@ -273,7 +273,6 @@ fn update_screen(screen: *ray.RenderTexture, pixels: [2048]bool) void { ray.EndTextureMode(); ray.BeginTextureMode(temp_canvas); - ray.BeginShaderMode(shader_pixalizer.shader); ray.DrawTexturePro( screen.texture, ray.Rectangle{ .x = 0, .y = 0, .width = @intToFloat(f32, screen.texture.width), .height = @intToFloat(f32, screen.texture.height) }, @@ -282,6 +281,18 @@ fn update_screen(screen: *ray.RenderTexture, pixels: [2048]bool) void { 0, ray.WHITE, ); + ray.EndTextureMode(); + + ray.BeginTextureMode(temp_canvas); + ray.BeginShaderMode(shader_pixalizer.shader); + ray.DrawTexturePro( + temp_canvas.texture, + ray.Rectangle{ .x = 0, .y = 0, .width = @intToFloat(f32, temp_canvas.texture.width), .height = @intToFloat(f32, temp_canvas.texture.height) }, + ray.Rectangle{ .x = 0, .y = 0, .width = 64 * scale, .height = 32 * scale }, + ray.Vector2{ .x = 0, .y = 0 }, + 0, + ray.WHITE, + ); ray.EndShaderMode(); ray.EndTextureMode(); @@ -290,7 +301,7 @@ fn update_screen(screen: *ray.RenderTexture, pixels: [2048]bool) void { ray.DrawTexturePro( temp_canvas.texture, ray.Rectangle{ .x = 0, .y = 0, .width = @intToFloat(f32, temp_canvas.texture.width), .height = @intToFloat(f32, temp_canvas.texture.height) }, - ray.Rectangle{ .x = 0, .y = 24, .width = 64 * scale, .height = 32 * scale }, + ray.Rectangle{ .x = 0, .y = 0, .width = 64 * scale, .height = 32 * scale }, ray.Vector2{ .x = 0, .y = 0 }, 0, ray.WHITE, @@ -298,14 +309,16 @@ fn update_screen(screen: *ray.RenderTexture, pixels: [2048]bool) void { ray.EndShaderMode(); ray.EndTextureMode(); + //ray.BeginTextureMode(temp_canvas); ray.BeginShaderMode(shader_stretcher.shader); ray.DrawTexturePro( temp_canvas.texture, - ray.Rectangle{ .x = 0, .y = 0, .width = @intToFloat(f32, temp_canvas.texture.width), .height = @intToFloat(f32, temp_canvas.texture.height) }, + ray.Rectangle{ .x = 0, .y = 0, .width = @intToFloat(f32, temp_canvas.texture.width), .height = -@intToFloat(f32, temp_canvas.texture.height) }, ray.Rectangle{ .x = 0, .y = 24, .width = 64 * scale, .height = 32 * scale }, ray.Vector2{ .x = 0, .y = 0 }, 0, ray.WHITE, ); ray.EndShaderMode(); + //ray.EndTextureMode(); } -- cgit v1.2.3