mirror of https://github.com/axmolengine/axmol.git
merge v3 into v3_wp8glviewhookpr
This commit is contained in:
huangshiwu
commit
9a3f231771
|
|
@ -137,3 +137,4 @@ project.properties
|
|||
/templates/lua-template-runtime/runtime
|
||||
/v*-deps-*.zip
|
||||
/v*-lua-runtime-*.zip
|
||||
/tools/fbx-conv/
|
||||
|
|
|
|||
35
AUTHORS
35
AUTHORS
|
|
@ -25,7 +25,7 @@ Developers:
|
|||
longlene
|
||||
Improve android project creation script
|
||||
|
||||
simpliplant
|
||||
reneklacan
|
||||
Hardware keyboard support
|
||||
|
||||
liuyq
|
||||
|
|
@ -530,6 +530,7 @@ Developers:
|
|||
Casting variables to their own type, and print warning info if no corresponding lua callback function instead of crash.
|
||||
fix of WebSocket url parse error for 'ws://domain.com/websocket' pattern.
|
||||
Fixed a bug that Websocket doesn't support send/receive data which larger than 4096 bytes.
|
||||
Show detail class & function name in error message of lua-binding
|
||||
|
||||
musikov
|
||||
Fixing a bug that missing precision when getting strokeColor and fontFillColor
|
||||
|
|
@ -658,6 +659,7 @@ Developers:
|
|||
Fixed a bug that Node's anchor point was changed after being added to ScrollView.
|
||||
Added HttpClient::sendImmediate()
|
||||
Added operator == != for Value
|
||||
Replace dynamic_cast to std::is_base_of in object_to_luaval
|
||||
|
||||
superrad
|
||||
Clear NoSuchMethodError Exception when JniHelper fails to find methodID
|
||||
|
|
@ -797,6 +799,8 @@ Developers:
|
|||
Adds support for get response when Activity's onActivityResult is triggered
|
||||
Improve Android projects
|
||||
Android jni error clear & more readable log
|
||||
Add support of software PVRTC v1 decompression
|
||||
Fixed a bug that ttf font have not effect on Mac OS X
|
||||
|
||||
youknowone
|
||||
Adds iOS-like elastic bounceback support for cocos2d::extension::ScrollView
|
||||
|
|
@ -829,6 +833,7 @@ Developers:
|
|||
HttpRequest uses std::function as callback
|
||||
EditBox: mac secure input
|
||||
Fix a bug that can not get/set text in password mode on Mac OS X
|
||||
Make sure TableView parents are visible before handling touch
|
||||
|
||||
iSevenDays
|
||||
Fixed a bug that the result of 'malloc' is incompatible with type 'unsigned char *' in Image::saveImageToPNG
|
||||
|
|
@ -888,6 +893,7 @@ Developers:
|
|||
Added TextField::getStringLength()
|
||||
Add shadow, outline, glow filter support for UIText
|
||||
Fix UITextField IME can't auto detach
|
||||
Add getChildByName method for get a node that can be cast to Type T
|
||||
|
||||
QiuleiWang
|
||||
Fix the bug that calculated height of multi-line string was incorrect on iOS
|
||||
|
|
@ -903,6 +909,7 @@ Developers:
|
|||
gin0606
|
||||
Add a new line at the end of a file
|
||||
Fix a bug that crash happened when try to remove videoView(STATE_PLAYBACK_COMPLETED) in android
|
||||
Fix video scale issue in iOS
|
||||
|
||||
billtt
|
||||
Fixed a bug that Node::setScale(float) may not work properly
|
||||
|
|
@ -913,6 +920,32 @@ Developers:
|
|||
chareice
|
||||
Make `setup.py` work on zsh
|
||||
|
||||
taug
|
||||
Could add seach path and resolution order path in front.
|
||||
|
||||
CaiCQ
|
||||
Fix a but that LabelTTF may lost chinese characters on linux
|
||||
|
||||
chenguangqi
|
||||
Fixed a compiling error on Android
|
||||
Fixed an error when importing project using Eclipse on Android
|
||||
|
||||
uorbe001
|
||||
Allow setting bundle to use in file utils on iOS and Mac OS X
|
||||
|
||||
yongkangchen
|
||||
Fixed a bug that font size of EditBox is not scaled when glview is scaled on Mac OS X
|
||||
Fixed a bug that Label::setTextColor does not have any effect on Mac OS X
|
||||
|
||||
wagulu
|
||||
Fixed a bug that particle effect is wrong when scaled
|
||||
|
||||
reckhou
|
||||
Optimize FPS control on Android
|
||||
|
||||
dzl-ian
|
||||
Added getter and setter for TextColor for UIText
|
||||
|
||||
Retired Core Developers:
|
||||
WenSheng Yang
|
||||
Author of windows port, CCTextField,
|
||||
|
|
|
|||
44
CHANGELOG
44
CHANGELOG
|
|
@ -1,18 +1,54 @@
|
|||
cocos2d-x-3.2 ??
|
||||
cocos2d-x-3.3 ??
|
||||
[NEW] Added UIScale9Sprite
|
||||
[NEW] FileUtils: add isDirectoryExist(), createDirectory(), removeDirectory(), removeFile(), renameFile()
|
||||
getFileSize()
|
||||
[NEW] FileUtilsApple: allow setting bundle to use in file utils on iOS and Mac OS X
|
||||
[NEW] Image: support of software PVRTC v1 decompression
|
||||
[NEW] UIText: added getter and setter for TextColor
|
||||
[NEW] TextField: support utf8
|
||||
|
||||
[FIX] EditBox: font size is not scaled when glview is scaled on Mac OS X
|
||||
[FIX] Label: can not set charmap after it is created
|
||||
[FIX] Label: setTextColor does not have any effect on Mac OS X
|
||||
[FIX] ParticleSystem: effect is wrong if scene scaled
|
||||
[FIX] ParticleSystemQuad: setTotalParticles() can't set a value larger than initialized value
|
||||
[FIX] Scale9Sprite: new added sprite will be hidden
|
||||
[FIX] UIListView: can not insert an item in specific position, it is added at bottom
|
||||
[FIX] TabelView: can handle touch event though its parents are invisible
|
||||
[FIX] TextField: can not use backspace to delete a character
|
||||
[FIX] UIVideoPlayer: video frame size is not calculated correctly on iOS
|
||||
[FIX] UIWidget: may crash if remove itself in touch call back function
|
||||
|
||||
[FIX] Others: can not import java library shift by engine correctly when using Eclispe on Android
|
||||
[FIX] Others: optimize FPS contorl algorithm on Android
|
||||
|
||||
[FIX] Lua-binding: replace dynamic_cast to std::is_base_of in object_to_luaval
|
||||
|
||||
cocos2d-x-3.2 Jul.17 2014
|
||||
[NEW] Node: added getChildByName method for get a node that can be cast to Type T
|
||||
[NEW] FileUtils: could add seach path and resolution order path in front
|
||||
|
||||
[FIX] Animation3D: getOrCreate is deprecated and replaced with Animation3D::create
|
||||
[FIX] Animate3D: setSpeed() accept negtive value, which means play reverse, getPlayback and setPlayBack are deprecated
|
||||
[FIX] EditBox: can not set/get text in password mode on Mac OS X
|
||||
[FIX] Game Controller: joystick y value inversed on iOS
|
||||
[FIX] GLView: cursor position is not correct if design resolution is different from device resolution
|
||||
[FIX] Label: color can not be set correctly if using system font
|
||||
[FIX] Label: color can not be set correctly if using system font on iOS
|
||||
[FIX] LabelTTF: may lost chinese characters on linux
|
||||
[FIX] Lua-binding: support UIVideoPlayer
|
||||
[FIX] Node: setRotation3D not work based on anchor point
|
||||
[FIX] Node: modify regular of enumerateChildren, now it just searchs its children
|
||||
[FIX] Setup.py: not work if using zsh
|
||||
[FIX] Physics integration: body shape will be wrong when using negative value to scale
|
||||
[FIX] ScrollViewDelegate: make the scrollView delegate methods optional
|
||||
[FIX] Setup.py: will crash on windows because of checking `zsh`
|
||||
[FIX] SpriteBatchNode: opacity can not work
|
||||
[FIX] Sprite3D: may crash on Android if playing animation and replace Scene after come from background
|
||||
[FIX] UIdget: opacity is wrong when replace texture
|
||||
[FIX] UIwidget: opacity is wrong when replace texture
|
||||
[FIX] UIRichText: will crash when using utf8 string and the length exceed specified length
|
||||
[FIX] UIText: can not wrap words automatically
|
||||
[FIX] UITextField: keyboard can not hide if touching space outside of keyboard
|
||||
[FIX] UITextField: can not wrap words automatically
|
||||
[FIX] UIVideoPlayer: can not exit full screen mode on Android
|
||||
|
||||
[FIX] Others: don't release singleton objects correctly that are needed in the whole game, which will be treated
|
||||
as memory leak when using VLD.
|
||||
|
|
|
|||
|
|
@ -1,88 +1,54 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Express 2012 for Windows Desktop
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libAudio", "..\cocos\audio\proj.win32\CocosDenshion.vcxproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos\2d\cocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libBox2D", "..\external\Box2D\proj.win32\Box2D.vcxproj", "{929480E7-23C0-4DF6-8456-096D71547116}"
|
||||
EndProject
|
||||
# Visual Studio 2012
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libchipmunk", "..\external\chipmunk\proj.win32\chipmunk.vcxproj", "{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libExtensions", "..\extensions\proj.win32\libExtensions.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-tests", "..\tests\cpp-tests\proj.win32\cpp-tests.vcxproj", "{76A39BB2-9B84-4C65-98A5-654D86B86F2A}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosBuilder", "..\cocos\editor-support\cocosbuilder\proj.win32\libCocosBuilder.vcxproj", "{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libCocosStudio", "..\cocos\editor-support\cocostudio\proj.win32\libCocosStudio.vcxproj", "{B57CF53F-2E49-4031-9822-047CC0E6BDE2}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libNetwork", "..\cocos\network\proj.win32\libNetwork.vcxproj", "{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\cocos\editor-support\spine\proj.win32\libSpine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libLocalStorage", "..\cocos\storage\local-storage\proj.win32\libLocalStorage.vcxproj", "{632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}"
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libnetwork", "..\cocos\network\proj.win32\libNetwork.vcxproj", "{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "liblua", "..\cocos\scripting\lua-bindings\proj.win32\liblua.vcxproj", "{DDC3E27F-004D-4DD4-9DD3-931A013D2159}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-tests", "..\tests\lua-tests\project\proj.win32\lua-tests.win32.vcxproj", "{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGUI", "..\cocos\ui\proj.win32\libGUI.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-empty-test", "..\tests\cpp-empty-test\proj.win32\cpp-empty-test.vcxproj", "{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "lua-empty-test", "..\tests\lua-empty-test\project\proj.win32\lua-empty-test.vcxproj", "{13E55395-94A2-4CD9-BFC2-1A051F80C17D}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libbox2d", "..\external\Box2D\proj.win32\libbox2d.vcxproj", "{929480E7-23C0-4DF6-8456-096D71547116}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos\2d\libcocos2d.vcxproj", "{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocosdenshion", "..\cocos\audio\proj.win32\libcocosdenshion.vcxproj", "{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libui", "..\cocos\ui\proj.win32\libui.vcxproj", "{7E06E92C-537A-442B-9E4A-4761C84F8A1A}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libextension", "..\extensions\proj.win32\libextension.vcxproj", "{21B2C324-891F-48EA-AD1A-5AE13DE12E28}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libspine", "..\cocos\editor-support\spine\proj.win32\libspine.vcxproj", "{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocosbuilder", "..\cocos\editor-support\cocosbuilder\proj.win32\libcocosbuilder.vcxproj", "{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocostudio", "..\cocos\editor-support\cocostudio\proj.win32\libcocostudio.vcxproj", "{B57CF53F-2E49-4031-9822-047CC0E6BDE2}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Win32 = Debug|Win32
|
||||
Release|Win32 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.Build.0 = Release|Win32
|
||||
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32
|
||||
{929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.Build.0 = Release|Win32
|
||||
{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{207BC7A9-CCF1-4F2F-A04D-45F72242AE25}.Release|Win32.Build.0 = Release|Win32
|
||||
{21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Release|Win32.Build.0 = Release|Win32
|
||||
{76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{76A39BB2-9B84-4C65-98A5-654D86B86F2A}.Release|Win32.Build.0 = Release|Win32
|
||||
{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Release|Win32.Build.0 = Release|Win32
|
||||
{B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Release|Win32.Build.0 = Release|Win32
|
||||
{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{DF2638C0-8128-4847-867C-6EAFE3DEE7B5}.Release|Win32.Build.0 = Release|Win32
|
||||
{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.Build.0 = Release|Win32
|
||||
{632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{632A8F38-D0F0-4D22-86B3-D69F5E6BF63A}.Release|Win32.Build.0 = Release|Win32
|
||||
{DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{DDC3E27F-004D-4DD4-9DD3-931A013D2159}.Release|Win32.ActiveCfg = Release|Win32
|
||||
|
|
@ -91,10 +57,6 @@ Global
|
|||
{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{4E6A7A0E-DDD8-4BAA-8B22-C964069364ED}.Release|Win32.Build.0 = Release|Win32
|
||||
{7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.Build.0 = Release|Win32
|
||||
{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{B8BF9E81-35FD-4582-BA1C-B85FA365BABB}.Release|Win32.ActiveCfg = Release|Win32
|
||||
|
|
@ -103,6 +65,38 @@ Global
|
|||
{13E55395-94A2-4CD9-BFC2-1A051F80C17D}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{13E55395-94A2-4CD9-BFC2-1A051F80C17D}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{13E55395-94A2-4CD9-BFC2-1A051F80C17D}.Release|Win32.Build.0 = Release|Win32
|
||||
{929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{929480E7-23C0-4DF6-8456-096D71547116}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{929480E7-23C0-4DF6-8456-096D71547116}.Release|Win32.Build.0 = Release|Win32
|
||||
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{98A51BA8-FC3A-415B-AC8F-8C7BD464E93E}.Release|Win32.Build.0 = Release|Win32
|
||||
{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}.Release|Win32.Build.0 = Release|Win32
|
||||
{7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{7E06E92C-537A-442B-9E4A-4761C84F8A1A}.Release|Win32.Build.0 = Release|Win32
|
||||
{21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{21B2C324-891F-48EA-AD1A-5AE13DE12E28}.Release|Win32.Build.0 = Release|Win32
|
||||
{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{B7C2A162-DEC9-4418-972E-240AB3CBFCAE}.Release|Win32.Build.0 = Release|Win32
|
||||
{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{811C0DAB-7B96-4BD3-A154-B7572B58E4AB}.Release|Win32.Build.0 = Release|Win32
|
||||
{B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Debug|Win32.ActiveCfg = Debug|Win32
|
||||
{B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Debug|Win32.Build.0 = Debug|Win32
|
||||
{B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Release|Win32.ActiveCfg = Release|Win32
|
||||
{B57CF53F-2E49-4031-9822-047CC0E6BDE2}.Release|Win32.Build.0 = Release|Win32
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,59 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "0510"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
buildImplicitDependencies = "YES">
|
||||
<BuildActionEntries>
|
||||
<BuildActionEntry
|
||||
buildForTesting = "YES"
|
||||
buildForRunning = "YES"
|
||||
buildForProfiling = "YES"
|
||||
buildForArchiving = "YES"
|
||||
buildForAnalyzing = "YES">
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "A03F2E9817814268006731B9"
|
||||
BuildableName = "libCocosDenshion Mac.a"
|
||||
BlueprintName = "CocosDenshion Mac"
|
||||
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildActionEntry>
|
||||
</BuildActionEntries>
|
||||
</BuildAction>
|
||||
<TestAction
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
buildConfiguration = "Debug">
|
||||
<Testables>
|
||||
</Testables>
|
||||
</TestAction>
|
||||
<LaunchAction
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
launchStyle = "0"
|
||||
useCustomWorkingDirectory = "NO"
|
||||
buildConfiguration = "Debug"
|
||||
ignoresPersistentStateOnLaunch = "NO"
|
||||
debugDocumentVersioning = "YES"
|
||||
allowLocationSimulation = "YES">
|
||||
<AdditionalOptions>
|
||||
</AdditionalOptions>
|
||||
</LaunchAction>
|
||||
<ProfileAction
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
savedToolIdentifier = ""
|
||||
useCustomWorkingDirectory = "NO"
|
||||
buildConfiguration = "Release"
|
||||
debugDocumentVersioning = "YES">
|
||||
</ProfileAction>
|
||||
<AnalyzeAction
|
||||
buildConfiguration = "Debug">
|
||||
</AnalyzeAction>
|
||||
<ArchiveAction
|
||||
buildConfiguration = "Release"
|
||||
revealArchiveInOrganizer = "YES">
|
||||
</ArchiveAction>
|
||||
</Scheme>
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "0510"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
buildImplicitDependencies = "YES">
|
||||
<BuildActionEntries>
|
||||
<BuildActionEntry
|
||||
buildForTesting = "YES"
|
||||
buildForRunning = "YES"
|
||||
buildForProfiling = "YES"
|
||||
buildForArchiving = "YES"
|
||||
buildForAnalyzing = "YES">
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "A07A4F9F178387730073F6A7"
|
||||
BuildableName = "libCocosDenshion iOS.a"
|
||||
BlueprintName = "CocosDenshion iOS"
|
||||
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildActionEntry>
|
||||
</BuildActionEntries>
|
||||
</BuildAction>
|
||||
<TestAction
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
buildConfiguration = "Debug">
|
||||
<Testables>
|
||||
</Testables>
|
||||
</TestAction>
|
||||
<LaunchAction
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
launchStyle = "0"
|
||||
useCustomWorkingDirectory = "NO"
|
||||
buildConfiguration = "Debug"
|
||||
ignoresPersistentStateOnLaunch = "NO"
|
||||
debugDocumentVersioning = "YES"
|
||||
allowLocationSimulation = "YES">
|
||||
<AdditionalOptions>
|
||||
</AdditionalOptions>
|
||||
</LaunchAction>
|
||||
<ProfileAction
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
savedToolIdentifier = ""
|
||||
useCustomWorkingDirectory = "NO"
|
||||
buildConfiguration = "Release"
|
||||
debugDocumentVersioning = "YES">
|
||||
</ProfileAction>
|
||||
<AnalyzeAction
|
||||
buildConfiguration = "Debug">
|
||||
</AnalyzeAction>
|
||||
<ArchiveAction
|
||||
buildConfiguration = "Release"
|
||||
revealArchiveInOrganizer = "YES">
|
||||
</ArchiveAction>
|
||||
</Scheme>
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "0510"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
buildImplicitDependencies = "YES">
|
||||
<BuildActionEntries>
|
||||
<BuildActionEntry
|
||||
buildForTesting = "YES"
|
||||
buildForRunning = "YES"
|
||||
buildForProfiling = "YES"
|
||||
buildForArchiving = "YES"
|
||||
buildForAnalyzing = "YES">
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "A03F2D5D1780BDF7006731B9"
|
||||
BuildableName = "libbox2d Mac.a"
|
||||
BlueprintName = "box2d Mac"
|
||||
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildActionEntry>
|
||||
</BuildActionEntries>
|
||||
</BuildAction>
|
||||
<TestAction
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
buildConfiguration = "Debug">
|
||||
<Testables>
|
||||
</Testables>
|
||||
</TestAction>
|
||||
<LaunchAction
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
launchStyle = "0"
|
||||
useCustomWorkingDirectory = "NO"
|
||||
buildConfiguration = "Debug"
|
||||
ignoresPersistentStateOnLaunch = "NO"
|
||||
debugDocumentVersioning = "YES"
|
||||
allowLocationSimulation = "YES">
|
||||
<AdditionalOptions>
|
||||
</AdditionalOptions>
|
||||
</LaunchAction>
|
||||
<ProfileAction
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
savedToolIdentifier = ""
|
||||
useCustomWorkingDirectory = "NO"
|
||||
buildConfiguration = "Release"
|
||||
debugDocumentVersioning = "YES">
|
||||
</ProfileAction>
|
||||
<AnalyzeAction
|
||||
buildConfiguration = "Debug">
|
||||
</AnalyzeAction>
|
||||
<ArchiveAction
|
||||
buildConfiguration = "Release"
|
||||
revealArchiveInOrganizer = "YES">
|
||||
</ArchiveAction>
|
||||
</Scheme>
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "0510"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
buildImplicitDependencies = "YES">
|
||||
<BuildActionEntries>
|
||||
<BuildActionEntry
|
||||
buildForTesting = "YES"
|
||||
buildForRunning = "YES"
|
||||
buildForProfiling = "YES"
|
||||
buildForArchiving = "YES"
|
||||
buildForAnalyzing = "YES">
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "A07A4F3C1783876B0073F6A7"
|
||||
BuildableName = "libbox2d iOS.a"
|
||||
BlueprintName = "box2d iOS"
|
||||
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildActionEntry>
|
||||
</BuildActionEntries>
|
||||
</BuildAction>
|
||||
<TestAction
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
buildConfiguration = "Debug">
|
||||
<Testables>
|
||||
</Testables>
|
||||
</TestAction>
|
||||
<LaunchAction
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
launchStyle = "0"
|
||||
useCustomWorkingDirectory = "NO"
|
||||
buildConfiguration = "Debug"
|
||||
ignoresPersistentStateOnLaunch = "NO"
|
||||
debugDocumentVersioning = "YES"
|
||||
allowLocationSimulation = "YES">
|
||||
<AdditionalOptions>
|
||||
</AdditionalOptions>
|
||||
</LaunchAction>
|
||||
<ProfileAction
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
savedToolIdentifier = ""
|
||||
useCustomWorkingDirectory = "NO"
|
||||
buildConfiguration = "Release"
|
||||
debugDocumentVersioning = "YES">
|
||||
</ProfileAction>
|
||||
<AnalyzeAction
|
||||
buildConfiguration = "Debug">
|
||||
</AnalyzeAction>
|
||||
<ArchiveAction
|
||||
buildConfiguration = "Release"
|
||||
revealArchiveInOrganizer = "YES">
|
||||
</ArchiveAction>
|
||||
</Scheme>
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "0510"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
buildImplicitDependencies = "YES">
|
||||
<BuildActionEntries>
|
||||
<BuildActionEntry
|
||||
buildForTesting = "YES"
|
||||
buildForRunning = "YES"
|
||||
buildForProfiling = "YES"
|
||||
buildForArchiving = "YES"
|
||||
buildForAnalyzing = "YES">
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "A03F2E8E178141C1006731B9"
|
||||
BuildableName = "build all libs Mac"
|
||||
BlueprintName = "build all libs Mac"
|
||||
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildActionEntry>
|
||||
</BuildActionEntries>
|
||||
</BuildAction>
|
||||
<TestAction
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
buildConfiguration = "Debug">
|
||||
<Testables>
|
||||
</Testables>
|
||||
</TestAction>
|
||||
<LaunchAction
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
launchStyle = "0"
|
||||
useCustomWorkingDirectory = "NO"
|
||||
buildConfiguration = "Debug"
|
||||
ignoresPersistentStateOnLaunch = "NO"
|
||||
debugDocumentVersioning = "YES"
|
||||
allowLocationSimulation = "YES">
|
||||
<AdditionalOptions>
|
||||
</AdditionalOptions>
|
||||
</LaunchAction>
|
||||
<ProfileAction
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
savedToolIdentifier = ""
|
||||
useCustomWorkingDirectory = "NO"
|
||||
buildConfiguration = "Release"
|
||||
debugDocumentVersioning = "YES">
|
||||
</ProfileAction>
|
||||
<AnalyzeAction
|
||||
buildConfiguration = "Debug">
|
||||
</AnalyzeAction>
|
||||
<ArchiveAction
|
||||
buildConfiguration = "Release"
|
||||
revealArchiveInOrganizer = "YES">
|
||||
</ArchiveAction>
|
||||
</Scheme>
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "0510"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
buildImplicitDependencies = "YES">
|
||||
<BuildActionEntries>
|
||||
<BuildActionEntry
|
||||
buildForTesting = "YES"
|
||||
buildForRunning = "YES"
|
||||
buildForProfiling = "YES"
|
||||
buildForArchiving = "YES"
|
||||
buildForAnalyzing = "YES">
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "A07A4E0B178386390073F6A7"
|
||||
BuildableName = "build all libs iOS"
|
||||
BlueprintName = "build all libs iOS"
|
||||
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildActionEntry>
|
||||
</BuildActionEntries>
|
||||
</BuildAction>
|
||||
<TestAction
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
buildConfiguration = "Debug">
|
||||
<Testables>
|
||||
</Testables>
|
||||
</TestAction>
|
||||
<LaunchAction
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
launchStyle = "0"
|
||||
useCustomWorkingDirectory = "NO"
|
||||
buildConfiguration = "Debug"
|
||||
ignoresPersistentStateOnLaunch = "NO"
|
||||
debugDocumentVersioning = "YES"
|
||||
allowLocationSimulation = "YES">
|
||||
<AdditionalOptions>
|
||||
</AdditionalOptions>
|
||||
</LaunchAction>
|
||||
<ProfileAction
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
savedToolIdentifier = ""
|
||||
useCustomWorkingDirectory = "NO"
|
||||
buildConfiguration = "Release"
|
||||
debugDocumentVersioning = "YES">
|
||||
</ProfileAction>
|
||||
<AnalyzeAction
|
||||
buildConfiguration = "Debug">
|
||||
</AnalyzeAction>
|
||||
<ArchiveAction
|
||||
buildConfiguration = "Release"
|
||||
revealArchiveInOrganizer = "YES">
|
||||
</ArchiveAction>
|
||||
</Scheme>
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "0510"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
buildImplicitDependencies = "YES">
|
||||
<BuildActionEntries>
|
||||
<BuildActionEntry
|
||||
buildForTesting = "YES"
|
||||
buildForRunning = "YES"
|
||||
buildForProfiling = "YES"
|
||||
buildForArchiving = "YES"
|
||||
buildForAnalyzing = "YES">
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "A03F2B781780BD04006731B9"
|
||||
BuildableName = "libchipmunk Mac.a"
|
||||
BlueprintName = "chipmunk Mac"
|
||||
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildActionEntry>
|
||||
</BuildActionEntries>
|
||||
</BuildAction>
|
||||
<TestAction
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
buildConfiguration = "Debug">
|
||||
<Testables>
|
||||
</Testables>
|
||||
</TestAction>
|
||||
<LaunchAction
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
launchStyle = "0"
|
||||
useCustomWorkingDirectory = "NO"
|
||||
buildConfiguration = "Debug"
|
||||
ignoresPersistentStateOnLaunch = "NO"
|
||||
debugDocumentVersioning = "YES"
|
||||
allowLocationSimulation = "YES">
|
||||
<AdditionalOptions>
|
||||
</AdditionalOptions>
|
||||
</LaunchAction>
|
||||
<ProfileAction
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
savedToolIdentifier = ""
|
||||
useCustomWorkingDirectory = "NO"
|
||||
buildConfiguration = "Release"
|
||||
debugDocumentVersioning = "YES">
|
||||
</ProfileAction>
|
||||
<AnalyzeAction
|
||||
buildConfiguration = "Debug">
|
||||
</AnalyzeAction>
|
||||
<ArchiveAction
|
||||
buildConfiguration = "Release"
|
||||
revealArchiveInOrganizer = "YES">
|
||||
</ArchiveAction>
|
||||
</Scheme>
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "0510"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
buildImplicitDependencies = "YES">
|
||||
<BuildActionEntries>
|
||||
<BuildActionEntry
|
||||
buildForTesting = "YES"
|
||||
buildForRunning = "YES"
|
||||
buildForProfiling = "YES"
|
||||
buildForArchiving = "YES"
|
||||
buildForAnalyzing = "YES">
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "A07A4EFD178387670073F6A7"
|
||||
BuildableName = "libchipmunk iOS.a"
|
||||
BlueprintName = "chipmunk iOS"
|
||||
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildActionEntry>
|
||||
</BuildActionEntries>
|
||||
</BuildAction>
|
||||
<TestAction
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
buildConfiguration = "Debug">
|
||||
<Testables>
|
||||
</Testables>
|
||||
</TestAction>
|
||||
<LaunchAction
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
launchStyle = "0"
|
||||
useCustomWorkingDirectory = "NO"
|
||||
buildConfiguration = "Debug"
|
||||
ignoresPersistentStateOnLaunch = "NO"
|
||||
debugDocumentVersioning = "YES"
|
||||
allowLocationSimulation = "YES">
|
||||
<AdditionalOptions>
|
||||
</AdditionalOptions>
|
||||
</LaunchAction>
|
||||
<ProfileAction
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
savedToolIdentifier = ""
|
||||
useCustomWorkingDirectory = "NO"
|
||||
buildConfiguration = "Release"
|
||||
debugDocumentVersioning = "YES">
|
||||
</ProfileAction>
|
||||
<AnalyzeAction
|
||||
buildConfiguration = "Debug">
|
||||
</AnalyzeAction>
|
||||
<ArchiveAction
|
||||
buildConfiguration = "Release"
|
||||
revealArchiveInOrganizer = "YES">
|
||||
</ArchiveAction>
|
||||
</Scheme>
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "0510"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
buildImplicitDependencies = "YES">
|
||||
<BuildActionEntries>
|
||||
<BuildActionEntry
|
||||
buildForTesting = "YES"
|
||||
buildForRunning = "YES"
|
||||
buildForProfiling = "YES"
|
||||
buildForArchiving = "YES"
|
||||
buildForAnalyzing = "YES">
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "1551A33E158F2AB200E66CFE"
|
||||
BuildableName = "libcocos2dx Mac.a"
|
||||
BlueprintName = "cocos2dx Mac"
|
||||
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildActionEntry>
|
||||
</BuildActionEntries>
|
||||
</BuildAction>
|
||||
<TestAction
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
buildConfiguration = "Debug">
|
||||
<Testables>
|
||||
</Testables>
|
||||
</TestAction>
|
||||
<LaunchAction
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
launchStyle = "0"
|
||||
useCustomWorkingDirectory = "NO"
|
||||
buildConfiguration = "Debug"
|
||||
ignoresPersistentStateOnLaunch = "NO"
|
||||
debugDocumentVersioning = "YES"
|
||||
allowLocationSimulation = "YES">
|
||||
<AdditionalOptions>
|
||||
</AdditionalOptions>
|
||||
</LaunchAction>
|
||||
<ProfileAction
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
savedToolIdentifier = ""
|
||||
useCustomWorkingDirectory = "NO"
|
||||
buildConfiguration = "Release"
|
||||
debugDocumentVersioning = "YES">
|
||||
</ProfileAction>
|
||||
<AnalyzeAction
|
||||
buildConfiguration = "Debug">
|
||||
</AnalyzeAction>
|
||||
<ArchiveAction
|
||||
buildConfiguration = "Release"
|
||||
revealArchiveInOrganizer = "YES">
|
||||
</ArchiveAction>
|
||||
</Scheme>
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "0510"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
buildImplicitDependencies = "YES">
|
||||
<BuildActionEntries>
|
||||
<BuildActionEntry
|
||||
buildForTesting = "YES"
|
||||
buildForRunning = "YES"
|
||||
buildForProfiling = "YES"
|
||||
buildForArchiving = "YES"
|
||||
buildForAnalyzing = "YES">
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "A07A4C241783777C0073F6A7"
|
||||
BuildableName = "libcocos2dx iOS.a"
|
||||
BlueprintName = "cocos2dx iOS"
|
||||
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildActionEntry>
|
||||
</BuildActionEntries>
|
||||
</BuildAction>
|
||||
<TestAction
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
buildConfiguration = "Debug">
|
||||
<Testables>
|
||||
</Testables>
|
||||
</TestAction>
|
||||
<LaunchAction
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
launchStyle = "0"
|
||||
useCustomWorkingDirectory = "NO"
|
||||
buildConfiguration = "Debug"
|
||||
ignoresPersistentStateOnLaunch = "NO"
|
||||
debugDocumentVersioning = "YES"
|
||||
allowLocationSimulation = "YES">
|
||||
<AdditionalOptions>
|
||||
</AdditionalOptions>
|
||||
</LaunchAction>
|
||||
<ProfileAction
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
savedToolIdentifier = ""
|
||||
useCustomWorkingDirectory = "NO"
|
||||
buildConfiguration = "Release"
|
||||
debugDocumentVersioning = "YES">
|
||||
</ProfileAction>
|
||||
<AnalyzeAction
|
||||
buildConfiguration = "Debug">
|
||||
</AnalyzeAction>
|
||||
<ArchiveAction
|
||||
buildConfiguration = "Release"
|
||||
revealArchiveInOrganizer = "YES">
|
||||
</ArchiveAction>
|
||||
</Scheme>
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "0510"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
buildImplicitDependencies = "YES">
|
||||
<BuildActionEntries>
|
||||
<BuildActionEntry
|
||||
buildForTesting = "YES"
|
||||
buildForRunning = "YES"
|
||||
buildForProfiling = "YES"
|
||||
buildForArchiving = "YES"
|
||||
buildForAnalyzing = "YES">
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "A03F2FC117814595006731B9"
|
||||
BuildableName = "libcocos2dx-extensions Mac.a"
|
||||
BlueprintName = "cocos2dx-extensions Mac"
|
||||
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildActionEntry>
|
||||
</BuildActionEntries>
|
||||
</BuildAction>
|
||||
<TestAction
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
buildConfiguration = "Debug">
|
||||
<Testables>
|
||||
</Testables>
|
||||
</TestAction>
|
||||
<LaunchAction
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
launchStyle = "0"
|
||||
useCustomWorkingDirectory = "NO"
|
||||
buildConfiguration = "Debug"
|
||||
ignoresPersistentStateOnLaunch = "NO"
|
||||
debugDocumentVersioning = "YES"
|
||||
allowLocationSimulation = "YES">
|
||||
<AdditionalOptions>
|
||||
</AdditionalOptions>
|
||||
</LaunchAction>
|
||||
<ProfileAction
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
savedToolIdentifier = ""
|
||||
useCustomWorkingDirectory = "NO"
|
||||
buildConfiguration = "Release"
|
||||
debugDocumentVersioning = "YES">
|
||||
</ProfileAction>
|
||||
<AnalyzeAction
|
||||
buildConfiguration = "Debug">
|
||||
</AnalyzeAction>
|
||||
<ArchiveAction
|
||||
buildConfiguration = "Release"
|
||||
revealArchiveInOrganizer = "YES">
|
||||
</ArchiveAction>
|
||||
</Scheme>
|
||||
|
|
@ -1,59 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "0510"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
buildImplicitDependencies = "YES">
|
||||
<BuildActionEntries>
|
||||
<BuildActionEntry
|
||||
buildForTesting = "YES"
|
||||
buildForRunning = "YES"
|
||||
buildForProfiling = "YES"
|
||||
buildForArchiving = "YES"
|
||||
buildForAnalyzing = "YES">
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "A07A4E111783867C0073F6A7"
|
||||
BuildableName = "libcocos2dx-extensions iOS.a"
|
||||
BlueprintName = "cocos2dx-extensions iOS"
|
||||
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
|
||||
</BuildableReference>
|
||||
</BuildActionEntry>
|
||||
</BuildActionEntries>
|
||||
</BuildAction>
|
||||
<TestAction
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
buildConfiguration = "Debug">
|
||||
<Testables>
|
||||
</Testables>
|
||||
</TestAction>
|
||||
<LaunchAction
|
||||
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
|
||||
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
|
||||
launchStyle = "0"
|
||||
useCustomWorkingDirectory = "NO"
|
||||
buildConfiguration = "Debug"
|
||||
ignoresPersistentStateOnLaunch = "NO"
|
||||
debugDocumentVersioning = "YES"
|
||||
allowLocationSimulation = "YES">
|
||||
<AdditionalOptions>
|
||||
</AdditionalOptions>
|
||||
</LaunchAction>
|
||||
<ProfileAction
|
||||
shouldUseLaunchSchemeArgsEnv = "YES"
|
||||
savedToolIdentifier = ""
|
||||
useCustomWorkingDirectory = "NO"
|
||||
buildConfiguration = "Release"
|
||||
debugDocumentVersioning = "YES">
|
||||
</ProfileAction>
|
||||
<AnalyzeAction
|
||||
buildConfiguration = "Debug">
|
||||
</AnalyzeAction>
|
||||
<ArchiveAction
|
||||
buildConfiguration = "Release"
|
||||
revealArchiveInOrganizer = "YES">
|
||||
</ArchiveAction>
|
||||
</Scheme>
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "0510"
|
||||
LastUpgradeVersion = "0600"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
|
|
@ -39,6 +39,15 @@
|
|||
ignoresPersistentStateOnLaunch = "NO"
|
||||
debugDocumentVersioning = "YES"
|
||||
allowLocationSimulation = "YES">
|
||||
<MacroExpansion>
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "A035ACBB1782469700987F6C"
|
||||
BuildableName = "build all tests Mac"
|
||||
BlueprintName = "build all tests Mac"
|
||||
ReferencedContainer = "container:cocos2d_tests.xcodeproj">
|
||||
</BuildableReference>
|
||||
</MacroExpansion>
|
||||
<AdditionalOptions>
|
||||
</AdditionalOptions>
|
||||
</LaunchAction>
|
||||
|
|
@ -48,6 +57,15 @@
|
|||
useCustomWorkingDirectory = "NO"
|
||||
buildConfiguration = "Release"
|
||||
debugDocumentVersioning = "YES">
|
||||
<MacroExpansion>
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "A035ACBB1782469700987F6C"
|
||||
BuildableName = "build all tests Mac"
|
||||
BlueprintName = "build all tests Mac"
|
||||
ReferencedContainer = "container:cocos2d_tests.xcodeproj">
|
||||
</BuildableReference>
|
||||
</MacroExpansion>
|
||||
</ProfileAction>
|
||||
<AnalyzeAction
|
||||
buildConfiguration = "Debug">
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "0510"
|
||||
LastUpgradeVersion = "0600"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
|
|
@ -39,6 +39,15 @@
|
|||
ignoresPersistentStateOnLaunch = "NO"
|
||||
debugDocumentVersioning = "YES"
|
||||
allowLocationSimulation = "YES">
|
||||
<MacroExpansion>
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "A07A517B1783A1CC0073F6A7"
|
||||
BuildableName = "build all tests iOS"
|
||||
BlueprintName = "build all tests iOS"
|
||||
ReferencedContainer = "container:cocos2d_tests.xcodeproj">
|
||||
</BuildableReference>
|
||||
</MacroExpansion>
|
||||
<AdditionalOptions>
|
||||
</AdditionalOptions>
|
||||
</LaunchAction>
|
||||
|
|
@ -48,6 +57,15 @@
|
|||
useCustomWorkingDirectory = "NO"
|
||||
buildConfiguration = "Release"
|
||||
debugDocumentVersioning = "YES">
|
||||
<MacroExpansion>
|
||||
<BuildableReference
|
||||
BuildableIdentifier = "primary"
|
||||
BlueprintIdentifier = "A07A517B1783A1CC0073F6A7"
|
||||
BuildableName = "build all tests iOS"
|
||||
BlueprintName = "build all tests iOS"
|
||||
ReferencedContainer = "container:cocos2d_tests.xcodeproj">
|
||||
</BuildableReference>
|
||||
</MacroExpansion>
|
||||
</ProfileAction>
|
||||
<AnalyzeAction
|
||||
buildConfiguration = "Debug">
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "0510"
|
||||
LastUpgradeVersion = "0600"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "0510"
|
||||
LastUpgradeVersion = "0600"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "0510"
|
||||
LastUpgradeVersion = "0600"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "0510"
|
||||
LastUpgradeVersion = "0600"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "0510"
|
||||
LastUpgradeVersion = "0600"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "0510"
|
||||
LastUpgradeVersion = "0600"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "0510"
|
||||
LastUpgradeVersion = "0600"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "0510"
|
||||
LastUpgradeVersion = "0600"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "0510"
|
||||
LastUpgradeVersion = "0600"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "0510"
|
||||
LastUpgradeVersion = "0600"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
|
|
|
|||
|
|
@ -53,11 +53,19 @@ public:
|
|||
*/
|
||||
virtual std::string description() const;
|
||||
|
||||
/** returns a clone of action */
|
||||
virtual Action* clone() const = 0;
|
||||
/** returns a clone of action */
|
||||
virtual Action* clone() const
|
||||
{
|
||||
CC_ASSERT(0);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
/** returns a new action that performs the exactly the reverse action */
|
||||
virtual Action* reverse() const = 0;
|
||||
virtual Action* reverse() const
|
||||
{
|
||||
CC_ASSERT(0);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
//! return true if the action has finished
|
||||
virtual bool isDone() const;
|
||||
|
|
@ -137,12 +145,20 @@ public:
|
|||
//
|
||||
// Overrides
|
||||
//
|
||||
virtual FiniteTimeAction* reverse() const override = 0;
|
||||
virtual FiniteTimeAction* clone() const override = 0;
|
||||
virtual FiniteTimeAction* reverse() const override
|
||||
{
|
||||
CC_ASSERT(0);
|
||||
return nullptr;
|
||||
}
|
||||
virtual FiniteTimeAction* clone() const override
|
||||
{
|
||||
CC_ASSERT(0);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
protected:
|
||||
FiniteTimeAction()
|
||||
: _duration(0)
|
||||
: _duration(0)
|
||||
{}
|
||||
virtual ~FiniteTimeAction(){}
|
||||
|
||||
|
|
@ -180,7 +196,7 @@ public:
|
|||
//
|
||||
// Override
|
||||
//
|
||||
virtual Speed* clone() const override;
|
||||
virtual Speed* clone() const override;
|
||||
virtual Speed* reverse() const override;
|
||||
virtual void startWithTarget(Node* target) override;
|
||||
virtual void stop() override;
|
||||
|
|
@ -231,8 +247,8 @@ public:
|
|||
//
|
||||
// Override
|
||||
//
|
||||
virtual Follow* clone() const override;
|
||||
virtual Follow* reverse() const override;
|
||||
virtual Follow* clone() const override;
|
||||
virtual Follow* reverse() const override;
|
||||
virtual void step(float dt) override;
|
||||
virtual bool isDone() const override;
|
||||
virtual void stop() override;
|
||||
|
|
@ -285,7 +301,7 @@ protected:
|
|||
float _rightBoundary;
|
||||
float _topBoundary;
|
||||
float _bottomBoundary;
|
||||
Rect _worldRect;
|
||||
Rect _worldRect;
|
||||
|
||||
private:
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(Follow);
|
||||
|
|
|
|||
|
|
@ -49,8 +49,18 @@ public:
|
|||
//
|
||||
// Overrides
|
||||
//
|
||||
virtual ActionEase* clone() const override = 0;
|
||||
virtual ActionEase* reverse() const override = 0;
|
||||
virtual ActionEase* clone() const override
|
||||
{
|
||||
CC_ASSERT(0);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
virtual ActionEase* reverse() const override
|
||||
{
|
||||
CC_ASSERT(0);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
virtual void startWithTarget(Node *target) override;
|
||||
virtual void stop() override;
|
||||
virtual void update(float time) override;
|
||||
|
|
@ -83,8 +93,16 @@ public:
|
|||
//
|
||||
// Overrides
|
||||
//
|
||||
virtual EaseRateAction* clone() const override = 0;
|
||||
virtual EaseRateAction* reverse() const override = 0;
|
||||
virtual EaseRateAction* clone() const override
|
||||
{
|
||||
CC_ASSERT(0);
|
||||
return nullptr;
|
||||
}
|
||||
virtual EaseRateAction* reverse() const override
|
||||
{
|
||||
CC_ASSERT(0);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseRateAction() {}
|
||||
|
|
@ -111,8 +129,8 @@ public:
|
|||
|
||||
// Overrides
|
||||
virtual void update(float time) override;
|
||||
virtual EaseIn* clone() const override;
|
||||
virtual EaseIn* reverse() const override;
|
||||
virtual EaseIn* clone() const override;
|
||||
virtual EaseIn* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseIn() {}
|
||||
|
|
@ -134,8 +152,8 @@ public:
|
|||
|
||||
// Overrides
|
||||
virtual void update(float time) override;
|
||||
virtual EaseOut* clone() const override;
|
||||
virtual EaseOut* reverse() const override;
|
||||
virtual EaseOut* clone() const override;
|
||||
virtual EaseOut* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseOut() {}
|
||||
|
|
@ -157,8 +175,8 @@ public:
|
|||
|
||||
// Overrides
|
||||
virtual void update(float time) override;
|
||||
virtual EaseInOut* clone() const override;
|
||||
virtual EaseInOut* reverse() const override;
|
||||
virtual EaseInOut* clone() const override;
|
||||
virtual EaseInOut* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseInOut() {}
|
||||
|
|
@ -180,8 +198,8 @@ public:
|
|||
|
||||
// Overrides
|
||||
virtual void update(float time) override;
|
||||
virtual EaseExponentialIn* clone() const override;
|
||||
virtual ActionEase* reverse() const override;
|
||||
virtual EaseExponentialIn* clone() const override;
|
||||
virtual ActionEase* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseExponentialIn() {}
|
||||
|
|
@ -203,8 +221,8 @@ public:
|
|||
|
||||
// Overrides
|
||||
virtual void update(float time) override;
|
||||
virtual EaseExponentialOut* clone() const override;
|
||||
virtual ActionEase* reverse() const override;
|
||||
virtual EaseExponentialOut* clone() const override;
|
||||
virtual ActionEase* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseExponentialOut() {}
|
||||
|
|
@ -226,8 +244,8 @@ public:
|
|||
|
||||
// Overrides
|
||||
virtual void update(float time) override;
|
||||
virtual EaseExponentialInOut* clone() const override;
|
||||
virtual EaseExponentialInOut* reverse() const override;
|
||||
virtual EaseExponentialInOut* clone() const override;
|
||||
virtual EaseExponentialInOut* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseExponentialInOut() {}
|
||||
|
|
@ -249,8 +267,8 @@ public:
|
|||
|
||||
// Overrides
|
||||
virtual void update(float time) override;
|
||||
virtual EaseSineIn* clone() const override;
|
||||
virtual ActionEase* reverse() const override;
|
||||
virtual EaseSineIn* clone() const override;
|
||||
virtual ActionEase* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseSineIn() {}
|
||||
|
|
@ -272,8 +290,8 @@ public:
|
|||
|
||||
// Overrides
|
||||
virtual void update(float time) override;
|
||||
virtual EaseSineOut* clone() const override;
|
||||
virtual ActionEase* reverse() const override;
|
||||
virtual EaseSineOut* clone() const override;
|
||||
virtual ActionEase* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseSineOut() {}
|
||||
|
|
@ -295,8 +313,8 @@ public:
|
|||
|
||||
// Overrides
|
||||
virtual void update(float time) override;
|
||||
virtual EaseSineInOut* clone() const override;
|
||||
virtual EaseSineInOut* reverse() const override;
|
||||
virtual EaseSineInOut* clone() const override;
|
||||
virtual EaseSineInOut* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseSineInOut() {}
|
||||
|
|
@ -323,8 +341,17 @@ public:
|
|||
//
|
||||
// Overrides
|
||||
//
|
||||
virtual EaseElastic* clone() const override = 0;
|
||||
virtual EaseElastic* reverse() const override = 0;
|
||||
virtual EaseElastic* clone() const override
|
||||
{
|
||||
CC_ASSERT(0);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
virtual EaseElastic* reverse() const override
|
||||
{
|
||||
CC_ASSERT(0);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseElastic() {}
|
||||
|
|
@ -355,8 +382,8 @@ public:
|
|||
|
||||
// Overrides
|
||||
virtual void update(float time) override;
|
||||
virtual EaseElasticIn* clone() const override;
|
||||
virtual EaseElastic* reverse() const override;
|
||||
virtual EaseElasticIn* clone() const override;
|
||||
virtual EaseElastic* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseElasticIn() {}
|
||||
|
|
@ -381,8 +408,8 @@ public:
|
|||
|
||||
// Overrides
|
||||
virtual void update(float time) override;
|
||||
virtual EaseElasticOut* clone() const override;
|
||||
virtual EaseElastic* reverse() const override;
|
||||
virtual EaseElasticOut* clone() const override;
|
||||
virtual EaseElastic* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseElasticOut() {}
|
||||
|
|
@ -407,8 +434,8 @@ public:
|
|||
|
||||
// Overrides
|
||||
virtual void update(float time) override;
|
||||
virtual EaseElasticInOut* clone() const override;
|
||||
virtual EaseElasticInOut* reverse() const override;
|
||||
virtual EaseElasticInOut* clone() const override;
|
||||
virtual EaseElasticInOut* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseElasticInOut() {}
|
||||
|
|
@ -428,8 +455,17 @@ class CC_DLL EaseBounce : public ActionEase
|
|||
public:
|
||||
|
||||
// Overrides
|
||||
virtual EaseBounce* clone() const override = 0;
|
||||
virtual EaseBounce* reverse() const override = 0;
|
||||
virtual EaseBounce* clone() const override
|
||||
{
|
||||
CC_ASSERT(0);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
virtual EaseBounce* reverse() const override
|
||||
{
|
||||
CC_ASSERT(0);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseBounce() {}
|
||||
|
|
@ -453,8 +489,8 @@ public:
|
|||
|
||||
// Overrides
|
||||
virtual void update(float time) override;
|
||||
virtual EaseBounceIn* clone() const override;
|
||||
virtual EaseBounce* reverse() const override;
|
||||
virtual EaseBounceIn* clone() const override;
|
||||
virtual EaseBounce* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseBounceIn() {}
|
||||
|
|
@ -478,8 +514,8 @@ public:
|
|||
|
||||
// Overrides
|
||||
virtual void update(float time) override;
|
||||
virtual EaseBounceOut* clone() const override;
|
||||
virtual EaseBounce* reverse() const override;
|
||||
virtual EaseBounceOut* clone() const override;
|
||||
virtual EaseBounce* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseBounceOut() {}
|
||||
|
|
@ -503,8 +539,8 @@ public:
|
|||
|
||||
// Overrides
|
||||
virtual void update(float time) override;
|
||||
virtual EaseBounceInOut* clone() const override;
|
||||
virtual EaseBounceInOut* reverse() const override;
|
||||
virtual EaseBounceInOut* clone() const override;
|
||||
virtual EaseBounceInOut* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseBounceInOut() {}
|
||||
|
|
@ -528,8 +564,8 @@ public:
|
|||
|
||||
// Overrides
|
||||
virtual void update(float time) override;
|
||||
virtual EaseBackIn* clone() const override;
|
||||
virtual ActionEase* reverse() const override;
|
||||
virtual EaseBackIn* clone() const override;
|
||||
virtual ActionEase* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseBackIn() {}
|
||||
|
|
@ -553,8 +589,8 @@ public:
|
|||
|
||||
// Overrides
|
||||
virtual void update(float time) override;
|
||||
virtual EaseBackOut* clone() const override;
|
||||
virtual ActionEase* reverse() const override;
|
||||
virtual EaseBackOut* clone() const override;
|
||||
virtual ActionEase* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseBackOut() {}
|
||||
|
|
@ -578,8 +614,8 @@ public:
|
|||
|
||||
// Overrides
|
||||
virtual void update(float time) override;
|
||||
virtual EaseBackInOut* clone() const override;
|
||||
virtual EaseBackInOut* reverse() const override;
|
||||
virtual EaseBackInOut* clone() const override;
|
||||
virtual EaseBackInOut* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseBackInOut() {}
|
||||
|
|
@ -594,52 +630,52 @@ private:
|
|||
@brief Ease Bezier
|
||||
@ingroup Actions
|
||||
*/
|
||||
class EaseBezierAction : public cocos2d::ActionEase
|
||||
class CC_DLL EaseBezierAction : public ActionEase
|
||||
{
|
||||
public:
|
||||
/** creates the action */
|
||||
static EaseBezierAction* create(cocos2d::ActionInterval* action);
|
||||
/** creates the action */
|
||||
static EaseBezierAction* create(ActionInterval* action);
|
||||
|
||||
virtual void update(float time) override;
|
||||
virtual EaseBezierAction* clone() const override;
|
||||
virtual EaseBezierAction* reverse() const override;
|
||||
virtual void update(float time) override;
|
||||
virtual EaseBezierAction* clone() const override;
|
||||
virtual EaseBezierAction* reverse() const override;
|
||||
|
||||
virtual void setBezierParamer( float p0, float p1, float p2, float p3);
|
||||
virtual void setBezierParamer( float p0, float p1, float p2, float p3);
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseBezierAction() {}
|
||||
virtual ~EaseBezierAction() {}
|
||||
EaseBezierAction() {}
|
||||
virtual ~EaseBezierAction() {}
|
||||
|
||||
protected:
|
||||
float _p0;
|
||||
float _p1;
|
||||
float _p2;
|
||||
float _p3;
|
||||
float _p0;
|
||||
float _p1;
|
||||
float _p2;
|
||||
float _p3;
|
||||
|
||||
private:
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseBezierAction);
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseBezierAction);
|
||||
};
|
||||
|
||||
/**
|
||||
@brief Ease Quadratic In
|
||||
@ingroup Actions
|
||||
*/
|
||||
class EaseQuadraticActionIn:public cocos2d::ActionEase
|
||||
class CC_DLL EaseQuadraticActionIn : public ActionEase
|
||||
{
|
||||
public:
|
||||
/** creates the action */
|
||||
static EaseQuadraticActionIn* create(cocos2d::ActionInterval* action);
|
||||
/** creates the action */
|
||||
static EaseQuadraticActionIn* create(ActionInterval* action);
|
||||
|
||||
virtual void update(float time) override;
|
||||
virtual EaseQuadraticActionIn* clone() const override;
|
||||
virtual EaseQuadraticActionIn* reverse() const override;
|
||||
virtual void update(float time) override;
|
||||
virtual EaseQuadraticActionIn* clone() const override;
|
||||
virtual EaseQuadraticActionIn* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseQuadraticActionIn() {}
|
||||
virtual ~EaseQuadraticActionIn() {}
|
||||
EaseQuadraticActionIn() {}
|
||||
virtual ~EaseQuadraticActionIn() {}
|
||||
|
||||
private:
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseQuadraticActionIn);
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseQuadraticActionIn);
|
||||
|
||||
};
|
||||
|
||||
|
|
@ -647,22 +683,22 @@ private:
|
|||
@brief Ease Quadratic Out
|
||||
@ingroup Actions
|
||||
*/
|
||||
class EaseQuadraticActionOut:public cocos2d::ActionEase
|
||||
class CC_DLL EaseQuadraticActionOut : public ActionEase
|
||||
{
|
||||
public:
|
||||
/** creates the action */
|
||||
static EaseQuadraticActionOut* create(cocos2d::ActionInterval* action);
|
||||
/** creates the action */
|
||||
static EaseQuadraticActionOut* create(ActionInterval* action);
|
||||
|
||||
virtual void update(float time) override;
|
||||
virtual EaseQuadraticActionOut* clone() const override;
|
||||
virtual EaseQuadraticActionOut* reverse() const override;
|
||||
virtual void update(float time) override;
|
||||
virtual EaseQuadraticActionOut* clone() const override;
|
||||
virtual EaseQuadraticActionOut* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseQuadraticActionOut() {}
|
||||
virtual ~EaseQuadraticActionOut() {}
|
||||
EaseQuadraticActionOut() {}
|
||||
virtual ~EaseQuadraticActionOut() {}
|
||||
|
||||
private:
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseQuadraticActionOut);
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseQuadraticActionOut);
|
||||
|
||||
};
|
||||
|
||||
|
|
@ -670,88 +706,88 @@ private:
|
|||
@brief Ease Quadratic InOut
|
||||
@ingroup Actions
|
||||
*/
|
||||
class EaseQuadraticActionInOut:public cocos2d::ActionEase
|
||||
class CC_DLL EaseQuadraticActionInOut : public ActionEase
|
||||
{
|
||||
public:
|
||||
/** creates the action */
|
||||
static EaseQuadraticActionInOut* create(cocos2d::ActionInterval* action);
|
||||
/** creates the action */
|
||||
static EaseQuadraticActionInOut* create(ActionInterval* action);
|
||||
|
||||
virtual void update(float time) override;
|
||||
virtual EaseQuadraticActionInOut* clone() const override;
|
||||
virtual EaseQuadraticActionInOut* reverse() const override;
|
||||
virtual void update(float time) override;
|
||||
virtual EaseQuadraticActionInOut* clone() const override;
|
||||
virtual EaseQuadraticActionInOut* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseQuadraticActionInOut() {}
|
||||
virtual ~EaseQuadraticActionInOut() {}
|
||||
EaseQuadraticActionInOut() {}
|
||||
virtual ~EaseQuadraticActionInOut() {}
|
||||
|
||||
private:
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseQuadraticActionInOut);
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseQuadraticActionInOut);
|
||||
};
|
||||
|
||||
/**
|
||||
@brief Ease Quartic In
|
||||
@ingroup Actions
|
||||
*/
|
||||
class EaseQuarticActionIn:public cocos2d::ActionEase
|
||||
class CC_DLL EaseQuarticActionIn : public ActionEase
|
||||
{
|
||||
public:
|
||||
/** creates the action */
|
||||
static EaseQuarticActionIn* create(cocos2d::ActionInterval* action);
|
||||
/** creates the action */
|
||||
static EaseQuarticActionIn* create(ActionInterval* action);
|
||||
|
||||
virtual void update(float time) override;
|
||||
virtual EaseQuarticActionIn* clone() const override;
|
||||
virtual EaseQuarticActionIn* reverse() const override;
|
||||
virtual void update(float time) override;
|
||||
virtual EaseQuarticActionIn* clone() const override;
|
||||
virtual EaseQuarticActionIn* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseQuarticActionIn() {}
|
||||
virtual ~EaseQuarticActionIn() {}
|
||||
EaseQuarticActionIn() {}
|
||||
virtual ~EaseQuarticActionIn() {}
|
||||
|
||||
private:
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseQuarticActionIn);
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseQuarticActionIn);
|
||||
};
|
||||
|
||||
/**
|
||||
@brief Ease Quartic Out
|
||||
@ingroup Actions
|
||||
*/
|
||||
class EaseQuarticActionOut:public cocos2d::ActionEase
|
||||
class CC_DLL EaseQuarticActionOut : public ActionEase
|
||||
{
|
||||
public:
|
||||
/** creates the action */
|
||||
static EaseQuarticActionOut* create(cocos2d::ActionInterval* action);
|
||||
/** creates the action */
|
||||
static EaseQuarticActionOut* create(ActionInterval* action);
|
||||
|
||||
virtual void update(float time) override;
|
||||
virtual EaseQuarticActionOut* clone() const override;
|
||||
virtual EaseQuarticActionOut* reverse() const override;
|
||||
virtual void update(float time) override;
|
||||
virtual EaseQuarticActionOut* clone() const override;
|
||||
virtual EaseQuarticActionOut* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseQuarticActionOut() {}
|
||||
virtual ~EaseQuarticActionOut() {}
|
||||
EaseQuarticActionOut() {}
|
||||
virtual ~EaseQuarticActionOut() {}
|
||||
|
||||
private:
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseQuarticActionOut);
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseQuarticActionOut);
|
||||
};
|
||||
|
||||
/**
|
||||
@brief Ease Quartic InOut
|
||||
@ingroup Actions
|
||||
*/
|
||||
class EaseQuarticActionInOut:public cocos2d::ActionEase
|
||||
class CC_DLL EaseQuarticActionInOut : public ActionEase
|
||||
{
|
||||
public:
|
||||
/** creates the action */
|
||||
static EaseQuarticActionInOut* create(cocos2d::ActionInterval* action);
|
||||
/** creates the action */
|
||||
static EaseQuarticActionInOut* create(ActionInterval* action);
|
||||
|
||||
virtual void update(float time) override;
|
||||
virtual EaseQuarticActionInOut* clone() const override;
|
||||
virtual EaseQuarticActionInOut* reverse() const override;
|
||||
virtual void update(float time) override;
|
||||
virtual EaseQuarticActionInOut* clone() const override;
|
||||
virtual EaseQuarticActionInOut* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseQuarticActionInOut() {}
|
||||
virtual ~EaseQuarticActionInOut() {}
|
||||
EaseQuarticActionInOut() {}
|
||||
virtual ~EaseQuarticActionInOut() {}
|
||||
|
||||
private:
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseQuarticActionInOut);
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseQuarticActionInOut);
|
||||
};
|
||||
|
||||
|
||||
|
|
@ -759,198 +795,198 @@ private:
|
|||
@brief Ease Quintic In
|
||||
@ingroup Actions
|
||||
*/
|
||||
class EaseQuinticActionIn:public cocos2d::ActionEase
|
||||
class CC_DLL EaseQuinticActionIn : public ActionEase
|
||||
{
|
||||
public:
|
||||
/** creates the action */
|
||||
static EaseQuinticActionIn* create(cocos2d::ActionInterval* action);
|
||||
/** creates the action */
|
||||
static EaseQuinticActionIn* create(ActionInterval* action);
|
||||
|
||||
virtual void update(float time) override;
|
||||
virtual EaseQuinticActionIn* clone() const override;
|
||||
virtual EaseQuinticActionIn* reverse() const override;
|
||||
virtual void update(float time) override;
|
||||
virtual EaseQuinticActionIn* clone() const override;
|
||||
virtual EaseQuinticActionIn* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseQuinticActionIn() {}
|
||||
virtual ~EaseQuinticActionIn() {}
|
||||
EaseQuinticActionIn() {}
|
||||
virtual ~EaseQuinticActionIn() {}
|
||||
|
||||
private:
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseQuinticActionIn);
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseQuinticActionIn);
|
||||
};
|
||||
|
||||
/**
|
||||
@brief Ease Quintic Out
|
||||
@ingroup Actions
|
||||
*/
|
||||
class EaseQuinticActionOut:public cocos2d::ActionEase
|
||||
class CC_DLL EaseQuinticActionOut : public ActionEase
|
||||
{
|
||||
public:
|
||||
/** creates the action */
|
||||
static EaseQuinticActionOut* create(cocos2d::ActionInterval* action);
|
||||
/** creates the action */
|
||||
static EaseQuinticActionOut* create(ActionInterval* action);
|
||||
|
||||
virtual void update(float time) override;
|
||||
virtual EaseQuinticActionOut* clone() const override;
|
||||
virtual EaseQuinticActionOut* reverse() const override;
|
||||
virtual void update(float time) override;
|
||||
virtual EaseQuinticActionOut* clone() const override;
|
||||
virtual EaseQuinticActionOut* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseQuinticActionOut() {}
|
||||
virtual ~EaseQuinticActionOut() {}
|
||||
EaseQuinticActionOut() {}
|
||||
virtual ~EaseQuinticActionOut() {}
|
||||
|
||||
private:
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseQuinticActionOut);
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseQuinticActionOut);
|
||||
};
|
||||
|
||||
/**
|
||||
@brief Ease Quintic InOut
|
||||
@ingroup Actions
|
||||
*/
|
||||
class EaseQuinticActionInOut:public cocos2d::ActionEase
|
||||
class CC_DLL EaseQuinticActionInOut : public ActionEase
|
||||
{
|
||||
public:
|
||||
/** creates the action */
|
||||
static EaseQuinticActionInOut* create(cocos2d::ActionInterval* action);
|
||||
/** creates the action */
|
||||
static EaseQuinticActionInOut* create(ActionInterval* action);
|
||||
|
||||
virtual void update(float time) override;
|
||||
virtual EaseQuinticActionInOut* clone() const override;
|
||||
virtual EaseQuinticActionInOut* reverse() const override;
|
||||
virtual void update(float time) override;
|
||||
virtual EaseQuinticActionInOut* clone() const override;
|
||||
virtual EaseQuinticActionInOut* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseQuinticActionInOut() {}
|
||||
virtual ~EaseQuinticActionInOut() {}
|
||||
EaseQuinticActionInOut() {}
|
||||
virtual ~EaseQuinticActionInOut() {}
|
||||
|
||||
private:
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseQuinticActionInOut);
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseQuinticActionInOut);
|
||||
};
|
||||
|
||||
/**
|
||||
@brief Ease Circle In
|
||||
@ingroup Actions
|
||||
*/
|
||||
class EaseCircleActionIn:public cocos2d::ActionEase
|
||||
class CC_DLL EaseCircleActionIn : public ActionEase
|
||||
{
|
||||
public:
|
||||
/** creates the action */
|
||||
static EaseCircleActionIn* create(cocos2d::ActionInterval* action);
|
||||
/** creates the action */
|
||||
static EaseCircleActionIn* create(ActionInterval* action);
|
||||
|
||||
virtual void update(float time) override;
|
||||
virtual EaseCircleActionIn* clone() const override;
|
||||
virtual EaseCircleActionIn* reverse() const override;
|
||||
virtual void update(float time) override;
|
||||
virtual EaseCircleActionIn* clone() const override;
|
||||
virtual EaseCircleActionIn* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseCircleActionIn() {}
|
||||
virtual ~EaseCircleActionIn() {}
|
||||
EaseCircleActionIn() {}
|
||||
virtual ~EaseCircleActionIn() {}
|
||||
|
||||
private:
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseCircleActionIn);
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseCircleActionIn);
|
||||
};
|
||||
|
||||
/**
|
||||
@brief Ease Circle Out
|
||||
@ingroup Actions
|
||||
*/
|
||||
class EaseCircleActionOut:public cocos2d::ActionEase
|
||||
class CC_DLL EaseCircleActionOut : public ActionEase
|
||||
{
|
||||
public:
|
||||
/** creates the action */
|
||||
static EaseCircleActionOut* create(cocos2d::ActionInterval* action);
|
||||
/** creates the action */
|
||||
static EaseCircleActionOut* create(ActionInterval* action);
|
||||
|
||||
virtual void update(float time) override;
|
||||
virtual EaseCircleActionOut* clone() const override;
|
||||
virtual EaseCircleActionOut* reverse() const override;
|
||||
virtual void update(float time) override;
|
||||
virtual EaseCircleActionOut* clone() const override;
|
||||
virtual EaseCircleActionOut* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseCircleActionOut() {}
|
||||
virtual ~EaseCircleActionOut() {}
|
||||
EaseCircleActionOut() {}
|
||||
virtual ~EaseCircleActionOut() {}
|
||||
|
||||
private:
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseCircleActionOut);
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseCircleActionOut);
|
||||
};
|
||||
|
||||
/**
|
||||
@brief Ease Circle InOut
|
||||
@ingroup Actions
|
||||
*/
|
||||
class EaseCircleActionInOut:public cocos2d::ActionEase
|
||||
class CC_DLL EaseCircleActionInOut:public ActionEase
|
||||
{
|
||||
public:
|
||||
/** creates the action */
|
||||
static EaseCircleActionInOut* create(cocos2d::ActionInterval* action);
|
||||
/** creates the action */
|
||||
static EaseCircleActionInOut* create(ActionInterval* action);
|
||||
|
||||
virtual void update(float time) override;
|
||||
virtual EaseCircleActionInOut* clone() const override;
|
||||
virtual EaseCircleActionInOut* reverse() const override;
|
||||
virtual void update(float time) override;
|
||||
virtual EaseCircleActionInOut* clone() const override;
|
||||
virtual EaseCircleActionInOut* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseCircleActionInOut() {}
|
||||
virtual ~EaseCircleActionInOut() {}
|
||||
EaseCircleActionInOut() {}
|
||||
virtual ~EaseCircleActionInOut() {}
|
||||
|
||||
private:
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseCircleActionInOut);
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseCircleActionInOut);
|
||||
};
|
||||
|
||||
/**
|
||||
@brief Ease Cubic In
|
||||
@ingroup Actions
|
||||
*/
|
||||
class EaseCubicActionIn:public cocos2d::ActionEase
|
||||
class CC_DLL EaseCubicActionIn:public ActionEase
|
||||
{
|
||||
public:
|
||||
/** creates the action */
|
||||
static EaseCubicActionIn* create(cocos2d::ActionInterval* action);
|
||||
/** creates the action */
|
||||
static EaseCubicActionIn* create(ActionInterval* action);
|
||||
|
||||
virtual void update(float time) override;
|
||||
virtual EaseCubicActionIn* clone() const override;
|
||||
virtual EaseCubicActionIn* reverse() const override;
|
||||
virtual void update(float time) override;
|
||||
virtual EaseCubicActionIn* clone() const override;
|
||||
virtual EaseCubicActionIn* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseCubicActionIn() {}
|
||||
virtual ~EaseCubicActionIn() {}
|
||||
EaseCubicActionIn() {}
|
||||
virtual ~EaseCubicActionIn() {}
|
||||
|
||||
private:
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseCubicActionIn);
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseCubicActionIn);
|
||||
};
|
||||
|
||||
/**
|
||||
@brief Ease Cubic Out
|
||||
@ingroup Actions
|
||||
*/
|
||||
class EaseCubicActionOut:public cocos2d::ActionEase
|
||||
class CC_DLL EaseCubicActionOut : public ActionEase
|
||||
{
|
||||
public:
|
||||
/** creates the action */
|
||||
static EaseCubicActionOut* create(cocos2d::ActionInterval* action);
|
||||
/** creates the action */
|
||||
static EaseCubicActionOut* create(ActionInterval* action);
|
||||
|
||||
virtual void update(float time) override;
|
||||
virtual EaseCubicActionOut* clone() const override;
|
||||
virtual EaseCubicActionOut* reverse() const override;
|
||||
virtual void update(float time) override;
|
||||
virtual EaseCubicActionOut* clone() const override;
|
||||
virtual EaseCubicActionOut* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseCubicActionOut() {}
|
||||
virtual ~EaseCubicActionOut() {}
|
||||
EaseCubicActionOut() {}
|
||||
virtual ~EaseCubicActionOut() {}
|
||||
|
||||
private:
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseCubicActionOut);
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseCubicActionOut);
|
||||
};
|
||||
|
||||
/**
|
||||
@brief Ease Cubic InOut
|
||||
@ingroup Actions
|
||||
*/
|
||||
class EaseCubicActionInOut:public cocos2d::ActionEase
|
||||
class CC_DLL EaseCubicActionInOut : public ActionEase
|
||||
{
|
||||
public:
|
||||
/** creates the action */
|
||||
static EaseCubicActionInOut* create(cocos2d::ActionInterval* action);
|
||||
/** creates the action */
|
||||
static EaseCubicActionInOut* create(ActionInterval* action);
|
||||
|
||||
virtual void update(float time) override;
|
||||
virtual EaseCubicActionInOut* clone() const override;
|
||||
virtual EaseCubicActionInOut* reverse() const override;
|
||||
virtual void update(float time) override;
|
||||
virtual EaseCubicActionInOut* clone() const override;
|
||||
virtual EaseCubicActionInOut* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
EaseCubicActionInOut() {}
|
||||
virtual ~EaseCubicActionInOut() {}
|
||||
EaseCubicActionInOut() {}
|
||||
virtual ~EaseCubicActionInOut() {}
|
||||
|
||||
private:
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseCubicActionInOut);
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(EaseCubicActionInOut);
|
||||
};
|
||||
|
||||
// end of actions group
|
||||
|
|
|
|||
|
|
@ -48,7 +48,11 @@ public:
|
|||
virtual GridBase* getGrid();
|
||||
|
||||
// overrides
|
||||
virtual GridAction * clone() const override = 0;
|
||||
virtual GridAction * clone() const override
|
||||
{
|
||||
CC_ASSERT(0);
|
||||
return nullptr;
|
||||
}
|
||||
virtual GridAction* reverse() const override;
|
||||
virtual void startWithTarget(Node *target) override;
|
||||
|
||||
|
|
@ -109,7 +113,11 @@ public:
|
|||
void setVertex(const Vec2& position, const Vec3& vertex);
|
||||
|
||||
// Overrides
|
||||
virtual Grid3DAction * clone() const override = 0;
|
||||
virtual Grid3DAction * clone() const override
|
||||
{
|
||||
CC_ASSERT(0);
|
||||
return nullptr;
|
||||
}
|
||||
};
|
||||
|
||||
/** @brief Base class for TiledGrid3D actions */
|
||||
|
|
@ -156,7 +164,11 @@ public:
|
|||
virtual GridBase* getGrid();
|
||||
|
||||
// Override
|
||||
virtual TiledGrid3DAction * clone() const override = 0;
|
||||
virtual TiledGrid3DAction * clone() const override
|
||||
{
|
||||
CC_ASSERT(0);
|
||||
return nullptr;
|
||||
}
|
||||
};
|
||||
|
||||
/** @brief AccelDeccelAmplitude action */
|
||||
|
|
@ -174,8 +186,8 @@ public:
|
|||
// Overrides
|
||||
virtual void startWithTarget(Node *target) override;
|
||||
virtual void update(float time) override;
|
||||
virtual AccelDeccelAmplitude* clone() const override;
|
||||
virtual AccelDeccelAmplitude* reverse() const override;
|
||||
virtual AccelDeccelAmplitude* clone() const override;
|
||||
virtual AccelDeccelAmplitude* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
AccelDeccelAmplitude() {}
|
||||
|
|
@ -207,8 +219,8 @@ public:
|
|||
// Overrides
|
||||
virtual void startWithTarget(Node *target) override;
|
||||
virtual void update(float time) override;
|
||||
virtual AccelAmplitude* clone() const override;
|
||||
virtual AccelAmplitude* reverse() const override;
|
||||
virtual AccelAmplitude* clone() const override;
|
||||
virtual AccelAmplitude* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
AccelAmplitude() {}
|
||||
|
|
@ -239,8 +251,8 @@ public:
|
|||
// overrides
|
||||
virtual void startWithTarget(Node *target) override;
|
||||
virtual void update(float time) override;
|
||||
virtual DeccelAmplitude* clone() const override;
|
||||
virtual DeccelAmplitude* reverse() const override;
|
||||
virtual DeccelAmplitude* clone() const override;
|
||||
virtual DeccelAmplitude* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
DeccelAmplitude() {}
|
||||
|
|
@ -270,8 +282,8 @@ public:
|
|||
|
||||
// Overrides
|
||||
virtual void startWithTarget(Node *target) override;
|
||||
virtual StopGrid* clone() const override;
|
||||
virtual StopGrid* reverse() const override;
|
||||
virtual StopGrid* clone() const override;
|
||||
virtual StopGrid* reverse() const override;
|
||||
|
||||
protected:
|
||||
StopGrid() {}
|
||||
|
|
@ -294,8 +306,8 @@ public:
|
|||
|
||||
// Override
|
||||
virtual void startWithTarget(Node *target) override;
|
||||
virtual ReuseGrid* clone() const override;
|
||||
virtual ReuseGrid* reverse() const override;
|
||||
virtual ReuseGrid* clone() const override;
|
||||
virtual ReuseGrid* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
ReuseGrid() {}
|
||||
|
|
|
|||
|
|
@ -51,8 +51,18 @@ public:
|
|||
//
|
||||
// Overrides
|
||||
//
|
||||
virtual ActionInstant* clone() const override = 0;
|
||||
virtual ActionInstant * reverse() const override = 0;
|
||||
virtual ActionInstant* clone() const override
|
||||
{
|
||||
CC_ASSERT(0);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
virtual ActionInstant * reverse() const override
|
||||
{
|
||||
CC_ASSERT(0);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
virtual bool isDone() const override;
|
||||
virtual void step(float dt) override;
|
||||
virtual void update(float time) override;
|
||||
|
|
@ -72,7 +82,7 @@ public:
|
|||
//
|
||||
virtual void update(float time) override;
|
||||
virtual ActionInstant* reverse() const override;
|
||||
virtual Show* clone() const override;
|
||||
virtual Show* clone() const override;
|
||||
|
||||
protected:
|
||||
Show(){}
|
||||
|
|
@ -95,8 +105,8 @@ public:
|
|||
// Overrides
|
||||
//
|
||||
virtual void update(float time) override;
|
||||
virtual ActionInstant* reverse() const override;
|
||||
virtual Hide* clone() const override;
|
||||
virtual ActionInstant* reverse() const override;
|
||||
virtual Hide* clone() const override;
|
||||
|
||||
protected:
|
||||
Hide(){}
|
||||
|
|
@ -118,8 +128,8 @@ public:
|
|||
// Overrides
|
||||
//
|
||||
virtual void update(float time) override;
|
||||
virtual ToggleVisibility* reverse() const override;
|
||||
virtual ToggleVisibility* clone() const override;
|
||||
virtual ToggleVisibility* reverse() const override;
|
||||
virtual ToggleVisibility* clone() const override;
|
||||
|
||||
protected:
|
||||
ToggleVisibility(){}
|
||||
|
|
@ -135,25 +145,25 @@ private:
|
|||
class CC_DLL RemoveSelf : public ActionInstant
|
||||
{
|
||||
public:
|
||||
/** create the action */
|
||||
static RemoveSelf * create(bool isNeedCleanUp = true);
|
||||
/** create the action */
|
||||
static RemoveSelf * create(bool isNeedCleanUp = true);
|
||||
|
||||
//
|
||||
//
|
||||
// Override
|
||||
//
|
||||
virtual void update(float time) override;
|
||||
virtual RemoveSelf* clone() const override;
|
||||
virtual RemoveSelf* reverse() const override;
|
||||
virtual void update(float time) override;
|
||||
virtual RemoveSelf* clone() const override;
|
||||
virtual RemoveSelf* reverse() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
RemoveSelf() : _isNeedCleanUp(true){}
|
||||
virtual ~RemoveSelf(){}
|
||||
|
||||
/** init the action */
|
||||
bool init(bool isNeedCleanUp);
|
||||
/** init the action */
|
||||
bool init(bool isNeedCleanUp);
|
||||
|
||||
protected:
|
||||
bool _isNeedCleanUp;
|
||||
bool _isNeedCleanUp;
|
||||
|
||||
private:
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(RemoveSelf);
|
||||
|
|
@ -173,8 +183,8 @@ public:
|
|||
// Overrides
|
||||
//
|
||||
virtual void update(float time) override;
|
||||
virtual FlipX* reverse() const override;
|
||||
virtual FlipX* clone() const override;
|
||||
virtual FlipX* reverse() const override;
|
||||
virtual FlipX* clone() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
FlipX() :_flipX(false) {}
|
||||
|
|
@ -204,8 +214,8 @@ public:
|
|||
// Overrides
|
||||
//
|
||||
virtual void update(float time) override;
|
||||
virtual FlipY* reverse() const override;
|
||||
virtual FlipY* clone() const override;
|
||||
virtual FlipY* reverse() const override;
|
||||
virtual FlipY* clone() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
FlipY() :_flipY(false) {}
|
||||
|
|
@ -234,8 +244,8 @@ public:
|
|||
// Overrides
|
||||
//
|
||||
virtual void update(float time) override;
|
||||
virtual Place* reverse() const override;
|
||||
virtual Place* clone() const override;
|
||||
virtual Place* reverse() const override;
|
||||
virtual Place* clone() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
Place(){}
|
||||
|
|
@ -257,18 +267,18 @@ private:
|
|||
class CC_DLL CallFunc : public ActionInstant //<NSCopying>
|
||||
{
|
||||
public:
|
||||
/** creates the action with the callback of type std::function<void()>.
|
||||
This is the preferred way to create the callback.
|
||||
/** creates the action with the callback of type std::function<void()>.
|
||||
This is the preferred way to create the callback.
|
||||
* When this funtion bound in js or lua ,the input param will be changed
|
||||
* In js: var create(var func, var this, var [data]) or var create(var func)
|
||||
* In lua:local create(local funcID)
|
||||
*/
|
||||
*/
|
||||
static CallFunc * create(const std::function<void()>& func);
|
||||
|
||||
/** creates the action with the callback
|
||||
|
||||
typedef void (Ref::*SEL_CallFunc)();
|
||||
@deprecated Use the std::function API instead.
|
||||
@deprecated Use the std::function API instead.
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
|
|
@ -296,8 +306,8 @@ public:
|
|||
// Overrides
|
||||
//
|
||||
virtual void update(float time) override;
|
||||
virtual CallFunc* reverse() const override;
|
||||
virtual CallFunc* clone() const override;
|
||||
virtual CallFunc* reverse() const override;
|
||||
virtual CallFunc* clone() const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
CallFunc()
|
||||
|
|
@ -308,16 +318,16 @@ CC_CONSTRUCTOR_ACCESS:
|
|||
}
|
||||
virtual ~CallFunc();
|
||||
|
||||
/** initializes the action with the callback
|
||||
/** initializes the action with the callback
|
||||
typedef void (Ref::*SEL_CallFunc)();
|
||||
@deprecated Use the std::function API instead.
|
||||
*/
|
||||
CC_DEPRECATED_ATTRIBUTE bool initWithTarget(Ref* target);
|
||||
|
||||
/** initializes the action with the std::function<void()>
|
||||
/** initializes the action with the std::function<void()>
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
*/
|
||||
bool initWithFunction(const std::function<void()>& func);
|
||||
|
||||
protected:
|
||||
|
|
@ -331,7 +341,7 @@ protected:
|
|||
};
|
||||
|
||||
/** function that will be called */
|
||||
std::function<void()> _function;
|
||||
std::function<void()> _function;
|
||||
|
||||
private:
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(CallFunc);
|
||||
|
|
@ -345,8 +355,8 @@ class CC_DLL CallFuncN : public CallFunc
|
|||
{
|
||||
public:
|
||||
/** creates the action with the callback of type std::function<void()>.
|
||||
This is the preferred way to create the callback.
|
||||
*/
|
||||
This is the preferred way to create the callback.
|
||||
*/
|
||||
static CallFuncN * create(const std::function<void(Node*)>& func);
|
||||
|
||||
/** creates the action with the callback
|
||||
|
|
@ -359,7 +369,7 @@ public:
|
|||
//
|
||||
// Overrides
|
||||
//
|
||||
virtual CallFuncN* clone() const override;
|
||||
virtual CallFuncN* clone() const override;
|
||||
virtual void execute() override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
|
|
@ -399,7 +409,7 @@ public:
|
|||
//
|
||||
// Overrides
|
||||
//
|
||||
virtual __CCCallFuncND* clone() const override;
|
||||
virtual __CCCallFuncND* clone() const override;
|
||||
virtual void execute() override;
|
||||
|
||||
protected:
|
||||
|
|
@ -435,7 +445,7 @@ public:
|
|||
//
|
||||
// Overrides
|
||||
//
|
||||
virtual __CCCallFuncO* clone() const override;
|
||||
virtual __CCCallFuncO* clone() const override;
|
||||
virtual void execute() override;
|
||||
|
||||
Ref* getObject() const;
|
||||
|
|
|
|||
|
|
@ -77,8 +77,17 @@ public:
|
|||
virtual bool isDone(void) const override;
|
||||
virtual void step(float dt) override;
|
||||
virtual void startWithTarget(Node *target) override;
|
||||
virtual ActionInterval* reverse() const override = 0;
|
||||
virtual ActionInterval *clone() const override = 0;
|
||||
virtual ActionInterval* reverse() const override
|
||||
{
|
||||
CC_ASSERT(0);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
virtual ActionInterval *clone() const override
|
||||
{
|
||||
CC_ASSERT(0);
|
||||
return nullptr;
|
||||
}
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
/** initializes the action */
|
||||
|
|
@ -132,7 +141,7 @@ public:
|
|||
// Overrides
|
||||
//
|
||||
virtual Sequence* clone() const override;
|
||||
virtual Sequence* reverse() const override;
|
||||
virtual Sequence* reverse() const override;
|
||||
virtual void startWithTarget(Node *target) override;
|
||||
virtual void stop(void) override;
|
||||
virtual void update(float t) override;
|
||||
|
|
@ -181,7 +190,7 @@ public:
|
|||
// Overrides
|
||||
//
|
||||
virtual Repeat* clone() const override;
|
||||
virtual Repeat* reverse() const override;
|
||||
virtual Repeat* reverse() const override;
|
||||
virtual void startWithTarget(Node *target) override;
|
||||
virtual void stop(void) override;
|
||||
virtual void update(float dt) override;
|
||||
|
|
@ -235,7 +244,7 @@ public:
|
|||
// Overrides
|
||||
//
|
||||
virtual RepeatForever* clone() const override;
|
||||
virtual RepeatForever* reverse(void) const override;
|
||||
virtual RepeatForever* reverse(void) const override;
|
||||
virtual void startWithTarget(Node* target) override;
|
||||
virtual void step(float dt) override;
|
||||
virtual bool isDone(void) const override;
|
||||
|
|
@ -302,7 +311,7 @@ public:
|
|||
// Overrides
|
||||
//
|
||||
virtual Spawn* clone() const override;
|
||||
virtual Spawn* reverse(void) const override;
|
||||
virtual Spawn* reverse(void) const override;
|
||||
virtual void startWithTarget(Node *target) override;
|
||||
virtual void stop(void) override;
|
||||
virtual void update(float time) override;
|
||||
|
|
@ -379,7 +388,7 @@ public:
|
|||
// Override
|
||||
//
|
||||
virtual RotateBy* clone() const override;
|
||||
virtual RotateBy* reverse(void) const override;
|
||||
virtual RotateBy* reverse(void) const override;
|
||||
virtual void startWithTarget(Node *target) override;
|
||||
virtual void update(float time) override;
|
||||
|
||||
|
|
@ -423,7 +432,7 @@ public:
|
|||
// Overrides
|
||||
//
|
||||
virtual MoveBy* clone() const override;
|
||||
virtual MoveBy* reverse(void) const override;
|
||||
virtual MoveBy* reverse(void) const override;
|
||||
virtual void startWithTarget(Node *target) override;
|
||||
virtual void update(float time) override;
|
||||
|
||||
|
|
@ -487,7 +496,7 @@ public:
|
|||
// Overrides
|
||||
//
|
||||
virtual SkewTo* clone() const override;
|
||||
virtual SkewTo* reverse(void) const override;
|
||||
virtual SkewTo* reverse(void) const override;
|
||||
virtual void startWithTarget(Node *target) override;
|
||||
virtual void update(float time) override;
|
||||
|
||||
|
|
@ -525,7 +534,7 @@ public:
|
|||
//
|
||||
virtual void startWithTarget(Node *target) override;
|
||||
virtual SkewBy* clone() const override;
|
||||
virtual SkewBy* reverse(void) const override;
|
||||
virtual SkewBy* reverse(void) const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
SkewBy() {}
|
||||
|
|
@ -549,7 +558,7 @@ public:
|
|||
// Overrides
|
||||
//
|
||||
virtual JumpBy* clone() const override;
|
||||
virtual JumpBy* reverse(void) const override;
|
||||
virtual JumpBy* reverse(void) const override;
|
||||
virtual void startWithTarget(Node *target) override;
|
||||
virtual void update(float time) override;
|
||||
|
||||
|
|
@ -584,7 +593,7 @@ public:
|
|||
//
|
||||
virtual void startWithTarget(Node *target) override;
|
||||
virtual JumpTo* clone() const override;
|
||||
virtual JumpTo* reverse(void) const override;
|
||||
virtual JumpTo* reverse(void) const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
JumpTo() {}
|
||||
|
|
@ -623,7 +632,7 @@ public:
|
|||
// Overrides
|
||||
//
|
||||
virtual BezierBy* clone() const override;
|
||||
virtual BezierBy* reverse(void) const override;
|
||||
virtual BezierBy* reverse(void) const override;
|
||||
virtual void startWithTarget(Node *target) override;
|
||||
virtual void update(float time) override;
|
||||
|
||||
|
|
@ -663,7 +672,7 @@ public:
|
|||
//
|
||||
virtual void startWithTarget(Node *target) override;
|
||||
virtual BezierTo* clone() const override;
|
||||
virtual BezierTo* reverse(void) const override;
|
||||
virtual BezierTo* reverse(void) const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
BezierTo() {}
|
||||
|
|
@ -698,7 +707,7 @@ public:
|
|||
// Overrides
|
||||
//
|
||||
virtual ScaleTo* clone() const override;
|
||||
virtual ScaleTo* reverse(void) const override;
|
||||
virtual ScaleTo* reverse(void) const override;
|
||||
virtual void startWithTarget(Node *target) override;
|
||||
virtual void update(float time) override;
|
||||
|
||||
|
|
@ -751,7 +760,7 @@ public:
|
|||
//
|
||||
virtual void startWithTarget(Node *target) override;
|
||||
virtual ScaleBy* clone() const override;
|
||||
virtual ScaleBy* reverse(void) const override;
|
||||
virtual ScaleBy* reverse(void) const override;
|
||||
|
||||
CC_CONSTRUCTOR_ACCESS:
|
||||
ScaleBy() {}
|
||||
|
|
@ -773,7 +782,7 @@ public:
|
|||
// Overrides
|
||||
//
|
||||
virtual Blink* clone() const override;
|
||||
virtual Blink* reverse() const override;
|
||||
virtual Blink* reverse() const override;
|
||||
virtual void update(float time) override;
|
||||
virtual void startWithTarget(Node *target) override;
|
||||
virtual void stop() override;
|
||||
|
|
@ -807,7 +816,7 @@ public:
|
|||
// Overrides
|
||||
//
|
||||
virtual FadeTo* clone() const override;
|
||||
virtual FadeTo* reverse(void) const override;
|
||||
virtual FadeTo* reverse(void) const override;
|
||||
virtual void startWithTarget(Node *target) override;
|
||||
virtual void update(float time) override;
|
||||
|
||||
|
|
@ -841,7 +850,7 @@ public:
|
|||
//
|
||||
virtual void startWithTarget(Node *target) override;
|
||||
virtual FadeIn* clone() const override;
|
||||
virtual FadeTo* reverse(void) const override;
|
||||
virtual FadeTo* reverse(void) const override;
|
||||
|
||||
void setReverseAction(FadeTo* ac);
|
||||
|
||||
|
|
@ -868,7 +877,7 @@ public:
|
|||
//
|
||||
virtual void startWithTarget(Node *target) override;
|
||||
virtual FadeOut* clone() const override;
|
||||
virtual FadeTo* reverse(void) const override;
|
||||
virtual FadeTo* reverse(void) const override;
|
||||
|
||||
void setReverseAction(FadeTo* ac);
|
||||
|
||||
|
|
@ -893,7 +902,7 @@ public:
|
|||
// Overrides
|
||||
//
|
||||
virtual TintTo* clone() const override;
|
||||
virtual TintTo* reverse(void) const override;
|
||||
virtual TintTo* reverse(void) const override;
|
||||
virtual void startWithTarget(Node *target) override;
|
||||
virtual void update(float time) override;
|
||||
|
||||
|
|
@ -925,7 +934,7 @@ public:
|
|||
// Overrides
|
||||
//
|
||||
virtual TintBy* clone() const override;
|
||||
virtual TintBy* reverse() const override;
|
||||
virtual TintBy* reverse() const override;
|
||||
virtual void startWithTarget(Node *target) override;
|
||||
virtual void update(float time) override;
|
||||
|
||||
|
|
@ -988,7 +997,7 @@ public:
|
|||
//
|
||||
// Overrides
|
||||
//
|
||||
virtual ReverseTime* reverse() const override;
|
||||
virtual ReverseTime* reverse() const override;
|
||||
virtual ReverseTime* clone() const override;
|
||||
virtual void startWithTarget(Node *target) override;
|
||||
virtual void stop(void) override;
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ THE SOFTWARE.
|
|||
#include "base/CCRef.h"
|
||||
#include "base/CCMap.h"
|
||||
#include "base/CCValue.h"
|
||||
#include "2d/CCAnimation.h"
|
||||
|
||||
#include <string>
|
||||
|
||||
|
|
|
|||
|
|
@ -89,12 +89,33 @@ bool ComponentContainer::remove(const std::string& name)
|
|||
com->setOwner(nullptr);
|
||||
|
||||
_components->erase(iter);
|
||||
|
||||
ret = true;
|
||||
} while(0);
|
||||
return ret;
|
||||
}
|
||||
|
||||
bool ComponentContainer::remove(Component *com)
|
||||
{
|
||||
bool ret = false;
|
||||
do
|
||||
{
|
||||
CC_BREAK_IF(!_components);
|
||||
|
||||
for (auto iter = _components->begin(); iter != _components->end(); ++iter)
|
||||
{
|
||||
if (iter->second == com)
|
||||
{
|
||||
com->onExit();
|
||||
com->setOwner(nullptr);
|
||||
_components->erase(iter);
|
||||
break;
|
||||
}
|
||||
}
|
||||
ret = true;
|
||||
} while(0);
|
||||
return ret;
|
||||
}
|
||||
|
||||
void ComponentContainer::removeAll()
|
||||
{
|
||||
if (_components != nullptr)
|
||||
|
|
|
|||
|
|
@ -50,6 +50,7 @@ public:
|
|||
virtual Component* get(const std::string& name) const;
|
||||
virtual bool add(Component *com);
|
||||
virtual bool remove(const std::string& name);
|
||||
virtual bool remove(Component *com);
|
||||
virtual void removeAll();
|
||||
virtual void visit(float delta);
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -79,85 +79,85 @@ class PointArray;
|
|||
namespace DrawPrimitives
|
||||
{
|
||||
/** Initializes the drawing primitives */
|
||||
void init();
|
||||
void CC_DLL init();
|
||||
|
||||
/** Frees allocated resources by the drawing primitives */
|
||||
void free();
|
||||
void CC_DLL free();
|
||||
|
||||
/** draws a point given x and y coordinate measured in points */
|
||||
void drawPoint(const Vec2& point);
|
||||
void CC_DLL drawPoint(const Vec2& point);
|
||||
|
||||
/** draws an array of points.
|
||||
@since v0.7.2
|
||||
*/
|
||||
void drawPoints(const Vec2 *points, unsigned int numberOfPoints);
|
||||
void CC_DLL drawPoints(const Vec2 *points, unsigned int numberOfPoints);
|
||||
|
||||
/** draws a line given the origin and destination point measured in points */
|
||||
void drawLine(const Vec2& origin, const Vec2& destination);
|
||||
void CC_DLL drawLine(const Vec2& origin, const Vec2& destination);
|
||||
|
||||
/** draws a rectangle given the origin and destination point measured in points. */
|
||||
void drawRect(Vec2 origin, Vec2 destination);
|
||||
void CC_DLL drawRect(Vec2 origin, Vec2 destination);
|
||||
|
||||
/** draws a solid rectangle given the origin and destination point measured in points.
|
||||
@since 1.1
|
||||
*/
|
||||
void drawSolidRect(Vec2 origin, Vec2 destination, Color4F color);
|
||||
void CC_DLL drawSolidRect(Vec2 origin, Vec2 destination, Color4F color);
|
||||
|
||||
/** draws a polygon given a pointer to point coordinates and the number of vertices measured in points.
|
||||
The polygon can be closed or open
|
||||
*/
|
||||
void drawPoly(const Vec2 *vertices, unsigned int numOfVertices, bool closePolygon);
|
||||
void CC_DLL drawPoly(const Vec2 *vertices, unsigned int numOfVertices, bool closePolygon);
|
||||
|
||||
/** draws a solid polygon given a pointer to CGPoint coordinates, the number of vertices measured in points, and a color.
|
||||
*/
|
||||
void drawSolidPoly(const Vec2 *poli, unsigned int numberOfPoints, Color4F color);
|
||||
void CC_DLL drawSolidPoly(const Vec2 *poli, unsigned int numberOfPoints, Color4F color);
|
||||
|
||||
/** draws a circle given the center, radius and number of segments. */
|
||||
void drawCircle(const Vec2& center, float radius, float angle, unsigned int segments, bool drawLineToCenter, float scaleX, float scaleY);
|
||||
void drawCircle(const Vec2& center, float radius, float angle, unsigned int segments, bool drawLineToCenter);
|
||||
void CC_DLL drawCircle(const Vec2& center, float radius, float angle, unsigned int segments, bool drawLineToCenter, float scaleX, float scaleY);
|
||||
void CC_DLL drawCircle(const Vec2& center, float radius, float angle, unsigned int segments, bool drawLineToCenter);
|
||||
|
||||
/** draws a solid circle given the center, radius and number of segments. */
|
||||
void drawSolidCircle(const Vec2& center, float radius, float angle, unsigned int segments, float scaleX, float scaleY);
|
||||
void drawSolidCircle(const Vec2& center, float radius, float angle, unsigned int segments);
|
||||
void CC_DLL drawSolidCircle(const Vec2& center, float radius, float angle, unsigned int segments, float scaleX, float scaleY);
|
||||
void CC_DLL drawSolidCircle(const Vec2& center, float radius, float angle, unsigned int segments);
|
||||
|
||||
/** draws a quad bezier path
|
||||
@warning This function could be pretty slow. Use it only for debugging purposes.
|
||||
@since v0.8
|
||||
*/
|
||||
void drawQuadBezier(const Vec2& origin, const Vec2& control, const Vec2& destination, unsigned int segments);
|
||||
void CC_DLL drawQuadBezier(const Vec2& origin, const Vec2& control, const Vec2& destination, unsigned int segments);
|
||||
|
||||
/** draws a cubic bezier path
|
||||
@warning This function could be pretty slow. Use it only for debugging purposes.
|
||||
@since v0.8
|
||||
*/
|
||||
void drawCubicBezier(const Vec2& origin, const Vec2& control1, const Vec2& control2, const Vec2& destination, unsigned int segments);
|
||||
void CC_DLL drawCubicBezier(const Vec2& origin, const Vec2& control1, const Vec2& control2, const Vec2& destination, unsigned int segments);
|
||||
|
||||
/** draws a Catmull Rom path.
|
||||
@warning This function could be pretty slow. Use it only for debugging purposes.
|
||||
@since v2.0
|
||||
*/
|
||||
void drawCatmullRom(PointArray *arrayOfControlPoints, unsigned int segments);
|
||||
void CC_DLL drawCatmullRom(PointArray *arrayOfControlPoints, unsigned int segments);
|
||||
|
||||
/** draws a Cardinal Spline path.
|
||||
@warning This function could be pretty slow. Use it only for debugging purposes.
|
||||
@since v2.0
|
||||
*/
|
||||
void drawCardinalSpline(PointArray *config, float tension, unsigned int segments);
|
||||
void CC_DLL drawCardinalSpline(PointArray *config, float tension, unsigned int segments);
|
||||
|
||||
/** set the drawing color with 4 unsigned bytes
|
||||
@since v2.0
|
||||
*/
|
||||
void setDrawColor4B(GLubyte r, GLubyte g, GLubyte b, GLubyte a);
|
||||
void CC_DLL setDrawColor4B(GLubyte r, GLubyte g, GLubyte b, GLubyte a);
|
||||
|
||||
/** set the drawing color with 4 floats
|
||||
@since v2.0
|
||||
*/
|
||||
void setDrawColor4F(GLfloat r, GLfloat g, GLfloat b, GLfloat a);
|
||||
void CC_DLL setDrawColor4F(GLfloat r, GLfloat g, GLfloat b, GLfloat a);
|
||||
|
||||
/** set the point size in points. Default 1.
|
||||
@since v2.0
|
||||
*/
|
||||
void setPointSize(GLfloat pointSize);
|
||||
void CC_DLL setPointSize(GLfloat pointSize);
|
||||
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -49,15 +49,16 @@ THE SOFTWARE.
|
|||
#include <algorithm>
|
||||
|
||||
NS_CC_BEGIN
|
||||
namespace experimental {
|
||||
|
||||
const int FastTMXLayer::FAST_TMX_ORIENTATION_ORTHO = 0;
|
||||
const int FastTMXLayer::FAST_TMX_ORIENTATION_HEX = 1;
|
||||
const int FastTMXLayer::FAST_TMX_ORIENTATION_ISO = 2;
|
||||
const int TMXLayer::FAST_TMX_ORIENTATION_ORTHO = 0;
|
||||
const int TMXLayer::FAST_TMX_ORIENTATION_HEX = 1;
|
||||
const int TMXLayer::FAST_TMX_ORIENTATION_ISO = 2;
|
||||
|
||||
// FastTMXLayer - init & alloc & dealloc
|
||||
FastTMXLayer * FastTMXLayer::create(TMXTilesetInfo *tilesetInfo, TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo)
|
||||
TMXLayer * TMXLayer::create(TMXTilesetInfo *tilesetInfo, TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo)
|
||||
{
|
||||
FastTMXLayer *ret = new FastTMXLayer();
|
||||
TMXLayer *ret = new TMXLayer();
|
||||
if (ret->initWithTilesetInfo(tilesetInfo, layerInfo, mapInfo))
|
||||
{
|
||||
ret->autorelease();
|
||||
|
|
@ -66,7 +67,7 @@ FastTMXLayer * FastTMXLayer::create(TMXTilesetInfo *tilesetInfo, TMXLayerInfo *l
|
|||
return nullptr;
|
||||
}
|
||||
|
||||
bool FastTMXLayer::initWithTilesetInfo(TMXTilesetInfo *tilesetInfo, TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo)
|
||||
bool TMXLayer::initWithTilesetInfo(TMXTilesetInfo *tilesetInfo, TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo)
|
||||
{
|
||||
|
||||
if( tilesetInfo )
|
||||
|
|
@ -108,7 +109,7 @@ bool FastTMXLayer::initWithTilesetInfo(TMXTilesetInfo *tilesetInfo, TMXLayerInfo
|
|||
return true;
|
||||
}
|
||||
|
||||
FastTMXLayer::FastTMXLayer()
|
||||
TMXLayer::TMXLayer()
|
||||
: _layerName("")
|
||||
, _layerSize(Size::ZERO)
|
||||
, _mapTileSize(Size::ZERO)
|
||||
|
|
@ -124,7 +125,7 @@ FastTMXLayer::FastTMXLayer()
|
|||
_buffersVBO[0] = _buffersVBO[1] = 0;
|
||||
}
|
||||
|
||||
FastTMXLayer::~FastTMXLayer()
|
||||
TMXLayer::~TMXLayer()
|
||||
{
|
||||
CC_SAFE_RELEASE(_tileSet);
|
||||
CC_SAFE_RELEASE(_texture);
|
||||
|
|
@ -140,7 +141,7 @@ FastTMXLayer::~FastTMXLayer()
|
|||
}
|
||||
}
|
||||
|
||||
void FastTMXLayer::draw(Renderer *renderer, const Mat4& transform, uint32_t flags)
|
||||
void TMXLayer::draw(Renderer *renderer, const Mat4& transform, uint32_t flags)
|
||||
{
|
||||
updateTotalQuads();
|
||||
|
||||
|
|
@ -169,13 +170,13 @@ void FastTMXLayer::draw(Renderer *renderer, const Mat4& transform, uint32_t flag
|
|||
auto& cmd = _renderCommands[index++];
|
||||
|
||||
cmd.init(iter.first);
|
||||
cmd.func = CC_CALLBACK_0(FastTMXLayer::onDraw, this, _indicesVertexZOffsets[iter.first], iter.second);
|
||||
cmd.func = CC_CALLBACK_0(TMXLayer::onDraw, this, _indicesVertexZOffsets[iter.first], iter.second);
|
||||
renderer->addCommand(&cmd);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
void FastTMXLayer::onDraw(int offset, int count)
|
||||
void TMXLayer::onDraw(int offset, int count)
|
||||
{
|
||||
GL::bindTexture2D(_texture->getName());
|
||||
getGLProgramState()->apply(_modelViewTransform);
|
||||
|
|
@ -194,7 +195,7 @@ void FastTMXLayer::onDraw(int offset, int count)
|
|||
CC_INCREMENT_GL_DRAWN_BATCHES_AND_VERTICES(1, count * 4);
|
||||
}
|
||||
|
||||
void FastTMXLayer::updateTiles(const Rect& culledRect)
|
||||
void TMXLayer::updateTiles(const Rect& culledRect)
|
||||
{
|
||||
Rect visibleTiles = culledRect;
|
||||
Size mapTileSize = CC_SIZE_PIXELS_TO_POINTS(_mapTileSize);
|
||||
|
|
@ -287,7 +288,7 @@ void FastTMXLayer::updateTiles(const Rect& culledRect)
|
|||
|
||||
}
|
||||
|
||||
void FastTMXLayer::updateVertexBuffer()
|
||||
void TMXLayer::updateVertexBuffer()
|
||||
{
|
||||
GL::bindVAO(0);
|
||||
if(!glIsBuffer(_buffersVBO[0]))
|
||||
|
|
@ -300,7 +301,7 @@ void FastTMXLayer::updateVertexBuffer()
|
|||
glBindBuffer(GL_ARRAY_BUFFER, 0);
|
||||
}
|
||||
|
||||
void FastTMXLayer::updateIndexBuffer()
|
||||
void TMXLayer::updateIndexBuffer()
|
||||
{
|
||||
if(!glIsBuffer(_buffersVBO[1]))
|
||||
{
|
||||
|
|
@ -312,7 +313,7 @@ void FastTMXLayer::updateIndexBuffer()
|
|||
}
|
||||
|
||||
// FastTMXLayer - setup Tiles
|
||||
void FastTMXLayer::setupTiles()
|
||||
void TMXLayer::setupTiles()
|
||||
{
|
||||
// Optimization: quick hack that sets the image size on the tileset
|
||||
_tileSet->_imageSize = _texture->getContentSizeInPixels();
|
||||
|
|
@ -352,7 +353,7 @@ void FastTMXLayer::setupTiles()
|
|||
|
||||
}
|
||||
|
||||
Mat4 FastTMXLayer::tileToNodeTransform()
|
||||
Mat4 TMXLayer::tileToNodeTransform()
|
||||
{
|
||||
float w = _mapTileSize.width / CC_CONTENT_SCALE_FACTOR();
|
||||
float h = _mapTileSize.height / CC_CONTENT_SCALE_FACTOR();
|
||||
|
|
@ -404,7 +405,7 @@ Mat4 FastTMXLayer::tileToNodeTransform()
|
|||
|
||||
}
|
||||
|
||||
void FastTMXLayer::updateTotalQuads()
|
||||
void TMXLayer::updateTotalQuads()
|
||||
{
|
||||
if(_quadsDirty)
|
||||
{
|
||||
|
|
@ -536,7 +537,7 @@ void FastTMXLayer::updateTotalQuads()
|
|||
}
|
||||
|
||||
// removing / getting tiles
|
||||
Sprite* FastTMXLayer::getTileAt(const Vec2& tileCoordinate)
|
||||
Sprite* TMXLayer::getTileAt(const Vec2& tileCoordinate)
|
||||
{
|
||||
CCASSERT( tileCoordinate.x < _layerSize.width && tileCoordinate.y < _layerSize.height && tileCoordinate.x >=0 && tileCoordinate.y >=0, "TMXLayer: invalid position");
|
||||
CCASSERT( _tiles, "TMXLayer: the tiles map has been released");
|
||||
|
|
@ -576,7 +577,7 @@ Sprite* FastTMXLayer::getTileAt(const Vec2& tileCoordinate)
|
|||
return tile;
|
||||
}
|
||||
|
||||
int FastTMXLayer::getTileGIDAt(const Vec2& tileCoordinate, TMXTileFlags* flags/* = nullptr*/)
|
||||
int TMXLayer::getTileGIDAt(const Vec2& tileCoordinate, TMXTileFlags* flags/* = nullptr*/)
|
||||
{
|
||||
CCASSERT(tileCoordinate.x < _layerSize.width && tileCoordinate.y < _layerSize.height && tileCoordinate.x >=0 && tileCoordinate.y >=0, "TMXLayer: invalid position");
|
||||
CCASSERT(_tiles, "TMXLayer: the tiles map has been released");
|
||||
|
|
@ -602,12 +603,12 @@ int FastTMXLayer::getTileGIDAt(const Vec2& tileCoordinate, TMXTileFlags* flags/*
|
|||
return (tile & kTMXFlippedMask);
|
||||
}
|
||||
|
||||
Vec2 FastTMXLayer::getPositionAt(const Vec2& pos)
|
||||
Vec2 TMXLayer::getPositionAt(const Vec2& pos)
|
||||
{
|
||||
return PointApplyTransform(pos, _tileToNodeTransform);
|
||||
}
|
||||
|
||||
int FastTMXLayer::getVertexZForPos(const Vec2& pos)
|
||||
int TMXLayer::getVertexZForPos(const Vec2& pos)
|
||||
{
|
||||
int ret = 0;
|
||||
int maxVal = 0;
|
||||
|
|
@ -638,7 +639,7 @@ int FastTMXLayer::getVertexZForPos(const Vec2& pos)
|
|||
return ret;
|
||||
}
|
||||
|
||||
void FastTMXLayer::removeTileAt(const Vec2& tileCoordinate)
|
||||
void TMXLayer::removeTileAt(const Vec2& tileCoordinate)
|
||||
{
|
||||
|
||||
CCASSERT( tileCoordinate.x < _layerSize.width && tileCoordinate.y < _layerSize.height && tileCoordinate.x >=0 && tileCoordinate.y >=0, "TMXLayer: invalid position");
|
||||
|
|
@ -661,7 +662,7 @@ void FastTMXLayer::removeTileAt(const Vec2& tileCoordinate)
|
|||
}
|
||||
}
|
||||
|
||||
void FastTMXLayer::setFlaggedTileGIDByIndex(int index, int gid)
|
||||
void TMXLayer::setFlaggedTileGIDByIndex(int index, int gid)
|
||||
{
|
||||
if(gid == _tiles[index]) return;
|
||||
_tiles[index] = gid;
|
||||
|
|
@ -669,7 +670,7 @@ void FastTMXLayer::setFlaggedTileGIDByIndex(int index, int gid)
|
|||
_dirty = true;
|
||||
}
|
||||
|
||||
void FastTMXLayer::removeChild(Node* node, bool cleanup)
|
||||
void TMXLayer::removeChild(Node* node, bool cleanup)
|
||||
{
|
||||
int tag = node->getTag();
|
||||
auto it = _spriteContainer.find(tag);
|
||||
|
|
@ -680,8 +681,8 @@ void FastTMXLayer::removeChild(Node* node, bool cleanup)
|
|||
Node::removeChild(node, cleanup);
|
||||
}
|
||||
|
||||
// FastTMXLayer - Properties
|
||||
Value FastTMXLayer::getProperty(const std::string& propertyName) const
|
||||
// TMXLayer - Properties
|
||||
Value TMXLayer::getProperty(const std::string& propertyName) const
|
||||
{
|
||||
if (_properties.find(propertyName) != _properties.end())
|
||||
return _properties.at(propertyName);
|
||||
|
|
@ -689,7 +690,7 @@ Value FastTMXLayer::getProperty(const std::string& propertyName) const
|
|||
return Value();
|
||||
}
|
||||
|
||||
void FastTMXLayer::parseInternalProperties()
|
||||
void TMXLayer::parseInternalProperties()
|
||||
{
|
||||
auto vertexz = getProperty("cc_vertexz");
|
||||
if (vertexz.isNull()) return;
|
||||
|
|
@ -719,7 +720,7 @@ void FastTMXLayer::parseInternalProperties()
|
|||
}
|
||||
|
||||
//CCTMXLayer2 - obtaining positions, offset
|
||||
Vec2 FastTMXLayer::calculateLayerOffset(const Vec2& pos)
|
||||
Vec2 TMXLayer::calculateLayerOffset(const Vec2& pos)
|
||||
{
|
||||
Vec2 ret = Vec2::ZERO;
|
||||
switch (_layerOrientation)
|
||||
|
|
@ -740,12 +741,12 @@ Vec2 FastTMXLayer::calculateLayerOffset(const Vec2& pos)
|
|||
}
|
||||
|
||||
// TMXLayer - adding / remove tiles
|
||||
void FastTMXLayer::setTileGID(int gid, const Vec2& tileCoordinate)
|
||||
void TMXLayer::setTileGID(int gid, const Vec2& tileCoordinate)
|
||||
{
|
||||
setTileGID(gid, tileCoordinate, (TMXTileFlags)0);
|
||||
}
|
||||
|
||||
void FastTMXLayer::setTileGID(int gid, const Vec2& tileCoordinate, TMXTileFlags flags)
|
||||
void TMXLayer::setTileGID(int gid, const Vec2& tileCoordinate, TMXTileFlags flags)
|
||||
{
|
||||
CCASSERT(tileCoordinate.x < _layerSize.width && tileCoordinate.y < _layerSize.height && tileCoordinate.x >=0 && tileCoordinate.y >=0, "TMXLayer: invalid position");
|
||||
CCASSERT(_tiles, "TMXLayer: the tiles map has been released");
|
||||
|
|
@ -796,7 +797,7 @@ void FastTMXLayer::setTileGID(int gid, const Vec2& tileCoordinate, TMXTileFlags
|
|||
}
|
||||
}
|
||||
|
||||
void FastTMXLayer::setupTileSprite(Sprite* sprite, Vec2 pos, int gid)
|
||||
void TMXLayer::setupTileSprite(Sprite* sprite, Vec2 pos, int gid)
|
||||
{
|
||||
sprite->setPosition(getPositionAt(pos));
|
||||
sprite->setPositionZ((float)getVertexZForPos(pos));
|
||||
|
|
@ -852,9 +853,11 @@ void FastTMXLayer::setupTileSprite(Sprite* sprite, Vec2 pos, int gid)
|
|||
}
|
||||
}
|
||||
|
||||
std::string FastTMXLayer::getDescription() const
|
||||
std::string TMXLayer::getDescription() const
|
||||
{
|
||||
return StringUtils::format("<FastTMXLayer | tag = %d, size = %d,%d>", _tag, (int)_mapTileSize.width, (int)_mapTileSize.height);
|
||||
}
|
||||
|
||||
} //end of namespace experimental
|
||||
|
||||
NS_CC_END
|
||||
|
|
|
|||
|
|
@ -45,6 +45,8 @@ class Texture2D;
|
|||
class Sprite;
|
||||
struct _ccCArray;
|
||||
|
||||
namespace experimental{
|
||||
|
||||
/**
|
||||
* @addtogroup tilemap_parallax_nodes
|
||||
* @{
|
||||
|
|
@ -76,20 +78,20 @@ http://www.cocos2d-iphone.org/wiki/doku.php/prog_guide:tiled_maps
|
|||
@since v3.2
|
||||
*/
|
||||
|
||||
class CC_DLL FastTMXLayer : public Node
|
||||
class CC_DLL TMXLayer : public Node
|
||||
{
|
||||
public:
|
||||
/** creates a FastTMXLayer with an tileset info, a layer info and a map info */
|
||||
static FastTMXLayer * create(TMXTilesetInfo *tilesetInfo, TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo);
|
||||
static TMXLayer * create(TMXTilesetInfo *tilesetInfo, TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo);
|
||||
/**
|
||||
* @js ctor
|
||||
*/
|
||||
FastTMXLayer();
|
||||
TMXLayer();
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual ~FastTMXLayer();
|
||||
virtual ~TMXLayer();
|
||||
|
||||
/** returns the tile gid at a given tile coordinate. It also returns the tile flags.
|
||||
*/
|
||||
|
|
@ -256,7 +258,7 @@ public:
|
|||
|
||||
// end of tilemap_parallax_nodes group
|
||||
/// @}
|
||||
|
||||
} //end of namespace experimental
|
||||
NS_CC_END
|
||||
|
||||
#endif //__CCTMX_LAYER2_H__
|
||||
|
|
|
|||
|
|
@ -34,12 +34,13 @@ THE SOFTWARE.
|
|||
#include "deprecated/CCString.h"
|
||||
|
||||
NS_CC_BEGIN
|
||||
namespace experimental {
|
||||
|
||||
// implementation FastTMXTiledMap
|
||||
|
||||
FastTMXTiledMap * FastTMXTiledMap::create(const std::string& tmxFile)
|
||||
TMXTiledMap * TMXTiledMap::create(const std::string& tmxFile)
|
||||
{
|
||||
FastTMXTiledMap *ret = new FastTMXTiledMap();
|
||||
TMXTiledMap *ret = new TMXTiledMap();
|
||||
if (ret->initWithTMXFile(tmxFile))
|
||||
{
|
||||
ret->autorelease();
|
||||
|
|
@ -49,9 +50,9 @@ FastTMXTiledMap * FastTMXTiledMap::create(const std::string& tmxFile)
|
|||
return nullptr;
|
||||
}
|
||||
|
||||
FastTMXTiledMap* FastTMXTiledMap::createWithXML(const std::string& tmxString, const std::string& resourcePath)
|
||||
TMXTiledMap* TMXTiledMap::createWithXML(const std::string& tmxString, const std::string& resourcePath)
|
||||
{
|
||||
FastTMXTiledMap *ret = new FastTMXTiledMap();
|
||||
TMXTiledMap *ret = new TMXTiledMap();
|
||||
if (ret->initWithXML(tmxString, resourcePath))
|
||||
{
|
||||
ret->autorelease();
|
||||
|
|
@ -61,7 +62,7 @@ FastTMXTiledMap* FastTMXTiledMap::createWithXML(const std::string& tmxString, co
|
|||
return nullptr;
|
||||
}
|
||||
|
||||
bool FastTMXTiledMap::initWithTMXFile(const std::string& tmxFile)
|
||||
bool TMXTiledMap::initWithTMXFile(const std::string& tmxFile)
|
||||
{
|
||||
CCASSERT(tmxFile.size()>0, "FastTMXTiledMap: tmx file should not be empty");
|
||||
|
||||
|
|
@ -79,7 +80,7 @@ bool FastTMXTiledMap::initWithTMXFile(const std::string& tmxFile)
|
|||
return true;
|
||||
}
|
||||
|
||||
bool FastTMXTiledMap::initWithXML(const std::string& tmxString, const std::string& resourcePath)
|
||||
bool TMXTiledMap::initWithXML(const std::string& tmxString, const std::string& resourcePath)
|
||||
{
|
||||
setContentSize(Size::ZERO);
|
||||
|
||||
|
|
@ -91,21 +92,21 @@ bool FastTMXTiledMap::initWithXML(const std::string& tmxString, const std::strin
|
|||
return true;
|
||||
}
|
||||
|
||||
FastTMXTiledMap::FastTMXTiledMap()
|
||||
TMXTiledMap::TMXTiledMap()
|
||||
:_mapSize(Size::ZERO)
|
||||
,_tileSize(Size::ZERO)
|
||||
{
|
||||
}
|
||||
|
||||
FastTMXTiledMap::~FastTMXTiledMap()
|
||||
TMXTiledMap::~TMXTiledMap()
|
||||
{
|
||||
}
|
||||
|
||||
// private
|
||||
FastTMXLayer * FastTMXTiledMap::parseLayer(TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo)
|
||||
TMXLayer * TMXTiledMap::parseLayer(TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo)
|
||||
{
|
||||
TMXTilesetInfo *tileset = tilesetForLayer(layerInfo, mapInfo);
|
||||
FastTMXLayer *layer = FastTMXLayer::create(tileset, layerInfo, mapInfo);
|
||||
TMXLayer *layer = TMXLayer::create(tileset, layerInfo, mapInfo);
|
||||
|
||||
// tell the layerinfo to release the ownership of the tiles map.
|
||||
layerInfo->_ownTiles = false;
|
||||
|
|
@ -114,7 +115,7 @@ FastTMXLayer * FastTMXTiledMap::parseLayer(TMXLayerInfo *layerInfo, TMXMapInfo *
|
|||
return layer;
|
||||
}
|
||||
|
||||
TMXTilesetInfo * FastTMXTiledMap::tilesetForLayer(TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo)
|
||||
TMXTilesetInfo * TMXTiledMap::tilesetForLayer(TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo)
|
||||
{
|
||||
Size size = layerInfo->_layerSize;
|
||||
auto& tilesets = mapInfo->getTilesets();
|
||||
|
|
@ -155,7 +156,7 @@ TMXTilesetInfo * FastTMXTiledMap::tilesetForLayer(TMXLayerInfo *layerInfo, TMXMa
|
|||
return nullptr;
|
||||
}
|
||||
|
||||
void FastTMXTiledMap::buildWithMapInfo(TMXMapInfo* mapInfo)
|
||||
void TMXTiledMap::buildWithMapInfo(TMXMapInfo* mapInfo)
|
||||
{
|
||||
_mapSize = mapInfo->getMapSize();
|
||||
_tileSize = mapInfo->getTileSize();
|
||||
|
|
@ -173,7 +174,7 @@ void FastTMXTiledMap::buildWithMapInfo(TMXMapInfo* mapInfo)
|
|||
for(const auto &layerInfo : layers) {
|
||||
if (layerInfo->_visible)
|
||||
{
|
||||
FastTMXLayer *child = parseLayer(layerInfo, mapInfo);
|
||||
TMXLayer *child = parseLayer(layerInfo, mapInfo);
|
||||
addChild(child, idx, idx);
|
||||
|
||||
// update content size with the max size
|
||||
|
|
@ -189,13 +190,13 @@ void FastTMXTiledMap::buildWithMapInfo(TMXMapInfo* mapInfo)
|
|||
}
|
||||
|
||||
// public
|
||||
FastTMXLayer * FastTMXTiledMap::getLayer(const std::string& layerName) const
|
||||
TMXLayer * TMXTiledMap::getLayer(const std::string& layerName) const
|
||||
{
|
||||
CCASSERT(layerName.size() > 0, "Invalid layer name!");
|
||||
|
||||
for (auto& child : _children)
|
||||
{
|
||||
FastTMXLayer* layer = dynamic_cast<FastTMXLayer*>(child);
|
||||
TMXLayer* layer = dynamic_cast<TMXLayer*>(child);
|
||||
if(layer)
|
||||
{
|
||||
if(layerName.compare( layer->getLayerName()) == 0)
|
||||
|
|
@ -209,7 +210,7 @@ FastTMXLayer * FastTMXTiledMap::getLayer(const std::string& layerName) const
|
|||
return nullptr;
|
||||
}
|
||||
|
||||
TMXObjectGroup * FastTMXTiledMap::getObjectGroup(const std::string& groupName) const
|
||||
TMXObjectGroup * TMXTiledMap::getObjectGroup(const std::string& groupName) const
|
||||
{
|
||||
CCASSERT(groupName.size() > 0, "Invalid group name!");
|
||||
|
||||
|
|
@ -230,7 +231,7 @@ TMXObjectGroup * FastTMXTiledMap::getObjectGroup(const std::string& groupName) c
|
|||
return nullptr;
|
||||
}
|
||||
|
||||
Value FastTMXTiledMap::getProperty(const std::string& propertyName) const
|
||||
Value TMXTiledMap::getProperty(const std::string& propertyName) const
|
||||
{
|
||||
if (_properties.find(propertyName) != _properties.end())
|
||||
return _properties.at(propertyName);
|
||||
|
|
@ -238,7 +239,7 @@ Value FastTMXTiledMap::getProperty(const std::string& propertyName) const
|
|||
return Value();
|
||||
}
|
||||
|
||||
Value FastTMXTiledMap::getPropertiesForGID(int GID) const
|
||||
Value TMXTiledMap::getPropertiesForGID(int GID) const
|
||||
{
|
||||
if (_tileProperties.find(GID) != _tileProperties.end())
|
||||
return _tileProperties.at(GID);
|
||||
|
|
@ -246,11 +247,12 @@ Value FastTMXTiledMap::getPropertiesForGID(int GID) const
|
|||
return Value();
|
||||
}
|
||||
|
||||
std::string FastTMXTiledMap::getDescription() const
|
||||
std::string TMXTiledMap::getDescription() const
|
||||
{
|
||||
return StringUtils::format("<FastTMXTiledMap | Tag = %d, Layers = %d", _tag, static_cast<int>(_children.size()));
|
||||
}
|
||||
|
||||
} //end of namespace experimental
|
||||
|
||||
NS_CC_END
|
||||
|
||||
|
|
|
|||
|
|
@ -33,11 +33,14 @@ THE SOFTWARE.
|
|||
NS_CC_BEGIN
|
||||
|
||||
class TMXObjectGroup;
|
||||
class FastTMXLayer;
|
||||
class TMXLayerInfo;
|
||||
class TMXTilesetInfo;
|
||||
class TMXMapInfo;
|
||||
|
||||
namespace experimental {
|
||||
|
||||
class TMXLayer;
|
||||
|
||||
/** @brief FastTMXTiledMap knows how to parse and render a TMX map.
|
||||
|
||||
It adds support for the TMX tiled map format used by http://www.mapeditor.org
|
||||
|
|
@ -89,17 +92,17 @@ object->getProperty(name_of_the_property);
|
|||
|
||||
@since v3.2
|
||||
*/
|
||||
class CC_DLL FastTMXTiledMap : public Node
|
||||
class CC_DLL TMXTiledMap : public Node
|
||||
{
|
||||
public:
|
||||
/** creates a TMX Tiled Map with a TMX file.*/
|
||||
static FastTMXTiledMap* create(const std::string& tmxFile);
|
||||
static TMXTiledMap* create(const std::string& tmxFile);
|
||||
|
||||
/** initializes a TMX Tiled Map with a TMX formatted XML string and a path to TMX resources */
|
||||
static FastTMXTiledMap* createWithXML(const std::string& tmxString, const std::string& resourcePath);
|
||||
static TMXTiledMap* createWithXML(const std::string& tmxString, const std::string& resourcePath);
|
||||
|
||||
/** return the FastTMXLayer for the specific layer */
|
||||
FastTMXLayer* getLayer(const std::string& layerName) const;
|
||||
TMXLayer* getLayer(const std::string& layerName) const;
|
||||
|
||||
/** return the TMXObjectGroup for the specific group */
|
||||
TMXObjectGroup* getObjectGroup(const std::string& groupName) const;
|
||||
|
|
@ -141,12 +144,12 @@ protected:
|
|||
/**
|
||||
* @js ctor
|
||||
*/
|
||||
FastTMXTiledMap();
|
||||
TMXTiledMap();
|
||||
/**
|
||||
* @js NA
|
||||
* @lua NA
|
||||
*/
|
||||
virtual ~FastTMXTiledMap();
|
||||
virtual ~TMXTiledMap();
|
||||
|
||||
/** initializes a TMX Tiled Map with a TMX file */
|
||||
bool initWithTMXFile(const std::string& tmxFile);
|
||||
|
|
@ -154,7 +157,7 @@ protected:
|
|||
/** initializes a TMX Tiled Map with a TMX formatted XML string and a path to TMX resources */
|
||||
bool initWithXML(const std::string& tmxString, const std::string& resourcePath);
|
||||
|
||||
FastTMXLayer * parseLayer(TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo);
|
||||
TMXLayer * parseLayer(TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo);
|
||||
TMXTilesetInfo * tilesetForLayer(TMXLayerInfo *layerInfo, TMXMapInfo *mapInfo);
|
||||
void buildWithMapInfo(TMXMapInfo* mapInfo);
|
||||
|
||||
|
|
@ -173,13 +176,15 @@ protected:
|
|||
ValueMapIntKey _tileProperties;
|
||||
|
||||
private:
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(FastTMXTiledMap);
|
||||
CC_DISALLOW_COPY_AND_ASSIGN(TMXTiledMap);
|
||||
|
||||
};
|
||||
|
||||
// end of tilemap_parallax_nodes group
|
||||
/// @}
|
||||
|
||||
} //end of namespace experimental
|
||||
|
||||
NS_CC_END
|
||||
|
||||
#endif //__CCTMX_TILE_MAP2_H__
|
||||
|
|
|
|||
|
|
@ -178,7 +178,10 @@ FontAtlas * FontAtlasCache::getFontAtlasCharMap(Texture2D* texture, int itemWidt
|
|||
|
||||
FontAtlas * FontAtlasCache::getFontAtlasCharMap(const std::string& charMapFile, int itemWidth, int itemHeight, int startCharMap)
|
||||
{
|
||||
std::string atlasName = generateFontName(charMapFile, 0, GlyphCollection::CUSTOM,false);
|
||||
char tmp[255];
|
||||
snprintf(tmp,250,"name:%s_%d_%d_%d",charMapFile.c_str(),itemWidth,itemHeight,startCharMap);
|
||||
|
||||
std::string atlasName = generateFontName(tmp, 0, GlyphCollection::CUSTOM,false);
|
||||
|
||||
auto it = _atlasMap.find(atlasName);
|
||||
if ( it == _atlasMap.end() )
|
||||
|
|
|
|||
|
|
@ -881,11 +881,12 @@ void Label::drawShadowWithoutBlur()
|
|||
void Label::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
|
||||
{
|
||||
// Don't do calculate the culling if the transform was not updated
|
||||
_insideBounds = (flags & FLAGS_TRANSFORM_DIRTY) ? renderer->checkVisibility(transform, _contentSize) : _insideBounds;
|
||||
bool transformUpdated = flags & FLAGS_TRANSFORM_DIRTY;
|
||||
_insideBounds = transformUpdated ? renderer->checkVisibility(transform, _contentSize) : _insideBounds;
|
||||
|
||||
if(_insideBounds) {
|
||||
_customCommand.init(_globalZOrder);
|
||||
_customCommand.func = CC_CALLBACK_0(Label::onDraw, this, transform, flags);
|
||||
_customCommand.func = CC_CALLBACK_0(Label::onDraw, this, transform, transformUpdated);
|
||||
renderer->addCommand(&_customCommand);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -186,7 +186,7 @@ bool LabelTextFormatter::alignText(Label *theLabel)
|
|||
int i = 0;
|
||||
|
||||
int lineNumber = 0;
|
||||
int strLen = static_cast<int>(theLabel->_currentUTF16String.length());
|
||||
int strLen = theLabel->_limitShowCount;
|
||||
std::vector<char16_t> lastLine;
|
||||
auto strWhole = theLabel->_currentUTF16String;
|
||||
|
||||
|
|
|
|||
|
|
@ -173,9 +173,9 @@ CC_CONSTRUCTOR_ACCESS:
|
|||
|
||||
protected:
|
||||
//add the api for avoid use deprecated api
|
||||
void _addTouchListener();
|
||||
CC_DEPRECATED_ATTRIBUTE void _addTouchListener() {}
|
||||
|
||||
CC_DEPRECATED_ATTRIBUTE void addTouchListener() { _addTouchListener();};
|
||||
CC_DEPRECATED_ATTRIBUTE void addTouchListener() {}
|
||||
CC_DEPRECATED_ATTRIBUTE int executeScriptTouchHandler(EventTouch::EventCode eventType, Touch* touch, Event* event);
|
||||
CC_DEPRECATED_ATTRIBUTE int executeScriptTouchesHandler(EventTouch::EventCode eventType, const std::vector<Touch*>& touches, Event* event);
|
||||
|
||||
|
|
|
|||
|
|
@ -1850,6 +1850,11 @@ bool Node::removeComponent(const std::string& name)
|
|||
return false;
|
||||
}
|
||||
|
||||
bool Node::removeComponent(Component *component)
|
||||
{
|
||||
return _componentContainer->remove(component);
|
||||
}
|
||||
|
||||
void Node::removeAllComponents()
|
||||
{
|
||||
if( _componentContainer )
|
||||
|
|
|
|||
|
|
@ -71,7 +71,7 @@ enum {
|
|||
kNodeOnCleanup
|
||||
};
|
||||
|
||||
bool nodeComparisonLess(Node* n1, Node* n2);
|
||||
bool CC_DLL nodeComparisonLess(Node* n1, Node* n2);
|
||||
|
||||
class EventListener;
|
||||
|
||||
|
|
@ -1433,6 +1433,10 @@ public:
|
|||
*/
|
||||
virtual bool removeComponent(const std::string& name);
|
||||
|
||||
/**
|
||||
* removes a component by its pointer
|
||||
*/
|
||||
virtual bool removeComponent(Component *component);
|
||||
/**
|
||||
* removes all components
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ NS_CC_BEGIN
|
|||
|
||||
class GridBase;
|
||||
|
||||
class NodeGrid : public Node
|
||||
class CC_DLL NodeGrid : public Node
|
||||
{
|
||||
public:
|
||||
static NodeGrid* create();
|
||||
|
|
|
|||
|
|
@ -771,7 +771,12 @@ void ParticleSystem::update(float dt)
|
|||
|
||||
Vec2 newPos;
|
||||
|
||||
if (_positionType == PositionType::FREE || _positionType == PositionType::RELATIVE)
|
||||
if (_positionType == PositionType::FREE)
|
||||
{
|
||||
Vec2 diff = convertToNodeSpace(currentPosition) - convertToNodeSpace(p-> startPos);
|
||||
newPos = p->pos - diff;
|
||||
}
|
||||
else if(_positionType == PositionType::RELATIVE)
|
||||
{
|
||||
Vec2 diff = currentPosition - p->startPos;
|
||||
newPos = p->pos - diff;
|
||||
|
|
|
|||
|
|
@ -449,6 +449,10 @@ void ParticleSystemQuad::setTotalParticles(int tp)
|
|||
_totalParticles = tp;
|
||||
}
|
||||
|
||||
// fixed issue #5762
|
||||
// reset the emission rate
|
||||
setEmissionRate(_totalParticles / _life);
|
||||
|
||||
resetSystem();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
NS_CC_BEGIN
|
||||
|
||||
class CC_DLL ProtectedNode : public Node
|
||||
class CC_DLL ProtectedNode : public Node
|
||||
{
|
||||
public:
|
||||
static ProtectedNode * create(void);
|
||||
|
|
@ -94,6 +94,9 @@ RenderTexture::~RenderTexture()
|
|||
|
||||
void RenderTexture::listenToBackground(EventCustom *event)
|
||||
{
|
||||
// We have not found a way to dispatch the enter background message before the texture data are destroyed.
|
||||
// So we disable this pair of message handler at present.
|
||||
#if 0
|
||||
#if CC_ENABLE_CACHE_TEXTURE_DATA
|
||||
CC_SAFE_DELETE(_UITextureImage);
|
||||
|
||||
|
|
@ -118,10 +121,12 @@ void RenderTexture::listenToBackground(EventCustom *event)
|
|||
glDeleteFramebuffers(1, &_FBO);
|
||||
_FBO = 0;
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
void RenderTexture::listenToForeground(EventCustom *event)
|
||||
{
|
||||
#if 0
|
||||
#if CC_ENABLE_CACHE_TEXTURE_DATA
|
||||
// -- regenerate frame buffer object and attach the texture
|
||||
glGetIntegerv(GL_FRAMEBUFFER_BINDING, &_oldFBO);
|
||||
|
|
@ -139,6 +144,7 @@ void RenderTexture::listenToForeground(EventCustom *event)
|
|||
glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, _texture->getName(), 0);
|
||||
glBindFramebuffer(GL_FRAMEBUFFER, _oldFBO);
|
||||
#endif
|
||||
#endif
|
||||
}
|
||||
|
||||
RenderTexture * RenderTexture::create(int w, int h, Texture2D::PixelFormat eFormat)
|
||||
|
|
@ -564,6 +570,14 @@ void RenderTexture::onBegin()
|
|||
Mat4::createOrthographicOffCenter((float)-1.0 / widthRatio, (float)1.0 / widthRatio, (float)-1.0 / heightRatio, (float)1.0 / heightRatio, -1, 1, &orthoMatrix);
|
||||
director->multiplyMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION, orthoMatrix);
|
||||
}
|
||||
else
|
||||
{
|
||||
#if CC_TARGET_PLATFORM == CC_PLATFORM_WP8
|
||||
Mat4 modifiedProjection = director->getMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION);
|
||||
modifiedProjection = CCEGLView::sharedOpenGLView()->getReverseOrientationMatrix() * modifiedProjection;
|
||||
director->loadMatrix(MATRIX_STACK_TYPE::MATRIX_STACK_PROJECTION, modifiedProjection);
|
||||
#endif
|
||||
}
|
||||
|
||||
//calculate viewport
|
||||
{
|
||||
|
|
|
|||
|
|
@ -26,7 +26,6 @@ THE SOFTWARE.
|
|||
#include "CCTextFieldTTF.h"
|
||||
|
||||
#include "base/CCDirector.h"
|
||||
#include "CCGLView.h"
|
||||
|
||||
NS_CC_BEGIN
|
||||
|
||||
|
|
@ -140,7 +139,7 @@ bool TextFieldTTF::attachWithIME()
|
|||
if (ret)
|
||||
{
|
||||
// open keyboard
|
||||
GLView * pGlView = Director::getInstance()->getOpenGLView();
|
||||
auto pGlView = Director::getInstance()->getOpenGLView();
|
||||
if (pGlView)
|
||||
{
|
||||
pGlView->setIMEKeyboardState(true);
|
||||
|
|
@ -155,7 +154,7 @@ bool TextFieldTTF::detachWithIME()
|
|||
if (ret)
|
||||
{
|
||||
// close keyboard
|
||||
GLView * glView = Director::getInstance()->getOpenGLView();
|
||||
auto glView = Director::getInstance()->getOpenGLView();
|
||||
if (glView)
|
||||
{
|
||||
glView->setIMEKeyboardState(false);
|
||||
|
|
|
|||
|
|
@ -84,63 +84,63 @@ namespace tweenfunc {
|
|||
|
||||
|
||||
//tween functions for CCActionEase
|
||||
float easeIn(float time, float rate);
|
||||
float easeOut(float time, float rate);
|
||||
float easeInOut(float time, float rate);
|
||||
float CC_DLL easeIn(float time, float rate);
|
||||
float CC_DLL easeOut(float time, float rate);
|
||||
float CC_DLL easeInOut(float time, float rate);
|
||||
|
||||
float bezieratFunction( float a, float b, float c, float d, float t );
|
||||
float CC_DLL bezieratFunction( float a, float b, float c, float d, float t );
|
||||
|
||||
float quadraticIn(float time);
|
||||
float quadraticOut(float time);
|
||||
float quadraticInOut(float time);
|
||||
float CC_DLL quadraticIn(float time);
|
||||
float CC_DLL quadraticOut(float time);
|
||||
float CC_DLL quadraticInOut(float time);
|
||||
|
||||
|
||||
float tweenTo(float time, TweenType type, float *easingParam);
|
||||
float CC_DLL tweenTo(float time, TweenType type, float *easingParam);
|
||||
|
||||
float linear(float time);
|
||||
float CC_DLL linear(float time);
|
||||
|
||||
|
||||
float sineEaseIn(float time);
|
||||
float sineEaseOut(float time);
|
||||
float sineEaseInOut(float time);
|
||||
float CC_DLL sineEaseIn(float time);
|
||||
float CC_DLL sineEaseOut(float time);
|
||||
float CC_DLL sineEaseInOut(float time);
|
||||
|
||||
float quadEaseIn(float time);
|
||||
float quadEaseOut(float time);
|
||||
float quadEaseInOut(float time);
|
||||
float CC_DLL quadEaseIn(float time);
|
||||
float CC_DLL quadEaseOut(float time);
|
||||
float CC_DLL quadEaseInOut(float time);
|
||||
|
||||
float cubicEaseIn(float time);
|
||||
float cubicEaseOut(float time);
|
||||
float cubicEaseInOut(float time);
|
||||
float CC_DLL cubicEaseIn(float time);
|
||||
float CC_DLL cubicEaseOut(float time);
|
||||
float CC_DLL cubicEaseInOut(float time);
|
||||
|
||||
float quartEaseIn(float time);
|
||||
float quartEaseOut(float time);
|
||||
float quartEaseInOut(float time);
|
||||
float CC_DLL quartEaseIn(float time);
|
||||
float CC_DLL quartEaseOut(float time);
|
||||
float CC_DLL quartEaseInOut(float time);
|
||||
|
||||
float quintEaseIn(float time);
|
||||
float quintEaseOut(float time);
|
||||
float quintEaseInOut(float time);
|
||||
float CC_DLL quintEaseIn(float time);
|
||||
float CC_DLL quintEaseOut(float time);
|
||||
float CC_DLL quintEaseInOut(float time);
|
||||
|
||||
float expoEaseIn(float time);
|
||||
float expoEaseOut(float time);
|
||||
float expoEaseInOut(float time);
|
||||
float CC_DLL expoEaseIn(float time);
|
||||
float CC_DLL expoEaseOut(float time);
|
||||
float CC_DLL expoEaseInOut(float time);
|
||||
|
||||
float circEaseIn(float time);
|
||||
float circEaseOut(float time);
|
||||
float circEaseInOut(float time);
|
||||
float CC_DLL circEaseIn(float time);
|
||||
float CC_DLL circEaseOut(float time);
|
||||
float CC_DLL circEaseInOut(float time);
|
||||
|
||||
float elasticEaseIn(float time, float period);
|
||||
float elasticEaseOut(float time, float period);
|
||||
float elasticEaseInOut(float time, float period);
|
||||
float CC_DLL elasticEaseIn(float time, float period);
|
||||
float CC_DLL elasticEaseOut(float time, float period);
|
||||
float CC_DLL elasticEaseInOut(float time, float period);
|
||||
|
||||
float backEaseIn(float time);
|
||||
float backEaseOut(float time);
|
||||
float backEaseInOut(float time);
|
||||
float CC_DLL backEaseIn(float time);
|
||||
float CC_DLL backEaseOut(float time);
|
||||
float CC_DLL backEaseInOut(float time);
|
||||
|
||||
float bounceEaseIn(float time);
|
||||
float bounceEaseOut(float time);
|
||||
float bounceEaseInOut(float time);
|
||||
float CC_DLL bounceEaseIn(float time);
|
||||
float CC_DLL bounceEaseOut(float time);
|
||||
float CC_DLL bounceEaseInOut(float time);
|
||||
|
||||
float customEase(float time, float *easingParam);
|
||||
float CC_DLL customEase(float time, float *easingParam);
|
||||
}
|
||||
|
||||
NS_CC_END
|
||||
|
|
|
|||
|
|
@ -58,6 +58,7 @@ set(COCOS_2D_SRC
|
|||
2d/CCParticleSystem.cpp
|
||||
2d/CCParticleSystemQuad.cpp
|
||||
2d/CCProgressTimer.cpp
|
||||
2d/CCProtectedNode.cpp
|
||||
2d/CCRenderTexture.cpp
|
||||
2d/CCScene.cpp
|
||||
2d/CCSpriteBatchNode.cpp
|
||||
|
|
|
|||
|
|
@ -0,0 +1,2 @@
|
|||
|
||||
LIBRARY
|
||||
|
|
@ -406,6 +406,7 @@
|
|||
<ClCompile Include="CCParticleSystem.cpp" />
|
||||
<ClCompile Include="CCParticleSystemQuad.cpp" />
|
||||
<ClCompile Include="CCProgressTimer.cpp" />
|
||||
<ClCompile Include="CCProtectedNode.cpp" />
|
||||
<ClCompile Include="CCRenderTexture.cpp" />
|
||||
<ClCompile Include="CCScene.cpp" />
|
||||
<ClCompile Include="CCSprite.cpp" />
|
||||
|
|
@ -622,6 +623,7 @@
|
|||
<ClInclude Include="CCParticleSystem.h" />
|
||||
<ClInclude Include="CCParticleSystemQuad.h" />
|
||||
<ClInclude Include="CCProgressTimer.h" />
|
||||
<ClInclude Include="CCProtectedNode.h" />
|
||||
<ClInclude Include="CCRenderTexture.h" />
|
||||
<ClInclude Include="CCScene.h" />
|
||||
<ClInclude Include="CCSprite.h" />
|
||||
|
|
|
|||
|
|
@ -614,6 +614,9 @@
|
|||
<ClCompile Include="..\platform\wp8\CCGLViewImpl.cpp">
|
||||
<Filter>platform\wp8</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="CCProtectedNode.cpp">
|
||||
<Filter>2d</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\physics\CCPhysicsBody.h">
|
||||
|
|
@ -1250,11 +1253,16 @@
|
|||
<ClInclude Include="CCFastTMXTiledMap.h">
|
||||
<Filter>2d</Filter>
|
||||
</ClInclude>
|
||||
<<<<<<< HEAD
|
||||
<ClInclude Include="..\platform\CCGLView.h">
|
||||
<Filter>platform</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\platform\wp8\CCGLViewImpl.h">
|
||||
<Filter>platform\wp8</Filter>
|
||||
=======
|
||||
<ClInclude Include="CCProtectedNode.h">
|
||||
<Filter>2d</Filter>
|
||||
>>>>>>> v3
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@
|
|||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
|
||||
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<CharacterSet>Unicode</CharacterSet>
|
||||
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
|
||||
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
|
||||
|
|
@ -65,10 +65,10 @@
|
|||
<CodeAnalysisRuleAssemblies Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" />
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
|
||||
<LibraryPath>../../external/sqlite3/libraries/win32;$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<LibraryPath>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
|
||||
<LibraryPath>../../external/sqlite3/libraries/win32;$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\lib;$(LibraryPath)</LibraryPath>
|
||||
</PropertyGroup>
|
||||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<PreBuildEvent>
|
||||
|
|
@ -78,7 +78,7 @@
|
|||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;_USRDLL;_DEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;COCOS2D_DEBUG=1;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>false</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
|
|
@ -103,6 +103,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\websockets\prebuilt\win32\*.*" "$(OutDi
|
|||
xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\zlib\prebuilt\*.*" "$(OutDir)"
|
||||
xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\icon\prebuilt\*.*" "$(OutDir)"
|
||||
xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(OutDir)"
|
||||
xcopy /Y /Q "$(ProjectDir)..\..\external\sqlite3\libraries\win32\*.*" "$(OutDir)"
|
||||
</Command>
|
||||
</PreLinkEvent>
|
||||
<Link>
|
||||
|
|
@ -114,6 +115,8 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
|
|||
<SubSystem>Windows</SubSystem>
|
||||
<ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
|
||||
<TargetMachine>MachineX86</TargetMachine>
|
||||
<ModuleDefinitionFile>cocos2d.def</ModuleDefinitionFile>
|
||||
<AdditionalDependencies>libchipmunk.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
</Link>
|
||||
<PostBuildEvent>
|
||||
<Command>
|
||||
|
|
@ -127,7 +130,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
|
|||
</PreBuildEvent>
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\win32;$(EngineRoot)external\jpeg\include\win32;$(EngineRoot)external\tiff\include\win32;$(EngineRoot)external\webp\include\win32;$(EngineRoot)external\freetype2\include\win32;$(EngineRoot)external\win32-specific\icon\include;$(EngineRoot)external\win32-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;$(EngineRoot)external\ConvertUTF;$(EngineRoot)external;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;_USRDLL;NDEBUG;_WINDOWS;_LIB;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
|
|
@ -155,7 +158,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
|
|||
</Command>
|
||||
</PreLinkEvent>
|
||||
<Link>
|
||||
<AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<AdditionalDependencies>libchipmunk.lib;sqlite3.lib;%(AdditionalDependencies)</AdditionalDependencies>
|
||||
<OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
|
||||
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
|
||||
<IgnoreSpecificDefaultLibraries> ;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
|
||||
|
|
@ -165,6 +168,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
|
|||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
|
||||
<TargetMachine>MachineX86</TargetMachine>
|
||||
<ModuleDefinitionFile>cocos2d.def</ModuleDefinitionFile>
|
||||
</Link>
|
||||
<PostBuildEvent>
|
||||
<Command>
|
||||
|
|
@ -226,6 +230,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
|
|||
<ClCompile Include="..\base\ccUtils.cpp" />
|
||||
<ClCompile Include="..\base\CCValue.cpp" />
|
||||
<ClCompile Include="..\base\etc1.cpp" />
|
||||
<ClCompile Include="..\base\pvr.cpp" />
|
||||
<ClCompile Include="..\base\ObjectFactory.cpp" />
|
||||
<ClCompile Include="..\base\s3tc.cpp" />
|
||||
<ClCompile Include="..\base\TGAlib.cpp" />
|
||||
|
|
@ -258,11 +263,11 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
|
|||
<ClCompile Include="..\physics\chipmunk\CCPhysicsShapeInfo_chipmunk.cpp" />
|
||||
<ClCompile Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.cpp" />
|
||||
<ClCompile Include="..\platform\CCFileUtils.cpp" />
|
||||
<ClCompile Include="..\platform\CCGLViewProtocol.cpp" />
|
||||
<ClCompile Include="..\platform\CCGLView.cpp" />
|
||||
<ClCompile Include="..\platform\CCImage.cpp" />
|
||||
<ClCompile Include="..\platform\CCSAXParser.cpp" />
|
||||
<ClCompile Include="..\platform\CCThread.cpp" />
|
||||
<ClCompile Include="..\platform\desktop\CCGLView.cpp" />
|
||||
<ClCompile Include="..\platform\desktop\CCGLViewImpl.cpp" />
|
||||
<ClCompile Include="..\platform\win32\CCApplication.cpp" />
|
||||
<ClCompile Include="..\platform\win32\CCCommon.cpp" />
|
||||
<ClCompile Include="..\platform\win32\CCDevice.cpp" />
|
||||
|
|
@ -284,6 +289,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
|
|||
<ClCompile Include="..\renderer\CCTexture2D.cpp" />
|
||||
<ClCompile Include="..\renderer\CCTextureAtlas.cpp" />
|
||||
<ClCompile Include="..\renderer\CCTextureCache.cpp" />
|
||||
<ClCompile Include="..\storage\local-storage\LocalStorage.cpp" />
|
||||
<ClCompile Include="CCAction.cpp" />
|
||||
<ClCompile Include="CCActionCamera.cpp" />
|
||||
<ClCompile Include="CCActionCatmullRom.cpp" />
|
||||
|
|
@ -333,6 +339,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
|
|||
<ClCompile Include="CCParticleSystem.cpp" />
|
||||
<ClCompile Include="CCParticleSystemQuad.cpp" />
|
||||
<ClCompile Include="CCProgressTimer.cpp" />
|
||||
<ClCompile Include="CCProtectedNode.cpp" />
|
||||
<ClCompile Include="CCRenderTexture.cpp" />
|
||||
<ClCompile Include="CCScene.cpp" />
|
||||
<ClCompile Include="CCSprite.cpp" />
|
||||
|
|
@ -418,6 +425,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
|
|||
<ClInclude Include="..\base\etc1.h" />
|
||||
<ClInclude Include="..\base\firePngData.h" />
|
||||
<ClInclude Include="..\base\ObjectFactory.h" />
|
||||
<ClInclude Include="..\base\pvr.h" />
|
||||
<ClInclude Include="..\base\s3tc.h" />
|
||||
<ClInclude Include="..\base\TGAlib.h" />
|
||||
<ClInclude Include="..\base\uthash.h" />
|
||||
|
|
@ -461,11 +469,11 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
|
|||
<ClInclude Include="..\platform\CCCommon.h" />
|
||||
<ClInclude Include="..\platform\CCDevice.h" />
|
||||
<ClInclude Include="..\platform\CCFileUtils.h" />
|
||||
<ClInclude Include="..\platform\CCGLViewProtocol.h" />
|
||||
<ClInclude Include="..\platform\CCGLView.h" />
|
||||
<ClInclude Include="..\platform\CCImage.h" />
|
||||
<ClInclude Include="..\platform\CCSAXParser.h" />
|
||||
<ClInclude Include="..\platform\CCThread.h" />
|
||||
<ClInclude Include="..\platform\desktop\CCGLView.h" />
|
||||
<ClInclude Include="..\platform\desktop\CCGLViewImpl.h" />
|
||||
<ClInclude Include="..\platform\win32\CCApplication.h" />
|
||||
<ClInclude Include="..\platform\win32\CCFileUtilsWin32.h" />
|
||||
<ClInclude Include="..\platform\win32\CCGL.h" />
|
||||
|
|
@ -489,6 +497,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
|
|||
<ClInclude Include="..\renderer\CCTexture2D.h" />
|
||||
<ClInclude Include="..\renderer\CCTextureAtlas.h" />
|
||||
<ClInclude Include="..\renderer\CCTextureCache.h" />
|
||||
<ClInclude Include="..\storage\local-storage\LocalStorage.h" />
|
||||
<ClInclude Include="CCAction.h" />
|
||||
<ClInclude Include="CCActionCamera.h" />
|
||||
<ClInclude Include="CCActionCatmullRom.h" />
|
||||
|
|
@ -538,6 +547,7 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
|
|||
<ClInclude Include="CCParticleSystem.h" />
|
||||
<ClInclude Include="CCParticleSystemQuad.h" />
|
||||
<ClInclude Include="CCProgressTimer.h" />
|
||||
<ClInclude Include="CCProtectedNode.h" />
|
||||
<ClInclude Include="CCRenderTexture.h" />
|
||||
<ClInclude Include="CCScene.h" />
|
||||
<ClInclude Include="CCSprite.h" />
|
||||
|
|
@ -564,6 +574,12 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\win32-specific\gles\prebuilt\*.*" "$(Ou
|
|||
<None Include="..\math\Vec2.inl" />
|
||||
<None Include="..\math\Vec3.inl" />
|
||||
<None Include="..\math\Vec4.inl" />
|
||||
<None Include="cocos2d.def" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\external\chipmunk\proj.win32\chipmunk.vcxproj">
|
||||
<Project>{207bc7a9-ccf1-4f2f-a04d-45f72242ae25}</Project>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
|
|
@ -55,6 +55,9 @@
|
|||
<Filter Include="3d">
|
||||
<UniqueIdentifier>{a20c4bdc-bd4c-40c1-a78a-fe31cd3ec76a}</UniqueIdentifier>
|
||||
</Filter>
|
||||
<Filter Include="storage">
|
||||
<UniqueIdentifier>{44bdf58f-4af2-433c-b4af-58dc05ef96b5}</UniqueIdentifier>
|
||||
</Filter>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\physics\CCPhysicsBody.cpp">
|
||||
|
|
@ -403,9 +406,6 @@
|
|||
<ClCompile Include="..\base\CCUserDefault.cpp">
|
||||
<Filter>base</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\base\CCUserDefaultAndroid.cpp">
|
||||
<Filter>base</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\base\ccUTF8.cpp">
|
||||
<Filter>base</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -418,6 +418,9 @@
|
|||
<ClCompile Include="..\base\etc1.cpp">
|
||||
<Filter>base</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\base\pvr.cpp">
|
||||
<Filter>platform</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\base\s3tc.cpp">
|
||||
<Filter>base</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -472,9 +475,6 @@
|
|||
<ClCompile Include="..\renderer\CCTextureCache.cpp">
|
||||
<Filter>renderer</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\platform\desktop\CCGLView.cpp">
|
||||
<Filter>platform\desktop</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\platform\win32\CCApplication.cpp">
|
||||
<Filter>platform\win32</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -523,9 +523,6 @@
|
|||
<ClCompile Include="..\platform\CCFileUtils.cpp">
|
||||
<Filter>platform</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\platform\CCGLViewProtocol.cpp">
|
||||
<Filter>platform</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\platform\CCImage.cpp">
|
||||
<Filter>platform</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -589,6 +586,18 @@
|
|||
<ClCompile Include="CCFastTMXTiledMap.cpp">
|
||||
<Filter>2d</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\storage\local-storage\LocalStorage.cpp">
|
||||
<Filter>storage</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\platform\desktop\CCGLViewImpl.cpp">
|
||||
<Filter>platform\desktop</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\platform\CCGLView.cpp">
|
||||
<Filter>platform</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="CCProtectedNode.cpp">
|
||||
<Filter>2d</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\physics\CCPhysicsBody.h">
|
||||
|
|
@ -988,6 +997,9 @@
|
|||
<ClInclude Include="..\base\etc1.h">
|
||||
<Filter>base</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\base\pvr.h">
|
||||
<Filter>platform</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\base\firePngData.h">
|
||||
<Filter>base</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -1054,9 +1066,6 @@
|
|||
<ClInclude Include="..\renderer\CCTextureCache.h">
|
||||
<Filter>renderer</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\platform\desktop\CCGLView.h">
|
||||
<Filter>platform\desktop</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\platform\win32\compat\stdint.h">
|
||||
<Filter>platform\win32\compat</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -1123,9 +1132,6 @@
|
|||
<ClInclude Include="..\platform\CCFileUtils.h">
|
||||
<Filter>platform</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\platform\CCGLViewProtocol.h">
|
||||
<Filter>platform</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\platform\CCImage.h">
|
||||
<Filter>platform</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -1198,6 +1204,18 @@
|
|||
<ClInclude Include="CCFastTMXLayer.h">
|
||||
<Filter>2d</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\storage\local-storage\LocalStorage.h">
|
||||
<Filter>storage</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\platform\desktop\CCGLViewImpl.h">
|
||||
<Filter>platform\desktop</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\platform\CCGLView.h">
|
||||
<Filter>platform</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="CCProtectedNode.h">
|
||||
<Filter>2d</Filter>
|
||||
</ClInclude>
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="..\math\Mat4.inl">
|
||||
|
|
@ -1224,5 +1242,6 @@
|
|||
<None Include="..\3d\CCAnimationCurve.inl">
|
||||
<Filter>3d</Filter>
|
||||
</None>
|
||||
<None Include="cocos2d.def" />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
|
|
@ -42,7 +42,7 @@ class Bone3D;
|
|||
/**
|
||||
* Animate3D, Animates a Sprite3D given with an Animation3D
|
||||
*/
|
||||
class Animate3D: public ActionInterval
|
||||
class CC_DLL Animate3D: public ActionInterval
|
||||
{
|
||||
public:
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ NS_CC_BEGIN
|
|||
/**
|
||||
* static animation data, shared
|
||||
*/
|
||||
class Animation3D: public Ref
|
||||
class CC_DLL Animation3D: public Ref
|
||||
{
|
||||
friend class Bundle3D;
|
||||
public:
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ public:
|
|||
/**
|
||||
* Returns the position of the file pointer.
|
||||
*/
|
||||
long int tell();
|
||||
ssize_t tell();
|
||||
|
||||
/**
|
||||
* Sets the position of the file pointer.
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ NS_CC_BEGIN
|
|||
class EventListenerCustom;
|
||||
class EventCustom;
|
||||
|
||||
class RenderMeshData
|
||||
class CC_DLL RenderMeshData
|
||||
{
|
||||
friend class Mesh;
|
||||
public:
|
||||
|
|
@ -66,7 +66,7 @@ protected:
|
|||
* Mesh: Geometry with a collection of vertex.
|
||||
* Supporting various vertex formats.
|
||||
*/
|
||||
class Mesh : public Ref
|
||||
class CC_DLL Mesh : public Ref
|
||||
{
|
||||
public:
|
||||
/** Defines supported index formats. */
|
||||
|
|
|
|||
|
|
@ -41,7 +41,7 @@ class Texture2D;
|
|||
class MeshSkin;
|
||||
|
||||
/** Sprite3D: A sprite can be loaded from 3D model files, .obj, .c3t, .c3b, then can be drawed as sprite */
|
||||
class Sprite3D : public Node, public BlendProtocol
|
||||
class CC_DLL Sprite3D : public Node, public BlendProtocol
|
||||
{
|
||||
public:
|
||||
/** creates a Sprite3D*/
|
||||
|
|
@ -94,7 +94,7 @@ protected:
|
|||
BlendFunc _blend;
|
||||
};
|
||||
|
||||
extern std::string s_attributeNames[];//attribute names array
|
||||
extern std::string CC_DLL s_attributeNames[];//attribute names array
|
||||
|
||||
NS_CC_END
|
||||
#endif // __SPRITE3D_H_
|
||||
|
|
|
|||
|
|
@ -55,6 +55,7 @@ cocos2d.cpp \
|
|||
2d/CCParticleSystem.cpp \
|
||||
2d/CCParticleSystemQuad.cpp \
|
||||
2d/CCProgressTimer.cpp \
|
||||
2d/CCProtectedNode.cpp \
|
||||
2d/CCRenderTexture.cpp \
|
||||
2d/CCScene.cpp \
|
||||
2d/CCSprite.cpp \
|
||||
|
|
@ -82,7 +83,7 @@ cocos2d.cpp \
|
|||
3d/CCSprite3DMaterial.cpp \
|
||||
3d/CCObjLoader.cpp \
|
||||
3d/CCSprite3D.cpp \
|
||||
platform/CCGLViewProtocol.cpp \
|
||||
platform/CCGLView.cpp \
|
||||
platform/CCFileUtils.cpp \
|
||||
platform/CCSAXParser.cpp \
|
||||
platform/CCThread.cpp \
|
||||
|
|
@ -140,6 +141,7 @@ base/ccTypes.cpp \
|
|||
base/ccUTF8.cpp \
|
||||
base/ccUtils.cpp \
|
||||
base/etc1.cpp \
|
||||
base/pvr.cpp \
|
||||
base/s3tc.cpp \
|
||||
base/CCController.cpp \
|
||||
base/CCController-android.cpp \
|
||||
|
|
@ -206,12 +208,6 @@ LOCAL_C_INCLUDES := $(LOCAL_PATH) \
|
|||
$(LOCAL_PATH)/../external/ConvertUTF \
|
||||
$(LOCAL_PATH)/../external/nslog
|
||||
|
||||
|
||||
LOCAL_LDLIBS := -lGLESv2 \
|
||||
-llog \
|
||||
-lz \
|
||||
-landroid
|
||||
|
||||
LOCAL_EXPORT_LDLIBS := -lGLESv2 \
|
||||
-llog \
|
||||
-lz \
|
||||
|
|
@ -220,6 +216,10 @@ LOCAL_EXPORT_LDLIBS := -lGLESv2 \
|
|||
LOCAL_WHOLE_STATIC_LIBRARIES := cocos_freetype2_static
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES += cocos2dxandroid_static
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_png_static
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_jpeg_static
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_tiff_static
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES += cocos_webp_static
|
||||
|
||||
# define the macro to compile through support/zip_support/ioapi.c
|
||||
LOCAL_CFLAGS := -DUSE_FILE32API
|
||||
|
|
@ -232,3 +232,7 @@ include $(BUILD_STATIC_LIBRARY)
|
|||
$(call import-module,freetype2/prebuilt/android)
|
||||
$(call import-module,chipmunk)
|
||||
$(call import-module,platform/android)
|
||||
$(call import-module,jpeg/prebuilt/android)
|
||||
$(call import-module,png/prebuilt/android)
|
||||
$(call import-module,tiff/prebuilt/android)
|
||||
$(call import-module,webp/prebuilt/android)
|
||||
|
|
|
|||
|
|
@ -30,11 +30,11 @@ THE SOFTWARE.
|
|||
#define EXPORT_DLL _EXPORT_
|
||||
#elif defined(_WIN32)
|
||||
#if defined(_EXPORT_DLL_)
|
||||
#define EXPORT_DLL// __declspec(dllexport)
|
||||
#define EXPORT_DLL __declspec(dllexport)
|
||||
#elif defined(IGNORE_EXPORT)
|
||||
#define EXPORT_DLL
|
||||
#else /* use a DLL library */
|
||||
#define EXPORT_DLL// __declspec(dllimport)
|
||||
#define EXPORT_DLL __declspec(dllimport)
|
||||
#endif
|
||||
#else
|
||||
#if defined(_SHARED_)
|
||||
|
|
|
|||
|
|
@ -11,14 +11,14 @@
|
|||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectName>libAudio</ProjectName>
|
||||
<ProjectName>libcocosdenshion</ProjectName>
|
||||
<ProjectGuid>{F8EDD7FA-9A51-4E80-BAEB-860825D2EAC6}</ProjectGuid>
|
||||
<RootNamespace>CocosDenshion.win32</RootNamespace>
|
||||
<Keyword>Win32Proj</Keyword>
|
||||
</PropertyGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<CharacterSet>NotSet</CharacterSet>
|
||||
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
|
||||
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
<PlatformToolset Condition="'$(VisualStudioVersion)' == '12.0' and exists('$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A')">v120_xp</PlatformToolset>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
|
||||
<ConfigurationType>StaticLibrary</ConfigurationType>
|
||||
<ConfigurationType>DynamicLibrary</ConfigurationType>
|
||||
<CharacterSet>NotSet</CharacterSet>
|
||||
<PlatformToolset Condition="'$(VisualStudioVersion)' == '10.0'">v100</PlatformToolset>
|
||||
<PlatformToolset Condition="'$(VisualStudioVersion)' == '11.0'">v110</PlatformToolset>
|
||||
|
|
@ -74,7 +74,7 @@
|
|||
<ClCompile>
|
||||
<Optimization>Disabled</Optimization>
|
||||
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;..\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_EXPORT_DLL_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<MinimalRebuild>false</MinimalRebuild>
|
||||
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
|
||||
<RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
|
||||
|
|
@ -90,7 +90,7 @@
|
|||
<OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
|
||||
<GenerateDebugInformation>true</GenerateDebugInformation>
|
||||
<SubSystem>Windows</SubSystem>
|
||||
<ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
|
||||
<ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
|
||||
<TargetMachine>MachineX86</TargetMachine>
|
||||
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
|
||||
</Link>
|
||||
|
|
@ -98,7 +98,7 @@
|
|||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
<AdditionalIncludeDirectories>$(MSBuildProgramFiles32)\Microsoft SDKs\Windows\v7.1A\include;..\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_CRT_SECURE_NO_WARNINGS;_EXPORT_DLL_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
|
||||
<PrecompiledHeader>
|
||||
</PrecompiledHeader>
|
||||
|
|
@ -116,7 +116,7 @@
|
|||
<SubSystem>Windows</SubSystem>
|
||||
<OptimizeReferences>true</OptimizeReferences>
|
||||
<EnableCOMDATFolding>true</EnableCOMDATFolding>
|
||||
<ImportLibrary>$(TargetDir)$(TargetName).lib</ImportLibrary>
|
||||
<ImportLibrary>$(OutDir)$(TargetName).lib</ImportLibrary>
|
||||
<TargetMachine>MachineX86</TargetMachine>
|
||||
<AdditionalLibraryDirectories>$(OutDir)</AdditionalLibraryDirectories>
|
||||
</Link>
|
||||
|
|
@ -130,6 +130,11 @@
|
|||
<ClCompile Include="..\win32\MciPlayer.cpp" />
|
||||
<ClCompile Include="..\win32\SimpleAudioEngine.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\..\2d\libcocos2d.vcxproj">
|
||||
<Project>{98a51ba8-fc3a-415b-ac8f-8c7bd464e93e}</Project>
|
||||
</ProjectReference>
|
||||
</ItemGroup>
|
||||
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
|
||||
<ImportGroup Label="ExtensionTargets">
|
||||
</ImportGroup>
|
||||
|
|
@ -61,7 +61,6 @@
|
|||
#include "2d/CCScene.h"
|
||||
#include "platform/CCFileUtils.h"
|
||||
#include "renderer/CCTextureCache.h"
|
||||
#include "CCGLView.h"
|
||||
#include "base/base64.h"
|
||||
#include "base/ccUtils.h"
|
||||
NS_CC_BEGIN
|
||||
|
|
|
|||
|
|
@ -196,7 +196,7 @@ void Controller::registerListeners()
|
|||
};
|
||||
|
||||
_impl->_gcController.extendedGamepad.leftThumbstick.yAxis.valueChangedHandler = ^(GCControllerAxisInput *axis, float value){
|
||||
onAxisEvent(Key::JOYSTICK_LEFT_Y, value, axis.isAnalog);
|
||||
onAxisEvent(Key::JOYSTICK_LEFT_Y, -value, axis.isAnalog);
|
||||
};
|
||||
|
||||
_impl->_gcController.extendedGamepad.rightThumbstick.xAxis.valueChangedHandler = ^(GCControllerAxisInput *axis, float value){
|
||||
|
|
@ -204,7 +204,7 @@ void Controller::registerListeners()
|
|||
};
|
||||
|
||||
_impl->_gcController.extendedGamepad.rightThumbstick.yAxis.valueChangedHandler = ^(GCControllerAxisInput *axis, float value){
|
||||
onAxisEvent(Key::JOYSTICK_RIGHT_Y, value, axis.isAnalog);
|
||||
onAxisEvent(Key::JOYSTICK_RIGHT_Y, -value, axis.isAnalog);
|
||||
};
|
||||
|
||||
_impl->_gcController.extendedGamepad.valueChangedHandler = ^(GCExtendedGamepad *gamepad, GCControllerElement *element){
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ ssize_t Data::getSize() const
|
|||
return _size;
|
||||
}
|
||||
|
||||
void Data::copy(unsigned char* bytes, const ssize_t size)
|
||||
void Data::copy(const unsigned char* bytes, const ssize_t size)
|
||||
{
|
||||
clear();
|
||||
|
||||
|
|
|
|||
|
|
@ -63,7 +63,7 @@ public:
|
|||
* Developer should free the pointer after invoking this method.
|
||||
* @see Data::fastSet
|
||||
*/
|
||||
void copy(unsigned char* bytes, const ssize_t size);
|
||||
void copy(const unsigned char* bytes, const ssize_t size);
|
||||
|
||||
/** Fast set the buffer pointer and its size. Please use it carefully.
|
||||
* @param bytes The buffer pointer, note that it have to be allocated by 'malloc' or 'calloc',
|
||||
|
|
|
|||
|
|
@ -263,7 +263,7 @@ void Director::drawScene()
|
|||
|
||||
if (_openGLView)
|
||||
{
|
||||
_openGLView->pollInputEvents();
|
||||
_openGLView->pollEvents();
|
||||
}
|
||||
|
||||
//tick before glClear: issue #533
|
||||
|
|
|
|||
|
|
@ -36,6 +36,7 @@ THE SOFTWARE.
|
|||
#include "base/CCVector.h"
|
||||
#include "CCGL.h"
|
||||
#include "2d/CCLabelAtlas.h"
|
||||
#include "2d/CCScene.h"
|
||||
#include <stack>
|
||||
#include "math/CCMath.h"
|
||||
#include "platform/CCGLView.h"
|
||||
|
|
@ -442,7 +443,8 @@ protected:
|
|||
/* delta time since last tick to main loop */
|
||||
float _deltaTime;
|
||||
|
||||
/* The GLView, where everything is rendered */
|
||||
/* The _openGLView, where everything is rendered, GLView is a abstract class,cocos2d-x provide GLViewImpl
|
||||
which inherit from it as default renderer context,you can have your own by inherit from it*/
|
||||
GLView *_openGLView;
|
||||
|
||||
//texture cache belongs to this director
|
||||
|
|
@ -509,7 +511,7 @@ protected:
|
|||
Console *_console;
|
||||
#endif
|
||||
|
||||
// GLViewProtocol will recreate stats labels to fit visible rect
|
||||
// GLView will recreate stats labels to fit visible rect
|
||||
friend class GLView;
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@ class Node;
|
|||
/**
|
||||
* Base class of all kinds of events.
|
||||
*/
|
||||
class Event : public Ref
|
||||
class CC_DLL Event : public Ref
|
||||
{
|
||||
public:
|
||||
enum class Type
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
NS_CC_BEGIN
|
||||
|
||||
class EventAcceleration : public Event
|
||||
class CC_DLL EventAcceleration : public Event
|
||||
{
|
||||
public:
|
||||
EventAcceleration(const Acceleration& acc);
|
||||
|
|
|
|||
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
NS_CC_BEGIN
|
||||
|
||||
class EventCustom : public Event
|
||||
class CC_DLL EventCustom : public Event
|
||||
{
|
||||
public:
|
||||
/** Constructor */
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@ event listeners can be added and removed even
|
|||
from within an EventListener, while events are being
|
||||
dispatched.
|
||||
*/
|
||||
class EventDispatcher : public Ref
|
||||
class CC_DLL EventDispatcher : public Ref
|
||||
{
|
||||
public:
|
||||
// Adds event listener
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ namespace ui {
|
|||
class Widget;
|
||||
}
|
||||
|
||||
class EventFocus : public Event
|
||||
class CC_DLL EventFocus : public Event
|
||||
{
|
||||
public:
|
||||
EventFocus(ui::Widget* widgetLoseFocus, ui::Widget* widgetGetFocus);
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
NS_CC_BEGIN
|
||||
|
||||
class EventKeyboard : public Event
|
||||
class CC_DLL EventKeyboard : public Event
|
||||
{
|
||||
public:
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ class Node;
|
|||
* If you need custom listener which with different callback, you need to inherit this class.
|
||||
* For instance, you could refer to EventListenerAcceleration, EventListenerKeyboard, EventListenerTouchOneByOne, EventListenerCustom.
|
||||
*/
|
||||
class EventListener : public Ref
|
||||
class CC_DLL EventListener : public Ref
|
||||
{
|
||||
public:
|
||||
enum class Type
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@
|
|||
|
||||
NS_CC_BEGIN
|
||||
|
||||
class EventListenerAcceleration : public EventListener
|
||||
class CC_DLL EventListenerAcceleration : public EventListener
|
||||
{
|
||||
public:
|
||||
static const std::string LISTENER_ID;
|
||||
|
|
|
|||
|
|
@ -49,7 +49,7 @@ class EventCustom;
|
|||
*
|
||||
* dispatcher->removeEventListener(listener);
|
||||
*/
|
||||
class EventListenerCustom : public EventListener
|
||||
class CC_DLL EventListenerCustom : public EventListener
|
||||
{
|
||||
public:
|
||||
/** Creates an event listener with type and callback.
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ namespace ui {
|
|||
class Widget;
|
||||
}
|
||||
|
||||
class EventListenerFocus : public EventListener
|
||||
class CC_DLL EventListenerFocus : public EventListener
|
||||
{
|
||||
public:
|
||||
static const std::string LISTENER_ID;
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ NS_CC_BEGIN
|
|||
|
||||
class Event;
|
||||
|
||||
class EventListenerKeyboard : public EventListener
|
||||
class CC_DLL EventListenerKeyboard : public EventListener
|
||||
{
|
||||
public:
|
||||
static const std::string LISTENER_ID;
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ NS_CC_BEGIN
|
|||
|
||||
class Event;
|
||||
|
||||
class EventListenerMouse : public EventListener
|
||||
class CC_DLL EventListenerMouse : public EventListener
|
||||
{
|
||||
public:
|
||||
static const std::string LISTENER_ID;
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@
|
|||
|
||||
NS_CC_BEGIN
|
||||
|
||||
class EventListenerTouchOneByOne : public EventListener
|
||||
class CC_DLL EventListenerTouchOneByOne : public EventListener
|
||||
{
|
||||
public:
|
||||
static const std::string LISTENER_ID;
|
||||
|
|
@ -67,7 +67,7 @@ private:
|
|||
};
|
||||
|
||||
|
||||
class EventListenerTouchAllAtOnce : public EventListener
|
||||
class CC_DLL EventListenerTouchAllAtOnce : public EventListener
|
||||
{
|
||||
public:
|
||||
static const std::string LISTENER_ID;
|
||||
|
|
|
|||
|
|
@ -39,7 +39,7 @@
|
|||
|
||||
NS_CC_BEGIN
|
||||
|
||||
class EventMouse : public Event
|
||||
class CC_DLL EventMouse : public Event
|
||||
{
|
||||
public:
|
||||
/**
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ NS_CC_BEGIN
|
|||
|
||||
#define TOUCH_PERF_DEBUG 1
|
||||
|
||||
class EventTouch : public Event
|
||||
class CC_DLL EventTouch : public Event
|
||||
{
|
||||
public:
|
||||
static const int MAX_TOUCHES = 5;
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ THE SOFTWARE.
|
|||
#include "math/CCGeometry.h"
|
||||
|
||||
NS_CC_BEGIN
|
||||
extern const std::string STD_STRING_EMPTY;
|
||||
extern const std::string CC_DLL STD_STRING_EMPTY;
|
||||
|
||||
/**
|
||||
* @addtogroup input
|
||||
|
|
|
|||
|
|
@ -45,7 +45,7 @@ NS_CC_BEGIN
|
|||
*/
|
||||
|
||||
template <class K, class V>
|
||||
class CC_DLL Map
|
||||
class Map
|
||||
{
|
||||
public:
|
||||
// ------------------------------------------
|
||||
|
|
|
|||
|
|
@ -143,9 +143,9 @@ public:
|
|||
long numberOfCalls;
|
||||
};
|
||||
|
||||
extern void ProfilingBeginTimingBlock(const char *timerName);
|
||||
extern void ProfilingEndTimingBlock(const char *timerName);
|
||||
extern void ProfilingResetTimingBlock(const char *timerName);
|
||||
extern void CC_DLL ProfilingBeginTimingBlock(const char *timerName);
|
||||
extern void CC_DLL ProfilingEndTimingBlock(const char *timerName);
|
||||
extern void CC_DLL ProfilingResetTimingBlock(const char *timerName);
|
||||
|
||||
/*
|
||||
* cocos2d profiling categories
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ extern const ValueVector ValueVectorNull;
|
|||
extern const ValueMap ValueMapNull;
|
||||
extern const ValueMapIntKey ValueMapIntKeyNull;
|
||||
|
||||
class Value
|
||||
class CC_DLL Value
|
||||
{
|
||||
public:
|
||||
static const Value Null;
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ THE SOFTWARE.
|
|||
NS_CC_BEGIN
|
||||
|
||||
template<class T>
|
||||
class CC_DLL Vector
|
||||
class Vector
|
||||
{
|
||||
public:
|
||||
// ------------------------------------------
|
||||
|
|
|
|||
|
|
@ -40,6 +40,7 @@ set(COCOS_BASE_SRC
|
|||
base/ccUTF8.cpp
|
||||
base/ccUtils.cpp
|
||||
base/etc1.cpp
|
||||
base/pvr.cpp
|
||||
base/s3tc.cpp
|
||||
base/ObjectFactory.cpp
|
||||
)
|
||||
|
|
|
|||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue