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

Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20_optimize_data 

Conflicts:
	cocos2dx/shaders/CCGLProgram.cpp
This commit is contained in:
James Chen 2012-04-16 12:45:47 +08:00
parent 9ace0d2fdc 3a7fed9089
commit a71e5be0d8
28 changed files with 328 additions and 265 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HelloLua/Classes/AppDelegate.cpp
View File

@ -96,7 +96,7 @@ bool AppDelegate::applicationDidFinishLaunching()
// pDirector->enableRetinaDisplay(true);
// turn on display FPS
pDirector->setDisplayFPS(true);
pDirector->setDisplayStats(true);
// pDirector->setDeviceOrientation(kCCDeviceOrientationLandscapeLeft);
@ -125,7 +125,7 @@ bool AppDelegate::applicationDidFinishLaunching()
#endif
#if (CC_TARGET_PLATFORM == CC_PLATFORM_WIN32) || (CC_TARGET_PLATFORM == CC_PLATFORM_IOS) || (CC_TARGET_PLATFORM == CC_PLATFORM_MARMALADE)
string path = CCFileUtils::fullPathFromRelativePath("hello.lua");
std::string path = CCFileUtils::fullPathFromRelativePath("hello.lua");
pEngine->addSearchPath(path.substr(0, path.find_last_of("/")).c_str());
pEngine->executeScriptFile(path.c_str());
#endif

2
HelloLua/win32/HelloLua.win32.vcproj
View File

@ -49,7 +49,7 @@
<Tool
Name="VCCLCompilerTool"
Optimization="0"
AdditionalIncludeDirectories="..\Classes;&quot;$(SolutionDir)\lua\cocos2dx_support&quot;;&quot;$(SolutionDir)\lua\CocosDenshion_support&quot;;&quot;$(SolutionDir)\lua\lua&quot;;&quot;$(SolutionDir)\lua\tolua&quot;;&quot;$(SolutionDir)\lua\src&quot;;.;&quot;$(SolutionDir)\cocos2dx&quot;;&quot;$(SolutionDir)\cocos2dx\include&quot;;&quot;$(SolutionDir)\cocos2dx\platform&quot;;&quot;$(SolutionDir)\cocos2dx\platform\third_party\win32\OGLES&quot;;&quot;$(SolutionDir)\CocosDenshion\Include&quot;"
AdditionalIncludeDirectories="..\Classes;&quot;$(SolutionDir)\lua\cocos2dx_support&quot;;&quot;$(SolutionDir)\lua\CocosDenshion_support&quot;;&quot;$(SolutionDir)\lua\lua&quot;;&quot;$(SolutionDir)\lua\tolua&quot;;&quot;$(SolutionDir)\lua\src&quot;;.;&quot;$(SolutionDir)\cocos2dx&quot;;&quot;$(SolutionDir)\cocos2dx\include&quot;;&quot;$(SolutionDir)\cocos2dx\platform&quot;;&quot;$(SolutionDir)\cocos2dx\platform\third_party\win32\OGLES&quot;;&quot;$(SolutionDir)\CocosDenshion\Include&quot;;&quot;$(SolutionDir)\cocos2dx\kazmath\include&quot;"
PreprocessorDefinitions="WIN32;_WINDOWS;STRICT;_DEBUG;COCOS2D_DEBUG=1"
MinimalRebuild="true"
BasicRuntimeChecks="3"

4
HelloLua/win32/HelloLua.win32.vcxproj
View File

@ -64,7 +64,7 @@
</Midl>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\Classes;$(SolutionDir)\lua\cocos2dx_support;$(SolutionDir)\lua\CocosDenshion_support;$(SolutionDir)\lua\lua;$(SolutionDir)\lua\tolua;.;$(SolutionDir)\cocos2dx;$(SolutionDir)\cocos2dx\include;$(SolutionDir)\cocos2dx\platform;$(SolutionDir)\cocos2dx\platform\third_party\win32\OGLES;$(SolutionDir)\CocosDenshion\Include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\Classes;$(SolutionDir)\lua\cocos2dx_support;$(SolutionDir)\lua\CocosDenshion_support;$(SolutionDir)\lua\lua;$(SolutionDir)\lua\tolua;.;$(SolutionDir)\cocos2dx;$(SolutionDir)\cocos2dx\include;$(SolutionDir)\cocos2dx\platform;$(SolutionDir)\cocos2dx\platform\third_party\win32\OGLES;$(SolutionDir)\CocosDenshion\Include;$(SolutionDir)cocos2dx\kazmath\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_WINDOWS;STRICT;_DEBUG;COCOS2D_DEBUG=1;ENABLE_LUA;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -81,7 +81,7 @@
<AdditionalIncludeDirectories>$(IntDir);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ResourceCompile>
<Link>
<AdditionalDependencies>libcocos2d.lib;libCocosDenshion.lib;libgles_cm.lib;liblua.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libcocos2d.lib;libCocosDenshion.lib;liblua.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
<SubSystem>Windows</SubSystem>

2
HelloWorld/Classes/AppDelegate.cpp
View File

@ -96,7 +96,7 @@ bool AppDelegate::applicationDidFinishLaunching() {
pDirector->setOpenGLView(&CCEGLView::sharedOpenGLView());
// enable High Resource Mode(2x, such as iphone4) and maintains low resource on other devices.
// pDirector->enableRetinaDisplay(true);
// pDirector->enableRetinaDisplay(true);
// turn on display FPS
pDirector->setDisplayStats(true);

4
HelloWorld/win32/HelloWorld.win32.vcxproj
View File

@ -54,7 +54,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)cocos2dx\platform;$(SolutionDir)cocos2dx\include;$(SolutionDir)cocos2dx;$(SolutionDir)cocos2dx\platform\third_party\win32\OGLES;..\Classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)cocos2dx\platform;$(SolutionDir)cocos2dx\include;$(SolutionDir)cocos2dx;$(SolutionDir)cocos2dx\platform\third_party\win32\OGLES;..\Classes;$(SolutionDir)cocos2dx\kazmath\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -81,7 +81,7 @@
<ClCompile>
<Optimization>MaxSpeed</Optimization>
<IntrinsicFunctions>true</IntrinsicFunctions>
<AdditionalIncludeDirectories>$(SolutionDir)cocos2dx\platform;$(SolutionDir)cocos2dx\include;$(SolutionDir)cocos2dx;$(SolutionDir)cocos2dx\platform\third_party\win32\OGLES;..\Classes;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)cocos2dx\platform;$(SolutionDir)cocos2dx\include;$(SolutionDir)cocos2dx;$(SolutionDir)cocos2dx\platform\third_party\win32\OGLES;..\Classes;$(SolutionDir)cocos2dx\kazmath\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<FunctionLevelLinking>true</FunctionLevelLinking>

2
chipmunk/proj.win32/chipmunk.win32.vcxproj
View File

@ -120,6 +120,7 @@
<ClCompile Include="..\src\cpArbiter.c" />
<ClCompile Include="..\src\cpArray.c" />
<ClCompile Include="..\src\cpBB.c" />
<ClCompile Include="..\src\cpBBTree.c" />
<ClCompile Include="..\src\cpBody.c" />
<ClCompile Include="..\src\cpCollision.c" />
<ClCompile Include="..\src\constraints\cpConstraint.c" />
@ -141,6 +142,7 @@
<ClCompile Include="..\src\cpSpaceHash.c" />
<ClCompile Include="..\src\cpSpaceQuery.c" />
<ClCompile Include="..\src\cpSpaceStep.c" />
<ClCompile Include="..\src\cpSpatialIndex.c" />
<ClCompile Include="..\src\cpVect.c" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

6
chipmunk/proj.win32/chipmunk.win32.vcxproj.filters
View File

@ -178,5 +178,11 @@
<ClCompile Include="..\src\cpVect.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\src\cpBBTree.c">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\src\cpSpatialIndex.c">
<Filter>src</Filter>
</ClCompile>
</ItemGroup>
</Project>

36
cocos2dx/include/CCTexture2D.h
View File

