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

issue #2284: fix bugs after merging master

This commit is contained in:
minggo 2013-06-14 14:34:50 +08:00
parent cd5bcb87af
commit a221f06592
15 changed files with 2406 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cocos2dx/platform/android/java/.settings/org.eclipse.jdt.core.prefs Normal file
View File

@ -0,0 +1,4 @@
eclipse.preferences.version=1
org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6
org.eclipse.jdt.core.compiler.compliance=1.6
org.eclipse.jdt.core.compiler.source=1.6

2
cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
fa60dbec00f648a7eeff29e2da5267a9d9edfd06 06a3716ff2fdcaa883bed71ffe53793daf0f3980

2
cocos2dx/proj.mac/cocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
4f421e1ed8425f53876db5971e3deac238edb4d3 48343c95124055e16c2b921bb7658b86b20811e1

947
cocos2dx/proj.win32/cocos2d.vcxproj.filters.orig Normal file
View File

@ -0,0 +1,947 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="base_nodes">
<UniqueIdentifier>{cc64f5ad-2234-494c-9c51-b7a20c8887aa}</UniqueIdentifier>
</Filter>
<Filter Include="cocoa">
<UniqueIdentifier>{aec8225f-81a7-4213-b97b-7004d5535398}</UniqueIdentifier>
</Filter>
<Filter Include="effects">
<UniqueIdentifier>{736cf4ab-e0d6-40ba-912a-b062d28d318a}</UniqueIdentifier>
</Filter>
<Filter Include="actions">
<UniqueIdentifier>{1c7c61b8-3d36-4ba0-a87c-457eb4c782d0}</UniqueIdentifier>
</Filter>
<Filter Include="include">
<UniqueIdentifier>{0b3a64bd-79fa-476a-a461-6b97e5072453}</UniqueIdentifier>
</Filter>
<Filter Include="label_nodes">
<UniqueIdentifier>{e455af5e-da09-4f41-b79f-df4dd311820d}</UniqueIdentifier>
</Filter>
<Filter Include="layers_scenes_transitions_nodes">
<UniqueIdentifier>{206bd96b-f80e-4722-8675-d7c6ff9b3639}</UniqueIdentifier>
</Filter>
<Filter Include="menu_nodes">
<UniqueIdentifier>{075492ba-08bc-404c-92da-32029797a600}</UniqueIdentifier>
</Filter>
<Filter Include="misc_nodes">
<UniqueIdentifier>{41abe422-1602-4fe0-ac1c-6b04a14c1abb}</UniqueIdentifier>
</Filter>
<Filter Include="particle_nodes">
<UniqueIdentifier>{8bf0f517-2ac3-4fc3-a1ad-999d9ea103cd}</UniqueIdentifier>
</Filter>
<Filter Include="platform">
<UniqueIdentifier>{926fc31c-8742-4984-9940-c972dd02fc8a}</UniqueIdentifier>
</Filter>
<Filter Include="platform\win32">
<UniqueIdentifier>{9428f8e6-4ce3-4596-b8af-14d70b7c5b5d}</UniqueIdentifier>
</Filter>
<Filter Include="sprite_nodes">
<UniqueIdentifier>{755e5282-111e-46a5-9169-7c12b37f5ffc}</UniqueIdentifier>
</Filter>
<Filter Include="support">
<UniqueIdentifier>{d94bbf20-8de9-49a7-ae20-6a1140cf633b}</UniqueIdentifier>
</Filter>
<Filter Include="support\data_support">
<UniqueIdentifier>{4a64789e-cc8d-4f84-a869-e6dae2e0d58c}</UniqueIdentifier>
</Filter>
<Filter Include="support\image_support">
<UniqueIdentifier>{bb98a889-9a48-4e31-af2f-117f14da388a}</UniqueIdentifier>
</Filter>
<Filter Include="support\zip_support">
<UniqueIdentifier>{fdea327e-b905-47db-8c33-b70d7866166b}</UniqueIdentifier>
</Filter>
<Filter Include="textures">
<UniqueIdentifier>{46c8d130-b8b5-47f5-a063-ca700e1c32cc}</UniqueIdentifier>
</Filter>
<Filter Include="tilemap_parallax_nodes">
<UniqueIdentifier>{f2671200-b2d8-4d2e-9728-06719cf6f835}</UniqueIdentifier>
</Filter>
<Filter Include="touch_dispatcher">
<UniqueIdentifier>{eaa16c9b-dfbc-4a37-8e3e-e961d9ca1d1a}</UniqueIdentifier>
</Filter>
<Filter Include="keypad_dispatcher">
<UniqueIdentifier>{3c91932f-7667-4049-b9bd-caac4c8eab15}</UniqueIdentifier>
</Filter>
<Filter Include="text_input_node">
<UniqueIdentifier>{535c04b0-fe2b-44c9-9a8c-9029e2b6de5c}</UniqueIdentifier>
</Filter>
<Filter Include="script_support">
<UniqueIdentifier>{5b082c5c-d396-43ca-b3b1-997d0f6247d0}</UniqueIdentifier>
</Filter>
<Filter Include="kazmath">
<UniqueIdentifier>{7751500e-ac9e-4604-a96d-670b30b7d8bd}</UniqueIdentifier>
</Filter>
<Filter Include="kazmath\include">
<UniqueIdentifier>{b38113b1-3d59-4f6e-ac5a-f43921f6ed09}</UniqueIdentifier>
</Filter>
<Filter Include="kazmath\include\kazmath">
<UniqueIdentifier>{569c49c9-27eb-456e-a3f4-9f403e28a3a1}</UniqueIdentifier>
</Filter>
<Filter Include="kazmath\include\kazmath\GL">
<UniqueIdentifier>{191b3e94-47dc-4054-b1cb-bf145d281521}</UniqueIdentifier>
</Filter>
<Filter Include="kazmath\src">
<UniqueIdentifier>{a91a4cc0-41e6-43e9-80c0-2c9101924386}</UniqueIdentifier>
</Filter>
<Filter Include="kazmath\src\GL">
<UniqueIdentifier>{e278b354-1e41-4e92-95b3-7f661ba67140}</UniqueIdentifier>
</Filter>
<Filter Include="shaders">
<UniqueIdentifier>{163895ae-8a8e-46bf-bdf2-98bb2c1347fc}</UniqueIdentifier>
</Filter>
<Filter Include="draw_nodes">
<UniqueIdentifier>{1179d205-d065-49f0-8457-bc4c3f1d0cb3}</UniqueIdentifier>
</Filter>
<Filter Include="support\tinyxml2">
<UniqueIdentifier>{cc25bb83-527d-4218-8d68-ebf963ce7698}</UniqueIdentifier>
</Filter>
<Filter Include="support\user_default">
<UniqueIdentifier>{c45b97e8-fa1f-4e58-8ec5-d46371c2dd26}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\base_nodes\CCAtlasNode.cpp">
<Filter>base_nodes</Filter>
</ClCompile>
<ClCompile Include="..\base_nodes\CCNode.cpp">
<Filter>base_nodes</Filter>
</ClCompile>
<ClCompile Include="..\cocoa\CCAffineTransform.cpp">
<Filter>cocoa</Filter>
</ClCompile>
<ClCompile Include="..\cocoa\CCArray.cpp">
<Filter>cocoa</Filter>
</ClCompile>
<ClCompile Include="..\cocoa\CCAutoreleasePool.cpp">
<Filter>cocoa</Filter>
</ClCompile>
<ClCompile Include="..\cocoa\CCDictionary.cpp">
<Filter>cocoa</Filter>
</ClCompile>
<ClCompile Include="..\cocoa\CCGeometry.cpp">
<Filter>cocoa</Filter>
</ClCompile>
<ClCompile Include="..\cocoa\CCNS.cpp">
<Filter>cocoa</Filter>
</ClCompile>
<ClCompile Include="..\cocoa\CCObject.cpp">
<Filter>cocoa</Filter>
</ClCompile>
<ClCompile Include="..\cocoa\CCSet.cpp">
<Filter>cocoa</Filter>
</ClCompile>
<ClCompile Include="..\cocoa\CCString.cpp">
<Filter>cocoa</Filter>
</ClCompile>
<ClCompile Include="..\cocoa\CCZone.cpp">
<Filter>cocoa</Filter>
</ClCompile>
<ClCompile Include="..\effects\CCGrabber.cpp">
<Filter>effects</Filter>
</ClCompile>
<ClCompile Include="..\effects\CCGrid.cpp">
<Filter>effects</Filter>
</ClCompile>
<ClCompile Include="..\actions\CCAction.cpp">
<Filter>actions</Filter>
</ClCompile>
<ClCompile Include="..\actions\CCActionCamera.cpp">
<Filter>actions</Filter>
</ClCompile>
<ClCompile Include="..\actions\CCActionCatmullRom.cpp">
<Filter>actions</Filter>
</ClCompile>
<ClCompile Include="..\actions\CCActionEase.cpp">
<Filter>actions</Filter>
</ClCompile>
<ClCompile Include="..\actions\CCActionGrid.cpp">
<Filter>actions</Filter>
</ClCompile>
<ClCompile Include="..\actions\CCActionGrid3D.cpp">
<Filter>actions</Filter>
</ClCompile>
<ClCompile Include="..\actions\CCActionInstant.cpp">
<Filter>actions</Filter>
</ClCompile>
<ClCompile Include="..\actions\CCActionInterval.cpp">
<Filter>actions</Filter>
</ClCompile>
<ClCompile Include="..\actions\CCActionManager.cpp">
<Filter>actions</Filter>
</ClCompile>
<ClCompile Include="..\actions\CCActionPageTurn3D.cpp">
<Filter>actions</Filter>
</ClCompile>
<ClCompile Include="..\actions\CCActionProgressTimer.cpp">
<Filter>actions</Filter>
</ClCompile>
<ClCompile Include="..\actions\CCActionTiledGrid.cpp">
<Filter>actions</Filter>
</ClCompile>
<ClCompile Include="..\actions\CCActionTween.cpp">
<Filter>actions</Filter>
</ClCompile>
<ClCompile Include="..\label_nodes\CCLabelAtlas.cpp">
<Filter>label_nodes</Filter>
</ClCompile>
<ClCompile Include="..\label_nodes\CCLabelBMFont.cpp">
<Filter>label_nodes</Filter>
</ClCompile>
<ClCompile Include="..\label_nodes\CCLabelTTF.cpp">
<Filter>label_nodes</Filter>
</ClCompile>
<ClCompile Include="..\layers_scenes_transitions_nodes\CCLayer.cpp">
<Filter>layers_scenes_transitions_nodes</Filter>
</ClCompile>
<ClCompile Include="..\layers_scenes_transitions_nodes\CCScene.cpp">
<Filter>layers_scenes_transitions_nodes</Filter>
</ClCompile>
<ClCompile Include="..\layers_scenes_transitions_nodes\CCTransition.cpp">
<Filter>layers_scenes_transitions_nodes</Filter>
</ClCompile>
<ClCompile Include="..\layers_scenes_transitions_nodes\CCTransitionPageTurn.cpp">
<Filter>layers_scenes_transitions_nodes</Filter>
</ClCompile>
<ClCompile Include="..\layers_scenes_transitions_nodes\CCTransitionProgress.cpp">
<Filter>layers_scenes_transitions_nodes</Filter>
</ClCompile>
<ClCompile Include="..\menu_nodes\CCMenu.cpp">
<Filter>menu_nodes</Filter>
</ClCompile>
<ClCompile Include="..\menu_nodes\CCMenuItem.cpp">
<Filter>menu_nodes</Filter>
</ClCompile>
<ClCompile Include="..\misc_nodes\CCMotionStreak.cpp">
<Filter>misc_nodes</Filter>
</ClCompile>
<ClCompile Include="..\misc_nodes\CCProgressTimer.cpp">
<Filter>misc_nodes</Filter>
</ClCompile>
<ClCompile Include="..\misc_nodes\CCRenderTexture.cpp">
<Filter>misc_nodes</Filter>
</ClCompile>
<ClCompile Include="..\particle_nodes\CCParticleBatchNode.cpp">
<Filter>particle_nodes</Filter>
</ClCompile>
<ClCompile Include="..\particle_nodes\CCParticleExamples.cpp">
<Filter>particle_nodes</Filter>
</ClCompile>
<ClCompile Include="..\particle_nodes\CCParticleSystem.cpp">
<Filter>particle_nodes</Filter>
</ClCompile>
<ClCompile Include="..\particle_nodes\CCParticleSystemQuad.cpp">
<Filter>particle_nodes</Filter>
</ClCompile>
<ClCompile Include="..\platform\CCEGLViewProtocol.cpp">
<Filter>platform</Filter>
</ClCompile>
<ClCompile Include="..\platform\CCSAXParser.cpp">
<Filter>platform</Filter>
</ClCompile>
<ClCompile Include="..\platform\CCThread.cpp">
<Filter>platform</Filter>
</ClCompile>
<ClCompile Include="..\platform\platform.cpp">
<Filter>platform</Filter>
</ClCompile>
<ClCompile Include="..\platform\win32\CCAccelerometer.cpp">
<Filter>platform\win32</Filter>
</ClCompile>
<ClCompile Include="..\platform\win32\CCApplication.cpp">
<Filter>platform\win32</Filter>
</ClCompile>
<ClCompile Include="..\platform\win32\CCCommon.cpp">
<Filter>platform\win32</Filter>
</ClCompile>
<ClCompile Include="..\platform\win32\CCEGLView.cpp">
<Filter>platform\win32</Filter>
</ClCompile>
<ClCompile Include="..\platform\win32\CCImage.cpp">
<Filter>platform\win32</Filter>
</ClCompile>
<ClCompile Include="..\platform\win32\CCStdC.cpp">
<Filter>platform\win32</Filter>
</ClCompile>
<ClCompile Include="..\sprite_nodes\CCAnimation.cpp">
<Filter>sprite_nodes</Filter>
</ClCompile>
<ClCompile Include="..\sprite_nodes\CCAnimationCache.cpp">
<Filter>sprite_nodes</Filter>
</ClCompile>
<ClCompile Include="..\sprite_nodes\CCSprite.cpp">
<Filter>sprite_nodes</Filter>
</ClCompile>
<ClCompile Include="..\sprite_nodes\CCSpriteBatchNode.cpp">
<Filter>sprite_nodes</Filter>
</ClCompile>
<ClCompile Include="..\sprite_nodes\CCSpriteFrame.cpp">
<Filter>sprite_nodes</Filter>
</ClCompile>
<ClCompile Include="..\sprite_nodes\CCSpriteFrameCache.cpp">
<Filter>sprite_nodes</Filter>
</ClCompile>
<ClCompile Include="..\support\base64.cpp">
<Filter>support</Filter>
</ClCompile>
<ClCompile Include="..\support\CCNotificationCenter.cpp">
<Filter>support</Filter>
</ClCompile>
<ClCompile Include="..\support\CCPointExtension.cpp">
<Filter>support</Filter>
</ClCompile>
<ClCompile Include="..\support\CCProfiling.cpp">
<Filter>support</Filter>
</ClCompile>
<ClCompile Include="..\support\ccUtils.cpp">
<Filter>support</Filter>
</ClCompile>
<ClCompile Include="..\support\CCVertex.cpp">
<Filter>support</Filter>
</ClCompile>
<ClCompile Include="..\support\TransformUtils.cpp">
<Filter>support</Filter>
</ClCompile>
<ClCompile Include="..\support\data_support\ccCArray.cpp">
<Filter>support\data_support</Filter>
</ClCompile>
<ClCompile Include="..\support\image_support\TGAlib.cpp">
<Filter>support\image_support</Filter>
</ClCompile>
<ClCompile Include="..\support\zip_support\ioapi.cpp">
<Filter>support\zip_support</Filter>
</ClCompile>
<ClCompile Include="..\support\zip_support\unzip.cpp">
<Filter>support\zip_support</Filter>
</ClCompile>
<ClCompile Include="..\support\zip_support\ZipUtils.cpp">
<Filter>support\zip_support</Filter>
</ClCompile>
<ClCompile Include="..\textures\CCTexture2D.cpp">
<Filter>textures</Filter>
</ClCompile>
<ClCompile Include="..\textures\CCTextureAtlas.cpp">
<Filter>textures</Filter>
</ClCompile>
<ClCompile Include="..\textures\CCTextureCache.cpp">
<Filter>textures</Filter>
</ClCompile>
<ClCompile Include="..\textures\CCTexturePVR.cpp">
<Filter>textures</Filter>
</ClCompile>
<ClCompile Include="..\tileMap_parallax_nodes\CCParallaxNode.cpp">
<Filter>tilemap_parallax_nodes</Filter>
</ClCompile>
<ClCompile Include="..\tileMap_parallax_nodes\CCTileMapAtlas.cpp">
<Filter>tilemap_parallax_nodes</Filter>
</ClCompile>
<ClCompile Include="..\tileMap_parallax_nodes\CCTMXLayer.cpp">
<Filter>tilemap_parallax_nodes</Filter>
</ClCompile>
<ClCompile Include="..\tileMap_parallax_nodes\CCTMXObjectGroup.cpp">
<Filter>tilemap_parallax_nodes</Filter>
</ClCompile>
<ClCompile Include="..\tileMap_parallax_nodes\CCTMXTiledMap.cpp">
<Filter>tilemap_parallax_nodes</Filter>
</ClCompile>
<ClCompile Include="..\tileMap_parallax_nodes\CCTMXXMLParser.cpp">
<Filter>tilemap_parallax_nodes</Filter>
</ClCompile>
<ClCompile Include="..\touch_dispatcher\CCTouch.cpp">
<Filter>touch_dispatcher</Filter>
</ClCompile>
<ClCompile Include="..\touch_dispatcher\CCTouchDispatcher.cpp">
<Filter>touch_dispatcher</Filter>
</ClCompile>
<ClCompile Include="..\touch_dispatcher\CCTouchHandler.cpp">
<Filter>touch_dispatcher</Filter>
</ClCompile>
<ClCompile Include="..\keypad_dispatcher\CCKeypadDelegate.cpp">
<Filter>keypad_dispatcher</Filter>
</ClCompile>
<ClCompile Include="..\keypad_dispatcher\CCKeypadDispatcher.cpp">
<Filter>keypad_dispatcher</Filter>
</ClCompile>
<ClCompile Include="..\text_input_node\CCIMEDispatcher.cpp">
<Filter>text_input_node</Filter>
</ClCompile>
<ClCompile Include="..\text_input_node\CCTextFieldTTF.cpp">
<Filter>text_input_node</Filter>
</ClCompile>
<ClCompile Include="..\script_support\CCScriptSupport.cpp">
<Filter>script_support</Filter>
</ClCompile>
<ClCompile Include="..\kazmath\src\aabb.c">
<Filter>kazmath\src</Filter>
</ClCompile>
<ClCompile Include="..\kazmath\src\mat3.c">
<Filter>kazmath\src</Filter>
</ClCompile>
<ClCompile Include="..\kazmath\src\mat4.c">
<Filter>kazmath\src</Filter>
</ClCompile>
<ClCompile Include="..\kazmath\src\neon_matrix_impl.c">
<Filter>kazmath\src</Filter>
</ClCompile>
<ClCompile Include="..\kazmath\src\plane.c">
<Filter>kazmath\src</Filter>
</ClCompile>
<ClCompile Include="..\kazmath\src\quaternion.c">
<Filter>kazmath\src</Filter>
</ClCompile>
<ClCompile Include="..\kazmath\src\ray2.c">
<Filter>kazmath\src</Filter>
</ClCompile>
<ClCompile Include="..\kazmath\src\utility.c">
<Filter>kazmath\src</Filter>
</ClCompile>
<ClCompile Include="..\kazmath\src\vec2.c">
<Filter>kazmath\src</Filter>
</ClCompile>
<ClCompile Include="..\kazmath\src\vec3.c">
<Filter>kazmath\src</Filter>
</ClCompile>
<ClCompile Include="..\kazmath\src\vec4.c">
<Filter>kazmath\src</Filter>
</ClCompile>
<ClCompile Include="..\kazmath\src\GL\mat4stack.c">
<Filter>kazmath\src\GL</Filter>
</ClCompile>
<ClCompile Include="..\kazmath\src\GL\matrix.c">
<Filter>kazmath\src\GL</Filter>
</ClCompile>
<ClCompile Include="..\CCCamera.cpp" />
<ClCompile Include="..\CCConfiguration.cpp" />
<ClCompile Include="..\CCDirector.cpp" />
<ClCompile Include="..\CCScheduler.cpp" />
<ClCompile Include="..\cocos2d.cpp" />
<ClCompile Include="..\draw_nodes\CCDrawingPrimitives.cpp">
<Filter>draw_nodes</Filter>
</ClCompile>
<ClCompile Include="..\draw_nodes\CCDrawNode.cpp">
<Filter>draw_nodes</Filter>
</ClCompile>
<ClCompile Include="..\misc_nodes\CCClippingNode.cpp">
<Filter>misc_nodes</Filter>
</ClCompile>
<ClCompile Include="..\shaders\ccGLStateCache.cpp">
<Filter>shaders</Filter>
</ClCompile>
<ClCompile Include="..\shaders\CCShaderCache.cpp">
<Filter>shaders</Filter>
</ClCompile>
<ClCompile Include="..\shaders\ccShaders.cpp">
<Filter>shaders</Filter>
</ClCompile>
<ClCompile Include="..\shaders\CCGLProgram.cpp">
<Filter>shaders</Filter>
</ClCompile>
<ClCompile Include="..\platform\win32\CCFileUtilsWin32.cpp">
<Filter>platform\win32</Filter>
</ClCompile>
<ClCompile Include="..\platform\CCFileUtils.cpp">
<Filter>platform</Filter>
</ClCompile>
<ClCompile Include="..\platform\CCImageCommonWebp.cpp">
<Filter>platform</Filter>
</ClCompile>
<ClCompile Include="..\platform\win32\CCDevice.cpp">
<Filter>platform\win32</Filter>
</ClCompile>
<ClCompile Include="..\support\ccUTF8.cpp">
<Filter>support</Filter>
</ClCompile>
<ClCompile Include="..\support\user_default\CCUserDefault.cpp">
<Filter>support\user_default</Filter>
</ClCompile>
<ClCompile Include="..\support\tinyxml2\tinyxml2.cpp">
<Filter>support\tinyxml2</Filter>
</ClCompile>
<ClCompile Include="..\cocoa\CCDataVisitor.cpp">
<Filter>cocoa</Filter>
</ClCompile>
<<<<<<< HEAD
<ClCompile Include="..\ccFPSImages.c" />
=======
<ClCompile Include="..\textures\CCTextureETC.cpp">
<Filter>textures</Filter>
</ClCompile>
>>>>>>> 5622ced1172b79eb8cdb652677c39d4f6fe16c56
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\base_nodes\CCAtlasNode.h">
<Filter>base_nodes</Filter>
</ClInclude>
<ClInclude Include="..\base_nodes\CCNode.h">
<Filter>base_nodes</Filter>
</ClInclude>
<ClInclude Include="..\cocoa\CCAffineTransform.h">
<Filter>cocoa</Filter>
</ClInclude>
<ClInclude Include="..\cocoa\CCArray.h">
<Filter>cocoa</Filter>
</ClInclude>
<ClInclude Include="..\cocoa\CCAutoreleasePool.h">
<Filter>cocoa</Filter>
</ClInclude>
<ClInclude Include="..\cocoa\CCDictionary.h">
<Filter>cocoa</Filter>
</ClInclude>
<ClInclude Include="..\cocoa\CCGeometry.h">
<Filter>cocoa</Filter>
</ClInclude>
<ClInclude Include="..\cocoa\CCInteger.h">
<Filter>cocoa</Filter>
</ClInclude>
<ClInclude Include="..\cocoa\CCNS.h">
<Filter>cocoa</Filter>
</ClInclude>
<ClInclude Include="..\cocoa\CCObject.h">
<Filter>cocoa</Filter>
</ClInclude>
<ClInclude Include="..\cocoa\CCSet.h">
<Filter>cocoa</Filter>
</ClInclude>
<ClInclude Include="..\cocoa\CCString.h">
<Filter>cocoa</Filter>
</ClInclude>
<ClInclude Include="..\cocoa\CCZone.h">
<Filter>cocoa</Filter>
</ClInclude>
<ClInclude Include="..\effects\CCGrabber.h">
<Filter>effects</Filter>
</ClInclude>
<ClInclude Include="..\effects\CCGrid.h">
<Filter>effects</Filter>
</ClInclude>
<ClInclude Include="..\actions\CCAction.h">
<Filter>actions</Filter>
</ClInclude>
<ClInclude Include="..\actions\CCActionCamera.h">
<Filter>actions</Filter>
</ClInclude>
<ClInclude Include="..\actions\CCActionCatmullRom.h">
<Filter>actions</Filter>
</ClInclude>
<ClInclude Include="..\actions\CCActionEase.h">
<Filter>actions</Filter>
</ClInclude>
<ClInclude Include="..\actions\CCActionGrid.h">
<Filter>actions</Filter>
</ClInclude>
<ClInclude Include="..\actions\CCActionGrid3D.h">
<Filter>actions</Filter>
</ClInclude>
<ClInclude Include="..\actions\CCActionInstant.h">
<Filter>actions</Filter>
</ClInclude>
<ClInclude Include="..\actions\CCActionInterval.h">
<Filter>actions</Filter>
</ClInclude>
<ClInclude Include="..\actions\CCActionManager.h">
<Filter>actions</Filter>
</ClInclude>
<ClInclude Include="..\actions\CCActionPageTurn3D.h">
<Filter>actions</Filter>
</ClInclude>
<ClInclude Include="..\actions\CCActionProgressTimer.h">
<Filter>actions</Filter>
</ClInclude>
<ClInclude Include="..\actions\CCActionTiledGrid.h">
<Filter>actions</Filter>
</ClInclude>
<ClInclude Include="..\actions\CCActionTween.h">
<Filter>actions</Filter>
</ClInclude>
<ClInclude Include="..\include\ccConfig.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\include\CCEventType.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\include\ccMacros.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\include\CCProtocols.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\include\ccTypes.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\include\cocos2d.h">
<Filter>include</Filter>
</ClInclude>
<ClInclude Include="..\label_nodes\CCLabelAtlas.h">
<Filter>label_nodes</Filter>
</ClInclude>
<ClInclude Include="..\label_nodes\CCLabelBMFont.h">
<Filter>label_nodes</Filter>
</ClInclude>
<ClInclude Include="..\label_nodes\CCLabelTTF.h">
<Filter>label_nodes</Filter>
</ClInclude>
<ClInclude Include="..\layers_scenes_transitions_nodes\CCLayer.h">
<Filter>layers_scenes_transitions_nodes</Filter>
</ClInclude>
<ClInclude Include="..\layers_scenes_transitions_nodes\CCScene.h">
<Filter>layers_scenes_transitions_nodes</Filter>
</ClInclude>
<ClInclude Include="..\layers_scenes_transitions_nodes\CCTransition.h">
<Filter>layers_scenes_transitions_nodes</Filter>
</ClInclude>
<ClInclude Include="..\layers_scenes_transitions_nodes\CCTransitionPageTurn.h">
<Filter>layers_scenes_transitions_nodes</Filter>
</ClInclude>
<ClInclude Include="..\layers_scenes_transitions_nodes\CCTransitionProgress.h">
<Filter>layers_scenes_transitions_nodes</Filter>
</ClInclude>
<ClInclude Include="..\menu_nodes\CCMenu.h">
<Filter>menu_nodes</Filter>
</ClInclude>
<ClInclude Include="..\menu_nodes\CCMenuItem.h">
<Filter>menu_nodes</Filter>
</ClInclude>
<ClInclude Include="..\misc_nodes\CCMotionStreak.h">
<Filter>misc_nodes</Filter>
</ClInclude>
<ClInclude Include="..\misc_nodes\CCProgressTimer.h">
<Filter>misc_nodes</Filter>
</ClInclude>
<ClInclude Include="..\misc_nodes\CCRenderTexture.h">
<Filter>misc_nodes</Filter>
</ClInclude>
<ClInclude Include="..\particle_nodes\CCParticleBatchNode.h">
<Filter>particle_nodes</Filter>
</ClInclude>
<ClInclude Include="..\particle_nodes\CCParticleExamples.h">
<Filter>particle_nodes</Filter>
</ClInclude>
<ClInclude Include="..\particle_nodes\CCParticleSystem.h">
<Filter>particle_nodes</Filter>
</ClInclude>
<ClInclude Include="..\particle_nodes\CCParticleSystemQuad.h">
<Filter>particle_nodes</Filter>
</ClInclude>
<ClInclude Include="..\platform\CCAccelerometerDelegate.h">
<Filter>platform</Filter>
</ClInclude>
<ClInclude Include="..\platform\CCApplicationProtocol.h">
<Filter>platform</Filter>
</ClInclude>
<ClInclude Include="..\platform\CCCommon.h">
<Filter>platform</Filter>
</ClInclude>
<ClInclude Include="..\platform\CCEGLViewProtocol.h">
<Filter>platform</Filter>
</ClInclude>
<ClInclude Include="..\platform\CCFileUtils.h">
<Filter>platform</Filter>
</ClInclude>
<ClInclude Include="..\platform\CCImage.h">
<Filter>platform</Filter>
</ClInclude>
<ClInclude Include="..\platform\CCImageCommon_cpp.h">
<Filter>platform</Filter>
</ClInclude>
<ClInclude Include="..\platform\CCPlatformConfig.h">
<Filter>platform</Filter>
</ClInclude>
<ClInclude Include="..\platform\CCPlatformMacros.h">
<Filter>platform</Filter>
</ClInclude>
<ClInclude Include="..\platform\CCSAXParser.h">
<Filter>platform</Filter>
</ClInclude>
<ClInclude Include="..\platform\CCThread.h">
<Filter>platform</Filter>
</ClInclude>
<ClInclude Include="..\platform\platform.h">
<Filter>platform</Filter>
</ClInclude>
<ClInclude Include="..\platform\win32\CCAccelerometer.h">
<Filter>platform\win32</Filter>
</ClInclude>
<ClInclude Include="..\platform\win32\CCApplication.h">
<Filter>platform\win32</Filter>
</ClInclude>
<ClInclude Include="..\platform\win32\CCEGLView.h">
<Filter>platform\win32</Filter>
</ClInclude>
<ClInclude Include="..\platform\win32\CCGL.h">
<Filter>platform\win32</Filter>
</ClInclude>
<ClInclude Include="..\platform\win32\CCPlatformDefine.h">
<Filter>platform\win32</Filter>
</ClInclude>
<ClInclude Include="..\platform\win32\CCStdC.h">
<Filter>platform\win32</Filter>
</ClInclude>
<ClInclude Include="..\sprite_nodes\CCAnimation.h">
<Filter>sprite_nodes</Filter>
</ClInclude>
<ClInclude Include="..\sprite_nodes\CCAnimationCache.h">
<Filter>sprite_nodes</Filter>
</ClInclude>
<ClInclude Include="..\sprite_nodes\CCSprite.h">
<Filter>sprite_nodes</Filter>
</ClInclude>
<ClInclude Include="..\sprite_nodes\CCSpriteBatchNode.h">
<Filter>sprite_nodes</Filter>
</ClInclude>
<ClInclude Include="..\sprite_nodes\CCSpriteFrame.h">
<Filter>sprite_nodes</Filter>
</ClInclude>
<ClInclude Include="..\sprite_nodes\CCSpriteFrameCache.h">
<Filter>sprite_nodes</Filter>
</ClInclude>
<ClInclude Include="..\support\base64.h">
<Filter>support</Filter>
</ClInclude>
<ClInclude Include="..\support\CCNotificationCenter.h">
<Filter>support</Filter>
</ClInclude>
<ClInclude Include="..\support\CCPointExtension.h">
<Filter>support</Filter>
</ClInclude>
<ClInclude Include="..\support\CCProfiling.h">
<Filter>support</Filter>
</ClInclude>
<ClInclude Include="..\support\ccUtils.h">
<Filter>support</Filter>
</ClInclude>
<ClInclude Include="..\support\CCVertex.h">
<Filter>support</Filter>
</ClInclude>
<ClInclude Include="..\support\TransformUtils.h">
<Filter>support</Filter>
</ClInclude>
<ClInclude Include="..\support\data_support\ccCArray.h">
<Filter>support\data_support</Filter>
</ClInclude>
<ClInclude Include="..\support\data_support\uthash.h">
<Filter>support\data_support</Filter>
</ClInclude>
<ClInclude Include="..\support\data_support\utlist.h">
<Filter>support\data_support</Filter>
</ClInclude>
<ClInclude Include="..\support\image_support\TGAlib.h">
<Filter>support\image_support</Filter>
</ClInclude>
<ClInclude Include="..\support\zip_support\ioapi.h">
<Filter>support\zip_support</Filter>
</ClInclude>
<ClInclude Include="..\support\zip_support\unzip.h">
<Filter>support\zip_support</Filter>
</ClInclude>
<ClInclude Include="..\support\zip_support\ZipUtils.h">
<Filter>support\zip_support</Filter>
</ClInclude>
<ClInclude Include="..\textures\CCTexture2D.h">
<Filter>textures</Filter>
</ClInclude>
<ClInclude Include="..\textures\CCTextureAtlas.h">
<Filter>textures</Filter>
</ClInclude>
<ClInclude Include="..\textures\CCTextureCache.h">
<Filter>textures</Filter>
</ClInclude>
<ClInclude Include="..\textures\CCTexturePVR.h">
<Filter>textures</Filter>
</ClInclude>
<ClInclude Include="..\tileMap_parallax_nodes\CCParallaxNode.h">
<Filter>tilemap_parallax_nodes</Filter>
</ClInclude>
<ClInclude Include="..\tileMap_parallax_nodes\CCTileMapAtlas.h">
<Filter>tilemap_parallax_nodes</Filter>
</ClInclude>
<ClInclude Include="..\tileMap_parallax_nodes\CCTMXLayer.h">
<Filter>tilemap_parallax_nodes</Filter>
</ClInclude>
<ClInclude Include="..\tileMap_parallax_nodes\CCTMXObjectGroup.h">
<Filter>tilemap_parallax_nodes</Filter>
</ClInclude>
<ClInclude Include="..\tileMap_parallax_nodes\CCTMXTiledMap.h">
<Filter>tilemap_parallax_nodes</Filter>
</ClInclude>
<ClInclude Include="..\tileMap_parallax_nodes\CCTMXXMLParser.h">
<Filter>tilemap_parallax_nodes</Filter>
</ClInclude>
<ClInclude Include="..\touch_dispatcher\CCTouch.h">
<Filter>touch_dispatcher</Filter>
</ClInclude>
<ClInclude Include="..\touch_dispatcher\CCTouchDelegateProtocol.h">
<Filter>touch_dispatcher</Filter>
</ClInclude>
<ClInclude Include="..\touch_dispatcher\CCTouchDispatcher.h">
<Filter>touch_dispatcher</Filter>
</ClInclude>
<ClInclude Include="..\touch_dispatcher\CCTouchHandler.h">
<Filter>touch_dispatcher</Filter>
</ClInclude>
<ClInclude Include="..\keypad_dispatcher\CCKeypadDelegate.h">
<Filter>keypad_dispatcher</Filter>
</ClInclude>
<ClInclude Include="..\keypad_dispatcher\CCKeypadDispatcher.h">
<Filter>keypad_dispatcher</Filter>
</ClInclude>
<ClInclude Include="..\text_input_node\CCIMEDelegate.h">
<Filter>text_input_node</Filter>
</ClInclude>
<ClInclude Include="..\text_input_node\CCIMEDispatcher.h">
<Filter>text_input_node</Filter>
</ClInclude>
<ClInclude Include="..\text_input_node\CCTextFieldTTF.h">
<Filter>text_input_node</Filter>
</ClInclude>
<ClInclude Include="..\script_support\CCScriptSupport.h">
<Filter>script_support</Filter>
</ClInclude>
<ClInclude Include="..\kazmath\include\kazmath\aabb.h">
<Filter>kazmath\include\kazmath</Filter>
</ClInclude>
<ClInclude Include="..\kazmath\include\kazmath\kazmath.h">
<Filter>kazmath\include\kazmath</Filter>
</ClInclude>
<ClInclude Include="..\kazmath\include\kazmath\mat3.h">
<Filter>kazmath\include\kazmath</Filter>
</ClInclude>
<ClInclude Include="..\kazmath\include\kazmath\mat4.h">
<Filter>kazmath\include\kazmath</Filter>
</ClInclude>
<ClInclude Include="..\kazmath\include\kazmath\neon_matrix_impl.h">
<Filter>kazmath\include\kazmath</Filter>
</ClInclude>
<ClInclude Include="..\kazmath\include\kazmath\plane.h">
<Filter>kazmath\include\kazmath</Filter>
</ClInclude>
<ClInclude Include="..\kazmath\include\kazmath\quaternion.h">
<Filter>kazmath\include\kazmath</Filter>
</ClInclude>
<ClInclude Include="..\kazmath\include\kazmath\ray2.h">
<Filter>kazmath\include\kazmath</Filter>
</ClInclude>
<ClInclude Include="..\kazmath\include\kazmath\utility.h">
<Filter>kazmath\include\kazmath</Filter>
</ClInclude>
<ClInclude Include="..\kazmath\include\kazmath\vec2.h">
<Filter>kazmath\include\kazmath</Filter>
</ClInclude>
<ClInclude Include="..\kazmath\include\kazmath\vec3.h">
<Filter>kazmath\include\kazmath</Filter>
</ClInclude>
<ClInclude Include="..\kazmath\include\kazmath\vec4.h">
<Filter>kazmath\include\kazmath</Filter>
</ClInclude>
<ClInclude Include="..\kazmath\include\kazmath\GL\mat4stack.h">
<Filter>kazmath\include\kazmath\GL</Filter>
</ClInclude>
<ClInclude Include="..\kazmath\include\kazmath\GL\matrix.h">
<Filter>kazmath\include\kazmath\GL</Filter>
</ClInclude>
<ClInclude Include="..\CCCamera.h" />
<ClInclude Include="..\CCConfiguration.h" />
<ClInclude Include="..\CCDirector.h" />
<ClInclude Include="..\CCScheduler.h" />
<ClInclude Include="..\draw_nodes\CCDrawingPrimitives.h">
<Filter>draw_nodes</Filter>
</ClInclude>
<ClInclude Include="..\draw_nodes\CCDrawNode.h">
<Filter>draw_nodes</Filter>
</ClInclude>
<ClInclude Include="..\misc_nodes\CCClippingNode.h">
<Filter>misc_nodes</Filter>
</ClInclude>
<ClInclude Include="..\shaders\ccGLStateCache.h">
<Filter>shaders</Filter>
</ClInclude>
<ClInclude Include="..\shaders\ccShader_Position_uColor_frag.h">
<Filter>shaders</Filter>
</ClInclude>
<ClInclude Include="..\shaders\ccShader_Position_uColor_vert.h">
<Filter>shaders</Filter>
</ClInclude>
<ClInclude Include="..\shaders\ccShader_PositionColor_frag.h">
<Filter>shaders</Filter>
</ClInclude>
<ClInclude Include="..\shaders\ccShader_PositionColor_vert.h">
<Filter>shaders</Filter>
</ClInclude>
<ClInclude Include="..\shaders\ccShader_PositionColorLengthTexture_frag.h">
<Filter>shaders</Filter>
</ClInclude>
<ClInclude Include="..\shaders\ccShader_PositionColorLengthTexture_vert.h">
<Filter>shaders</Filter>
</ClInclude>
<ClInclude Include="..\shaders\ccShader_PositionTexture_frag.h">
<Filter>shaders</Filter>
</ClInclude>
<ClInclude Include="..\shaders\ccShader_PositionTexture_uColor_frag.h">
<Filter>shaders</Filter>
</ClInclude>
<ClInclude Include="..\shaders\ccShader_PositionTexture_uColor_vert.h">
<Filter>shaders</Filter>
</ClInclude>
<ClInclude Include="..\shaders\ccShader_PositionTexture_vert.h">
<Filter>shaders</Filter>
</ClInclude>
<ClInclude Include="..\shaders\ccShader_PositionTextureA8Color_frag.h">
<Filter>shaders</Filter>
</ClInclude>
<ClInclude Include="..\shaders\ccShader_PositionTextureA8Color_vert.h">
<Filter>shaders</Filter>
</ClInclude>
<ClInclude Include="..\shaders\ccShader_PositionTextureColor_frag.h">
<Filter>shaders</Filter>
</ClInclude>
<ClInclude Include="..\shaders\ccShader_PositionTextureColor_vert.h">
<Filter>shaders</Filter>
</ClInclude>
<ClInclude Include="..\shaders\ccShader_PositionTextureColorAlphaTest_frag.h">
<Filter>shaders</Filter>
</ClInclude>
<ClInclude Include="..\shaders\CCShaderCache.h">
<Filter>shaders</Filter>
</ClInclude>
<ClInclude Include="..\shaders\ccShaderEx_SwitchMask_frag.h">
<Filter>shaders</Filter>
</ClInclude>
<ClInclude Include="..\shaders\ccShaders.h">
<Filter>shaders</Filter>
</ClInclude>
<ClInclude Include="..\shaders\CCGLProgram.h">
<Filter>shaders</Filter>
</ClInclude>
<ClInclude Include="..\platform\win32\CCFileUtilsWin32.h">
<Filter>platform\win32</Filter>
</ClInclude>
<ClInclude Include="..\support\ccUTF8.h">
<Filter>support</Filter>
</ClInclude>
<ClInclude Include="..\support\user_default\CCUserDefault.h">
<Filter>support\user_default</Filter>
</ClInclude>
<ClInclude Include="..\support\tinyxml2\tinyxml2.h">
<Filter>support\tinyxml2</Filter>
</ClInclude>
<ClInclude Include="..\cocoa\CCDataVisitor.h">
<Filter>cocoa</Filter>
</ClInclude>
<ClInclude Include="..\cocoa\CCBool.h">
<Filter>cocoa</Filter>
</ClInclude>
<ClInclude Include="..\cocoa\CCDouble.h">
<Filter>cocoa</Filter>
</ClInclude>
<ClInclude Include="..\cocoa\CCFloat.h">
<Filter>cocoa</Filter>
</ClInclude>
<<<<<<< HEAD
<ClInclude Include="..\ccFPSImages.h" />
=======
<ClInclude Include="..\textures\CCTextureETC.h">
<Filter>textures</Filter>
</ClInclude>
>>>>>>> 5622ced1172b79eb8cdb652677c39d4f6fe16c56
</ItemGroup>
</Project>

