-
Notifications
You must be signed in to change notification settings - Fork 440
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Additional glyphs #2946
Open
SeiferTim
wants to merge
2
commits into
HaxeFlixel:dev
Choose a base branch
from
SeiferTim:additionalGlyphs
base: dev
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Additional glyphs #2946
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -79,6 +79,17 @@ class FlxBitmapFont extends FlxFramesCollection | |
*/ | ||
var frame:FlxFrame; | ||
|
||
/** | ||
* Lookup tables for additional glyphs characters. | ||
*/ | ||
public var lookupTable:Map<String, String> = []; | ||
public var revLookupTable:Map<String, String> = []; | ||
|
||
/** | ||
* Special characters start index. | ||
*/ | ||
public var specialStart:Int = 500; | ||
|
||
/** | ||
* Creates a new bitmap font using specified bitmap data and letter input. | ||
*/ | ||
|
@@ -635,4 +646,51 @@ class FlxBitmapFont extends FlxFramesCollection | |
font.updateSourceHeight(); | ||
return font; | ||
} | ||
|
||
/* | ||
* Adds additional glyphs to this font. | ||
* | ||
* @param Frames Additional glyphs frames. | ||
* @param StartingCharacter Starting character code for additional glyphs. | ||
*/ | ||
public function appendGlyphs(Frames:FlxFramesCollection, StartingCharacter:Int = 500):Void | ||
{ | ||
specialStart = StartingCharacter; | ||
|
||
var offY:Int = parent.height; | ||
|
||
var tmpBmp:BitmapData = new BitmapData(Math.ceil(Math.max(parent.width, Frames.parent.width)), parent.height + Frames.parent.height, true, 0x00000000); | ||
tmpBmp.copyPixels(parent.bitmap, parent.bitmap.rect, point); | ||
tmpBmp.copyPixels(Frames.parent.bitmap, Frames.parent.bitmap.rect, new Point(0, parent.height)); | ||
|
||
parent = FlxGraphic.fromBitmapData(tmpBmp, parent.key + "+" + Frames.parent.key, true); | ||
Comment on lines
+662
to
+666
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. this is a big part of it, with multiatlases we can simply take frames from one atlas and add them to another without needing to create a new bitmap containing every frame Also line 666 breals flash CI, by skipping the |
||
parent.persist = true; | ||
parent.destroyOnNoUse = false; | ||
|
||
var offset:FlxPoint; | ||
|
||
var currentCode:Int = StartingCharacter; | ||
var charName:String; | ||
|
||
for (frame in Frames.frames) | ||
{ | ||
frame.frame.y += offY; | ||
offset = FlxPoint.get(0, Math.min(4, (lineHeight / 2) - (frame.frame.height / 2))); | ||
var w:Float = frame.sourceSize.x; | ||
var h:Float = frame.sourceSize.y; | ||
w += (offset.x > 0) ? offset.x : 0; | ||
h += (offset.y > 0) ? offset.y : 0; | ||
frame.sourceSize.set(w, h); | ||
frame.offset.addPoint(offset); | ||
charName = new UnicodeBuffer().addChar(currentCode).toString(); | ||
lookupTable.set(frame.name, charName); | ||
revLookupTable.set(charName, frame.name); | ||
frame.name = charName; | ||
pushFrame(frame); | ||
charMap.set(currentCode, frame); | ||
charAdvance.set(currentCode, Math.ceil(frame.sourceSize.x)); | ||
currentCode++; | ||
} | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I also think this can be implemented without needing a special start, secondly, an ability to parse tokens in text strings to denote special characters seems helpful on it's own wether that maps to some large unicode index, or not