@ -127,10 +127,10 @@ public:
*/
/** Initializes a texture from a UIImage object */
bool initWithImage(CCImage * uiImage);
bool initWithImage(CCImage *uiImage, ccResolutionType resolution);
bool initWithImage(CCImage * uiImage);
bool initWithImage(CCImage *uiImage, ccResolutionType resolution);
/**
Extensions to make it easy to create a CCTexture2D object from a string of text.
Note that the generated textures are of type A8 - use the blending mode (GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA).
@ -241,24 +241,24 @@ private:
/** texture max T */
CC_PROPERTY(GLfloat, m_fMaxT, MaxT)
/** content size */
CC_PROPERTY_READONLY(CCSize, m_tContentSize, ContentSize)
CC_PROPERTY_READONLY(CCSize, m_tContentSize, ContentSize)
/** whether or not the texture has their Alpha premultiplied */
CC_PROPERTY_READONLY(bool, m_bHasPremultipliedAlpha, HasPremultipliedAlpha);
/** shader program used by drawAtPoint and drawInRect */
CC_PROPERTY(CCGLProgram*, m_pShaderProgram, ShaderProgram);
/** Returns the resolution type of the texture.
Is it a RetinaDisplay texture, an iPad texture or an standard texture ?
Only valid on iOS. Not valid on OS X.
Should be a readonly property. It is readwrite as a hack.
@since v1.1
*/
CC_SYNTHESIZE(ccResolutionType, m_eResolutionType, ResolutionType);
/** shader program used by drawAtPoint and drawInRect */
CC_PROPERTY(CCGLProgram*, m_pShaderProgram, ShaderProgram);
/** Returns the resolution type of the texture.
Is it a RetinaDisplay texture, an iPad texture or an standard texture ?
Only valid on iOS. Not valid on OS X.
Should be a readonly property. It is readwrite as a hack.
@since v1.1
*/
CC_SYNTHESIZE(ccResolutionType, m_eResolutionType, ResolutionType);
};
}//namespace cocos2d

2
cocos2dx/label_nodes/CCLabelTTF.cpp
View File

@ -113,7 +113,7 @@ bool CCLabelTTF::initWithString(const char *label, const char *fontName, float f
CC_SAFE_DELETE(m_pFontName);
m_pFontName = new std::string(fontName);
m_fFontSize = fontSize;
m_fFontSize = fontSize * CC_CONTENT_SCALE_FACTOR();
this->setString(label);
return true;
}

9
cocos2dx/proj.ios/libcocos2dx-Prefix.pch Normal file
View File

@ -0,0 +1,9 @@
//
// Prefix header for all source files of the 'libcocos2dx' target in the 'libcocos2dx' project
//
#ifdef __OBJC__
#import <Foundation/Foundation.h>
#endif
//#import "cocos2d.h"

1
cocos2dx/proj.ios/libcocos2dx.xcodeproj/project.pbxproj.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
1ff6aa7eb0f4aaec98e1cd7655f5794b78a60bb5

46
cocos2dx/proj.win32/cocos2d-win32.vcxproj
View File

@ -57,7 +57,7 @@
</PreBuildEvent>
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>..\platform;..\platform\third_party\win32\iconv;..\platform\third_party\win32\zlib;..\platform\third_party\win32\libpng;..\platform\third_party\win32\libjpeg;..\platform\third_party\win32\pthread;..\platform\third_party\win32\libxml2;..\platform\third_party\win32\pthread;..\platform\third_party\win32\OGLES;..\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\platform;..\platform\third_party\win32\iconv;..\platform\third_party\win32\zlib;..\platform\third_party\win32\libpng;..\platform\third_party\win32\libjpeg;..\platform\third_party\win32\pthread;..\platform\third_party\win32\libxml2;..\platform\third_party\win32\OGLES;..\include;..;..\kazmath\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -74,7 +74,7 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$
</Command>
</PreLinkEvent>
<Link>
<AdditionalDependencies>libEGL.lib;libgles_cm.lib;libxml2.lib;libzlib.lib;libpng.lib;libjpeg.lib;libiconv.lib;pthreadVCE2.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libEGL.lib;libGLESv2.lib;libxml2.lib;libzlib.lib;libpng.lib;libjpeg.lib;libiconv.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
@ -95,7 +95,7 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$
</Command>
</PreBuildEvent>
<ClCompile>
<AdditionalIncludeDirectories>..\platform;..\platform\third_party\win32\iconv;..\platform\third_party\win32\zlib;..\platform\third_party\win32\libpng;..\platform\third_party\win32\libjpeg;..\platform\third_party\win32\pthread;..\platform\third_party\win32\libxml2;..\platform\third_party\win32\OGLES;..\include;..;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>..\platform;..\platform\third_party\win32\iconv;..\platform\third_party\win32\zlib;..\platform\third_party\win32\libpng;..\platform\third_party\win32\libjpeg;..\platform\third_party\win32\pthread;..\platform\third_party\win32\libxml2;..\platform\third_party\win32\OGLES;..\include;..;..\kazmath\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;COCOS2DXWIN32_EXPORTS;GL_GLEXT_PROTOTYPES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
<PrecompiledHeader>
@ -110,7 +110,7 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$
</Command>
</PreLinkEvent>
<Link>
<AdditionalDependencies>libEGL.lib;libgles_cm.lib;libxml2.lib;libzlib.lib;libpng.lib;libjpeg.lib;libiconv.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libEGL.lib;libglesv2.lib;libxml2.lib;libzlib.lib;libpng.lib;libjpeg.lib;libiconv.lib;pthreadVCE2.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).dll</OutputFile>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries> ;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
@ -132,6 +132,7 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$
<ClCompile Include="..\cocoa\CCAffineTransform.cpp" />
<ClCompile Include="..\cocoa\CCAutoreleasePool.cpp" />
<ClCompile Include="..\cocoa\CCData.cpp" />
<ClCompile Include="..\cocoa\CCDictionary.cpp" />
<ClCompile Include="..\cocoa\CCGeometry.cpp" />
<ClCompile Include="..\cocoa\CCNS.cpp" />
<ClCompile Include="..\cocoa\CCObject.cpp" />
@ -151,6 +152,19 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$
<ClCompile Include="..\actions\CCActionProgressTimer.cpp" />
<ClCompile Include="..\actions\CCActionTiledGrid.cpp" />
<ClCompile Include="..\extensions\CCNotificationCenter.cpp" />
<ClCompile Include="..\kazmath\src\aabb.c" />
<ClCompile Include="..\kazmath\src\GL\mat4stack.c" />
<ClCompile Include="..\kazmath\src\GL\matrix.c" />
<ClCompile Include="..\kazmath\src\mat3.c" />
<ClCompile Include="..\kazmath\src\mat4.c" />
<ClCompile Include="..\kazmath\src\neon_matrix_impl.c" />
<ClCompile Include="..\kazmath\src\plane.c" />
<ClCompile Include="..\kazmath\src\quaternion.c" />
<ClCompile Include="..\kazmath\src\ray2.c" />
<ClCompile Include="..\kazmath\src\utility.c" />
<ClCompile Include="..\kazmath\src\vec2.c" />
<ClCompile Include="..\kazmath\src\vec3.c" />
<ClCompile Include="..\kazmath\src\vec4.c" />
<ClCompile Include="..\label_nodes\CCLabelAtlas.cpp" />
<ClCompile Include="..\label_nodes\CCLabelBMFont.cpp" />
<ClCompile Include="..\label_nodes\CCLabelTTF.cpp" />
@ -158,16 +172,15 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$
<ClCompile Include="..\layers_scenes_transitions_nodes\CCScene.cpp" />
<ClCompile Include="..\layers_scenes_transitions_nodes\CCTransition.cpp" />
<ClCompile Include="..\layers_scenes_transitions_nodes\CCTransitionPageTurn.cpp" />
<ClCompile Include="..\layers_scenes_transitions_nodes\CCTransitionRadial.cpp" />
<ClCompile Include="..\layers_scenes_transitions_nodes\CCTransitionProgress.cpp" />
<ClCompile Include="..\menu_nodes\CCMenu.cpp" />
<ClCompile Include="..\menu_nodes\CCMenuItem.cpp" />
<ClCompile Include="..\misc_nodes\CCMotionStreak.cpp" />
<ClCompile Include="..\misc_nodes\CCProgressTimer.cpp" />
<ClCompile Include="..\misc_nodes\CCRenderTexture.cpp" />
<ClCompile Include="..\misc_nodes\CCRibbon.cpp" />
<ClCompile Include="..\particle_nodes\CCParticleBatchNode.cpp" />
<ClCompile Include="..\particle_nodes\CCParticleExamples.cpp" />
<ClCompile Include="..\particle_nodes\CCParticleSystem.cpp" />
<ClCompile Include="..\particle_nodes\CCParticleSystemPoint.cpp" />
<ClCompile Include="..\particle_nodes\CCParticleSystemQuad.cpp" />
<ClCompile Include="..\platform\CCCommon.cpp" />
<ClCompile Include="..\platform\CCFileUtils.cpp" />
@ -180,6 +193,10 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$
<ClCompile Include="..\platform\win32\CCAccelerometer_win32.cpp" />
<ClCompile Include="..\platform\win32\CCApplication_win32.cpp" />
<ClCompile Include="..\platform\win32\CCEGLView_win32.cpp" />
<ClCompile Include="..\shaders\CCGLProgram.cpp" />
<ClCompile Include="..\shaders\ccGLStateCache.cpp" />
<ClCompile Include="..\shaders\CCShaderCache.cpp" />
<ClCompile Include="..\shaders\ccShaders.cpp" />
<ClCompile Include="..\sprite_nodes\CCAnimation.cpp" />
<ClCompile Include="..\sprite_nodes\CCAnimationCache.cpp" />
<ClCompile Include="..\sprite_nodes\CCSprite.cpp" />
@ -192,6 +209,7 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$
<ClCompile Include="..\support\CCProfiling.cpp" />
<ClCompile Include="..\support\CCUserDefault.cpp" />
<ClCompile Include="..\support\ccUtils.cpp" />
<ClCompile Include="..\support\CCVertex.cpp" />
<ClCompile Include="..\support\TransformUtils.cpp" />
<ClCompile Include="..\support\image_support\TGAlib.cpp" />
<ClCompile Include="..\support\zip_support\ioapi.cpp" />
@ -328,9 +346,23 @@ xcopy /Y /Q "$(SolutionDir)cocos2dx\platform\third_party\win32\libraries\*.*" "$
<ClInclude Include="..\platform\win32\CCAccelerometer_win32.h" />
<ClInclude Include="..\platform\win32\CCApplication_win32.h" />
<ClInclude Include="..\platform\win32\CCEGLView_win32.h" />
<ClInclude Include="..\shaders\ccShader_PositionColor_frag.h" />
<ClInclude Include="..\shaders\ccShader_PositionColor_vert.h" />
<ClInclude Include="..\shaders\ccShader_PositionTextureA8Color_frag.h" />
<ClInclude Include="..\shaders\ccShader_PositionTextureA8Color_vert.h" />
<ClInclude Include="..\shaders\ccShader_PositionTextureColorAlphaTest_frag.h" />
<ClInclude Include="..\shaders\ccShader_PositionTextureColor_frag.h" />
<ClInclude Include="..\shaders\ccShader_PositionTextureColor_vert.h" />
<ClInclude Include="..\shaders\ccShader_PositionTexture_frag.h" />
<ClInclude Include="..\shaders\ccShader_PositionTexture_uColor_frag.h" />
<ClInclude Include="..\shaders\ccShader_PositionTexture_uColor_vert.h" />
<ClInclude Include="..\shaders\ccShader_PositionTexture_vert.h" />
<ClInclude Include="..\shaders\ccShader_Position_uColor_frag.h" />
<ClInclude Include="..\shaders\ccShader_Position_uColor_vert.h" />
<ClInclude Include="..\support\base64.h" />
<ClInclude Include="..\support\CCProfiling.h" />
<ClInclude Include="..\support\ccUtils.h" />
<ClInclude Include="..\support\CCVertex.h" />
<ClInclude Include="..\support\TransformUtils.h" />
<ClInclude Include="..\support\data_support\ccCArray.h" />
<ClInclude Include="..\support\data_support\uthash.h" />