BIN
cocos2dx/support/user_default/Archive.zip Normal file
View File

Binary file not shown.

31
extensions/Android.mk
View File

@ -6,6 +6,31 @@ LOCAL_MODULE := cocos_extension_static
LOCAL_MODULE_FILENAME := libextension LOCAL_MODULE_FILENAME := libextension
LOCAL_SRC_FILES := AssetsManager/AssetsManager.cpp \ LOCAL_SRC_FILES := AssetsManager/AssetsManager.cpp \
CCArmature/CCArmature.cpp \
CCArmature/CCBone.cpp \
CCArmature/animation/CCArmatureAnimation.cpp \
CCArmature/animation/CCProcessBase.cpp \
CCArmature/animation/CCTween.cpp \
CCArmature/datas/CCDatas.cpp \
CCArmature/display/CCBatchNode.cpp \
CCArmature/display/CCDecorativeDisplay.cpp \
CCArmature/display/CCDisplayFactory.cpp \
CCArmature/display/CCDisplayManager.cpp \
CCArmature/display/CCShaderNode.cpp \
CCArmature/display/CCSkin.cpp \
CCArmature/external_tool/GLES-Render.cpp \
CCArmature/external_tool/Json/CSContentJsonDictionary.cpp \
CCArmature/external_tool/Json/lib_json/json_value.cpp \
CCArmature/external_tool/Json/lib_json/json_reader.cpp \
CCArmature/external_tool/Json/lib_json/json_writer.cpp \
CCArmature/physics/CCColliderDetector.cpp \
CCArmature/physics/CCPhysicsWorld.cpp \
CCArmature/utils/CCArmatureDataManager.cpp \
CCArmature/utils/CCDataReaderHelper.cpp \
CCArmature/utils/CCSpriteFrameCacheHelper.cpp \
CCArmature/utils/CCTransformHelp.cpp \
CCArmature/utils/CCTweenFunction.cpp \
CCArmature/utils/CCUtilMath.cpp \
CCBReader/CCBFileLoader.cpp \ CCBReader/CCBFileLoader.cpp \
CCBReader/CCBReader.cpp \ CCBReader/CCBReader.cpp \
CCBReader/CCControlButtonLoader.cpp \ CCBReader/CCControlButtonLoader.cpp \
@ -29,6 +54,10 @@ CCBReader/CCBSequence.cpp \
CCBReader/CCBSequenceProperty.cpp \ CCBReader/CCBSequenceProperty.cpp \
CCBReader/CCBValue.cpp \ CCBReader/CCBValue.cpp \
CCBReader/CCNode+CCBRelativePositioning.cpp \ CCBReader/CCNode+CCBRelativePositioning.cpp \
Components/CCComAttribute.cpp \
Components/CCComAudio.cpp \
Components/CCComController.cpp \
Components/CCInputDelegate.cpp \
GUI/CCControlExtension/CCControl.cpp \ GUI/CCControlExtension/CCControl.cpp \
GUI/CCControlExtension/CCControlButton.cpp \ GUI/CCControlExtension/CCControlButton.cpp \
GUI/CCControlExtension/CCControlColourPicker.cpp \ GUI/CCControlExtension/CCControlColourPicker.cpp \
@ -81,6 +110,8 @@ LOCAL_WHOLE_STATIC_LIBRARIES += box2d_static
LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static LOCAL_WHOLE_STATIC_LIBRARIES += chipmunk_static
LOCAL_WHOLE_STATIC_LIBRARIES += libwebsockets_static LOCAL_WHOLE_STATIC_LIBRARIES += libwebsockets_static
LOCAL_CXXFLAGS += -fexceptions
LOCAL_CFLAGS += -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 LOCAL_CFLAGS += -DCC_ENABLE_CHIPMUNK_INTEGRATION=1
LOCAL_EXPORT_CFLAGS += -DCC_ENABLE_CHIPMUNK_INTEGRATION=1 LOCAL_EXPORT_CFLAGS += -DCC_ENABLE_CHIPMUNK_INTEGRATION=1

