Mirrors/phaser
2
0
Fork 0
mirror of https://github.com/photonstorm/phaser synced 2024-12-24 20:13:35 +00:00
Code Issues Projects Releases Packages Wiki Activity
17145 commits 10 branches 177 tags 1 GiB
Commit graph

182 commits

Author SHA1 Message Date
Richard Davey
66a25e2117 Setting lineSpacing in the Text Game Object style config would set the value but not apply it to the Text, leaving you to call updateText yourself. If set, it's now applied on instantiation. Fix #4901 2019-12-18 14:55:12 +00:00
Hua
3c4cf8834e Don't add white space at last word of a line 2019-11-27 13:09:07 +08:00
Richard Davey
f4002471d7 Updated context lost / restored handlers 2019-07-17 16:38:00 +01:00
Richard Davey
0d8a9bb7ae Fixed TextSyle typo. Fix #4630 2019-07-02 12:32:29 +01:00
Richard Davey
f5cae5a48b Added in Text justification feature. Fix #4291 2019-06-19 09:46:32 +01:00
Richard Davey
2cdb672d36 Added new Text Padding typedef 2019-06-05 23:40:27 +01:00
Richard Davey
2446e2f3fc Setting padding in a Text style configuration object would cause an error about calling split on undefined. Padding can now be applied both in the config and via setPadding 2019-06-05 23:40:10 +01:00
Richard Davey
558f6aea55 JSDoc fixes 2019-06-04 16:01:37 +01:00
Richard Davey
278bde236b lint fix 2019-05-30 23:05:06 +01:00
Richard Davey
ec6bbdeebd Added typedefs for the Text Game Object. Fix #4551 2019-05-30 23:01:53 +01:00
Rex
9a958631fc Don't draw text only when width or height is 0 
It can fix this issue:
Text is empty string '', but have fixedWidth and fixedHeight, with backgroundColor setting.
 2019-05-26 20:58:40 +08:00
Hua
cc7870906b Fix coding style 2019-05-23 17:30:04 +08:00
Hua
d1b31649ec Fix text align to right/center issue 
Calculate text-width in fixedWidth mode
 2019-05-23 17:22:51 +08:00
Hua
97b60efa21 Set canvas size equal to text object size 
Canvas size might less than text object size, when `fixedWidth` and `fixedHeight` is set.
 2019-05-23 16:54:32 +08:00
Richard Davey
c91ed91ce3 License link update 2019-05-10 16:15:04 +01:00
Richard Davey
7deaa9e2b2
Merge pull request #4517 from antoine-pous/patch-1 
JSDoc fix returned object type
 2019-05-10 14:19:36 +01:00
Richard Davey
a6341a97a8 Fixed Types references 2019-05-09 15:32:53 +01:00
Antoine Pous
ce1577bcc3
JSDoc fix returned object type 2019-05-09 15:20:37 +02:00
Richard Davey
b09ddc9048 GameObject Types 2019-05-09 12:01:00 +01:00
Richard Davey
1a3263ad5e Text Types 2019-05-09 11:59:10 +01:00
Richard Davey
9672602c2f
Merge pull request #4504 from rexrainbow/master 
Constraints canvas size via object size
 2019-05-04 12:21:06 +01:00
Rex
72df134571 Constrains canvas sizer via game object size 2019-05-01 11:48:08 +08:00
Rex
2a51bb8c3b Remove redundant code 2019-05-01 10:10:05 +08:00
Rex
816eb6d677 Remove redundant code 2019-05-01 10:09:20 +08:00
Rex
b2a32a8e8f Constraints canvas size if using fixedWidth, fixedHeight style 2019-05-01 10:06:04 +08:00
Richard Davey
53c14df798 Changing any aspect of a Text object, such as the font size or content, wouldn't update its hitArea if it had been enabled for input, causing it to carry on using the old hit area size. Now, as long as the Text was created _without_ a custom hitArea, the hitArea size will be changed to match the new texture size on update. If you have provided your own custom hitArea shape, you need to modify it when the Text changes size yourself. Fix #4456 2019-04-24 11:21:36 +01:00
Hua
a05cd9377a Update rectangle hitarea when updated text 2019-04-18 11:04:27 +08:00
Richard Davey
d13e79a8db
Merge pull request #4427 from rexrainbow/master 
Fix bug about counting height of text object
 2019-04-05 17:25:27 +01:00
Richard Davey
e017691c68 The ScaleMode Component has been removed from every Game Object, and along with it the scaleMode property and setScaleMode method. These did nothing anyway as they were not hooked to the render pipeline and scale mode should be set on the texture, not the Game Object. Fix #4413 2019-03-24 23:07:27 +00:00
Hua
b562917490 Fix fixedWidth, fixedHeight assignment issue 2019-03-15 17:11:04 +08:00
Hua
3c75872335 Fix word wrap issue 2019-03-15 17:06:39 +08:00
Hua
a1d4417a7a Fix bug about counting height of text object 
Drawing lines might not equal to amount of lines
 2019-03-15 14:31:05 +08:00
