Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'v3' into v3_windowChangeModule

This commit is contained in:
Huabing.Xu 2014-07-29 10:20:23 +08:00
parent eacf003eed ba3a467c3f
commit aaa65dcae4
66 changed files with 1486 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
AUTHORS
View File

@ -909,6 +909,7 @@ Developers:
gin0606 gin0606
Add a new line at the end of a file 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 a bug that crash happened when try to remove videoView(STATE_PLAYBACK_COMPLETED) in android
Fix video scale issue in iOS
billtt billtt
Fixed a bug that Node::setScale(float) may not work properly Fixed a bug that Node::setScale(float) may not work properly
@ -935,6 +936,12 @@ Developers:
yongkangchen yongkangchen
Fixed a bug that font size of EditBox is not scaled when glview is scaled on Mac OS X 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 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
Retired Core Developers: Retired Core Developers:
WenSheng Yang WenSheng Yang

4
CHANGELOG
View File

@ -7,12 +7,16 @@ cocos2d-x-3.3 ??
[FIX] EditBox: font size is not scaled when glview is scaled on Mac OS X [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: can not set charmap after it is created
[FIX] Label: setTextColor does not have any effect on Mac OS X [FIX] Label: setTextColor does not have any effect on Mac OS X
[FIX] ParticleSystem: effect is wrong if scene scaled
[FIX] Scale9Sprite: new added sprite will be hidden [FIX] Scale9Sprite: new added sprite will be hidden
[FIX] UIListView: can not insert an item in specific position, it is added at bottom [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] TabelView: can handle touch event though its parents are invisible
[FIX] TextField: can not use backspace to delete a character [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: 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 [FIX] Lua-binding: replace dynamic_cast to std::is_base_of in object_to_luaval

20
build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/build all libs Mac.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0510" LastUpgradeVersion = "0600"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
@ -39,6 +39,15 @@
ignoresPersistentStateOnLaunch = "NO" ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES" debugDocumentVersioning = "YES"
allowLocationSimulation = "YES"> allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A03F2E8E178141C1006731B9"
BuildableName = "build all libs Mac"
BlueprintName = "build all libs Mac"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions> <AdditionalOptions>
</AdditionalOptions> </AdditionalOptions>
</LaunchAction> </LaunchAction>
@ -48,6 +57,15 @@
useCustomWorkingDirectory = "NO" useCustomWorkingDirectory = "NO"
buildConfiguration = "Release" buildConfiguration = "Release"
debugDocumentVersioning = "YES"> debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A03F2E8E178141C1006731B9"
BuildableName = "build all libs Mac"
BlueprintName = "build all libs Mac"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction> </ProfileAction>
<AnalyzeAction <AnalyzeAction
buildConfiguration = "Debug"> buildConfiguration = "Debug">

20
build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/build all libs iOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0510" LastUpgradeVersion = "0600"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
@ -39,6 +39,15 @@
ignoresPersistentStateOnLaunch = "NO" ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES" debugDocumentVersioning = "YES"
allowLocationSimulation = "YES"> allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A07A4E0B178386390073F6A7"
BuildableName = "build all libs iOS"
BlueprintName = "build all libs iOS"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions> <AdditionalOptions>
</AdditionalOptions> </AdditionalOptions>
</LaunchAction> </LaunchAction>
@ -48,6 +57,15 @@
useCustomWorkingDirectory = "NO" useCustomWorkingDirectory = "NO"
buildConfiguration = "Release" buildConfiguration = "Release"
debugDocumentVersioning = "YES"> debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A07A4E0B178386390073F6A7"
BuildableName = "build all libs iOS"
BlueprintName = "build all libs iOS"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction> </ProfileAction>
<AnalyzeAction <AnalyzeAction
buildConfiguration = "Debug"> buildConfiguration = "Debug">

20
build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/box2d Mac.xcscheme → build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/libbox2d Mac.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0510" LastUpgradeVersion = "0600"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
@ -39,6 +39,15 @@
ignoresPersistentStateOnLaunch = "NO" ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES" debugDocumentVersioning = "YES"
allowLocationSimulation = "YES"> allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A03F2D5D1780BDF7006731B9"
BuildableName = "libbox2d Mac.a"
BlueprintName = "libbox2d Mac"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions> <AdditionalOptions>
</AdditionalOptions> </AdditionalOptions>
</LaunchAction> </LaunchAction>
@ -48,6 +57,15 @@
useCustomWorkingDirectory = "NO" useCustomWorkingDirectory = "NO"
buildConfiguration = "Release" buildConfiguration = "Release"
debugDocumentVersioning = "YES"> debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A03F2D5D1780BDF7006731B9"
BuildableName = "libbox2d Mac.a"
BlueprintName = "libbox2d Mac"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction> </ProfileAction>
<AnalyzeAction <AnalyzeAction
buildConfiguration = "Debug"> buildConfiguration = "Debug">

20
build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/box2d iOS.xcscheme → build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/libbox2d iOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0510" LastUpgradeVersion = "0600"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
@ -39,6 +39,15 @@
ignoresPersistentStateOnLaunch = "NO" ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES" debugDocumentVersioning = "YES"
allowLocationSimulation = "YES"> allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A07A4F3C1783876B0073F6A7"
BuildableName = "libbox2d iOS.a"
BlueprintName = "libbox2d iOS"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions> <AdditionalOptions>
</AdditionalOptions> </AdditionalOptions>
</LaunchAction> </LaunchAction>
@ -48,6 +57,15 @@
useCustomWorkingDirectory = "NO" useCustomWorkingDirectory = "NO"
buildConfiguration = "Release" buildConfiguration = "Release"
debugDocumentVersioning = "YES"> debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A07A4F3C1783876B0073F6A7"
BuildableName = "libbox2d iOS.a"
BlueprintName = "libbox2d iOS"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction> </ProfileAction>
<AnalyzeAction <AnalyzeAction
buildConfiguration = "Debug"> buildConfiguration = "Debug">

20
build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/chipmunk Mac.xcscheme → build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/libchipmunk Mac.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0510" LastUpgradeVersion = "0600"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
@ -39,6 +39,15 @@
ignoresPersistentStateOnLaunch = "NO" ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES" debugDocumentVersioning = "YES"
allowLocationSimulation = "YES"> allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A03F2B781780BD04006731B9"
BuildableName = "libchipmunk Mac.a"
BlueprintName = "libchipmunk Mac"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions> <AdditionalOptions>
</AdditionalOptions> </AdditionalOptions>
</LaunchAction> </LaunchAction>
@ -48,6 +57,15 @@
useCustomWorkingDirectory = "NO" useCustomWorkingDirectory = "NO"
buildConfiguration = "Release" buildConfiguration = "Release"
debugDocumentVersioning = "YES"> debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A03F2B781780BD04006731B9"
BuildableName = "libchipmunk Mac.a"
BlueprintName = "libchipmunk Mac"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction> </ProfileAction>
<AnalyzeAction <AnalyzeAction
buildConfiguration = "Debug"> buildConfiguration = "Debug">

20
build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/chipmunk iOS.xcscheme → build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/libchipmunk iOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0510" LastUpgradeVersion = "0600"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
@ -39,6 +39,15 @@
ignoresPersistentStateOnLaunch = "NO" ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES" debugDocumentVersioning = "YES"
allowLocationSimulation = "YES"> allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A07A4EFD178387670073F6A7"
BuildableName = "libchipmunk iOS.a"
BlueprintName = "libchipmunk iOS"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions> <AdditionalOptions>
</AdditionalOptions> </AdditionalOptions>
</LaunchAction> </LaunchAction>
@ -48,6 +57,15 @@
useCustomWorkingDirectory = "NO" useCustomWorkingDirectory = "NO"
buildConfiguration = "Release" buildConfiguration = "Release"
debugDocumentVersioning = "YES"> debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A07A4EFD178387670073F6A7"
BuildableName = "libchipmunk iOS.a"
BlueprintName = "libchipmunk iOS"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction> </ProfileAction>
<AnalyzeAction <AnalyzeAction
buildConfiguration = "Debug"> buildConfiguration = "Debug">

22
build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx Mac.xcscheme → build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/libcocos2d Mac.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0510" LastUpgradeVersion = "0600"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
@ -15,7 +15,7 @@
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "1551A33E158F2AB200E66CFE" BlueprintIdentifier = "1551A33E158F2AB200E66CFE"
BuildableName = "libcocos2dx Mac.a" BuildableName = "libcocos2d Mac.a"
BlueprintName = "libcocos2d Mac" BlueprintName = "libcocos2d Mac"
ReferencedContainer = "container:cocos2d_libs.xcodeproj"> ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference> </BuildableReference>
@ -39,6 +39,15 @@
ignoresPersistentStateOnLaunch = "NO" ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES" debugDocumentVersioning = "YES"
allowLocationSimulation = "YES"> allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1551A33E158F2AB200E66CFE"
BuildableName = "libcocos2d Mac.a"
BlueprintName = "libcocos2d Mac"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions> <AdditionalOptions>
</AdditionalOptions> </AdditionalOptions>
</LaunchAction> </LaunchAction>
@ -48,6 +57,15 @@
useCustomWorkingDirectory = "NO" useCustomWorkingDirectory = "NO"
buildConfiguration = "Release" buildConfiguration = "Release"
debugDocumentVersioning = "YES"> debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1551A33E158F2AB200E66CFE"
BuildableName = "libcocos2d Mac.a"
BlueprintName = "libcocos2d Mac"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction> </ProfileAction>
<AnalyzeAction <AnalyzeAction
buildConfiguration = "Debug"> buildConfiguration = "Debug">

22
build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx iOS.xcscheme → build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/libcocos2d iOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0510" LastUpgradeVersion = "0600"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
@ -15,7 +15,7 @@
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "A07A4C241783777C0073F6A7" BlueprintIdentifier = "A07A4C241783777C0073F6A7"
BuildableName = "libcocos2dx iOS.a" BuildableName = "libcocos2d iOS.a"
BlueprintName = "libcocos2d iOS" BlueprintName = "libcocos2d iOS"
ReferencedContainer = "container:cocos2d_libs.xcodeproj"> ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference> </BuildableReference>
@ -39,6 +39,15 @@
ignoresPersistentStateOnLaunch = "NO" ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES" debugDocumentVersioning = "YES"
allowLocationSimulation = "YES"> allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A07A4C241783777C0073F6A7"
BuildableName = "libcocos2d iOS.a"
BlueprintName = "libcocos2d iOS"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions> <AdditionalOptions>
</AdditionalOptions> </AdditionalOptions>
</LaunchAction> </LaunchAction>
@ -48,6 +57,15 @@
useCustomWorkingDirectory = "NO" useCustomWorkingDirectory = "NO"
buildConfiguration = "Release" buildConfiguration = "Release"
debugDocumentVersioning = "YES"> debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A07A4C241783777C0073F6A7"
BuildableName = "libcocos2d iOS.a"
BlueprintName = "libcocos2d iOS"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction> </ProfileAction>
<AnalyzeAction <AnalyzeAction
buildConfiguration = "Debug"> buildConfiguration = "Debug">

77
build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/libcocosbuilder Mac.xcscheme Normal file
View File

@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0600"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B2DB479B197669A100411E16"
BuildableName = "libcocosbuilder Mac.a"
BlueprintName = "libcocosbuilder 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">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B2DB479B197669A100411E16"
BuildableName = "libcocosbuilder Mac.a"
BlueprintName = "libcocosbuilder Mac"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B2DB479B197669A100411E16"
BuildableName = "libcocosbuilder Mac.a"
BlueprintName = "libcocosbuilder Mac"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

77
build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/libcocosbuilder iOS.xcscheme Normal file
View File

@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0600"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B24EEA6F19775ECE004493CC"
BuildableName = "libcocosbuilder iOS.a"
BlueprintName = "libcocosbuilder 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">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B24EEA6F19775ECE004493CC"
BuildableName = "libcocosbuilder iOS.a"
BlueprintName = "libcocosbuilder iOS"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B24EEA6F19775ECE004493CC"
BuildableName = "libcocosbuilder iOS.a"
BlueprintName = "libcocosbuilder iOS"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

22
build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/CocosDenshion Mac.xcscheme → build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/libcocosdenshion Mac.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0510" LastUpgradeVersion = "0600"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
@ -15,7 +15,7 @@
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "A03F2E9817814268006731B9" BlueprintIdentifier = "A03F2E9817814268006731B9"
BuildableName = "libCocosDenshion Mac.a" BuildableName = "libcocosdenshion Mac.a"
BlueprintName = "libcocosdenshion Mac" BlueprintName = "libcocosdenshion Mac"
ReferencedContainer = "container:cocos2d_libs.xcodeproj"> ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference> </BuildableReference>
@ -39,6 +39,15 @@
ignoresPersistentStateOnLaunch = "NO" ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES" debugDocumentVersioning = "YES"
allowLocationSimulation = "YES"> allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A03F2E9817814268006731B9"
BuildableName = "libcocosdenshion Mac.a"
BlueprintName = "libcocosdenshion Mac"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions> <AdditionalOptions>
</AdditionalOptions> </AdditionalOptions>
</LaunchAction> </LaunchAction>
@ -48,6 +57,15 @@
useCustomWorkingDirectory = "NO" useCustomWorkingDirectory = "NO"
buildConfiguration = "Release" buildConfiguration = "Release"
debugDocumentVersioning = "YES"> debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A03F2E9817814268006731B9"
BuildableName = "libcocosdenshion Mac.a"
BlueprintName = "libcocosdenshion Mac"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction> </ProfileAction>
<AnalyzeAction <AnalyzeAction
buildConfiguration = "Debug"> buildConfiguration = "Debug">

22
build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/CocosDenshion iOS.xcscheme → build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/libcocosdenshion iOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0510" LastUpgradeVersion = "0600"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
@ -15,7 +15,7 @@
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "A07A4F9F178387730073F6A7" BlueprintIdentifier = "A07A4F9F178387730073F6A7"
BuildableName = "libCocosDenshion iOS.a" BuildableName = "libcocosdenshion iOS.a"
BlueprintName = "libcocosdenshion iOS" BlueprintName = "libcocosdenshion iOS"
ReferencedContainer = "container:cocos2d_libs.xcodeproj"> ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference> </BuildableReference>
@ -39,6 +39,15 @@
ignoresPersistentStateOnLaunch = "NO" ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES" debugDocumentVersioning = "YES"
allowLocationSimulation = "YES"> allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A07A4F9F178387730073F6A7"
BuildableName = "libcocosdenshion iOS.a"
BlueprintName = "libcocosdenshion iOS"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions> <AdditionalOptions>
</AdditionalOptions> </AdditionalOptions>
</LaunchAction> </LaunchAction>
@ -48,6 +57,15 @@
useCustomWorkingDirectory = "NO" useCustomWorkingDirectory = "NO"
buildConfiguration = "Release" buildConfiguration = "Release"
debugDocumentVersioning = "YES"> debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A07A4F9F178387730073F6A7"
BuildableName = "libcocosdenshion iOS.a"
BlueprintName = "libcocosdenshion iOS"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction> </ProfileAction>
<AnalyzeAction <AnalyzeAction
buildConfiguration = "Debug"> buildConfiguration = "Debug">

77
build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/libcocostudio Mac.xcscheme Normal file
View File

@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0600"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B2DB48161976716E00411E16"
BuildableName = "libcocostudio Mac.a"
BlueprintName = "libcocostudio 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">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B2DB48161976716E00411E16"
BuildableName = "libcocostudio Mac.a"
BlueprintName = "libcocostudio Mac"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B2DB48161976716E00411E16"
BuildableName = "libcocostudio Mac.a"
BlueprintName = "libcocostudio Mac"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

77
build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/libcocostudio iOS.xcscheme Normal file
View File

@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0600"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B24EEA6719775EBB004493CC"
BuildableName = "libcocostudio iOS.a"
BlueprintName = "libcocostudio 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">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B24EEA6719775EBB004493CC"
BuildableName = "libcocostudio iOS.a"
BlueprintName = "libcocostudio iOS"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B24EEA6719775EBB004493CC"
BuildableName = "libcocostudio iOS.a"
BlueprintName = "libcocostudio iOS"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

22
build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx-extensions Mac.xcscheme → build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/libextension Mac.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0510" LastUpgradeVersion = "0600"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
@ -15,7 +15,7 @@
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "A03F2FC117814595006731B9" BlueprintIdentifier = "A03F2FC117814595006731B9"
BuildableName = "libcocos2dx-extensions Mac.a" BuildableName = "libextension Mac.a"
BlueprintName = "libextension Mac" BlueprintName = "libextension Mac"
ReferencedContainer = "container:cocos2d_libs.xcodeproj"> ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference> </BuildableReference>
@ -39,6 +39,15 @@
ignoresPersistentStateOnLaunch = "NO" ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES" debugDocumentVersioning = "YES"
allowLocationSimulation = "YES"> allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A03F2FC117814595006731B9"
BuildableName = "libextension Mac.a"
BlueprintName = "libextension Mac"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions> <AdditionalOptions>
</AdditionalOptions> </AdditionalOptions>
</LaunchAction> </LaunchAction>
@ -48,6 +57,15 @@
useCustomWorkingDirectory = "NO" useCustomWorkingDirectory = "NO"
buildConfiguration = "Release" buildConfiguration = "Release"
debugDocumentVersioning = "YES"> debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A03F2FC117814595006731B9"
BuildableName = "libextension Mac.a"
BlueprintName = "libextension Mac"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction> </ProfileAction>
<AnalyzeAction <AnalyzeAction
buildConfiguration = "Debug"> buildConfiguration = "Debug">

22
build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/cocos2dx-extensions iOS.xcscheme → build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/libextension iOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0510" LastUpgradeVersion = "0600"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
@ -15,7 +15,7 @@
<BuildableReference <BuildableReference
BuildableIdentifier = "primary" BuildableIdentifier = "primary"
BlueprintIdentifier = "A07A4E111783867C0073F6A7" BlueprintIdentifier = "A07A4E111783867C0073F6A7"
BuildableName = "libcocos2dx-extensions iOS.a" BuildableName = "libextension iOS.a"
BlueprintName = "libextension iOS" BlueprintName = "libextension iOS"
ReferencedContainer = "container:cocos2d_libs.xcodeproj"> ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference> </BuildableReference>
@ -39,6 +39,15 @@
ignoresPersistentStateOnLaunch = "NO" ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES" debugDocumentVersioning = "YES"
allowLocationSimulation = "YES"> allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A07A4E111783867C0073F6A7"
BuildableName = "libextension iOS.a"
BlueprintName = "libextension iOS"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions> <AdditionalOptions>
</AdditionalOptions> </AdditionalOptions>
</LaunchAction> </LaunchAction>
@ -48,6 +57,15 @@
useCustomWorkingDirectory = "NO" useCustomWorkingDirectory = "NO"
buildConfiguration = "Release" buildConfiguration = "Release"
debugDocumentVersioning = "YES"> debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "A07A4E111783867C0073F6A7"
BuildableName = "libextension iOS.a"
BlueprintName = "libextension iOS"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction> </ProfileAction>
<AnalyzeAction <AnalyzeAction
buildConfiguration = "Debug"> buildConfiguration = "Debug">

77
build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/libnetwork Mac.xcscheme Normal file
View File

@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0600"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B2DB498D197686CB00411E16"
BuildableName = "libnetwork Mac.a"
BlueprintName = "libnetwork 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">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B2DB498D197686CB00411E16"
BuildableName = "libnetwork Mac.a"
BlueprintName = "libnetwork Mac"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B2DB498D197686CB00411E16"
BuildableName = "libnetwork Mac.a"
BlueprintName = "libnetwork Mac"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

77
build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/libnetwork iOS.xcscheme Normal file
View File

@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0600"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B24EEA7F19775EF3004493CC"
BuildableName = "libnetwork iOS.a"
BlueprintName = "libnetwork 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">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B24EEA7F19775EF3004493CC"
BuildableName = "libnetwork iOS.a"
BlueprintName = "libnetwork iOS"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B24EEA7F19775EF3004493CC"
BuildableName = "libnetwork iOS.a"
BlueprintName = "libnetwork iOS"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

77
build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/libspine Mac.xcscheme Normal file
View File

@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0600"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B2DB48CA19767F1F00411E16"
BuildableName = "libspine Mac.a"
BlueprintName = "libspine 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">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B2DB48CA19767F1F00411E16"
BuildableName = "libspine Mac.a"
BlueprintName = "libspine Mac"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B2DB48CA19767F1F00411E16"
BuildableName = "libspine Mac.a"
BlueprintName = "libspine Mac"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

77
build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/libspine iOS.xcscheme Normal file
View File

@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0600"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B24EEA7719775EE1004493CC"
BuildableName = "libspine iOS.a"
BlueprintName = "libspine 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">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B24EEA7719775EE1004493CC"
BuildableName = "libspine iOS.a"
BlueprintName = "libspine iOS"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B24EEA7719775EE1004493CC"
BuildableName = "libspine iOS.a"
BlueprintName = "libspine iOS"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

77
build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/libui Mac.xcscheme Normal file
View File

@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0600"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B245F10019766132001920FD"
BuildableName = "libui Mac.a"
BlueprintName = "libui 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">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B245F10019766132001920FD"
BuildableName = "libui Mac.a"
BlueprintName = "libui Mac"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B245F10019766132001920FD"
BuildableName = "libui Mac.a"
BlueprintName = "libui Mac"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

77
build/cocos2d_libs.xcodeproj/xcshareddata/xcschemes/libui iOS.xcscheme Normal file
View File

@ -0,0 +1,77 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "0600"
version = "1.3">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B24EEA2C19775E92004493CC"
BuildableName = "libui iOS.a"
BlueprintName = "libui 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">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B24EEA2C19775E92004493CC"
BuildableName = "libui iOS.a"
BlueprintName = "libui iOS"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions>
</AdditionalOptions>
</LaunchAction>
<ProfileAction
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
buildConfiguration = "Release"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "B24EEA2C19775E92004493CC"
BuildableName = "libui iOS.a"
BlueprintName = "libui iOS"
ReferencedContainer = "container:cocos2d_libs.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>

20
build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/build all tests Mac.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0510" LastUpgradeVersion = "0600"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
@ -39,6 +39,15 @@
ignoresPersistentStateOnLaunch = "NO" ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES" debugDocumentVersioning = "YES"
allowLocationSimulation = "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>
</AdditionalOptions> </AdditionalOptions>
</LaunchAction> </LaunchAction>
@ -48,6 +57,15 @@
useCustomWorkingDirectory = "NO" useCustomWorkingDirectory = "NO"
buildConfiguration = "Release" buildConfiguration = "Release"
debugDocumentVersioning = "YES"> 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> </ProfileAction>
<AnalyzeAction <AnalyzeAction
buildConfiguration = "Debug"> buildConfiguration = "Debug">

20
build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/build all tests iOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0510" LastUpgradeVersion = "0600"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
@ -39,6 +39,15 @@
ignoresPersistentStateOnLaunch = "NO" ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES" debugDocumentVersioning = "YES"
allowLocationSimulation = "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>
</AdditionalOptions> </AdditionalOptions>
</LaunchAction> </LaunchAction>
@ -48,6 +57,15 @@
useCustomWorkingDirectory = "NO" useCustomWorkingDirectory = "NO"
buildConfiguration = "Release" buildConfiguration = "Release"
debugDocumentVersioning = "YES"> 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> </ProfileAction>
<AnalyzeAction <AnalyzeAction
buildConfiguration = "Debug"> buildConfiguration = "Debug">

2
build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-empty-test Mac.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0510" LastUpgradeVersion = "0600"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-empty-test iOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0510" LastUpgradeVersion = "0600"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-tests Mac.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0510" LastUpgradeVersion = "0600"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/cpp-tests iOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0510" LastUpgradeVersion = "0600"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/game-controller-test IOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0510" LastUpgradeVersion = "0600"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/lua-empty-test Mac.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0510" LastUpgradeVersion = "0600"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/lua-empty-test iOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0510" LastUpgradeVersion = "0600"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/lua-game-controller-test iOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0510" LastUpgradeVersion = "0600"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/lua-tests Mac.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0510" LastUpgradeVersion = "0600"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

2
build/cocos2d_tests.xcodeproj/xcshareddata/xcschemes/lua-tests iOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0510" LastUpgradeVersion = "0600"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"

5
cocos/2d/CCLabel.cpp
View File

@ -881,11 +881,12 @@ void Label::drawShadowWithoutBlur()
void Label::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags) void Label::draw(Renderer *renderer, const Mat4 &transform, uint32_t flags)
{ {
// Don't do calculate the culling if the transform was not updated // 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) { if(_insideBounds) {
_customCommand.init(_globalZOrder); _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); renderer->addCommand(&_customCommand);
} }
} }

