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
7495f22708
closed #4906:Fixed the label continue to appear when its opacity is set to 0.
2014-05-08 10:12:29 +08:00
40fe815ab9
Squashed commit of the following:
...
commit c16dcfaaea0922039aad05bce1f4efed18e04871
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:05:18 2014 -0700
more linux fixes
commit 1553795976c9090a1b46deb53d12910fe0676008
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:04:04 2014 -0700
more linux fixes
commit 1e43a8cabff33cbf25aa5eb5412f53a878222d83
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 19:02:07 2014 -0700
fixes linux isuses
commit 723a445dd6411f91846da2b801248ad8298174f1
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:58:50 2014 -0700
more linux fixes
commit 533c8025e794fc76cef02f396b3a93b3d7f4cfc8
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:57:33 2014 -0700
more linux fixes
commit 4ba1e84959670bcbf044f18d1c0d4b3cb3be4090
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:53:43 2014 -0700
more linux fixes
commit 1f8e011f306a47ed4134224e5e349929201f0539
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:49:28 2014 -0700
more linux fixes
commit 3e2033100822ff6d532a1b4f012337491dc11920
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:47:43 2014 -0700
more linux fixes
commit 2e708863c75fd032f1b2396dfdf1d31f7a62b713
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:46:00 2014 -0700
more linux fixes
commit 861b5b92a6efd4de7b926c20d636ce9d749b293f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:43:15 2014 -0700
more linux fixes
commit 2a43365a0c1755e9b9cada53301be1a20adb31cf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:36:06 2014 -0700
more fixes for linux
commit 7d332bf911892f87c7824d2a5da7bf73ce7ec411
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:35:29 2014 -0700
more fixes for linux
commit f1becc17d3316dfe3678c23c9dcedb7a447d9235
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:34:44 2014 -0700
more fixes for linux
commit d2e5959bb0dde921dd5e73be1d8acc3b3f50e51d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:33:45 2014 -0700
fixes for linux
commit ad9b633c352107cf0e8b060a0e23d6e6a3f5e80f
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:16:48 2014 -0700
compiles on Windows
commit 4425ee8e5de8f42a2d6050e4470109600dce8b5d
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Wed Apr 30 18:07:20 2014 -0700
fix builder
2014-04-30 19:09:13 -07:00
8bb8416c26
Improved directory structure
2014-04-29 17:37:36 -07:00
9b118e5e96
Squashed commit of the following:
...
commit 519fcd7f68e3586c376fd5e8d4a0ee220a48d225
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:10:06 2014 -0700
Updates templates files
commit 2b07843ebe592f56b2abc544ccf66d441bb19fc5
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 10:08:19 2014 -0700
compiles on Windows
commit b175522ef7205eaab3bd3f26c27c5d6514cbe2a4
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:55:30 2014 -0700
adds cocos2d.h
commit 4c3d14f929bac017b93ca843b4f149d352264a30
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:54:24 2014 -0700
re-adds missing files
commit f729181728959260d14c4152555534f5beec8e05
Merge: 148da79 2adac67
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:51:12 2014 -0700
Merge branch 'includes_fixes' of github.com:ricardoquesada/cocos2d-x into includes_fixes
commit 148da79010c5dffeab885933624cffaf3d588852
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:49:12 2014 -0700
Adds SimpleAudioEngine
commit 2adac67019180ec82b7bd03f0b67c12f62e29e77
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:47:45 2014 -0700
Compiles for Android
commit 4a300d1b9225fa5708f25a69a50bb531f0ac1a32
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Sat Apr 26 09:13:35 2014 -0700
Fixes the includes
2014-04-26 10:11:22 -07:00
c7a606fc78
Adds auto-culling for labels!
...
yeah!
2014-04-25 19:00:22 -07:00
feec24e3ef
Merge branch 'v3' into develop_migrate_math_lib_merge
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
cocos/2d/CCNode.cpp
cocos/2d/CCRenderTexture.cpp
cocos/2d/platform/wp8/CCGLView.h
cocos/physics/CCPhysicsBody.cpp
extensions/physics-nodes/CCPhysicsSprite.cpp
extensions/physics-nodes/CCPhysicsSprite.h
tests/cpp-tests/Classes/PhysicsTest/PhysicsTest.cpp
2014-04-25 16:20:24 +08:00
7beb8b78fe
Merge pull request #6325 from MSOpenTech/wp8-3.0-update
...
Wp8 3.0 update：
Background texture is now correctly oriented in Transition Effects
Accelerometer now works for WP8. Refactor of InputEvents was required to support adding Accelerometer event to rendering queue.
Console support for WP8.
Fixed cpp template for WP8. Added missing projects. Fixed property sheets.
Updates precompiled shaders
2014-04-25 10:41:58 +08:00
f65973d9f0
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
cocos/2d/CCActionInterval.cpp
cocos/2d/CCLabelAtlas.cpp
cocos/2d/CCLabelBMFont.cpp
tests/cpp-tests/Classes/ClippingNodeTest/ClippingNodeTest.cpp
2014-04-23 14:46:14 +08:00
093bd20a74
Solve compiling errors when some macros changed in ccConfig.h.
2014-04-22 16:42:13 +08:00
8f14597717
check if _currentUTF16String is null
2014-04-19 09:38:45 -07:00
95cb7721f6
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
cocos/2d/CCSprite.cpp
tests/cpp-tests/Classes/NewRendererTest/NewRendererTest.cpp
2014-04-15 22:21:04 +08:00
63b52dd287
replace Point with Vector2 in cocos folder cpp file
2014-04-15 18:13:57 +08:00
aef2767d23
change variable name.
2014-04-14 13:42:37 +08:00
6fe64b83f8
LabelTTF:fixed display incorrect if create by FontDefinition.
2014-04-14 11:33:46 +08:00
1670e07300
Merge branch 'develop' into develop_migrate_math_lib_merge
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
build/cocos2d_tests.xcodeproj/project.pbxproj
2014-04-11 11:18:13 +08:00
efb443dea0
Merge pull request #6200 from dumganhar/iss4729-deprecated-folder
...
issue #4729 : Move deprecated stuff to deprecated folder
2014-04-10 11:17:21 +08:00
231cdcb906
adjust comment message
2014-04-10 11:14:46 +08:00
8ab372fdd9
Label:Add compatible API of the create functions.
2014-04-10 10:58:49 +08:00
07ac817a7c
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-10 10:52:15 +08:00
390685ae93
Label:Change setter of system font name.
2014-04-10 10:23:00 +08:00
9d8d256bee
issue #4729 : Android build works ok.
2014-04-10 00:36:42 +08:00
05b8123803
Label:Makes the create functions of Label just do one thing.
2014-04-09 23:31:05 +08:00
67652357e1
1.Makes the create functions of Label clear.
2014-04-09 21:35:08 +08:00
61134426a8
Some fixes detected by xcode analyze
2014-04-09 20:41:09 +08:00
be4901d078
remove kmMat4 interface in class Label
2014-04-09 10:06:30 +08:00
3837c23ebe
draw() using Matrix instead of kmMat4
2014-04-08 22:07:35 +08:00
b9af100493
visit() using Matrix instead of kmMat4
2014-04-08 21:45:54 +08:00
f9405e0ea9
Merge branch 'develop' into develop_migrate_math_lib_merge
2014-04-03 17:47:16 +08:00
46b4f1b5d8
migrate Grid, Label, RenderTexture to director matrix stack
2014-04-03 14:32:49 +08:00
5aafec462f
Label:Fine tune the declaration order of API.
2014-04-02 14:57:00 +08:00
c63baa388b
remove unused local variable.
2014-04-01 15:10:24 +08:00
540c67f701
Label:fixed possible appear OpenGL error 0x500.
2014-04-01 15:03:17 +08:00
eadbca8ee7
1.fixed logical error in Label::enableShadow.
...
2.Add test case for shadow and outline take effect at the same time.
2014-04-01 14:15:35 +08:00
3a556c24aa
fixed shadow and outline can't take effect at the same time
2014-04-01 11:37:36 +08:00
d7ca1999ab
Merge pull request #5998 from bmanGH/feature/fix_STRING_TEXTURE_label_sortAllChildren_crash
...
closed #4626 : Crash if label's type is STRING_TEXTURE and label->sortAllChildren is called.
2014-04-01 10:02:35 +08:00
f485d3b6d5
Label:fixed possible blink if label contains shadow.
2014-03-31 18:16:08 +08:00
d39a419eeb
fixed logical error in Label::create.
2014-03-31 16:06:20 +08:00
89eba4424f
fixed logical error.
2014-03-31 15:45:06 +08:00
774debd142
fixed logical error in Label::updateFont.
2014-03-31 15:29:24 +08:00
cffdb129c9
change type of Label::_shadowNode
2014-03-31 11:47:28 +08:00
08beaa3532
TextFieldTTF:fixed display incorrect color.
2014-03-31 11:16:12 +08:00
c86ab37685
Label ignore sort children.
2014-03-30 21:08:43 +08:00
503fed5313
fix crash when sort children while label type is STRING_TEXTURE. since the only one child sprite is not add with batch mode
2014-03-30 21:08:43 +08:00
8ab057550f
fixed got wrong Rect by LabelTTF::getBoundingBox / LabelBMFont::getBoundingBox.
2014-03-28 15:58:28 +08:00
3da695b184
fixed got wrong Rect by Label::getBoundingBox.
2014-03-28 11:03:39 +08:00
8a8fa743eb
closed #4565:fixed logical error in Label::setFontAtlas.
2014-03-27 14:28:32 +08:00
1247760d95
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_label_fixs
...
Conflicts:
cocos/2d/CCLabel.cpp
2014-03-26 11:15:48 +08:00
41ffa372e8
label: Refactor implementation of shadow.
2014-03-26 11:09:16 +08:00
b6589b0b5a
Merge pull request #5931 from Dhilan007/develop_label
...
label: Support to clip transparent area of Label, content size will be updated with only non-transparent area.
2014-03-25 16:47:12 +08:00
8278a510aa
Label:fixed shadow offset didn't consider 'contentScaleFactor'
2014-03-25 10:41:53 +08:00
859fe98502
label:1.change default value of anchor point. 2.Shadow offset and outline size passed to new Label didn't consider 'contentScaleFactor'
2014-03-25 09:58:16 +08:00
538c01e76e
label:support clip blank of upper and lower margin.
2014-03-24 14:16:27 +08:00
1a08cd9b32
fix typo.
2014-03-21 13:52:12 +08:00
6b74794c74
fix typo and mistake in Label::setTextColor.
2014-03-21 09:47:29 +08:00
9dfa099bef
Label:Refactoring related functions of color.
2014-03-20 20:56:10 +08:00
8c1bf48357
fixed label font size: from int to float
2014-03-20 15:03:48 +08:00
ca6851f114
fix warnings of font and RichText
2014-03-20 11:58:36 +08:00
7ae77c9335
fix cocos2dx engine internal warnings
2014-03-20 10:58:04 +08:00
f76460aee8
closed issue#4434:fixed display incorrect color of label if create by font name.
2014-03-19 10:10:47 +08:00
a286ed8374
fixed typo.
2014-03-18 13:48:41 +08:00
cc671835f8
closed issue#4428:fixed label display incorrect if invoking getLetter and it's multi-line.
2014-03-17 18:33:15 +08:00
5f6fbc6a33
label:fixed getter for font size and font name.
2014-03-14 15:18:45 +08:00
971b1dd557
Label:fixed text display incorrect when come to foreground on android.
2014-03-14 14:59:26 +08:00
36bfd6d2c2
label:fixed incorrect effect of outline.
2014-03-14 09:51:39 +08:00
fe6f485a6b
label:rename some API for clearly.
2014-03-13 21:00:36 +08:00
62d0fa8564
label:rename some API for clearly.
2014-03-13 20:52:33 +08:00
bc68c6b629
Refactor setter of label's font name and font size.
2014-03-13 18:46:35 +08:00
3acaf3ece5
1.Label:Fixes the font rendering on Windows.
...
2.fixed Label::setColor crash when create the label by font name.
2014-03-12 20:39:13 +08:00
c11ef679da
fixed incorrect initial value of label's TextVAlignment.
2014-03-12 16:11:12 +08:00
f5daf1af24
label:change default font size
2014-03-12 15:30:14 +08:00
2786b40dc3
using string::empty() for judge whether string is empty.
2014-03-12 15:03:22 +08:00
233b04269b
label:
...
1.fixed crash if create label by font name and text is empty.
2.fixed getter of font name and font size is incorrect.
2014-03-12 14:49:19 +08:00
6f165bb592
fixed incorrect initial value of label type.
2014-03-12 11:06:51 +08:00
aefafdbe77
Add conditions to evaluate for setter of font size and font name.
2014-03-12 10:53:51 +08:00
df12ca963e
issue #4337:label support create by font name,compatible with old labelTTF
...
1.fixed color and opacity has not yet gone into effect.
2.fixed display is not consistent with old LabelTTF when content scale factor of Director not equal to 1.
2014-03-11 18:06:14 +08:00
c2ef7b8796
fix incorrect implementation of Label::getContentSize
2014-03-11 15:03:16 +08:00
792e182e12
typo fix and coding style improvements.
2014-03-11 14:32:07 +08:00
11d3acd478
fixed inappropriate usage of inline.
2014-03-10 20:35:36 +08:00
8bac35ae2a
closed #4337:label support create by font name,compatible with old labelTTF.
2014-03-10 19:42:43 +08:00
ac944cd42b
fixed incorrect display when the size of label not enough to support display all text.
2014-03-07 15:58:49 +08:00
c233b636cd
closed #4301:Label support vertical alignment and assign dimensions.
2014-03-07 14:58:44 +08:00
a0ab8fcdf3
onDraw() updated
...
`onDraw()` receives `const kmMat4 &transform` and `bool
transformUpdated`.
`CC_NODE_DRAW_SETUP()` is no longer used in our code.
`_modelViewTransform` is only used as a cache.
2014-03-05 15:49:08 -08:00
dfdf19daff
remove unused shader and also did adjust FontAtlas::getTexture
2014-03-05 16:51:16 +08:00
23501b40aa
issue #3629:new label support customize the effects such as Shadow[blur is unsupported], Outline
2014-03-05 15:54:40 +08:00
c3c3e12ee6
close #4276:fixed crash on CocoStudioGuiTest->LabelBMFontTest.
2014-03-05 14:41:59 +08:00
d78304599d
Cache working OK.
...
Performance increased in 20% for static objects.
2014-02-28 16:10:48 -08:00
6920bec6ef
transform object returns the MV
...
code cleaner.
the kmGL code is altogether
2014-02-28 11:20:53 -08:00
eb66ddd931
visit and draw improved.
...
`visit()` and `draw()` are improved.
they both receive:
- `Renderer`
- `kmMat4` for transformation
- `bool` whether or not the transform changed from the previous frame
Although `draw` and `visit` are not using the 3 new parameters,
they will start using it in the coming days (or weeks, or months).
Those parameters are needed for:
- `Renderer` shouldn't be a singleton. There should be one renderer per Director. There could be more than one renderer
- we should get rid of `kmGLXXX` functions since nodoby knows what is happening. the `kmMat4` is for that.
- whenever possible, we should try to optimize the multiplications. the `dirty` flag is for that.
We need those changes, so, it is better to change the API now, and not right after v3.0-final is released.
2014-02-27 21:43:54 -08:00
54f48b23e6
LabelBMFont re-implemented as a wrapper of Label.
2014-02-20 22:33:52 +08:00
ddd02b463c
optimize label:
...
1.remove unnecessary API
2.reduces object-creation and function calls.
2014-02-19 20:26:14 +08:00
5361413383
replace [auto] with [const auto&] in FOR loop.
2014-02-18 16:41:01 +08:00
2ad81b0edb
closed #4060:fixed Label wasn't implemented correctly when Label::_fontAtlas contains multiple texture.
2014-02-18 14:30:51 +08:00
e12c1f57ac
Label::reduce unnecessary calculation amount.
2014-02-10 11:21:54 +08:00
710b614680
fix mistake of label's transparency.
2014-01-26 21:19:40 +08:00
1a34a6ff84
remove unused header
...
remove CC Prefix
2014-01-23 18:55:51 +09:00
c042c5f3db
updateColor should be called after updating quads on alignText
2014-01-23 17:27:28 +09:00
4773fd0937
Merge develop
2014-01-23 16:20:42 +09:00
bd97394ccc
1.Label:Change the default parameters
...
2.Label:let setString method do a single function
2014-01-23 13:42:27 +08:00
df21bbf7df
1.remove unused code
...
2.reduce calculation amount.
3.reduces expenses of function calls
2014-01-22 14:57:11 +08:00
697b0289c7
close #3805:fix wrap error and alignment error.
2014-01-21 17:55:49 +08:00
802fc092be
fix compiling error cause by miss include header file.
2014-01-20 11:43:13 +08:00
7d44da43c4
fix compiling error cause by include a non-existent file.
2014-01-20 11:34:31 +08:00
5fcbf42356
GlobalZOrder is used for render priority...
...
...and not vertexZ
Node::setGlobalZOrder() is used to change that.
Node::setZOrder() -> Node::setLocalZOrder();
2014-01-18 11:38:06 -08:00
8931d968c0
Renderer uses a float as a key
...
Instead of using a 64-bit int key with viewport, opaque and depth,
it only uses a 32-bit float with only the depth.
Saves time in:
- No need to convert the 32-bit float into 24-bit int
- keys are shorter
2014-01-17 16:08:29 -08:00
a74a524eaa
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into header_dependency_fixes
2014-01-16 21:36:22 -08:00
d0dbf34319
removes "include "cocos2d.h" from cocos2d files
2014-01-16 21:35:58 -08:00
a765e5e7e1
closed #3628:Integrate LabelAtlas with new Label
2014-01-16 16:37:29 +08:00
629f111f7d
Relieve inherit from LabelProtocol
2014-01-15 17:21:08 +08:00
fd481d64a0
1.update lua binding configuration for label.
...
2.recover old method[createWithTTF]
2014-01-13 16:32:35 +08:00
69c004108b
issue#3630:Adjust some method for more easily create and change type.
2014-01-11 22:33:07 +08:00
9b6027d284
Merge pull request #4947 from walzer/develop
...
udpate copyrights for the new year 2014 and Chukong.
2014-01-06 19:50:18 -08:00
Shrimpz