Richard Davey
8180764cca Added jsdoc override for origin 2019-02-25 17:07:09 +00:00
Richard Davey
c9bdb83941 GameObject and Loader typedefs 2019-02-13 13:57:59 +00:00
Richard Davey
e7b1d086e7 Moving all of the typedefs to properly namespaced scopes, rather than globals 
\o/ ~ "Someone, save me!"
 2019-02-13 12:35:12 +00:00
Richard Davey
eb9ed3463f Lots of namespace and jsdoc fixes 2019-02-01 18:02:58 +00:00
Richard Davey
348306cafb Lots more jsdoc fixes and new documentation 2019-01-31 14:47:50 +00:00
Richard Davey
ea9678cc85 Removed TextStyle auto-quotes and added docs instead. 2019-01-22 14:02:25 +00:00
Richard Davey
aa341854c7 Happy New Year 2019-01-15 16:20:22 +00:00
Richard Davey
79dc611b95 Quote the font family in Text objects. 2019-01-12 16:31:48 +00:00
Taran van Groenigen
e181a98aa2
Fixed a mistake that would cause fontFamily to hold all font data when using the font shorthand & fixes photonstorm/phaser#4141 
I noticed this while investigating photonstorm/phaser#4141
 2018-11-22 09:40:10 +01:00
Richard Davey
c14fb4b764 Updated formatting. 2018-10-19 13:35:30 +01:00
Richard Davey
38743135eb
Merge pull request #4101 from DotTheGreat/TextStyle_setStyle-fix 
Text style setStyle/setFont fix
 2018-10-19 13:31:15 +01:00
Richard Davey
d41a01ac39 Updated docs 2018-10-18 13:27:56 +01:00
Richard Davey
9dc53d1e5a The WebGLRenderer method canvasToTexture has a new optional argument noRepeat which will stop it from using gl.REPEAT entirely. This is now used by the Text object to avoid it potentially switching between a REPEAT and CLAMP texture, causing texture black-outs 2018-10-12 15:08:53 +01:00
Richard Davey
4b1c762296 Updated @memberOf to @memberof 2018-10-10 10:49:13 +01:00
Taran van Groenigen
c841adcba4
Removed whitespaces from empty lines 2018-10-09 11:50:21 +02:00
Taran van Groenigen
af664dc699
Removed two tabs 2018-10-09 11:32:52 +02:00
Taran van Groenigen
4e2bd36ca5
A string now uses the same default values as an object passed into setFont 2018-10-09 11:28:02 +02:00
Taran van Groenigen
9a2a0ad45f
TextStyle.setStyle & TextStyle.setFont now set fontSize, fontStyle & fontFamily when font is a string 
TextStyle.setFont now sets fontFamily, fontSize, and fontStyle when "font" is a string. 
TextStyle.setStyle calls TextStyle.setFont when "font" is overridden.
This fixes an issue where TextStyle.update(true) overrides TextStyle._font
 2018-10-09 11:13:23 +02:00
Richard Davey
8b5d0a3af1 Text.setFont, Text.setFontFamily, Text.setFontStyle and Text.setStroke will no longer re-measure the parent Text object if their values have not changed. 2018-09-29 11:21:31 +01:00
Richard Davey
fcaa2bfc4f Completing Game Object jsdocs 2018-09-15 10:31:10 +01:00
Richard Davey
7722207dbd Remove texture deletion. 2018-09-13 13:23:24 +01:00
Richard Davey
f285cf4854 Trim the font style 2018-09-13 13:23:11 +01:00
Richard Davey
0a152949cb Added setLineSpacing method and docs. 2018-09-12 16:29:38 +01:00
Richard Davey
dedc939fdd initPipeline now defaults to the Texture Tint Pipeline if nothing else is specified. 2018-09-05 11:19:02 +01:00
Richard Davey
5b98386677 Calling Text.setStyle would make the Text vanish if you didn't provide a resolution property in the style configuration object. Calling setStyle now only changes the properties given in the object, leaving any previously changed properties as-is. Fix #4011 2018-09-04 22:43:25 +01:00
Richard Davey
27c3cc30ac Previously, changing a Text object by setting its text property directly wouldn't change the text being rendered as using setText was the expected way to change what was being displayed. Internally the text property has been renamed to _text and flagged as private, and a new getter / setter for text has been added, which hands over to the setText method, meaning you can now use both ways of setting the text. Fix #3919 2018-08-20 17:41:05 +01:00
Richard Davey
e91d95e107 Text updated to use proper texture frame and now supports crop 2018-08-03 19:07:12 +01:00
Richard Davey
ca68904953 The Canvas Renderer has a new batchSprite method that consolidates the process of drawing a texture-based Game Object to the canvas. It processes the alpha, blend mode and matrix calculations in a single function and now is used by nearly all Game Object canvas renderers. 2018-08-03 18:53:50 +01:00
Richard Davey
fc0dc13930 Removed use of currentBlendMode and currentAlpha 2018-08-03 01:53:51 +01:00
Richard Davey
9f44896a3f The Blend Mode is now set directly in all Canvas Renderers without comparing it to what's stored in the Canvas Renderer. This fixes problems where the blend mode would be lost between two different Game Objects because they restored the context, but didn't update the renderer flag. Game Objects in Canvas can now mix and match blend modes across the display list. 2018-08-03 01:29:18 +01:00
Richard Davey
106e32a4f5 Removed un-used imports 2018-07-19 13:26:11 +01:00
Richard Davey
ec5bd1912e GameObject.willRender now takes a Camera as its only argument and uses it within the check. This has allowed me to remove 23 duplicate checks spread across the various Game Objects, all of which did the same thing, saving both KB and CPU time as the flags were being checked twice in most cases. 2018-07-19 13:19:02 +01:00
Richard Davey
14ba51d928 Added Text.setResolution methods. 2018-07-18 14:45:10 +01:00
Richard Davey
94540e112e Text supports high dpi resolution for its internal canvas 2018-07-17 22:44:12 +01:00
Richard Davey
c8b058c26a Renamed object to avoid TS defs conflict 2018-07-16 10:28:28 +01:00
Richard Davey
5fdf51ce59 Using direct pipeline calls 2018-07-02 13:32:56 +01:00
Richard Davey
7a23378015 Unified use of roundPixels, antialias and pixelArt modes 2018-06-27 15:15:00 +01:00
Richard Davey
90ba2608fa Added in Camera alpha support to all canvas renderers 2018-06-25 16:24:08 +01:00
Richard Davey
5a0fe89a7e Swap _id to id 2018-06-23 12:26:39 +01:00
Chris Andrew
9f23818c40 Documented various missing descriptions for GameObject classes and functions. 2018-06-20 07:28:02 +01:00
Chris Andrew
47fdf779d3 Switched to example annotations for the setStyle() examples. 2018-06-14 14:49:29 +01:00
Chris Andrew
885b404b98 Fixed the indentation of setStyle() examples. 2018-06-14 14:41:17 +01:00
Chris Andrew
a6b8b8ed31 Documented the Text game object and its TextStyle companion. 
Minor update to JSON representation descriptions.
 2018-06-14 14:27:58 +01:00