120
cocos2dx/proj.win32/cocos2d-win32.vcxproj.filters
View File

@ -73,6 +73,12 @@
<Filter Include="extensions">
<UniqueIdentifier>{35a45df9-e7ee-4fba-b38c-7b1369c3385c}</UniqueIdentifier>
</Filter>
<Filter Include="shaders">
<UniqueIdentifier>{39fcf438-a1c0-42d6-ad59-781aeb17e12e}</UniqueIdentifier>
</Filter>
<Filter Include="kazmath">
<UniqueIdentifier>{4550b0c0-b8f8-4eba-b7f5-77ba5c90808f}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\base_nodes\CCAtlasNode.cpp">
@ -165,9 +171,6 @@
<ClCompile Include="..\layers_scenes_transitions_nodes\CCTransitionPageTurn.cpp">
<Filter>layers_scenes_transitions_nodes</Filter>
</ClCompile>
<ClCompile Include="..\layers_scenes_transitions_nodes\CCTransitionRadial.cpp">
<Filter>layers_scenes_transitions_nodes</Filter>
</ClCompile>
<ClCompile Include="..\menu_nodes\CCMenu.cpp">
<Filter>menu_nodes</Filter>
</ClCompile>
@ -183,18 +186,12 @@
<ClCompile Include="..\misc_nodes\CCRenderTexture.cpp">
<Filter>misc_nodes</Filter>
</ClCompile>
<ClCompile Include="..\misc_nodes\CCRibbon.cpp">
<Filter>misc_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\CCParticleSystemPoint.cpp">
<Filter>particle_nodes</Filter>
</ClCompile>
<ClCompile Include="..\particle_nodes\CCParticleSystemQuad.cpp">
<Filter>particle_nodes</Filter>
</ClCompile>
@ -342,6 +339,69 @@
<ClCompile Include="..\extensions\CCNotificationCenter.cpp">
<Filter>extensions</Filter>
</ClCompile>
<ClCompile Include="..\shaders\CCGLProgram.cpp">
<Filter>shaders</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="..\support\CCVertex.cpp">
<Filter>support</Filter>
</ClCompile>
<ClCompile Include="..\cocoa\CCDictionary.cpp">
<Filter>cocoa</Filter>
</ClCompile>
<ClCompile Include="..\kazmath\src\aabb.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\kazmath\src\GL\mat4stack.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\kazmath\src\GL\matrix.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\kazmath\src\mat3.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\kazmath\src\mat4.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\kazmath\src\neon_matrix_impl.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\kazmath\src\plane.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\kazmath\src\quaternion.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\kazmath\src\ray2.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\kazmath\src\utility.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\kazmath\src\vec2.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\kazmath\src\vec3.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\kazmath\src\vec4.c">
<Filter>kazmath</Filter>
</ClCompile>
<ClCompile Include="..\particle_nodes\CCParticleBatchNode.cpp">
<Filter>particle_nodes</Filter>
</ClCompile>
<ClCompile Include="..\layers_scenes_transitions_nodes\CCTransitionProgress.cpp">
<Filter>layers_scenes_transitions_nodes</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\cocoa\CCNS.h">
@ -699,5 +759,47 @@
<ClInclude Include="..\extensions\CCNotificationCenter.h">
<Filter>extensions</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_PositionTextureA8Color_frag.h">
<Filter>shaders</Filter>
</ClInclude>
<ClInclude Include="..\shaders\ccShader_PositionTextureA8Color_vert.h">
<Filter>shaders</Filter>
</ClInclude>
<ClInclude Include="..\shaders\ccShader_PositionTextureColorAlphaTest_frag.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_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_Position_uColor_frag.h">
<Filter>shaders</Filter>
</ClInclude>
<ClInclude Include="..\shaders\ccShader_Position_uColor_vert.h">
<Filter>shaders</Filter>
</ClInclude>
<ClInclude Include="..\support\CCVertex.h">
<Filter>support</Filter>
</ClInclude>
</ItemGroup>
</Project>

20
cocos2dx/sprite_nodes/CCSprite.cpp
View File