7
cocos/2d/CCParticleSystem.cpp
View File

@ -771,7 +771,12 @@ void ParticleSystem::update(float dt)
Vec2 newPos; 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; Vec2 diff = currentPosition - p->startPos;
newPos = p->pos - diff; newPos = p->pos - diff;

4
cocos/base/ccUtils.h
View File

@ -74,8 +74,8 @@ namespace utils
*/ */
std::vector<Node*> CC_DLL findChildren(const Node &node, const std::string &name); std::vector<Node*> CC_DLL findChildren(const Node &node, const std::string &name);
/** Same to ::atof, but strip the string, remain 7 numbers after '.' before call atof。 /** Same to ::atof, but strip the string, remain 7 numbers after '.' before call atof.
* Why we need this? Because in android c++_static, atof ( and std::atof ) is unsupported for numbers have long decimal part and contain several numbers can approximate to 1 （ like 90.099998474121094 ), it will return inf. this function is used to fix this bug. * Why we need this? Because in android c++_static, atof ( and std::atof ) is unsupported for numbers have long decimal part and contain several numbers can approximate to 1 ( like 90.099998474121094 ), it will return inf. this function is used to fix this bug.
*/ */
double CC_DLL atof(const char* str); double CC_DLL atof(const char* str);
} }

30
cocos/platform/CCFileUtils.cpp
View File

