f91a58c8ff
fix Label auto-culling bug.
2015-07-30 13:59:50 +08:00
964e7103b5
Improve coding style
2015-07-30 11:33:18 +08:00
a9f27865d3
Fixed the content size of Label is incorrect with GLOW effect.
2015-07-29 16:30:07 +08:00
37a174ee4a
Label:refine the implementation about text layout and support debug draw
2015-07-24 18:38:45 +08:00
63326c2826
Label:Fixed opacity setting is invalid with bitmap font.
2015-07-20 11:10:17 +08:00
731de26795
Label:Fixed system font may be invisible when there are multiple cameras.
2015-07-17 17:45:11 +08:00
d5d5af5ac3
change ‘auto’ to ‘auto&&’
2015-07-16 14:08:59 +08:00
1c9a181c35
Label:Fixed the color of letter will be overridden by fade action.
2015-07-15 20:17:05 +08:00
b701fd9e73
Fixed compile error
2015-07-14 13:47:35 +08:00
964713355b
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-label-createfail
2015-07-14 13:43:43 +08:00
d4f62a8063
Label:improving the code readability.
2015-07-14 11:30:56 +08:00
ef5d4ddf86
Merge remote-tracking branch 'upstream/v3' into v3
...
# Conflicts:
# tests/cpp-tests/proj.win8.1-universal/cpp-tests.Shared/cpp-tests.Shared.vcxitems.filters
2015-07-14 11:24:38 +08:00
fc673ee502
Merge branch 'v3.7-release' into v3
2015-07-13 22:44:54 +08:00
80dff7f1c4
Rollback pr12299
2015-07-13 11:32:25 +08:00
81bc0b09da
Label:Fixed create fail if the font(TTF) not contain a Unicode charmap.
2015-07-10 14:39:21 +08:00
6a33702c80
Refine Label::onDraw
2015-07-08 17:59:24 +08:00
8cf27b9174
Update comments.
2015-07-08 15:30:34 +08:00
581f1ab42b
Add test case
2015-07-07 15:41:54 +08:00
158d96046e
Label:Support add child nodes.
2015-07-07 14:20:23 +08:00
c11e91e215
Label:Fixed the characters are displayed incorrect with "dark roast.ttf"
2015-07-03 18:08:32 +08:00
5328996a18
Fix event listener cleanup in destructor
...
Event listeners should always be removed at destroy (move out of
if-block)
2015-06-30 18:59:33 -07:00
7cea464a11
Ensure CCLabel atlases are purged before resetting
...
The current purge->reset behavior occurs per label according to scene
graph priority. This has two disadvanages; firstly, any labels that are
initialized but not part of the scene graph will not be reset.
Secondly, any labels which share atlases in the FontAtlasCache may not
be reset since each label will call releaseFontAtlas individually before
resetting its fontConfig. This means that any shared atlases may not be
released all the way to a reference count of 0 and the invalid atlas
will not be deleted and reset from scratch.
By putting a fixed priority on both the purge and reset steps we can
ensure that firstly: all labels will be reset regardless of whether they
have been added to the scene-graph. Secondly, ALL labels with the same
atlas must call releaseFontAtlas before any others are allowed to
rebuild their textures. This will prevent any old atlases from sticking
around after a new GL context is created.
This is a fix for Github issue #8305
https://github.com/cocos2d/cocos2d-x/issues/8305
2015-06-30 13:16:25 -07:00
fbe1bd8253
Label should be invisible when the line height is set to zero.
2015-06-23 09:42:48 +08:00
d32a317ea0
Label:Fixed line wrap error without space.
2015-06-19 13:39:19 +08:00
cbd428f6ac
Label:Fixed wrong letter spacing with outline enabled
2015-06-17 13:57:23 +08:00
5aa31ea83a
Label:the texture of character have not cropped if character cross the axis-aligned bounding-box.
2015-06-11 17:16:44 +08:00
351a898a70
removed CC_PLATFORM_WP8
2015-05-08 09:19:13 -07:00
d09bd21da4
Label: Fixed position is wrong if label content is changed after invoking `getLetter(letterIndex)`
2015-05-07 11:20:22 +08:00
6351863b3c
Merge pull request #11696 from WenhaiLin/v3-label-shadow-glerror
...
Label:Fixed shadow effect cause OpenGL error on IOS.
2015-05-06 09:53:39 +08:00
8f6277c540
Label:Fixed shadow effect cause OpenGL error on IOS.
2015-05-05 18:30:33 +08:00
22c46b5c14
Label:Fixed the character positions could be wrong if `getLetter(letterIndex)` get called.
2015-05-04 10:07:37 +08:00
004cb5464e
Fixed crash
2015-05-03 22:15:58 +08:00
7472bafee3
Label:When you invoking `getLetter(letterIndex)` and `setString(text)` in sequence, and `letterIndex` greater than the length of `text`, it might crash your program.
2015-04-30 15:13:41 +08:00
9c2e39dd49
Label:Fixed the shadow color of system font may be incorrect.
2015-04-17 15:42:41 +08:00
5a438ed9a1
Label:Fixed the shadow effect of system font might not be shown.
2015-04-17 15:26:43 +08:00
0ac99002d5
Label:disableEffect(LabelEffect::XXXX) support disable all effect.
2015-04-17 14:39:52 +08:00
4211b20134
Merge pull request #11414 from likexx/patch-1
...
Update CCLabel.cpp
2015-04-14 10:06:09 +08:00
6f341e3284
Update CCLabel.cpp
...
in rare case, the texture atlas becomes NULL. Added an additional check to make sure it won't crash here.
2015-04-13 20:53:34 +08:00
d24a1243da
Label:Fixed the position of system font is wrong if it is visited by a new camera.
2015-04-13 18:22:05 +08:00
9ef04943a8
Label:Fixed System font can't scale.
2015-04-13 16:28:55 +08:00
927cda3f0d
Add Label::disableEffect(LabelEffect effect) for better support disable the effect of Label.
2015-04-07 15:51:57 +08:00
c5c5d3e39d
Label: Fixed shadow color is incorrect.
2015-04-07 11:17:01 +08:00
44af57459e
add comment
2015-03-18 11:58:36 +08:00
21d581a72c
set camera mask when member created
2015-03-18 11:41:43 +08:00
5b26ba3c68
override setCameraMask
2015-03-16 17:11:17 +08:00
f56d8c4784
fix camra mask for label does not work
2015-03-16 15:31:29 +08:00
cd95905a04
Label:Fixed transform not update correctly if this camera mask of Label isn't visible by the current visiting camera
2015-03-09 17:26:43 +08:00
befbc0a14e
FIX for Build error when CC_USE_CULLING=0 #10373
...
Fix for build error when using CC_USE_CULLING
2015-02-09 18:15:22 -08:00
342c582124
Fixed label may become white/black block after resume from background on android
2015-01-21 21:58:18 +08:00
415bbeba21
Fixed the alpha channel of text color of system font not take effect
2015-01-20 16:04:14 +08:00
f2c6a48976
Fixed lose the precision of label's dimensions
2015-01-20 11:46:43 +08:00
4a440e66c9
Refactor draw command
2015-01-15 14:00:49 -08:00
34582ba268
Merge branch 'v3' into v3_AddOptionsForCulling
...
Conflicts:
cocos/2d/CCLabel.cpp
2015-01-14 12:44:24 +08:00
f3d8798d39
add macro to enable to disable culling
2015-01-14 10:56:51 +08:00
8591609128
Implement 3D drawing support for Sprite, Label, Particle, BatchNode
2015-01-12 20:06:50 -08:00
20beb3b9e0
Merge pull request #9567 from joewan/v3-improve-perf
...
fix serious performance problem of Animate.
2014-12-22 14:57:26 +08:00
bb1267cd09
use auto&.
2014-12-21 14:05:34 +08:00
a15a4a0739
fix compile error.
2014-12-21 02:03:41 +08:00
3765f87651
fix.
2014-12-21 00:49:23 +08:00
4ed5872ba3
Fixed content size of Label is incorrect after sets empty string.
2014-12-15 14:36:57 +08:00
4d2ea40db0
Merge pull request #9265 from shrimpz/fix_label_crashed_on_android
...
Fix label crashed on android #9255
2014-12-02 15:48:10 +08:00
38a6aa30a2
* fixed android crash that a Label instance add to an invisibility parent node.
2014-11-27 10:59:47 +08:00
33a2d0451c
Code conforms with the cocos2d-x c++ guidelines
2014-11-25 17:53:52 -08:00
8a49ae0b07
Merge pull request #8981 from vovkasm/clean-order-of-fields-initialization
...
Cleanup order of fields initialization.
2014-11-05 17:51:58 +08:00
2835b094da
Cleanup order of fields initialization.
...
Make initialization order to match declarations.
This change twice reduces number of warnings when compiling on MacOS X with Xcode 6.1
Warnings was like "Field 'XXXX' will be initialized after field 'YYYY'"
2014-10-30 17:28:41 +03:00
145156d698
disabled distanceFieldEnabled for WP8 as the shader crashes some older windows phones
2014-10-28 20:56:49 -07:00
462e38cbc6
fixed opacity of label
2014-10-09 10:54:35 +08:00
d1faf75b58
[CCLabel] Apply updateContent() for getStringNumLines() when Label is dirty
2014-09-25 01:46:17 +09:00
c149bfca00
Adds MARK: TODO: FIXME: in code
...
Replaces XXX with FIXME:
Xcode 6 beta 4 supports this new format
2014-08-29 12:54:24 -07:00
6a8270f33b
Merge pull request #7900 from minggo/setposition-optimize
...
not create Vec as possible for setting position
2014-08-28 14:31:54 +08:00
9fb977ff99
not create Vec as possible for setting position
2014-08-28 11:41:18 +08:00
3dda35b4ef
Adds `std::nothrow` to `new`
...
Since cocos2d-x doesn't support exceptions, it is important to add
`std::nothrow` to all the `new` statements
2014-08-27 16:31:57 -07:00
d0ca9a4da5
remove unneeded include header files
2014-08-27 13:39:50 +08:00
b9c51e6994
remove unneeded codes
2014-08-26 18:19:28 +08:00
055a143f9d
Label performance problem
2014-08-19 15:02:09 +04:00
032ba062a9
rename isVisibleByVisitingCamera to isVisitableByVisitingCamera
2014-08-14 10:26:37 +08:00
4629d257e1
rename checkCameraMask to isVisibleByVisitingCamera
2014-08-14 09:58:11 +08:00
76329f9e53
add camera mask check to visit
2014-08-13 12:06:51 +08:00
b9cfa4a8b5
fix warn
2014-07-25 14:38:02 +08:00
dbcb20b886
Dispatch EVENT_RENDERER_RECREATED event when renderer was recreated on android/wp8.
...
Make clear EVENT_COME_TO_FOREGROUND event.
2014-07-09 23:03:04 +08:00
136033c282
not set _orderOfArrival to 0 after visit
2014-06-19 15:09:27 +08:00
b2d8e4fc93
add assert.
2014-06-12 14:41:01 +08:00
3511d1e87e
1.Support setting up the line height and additional kerning of label.
...
2.Add more annotation
2014-06-12 12:01:15 +08:00
7cc3879257
Ensuring release cache texture in timely.
2014-06-11 22:03:10 +08:00
b24c674d25
Little fixes for setNormalized
2014-05-30 21:50:39 -07:00
1b8d0d88df
Adds setNormalizedPosition()
...
Changes in `visit()` were done in order to do it
in a robust and fast way.
2014-05-30 16:42:05 -07:00
0f67247325
Squashed commit of the following:
...
commit a794d107ad85667e3d754f0b6251fc864dfbf288
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 14:33:49 2014 -0700
Yeah... everything compiles on win32 and wp8
commit 4740be6e4a0d16f742c27996e7ab2c100adc76af
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:58:38 2014 -0700
CCIME moved to base
and compiles on Android
commit ff3e1bf1eb27a01019f4e1b56d1aebbe2d385f72
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 13:02:57 2014 -0700
compiles Ok for Windows Phone 8
commit 8160a4eb2ecdc61b5bd1cf56b90d2da6f11e3ebd
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 12:25:31 2014 -0700
fixes for Windows Phone 8
commit 418197649efc93032aee0adc205e502101cdb53d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 11:15:13 2014 -0700
Compiles on Win32
commit 08813ed7cf8ac1079ffadeb1ce78ea9e833e1a33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 10:08:31 2014 -0700
Compiles on linux!
commit 118896521e5b335a5257090b6863f1fb2a2002fe
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Fri May 16 09:30:42 2014 -0700
moves cocos/2d/platform -> cocos/platform
commit 4fe9319d7717b0c1bccb2db0156eeb86255a89e0
Merge: bd68ec2 511295e
2014-05-16 14:36:00 -07:00
7e4597508c
Does not crash on Mac if the .ttf file is not found
2014-05-15 17:22:53 -07:00
dc711643cd
Squashed commit of the following:
...
commit a9572b8913f3a38b59adbd7b4017ab9848a6b2b5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed May 14 10:03:44 2014 -0700
math renames
`Vector2` -> `Vec2`
`Vector3` -> `Vec3`
`Vector4` -> `Vec4`
`Matrix` -> `Mat4`
commit 4e107f4bd854c26bfceb52b063d6bd9cea02d6a3
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:24:28 2014 -0700
raw version of rename Vector3
commit 1d115573ebe96a5fc815fa44fbe6417ea7dba841
Author: Huabing.Xu <dabingnn@gmail.com>
Date: Wed May 14 09:07:14 2014 -0700
rename Vector2 after merge
commit ab2ed58c129dbc30a4c0970ed94568c5d271657b
Merge: 1978d2d 86fb75a
2014-05-14 10:07:09 -07:00
059ea3dd8a
label's small improvement.
2014-05-14 16:41:26 +08:00
012f1020ca
GLProgramState fixes
...
It is possible to submit to the Renderer a Sprite with custom uniforms
(although it won't be batched).
It is possible to use a custom shader + uniforms on Sprite with
subclassing Sprite
2014-05-12 19:12:56 -07:00
fc72dc040d
Label:fixed wrong logic of alignment.
2014-05-12 14:34:25 +08:00
3d22c30933
issue #4660 : Warning fix in CCLabel.cpp and ConvertUTF.c
2014-05-11 11:24:01 +08:00
4692c67b78
issue #4660:remove unnecessary API.
2014-05-10 19:33:05 +08:00
5fda13639d
issue #4660 : Uses new utf api for Label.
2014-05-10 19:24:03 +08:00
a8c2fb5431
Fixes deprecated warnings
2014-05-09 21:29:24 -07:00
77c03fcf11
ShaderCache -> GLProgramCache
2014-05-09 18:39:25 -07:00
62d9c24518
moves shaders files from 2d/ to renderer/
2014-05-08 18:01:48 -07:00
51f498fc94
fixed deprecation warnings
2014-05-08 16:42:36 -07:00
580ebf939f
working Ok with new API
2014-05-08 15:43:12 -07:00
fusijie