@ -585,22 +585,22 @@ void CCSprite::draw(void)
#if CC_SPRITE_DEBUG_DRAW == 1
// draw bounding box
CGPoint vertices[4]={
ccp(quad_.tl.vertices.x,quad_.tl.vertices.y),
ccp(quad_.bl.vertices.x,quad_.bl.vertices.y),
ccp(quad_.br.vertices.x,quad_.br.vertices.y),
ccp(quad_.tr.vertices.x,quad_.tr.vertices.y),
CCPoint vertices[4]={
ccp(m_sQuad.tl.vertices.x,m_sQuad.tl.vertices.y),
ccp(m_sQuad.bl.vertices.x,m_sQuad.bl.vertices.y),
ccp(m_sQuad.br.vertices.x,m_sQuad.br.vertices.y),
ccp(m_sQuad.tr.vertices.x,m_sQuad.tr.vertices.y),
};
ccDrawPoly(vertices, 4, YES);
ccDrawPoly(vertices, 4, true);
#elif CC_SPRITE_DEBUG_DRAW == 2
// draw texture box
CGSize s = self.textureRect.size;
CGPoint offsetPix = self.offsetPosition;
CGPoint vertices[4] = {
CCSize s = this->getTextureRect().size;
CCPoint offsetPix = this->getOffsetPosition();
CCPoint vertices[4] = {
ccp(offsetPix.x,offsetPix.y), ccp(offsetPix.x+s.width,offsetPix.y),
ccp(offsetPix.x+s.width,offsetPix.y+s.height), ccp(offsetPix.x,offsetPix.y+s.height)
};
ccDrawPoly(vertices, 4, YES);
ccDrawPoly(vertices, 4, true);
#endif // CC_SPRITE_DEBUG_DRAW
CC_INCREMENT_GL_DRAWS(1);

7
cocos2dx/textures/CCTexture2D.cpp
View File

@ -114,8 +114,8 @@ GLuint CCTexture2D::getName()
CCSize CCTexture2D::getContentSize()
{
//return m_tContentSize;
CCSize ret;
CCSize ret;
ret.width = m_tContentSize.width / CC_CONTENT_SCALE_FACTOR();
ret.height = m_tContentSize.height / CC_CONTENT_SCALE_FACTOR();
@ -209,6 +209,9 @@ bool CCTexture2D::initWithData(const void *data, CCTexture2DPixelFormat pixelFor
case kCCTexture2DPixelFormat_A8:
glTexImage2D(GL_TEXTURE_2D, 0, GL_ALPHA, (GLsizei)pixelsWide, (GLsizei)pixelsHigh, 0, GL_ALPHA, GL_UNSIGNED_BYTE, data);
break;
case kCCTexture2DPixelFormat_I8:
glTexImage2D(GL_TEXTURE_2D, 0, GL_LUMINANCE, (GLsizei)pixelsWide, (GLsizei)pixelsHigh, 0, GL_LUMINANCE, GL_UNSIGNED_BYTE, data);
break;
default:
CCAssert(0, "NSInternalInconsistencyException");

2
lua/cocos2dx_support/LuaCocos2d.cpp.REMOVED.git-id
View File

@ -1 +1 @@
2d74827a957b6bcc79f46daf5379ed30ac406da7
c686a8f1f350a7e9f6c87b2267268c21e3f676b1

44
tests/test.win32/test.win32.vcxproj
View File

@ -55,7 +55,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
<ClCompile>
<Optimization>Disabled</Optimization>
<AdditionalIncludeDirectories>$(SolutionDir)cocos2dx\platform\third_party\win32;$(SolutionDir)cocos2dx\platform;$(SolutionDir)cocos2dx;$(SolutionDir)cocos2dx\include;$(SolutionDir);$(SolutionDir)chipmunk\include\chipmunk;$(SolutionDir)CocosDenshion\include;..\tests;$(SolutionDir)cocos2dx\platform\third_party\win32\OGLES;..\;.\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(SolutionDir)cocos2dx\platform\third_party\win32;$(SolutionDir)cocos2dx\platform;$(SolutionDir)cocos2dx;$(SolutionDir)cocos2dx\include;$(SolutionDir);$(SolutionDir)chipmunk\include\chipmunk;$(SolutionDir)CocosDenshion\include;..\tests;$(SolutionDir)cocos2dx\platform\third_party\win32\OGLES;..\;.\;$(SolutionDir)cocos2dx\kazmath\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USE_MATH_DEFINES;GL_GLEXT_PROTOTYPES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<MinimalRebuild>true</MinimalRebuild>
<BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
@ -67,7 +67,7 @@
<DisableSpecificWarnings>4251;4244;4996;%(DisableSpecificWarnings)</DisableSpecificWarnings>
</ClCompile>
<Link>
<AdditionalDependencies>libcocos2d.lib;libgles_cm.lib;libBox2d.lib;libchipmunk.lib;libcurl_imp.lib;libCocosDenshion.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalDependencies>libGLESv2.lib;libcocos2d.lib;libBox2d.lib;libchipmunk.lib;libcurl_imp.lib;libCocosDenshion.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(ProjectName).exe</OutputFile>
<AdditionalLibraryDirectories>$(OutDir);%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<GenerateDebugInformation>true</GenerateDebugInformation>
@ -110,6 +110,8 @@
</ItemDefinitionGroup>
<ItemGroup>
<ClCompile Include="..\tests\AccelerometerTest\AccelerometerTest.cpp" />
<ClCompile Include="..\tests\ActionsEaseTest\ActionsEaseTest.cpp" />
<ClCompile Include="..\tests\ActionsProgressTest\ActionsProgressTest.cpp" />
<ClCompile Include="..\tests\BugsTest\Bug-1159.cpp" />
<ClCompile Include="..\tests\BugsTest\Bug-1174.cpp" />
<ClCompile Include="..\tests\BugsTest\Bug-350.cpp" />
@ -121,11 +123,14 @@
<ClCompile Include="..\tests\BugsTest\Bug-899.cpp" />
<ClCompile Include="..\tests\BugsTest\Bug-914.cpp" />
<ClCompile Include="..\tests\BugsTest\BugsTest.cpp" />
<ClCompile Include="..\tests\ChipmunkAccelTouchTest\ChipmunkAccelTouchTest.cpp" />
<ClCompile Include="..\tests\CurrentLanguageTest\CurrentLanguageTest.cpp" />
<ClCompile Include="..\tests\DirectorTest\DirectorTest.cpp" />
<ClCompile Include="..\tests\ExtensionsTest\ExtensionsTest.cpp" />
<ClCompile Include="..\tests\ExtensionsTest\NotificationCenterTest.cpp" />
<ClCompile Include="..\tests\FontTest\FontTest.cpp" />
<ClCompile Include="..\tests\NodeTest\NodeTest.cpp" />
<ClCompile Include="..\tests\ShaderTest\ShaderTest.cpp" />
<ClCompile Include="..\tests\Texture2dTest\Texture2dTest.cpp" />
<ClCompile Include="..\tests\TextureCacheTest\TextureCacheTest.cpp" />
<ClCompile Include="main.cpp" />
@ -134,15 +139,12 @@
<ClCompile Include="..\tests\testBasic.cpp" />
<ClCompile Include="..\tests\ActionsTest\ActionsTest.cpp" />
<ClCompile Include="..\tests\TransitionsTest\TransitionsTest.cpp" />
<ClCompile Include="..\tests\ProgressActionsTest\ProgressActionsTest.cpp" />
<ClCompile Include="..\tests\EffectsTest\EffectsTest.cpp" />
<ClCompile Include="..\tests\ClickAndMoveTest\ClickAndMoveTest.cpp" />
<ClCompile Include="..\tests\RotateWorldTest\RotateWorldTest.cpp" />
<ClCompile Include="..\tests\ParticleTest\ParticleTest.cpp" />
<ClCompile Include="..\tests\EaseActionsTest\EaseActionsTest.cpp" />
<ClCompile Include="..\tests\MotionStreakTest\MotionStreakTest.cpp" />
<ClCompile Include="..\tests\DrawPrimitivesTest\DrawPrimitivesTest.cpp" />
<ClCompile Include="..\tests\CocosNodeTest\CocosNodeTest.cpp" />
<ClCompile Include="..\tests\TouchesTest\Ball.cpp" />
<ClCompile Include="..\tests\TouchesTest\Paddle.cpp" />
<ClCompile Include="..\tests\TouchesTest\TouchesTest.cpp" />
@ -157,27 +159,6 @@
<ClCompile Include="..\tests\SpriteTest\SpriteTest.cpp" />
<ClCompile Include="..\tests\SchedulerTest\SchedulerTest.cpp" />
<ClCompile Include="..\tests\RenderTextureTest\RenderTextureTest.cpp" />
<ClCompile Include="..\tests\ChipmunkTest\Bounce.cpp" />
<ClCompile Include="..\tests\ChipmunkTest\cocos2dChipmunkDemo.cpp" />
<ClCompile Include="..\tests\ChipmunkTest\drawSpace.cpp" />
<ClCompile Include="..\tests\ChipmunkTest\Joints.cpp" />
<ClCompile Include="..\tests\ChipmunkTest\LogoSmash.cpp" />
<ClCompile Include="..\tests\ChipmunkTest\MagnetsElectric.cpp" />
<ClCompile Include="..\tests\ChipmunkTest\OneWay.cpp" />
<ClCompile Include="..\tests\ChipmunkTest\Planet.cpp" />
<ClCompile Include="..\tests\ChipmunkTest\Player.cpp" />
<ClCompile Include="..\tests\ChipmunkTest\Plink.cpp" />
<ClCompile Include="..\tests\ChipmunkTest\Pump.cpp" />
<ClCompile Include="..\tests\ChipmunkTest\PyramidStack.cpp" />
<ClCompile Include="..\tests\ChipmunkTest\PyramidTopple.cpp" />
<ClCompile Include="..\tests\ChipmunkTest\Query.cpp" />
<ClCompile Include="..\tests\ChipmunkTest\Sensors.cpp" />
<ClCompile Include="..\tests\ChipmunkTest\Simple.cpp" />
<ClCompile Include="..\tests\ChipmunkTest\Springies.cpp" />
<ClCompile Include="..\tests\ChipmunkTest\Tank.cpp" />
<ClCompile Include="..\tests\ChipmunkTest\TheoJansen.cpp" />
<ClCompile Include="..\tests\ChipmunkTest\Tumble.cpp" />
<ClCompile Include="..\tests\ChipmunkTest\UnsafeOps.cpp" />
<ClCompile Include="..\tests\Box2DTest\Box2dTest.cpp" />
<ClCompile Include="..\tests\Box2DTestBed\Box2dView.cpp" />
<ClCompile Include="..\tests\Box2DTestBed\GLES-Render.cpp" />
@ -200,6 +181,8 @@
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\tests\AccelerometerTest\AccelerometerTest.h" />
<ClInclude Include="..\tests\ActionsEaseTest\ActionsEaseTest.h" />
<ClInclude Include="..\tests\ActionsProgressTest\ActionsProgressTest.h" />
<ClInclude Include="..\tests\BugsTest\Bug-1159.h" />
<ClInclude Include="..\tests\BugsTest\Bug-1174.h" />
<ClInclude Include="..\tests\BugsTest\Bug-350.h" />
@ -211,11 +194,14 @@
<ClInclude Include="..\tests\BugsTest\Bug-899.h" />
<ClInclude Include="..\tests\BugsTest\Bug-914.h" />
<ClInclude Include="..\tests\BugsTest\BugsTest.h" />
<ClInclude Include="..\tests\ChipmunkAccelTouchTest\ChipmunkAccelTouchTest.h" />
<ClInclude Include="..\tests\CurrentLanguageTest\CurrentLanguageTest.h" />
<ClInclude Include="..\tests\DirectorTest\DirectorTest.h" />
<ClInclude Include="..\tests\ExtensionsTest\ExtensionsTest.h" />
<ClInclude Include="..\tests\ExtensionsTest\NotificationCenterTest.h" />
<ClInclude Include="..\tests\FontTest\FontTest.h" />
<ClInclude Include="..\tests\NodeTest\NodeTest.h" />
<ClInclude Include="..\tests\ShaderTest\ShaderTest.h" />
<ClInclude Include="..\tests\Texture2dTest\Texture2dTest.h" />
<ClInclude Include="..\tests\TextureCacheTest\TextureCacheTest.h" />
<ClInclude Include="main.h" />
@ -226,15 +212,12 @@
<ClInclude Include="..\tests\tests.h" />
<ClInclude Include="..\tests\ActionsTest\ActionsTest.h" />
<ClInclude Include="..\tests\TransitionsTest\TransitionsTest.h" />
<ClInclude Include="..\tests\ProgressActionsTest\ProgressActionsTest.h" />
<ClInclude Include="..\tests\EffectsTest\EffectsTest.h" />
<ClInclude Include="..\tests\ClickAndMoveTest\ClickAndMoveTest.h" />
<ClInclude Include="..\tests\RotateWorldTest\RotateWorldTest.h" />
<ClInclude Include="..\tests\ParticleTest\ParticleTest.h" />
<ClInclude Include="..\tests\EaseActionsTest\EaseActionsTest.h" />
<ClInclude Include="..\tests\MotionStreakTest\MotionStreakTest.h" />
<ClInclude Include="..\tests\DrawPrimitivesTest\DrawPrimitivesTest.h" />
<ClInclude Include="..\tests\CocosNodeTest\CocosNodeTest.h" />
<ClInclude Include="..\tests\TouchesTest\Ball.h" />
<ClInclude Include="..\tests\TouchesTest\Paddle.h" />
<ClInclude Include="..\tests\TouchesTest\TouchesTest.h" />
@ -249,9 +232,6 @@
<ClInclude Include="..\tests\SpriteTest\SpriteTest.h" />
<ClInclude Include="..\tests\SchedulerTest\SchedulerTest.h" />
<ClInclude Include="..\tests\RenderTextureTest\RenderTextureTest.h" />
<ClInclude Include="..\tests\ChipmunkTest\ChipmunkDemo.h" />
<ClInclude Include="..\tests\ChipmunkTest\cocos2dChipmunkDemo.h" />
<ClInclude Include="..\tests\ChipmunkTest\drawSpace.h" />
<ClInclude Include="..\tests\Box2DTest\Box2dTest.h" />
<ClInclude Include="..\tests\Box2DTestBed\Box2dView.h" />
<ClInclude Include="..\tests\Box2DTestBed\GLES-Render.h" />

147
tests/test.win32/test.win32.vcxproj.filters
View File

@ -16,9 +16,6 @@
<Filter Include="classes\tests\TransitionsTest">
<UniqueIdentifier>{fb9689c5-553f-4346-bef7-a105b2ee5712}</UniqueIdentifier>
</Filter>
<Filter Include="classes\tests\ProgressActionsTest">
<UniqueIdentifier>{4d6cf257-1df2-412e-bad2-a86fc8c8c28c}</UniqueIdentifier>
</Filter>
<Filter Include="classes\tests\EffectsTest">
<UniqueIdentifier>{4be7789d-78b1-4840-9662-06db2988f727}</UniqueIdentifier>
</Filter>
@ -31,18 +28,12 @@
<Filter Include="classes\tests\ParticleTest">
<UniqueIdentifier>{905dd2f4-3138-4b3a-84de-63f93ddaa430}</UniqueIdentifier>
</Filter>
<Filter Include="classes\tests\EaseActionsTest">
<UniqueIdentifier>{6f40b1a3-f116-4701-b51f-696e46334da9}</UniqueIdentifier>
</Filter>
<Filter Include="classes\tests\MotionStreakTest">
<UniqueIdentifier>{2afa708f-716d-47d3-9a5c-69444fa853a3}</UniqueIdentifier>
</Filter>
<Filter Include="classes\tests\DrawPrimitivesTest">
<UniqueIdentifier>{e7d5c185-fd12-4e4d-9313-6deb91b05b8d}</UniqueIdentifier>
</Filter>
<Filter Include="classes\tests\CocosNodeTest">
<UniqueIdentifier>{5a7a452a-2040-4f4b-a66d-b29d80c943da}</UniqueIdentifier>
</Filter>
<Filter Include="classes\tests\TouchesTest">
<UniqueIdentifier>{3a0f96fe-ebb1-411d-bb2d-a42be092ca10}</UniqueIdentifier>
</Filter>
@ -79,9 +70,6 @@
<Filter Include="classes\tests\RenderTextureTest">
<UniqueIdentifier>{6669409b-79c8-48af-83cc-705b3149807c}</UniqueIdentifier>
</Filter>
<Filter Include="classes\tests\ChipmunkTest">
<UniqueIdentifier>{472ffce1-9d1f-4d36-931f-5e15dccf0c2e}</UniqueIdentifier>
</Filter>
<Filter Include="classes\tests\Box2dTest">
<UniqueIdentifier>{00685a5b-e6e1-4feb-acbb-2f42842b9ae9}</UniqueIdentifier>
</Filter>
@ -145,6 +133,21 @@
<Filter Include="classes\tests\ExtensionsTest">
<UniqueIdentifier>{cfa9177f-33ea-481d-a0a9-fbcf5463a37a}</UniqueIdentifier>
</Filter>
<Filter Include="classes\tests\ChipmunkAccelTouchTest">
<UniqueIdentifier>{5558c17a-06b8-46c9-a4fb-a4c1d0c1da56}</UniqueIdentifier>
</Filter>
<Filter Include="classes\tests\NodeTest">
<UniqueIdentifier>{5a7a452a-2040-4f4b-a66d-b29d80c943da}</UniqueIdentifier>
</Filter>
<Filter Include="classes\tests\ActionsProgressTest">
<UniqueIdentifier>{4d6cf257-1df2-412e-bad2-a86fc8c8c28c}</UniqueIdentifier>
</Filter>
<Filter Include="classes\tests\ActionsEaseTest">
<UniqueIdentifier>{6f40b1a3-f116-4701-b51f-696e46334da9}</UniqueIdentifier>
</Filter>
<Filter Include="classes\tests\ShaderTest">
<UniqueIdentifier>{7c1797b3-c350-4e3c-a8ff-ec9352af2008}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="main.cpp">
@ -165,9 +168,6 @@
<ClCompile Include="..\tests\TransitionsTest\TransitionsTest.cpp">
<Filter>classes\tests\TransitionsTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ProgressActionsTest\ProgressActionsTest.cpp">
<Filter>classes\tests\ProgressActionsTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\EffectsTest\EffectsTest.cpp">
<Filter>classes\tests\EffectsTest</Filter>
</ClCompile>
@ -180,18 +180,12 @@
<ClCompile Include="..\tests\ParticleTest\ParticleTest.cpp">
<Filter>classes\tests\ParticleTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\EaseActionsTest\EaseActionsTest.cpp">
<Filter>classes\tests\EaseActionsTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\MotionStreakTest\MotionStreakTest.cpp">
<Filter>classes\tests\MotionStreakTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\DrawPrimitivesTest\DrawPrimitivesTest.cpp">
<Filter>classes\tests\DrawPrimitivesTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\CocosNodeTest\CocosNodeTest.cpp">
<Filter>classes\tests\CocosNodeTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\TouchesTest\Ball.cpp">
<Filter>classes\tests\TouchesTest</Filter>
</ClCompile>
@ -234,69 +228,6 @@
<ClCompile Include="..\tests\RenderTextureTest\RenderTextureTest.cpp">
<Filter>classes\tests\RenderTextureTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ChipmunkTest\Bounce.cpp">
<Filter>classes\tests\ChipmunkTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ChipmunkTest\cocos2dChipmunkDemo.cpp">
<Filter>classes\tests\ChipmunkTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ChipmunkTest\drawSpace.cpp">
<Filter>classes\tests\ChipmunkTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ChipmunkTest\Joints.cpp">
<Filter>classes\tests\ChipmunkTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ChipmunkTest\LogoSmash.cpp">
<Filter>classes\tests\ChipmunkTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ChipmunkTest\MagnetsElectric.cpp">
<Filter>classes\tests\ChipmunkTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ChipmunkTest\OneWay.cpp">
<Filter>classes\tests\ChipmunkTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ChipmunkTest\Planet.cpp">
<Filter>classes\tests\ChipmunkTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ChipmunkTest\Player.cpp">
<Filter>classes\tests\ChipmunkTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ChipmunkTest\Plink.cpp">
<Filter>classes\tests\ChipmunkTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ChipmunkTest\Pump.cpp">
<Filter>classes\tests\ChipmunkTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ChipmunkTest\PyramidStack.cpp">
<Filter>classes\tests\ChipmunkTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ChipmunkTest\PyramidTopple.cpp">
<Filter>classes\tests\ChipmunkTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ChipmunkTest\Query.cpp">
<Filter>classes\tests\ChipmunkTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ChipmunkTest\Sensors.cpp">
<Filter>classes\tests\ChipmunkTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ChipmunkTest\Simple.cpp">
<Filter>classes\tests\ChipmunkTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ChipmunkTest\Springies.cpp">
<Filter>classes\tests\ChipmunkTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ChipmunkTest\Tank.cpp">
<Filter>classes\tests\ChipmunkTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ChipmunkTest\TheoJansen.cpp">
<Filter>classes\tests\ChipmunkTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ChipmunkTest\Tumble.cpp">
<Filter>classes\tests\ChipmunkTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ChipmunkTest\UnsafeOps.cpp">
<Filter>classes\tests\ChipmunkTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\Box2DTest\Box2dTest.cpp">
<Filter>classes\tests\Box2dTest</Filter>
</ClCompile>
@ -411,6 +342,21 @@
<ClCompile Include="..\tests\ExtensionsTest\NotificationCenterTest.cpp">
<Filter>classes\tests\ExtensionsTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ChipmunkAccelTouchTest\ChipmunkAccelTouchTest.cpp">
<Filter>classes\tests\ChipmunkAccelTouchTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\NodeTest\NodeTest.cpp">
<Filter>classes\tests\NodeTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ActionsProgressTest\ActionsProgressTest.cpp">
<Filter>classes\tests\ActionsProgressTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ActionsEaseTest\ActionsEaseTest.cpp">
<Filter>classes\tests\ActionsEaseTest</Filter>
</ClCompile>
<ClCompile Include="..\tests\ShaderTest\ShaderTest.cpp">
<Filter>classes\tests\ShaderTest</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="main.h">
@ -437,9 +383,6 @@
<ClInclude Include="..\tests\TransitionsTest\TransitionsTest.h">
<Filter>classes\tests\TransitionsTest</Filter>
</ClInclude>
<ClInclude Include="..\tests\ProgressActionsTest\ProgressActionsTest.h">
<Filter>classes\tests\ProgressActionsTest</Filter>
</ClInclude>
<ClInclude Include="..\tests\EffectsTest\EffectsTest.h">
<Filter>classes\tests\EffectsTest</Filter>
</ClInclude>
@ -452,18 +395,12 @@
<ClInclude Include="..\tests\ParticleTest\ParticleTest.h">
<Filter>classes\tests\ParticleTest</Filter>
</ClInclude>
<ClInclude Include="..\tests\EaseActionsTest\EaseActionsTest.h">
<Filter>classes\tests\EaseActionsTest</Filter>
</ClInclude>
<ClInclude Include="..\tests\MotionStreakTest\MotionStreakTest.h">
<Filter>classes\tests\MotionStreakTest</Filter>
</ClInclude>
<ClInclude Include="..\tests\DrawPrimitivesTest\DrawPrimitivesTest.h">
<Filter>classes\tests\DrawPrimitivesTest</Filter>
</ClInclude>
<ClInclude Include="..\tests\CocosNodeTest\CocosNodeTest.h">
<Filter>classes\tests\CocosNodeTest</Filter>
</ClInclude>
<ClInclude Include="..\tests\TouchesTest\Ball.h">
<Filter>classes\tests\TouchesTest</Filter>
</ClInclude>
@ -506,15 +443,6 @@
<ClInclude Include="..\tests\RenderTextureTest\RenderTextureTest.h">
<Filter>classes\tests\RenderTextureTest</Filter>
</ClInclude>
<ClInclude Include="..\tests\ChipmunkTest\ChipmunkDemo.h">
<Filter>classes\tests\ChipmunkTest</Filter>
</ClInclude>
<ClInclude Include="..\tests\ChipmunkTest\cocos2dChipmunkDemo.h">
<Filter>classes\tests\ChipmunkTest</Filter>
</ClInclude>
<ClInclude Include="..\tests\ChipmunkTest\drawSpace.h">
<Filter>classes\tests\ChipmunkTest</Filter>
</ClInclude>
<ClInclude Include="..\tests\Box2DTest\Box2dTest.h">
<Filter>classes\tests\Box2dTest</Filter>
</ClInclude>
@ -737,5 +665,20 @@
<ClInclude Include="..\tests\ExtensionsTest\NotificationCenterTest.h">
<Filter>classes\tests\ExtensionsTest</Filter>
</ClInclude>
<ClInclude Include="..\tests\ChipmunkAccelTouchTest\ChipmunkAccelTouchTest.h">
<Filter>classes\tests\ChipmunkAccelTouchTest</Filter>
</ClInclude>
<ClInclude Include="..\tests\NodeTest\NodeTest.h">
<Filter>classes\tests\NodeTest</Filter>
</ClInclude>
<ClInclude Include="..\tests\ActionsProgressTest\ActionsProgressTest.h">
<Filter>classes\tests\ActionsProgressTest</Filter>
</ClInclude>
<ClInclude Include="..\tests\ActionsEaseTest\ActionsEaseTest.h">
<Filter>classes\tests\ActionsEaseTest</Filter>
</ClInclude>
<ClInclude Include="..\tests\ShaderTest\ShaderTest.h">
<Filter>classes\tests\ShaderTest</Filter>
</ClInclude>
</ItemGroup>
</Project>

21
tools/tolua++/CCDirector.pkg
View File

@ -1,31 +1,18 @@
typedef enum {
/// Device oriented vertically, home button on the bottom
kCCDeviceOrientationPortrait = 0, // UIDeviceOrientationPortrait,
/// Device oriented vertically, home button on the top
kCCDeviceOrientationPortraitUpsideDown = 1, // UIDeviceOrientationPortraitUpsideDown,
/// Device oriented horizontally, home button on the right
kCCDeviceOrientationLandscapeLeft = 2, // UIDeviceOrientationLandscapeLeft,
/// Device oriented horizontally, home button on the left
kCCDeviceOrientationLandscapeRight = 3, // UIDeviceOrientationLandscapeRight,
} ccDeviceOrientation;
class CCDirector : public CCObject
{
CCScene* getRunningScene(void);
double getAnimationInterval(void);
bool isDisplayFPS(void);
void setDisplayFPS(bool bDisplayFPS);
bool isDisplayStats(void);
void setDisplayStats(bool bDisplayFPS);
bool isRetinaDisplay();
bool isPaused(void);
unsigned int getFrames(void);
CCSize getWinSize(void);
CCSize getWinSizeInPixels(void);
CCSize getDisplaySizeInPixels(void);
CCPoint convertToGL(CCPoint obPoint);
CCPoint convertToUI(CCPoint obPoint);
@ -35,9 +22,7 @@ class CCDirector : public CCObject
void popScene(void);
void replaceScene(CCScene *pScene);
CGFloat getContentScaleFactor(void);
int getDeviceOrientation();
CCFloat getContentScaleFactor(void);
static CCDirector* sharedDirector(void);
};

2
tools/tolua++/CCLayer.pkg
View File

@ -32,7 +32,7 @@ class CCLayerColor : public CCLayer
void setBlendFunc(ccBlendFunc Value);
ccBlendFunc getBlendFunc(void);
static CCLayerColor * layerWithColorWidthHeight(ccColor4B color, GLfloat width, GLfloat height);
static CCLayerColor * layerWithColor(ccColor4B color, GLfloat width, GLfloat height);
static CCLayerColor * layerWithColor(ccColor4B color);
};

4
tools/tolua++/CCMenu.pkg
View File

@ -1,9 +1,9 @@
/*
enum {
//* priority used by the menu
kCCMenuTouchPriority = -128,
};
*/
class CCMenu : public CCLayer
{
void alignItemsVertically();

12
tools/tolua++/CCMenuItem.pkg
View File

@ -29,7 +29,7 @@ class CCMenuItemLabel : public CCMenuItem
class CCMenuItemAtlasFont : public CCMenuItem
{
static CCMenuItemAtlasFont* itemFromString(const char* value,
static CCMenuItemAtlasFont* itemWithString(const char* value,
const char* charMapFile,
int itemWidth,
int itemHeight,
@ -42,7 +42,7 @@ class CCMenuItemFont : public CCMenuItem
static int fontSize();
static void setFontName(const char* name);
static const char* fontName();
static CCMenuItemFont * itemFromString(const char* value);
static CCMenuItemFont * itemWithString(const char* value);
};
class CCMenuItemSprite : public CCMenuItem
@ -52,9 +52,9 @@ class CCMenuItemSprite : public CCMenuItem
void setOpacity(GLubyte opacity);
GLubyte getOpacity();
static CCMenuItemSprite * itemFromNormalSprite(CCNode* normalSprite,
static CCMenuItemSprite * itemWithNormalSprite(CCNode* normalSprite,
CCNode* selectedSprite);
static CCMenuItemSprite * itemFromNormalSprite(CCNode* normalSprite,
static CCMenuItemSprite * itemWithNormalSprite(CCNode* normalSprite,
CCNode* selectedSprite,
CCNode* disabledSprite);
};
@ -66,9 +66,9 @@ class CCMenuItemImage : public CCMenuItem
void setOpacity(GLubyte opacity);
GLubyte getOpacity();
static CCMenuItemImage* itemFromNormalImage(const char* normalImage,
static CCMenuItemImage* itemWithNormalImage(const char* normalImage,
const char* selectedImage);
static CCMenuItemImage* itemFromNormalImage(const char* normalImage,
static CCMenuItemImage* itemWithNormalImage(const char* normalImage,
const char* selectedImage,
const char* disabledImage);
};

8
tools/tolua++/CCNode.pkg
View File

@ -53,15 +53,15 @@ class CCNode : public CCObject
tolua_property__CCContentSize CCSize contentSize;
tolua_property__CCTag int tag;
CCMutableArray<CCNode*>* getChildren();
CCArray* getChildren();
unsigned int getChildrenCount(void);
CCCamera* getCamera();
CCGridBase* getGrid();
void setGrid(CCGridBase* pGrid);
CCPoint getAnchorPointInPixels();
CCSize getContentSizeInPixels();
void setContentSizeInPixels(CCSize sz);
//CCPoint getAnchorPointInPixels();
//CCSize getContentSizeInPixels();
//void setContentSizeInPixels(CCSize sz);
bool getIsRunning();
CCNode* getParent();
void setParent(CCNode * var);

28
tools/tolua++/CCSprite.pkg
View File

@ -1,4 +1,4 @@
/*
typedef enum {
//! Translate with it's parent
CC_HONOR_PARENT_TRANSFORM_TRANSLATE = 1 << 0,
@ -13,7 +13,7 @@ typedef enum {
CC_HONOR_PARENT_TRANSFORM_ALL = CC_HONOR_PARENT_TRANSFORM_TRANSLATE | CC_HONOR_PARENT_TRANSFORM_ROTATE | CC_HONOR_PARENT_TRANSFORM_SCALE | CC_HONOR_PARENT_TRANSFORM_SKEW,
} ccHonorParentTransform;
*/
class CCSprite : public CCNode
{
void setDirty(bool bDirty);
@ -22,22 +22,22 @@ class CCSprite : public CCNode
ccV3F_C4B_T2F_Quad getQuad(void);
CCRect getTextureRect(void);
bool isUsesBatchNode(void);
//bool isUsesBatchNode(void);
bool isTextureRectRotated(void);
void setAtlasIndex(unsigned int uAtlasIndex);
unsigned int getAtlasIndex(void);
void setUsesSpriteBatchNode(bool bUsesSpriteBatchNode);
//void setUsesSpriteBatchNode(bool bUsesSpriteBatchNode);
void setTextureAtlas(CCTextureAtlas *pobTextureAtlas);
CCTextureAtlas* getTextureAtlas(void);
void setSpriteBatchNode(CCSpriteBatchNode *pobSpriteBatchNode);
CCSpriteBatchNode* getSpriteBatchNode(void);
void setHonorParentTransform(ccHonorParentTransform eHonorParentTransform);
ccHonorParentTransform getHonorParentTransform(void);
//void setSpriteBatchNode(CCSpriteBatchNode *pobSpriteBatchNode);
//CCSpriteBatchNode* getSpriteBatchNode(void);
//void setHonorParentTransform(ccHonorParentTransform eHonorParentTransform);
//ccHonorParentTransform getHonorParentTransform(void);
void setBlendFunc(ccBlendFunc blendFunc);
ccBlendFunc getBlendFunc(void);
CCPoint getOffsetPositionInPixels(void);
//CCPoint getOffsetPositionInPixels(void);
void setDirtyRecursively(bool bValue);
void setIsRelativeAnchorPoint(bool bRelative);
@ -61,13 +61,13 @@ class CCSprite : public CCNode
CCTexture2D* getTexture(void);
void updateTransform(void);
void useSelfRender(void);
//void useSelfRender(void);
void setTextureRect(CCRect rect);
void setTextureRectInPixels(CCRect rect, bool rotated, CCSize size);
void useBatchNode(CCSpriteBatchNode *batchNode);
//void setTextureRectInPixels(CCRect rect, bool rotated, CCSize size);
//void useBatchNode(CCSpriteBatchNode *batchNode);
void setDisplayFrame(CCSpriteFrame *pNewFrame);
bool isFrameDisplayed(CCSpriteFrame *pFrame);
CCSpriteFrame* displayedFrame(void);
//CCSpriteFrame* displayedFrame(void);
void setDisplayFrameWithAnimationName(const char *animationName, int frameIndex);
static CCSprite* spriteWithTexture(CCTexture2D *pTexture);
@ -77,5 +77,5 @@ class CCSprite : public CCNode
static CCSprite* spriteWithSpriteFrameName(const char *pszSpriteFrameName);
static CCSprite* spriteWithFile(const char *pszFileName);
static CCSprite* spriteWithFile(const char *pszFileName, CCRect rect);
static CCSprite* spriteWithBatchNode(CCSpriteBatchNode *batchNode, CCRect rect);
//static CCSprite* spriteWithBatchNode(CCSpriteBatchNode *batchNode, CCRect rect);
};

4
tools/tolua++/CCSpriteFrameCache.pkg
View File

@ -1,7 +1,7 @@
class CCSpriteFrameCache : public CCObject
{
void addSpriteFramesWithDictionary(CCDictionary<std::string, CCObject*> *pobDictionary, CCTexture2D *pobTexture);
//void addSpriteFramesWithDictionary(CCDictionary<std::string, CCObject*> *pobDictionary, CCTexture2D *pobTexture);
void addSpriteFramesWithFile(const char *pszPlist);
void addSpriteFramesWithFile(const char* plist, const char* textureFileName);
void addSpriteFramesWithFile(const char *pszPlist, CCTexture2D *pobTexture);
@ -11,7 +11,7 @@ class CCSpriteFrameCache : public CCObject
void removeUnusedSpriteFrames(void);
void removeSpriteFrameByName(const char *pszName);
void removeSpriteFramesFromFile(const char* plist);
void removeSpriteFramesFromDictionary(CCDictionary<std::string, CCSpriteFrame*> *dictionary);
//void removeSpriteFramesFromDictionary(CCDictionary<std::string, CCSpriteFrame*> *dictionary);
void removeSpriteFramesFromTexture(CCTexture2D* texture);
CCSpriteFrame* spriteFrameByName(const char *pszName);

4
tools/tolua++/CCTransition.pkg
View File

@ -144,7 +144,7 @@ class CCTransitionFadeDown : public CCScene
{
static CCTransitionFadeDown* transitionWithDuration(ccTime t, CCScene* scene);
};
/*
class CCTransitionRadialCCW : public CCScene
{
static CCTransitionRadialCCW* transitionWithDuration(ccTime t, CCScene* scene);
@ -154,7 +154,7 @@ class CCTransitionRadialCW : public CCScene
{
static CCTransitionRadialCW* transitionWithDuration(ccTime t, CCScene* scene);
};
*/
class CCTransitionPageTurn : public CCScene
{
CCActionInterval* actionWithSize(ccGridSize vector);

50
tools/tolua++/Cocos2d.pkg
View File

@ -1,17 +1,17 @@
$#include "LuaCocos2d.h"
$pfile "CCAction.pkg"
$pfile "CCActionCamera.pkg"
$pfile "CCActionEase.pkg"
$pfile "CCActionGrid.pkg"
$pfile "CCActionGrid3D.pkg"
$pfile "CCActionManager.pkg"
$pfile "CCActionPageTurn3D.pkg"
$pfile "CCActionTiledGrid.pkg"
$pfile "CCAffineTransform.pkg"
$pfile "CCAnimation.pkg"
$pfile "CCAnimationCache.pkg"
//$pfile "CCAction.pkg"
//$pfile "CCActionCamera.pkg"
//$pfile "CCActionEase.pkg"
//$pfile "CCActionGrid.pkg"
//$pfile "CCActionGrid3D.pkg"
//$pfile "CCActionManager.pkg"
//$pfile "CCActionPageTurn3D.pkg"
//$pfile "CCActionTiledGrid.pkg"
//$pfile "CCAffineTransform.pkg"
//$pfile "CCAnimation.pkg"
//$pfile "CCAnimationCache.pkg"
$pfile "CCApplication.pkg"
$pfile "CCArray.pkg"
$pfile "CCAtlasNode.pkg"
@ -27,21 +27,21 @@ $pfile "CCLabelTTF.pkg"
$pfile "CCLayer.pkg"
$pfile "CCMenu.pkg"
$pfile "CCMenuItem.pkg"
$pfile "CCMotionStreak.pkg"
$pfile "CCMutableArray.pkg"
$pfile "CCMutableDictionary.pkg"
//$pfile "CCMotionStreak.pkg"
//$pfile "CCMutableArray.pkg"
//$pfile "CCMutableDictionary.pkg"
$pfile "CCNode.pkg"
$pfile "CCObject.pkg"
$pfile "CCParallaxNode.pkg"
$pfile "CCParticleSystem.pkg"
//$pfile "CCParticleSystem.pkg"
$pfile "CCPointExtension.pkg"
$pfile "CCProgressTimer.pkg"
$pfile "CCRenderTexture.pkg"
$pfile "CCRibbon.pkg"
//$pfile "CCProgressTimer.pkg"
//$pfile "CCRenderTexture.pkg"
//$pfile "CCRibbon.pkg"
$pfile "CCScene.pkg"
$pfile "CCScheduler.pkg"
//$pfile "CCScheduler.pkg"
$pfile "CCSprite.pkg"
$pfile "CCSpriteBatchNode.pkg"
//$pfile "CCSpriteBatchNode.pkg"
$pfile "CCSpriteFrame.pkg"
$pfile "CCSpriteFrameCache.pkg"
$pfile "CCString.pkg"
@ -50,11 +50,11 @@ $pfile "CCTexture2D.pkg"
$pfile "CCTextureAtlas.pkg"
$pfile "CCTextureCache.pkg"
$pfile "CCTileMapAtlas.pkg"
$pfile "CCTMXLayer.pkg"
$pfile "CCTMXObjectGroup.pkg"
$pfile "CCTMXTiledMap.pkg"
$pfile "CCTMXXMLParser.pkg"
$pfile "CCTouch.pkg"
//$pfile "CCTMXLayer.pkg"
//$pfile "CCTMXObjectGroup.pkg"
//$pfile "CCTMXTiledMap.pkg"
//$pfile "CCTMXXMLParser.pkg"
//$pfile "CCTouch.pkg"
$pfile "CCTransition.pkg"
$pfile "ccTypes.pkg"
$pfile "CCUserDefault.pkg"

2
tools/tolua++/build.xml
View File

@ -59,7 +59,7 @@ TOLUA_API int tolua_Cocos2d_open (lua_State* tolua_S);]]></replacetoken>
#include "LuaCocos2d.h"
#include "tolua_fix.h"
#include "cocos2d.h"
#include "CCRibbon.h"
//#include "CCRibbon.h"
#include "SimpleAudioEngine.h"
using namespace cocos2d;