@ -888,39 +888,19 @@ std::string FileUtils::getFullPathForDirectoryAndFilename(const std::string& dir
std::string FileUtils::searchFullPathForFilename(const std::string& filename) const std::string FileUtils::searchFullPathForFilename(const std::string& filename) const
{ {
// If filename is absolute path, we don't need to consider 'search paths' and 'resolution orders'.
if (isAbsolutePath(filename)) if (isAbsolutePath(filename))
{ {
return filename; return filename;
} }
std::string path = const_cast<FileUtils*>(this)->fullPathForFilename(filename);
// Already Cached ? if (0 == path.compare(filename))
auto cacheIter = _fullPathCache.find(filename);
if( cacheIter != _fullPathCache.end() )
{ {
return cacheIter->second; return "";
} }
else
// Get the new file name.
const std::string newFilename( getNewFilename(filename) );
std::string fullpath;
for (auto searchIt = _searchPathArray.cbegin(); searchIt != _searchPathArray.cend(); ++searchIt)
{ {
for (auto resolutionIt = _searchResolutionsOrderArray.cbegin(); resolutionIt != _searchResolutionsOrderArray.cend(); ++resolutionIt) return path;
{
fullpath = const_cast<FileUtils*>(this)->getPathForFilename(newFilename, *resolutionIt, *searchIt);
if (!fullpath.empty())
{
// Using the filename passed in as key.
const_cast<FileUtils*>(this)->_fullPathCache.insert(std::make_pair(filename, fullpath));
return fullpath;
}
}
} }
return "";
} }
bool FileUtils::isFileExist(const std::string& filename) const bool FileUtils::isFileExist(const std::string& filename) const

17
cocos/platform/CCFileUtils.h
View File

@ -407,12 +407,16 @@ protected:
virtual std::string getNewFilename(const std::string &filename) const; virtual std::string getNewFilename(const std::string &filename) const;
/** /**
* Checks whether file exists without considering search paths and resolution orders. * Checks whether a file exists without considering search paths and resolution orders.
* @param The file (with absolute path) to look up for
* @return Returns true if the file found at the given absolute path, otherwise returns false
*/ */
virtual bool isFileExistInternal(const std::string& filename) const = 0; virtual bool isFileExistInternal(const std::string& filename) const = 0;
/** /**
* Checks whether file exists without considering search paths and resolution orders. * Checks whether a directory exists without considering search paths and resolution orders.
* @param The directory (with absolute path) to look up for
* @return Returns true if the directory found at the given absolute path, otherwise returns false
*/ */
virtual bool isDirectoryExistInternal(const std::string& dirPath) const; virtual bool isDirectoryExistInternal(const std::string& dirPath) const;
@ -438,7 +442,14 @@ protected:
*/ */
virtual std::string getFullPathForDirectoryAndFilename(const std::string& directory, const std::string& filename); virtual std::string getFullPathForDirectoryAndFilename(const std::string& directory, const std::string& filename);
/**
* Returns the fullpath for a given filename.
* This is an alternative for fullPathForFilename, there are two main differences:
* First, it returns empty string instead of the original filename when no file found for the given name.
* Secondly, it's a const function.
* @param filename The file name to look up for
* @return The full path for the file, if not found, the return value will be an empty string
*/
virtual std::string searchFullPathForFilename(const std::string& filename) const; virtual std::string searchFullPathForFilename(const std::string& filename) const;

27
cocos/platform/CCImage.cpp
View File

@ -97,6 +97,8 @@ namespace
{ {
static const int PVR_TEXTURE_FLAG_TYPE_MASK = 0xff; static const int PVR_TEXTURE_FLAG_TYPE_MASK = 0xff;
static bool _PVRHaveAlphaPremultiplied = false;
// Values taken from PVRTexture.h from http://www.imgtec.com // Values taken from PVRTexture.h from http://www.imgtec.com
enum class PVR2TextureFlag enum class PVR2TextureFlag
{ {
@ -455,7 +457,6 @@ Image::Image()
, _unpack(false) , _unpack(false)
, _fileType(Format::UNKOWN) , _fileType(Format::UNKOWN)
, _renderFormat(Texture2D::PixelFormat::NONE) , _renderFormat(Texture2D::PixelFormat::NONE)
, _preMulti(false)
, _numberOfMipmaps(0) , _numberOfMipmaps(0)
, _hasPremultipliedAlpha(true) , _hasPremultipliedAlpha(true)
{ {
@ -875,7 +876,7 @@ bool Image::initWithJpgData(const unsigned char * data, ssize_t dataLen)
/* init image info */ /* init image info */
_width = cinfo.output_width; _width = cinfo.output_width;
_height = cinfo.output_height; _height = cinfo.output_height;
_preMulti = false; _hasPremultipliedAlpha = false;
row_pointer[0] = static_cast<unsigned char*>(malloc(cinfo.output_width*cinfo.output_components * sizeof(unsigned char))); row_pointer[0] = static_cast<unsigned char*>(malloc(cinfo.output_width*cinfo.output_components * sizeof(unsigned char)));
CC_BREAK_IF(! row_pointer[0]); CC_BREAK_IF(! row_pointer[0]);
@ -1043,7 +1044,7 @@ bool Image::initWithPngData(const unsigned char * data, ssize_t dataLen)
} }
else else
{ {
_preMulti = false; _hasPremultipliedAlpha = false;
} }
if (row_pointers != nullptr) if (row_pointers != nullptr)
@ -1216,7 +1217,7 @@ bool Image::initWithTiffData(const unsigned char * data, ssize_t dataLen)
{ {
/* the raster data is pre-multiplied by the alpha component /* the raster data is pre-multiplied by the alpha component
after invoking TIFFReadRGBAImageOriented*/ after invoking TIFFReadRGBAImageOriented*/
_preMulti = true; _hasPremultipliedAlpha = true;
memcpy(_data, raster, npixels*sizeof (uint32)); memcpy(_data, raster, npixels*sizeof (uint32));
} }
@ -1288,7 +1289,9 @@ bool Image::initWithPVRv2Data(const unsigned char * data, ssize_t dataLen)
Configuration *configuration = Configuration::getInstance(); Configuration *configuration = Configuration::getInstance();
_hasPremultipliedAlpha = false; //can not detect the premultiplied alpha from pvr file, use _PVRHaveAlphaPremultiplied instead.
_hasPremultipliedAlpha = _PVRHaveAlphaPremultiplied;
unsigned int flags = CC_SWAP_INT32_LITTLE_TO_HOST(header->flags); unsigned int flags = CC_SWAP_INT32_LITTLE_TO_HOST(header->flags);
PVR2TexturePixelFormat formatFlags = static_cast<PVR2TexturePixelFormat>(flags & PVR_TEXTURE_FLAG_TYPE_MASK); PVR2TexturePixelFormat formatFlags = static_cast<PVR2TexturePixelFormat>(flags & PVR_TEXTURE_FLAG_TYPE_MASK);
bool flipped = (flags & (unsigned int)PVR2TextureFlag::VerticalFlip) ? true : false; bool flipped = (flags & (unsigned int)PVR2TextureFlag::VerticalFlip) ? true : false;
@ -1478,7 +1481,7 @@ bool Image::initWithPVRv3Data(const unsigned char * data, ssize_t dataLen)
// PVRv3 specifies premultiply alpha in a flag -- should always respect this in PVRv3 files // PVRv3 specifies premultiply alpha in a flag -- should always respect this in PVRv3 files
if (flags & (unsigned int)PVR3TextureFlag::PremultipliedAlpha) if (flags & (unsigned int)PVR3TextureFlag::PremultipliedAlpha)
{ {
_preMulti = true; _hasPremultipliedAlpha = true;
} }
// sizing // sizing
@ -1706,7 +1709,7 @@ bool Image::initWithTGAData(tImageTGA* tgaData)
_dataLen = _width * _height * tgaData->pixelDepth / 8; _dataLen = _width * _height * tgaData->pixelDepth / 8;
_fileType = Format::TGA; _fileType = Format::TGA;
_preMulti = false; _hasPremultipliedAlpha = false;
ret = true; ret = true;
@ -2056,7 +2059,7 @@ bool Image::initWithRawData(const unsigned char * data, ssize_t dataLen, int wid
_height = height; _height = height;
_width = width; _width = width;
_preMulti = preMulti; _hasPremultipliedAlpha = preMulti;
_renderFormat = Texture2D::PixelFormat::RGBA8888; _renderFormat = Texture2D::PixelFormat::RGBA8888;
// only RGBA8888 supported // only RGBA8888 supported
@ -2351,7 +2354,13 @@ void Image::premultipliedAlpha()
fourBytes[i] = CC_RGB_PREMULTIPLY_ALPHA(p[0], p[1], p[2], p[3]); fourBytes[i] = CC_RGB_PREMULTIPLY_ALPHA(p[0], p[1], p[2], p[3]);
} }
_preMulti = true; _hasPremultipliedAlpha = true;
}
void Image::setPVRImagesHavePremultipliedAlpha(bool haveAlphaPremultiplied)
{
_PVRHaveAlphaPremultiplied = haveAlphaPremultiplied;
} }
NS_CC_END NS_CC_END

12
cocos/platform/CCImage.h
View File

@ -122,10 +122,10 @@ public:
inline Texture2D::PixelFormat getRenderFormat() { return _renderFormat; } inline Texture2D::PixelFormat getRenderFormat() { return _renderFormat; }
inline int getWidth() { return _width; } inline int getWidth() { return _width; }
inline int getHeight() { return _height; } inline int getHeight() { return _height; }
inline bool isPremultipliedAlpha() { return _preMulti; }
inline int getNumberOfMipmaps() { return _numberOfMipmaps; } inline int getNumberOfMipmaps() { return _numberOfMipmaps; }
inline MipmapInfo* getMipmaps() { return _mipmaps; } inline MipmapInfo* getMipmaps() { return _mipmaps; }
inline bool hasPremultipliedAlpha() { return _hasPremultipliedAlpha; } inline bool hasPremultipliedAlpha() { return _hasPremultipliedAlpha; }
CC_DEPRECATED_ATTRIBUTE inline bool isPremultipliedAlpha() { return _hasPremultipliedAlpha; }
int getBitPerPixel(); int getBitPerPixel();
bool hasAlpha(); bool hasAlpha();
@ -138,6 +138,15 @@ public:
@param isToRGB whether the image is saved as RGB format. @param isToRGB whether the image is saved as RGB format.
*/ */
bool saveToFile(const std::string &filename, bool isToRGB = true); bool saveToFile(const std::string &filename, bool isToRGB = true);
/** treats (or not) PVR files as if they have alpha premultiplied.
Since it is impossible to know at runtime if the PVR images have the alpha channel premultiplied, it is
possible load them as if they have (or not) the alpha channel premultiplied.
By default it is disabled.
*/
static void setPVRImagesHavePremultipliedAlpha(bool haveAlphaPremultiplied);
protected: protected:
bool initWithJpgData(const unsigned char * data, ssize_t dataLen); bool initWithJpgData(const unsigned char * data, ssize_t dataLen);
@ -171,7 +180,6 @@ protected:
bool _unpack; bool _unpack;
Format _fileType; Format _fileType;
Texture2D::PixelFormat _renderFormat; Texture2D::PixelFormat _renderFormat;
bool _preMulti;
MipmapInfo _mipmaps[MIPMAP_MAX]; // pointer to mipmap images MipmapInfo _mipmaps[MIPMAP_MAX]; // pointer to mipmap images
int _numberOfMipmaps; int _numberOfMipmaps;
// false if we cann't auto detect the image is premultiplied or not. // false if we cann't auto detect the image is premultiplied or not.

11
cocos/platform/android/CCApplication.cpp
View File

@ -68,7 +68,16 @@ int Application::run()
void Application::setAnimationInterval(double interval) void Application::setAnimationInterval(double interval)
{ {
// NYI JniMethodInfo methodInfo;
if (! JniHelper::getStaticMethodInfo(methodInfo, "org/cocos2dx/lib/Cocos2dxRenderer", "setAnimationInterval",
"(D)V"))
{
CCLOG("%s %d: error to get methodInfo", __FILE__, __LINE__);
}
else
{
methodInfo.env->CallStaticVoidMethod(methodInfo.classID, methodInfo.methodID, interval);
}
} }
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////

41
cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxRenderer.java
View File

@ -82,31 +82,30 @@ public class Cocos2dxRenderer implements GLSurfaceView.Renderer {
@Override @Override
public void onDrawFrame(final GL10 gl) { public void onDrawFrame(final GL10 gl) {
/* /*
* FPS controlling algorithm is not accurate, and it will slow down FPS * No need to use algorithm in default(60 FPS) situation,
* on some devices. So comment FPS controlling code. * since onDrawFrame() was called by system 60 times per second by default.
*/ */
if (sAnimationInterval <= 1.0 / 60 * Cocos2dxRenderer.NANOSECONDSPERSECOND) {
Cocos2dxRenderer.nativeRender();
} else {
final long now = System.nanoTime();
final long interval = now - this.mLastTickInNanoSeconds;
/* if (interval < Cocos2dxRenderer.sAnimationInterval) {
final long nowInNanoSeconds = System.nanoTime(); try {
final long interval = nowInNanoSeconds - this.mLastTickInNanoSeconds; Thread.sleep((Cocos2dxRenderer.sAnimationInterval - interval) / Cocos2dxRenderer.NANOSECONDSPERMICROSECOND);
*/ } catch (final Exception e) {
}
// should render a frame when onDrawFrame() is called or there is a
// "ghost"
Cocos2dxRenderer.nativeRender();
/*
// fps controlling
if (interval < Cocos2dxRenderer.sAnimationInterval) {
try {
// because we render it before, so we should sleep twice time interval
Thread.sleep((Cocos2dxRenderer.sAnimationInterval - interval) / Cocos2dxRenderer.NANOSECONDSPERMICROSECOND);
} catch (final Exception e) {
} }
/*
* Render time MUST be counted in, or the FPS will slower than appointed.
*/
final long renderStart = System.nanoTime();
Cocos2dxRenderer.nativeRender();
final long renderEnd = System.nanoTime();
final long renderInterval = renderEnd - renderStart;
this.mLastTickInNanoSeconds = renderEnd - renderInterval;
} }
this.mLastTickInNanoSeconds = nowInNanoSeconds;
*/
} }
// =========================================================== // ===========================================================

4
cocos/platform/android/java/src/org/cocos2dx/lib/Cocos2dxVideoView.java
View File

@ -119,7 +119,7 @@ public class Cocos2dxVideoView extends SurfaceView implements MediaPlayerControl
mViewHeight = maxHeight; mViewHeight = maxHeight;
if (mVideoWidth != 0 && mVideoHeight != 0) { if (mVideoWidth != 0 && mVideoHeight != 0) {
fixSize(mViewLeft, mViewTop, mViewWidth, mVideoHeight); fixSize(mViewLeft, mViewTop, mViewWidth, mViewHeight);
} }
} }
@ -324,7 +324,7 @@ public class Cocos2dxVideoView extends SurfaceView implements MediaPlayerControl
if (mFullScreenEnabled) { if (mFullScreenEnabled) {
fixSize(0, 0, mFullScreenWidth, mFullScreenHeight); fixSize(0, 0, mFullScreenWidth, mFullScreenHeight);
} else { } else {
fixSize(mViewLeft, mViewTop, mViewWidth, mVideoHeight); fixSize(mViewLeft, mViewTop, mViewWidth, mViewHeight);
} }
} }

