From fd0ba8b5838be476715d1ef93c0a0836b9cc7e2c Mon Sep 17 00:00:00 2001 From: Roman Pytkov Date: Sun, 22 Feb 2026 00:42:18 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=B6=D0=B8=D0=B2=D0=BB=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=B5=20=D0=BF=D1=80=D0=BE=D0=B5=D0=BA=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Canvas.zig | 4 +--- src/main.zig | 2 +- src/models/{rasterization_models.zig => basic_models.zig} | 0 src/render/CpuRenderEngine.zig | 6 +++--- src/render/RenderEngine.zig | 4 ++-- 5 files changed, 7 insertions(+), 9 deletions(-) rename src/models/{rasterization_models.zig => basic_models.zig} (100%) diff --git a/src/Canvas.zig b/src/Canvas.zig index 0d19f56..b678b0e 100644 --- a/src/Canvas.zig +++ b/src/Canvas.zig @@ -3,7 +3,7 @@ const builtin = @import("builtin"); const dvui = @import("dvui"); const Document = @import("models/Document.zig"); const RenderEngine = @import("render/RenderEngine.zig").RenderEngine; -const ImageRect = @import("models/rasterization_models.zig").ImageRect; +const ImageRect = @import("models/basic_models.zig").ImageRect; const Size = dvui.Size; const Color = dvui.Color; @@ -18,8 +18,6 @@ scroll: dvui.ScrollInfo = .{ .horizontal = .auto, }, native_scaling: bool = true, -gradient_start: Color.PMA = .{ .r = 0, .g = 0, .b = 0, .a = 255 }, -gradient_end: Color.PMA = .{ .r = 255, .g = 255, .b = 255, .a = 255 }, document: ?*Document = null, render_engine: RenderEngine, _visible_rect: ?ImageRect = null, diff --git a/src/main.zig b/src/main.zig index 80b4188..1826d17 100644 --- a/src/main.zig +++ b/src/main.zig @@ -4,7 +4,7 @@ const dvui = @import("dvui"); const dvui_ext = @import("ui/dvui_ext.zig"); const SDLBackend = @import("sdl-backend"); const Document = @import("models/Document.zig"); -const ImageRect = @import("models/rasterization_models.zig").ImageRect; +const ImageRect = @import("models/basic_models.zig").ImageRect; const WindowContext = @import("WindowContext.zig"); const sdl_c = SDLBackend.c; const Allocator = std.mem.Allocator; diff --git a/src/models/rasterization_models.zig b/src/models/basic_models.zig similarity index 100% rename from src/models/rasterization_models.zig rename to src/models/basic_models.zig diff --git a/src/render/CpuRenderEngine.zig b/src/render/CpuRenderEngine.zig index c9bdbd2..c9c6195 100644 --- a/src/render/CpuRenderEngine.zig +++ b/src/render/CpuRenderEngine.zig @@ -2,9 +2,9 @@ const std = @import("std"); const builtin = @import("builtin"); const dvui = @import("dvui"); const RenderEngine = @import("RenderEngine.zig").RenderEngine; -const rast_models = @import("../models/rasterization_models.zig"); -const ImageSize = rast_models.ImageSize; -const ImageRect = rast_models.ImageRect; +const basic_models = @import("../models/basic_models.zig"); +const ImageSize = basic_models.ImageSize; +const ImageRect = basic_models.ImageRect; const Allocator = std.mem.Allocator; const Color = dvui.Color; diff --git a/src/render/RenderEngine.zig b/src/render/RenderEngine.zig index 49829c1..b5a38fe 100644 --- a/src/render/RenderEngine.zig +++ b/src/render/RenderEngine.zig @@ -1,7 +1,7 @@ // Интерфейс для рендеринга документа const dvui = @import("dvui"); const CpuRenderEngine = @import("CpuRenderEngine.zig"); -const rast_models = @import("../models/rasterization_models.zig"); +const basic_models = @import("../models/basic_models.zig"); pub const RenderEngine = union(enum) { cpu: *CpuRenderEngine, @@ -12,7 +12,7 @@ pub const RenderEngine = union(enum) { } } - pub fn example(self: RenderEngine, canvas_size: rast_models.ImageSize, visible_rect: rast_models.ImageRect) !?dvui.Texture { + pub fn example(self: RenderEngine, canvas_size: basic_models.ImageSize, visible_rect: basic_models.ImageRect) !?dvui.Texture { return switch (self) { .cpu => |cpu_r| cpu_r.example(canvas_size, visible_rect), };