|
@@ -1792,6 +1792,8 @@ var BABYLON;
|
|
|
// More info here: https://videlais.com/2014/03/16/the-many-and-varied-problems-with-measuring-font-height-for-html5-canvas/
|
|
|
FontTexture.prototype.getFontHeight = function (font) {
|
|
|
var fontDraw = document.createElement("canvas");
|
|
|
+ fontDraw.width = 600;
|
|
|
+ fontDraw.height = 600;
|
|
|
var ctx = fontDraw.getContext('2d');
|
|
|
ctx.fillRect(0, 0, fontDraw.width, fontDraw.height);
|
|
|
ctx.textBaseline = 'top';
|
|
@@ -3001,7 +3003,7 @@ var BABYLON;
|
|
|
* This layout must be used as a Singleton through the CanvasLayoutEngine.Singleton property.
|
|
|
*/
|
|
|
function CanvasLayoutEngine() {
|
|
|
- return _super.apply(this, arguments) || this;
|
|
|
+ return _super !== null && _super.apply(this, arguments) || this;
|
|
|
}
|
|
|
// A very simple (no) layout computing...
|
|
|
// The Canvas and its direct children gets the Canvas' size as Layout Area
|
|
@@ -5810,7 +5812,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 = {};
|
|
@@ -9567,7 +9569,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
|
|
@@ -9740,7 +9742,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 = {};
|
|
|
}
|
|
@@ -10682,7 +10684,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;
|
|
@@ -10908,7 +10910,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 = {};
|
|
|
}
|
|
@@ -11304,7 +11306,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 = {};
|
|
@@ -11831,7 +11833,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 = {};
|
|
@@ -12031,7 +12033,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;
|
|
@@ -12151,7 +12153,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 = {};
|
|
|
}
|
|
@@ -12802,7 +12804,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;
|
|
@@ -12997,7 +12999,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 = {};
|
|
|
}
|
|
@@ -13781,7 +13783,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 = {};
|
|
|
}
|
|
@@ -15927,6 +15929,9 @@ var BABYLON;
|
|
|
wsn.scaling = scale;
|
|
|
}
|
|
|
}
|
|
|
+ else {
|
|
|
+ throw new Error("Can't Track another Scene Node Type than AbstractMesh right now, call me lazy!");
|
|
|
+ }
|
|
|
}
|
|
|
};
|
|
|
/**
|
|
@@ -16356,7 +16361,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;
|
|
@@ -16443,6 +16448,44 @@ var BABYLON;
|
|
|
this._worldSpaceNode = null;
|
|
|
}
|
|
|
};
|
|
|
+ Object.defineProperty(WorldSpaceCanvas2D.prototype, "trackNode", {
|
|
|
+ get: function () {
|
|
|
+ return this._trackNode;
|
|
|
+ },
|
|
|
+ set: function (value) {
|
|
|
+ if (this._trackNode === value) {
|
|
|
+ return;
|
|
|
+ }
|
|
|
+ this._trackNode = value;
|
|
|
+ },
|
|
|
+ enumerable: true,
|
|
|
+ configurable: true
|
|
|
+ });
|
|
|
+ Object.defineProperty(WorldSpaceCanvas2D.prototype, "trackNodeOffset", {
|
|
|
+ get: function () {
|
|
|
+ return this._trackNodeOffset;
|
|
|
+ },
|
|
|
+ set: function (value) {
|
|
|
+ if (!this._trackNodeOffset) {
|
|
|
+ this._trackNodeOffset = value.clone();
|
|
|
+ }
|
|
|
+ else {
|
|
|
+ this._trackNodeOffset.copyFrom(value);
|
|
|
+ }
|
|
|
+ },
|
|
|
+ enumerable: true,
|
|
|
+ configurable: true
|
|
|
+ });
|
|
|
+ Object.defineProperty(WorldSpaceCanvas2D.prototype, "trackNodeBillboard", {
|
|
|
+ get: function () {
|
|
|
+ return this._trackNodeBillboard;
|
|
|
+ },
|
|
|
+ set: function (value) {
|
|
|
+ this._trackNodeBillboard = value;
|
|
|
+ },
|
|
|
+ enumerable: true,
|
|
|
+ configurable: true
|
|
|
+ });
|
|
|
return WorldSpaceCanvas2D;
|
|
|
}(Canvas2D));
|
|
|
WorldSpaceCanvas2D = __decorate([
|
|
@@ -16484,7 +16527,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;
|
|
@@ -17468,7 +17511,7 @@ var BABYLON;
|
|
|
var StackPanel = StackPanel_1 = (function (_super) {
|
|
|
__extends(StackPanel, _super);
|
|
|
function StackPanel(settings) {
|
|
|
- var _this;
|
|
|
+ var _this = this;
|
|
|
if (!settings) {
|
|
|
settings = {};
|
|
|
}
|
|
@@ -17531,7 +17574,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 };
|
|
@@ -17660,7 +17703,7 @@ var BABYLON;
|
|
|
var ContentControl = ContentControl_1 = (function (_super) {
|
|
|
__extends(ContentControl, _super);
|
|
|
function ContentControl(settings) {
|
|
|
- var _this;
|
|
|
+ var _this = this;
|
|
|
if (!settings) {
|
|
|
settings = {};
|
|
|
}
|
|
@@ -17815,7 +17858,7 @@ var BABYLON;
|
|
|
var Window = Window_1 = (function (_super) {
|
|
|
__extends(Window, _super);
|
|
|
function Window(scene, settings) {
|
|
|
- var _this;
|
|
|
+ var _this = this;
|
|
|
if (!settings) {
|
|
|
settings = {};
|
|
|
}
|
|
@@ -18000,7 +18043,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" });
|
|
@@ -18031,7 +18074,7 @@ var BABYLON;
|
|
|
var Label = Label_1 = (function (_super) {
|
|
|
__extends(Label, _super);
|
|
|
function Label(settings) {
|
|
|
- var _this;
|
|
|
+ var _this = this;
|
|
|
if (!settings) {
|
|
|
settings = {};
|
|
|
}
|
|
@@ -18078,7 +18121,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 });
|
|
@@ -18111,7 +18154,7 @@ var BABYLON;
|
|
|
var Button = Button_1 = (function (_super) {
|
|
|
__extends(Button, _super);
|
|
|
function Button(settings) {
|
|
|
- var _this;
|
|
|
+ var _this = this;
|
|
|
if (!settings) {
|
|
|
settings = {};
|
|
|
}
|
|
@@ -18265,7 +18308,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 });
|