22
cocos/renderer/CCTexture2D.cpp
View File

@ -121,8 +121,6 @@ const Texture2D::PixelFormatInfoMap Texture2D::_pixelFormatInfoTables(TexturePix
// Default is: RGBA8888 (32-bit textures) // Default is: RGBA8888 (32-bit textures)
static Texture2D::PixelFormat g_defaultAlphaPixelFormat = Texture2D::PixelFormat::DEFAULT; static Texture2D::PixelFormat g_defaultAlphaPixelFormat = Texture2D::PixelFormat::DEFAULT;
static bool _PVRHaveAlphaPremultiplied = false;
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
//conventer function //conventer function
@ -779,20 +777,8 @@ bool Texture2D::initWithImage(Image *image, PixelFormat format)
} }
// set the premultiplied tag // set the premultiplied tag
if (!image->hasPremultipliedAlpha()) _hasPremultipliedAlpha = image->hasPremultipliedAlpha();
{
if (image->getFileType() == Image::Format::PVR)
{
_hasPremultipliedAlpha = _PVRHaveAlphaPremultiplied;
}else
{
CCLOG("wanning: We cann't find the data is premultiplied or not, we will assume it's false.");
_hasPremultipliedAlpha = false;
}
}else
{
_hasPremultipliedAlpha = image->isPremultipliedAlpha();
}
return true; return true;
} }
} }
@ -1218,10 +1204,10 @@ void Texture2D::drawInRect(const Rect& rect)
void Texture2D::PVRImagesHavePremultipliedAlpha(bool haveAlphaPremultiplied) void Texture2D::PVRImagesHavePremultipliedAlpha(bool haveAlphaPremultiplied)
{ {
_PVRHaveAlphaPremultiplied = haveAlphaPremultiplied; Image::setPVRImagesHavePremultipliedAlpha(haveAlphaPremultiplied);
} }
// //
// Use to apply MIN/MAG filter // Use to apply MIN/MAG filter
// //

