Skip to content

updated using TileSet instead of TileSheet #26

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.

Sign up for GitHub

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

Open
wants to merge 4 commits into
base: v2
Choose a base branch
from
Open

updated using TileSet instead of TileSheet #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2e49aba
updated using TileSet instead of TileSheet
MatseFR Mar 6, 2018
5b48cff
text coloring works with TileMap
MatseFR Mar 8, 2018
d60e768
Fixed tile.colorTransform = null
vwr0527 May 13, 2018
276f623
Merge pull request #1 from vwr0527/patch-1
MatseFR May 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 7 additions & 6 deletions Haxe/lib/bitmapFont/BitmapFont.hx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ package bitmapFont;

import haxe.Utf8;
import haxe.xml.Fast;
import openfl.display.Tilesheet;
import openfl.display.Tileset;
import openfl.display.BitmapData;
import openfl.display.Graphics;
import openfl.geom.ColorTransform;
Expand All @@ -11,7 +11,7 @@ import openfl.geom.Point;
import openfl.geom.Rectangle;

#if RENDER_TILE
import openfl.display.Tilesheet;
import openfl.display.Tileset;
#end

/**
Expand Down Expand Up @@ -172,7 +172,7 @@ class BitmapFont
public var glyphs:Map<Int, BitmapGlyphFrame>;

#if RENDER_TILE
public var tilesheet:Tilesheet;
public var tilesheet:Tileset;
#end

/**
Expand All @@ -183,7 +183,7 @@ class BitmapFont
this.bitmap = bitmap;
this.fontName = name;
#if RENDER_TILE
tilesheet = new Tilesheet(bitmap);
tilesheet = new Tileset(bitmap);
#end
glyphs = new Map<Int, BitmapGlyphFrame>();
BitmapFont.store(name, this);
Expand Down Expand Up @@ -536,7 +536,8 @@ class BitmapFont
glyphFrame.rect = frame;

#if RENDER_TILE
glyphFrame.tileID = tilesheet.addTileRect(frame, new Point(0, 0));
//glyphFrame.tileID = tilesheet.addTileRect(frame, new Point(0, 0));
glyphFrame.tileID = tilesheet.addRect(frame);
#end

glyphs.set(charCode, glyphFrame);
Expand Down Expand Up @@ -645,7 +646,7 @@ class BitmapGlyphCollection

public var glyphs:Array<BitmapGlyph>;

public var color:UInt;
public var color:Int;

public var scale:Float;

Expand Down
Loading