kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into 8.2.0-Dev

Browse Source
This commit is contained in:
Josh Tynjala
2024-07-08 14:31:23 -07:00
parent 3a61390cb6 84d7f39605
commit 8f3ea8d271
6 changed files with 160 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/lime/text/Font.hx
View File

@@ -189,10 +189,11 @@ class Font
public function getGlyphs(characters:String = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!@#$%^`'\"/\\&*()[]{}<>|:;_-+=?,. "):Array<Glyph>
{
#if (lime_cffi && !macro)
var glyphs:Dynamic = NativeCFFI.lime_font_get_glyph_indices(src, characters);
// lime_font_get_glyph_indices returns Array<Int>
// cast it to Array<Glyph> instead (Glyph is an abstract)
return cast glyphs;
#if hl
return [for (index in NativeCFFI.lime_font_get_glyph_indices(src, characters)) new Glyph(index)];
#else
return NativeCFFI.lime_font_get_glyph_indices(src, characters);
#end
#else
return null;
#end

4
src/lime/tools/HXProject.hx
View File

@@ -189,6 +189,10 @@ class HXProject extends Script
else
{
environment = Sys.environment();
for (conflict in ["air", "android", "cpp", "flash", "hl", "html5", "ios", "linux", "mac", "neko", "webassembly", "windows"])
{
environment.remove(conflict);
}
}
haxedefs = new Map<String, Dynamic>();