4
cocos/renderer/CCTexture2D.h
View File

@ -182,10 +182,12 @@ public:
possible load them as if they have (or not) the alpha channel premultiplied. possible load them as if they have (or not) the alpha channel premultiplied.
By default it is disabled. By default it is disabled.
deprecated, please use Image::setPVRImagesHavePremultipliedAlpha() instead.
@since v0.99.5 @since v0.99.5
*/ */
static void PVRImagesHavePremultipliedAlpha(bool haveAlphaPremultiplied); CC_DEPRECATED_ATTRIBUTE static void PVRImagesHavePremultipliedAlpha(bool haveAlphaPremultiplied);
public: public:
/** /**

14
cocos/scripting/lua-bindings/auto/api/Image.lua
View File

@ -16,11 +16,6 @@
-- @param #bool bool -- @param #bool bool
-- @return bool#bool ret (return value: bool) -- @return bool#bool ret (return value: bool)
--------------------------------
-- @function [parent=#Image] getBitPerPixel
-- @param self
-- @return int#int ret (return value: int)
-------------------------------- --------------------------------
-- @function [parent=#Image] hasAlpha -- @function [parent=#Image] hasAlpha
-- @param self -- @param self
@ -48,9 +43,9 @@
-- @return int#int ret (return value: int) -- @return int#int ret (return value: int)
-------------------------------- --------------------------------
-- @function [parent=#Image] isPremultipliedAlpha -- @function [parent=#Image] getBitPerPixel
-- @param self -- @param self
-- @return bool#bool ret (return value: bool) -- @return int#int ret (return value: int)
-------------------------------- --------------------------------
-- @function [parent=#Image] getFileType -- @function [parent=#Image] getFileType
@ -67,6 +62,11 @@
-- @param self -- @param self
-- @return int#int ret (return value: int) -- @return int#int ret (return value: int)
--------------------------------
-- @function [parent=#Image] setPVRImagesHavePremultipliedAlpha
-- @param self
-- @param #bool bool
-------------------------------- --------------------------------
-- @function [parent=#Image] Image -- @function [parent=#Image] Image
-- @param self -- @param self

5
cocos/scripting/lua-bindings/auto/api/Texture2D.lua
View File

@ -150,11 +150,6 @@
-- @param self -- @param self
-- @return int#int ret (return value: int) -- @return int#int ret (return value: int)
--------------------------------
-- @function [parent=#Texture2D] PVRImagesHavePremultipliedAlpha
-- @param self
-- @param #bool bool
-------------------------------- --------------------------------
-- @function [parent=#Texture2D] Texture2D -- @function [parent=#Texture2D] Texture2D
-- @param self -- @param self

125
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.cpp
View File

@ -3500,38 +3500,6 @@ int lua_cocos2dx_Texture2D_getDefaultAlphaPixelFormat(lua_State* tolua_S)
#endif #endif
return 0; return 0;
} }
int lua_cocos2dx_Texture2D_PVRImagesHavePremultipliedAlpha(lua_State* tolua_S)
{
int argc = 0;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertable(tolua_S,1,"cc.Texture2D",0,&tolua_err)) goto tolua_lerror;
#endif
argc = lua_gettop(tolua_S) - 1;
if (argc == 1)
{
bool arg0;
ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Texture2D:PVRImagesHavePremultipliedAlpha");
if(!ok)
return 0;
cocos2d::Texture2D::PVRImagesHavePremultipliedAlpha(arg0);
return 0;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Texture2D:PVRImagesHavePremultipliedAlpha",argc, 1);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Texture2D_PVRImagesHavePremultipliedAlpha'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_Texture2D_constructor(lua_State* tolua_S) int lua_cocos2dx_Texture2D_constructor(lua_State* tolua_S)
{ {
int argc = 0; int argc = 0;
@ -3606,7 +3574,6 @@ int lua_register_cocos2dx_Texture2D(lua_State* tolua_S)
tolua_function(tolua_S,"setMaxS",lua_cocos2dx_Texture2D_setMaxS); tolua_function(tolua_S,"setMaxS",lua_cocos2dx_Texture2D_setMaxS);
tolua_function(tolua_S,"setDefaultAlphaPixelFormat", lua_cocos2dx_Texture2D_setDefaultAlphaPixelFormat); tolua_function(tolua_S,"setDefaultAlphaPixelFormat", lua_cocos2dx_Texture2D_setDefaultAlphaPixelFormat);
tolua_function(tolua_S,"getDefaultAlphaPixelFormat", lua_cocos2dx_Texture2D_getDefaultAlphaPixelFormat); tolua_function(tolua_S,"getDefaultAlphaPixelFormat", lua_cocos2dx_Texture2D_getDefaultAlphaPixelFormat);
tolua_function(tolua_S,"PVRImagesHavePremultipliedAlpha", lua_cocos2dx_Texture2D_PVRImagesHavePremultipliedAlpha);
tolua_endmodule(tolua_S); tolua_endmodule(tolua_S);
std::string typeName = typeid(cocos2d::Texture2D).name(); std::string typeName = typeid(cocos2d::Texture2D).name();
g_luaType[typeName] = "cc.Texture2D"; g_luaType[typeName] = "cc.Texture2D";
@ -44744,50 +44711,6 @@ int lua_cocos2dx_Image_saveToFile(lua_State* tolua_S)
return 0; return 0;
} }
int lua_cocos2dx_Image_getBitPerPixel(lua_State* tolua_S)
{
int argc = 0;
cocos2d::Image* cobj = nullptr;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertype(tolua_S,1,"cc.Image",0,&tolua_err)) goto tolua_lerror;
#endif
cobj = (cocos2d::Image*)tolua_tousertype(tolua_S,1,0);
#if COCOS2D_DEBUG >= 1
if (!cobj)
{
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Image_getBitPerPixel'", nullptr);
return 0;
}
#endif
argc = lua_gettop(tolua_S)-1;
if (argc == 0)
{
if(!ok)
return 0;
int ret = cobj->getBitPerPixel();
tolua_pushnumber(tolua_S,(lua_Number)ret);
return 1;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Image:getBitPerPixel",argc, 0);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Image_getBitPerPixel'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_Image_hasAlpha(lua_State* tolua_S) int lua_cocos2dx_Image_hasAlpha(lua_State* tolua_S)
{ {
int argc = 0; int argc = 0;
@ -45011,7 +44934,7 @@ int lua_cocos2dx_Image_getWidth(lua_State* tolua_S)
return 0; return 0;
} }
int lua_cocos2dx_Image_isPremultipliedAlpha(lua_State* tolua_S) int lua_cocos2dx_Image_getBitPerPixel(lua_State* tolua_S)
{ {
int argc = 0; int argc = 0;
cocos2d::Image* cobj = nullptr; cocos2d::Image* cobj = nullptr;
@ -45031,7 +44954,7 @@ int lua_cocos2dx_Image_isPremultipliedAlpha(lua_State* tolua_S)
#if COCOS2D_DEBUG >= 1 #if COCOS2D_DEBUG >= 1
if (!cobj) if (!cobj)
{ {
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Image_isPremultipliedAlpha'", nullptr); tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_Image_getBitPerPixel'", nullptr);
return 0; return 0;
} }
#endif #endif
@ -45041,16 +44964,16 @@ int lua_cocos2dx_Image_isPremultipliedAlpha(lua_State* tolua_S)
{ {
if(!ok) if(!ok)
return 0; return 0;
bool ret = cobj->isPremultipliedAlpha(); int ret = cobj->getBitPerPixel();
tolua_pushboolean(tolua_S,(bool)ret); tolua_pushnumber(tolua_S,(lua_Number)ret);
return 1; return 1;
} }
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Image:isPremultipliedAlpha",argc, 0); CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "cc.Image:getBitPerPixel",argc, 0);
return 0; return 0;
#if COCOS2D_DEBUG >= 1 #if COCOS2D_DEBUG >= 1
tolua_lerror: tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Image_isPremultipliedAlpha'.",&tolua_err); tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Image_getBitPerPixel'.",&tolua_err);
#endif #endif
return 0; return 0;
@ -45187,6 +45110,38 @@ int lua_cocos2dx_Image_getRenderFormat(lua_State* tolua_S)
return 0; return 0;
} }
int lua_cocos2dx_Image_setPVRImagesHavePremultipliedAlpha(lua_State* tolua_S)
{
int argc = 0;
bool ok = true;
#if COCOS2D_DEBUG >= 1
tolua_Error tolua_err;
#endif
#if COCOS2D_DEBUG >= 1
if (!tolua_isusertable(tolua_S,1,"cc.Image",0,&tolua_err)) goto tolua_lerror;
#endif
argc = lua_gettop(tolua_S) - 1;
if (argc == 1)
{
bool arg0;
ok &= luaval_to_boolean(tolua_S, 2,&arg0, "cc.Image:setPVRImagesHavePremultipliedAlpha");
if(!ok)
return 0;
cocos2d::Image::setPVRImagesHavePremultipliedAlpha(arg0);
return 0;
}
CCLOG("%s has wrong number of arguments: %d, was expecting %d\n ", "cc.Image:setPVRImagesHavePremultipliedAlpha",argc, 1);
return 0;
#if COCOS2D_DEBUG >= 1
tolua_lerror:
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_Image_setPVRImagesHavePremultipliedAlpha'.",&tolua_err);
#endif
return 0;
}
int lua_cocos2dx_Image_constructor(lua_State* tolua_S) int lua_cocos2dx_Image_constructor(lua_State* tolua_S)
{ {
int argc = 0; int argc = 0;
@ -45236,16 +45191,16 @@ int lua_register_cocos2dx_Image(lua_State* tolua_S)
tolua_function(tolua_S,"new",lua_cocos2dx_Image_constructor); tolua_function(tolua_S,"new",lua_cocos2dx_Image_constructor);
tolua_function(tolua_S,"hasPremultipliedAlpha",lua_cocos2dx_Image_hasPremultipliedAlpha); tolua_function(tolua_S,"hasPremultipliedAlpha",lua_cocos2dx_Image_hasPremultipliedAlpha);
tolua_function(tolua_S,"saveToFile",lua_cocos2dx_Image_saveToFile); tolua_function(tolua_S,"saveToFile",lua_cocos2dx_Image_saveToFile);
tolua_function(tolua_S,"getBitPerPixel",lua_cocos2dx_Image_getBitPerPixel);
tolua_function(tolua_S,"hasAlpha",lua_cocos2dx_Image_hasAlpha); tolua_function(tolua_S,"hasAlpha",lua_cocos2dx_Image_hasAlpha);
tolua_function(tolua_S,"isCompressed",lua_cocos2dx_Image_isCompressed); tolua_function(tolua_S,"isCompressed",lua_cocos2dx_Image_isCompressed);
tolua_function(tolua_S,"getHeight",lua_cocos2dx_Image_getHeight); tolua_function(tolua_S,"getHeight",lua_cocos2dx_Image_getHeight);
tolua_function(tolua_S,"initWithImageFile",lua_cocos2dx_Image_initWithImageFile); tolua_function(tolua_S,"initWithImageFile",lua_cocos2dx_Image_initWithImageFile);
tolua_function(tolua_S,"getWidth",lua_cocos2dx_Image_getWidth); tolua_function(tolua_S,"getWidth",lua_cocos2dx_Image_getWidth);
tolua_function(tolua_S,"isPremultipliedAlpha",lua_cocos2dx_Image_isPremultipliedAlpha); tolua_function(tolua_S,"getBitPerPixel",lua_cocos2dx_Image_getBitPerPixel);
tolua_function(tolua_S,"getFileType",lua_cocos2dx_Image_getFileType); tolua_function(tolua_S,"getFileType",lua_cocos2dx_Image_getFileType);
tolua_function(tolua_S,"getNumberOfMipmaps",lua_cocos2dx_Image_getNumberOfMipmaps); tolua_function(tolua_S,"getNumberOfMipmaps",lua_cocos2dx_Image_getNumberOfMipmaps);
tolua_function(tolua_S,"getRenderFormat",lua_cocos2dx_Image_getRenderFormat); tolua_function(tolua_S,"getRenderFormat",lua_cocos2dx_Image_getRenderFormat);
tolua_function(tolua_S,"setPVRImagesHavePremultipliedAlpha", lua_cocos2dx_Image_setPVRImagesHavePremultipliedAlpha);
tolua_endmodule(tolua_S); tolua_endmodule(tolua_S);
std::string typeName = typeid(cocos2d::Image).name(); std::string typeName = typeid(cocos2d::Image).name();
g_luaType[typeName] = "cc.Image"; g_luaType[typeName] = "cc.Image";

1
cocos/scripting/lua-bindings/auto/lua_cocos2dx_auto.hpp
View File

@ -1574,7 +1574,6 @@ int register_all_cocos2dx(lua_State* tolua_S);
#endif // __cocos2dx_h__ #endif // __cocos2dx_h__

20
cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/xcshareddata/xcschemes/luabindings Mac.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0510" LastUpgradeVersion = "0600"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
@ -39,6 +39,15 @@
ignoresPersistentStateOnLaunch = "NO" ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES" debugDocumentVersioning = "YES"
allowLocationSimulation = "YES"> allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1A6FB50417854BC200CDF010"
BuildableName = "libluabindings Mac.a"
BlueprintName = "luabindings Mac"
ReferencedContainer = "container:cocos2d_lua_bindings.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions> <AdditionalOptions>
</AdditionalOptions> </AdditionalOptions>
</LaunchAction> </LaunchAction>
@ -48,6 +57,15 @@
useCustomWorkingDirectory = "NO" useCustomWorkingDirectory = "NO"
buildConfiguration = "Release" buildConfiguration = "Release"
debugDocumentVersioning = "YES"> debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1A6FB50417854BC200CDF010"
BuildableName = "libluabindings Mac.a"
BlueprintName = "luabindings Mac"
ReferencedContainer = "container:cocos2d_lua_bindings.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction> </ProfileAction>
<AnalyzeAction <AnalyzeAction
buildConfiguration = "Debug"> buildConfiguration = "Debug">

20
cocos/scripting/lua-bindings/proj.ios_mac/cocos2d_lua_bindings.xcodeproj/xcshareddata/xcschemes/luabindings iOS.xcscheme
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<Scheme <Scheme
LastUpgradeVersion = "0510" LastUpgradeVersion = "0600"
version = "1.3"> version = "1.3">
<BuildAction <BuildAction
parallelizeBuildables = "YES" parallelizeBuildables = "YES"
@ -39,6 +39,15 @@
ignoresPersistentStateOnLaunch = "NO" ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES" debugDocumentVersioning = "YES"
allowLocationSimulation = "YES"> allowLocationSimulation = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1A119716178526AA00D62A44"
BuildableName = "libluabindings iOS.a"
BlueprintName = "luabindings iOS"
ReferencedContainer = "container:cocos2d_lua_bindings.xcodeproj">
</BuildableReference>
</MacroExpansion>
<AdditionalOptions> <AdditionalOptions>
</AdditionalOptions> </AdditionalOptions>
</LaunchAction> </LaunchAction>
@ -48,6 +57,15 @@
useCustomWorkingDirectory = "NO" useCustomWorkingDirectory = "NO"
buildConfiguration = "Release" buildConfiguration = "Release"
debugDocumentVersioning = "YES"> debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "1A119716178526AA00D62A44"
BuildableName = "libluabindings iOS.a"
BlueprintName = "luabindings iOS"
ReferencedContainer = "container:cocos2d_lua_bindings.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction> </ProfileAction>
<AnalyzeAction <AnalyzeAction
buildConfiguration = "Debug"> buildConfiguration = "Debug">

2
cocos/ui/UILayoutParameter.h
View File

@ -135,8 +135,6 @@ protected:
class LayoutParameterProtocol class LayoutParameterProtocol
{ {
public: public:
LayoutParameterProtocol(){}
virtual ~LayoutParameterProtocol(){}
virtual LayoutParameter* getLayoutParameter() const= 0; virtual LayoutParameter* getLayoutParameter() const= 0;
}; };

2
cocos/ui/UIVideoPlayerIOS.mm
View File

@ -323,7 +323,7 @@ void VideoPlayer::draw(Renderer* renderer, const Mat4 &transform, uint32_t flags
auto directorInstance = Director::getInstance(); auto directorInstance = Director::getInstance();
auto glView = directorInstance->getOpenGLView(); auto glView = directorInstance->getOpenGLView();
auto frameSize = glView->getFrameSize(); auto frameSize = glView->getFrameSize();
auto scaleFactor = directorInstance->getContentScaleFactor(); auto scaleFactor = [static_cast<CCEAGLView *>(glView->getEAGLView()) contentScaleFactor];
auto winSize = directorInstance->getWinSize(); auto winSize = directorInstance->getWinSize();

17
cocos/ui/UIWidget.cpp
View File

@ -319,7 +319,6 @@ void Widget::setSizePercent(const Vec2 &percent)
this->setContentSize(cSize); this->setContentSize(cSize);
} }
_customSize = cSize; _customSize = cSize;
onSizeChanged();
} }
void Widget::updateSizeAndPosition() void Widget::updateSizeAndPosition()
@ -373,7 +372,8 @@ void Widget::updateSizeAndPosition(const cocos2d::Size &parentSize)
default: default:
break; break;
} }
onSizeChanged();
//update position & position percent
Vec2 absPos = getPosition(); Vec2 absPos = getPosition();
switch (_positionType) switch (_positionType)
{ {
@ -426,7 +426,6 @@ void Widget::ignoreContentAdaptWithSize(bool ignore)
{ {
this->setContentSize(_customSize); this->setContentSize(_customSize);
} }
onSizeChanged();
} }
bool Widget::isIgnoreContentAdaptWithSize() const bool Widget::isIgnoreContentAdaptWithSize() const
@ -486,7 +485,6 @@ void Widget::updateContentSizeWithTextureSize(const cocos2d::Size &size)
{ {
this->setContentSize(_customSize); this->setContentSize(_customSize);
} }
onSizeChanged();
} }
void Widget::setTouchEnabled(bool enable) void Widget::setTouchEnabled(bool enable)
@ -719,6 +717,7 @@ void Widget::onTouchCancelled(Touch *touch, Event *unusedEvent)
void Widget::pushDownEvent() void Widget::pushDownEvent()
{ {
this->retain();
if (_touchEventCallback) { if (_touchEventCallback) {
_touchEventCallback(this, TouchEventType::BEGAN); _touchEventCallback(this, TouchEventType::BEGAN);
} }
@ -727,10 +726,12 @@ void Widget::pushDownEvent()
{ {
(_touchEventListener->*_touchEventSelector)(this,TOUCH_EVENT_BEGAN); (_touchEventListener->*_touchEventSelector)(this,TOUCH_EVENT_BEGAN);
} }
this->release();
} }
void Widget::moveEvent() void Widget::moveEvent()
{ {
this->retain();
if (_touchEventCallback) { if (_touchEventCallback) {
_touchEventCallback(this, TouchEventType::MOVED); _touchEventCallback(this, TouchEventType::MOVED);
} }
@ -739,11 +740,12 @@ void Widget::moveEvent()
{ {
(_touchEventListener->*_touchEventSelector)(this,TOUCH_EVENT_MOVED); (_touchEventListener->*_touchEventSelector)(this,TOUCH_EVENT_MOVED);
} }
this->release();
} }
void Widget::releaseUpEvent() void Widget::releaseUpEvent()
{ {
this->retain();
if (_touchEventCallback) { if (_touchEventCallback) {
_touchEventCallback(this, TouchEventType::ENDED); _touchEventCallback(this, TouchEventType::ENDED);
} }
@ -752,10 +754,12 @@ void Widget::releaseUpEvent()
{ {
(_touchEventListener->*_touchEventSelector)(this,TOUCH_EVENT_ENDED); (_touchEventListener->*_touchEventSelector)(this,TOUCH_EVENT_ENDED);
} }
this->release();
} }
void Widget::cancelUpEvent() void Widget::cancelUpEvent()
{ {
this->retain();
if (_touchEventCallback) if (_touchEventCallback)
{ {
_touchEventCallback(this, TouchEventType::CANCELED); _touchEventCallback(this, TouchEventType::CANCELED);
@ -765,7 +769,7 @@ void Widget::cancelUpEvent()
{ {
(_touchEventListener->*_touchEventSelector)(this,TOUCH_EVENT_CANCELED); (_touchEventListener->*_touchEventSelector)(this,TOUCH_EVENT_CANCELED);
} }
this->release();
} }
void Widget::addTouchEventListener(Ref *target, SEL_TouchEvent selector) void Widget::addTouchEventListener(Ref *target, SEL_TouchEvent selector)
@ -1036,7 +1040,6 @@ void Widget::copyProperties(Widget *widget)
{ {
setLayoutParameter(iter->second->clone()); setLayoutParameter(iter->second->clone());
} }
onSizeChanged();
} }
void Widget::setFlippedX(bool flippedX) void Widget::setFlippedX(bool flippedX)

2
extensions/GUI/CCScrollView/CCScrollView.h
View File

@ -41,7 +41,7 @@ NS_CC_EXT_BEGIN
class ScrollView; class ScrollView;
class ScrollViewDelegate class CC_EX_DLL ScrollViewDelegate
{ {
public: public:
/** /**

4
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/CocosGUIScene.cpp
View File

@ -51,7 +51,7 @@ g_guisTests[] =
UISceneManager* sceneManager = UISceneManager::sharedUISceneManager(); UISceneManager* sceneManager = UISceneManager::sharedUISceneManager();
sceneManager->setCurrentUISceneId(kUIButtonTest); sceneManager->setCurrentUISceneId(kUIButtonTest);
sceneManager->setMinUISceneId(kUIButtonTest); sceneManager->setMinUISceneId(kUIButtonTest);
sceneManager->setMaxUISceneId(kUIButtonTest_Title); sceneManager->setMaxUISceneId(kUIButtonTest_RemoveSelf);
Scene* scene = sceneManager->currentUIScene(); Scene* scene = sceneManager->currentUIScene();
Director::getInstance()->replaceScene(scene); Director::getInstance()->replaceScene(scene);
} }
@ -87,7 +87,7 @@ g_guisTests[] =
UISceneManager* sceneManager = UISceneManager::sharedUISceneManager(); UISceneManager* sceneManager = UISceneManager::sharedUISceneManager();
sceneManager->setCurrentUISceneId(kUIImageViewTest); sceneManager->setCurrentUISceneId(kUIImageViewTest);
sceneManager->setMinUISceneId(kUIImageViewTest); sceneManager->setMinUISceneId(kUIImageViewTest);
sceneManager->setMaxUISceneId(kUIImageViewTest_Scale9); sceneManager->setMaxUISceneId(kUIImageViewTest_ContentSize);
Scene* scene = sceneManager->currentUIScene(); Scene* scene = sceneManager->currentUIScene();
Director::getInstance()->replaceScene(scene); Director::getInstance()->replaceScene(scene);
} }

77
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.cpp
View File

@ -344,3 +344,80 @@ void UIButtonTest_Title::touchEvent(Ref *pSender, Widget::TouchEventType type)
break; break;
} }
} }
// UIButtonTest_RemoveSelf
UIButtonTestRemoveSelf::UIButtonTestRemoveSelf()
: _displayValueLabel(nullptr)
{
}
UIButtonTestRemoveSelf::~UIButtonTestRemoveSelf()
{
}
bool UIButtonTestRemoveSelf::init()
{
if (UIScene::init())
{
Size widgetSize = _widget->getContentSize();
// Add a label in which the button events will be displayed
_displayValueLabel = Text::create("No Event", "fonts/Marker Felt.ttf",32);
_displayValueLabel->setAnchorPoint(Vec2(0.5f, -1.0f));
_displayValueLabel->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
_uiLayer->addChild(_displayValueLabel);
// Add the alert
Text* alert = Text::create("Remove Self in the Button's Callback shouldn't cause crash!","fonts/Marker Felt.ttf",10);
alert->setColor(Color3B(159, 168, 176));
alert->setPosition(Vec2(widgetSize.width / 2.0f,
widgetSize.height / 2.0f - alert->getContentSize().height * 2.75f));
_uiLayer->addChild(alert);
// Create the button
Button* button = Button::create("cocosui/animationbuttonnormal.png",
"cocosui/animationbuttonpressed.png");
button->setPosition(Vec2(widgetSize.width / 2.0f, widgetSize.height / 2.0f));
// button->addTouchEventListener(this, toucheventselector(UIButtonTest::touchEvent));
button->addTouchEventListener(CC_CALLBACK_2(UIButtonTestRemoveSelf::touchEvent, this));
_uiLayer->addChild(button);
return true;
}
return false;
}
void UIButtonTestRemoveSelf::touchEvent(Ref *pSender, Widget::TouchEventType type)
{
switch (type)
{
case Widget::TouchEventType::BEGAN:
_displayValueLabel->setString(String::createWithFormat("Touch Down")->getCString());
break;
case Widget::TouchEventType::MOVED:
_displayValueLabel->setString(String::createWithFormat("Touch Move")->getCString());
break;
case Widget::TouchEventType::ENDED:
{
_displayValueLabel->setString(String::createWithFormat("Touch Up")->getCString());
_uiLayer->removeFromParentAndCleanup(true);
}
break;
case Widget::TouchEventType::CANCELED:
_displayValueLabel->setString(String::createWithFormat("Touch Cancelled")->getCString());
break;
default:
break;
}
}

13
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIButtonTest/UIButtonTest.h
View File

@ -79,4 +79,17 @@ protected:
Text* _displayValueLabel; Text* _displayValueLabel;
}; };
class UIButtonTestRemoveSelf : public UIScene
{
public:
UIButtonTestRemoveSelf();
~UIButtonTestRemoveSelf();
bool init();
void touchEvent(Ref *pSender, Widget::TouchEventType type);
protected:
UI_SCENE_CREATE_FUNC(UIButtonTestRemoveSelf)
Text* _displayValueLabel;
};
#endif /* defined(__TestCpp__UIButtonTest__) */ #endif /* defined(__TestCpp__UIButtonTest__) */

