summaryrefslogtreecommitdiffhomepage
path: root/src
diff options
context:
space:
mode:
authorrealtradam <[email protected]>2022-05-14 01:44:34 -0400
committerrealtradam <[email protected]>2022-05-14 01:44:34 -0400
commit633ac6cc977daffba030b84459fba77c67b901f5 (patch)
tree1d672014ddf3a91e08005beb3dfa549ee391a4da /src
parent9945000d6da4cfac1c98ec140ad004c7cf1449e6 (diff)
downloadzig-chip-8-633ac6cc977daffba030b84459fba77c67b901f5.tar.gz
zig-chip-8-633ac6cc977daffba030b84459fba77c67b901f5.zip
small cleanup
Diffstat (limited to 'src')
-rw-r--r--src/main.zig23
1 files changed, 18 insertions, 5 deletions
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();
}