Skip to content

Commit

Permalink
Merge pull request #1924 from nockawa/BitmapFontTexture1923
Browse files Browse the repository at this point in the history 
Fixing #1923 + new preview files
  • Loading branch information
@nockawa
nockawa committed Mar 24, 2017
2 parents fd0c59e + 5821600 commit e0e4ba0
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 34 deletions.
2 changes: 2 additions & 0 deletions canvas2D/src/Engine/babylon.text2d.ts
View file
Expand Up @@ -150,6 +150,7 @@
public static fontSuperSampleProperty: Prim2DPropInfo;
public static fontSignedDistanceFieldProperty: Prim2DPropInfo;
public static textureIsPremulAlphaProperty: Prim2DPropInfo;
public static fontTextureProperty: Prim2DPropInfo;

/**
* Alignment is made relative to the left edge of the Content Area. Valid for horizontal alignment only.
Expand Down Expand Up @@ -333,6 +334,7 @@
}
}

@modelLevelProperty(RenderablePrim2D.RENDERABLEPRIM2D_PROPCOUNT + 8, pi => Text2D.fontTextureProperty = pi)
public get fontTexture(): BaseFontTexture {
if (this._fontTexture) {
return this._fontTexture;
Expand Down
1 change: 1 addition & 0 deletions dist/preview release/canvas2D/babylon.canvas2d.d.ts
View file
Expand Up @@ -3862,6 +3862,7 @@ declare module BABYLON {
static fontSuperSampleProperty: Prim2DPropInfo;
static fontSignedDistanceFieldProperty: Prim2DPropInfo;
static textureIsPremulAlphaProperty: Prim2DPropInfo;
static fontTextureProperty: Prim2DPropInfo;
/**
* Alignment is made relative to the left edge of the Content Area. Valid for horizontal alignment only.
*/
Expand Down
53 changes: 28 additions & 25 deletions dist/preview release/canvas2D/babylon.canvas2d.js
View file
Expand Up @@ -3887,14 +3887,14 @@ var BABYLON;
var RowDefinition = (function (_super) {
__extends(RowDefinition, _super);
function RowDefinition() {
return _super.apply(this, arguments) || this;
return _super !== null && _super.apply(this, arguments) || this;
}
return RowDefinition;
}(GridDimensionDefinition));
var ColumnDefinition = (function (_super) {
__extends(ColumnDefinition, _super);
function ColumnDefinition() {
return _super.apply(this, arguments) || this;
return _super !== null && _super.apply(this, arguments) || this;
}
return ColumnDefinition;
}(GridDimensionDefinition));
Expand Down Expand Up @@ -7009,7 +7009,7 @@ var BABYLON;
var Prim2DBase = Prim2DBase_1 = (function (_super) {
__extends(Prim2DBase, _super);
function Prim2DBase(settings) {
var _this;
var _this = this;
// Avoid checking every time if the object exists
if (settings == null) {
settings = {};
Expand Down Expand Up @@ -11305,7 +11305,7 @@ var BABYLON;
var Shape2DInstanceData = (function (_super) {
__extends(Shape2DInstanceData, _super);
function Shape2DInstanceData() {
return _super.apply(this, arguments) || this;
return _super !== null && _super.apply(this, arguments) || this;
}
Object.defineProperty(Shape2DInstanceData.prototype, "fillSolidColor", {
// FILL ATTRIBUTES
Expand Down Expand Up @@ -11480,7 +11480,7 @@ var BABYLON;
* - padding: top, left, right and bottom padding formatted as a single string (see PrimitiveThickness.fromString)
*/
function Group2D(settings) {
var _this;
var _this = this;
if (settings == null) {
settings = {};
}
Expand Down Expand Up @@ -12443,7 +12443,7 @@ var BABYLON;
var WireFrame2DRenderCache = (function (_super) {
__extends(WireFrame2DRenderCache, _super);
function WireFrame2DRenderCache() {
var _this = _super.apply(this, arguments) || this;
var _this = _super !== null && _super.apply(this, arguments) || this;
_this.effectsReady = false;
_this.vb = null;
_this.vtxCount = 0;
Expand Down Expand Up @@ -12669,7 +12669,7 @@ var BABYLON;
* - padding: top, left, right and bottom padding formatted as a single string (see PrimitiveThickness.fromString)
*/
function WireFrame2D(wireFrameGroups, settings) {
var _this;
var _this = this;
if (!settings) {
settings = {};
}
Expand Down Expand Up @@ -13031,7 +13031,7 @@ var BABYLON;
* - padding: top, left, right and bottom padding formatted as a single string (see PrimitiveThickness.fromString)
*/
function Rectangle2D(settings) {
var _this;
var _this = this;
// Avoid checking every time if the object exists
if (settings == null) {
settings = {};
Expand Down Expand Up @@ -13548,7 +13548,7 @@ var BABYLON;
* - padding: top, left, right and bottom padding formatted as a single string (see PrimitiveThickness.fromString)
*/
function Ellipse2D(settings) {
var _this;
var _this = this;
// Avoid checking every time if the object exists
if (settings == null) {
settings = {};
Expand Down Expand Up @@ -13733,7 +13733,7 @@ var BABYLON;
var Sprite2DRenderCache = (function (_super) {
__extends(Sprite2DRenderCache, _super);
function Sprite2DRenderCache() {
var _this = _super.apply(this, arguments) || this;
var _this = _super !== null && _super.apply(this, arguments) || this;
_this.effectsReady = false;
_this.vb = null;
_this.ib = null;
Expand Down Expand Up @@ -13852,7 +13852,7 @@ var BABYLON;
* - padding: top, left, right and bottom padding formatted as a single string (see PrimitiveThickness.fromString)
*/
function Sprite2D(texture, settings) {
var _this;
var _this = this;
if (!settings) {
settings = {};
}
Expand Down Expand Up @@ -14478,7 +14478,7 @@ var BABYLON;
var Text2DRenderCache = (function (_super) {
__extends(Text2DRenderCache, _super);
function Text2DRenderCache() {
var _this = _super.apply(this, arguments) || this;
var _this = _super !== null && _super.apply(this, arguments) || this;
_this.effectsReady = false;
_this.vb = null;
_this.ib = null;
Expand Down Expand Up @@ -14677,7 +14677,7 @@ var BABYLON;
* - wordWrap: if true the text will wrap inside content area
*/
function Text2D(text, settings) {
var _this;
var _this = this;
if (!settings) {
settings = {};
}
Expand Down Expand Up @@ -15312,6 +15312,9 @@ var BABYLON;
__decorate([
BABYLON.instanceLevelProperty(BABYLON.RenderablePrim2D.RENDERABLEPRIM2D_PROPCOUNT + 7, function (pi) { return Text2D_1.textureIsPremulAlphaProperty = pi; })
], Text2D.prototype, "textureIsPremulAlpha", null);
__decorate([
BABYLON.modelLevelProperty(BABYLON.RenderablePrim2D.RENDERABLEPRIM2D_PROPCOUNT + 8, function (pi) { return Text2D_1.fontTextureProperty = pi; })
], Text2D.prototype, "fontTexture", null);
Text2D = Text2D_1 = __decorate([
BABYLON.className("Text2D", "BABYLON")
], Text2D);
Expand Down Expand Up @@ -15538,7 +15541,7 @@ var BABYLON;
* - padding: top, left, right and bottom padding formatted as a single string (see PrimitiveThickness.fromString)
*/
function Lines2D(points, settings) {
var _this;
var _this = this;
if (!settings) {
settings = {};
}
Expand Down Expand Up @@ -18236,7 +18239,7 @@ var BABYLON;
* - padding: top, left, right and bottom padding formatted as a single string (see PrimitiveThickness.fromString)
*/
function WorldSpaceCanvas2D(scene, size, settings) {
var _this;
var _this = this;
BABYLON.Prim2DBase._isCanvasInit = true;
var s = settings;
s.isScreenSpace = false;
Expand Down Expand Up @@ -18398,7 +18401,7 @@ var BABYLON;
* - padding: top, left, right and bottom padding formatted as a single string (see BABYLON.PrimitiveThickness.fromString)
*/
function ScreenSpaceCanvas2D(scene, settings) {
var _this;
var _this = this;
BABYLON.Prim2DBase._isCanvasInit = true;
_this = _super.call(this, scene, settings) || this;
return _this;
Expand Down Expand Up @@ -19382,7 +19385,7 @@ var BABYLON;
var StackPanel = StackPanel_1 = (function (_super) {
__extends(StackPanel, _super);
function StackPanel(settings) {
var _this;
var _this = this;
if (!settings) {
settings = {};
}
Expand Down Expand Up @@ -19445,7 +19448,7 @@ var BABYLON;
var DefaultStackPanelRenderingTemplate = DefaultStackPanelRenderingTemplate_1 = (function (_super) {
__extends(DefaultStackPanelRenderingTemplate, _super);
function DefaultStackPanelRenderingTemplate() {
return _super.apply(this, arguments) || this;
return _super !== null && _super.apply(this, arguments) || this;
}
DefaultStackPanelRenderingTemplate.prototype.createVisualTree = function (owner, visualPlaceholder) {
return { root: visualPlaceholder, contentPlaceholder: visualPlaceholder };
Expand Down Expand Up @@ -19574,7 +19577,7 @@ var BABYLON;
var ContentControl = ContentControl_1 = (function (_super) {
__extends(ContentControl, _super);
function ContentControl(settings) {
var _this;
var _this = this;
if (!settings) {
settings = {};
}
Expand Down Expand Up @@ -19729,7 +19732,7 @@ var BABYLON;
var Window = Window_1 = (function (_super) {
__extends(Window, _super);
function Window(scene, settings) {
var _this;
var _this = this;
if (!settings) {
settings = {};
}
Expand Down Expand Up @@ -19914,7 +19917,7 @@ var BABYLON;
var DefaultWindowRenderingTemplate = DefaultWindowRenderingTemplate_1 = (function (_super) {
__extends(DefaultWindowRenderingTemplate, _super);
function DefaultWindowRenderingTemplate() {
return _super.apply(this, arguments) || this;
return _super !== null && _super.apply(this, arguments) || this;
}
DefaultWindowRenderingTemplate.prototype.createVisualTree = function (owner, visualPlaceholder) {
var r = new BABYLON.Rectangle2D({ parent: visualPlaceholder, fill: "#808080FF" });
Expand Down Expand Up @@ -19945,7 +19948,7 @@ var BABYLON;
var Label = Label_1 = (function (_super) {
__extends(Label, _super);
function Label(settings) {
var _this;
var _this = this;
if (!settings) {
settings = {};
}
Expand Down Expand Up @@ -19992,7 +19995,7 @@ var BABYLON;
var DefaultLabelRenderingTemplate = DefaultLabelRenderingTemplate_1 = (function (_super) {
__extends(DefaultLabelRenderingTemplate, _super);
function DefaultLabelRenderingTemplate() {
return _super.apply(this, arguments) || this;
return _super !== null && _super.apply(this, arguments) || this;
}
DefaultLabelRenderingTemplate.prototype.createVisualTree = function (owner, visualPlaceholder) {
var r = new BABYLON.Text2D("", { parent: visualPlaceholder });
Expand Down Expand Up @@ -20025,7 +20028,7 @@ var BABYLON;
var Button = Button_1 = (function (_super) {
__extends(Button, _super);
function Button(settings) {
var _this;
var _this = this;
if (!settings) {
settings = {};
}
Expand Down Expand Up @@ -20179,7 +20182,7 @@ var BABYLON;
var DefaultButtonRenderingTemplate = DefaultButtonRenderingTemplate_1 = (function (_super) {
__extends(DefaultButtonRenderingTemplate, _super);
function DefaultButtonRenderingTemplate() {
return _super.apply(this, arguments) || this;
return _super !== null && _super.apply(this, arguments) || this;
}
DefaultButtonRenderingTemplate.prototype.createVisualTree = function (owner, visualPlaceholder) {
this._rect = new BABYLON.Rectangle2D({ parent: visualPlaceholder, fill: "#FF8080FF", border: "#FF8080FF", roundRadius: 10, borderThickness: 2 });
Expand Down
18 changes: 9 additions & 9 deletions dist/preview release/canvas2D/babylon.canvas2d.min.js
View file

Large diffs are not rendered by default.

0 comments on commit e0e4ba0

Please sign in to comment.