68
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.cpp
View File

@ -61,3 +61,71 @@ bool UIImageViewTest_Scale9::init()
} }
return false; return false;
} }
// UIImageViewTest_ContentSize
bool UIImageViewTest_ContentSize::init()
{
if (UIScene::init())
{
Size widgetSize = _widget->getContentSize();
Text* alert = Text::create("ImageView ContentSize Change", "fonts/Marker Felt.ttf", 26);
alert->setColor(Color3B(159, 168, 176));
alert->setPosition(Vec2(widgetSize.width / 2.0f,
widgetSize.height / 2.0f - alert->getContentSize().height * 2.125f));
_uiLayer->addChild(alert);
Text *status = Text::create("child ImageView position percent", "fonts/Marker Felt.ttf", 16);
status->setColor(Color3B::RED);
status->setPosition(Vec2(widgetSize.width/2, widgetSize.height/2 + 80));
_uiLayer->addChild(status,20);
// Create the imageview
ImageView* imageView = ImageView::create("cocosui/buttonHighlighted.png");
imageView->setScale9Enabled(true);
imageView->setContentSize(Size(200, 80));
imageView->setPosition(Vec2(widgetSize.width / 2.0f,
widgetSize.height / 2.0f ));
ImageView* imageViewChild = ImageView::create("cocosui/buttonHighlighted.png");
imageViewChild->setScale9Enabled(true);
imageViewChild->setSizeType(Widget::SizeType::PERCENT);
imageViewChild->setPositionType(Widget::PositionType::PERCENT);
imageViewChild->setSizePercent(Vec2::ANCHOR_MIDDLE);
imageViewChild->setPositionPercent(Vec2::ANCHOR_MIDDLE);
imageViewChild->setPosition(Vec2(widgetSize.width / 2.0f,
widgetSize.height / 2.0f));
ImageView* imageViewChild2 = ImageView::create("cocosui/buttonHighlighted.png");
imageViewChild2->setScale9Enabled(true);
imageViewChild2->setSizeType(Widget::SizeType::PERCENT);
imageViewChild2->setPositionType(Widget::PositionType::PERCENT);
imageViewChild2->setSizePercent(Vec2::ANCHOR_MIDDLE);
imageViewChild2->setPositionPercent(Vec2::ANCHOR_MIDDLE);
imageViewChild->addChild(imageViewChild2);
imageView->addChild(imageViewChild);
imageView->setTouchEnabled(true);
imageView->addTouchEventListener([=](Ref* sender, Widget::TouchEventType type){
if (type == Widget::TouchEventType::ENDED) {
float width = CCRANDOM_0_1() * 200 + 50;
float height = CCRANDOM_0_1() * 80 + 30;
imageView->setContentSize(Size(width, height));
imageViewChild->setPositionPercent(Vec2(CCRANDOM_0_1(), CCRANDOM_0_1()));
status->setString(StringUtils::format("child ImageView position percent: %f, %f",
imageViewChild->getPositionPercent().x, imageViewChild->getPositionPercent().y));
}
});
_uiLayer->addChild(imageView);
return true;
}
return false;
}

