freetype: fix import structure

This commit is contained in:
alichraghi 2022-07-18 15:48:46 +04:30 committed by Stephen Gutekanst
parent 4e624c5381
commit dc832997e4
5 changed files with 80 additions and 80 deletions

View file

@ -1,7 +1,7 @@
const c = @import("c"); const c = @import("c");
const intToError = @import("error.zig").intToError; const intToError = @import("error.zig").intToError;
const Error = @import("error.zig").Error; const Error = @import("error.zig").Error;
const Glyph = @import("Glyph.zig"); const Glyph = @import("glyph.zig").Glyph;
const Library = @import("freetype.zig").Library; const Library = @import("freetype.zig").Library;
const Face = @import("freetype.zig").Face; const Face = @import("freetype.zig").Face;
const RenderMode = @import("freetype.zig").RenderMode; const RenderMode = @import("freetype.zig").RenderMode;

View file

@ -2,7 +2,7 @@ const std = @import("std");
const c = @import("c"); const c = @import("c");
const intToError = @import("error.zig").intToError; const intToError = @import("error.zig").intToError;
const Error = @import("error.zig").Error; const Error = @import("error.zig").Error;
const Stroker = @import("Stroker.zig"); const Stroker = @import("stroke.zig").Stroker;
const Face = @import("freetype.zig").Face; const Face = @import("freetype.zig").Face;
const OpenArgs = @import("freetype.zig").OpenArgs; const OpenArgs = @import("freetype.zig").OpenArgs;
const LcdFilter = @import("lcdfilter.zig").LcdFilter; const LcdFilter = @import("lcdfilter.zig").LcdFilter;

View file

@ -2,7 +2,7 @@ const std = @import("std");
const c = @import("c"); const c = @import("c");
const intToError = @import("error.zig").intToError; const intToError = @import("error.zig").intToError;
const Error = @import("error.zig").Error; const Error = @import("error.zig").Error;
const Stroker = @import("Stroker.zig"); const Stroker = @import("stroke.zig").Stroker;
const Library = @import("freetype.zig").Library; const Library = @import("freetype.zig").Library;
const RenderMode = @import("freetype.zig").RenderMode; const RenderMode = @import("freetype.zig").RenderMode;
const SizeMetrics = @import("freetype.zig").SizeMetrics; const SizeMetrics = @import("freetype.zig").SizeMetrics;
@ -13,8 +13,6 @@ const GlyphFormat = @import("image.zig").GlyphFormat;
const Vector = @import("image.zig").Vector; const Vector = @import("image.zig").Vector;
const Bitmap = @import("image.zig").Bitmap; const Bitmap = @import("image.zig").Bitmap;
const Glyph = @This();
pub const BBoxMode = enum(u2) { pub const BBoxMode = enum(u2) {
// https://freetype.org/freetype2/docs/reference/ft2-glyph_management.html#ft_glyph_bbox_mode // https://freetype.org/freetype2/docs/reference/ft2-glyph_management.html#ft_glyph_bbox_mode
// both `unscaled` and `subpixel` are set to 0 // both `unscaled` and `subpixel` are set to 0
@ -24,6 +22,7 @@ pub const BBoxMode = enum(u2) {
pixels = c.FT_GLYPH_BBOX_PIXELS, pixels = c.FT_GLYPH_BBOX_PIXELS,
}; };
pub const Glyph = struct {
handle: c.FT_Glyph, handle: c.FT_Glyph,
pub fn deinit(self: Glyph) void { pub fn deinit(self: Glyph) void {
@ -94,6 +93,7 @@ pub fn advanceX(self: Glyph) isize {
pub fn advanceY(self: Glyph) isize { pub fn advanceY(self: Glyph) isize {
return self.handle.*.advance.y; return self.handle.*.advance.y;
} }
};
const SvgGlyph = struct { const SvgGlyph = struct {
handle: c.FT_SvgGlyph, handle: c.FT_SvgGlyph,

View file

@ -1,22 +1,22 @@
pub usingnamespace @import("freetype.zig");
pub usingnamespace @import("types.zig");
pub usingnamespace @import("image.zig");
pub usingnamespace @import("color.zig"); pub usingnamespace @import("color.zig");
pub usingnamespace @import("freetype.zig");
pub usingnamespace @import("glyph.zig");
pub usingnamespace @import("image.zig");
pub usingnamespace @import("lcdfilter.zig"); pub usingnamespace @import("lcdfilter.zig");
pub usingnamespace @import("stroke.zig");
pub usingnamespace @import("types.zig");
pub const c = @import("c"); pub const c = @import("c");
pub const Glyph = @import("Glyph.zig");
pub const Stroker = @import("Stroker.zig");
pub const Error = @import("error.zig").Error; pub const Error = @import("error.zig").Error;
const std = @import("std"); const std = @import("std");
test { test {
std.testing.refAllDeclsRecursive(@import("freetype.zig"));
std.testing.refAllDeclsRecursive(@import("types.zig"));
std.testing.refAllDeclsRecursive(@import("image.zig"));
std.testing.refAllDeclsRecursive(@import("color.zig")); std.testing.refAllDeclsRecursive(@import("color.zig"));
std.testing.refAllDeclsRecursive(@import("lcdfilter.zig"));
std.testing.refAllDeclsRecursive(@import("error.zig")); std.testing.refAllDeclsRecursive(@import("error.zig"));
std.testing.refAllDeclsRecursive(Glyph); std.testing.refAllDeclsRecursive(@import("freetype.zig"));
std.testing.refAllDeclsRecursive(Stroker); std.testing.refAllDeclsRecursive(@import("glyph.zig"));
std.testing.refAllDeclsRecursive(@import("image.zig"));
std.testing.refAllDeclsRecursive(@import("lcdfilter.zig"));
std.testing.refAllDeclsRecursive(@import("stroke.zig"));
std.testing.refAllDeclsRecursive(@import("types.zig"));
} }

View file

@ -1,7 +1,5 @@
const c = @import("c"); const c = @import("c");
const Stroker = @This();
pub const LineCap = enum(u2) { pub const LineCap = enum(u2) {
butt = c.FT_STROKER_LINECAP_BUTT, butt = c.FT_STROKER_LINECAP_BUTT,
round = c.FT_STROKER_LINECAP_ROUND, round = c.FT_STROKER_LINECAP_ROUND,
@ -15,6 +13,7 @@ pub const LineJoin = enum(u2) {
miter_fixed = c.FT_STROKER_LINEJOIN_MITER_FIXED, miter_fixed = c.FT_STROKER_LINEJOIN_MITER_FIXED,
}; };
pub const Stroker = struct {
handle: c.FT_Stroker, handle: c.FT_Stroker,
pub fn set(self: Stroker, radius: i32, line_cap: LineCap, line_join: LineJoin, miter_limit: i32) void { pub fn set(self: Stroker, radius: i32, line_cap: LineCap, line_join: LineJoin, miter_limit: i32) void {
@ -24,3 +23,4 @@ pub fn set(self: Stroker, radius: i32, line_cap: LineCap, line_join: LineJoin, m
pub fn deinit(self: Stroker) void { pub fn deinit(self: Stroker) void {
c.FT_Stroker_Done(self.handle); c.FT_Stroker_Done(self.handle);
} }
};