14
samples/Cpp/TestCpp/Android.mk
View File

@ -37,6 +37,7 @@ Classes/CurrentLanguageTest/CurrentLanguageTest.cpp \
Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp \ Classes/DrawPrimitivesTest/DrawPrimitivesTest.cpp \
Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp \ Classes/EffectsAdvancedTest/EffectsAdvancedTest.cpp \
Classes/EffectsTest/EffectsTest.cpp \ Classes/EffectsTest/EffectsTest.cpp \
Classes/ExtensionsTest/ArmatureTest/ArmatureScene.cpp \
Classes/ExtensionsTest/ExtensionsTest.cpp \ Classes/ExtensionsTest/ExtensionsTest.cpp \
Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp \ Classes/ExtensionsTest/NotificationCenterTest/NotificationCenterTest.cpp \
Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp \ Classes/ExtensionsTest/ControlExtensionTest/CCControlScene.cpp \
@ -54,20 +55,17 @@ Classes/ExtensionsTest/CocosBuilderTest/ButtonTest/ButtonTestLayer.cpp \
Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp \ Classes/ExtensionsTest/CocosBuilderTest/MenuTest/MenuTestLayer.cpp \
Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp \ Classes/ExtensionsTest/CocosBuilderTest/AnimationsTest/AnimationsTestLayer.cpp \
Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp \ Classes/ExtensionsTest/CocosBuilderTest/TimelineCallbackTest/TimelineCallbackTestLayer.cpp \
Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp \
Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp \
Classes/ExtensionsTest/EditBoxTest/EditBoxTest.cpp \
Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp \
Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp \
Classes/ExtensionsTest/ArmatureTest/ArmatureScene.cpp \
\
Classes/ExtensionsTest/ComponentsTest/ComponentsTestScene.cpp \ Classes/ExtensionsTest/ComponentsTest/ComponentsTestScene.cpp \
Classes/ExtensionsTest/ComponentsTest/EnemyController.cpp \ Classes/ExtensionsTest/ComponentsTest/EnemyController.cpp \
Classes/ExtensionsTest/ComponentsTest/GameOverScene.cpp \ Classes/ExtensionsTest/ComponentsTest/GameOverScene.cpp \
Classes/ExtensionsTest/ComponentsTest/PlayerController.cpp \ Classes/ExtensionsTest/ComponentsTest/PlayerController.cpp \
Classes/ExtensionsTest/ComponentsTest/ProjectileController.cpp \ Classes/ExtensionsTest/ComponentsTest/ProjectileController.cpp \
Classes/ExtensionsTest/ComponentsTest/SceneController.cpp \ Classes/ExtensionsTest/ComponentsTest/SceneController.cpp \
\ Classes/ExtensionsTest/NetworkTest/HttpClientTest.cpp \
Classes/ExtensionsTest/NetworkTest/WebSocketTest.cpp \
Classes/ExtensionsTest/EditBoxTest/EditBoxTest.cpp \
Classes/ExtensionsTest/TableViewTest/TableViewTestScene.cpp \
Classes/ExtensionsTest/TableViewTest/CustomTableViewCell.cpp \
Classes/FontTest/FontTest.cpp \ Classes/FontTest/FontTest.cpp \
Classes/IntervalTest/IntervalTest.cpp \ Classes/IntervalTest/IntervalTest.cpp \
Classes/KeypadTest/KeypadTest.cpp \ Classes/KeypadTest/KeypadTest.cpp \