9
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UIImageViewTest/UIImageViewTest.h
View File

@ -45,4 +45,13 @@ protected:
UI_SCENE_CREATE_FUNC(UIImageViewTest_Scale9) UI_SCENE_CREATE_FUNC(UIImageViewTest_Scale9)
}; };
class UIImageViewTest_ContentSize : public UIScene
{
public:
bool init();
protected:
UI_SCENE_CREATE_FUNC(UIImageViewTest_ContentSize)
};
#endif /* defined(__TestCpp__UIImageViewTest__) */ #endif /* defined(__TestCpp__UIImageViewTest__) */

8
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.cpp
View File

@ -45,6 +45,7 @@ static const char* s_testArray[] =
"UIButtonTest_Scale9", "UIButtonTest_Scale9",
"UIButtonTest_PressedAction", "UIButtonTest_PressedAction",
"UIButtonTest_Title", "UIButtonTest_Title",
"UIButtonTest_RemoveSelf",
"UICheckBoxTest", "UICheckBoxTest",
"UISliderTest", "UISliderTest",
"UISliderTest_Scale9", "UISliderTest_Scale9",
@ -58,6 +59,7 @@ static const char* s_testArray[] =
*/ */
"UIImageViewTest", "UIImageViewTest",
"UIImageViewTest_Scale9", "UIImageViewTest_Scale9",
"UIImageViewTest_ContentSize",
"UILoadingBarTest_Left", "UILoadingBarTest_Left",
"UILoadingBarTest_Right", "UILoadingBarTest_Right",
"UILoadingBarTest_Left_Scale9", "UILoadingBarTest_Left_Scale9",
@ -190,7 +192,8 @@ Scene *UISceneManager::currentUIScene()
case kUIButtonTest_Title: case kUIButtonTest_Title:
return UIButtonTest_Title::sceneWithTitle(s_testArray[_currentUISceneId]); return UIButtonTest_Title::sceneWithTitle(s_testArray[_currentUISceneId]);
case kUIButtonTest_RemoveSelf:
return UIButtonTestRemoveSelf::sceneWithTitle(s_testArray[_currentUISceneId]);
case kUICheckBoxTest: case kUICheckBoxTest:
return UICheckBoxTest::sceneWithTitle(s_testArray[_currentUISceneId]); return UICheckBoxTest::sceneWithTitle(s_testArray[_currentUISceneId]);
@ -205,7 +208,8 @@ Scene *UISceneManager::currentUIScene()
case kUIImageViewTest_Scale9: case kUIImageViewTest_Scale9:
return UIImageViewTest_Scale9::sceneWithTitle(s_testArray[_currentUISceneId]); return UIImageViewTest_Scale9::sceneWithTitle(s_testArray[_currentUISceneId]);
case kUIImageViewTest_ContentSize:
return UIImageViewTest_ContentSize::sceneWithTitle(s_testArray[_currentUISceneId]);
case kUILoadingBarTest_Left: case kUILoadingBarTest_Left:
return UILoadingBarTest_Left::sceneWithTitle(s_testArray[_currentUISceneId]); return UILoadingBarTest_Left::sceneWithTitle(s_testArray[_currentUISceneId]);