Richard Davey
0893c158d1 Added jsdocs 2018-05-22 15:55:02 +01:00
Richard Davey
0d0846a415 Calling a creator, such as GraphicsCreator, without passing in a config object, would cause an error to be thrown. All Game Object creators now catch against this. 2018-05-16 15:17:08 +01:00
Richard Davey
28251fd0f5 addToScene added to all Game Object Creators 2018-05-02 10:57:26 +01:00
Richard Davey
3323b785b2 space-infix fix 2018-04-30 13:03:44 +01:00
Rex
0a46d64328 Remove extra space in each line end 
Add space only when the word index is greater than last one.
 2018-04-28 14:54:59 +08:00
Richard Davey
e3c28d3cd9 Removed un-needed arguments 2018-04-23 17:28:37 +01:00
Richard Davey
606ba6d8d7 Added new Mask component and added to all relevant Game Objects 2018-04-20 18:57:49 +01:00
Richard Davey
6299019838 Updated to use typeof DefinePlugin check. 2018-04-20 00:23:24 +01:00
Richard Davey
b0544c73b8 jsdoc fixes 2018-04-18 13:29:22 +01:00
Richard Davey
55965c748f jsdoc fixes 2018-04-18 12:13:49 +01:00
Richard Davey
28e2764723 More jsdoc fixes 2018-04-16 16:02:27 +01:00
Felipe Alfonso
c232642a52 Parent matrix is applied to canvas context on each draw function 2018-04-04 14:05:59 -03:00
Felipe Alfonso
96b8db4685 Added parentMatrix to all canvas rendering functions 2018-04-04 13:14:55 -03:00
Felipe Alfonso
e0f678d1ff Merge branch 'master' into containers 2018-03-28 20:49:00 -03:00
Richard Davey
747f09af86 jsdoc fixes 2018-03-28 15:04:09 +01:00
Felipe Alfonso
d544701495 parentMatrix added to individual game object render function 2018-03-27 14:49:09 -03:00
Richard Davey
db613c793a Merge branch 'master' of https://github.com/photonstorm/phaser 2018-03-21 03:17:00 +00:00
Richard Davey
d329724ae5 Added the ComputedSize component to the Text Game Object, which allows Text.getBounds, and related methods, to work again instead of returning NaN. 2018-03-20 19:00:48 +00:00
orblazer
87633fdfad Fix multiple types on GameObjects 2018-03-20 15:56:31 +01:00
orblazer
4cff464555 Fix nullable types 2018-03-20 15:36:03 +01:00
Richard Davey
3591edcb73
Merge pull request #3417 from rexrainbow/master 
Bug fix: font might not sync to context
 2018-03-20 00:34:51 +00:00
orblazer
b4a30b8e43 Add callbacks on GameObjects 2018-03-19 22:27:16 +01:00
Richard Davey
620bcc6ae5 jsdoc fixes and additions 2018-03-19 13:45:00 +00:00
orblazer
87d6cdaff8 Update JSDoc on GameObjects 2018-03-19 13:50:32 +01:00
orblazer
90def456f2 Update JSDoc on GameObjects 2018-03-19 12:54:31 +01:00