2
samples/Cpp/TestCpp/Classes/ExtensionsTest/ArmatureTest/ArmatureScene.cpp
View File

@ -112,8 +112,6 @@ void ArmatureTestScene::runThisTest()
} }
void ArmatureTestScene::MainMenuCallback(CCObject* pSender) void ArmatureTestScene::MainMenuCallback(CCObject* pSender)
{ {
TestScene::MainMenuCallback(pSender);
removeAllChildren(); removeAllChildren();
CCArmatureDataManager::sharedArmatureDataManager()->purgeArmatureSystem(); CCArmatureDataManager::sharedArmatureDataManager()->purgeArmatureSystem();
} }

57
samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.cpp
View File

@ -7,8 +7,8 @@
#include "NetworkTest/HttpClientTest.h" #include "NetworkTest/HttpClientTest.h"
#endif #endif
#include "TableViewTest/TableViewTestScene.h" #include "TableViewTest/TableViewTestScene.h"
#include "ArmatureTest/ArmatureScene.h"
#include "ComponentsTest/ComponentsTestScene.h" #include "ComponentsTest/ComponentsTestScene.h"
#include "ArmatureTest/ArmatureScene.h"
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) || (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) #if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID) || (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32)
#include "NetworkTest/WebSocketTest.h" #include "NetworkTest/WebSocketTest.h"
@ -57,6 +57,13 @@ static struct {
#endif #endif
{ "TableViewTest", [](CCObject *sender){ runTableViewTest();} { "TableViewTest", [](CCObject *sender){ runTableViewTest();}
}, },
{ "CommponentTest", [](CCObject *sender) { runComponentsTestLayerTest(); }
},
{ "ArmatureTest", [](CCObject *sender) { ArmatureTestScene *pScene = new ArmatureTestScene();
pScene->runThisTest();
pScene->release();
}
},
}; };
static const int g_maxTests = sizeof(g_extensionsTests) / sizeof(g_extensionsTests[0]); static const int g_maxTests = sizeof(g_extensionsTests) / sizeof(g_extensionsTests[0]);
@ -66,64 +73,24 @@ static const int g_maxTests = sizeof(g_extensionsTests) / sizeof(g_extensionsTes
// ExtensionsMainLayer // ExtensionsMainLayer
// //
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////
static CCPoint s_tCurPos = CCPointZero;
void ExtensionsMainLayer::onEnter() void ExtensionsMainLayer::onEnter()
{ {
CCLayer::onEnter(); CCLayer::onEnter();
CCSize s = CCDirector::sharedDirector()->getWinSize(); CCSize s = CCDirector::sharedDirector()->getWinSize();
m_pItemMenu = CCMenu::create(); CCMenu* pMenu = CCMenu::create();
m_pItemMenu->setPosition( CCPointZero ); pMenu->setPosition( CCPointZero );
CCMenuItemFont::setFontName("Arial"); CCMenuItemFont::setFontName("Arial");
CCMenuItemFont::setFontSize(24); CCMenuItemFont::setFontSize(24);
for (int i = 0; i < g_maxTests; ++i) for (int i = 0; i < g_maxTests; ++i)
{ {
CCMenuItemFont* pItem = CCMenuItemFont::create(g_extensionsTests[i].name, g_extensionsTests[i].callback); CCMenuItemFont* pItem = CCMenuItemFont::create(g_extensionsTests[i].name, g_extensionsTests[i].callback);
pItem->setPosition(ccp(s.width / 2, s.height - (i + 1) * LINE_SPACE)); pItem->setPosition(ccp(s.width / 2, s.height - (i + 1) * LINE_SPACE));
m_pItemMenu->addChild(pItem, kItemTagBasic + i); pMenu->addChild(pItem, kItemTagBasic + i);
}
setTouchEnabled(true);
addChild(m_pItemMenu);
}
void ExtensionsMainLayer::ccTouchesBegan(CCSet *pTouches, CCEvent *pEvent)
{
CCSetIterator it = pTouches->begin();
CCTouch* touch = (CCTouch*)(*it);
m_tBeginPos = touch->getLocation();
}
void ExtensionsMainLayer::ccTouchesMoved(CCSet *pTouches, CCEvent *pEvent)
{
CCSetIterator it = pTouches->begin();
CCTouch* touch = (CCTouch*)(*it);
CCPoint touchLocation = touch->getLocation();
float nMoveY = touchLocation.y - m_tBeginPos.y;
CCPoint curPos = m_pItemMenu->getPosition();
CCPoint nextPos = ccp(curPos.x, curPos.y + nMoveY);
if (nextPos.y < 0.0f)
{
m_pItemMenu->setPosition(CCPointZero);
return;
} }
if (nextPos.y > ((TEST_MAX_COUNT + 1)* LINE_SPACE - VisibleRect::getVisibleRect().size.height)) addChild(pMenu);
{
m_pItemMenu->setPosition(ccp(0, ((TEST_MAX_COUNT + 1)* LINE_SPACE - VisibleRect::getVisibleRect().size.height)));
return;
}
m_pItemMenu->setPosition(nextPos);
m_tBeginPos = touchLocation;
s_tCurPos = nextPos;
} }
//////////////////////////////////////////////////////// ////////////////////////////////////////////////////////

5
samples/Cpp/TestCpp/Classes/ExtensionsTest/ExtensionsTest.h
View File

@ -7,11 +7,6 @@ class ExtensionsMainLayer : public CCLayer
{ {
public: public:
virtual void onEnter(); virtual void onEnter();
virtual void ccTouchesBegan(CCSet *pTouches, CCEvent *pEvent);
virtual void ccTouchesMoved(CCSet *pTouches, CCEvent *pEvent);
private:
CCPoint m_tBeginPos;
CCMenu* m_pItemMenu;
}; };
class ExtensionsTestScene : public TestScene class ExtensionsTestScene : public TestScene

2
samples/Cpp/TestCpp/proj.ios/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
b9541b02e155ec9f3c7c9a241697f058edd4820f b6c5b5f817aad6604c73f09eca6f352ccd4b9c29

2
samples/Cpp/TestCpp/proj.mac/TestCpp.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +1 @@
51b5fe73603097107dc665678709aaf6234d5627 ec3006faae4bdf182f2133fcfdfe0bca17b46393

63
samples/Javascript/TestJavascript/proj.ios/TestJavascript.xcodeproj/project.xcworkspace/xcshareddata/TestJavascript.xccheckout Normal file
View File

@ -0,0 +1,63 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>IDESourceControlProjectIdentifier</key>
<string>0B98B4D8-828E-460D-817C-495BE3652AD5</string>
<key>IDESourceControlProjectName</key>
<string>TestJavascript</string>
<key>IDESourceControlProjectOriginsDictionary</key>
<dict>
<key>5B0F35E6-1A4B-4F3D-A082-C30150726270</key>
<string>git://github.com/folecr/cocos2dx-autogen-bindings.git</string>
<key>D2399FF0-C90F-4E4F-8E8D-F9BE2AA9DC5A</key>
<string>https://github.com/minggo/cocos2d-x.git</string>
<key>E0C8B176-3A21-43EF-A355-D004DE1F4825</key>
<string>https://github.com/minggo/cocos2d-js-tests.git</string>
</dict>
<key>IDESourceControlProjectPath</key>
<string>samples/Javascript/TestJavascript/proj.ios/TestJavascript.xcodeproj/project.xcworkspace</string>
<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
<dict>
<key>5B0F35E6-1A4B-4F3D-A082-C30150726270</key>
<string>../../../../../../scripting/javascript/bindings/generated</string>
<key>D2399FF0-C90F-4E4F-8E8D-F9BE2AA9DC5A</key>
<string>../../../../../..</string>
<key>E0C8B176-3A21-43EF-A355-D004DE1F4825</key>
<string>../../../../Shared</string>
</dict>
<key>IDESourceControlProjectURL</key>
<string>https://github.com/minggo/cocos2d-x.git</string>
<key>IDESourceControlProjectVersion</key>
<integer>110</integer>
<key>IDESourceControlProjectWCCIdentifier</key>
<string>D2399FF0-C90F-4E4F-8E8D-F9BE2AA9DC5A</string>
<key>IDESourceControlProjectWCConfigurations</key>
<array>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
<string>D2399FF0-C90F-4E4F-8E8D-F9BE2AA9DC5A</string>
<key>IDESourceControlWCCName</key>
<string>cocos2d-x</string>
</dict>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
<string>E0C8B176-3A21-43EF-A355-D004DE1F4825</string>
<key>IDESourceControlWCCName</key>
<string>Shared</string>
</dict>
<dict>
<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
<string>public.vcs.git</string>
<key>IDESourceControlWCCIdentifierKey</key>
<string>5B0F35E6-1A4B-4F3D-A082-C30150726270</string>
<key>IDESourceControlWCCName</key>
<string>generated</string>
</dict>
</array>
</dict>
</plist>

1335
samples/Lua/HelloLua/proj.ios/HelloLua.xcodeproj/project.pbxproj Normal file
View File

File diff suppressed because it is too large Load Diff

1
samples/Lua/HelloLua/proj.ios/HelloLua.xcodeproj/project.pbxproj.REMOVED.git-id
View File

@ -1 +0,0 @@
476f55876013878f570b5d75d1c8742ddfe96b72