2
tests/cpp-tests/Classes/UITest/CocoStudioGUITest/UISceneManager.h
View File

@ -35,6 +35,7 @@ enum
kUIButtonTest_Scale9, kUIButtonTest_Scale9,
kUIButtonTest_PressedAction, kUIButtonTest_PressedAction,
kUIButtonTest_Title, kUIButtonTest_Title,
kUIButtonTest_RemoveSelf,
kUICheckBoxTest, kUICheckBoxTest,
kUISliderTest, kUISliderTest,
kUISliderTest_Scale9, kUISliderTest_Scale9,
@ -48,6 +49,7 @@ enum
*/ */
kUIImageViewTest, kUIImageViewTest,
kUIImageViewTest_Scale9, kUIImageViewTest_Scale9,
kUIImageViewTest_ContentSize,
kUILoadingBarTest_Left, kUILoadingBarTest_Left,
kUILoadingBarTest_Right, kUILoadingBarTest_Right,
kUILoadingBarTest_Left_Scale9, kUILoadingBarTest_Left_Scale9,

54
tools/jenkins-scripts/ci-dailybuild-android.py
View File

@ -5,7 +5,9 @@ from shutil import copy
import sys import sys
import traceback import traceback
import MySQLdb import MySQLdb
from email.mime.text import MIMEText
import smtplib
import datetime
def check_current_3rd_libs(): def check_current_3rd_libs():
#get current_libs config #get current_libs config
backup_files = range(2) backup_files = range(2)
@ -51,22 +53,69 @@ def save_build_stats(filename, size):
cursor.execute(sql) cursor.execute(sql)
db.commit() db.commit()
db.close() db.close()
def scan_all_libs(): def scan_all_libs():
stats = {}
_path = 'tests/cpp-empty-test/proj.android/libs/armeabi/libcpp_empty_test.so' _path = 'tests/cpp-empty-test/proj.android/libs/armeabi/libcpp_empty_test.so'
filesize = os.path.getsize(_path)/1024 filesize = os.path.getsize(_path)/1024
stats['libcpp_empty_test'] = filesize
save_build_stats('libcpp_empty_test', filesize) save_build_stats('libcpp_empty_test', filesize)
_path = 'tests/lua-empty-test/project/proj.android/libs/armeabi/liblua_empty_test.so' _path = 'tests/lua-empty-test/project/proj.android/libs/armeabi/liblua_empty_test.so'
filesize = os.path.getsize(_path)/1024 filesize = os.path.getsize(_path)/1024
stats['liblua_empty_test'] = filesize
save_build_stats('liblua_empty_test', filesize) save_build_stats('liblua_empty_test', filesize)
lib_path = './tests/cpp-tests/proj.android/obj/local/armeabi' lib_path = './tests/cpp-tests/proj.android/obj/local/armeabi'
for root, dirs, files in os.walk(lib_path): for root, dirs, files in os.walk(lib_path):
for _file in files: for _file in files:
if not _file.endswith(".a"): if not _file.endswith(".a"):
continue continue
print _file
libfile = lib_path + '/' + _file libfile = lib_path + '/' + _file
_filename = _file.split('.')[0] _filename = _file.split('.')[0]
filesize = os.path.getsize(libfile)/1024 filesize = os.path.getsize(libfile)/1024
stats[_filename]=filesize
save_build_stats(_filename, filesize) save_build_stats(_filename, filesize)
return stats
def send_mail(sub,title,content):
#to_list = os.environ['EMAIL_LIST'].split(' ')
mail_user = os.environ['EMAIL_USER']
mail_pass = os.environ['EMAIL_PWD']
to_list = os.environ['EMAIL_LIST'].split(' ')
mail_postfix = 'gmail.com'
me = mail_user + "<" + mail_user + "@" + mail_postfix + ">"
msg = MIMEText(content, _subtype='plain', _charset='gb2312')
msg['Subject'] = sub
msg['From'] = me
msg['To'] = " ".join(to_list)
print 'to users:', msg['To']
msg['Content'] = 'test'
try:
s = smtplib.SMTP('smtp.gmail.com', 587)
s.ehlo()
s.starttls()
s.login(mail_user,mail_pass)
s.sendmail(me, to_list, str(msg))
print 'info:', me, to_list, str(msg)
s.close()
return True
except Exception, e:
print str(e)
return False
def sendEmail(stats):
now = datetime.datetime.now()
sub = "Cocos2d-x Android dailybuild stats of " + now.strftime("%Y-%m-%d")
title = "Dailybuild stats"
content = "The following list tracks the sizes of Cocos2d-x Android built libraries:\n"
for key in stats:
content += key
content += " : "
content += str(stats[key]) + "KB"
content += "\n"
send_mail(sub, title, content)
def main(): def main():
print 'Build Config:' print 'Build Config:'
@ -89,7 +138,8 @@ def main():
ret = os.system('python build/android-build.py -b release all') ret = os.system('python build/android-build.py -b release all')
if(ret == 0): if(ret == 0):
strip_android_libs() strip_android_libs()
scan_all_libs() stats = scan_all_libs()
sendEmail(stats)
os.system('git clean -xdf -f') os.system('git clean -xdf -f')
print 'build exit' print 'build exit'
print ret print ret