mirror of https://github.com/axmolengine/axmol.git
Merge remote-tracking branch 'upstream/v3' into refactor5183
This commit is contained in:
andyque
commit
634fea7c45
3
AUTHORS
3
AUTHORS
|
|
@ -858,6 +858,9 @@ Developers:
|
|||
|
||||
NatWeiss
|
||||
Fix compilation error using arch i386
|
||||
|
||||
favorcode
|
||||
Correct some doxygen comment
|
||||
|
||||
Retired Core Developers:
|
||||
WenSheng Yang
|
||||
|
|
|
|||
|
|
@ -1,5 +1,12 @@
|
|||
cocos2d-x-3.1 ???
|
||||
cocos2d-x-3.1 May.24 2014
|
||||
[FIX] Label: may crash when using outline effect
|
||||
[FIX] Label: using outline and invoking 'Director::setContentScaleFactor' cause label show nothing
|
||||
[FIX] ProgressTo: will start from 0 when it reaches 100
|
||||
[FIX] Physics integration: may crashes if remove bodies at physics contact callback
|
||||
[FIX] UIWidget: copyProperties() lost copy some properties
|
||||
[FIX] WP8: orientation is not correct when it is set to portrait
|
||||
[FIX] WP8: fix for precompiled shaders and precompiled headers
|
||||
[FIX] WP8: template supports orientation
|
||||
|
||||
cocos2d-x-3.1-rc0 May.18 2014
|
||||
[NEW] Cocos2dxActivity: Adds a virtual method to load native libraries.
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio 2013
|
||||
VisualStudioVersion = 12.0.30324.0
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
# Visual Studio 2012
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libcocos2d", "..\cocos\2d\cocos2d_wp8.vcxproj", "{B5AF91B3-64EA-44E1-84B0-D759E93758FB}"
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libSpine", "..\cocos\editor-support\spine\proj.wp8\libSpine.vcxproj", "{7D4FC6EB-9497-4804-98F3-3EAEDC896154}"
|
||||
|
|
@ -46,9 +44,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cpp-tests", "..\tests\cpp-t
|
|||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-testsComponent", "..\tests\cpp-tests\proj.wp8-xaml\cpp-testsComponent\cpp-testsComponent.vcxproj", "{86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{271FEE84-9198-4C26-8567-4247C563B0B1} = {271FEE84-9198-4C26-8567-4247C563B0B1}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libNetwork", "..\cocos\network\proj.wp8\libNetwork.vcxproj", "{7DAA99E7-8E07-4FEF-8374-8EC04E395D2E}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
|
|
@ -63,9 +58,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cpp-empty-test", "..\tests\
|
|||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cpp-empty-testComponent", "..\tests\cpp-empty-test\proj-wp8-xaml\cpp-empty-testComponent\cpp-empty-testComponent.vcxproj", "{F5D665F8-AE19-4F3F-99A7-230A1E8305D2}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{271FEE84-9198-4C26-8567-4247C563B0B1} = {271FEE84-9198-4C26-8567-4247C563B0B1}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGUI", "..\cocos\ui\proj.wp8\libGUI.vcxproj", "{08FB23E4-1517-4EDC-B682-DA238CDAA83D}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
|
|
@ -73,6 +65,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libGUI", "..\cocos\ui\proj.
|
|||
EndProjectSection
|
||||
EndProject
|
||||
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CopyTemplateFiles", "..\cocos\platform\wp8-xaml\CopyTemplateFiles.vcxproj", "{271FEE84-9198-4C26-8567-4247C563B0B1}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{5921FE12-7EF3-4847-8453-42EF286DDBE7} = {5921FE12-7EF3-4847-8453-42EF286DDBE7}
|
||||
{60D53713-1675-4466-81DC-D67A031C3D21} = {60D53713-1675-4466-81DC-D67A031C3D21}
|
||||
{86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9} = {86B2C23C-3A6C-4C4E-AB0E-16A8CC1523E9}
|
||||
{F5D665F8-AE19-4F3F-99A7-230A1E8305D2} = {F5D665F8-AE19-4F3F-99A7-230A1E8305D2}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
|
|
|
|||
|
|
@ -85,6 +85,8 @@
|
|||
15C90B4A18E66C2B00D69802 /* tp.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB118DA8B6C00F6518C /* tp.lua */; };
|
||||
15C90B4B18E66C2F00D69802 /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB218DA8B6C00F6518C /* url.lua */; };
|
||||
15C90B4C18E66C3100D69802 /* url.lua in Resources */ = {isa = PBXBuildFile; fileRef = 1503FAB218DA8B6C00F6518C /* url.lua */; };
|
||||
15E66FC8192D957100C20A52 /* Sprite3DTest in Resources */ = {isa = PBXBuildFile; fileRef = 3E92EA841921A7720094CD21 /* Sprite3DTest */; };
|
||||
15E66FD6192DC8C700C20A52 /* Sprite3DTest in Resources */ = {isa = PBXBuildFile; fileRef = 3E92EA841921A7720094CD21 /* Sprite3DTest */; };
|
||||
1A0EE2A118CDF6DA004CD58F /* libchipmunk Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB41807A4F9005B8026 /* libchipmunk Mac.a */; };
|
||||
1A0EE2A218CDF6DA004CD58F /* libcocos2dx Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB01807A4F9005B8026 /* libcocos2dx Mac.a */; };
|
||||
1A0EE2A418CDF6DA004CD58F /* libCocosDenshion Mac.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 46A15FB81807A4F9005B8026 /* libCocosDenshion Mac.a */; };
|
||||
|
|
@ -4020,11 +4022,6 @@
|
|||
isa = PBXProject;
|
||||
attributes = {
|
||||
LastUpgradeCheck = 0510;
|
||||
TargetAttributes = {
|
||||
1ABCA2CC18CD93580087CE3A = {
|
||||
DevelopmentTeam = NQ596S94Q5;
|
||||
};
|
||||
};
|
||||
};
|
||||
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "cocos2d_tests" */;
|
||||
compatibilityVersion = "Xcode 3.2";
|
||||
|
|
@ -4286,6 +4283,7 @@
|
|||
isa = PBXResourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
15E66FD6192DC8C700C20A52 /* Sprite3DTest in Resources */,
|
||||
1AC35DC318CEE65100F37B72 /* Misc in Resources */,
|
||||
1AC35DC618CEE65100F37B72 /* Shaders in Resources */,
|
||||
1AC35DBB18CEE65100F37B72 /* components in Resources */,
|
||||
|
|
@ -4354,6 +4352,7 @@
|
|||
isa = PBXResourcesBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
15E66FC8192D957100C20A52 /* Sprite3DTest in Resources */,
|
||||
15C90B4418E66C1800D69802 /* mime.lua in Resources */,
|
||||
15C90B4C18E66C3100D69802 /* url.lua in Resources */,
|
||||
1AC35DD618CEE65200F37B72 /* Misc in Resources */,
|
||||
|
|
@ -5423,14 +5422,12 @@
|
|||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
CODE_SIGN_IDENTITY = "iPhone Developer";
|
||||
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
|
||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||
"$(inherited)",
|
||||
CC_TARGET_OS_IPHONE,
|
||||
);
|
||||
INFOPLIST_FILE = "$(SRCROOT)/../tests/lua-tests/project/proj.ios_mac/ios/Info.plist";
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
|
||||
PROVISIONING_PROFILE = "";
|
||||
SDKROOT = iphoneos;
|
||||
TARGETED_DEVICE_FAMILY = "1,2";
|
||||
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto";
|
||||
|
|
@ -5441,14 +5438,12 @@
|
|||
isa = XCBuildConfiguration;
|
||||
buildSettings = {
|
||||
CODE_SIGN_IDENTITY = "iPhone Developer";
|
||||
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
|
||||
GCC_PREPROCESSOR_DEFINITIONS = (
|
||||
"$(inherited)",
|
||||
CC_TARGET_OS_IPHONE,
|
||||
);
|
||||
INFOPLIST_FILE = "$(SRCROOT)/../tests/lua-tests/project/proj.ios_mac/ios/Info.plist";
|
||||
IPHONEOS_DEPLOYMENT_TARGET = 5.1.1;
|
||||
PROVISIONING_PROFILE = "";
|
||||
SDKROOT = iphoneos;
|
||||
TARGETED_DEVICE_FAMILY = "1,2";
|
||||
USER_HEADER_SEARCH_PATHS = "$(inherited) $(SRCROOT)/.. $(SRCROOT)/../cocos/platform/ios $(SRCROOT)/../external $(SRCROOT)/../external/lua/luajit/include $(SRCROOT)/../external/lua/tolua $(SRCROOT)/../cocos/scripting/lua-bindings/manual $(SRCROOT)/../cocos/scripting/lua-bindings/auto";
|
||||
|
|
|
|||
|
|
@ -69,8 +69,8 @@ FontAtlas * FontAtlasCache::getFontAtlasTTF(const TTFConfig & config)
|
|||
|
||||
if ( it == _atlasMap.end() )
|
||||
{
|
||||
auto font = FontFreeType::create(config.fontFilePath, fontSize * contentScaleFactor, config.glyphs,
|
||||
config.customGlyphs,useDistanceField,config.outlineSize * contentScaleFactor);
|
||||
auto font = FontFreeType::create(config.fontFilePath, fontSize, config.glyphs,
|
||||
config.customGlyphs, useDistanceField, config.outlineSize);
|
||||
if (font)
|
||||
{
|
||||
auto tempAtlas = font->createFontAtlas();
|
||||
|
|
|
|||
|
|
@ -27,7 +27,7 @@ THE SOFTWARE.
|
|||
|
||||
#include <stdio.h>
|
||||
#include <algorithm>
|
||||
|
||||
#include "base/CCDirector.h"
|
||||
#include "base/ccUTF8.h"
|
||||
#include "platform/CCFileUtils.h"
|
||||
#include "edtaa3func.h"
|
||||
|
|
@ -102,6 +102,7 @@ FontFreeType::FontFreeType(bool distanceFieldEnabled /* = false */,int outline /
|
|||
{
|
||||
if (_outlineSize > 0)
|
||||
{
|
||||
_outlineSize *= CC_CONTENT_SCALE_FACTOR();
|
||||
FT_Stroker_New(FontFreeType::getFTLibrary(), &_stroker);
|
||||
FT_Stroker_Set(_stroker,
|
||||
(int)(_outlineSize * 64),
|
||||
|
|
@ -142,7 +143,7 @@ bool FontFreeType::createFontObject(const std::string &fontName, int fontSize)
|
|||
|
||||
// set the requested font size
|
||||
int dpi = 72;
|
||||
int fontSizePoints = (int)(64.f * fontSize);
|
||||
int fontSizePoints = (int)(64.f * fontSize * CC_CONTENT_SCALE_FACTOR());
|
||||
if (FT_Set_Char_Size(face, fontSizePoints, fontSizePoints, dpi, dpi))
|
||||
return false;
|
||||
|
||||
|
|
@ -286,8 +287,6 @@ unsigned char* FontFreeType::getGlyphBitmap(unsigned short theChar, long &outWid
|
|||
auto copyBitmap = new unsigned char[outWidth * outHeight];
|
||||
memcpy(copyBitmap,ret,outWidth * outHeight * sizeof(unsigned char));
|
||||
|
||||
long bitmapWidth;
|
||||
long bitmapHeight;
|
||||
FT_BBox bbox;
|
||||
auto outlineBitmap = getGlyphBitmapWithOutline(theChar,bbox);
|
||||
if(outlineBitmap == nullptr)
|
||||
|
|
@ -297,42 +296,47 @@ unsigned char* FontFreeType::getGlyphBitmap(unsigned short theChar, long &outWid
|
|||
break;
|
||||
}
|
||||
|
||||
bitmapWidth = (bbox.xMax - bbox.xMin)>>6;
|
||||
bitmapHeight = (bbox.yMax - bbox.yMin)>>6;
|
||||
auto outlineWidth = (bbox.xMax - bbox.xMin)>>6;
|
||||
auto outlineHeight = (bbox.yMax - bbox.yMin)>>6;
|
||||
|
||||
long index;
|
||||
auto blendImage = new unsigned char[bitmapWidth * bitmapHeight * 2];
|
||||
memset(blendImage, 0, bitmapWidth * bitmapHeight * 2);
|
||||
for (int x = 0; x < bitmapWidth; ++x)
|
||||
auto blendWidth = outlineWidth > outWidth ? outlineWidth : outWidth;
|
||||
auto blendHeight = outlineHeight > outHeight ? outlineHeight : outHeight;
|
||||
|
||||
long index,index2;
|
||||
auto blendImage = new unsigned char[blendWidth * blendHeight * 2];
|
||||
memset(blendImage, 0, blendWidth * blendHeight * 2);
|
||||
|
||||
auto px = (blendWidth - outlineWidth) / 2;
|
||||
auto py = (blendHeight - outlineHeight) / 2;
|
||||
for (int x = 0; x < outlineWidth; ++x)
|
||||
{
|
||||
for (int y = 0; y < bitmapHeight; ++y)
|
||||
for (int y = 0; y < outlineHeight; ++y)
|
||||
{
|
||||
index = x + ( y * bitmapWidth );
|
||||
blendImage[2 * index] = outlineBitmap[index];
|
||||
index = px + x + ( (py + y) * blendWidth );
|
||||
index2 = x + (y * outlineWidth);
|
||||
blendImage[2 * index] = outlineBitmap[index2];
|
||||
}
|
||||
}
|
||||
|
||||
long maxX = outWidth + _outlineSize;
|
||||
long maxY = outHeight + _outlineSize;
|
||||
for (int x = _outlineSize; x < maxX; ++x)
|
||||
px = (blendWidth - outWidth) / 2;
|
||||
py = (blendHeight - outHeight) / 2;
|
||||
for (int x = 0; x < outWidth; ++x)
|
||||
{
|
||||
for (int y = _outlineSize; y < maxY; ++y)
|
||||
for (int y = 0; y < outHeight; ++y)
|
||||
{
|
||||
index = x + ( y * bitmapWidth );
|
||||
|
||||
blendImage[2 * index + 1] = copyBitmap[outWidth * (y - _outlineSize) + x - _outlineSize];
|
||||
index = px + x + ( (y + py) * blendWidth );
|
||||
index2 = x + (y * outWidth);
|
||||
blendImage[2 * index + 1] = copyBitmap[index2];
|
||||
}
|
||||
}
|
||||
|
||||
outRect.origin.x = bbox.xMin >> 6;
|
||||
outRect.origin.y = - (bbox.yMax >> 6);
|
||||
|
||||
xAdvance += bitmapWidth - outRect.size.width;
|
||||
|
||||
outRect.size.width = bitmapWidth;
|
||||
outRect.size.height = bitmapHeight;
|
||||
outWidth = bitmapWidth;
|
||||
outHeight = bitmapHeight;
|
||||
xAdvance += 2 * _outlineSize;
|
||||
outRect.size.width = blendWidth;
|
||||
outRect.size.height = blendHeight;
|
||||
outWidth = blendWidth;
|
||||
outHeight = blendHeight;
|
||||
|
||||
delete [] outlineBitmap;
|
||||
delete [] copyBitmap;
|
||||
|
|
|
|||
|
|
@ -58,7 +58,7 @@ public:
|
|||
static void shutdownFreeType();
|
||||
|
||||
bool isDistanceFieldEnabled() const { return _distanceFieldEnabled;}
|
||||
int getOutlineSize() const { return _outlineSize; }
|
||||
float getOutlineSize() const { return _outlineSize; }
|
||||
void renderCharAt(unsigned char *dest,int posX, int posY, unsigned char* bitmap,long bitmapWidth,long bitmapHeight);
|
||||
|
||||
virtual FontAtlas * createFontAtlas() override;
|
||||
|
|
@ -89,7 +89,7 @@ private:
|
|||
FT_Stroker _stroker;
|
||||
std::string _fontName;
|
||||
bool _distanceFieldEnabled;
|
||||
int _outlineSize;
|
||||
float _outlineSize;
|
||||
};
|
||||
|
||||
NS_CC_END
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ const BlendFunc &LabelBMFont::getBlendFunc() const
|
|||
return _label->getBlendFunc();
|
||||
}
|
||||
|
||||
Node* LabelBMFont::getChildByTag(int tag)
|
||||
Node* LabelBMFont::getChildByTag(int tag) const
|
||||
{
|
||||
return _label->getLetter(tag);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -115,7 +115,7 @@ public:
|
|||
virtual const BlendFunc &getBlendFunc() const override;
|
||||
|
||||
virtual Sprite * getLetter(int ID);
|
||||
virtual Node * getChildByTag(int tag) override;
|
||||
virtual Node * getChildByTag(int tag) const override;
|
||||
|
||||
virtual void setColor(const Color3B& color) override;
|
||||
|
||||
|
|
|
|||
|
|
@ -718,7 +718,7 @@ void Node::childrenAlloc(void)
|
|||
_children.reserve(4);
|
||||
}
|
||||
|
||||
Node* Node::getChildByTag(int tag)
|
||||
Node* Node::getChildByTag(int tag) const
|
||||
{
|
||||
CCASSERT( tag != Node::INVALID_TAG, "Invalid tag");
|
||||
|
||||
|
|
|
|||
|
|
@ -643,7 +643,7 @@ public:
|
|||
*
|
||||
* @return a Node object whose tag equals to the input parameter
|
||||
*/
|
||||
virtual Node * getChildByTag(int tag);
|
||||
virtual Node * getChildByTag(int tag) const;
|
||||
/**
|
||||
* Returns the array of the node's children
|
||||
*
|
||||
|
|
|
|||
|
|
@ -265,6 +265,18 @@
|
|||
</ImportGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="..\..\external\ConvertUTF\ConvertUTF.c">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</CompileAsWinRT>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
|
||||
|
|
@ -278,34 +290,33 @@
|
|||
<ClCompile Include="..\..\external\unzip\ioapi.cpp" />
|
||||
<ClCompile Include="..\..\external\unzip\unzip.cpp" />
|
||||
<ClCompile Include="..\..\external\xxhash\xxhash.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsWinRT>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
|
||||
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</ForcedIncludeFiles>
|
||||
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
</ForcedIncludeFiles>
|
||||
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
|
||||
</ForcedIncludeFiles>
|
||||
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
|
||||
</ForcedIncludeFiles>
|
||||
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
</ForcedIncludeFiles>
|
||||
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
</ForcedIncludeFiles>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">true</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</CompileAsWinRT>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\3d\CCMesh.cpp" />
|
||||
<ClCompile Include="..\3d\CCObjLoader.cpp" />
|
||||
<ClCompile Include="..\3d\CCSprite3D.cpp" />
|
||||
<ClCompile Include="..\3d\CCSprite3DDataCache.cpp" />
|
||||
<ClCompile Include="..\base\atitc.cpp" />
|
||||
<ClCompile Include="..\base\base64.cpp" />
|
||||
<ClCompile Include="..\base\CCAutoreleasePool.cpp" />
|
||||
<ClCompile Include="..\base\ccCArray.cpp" />
|
||||
<ClCompile Include="..\base\CCConfiguration.cpp" />
|
||||
<ClCompile Include="..\base\CCConsole.cpp" />
|
||||
<ClCompile Include="..\base\CCData.cpp" />
|
||||
|
|
@ -326,15 +337,30 @@
|
|||
<ClCompile Include="..\base\CCEventListenerTouch.cpp" />
|
||||
<ClCompile Include="..\base\CCEventMouse.cpp" />
|
||||
<ClCompile Include="..\base\CCEventTouch.cpp" />
|
||||
<ClCompile Include="..\base\ccFPSImages.c">
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">CompileAsCpp</CompileAs>
|
||||
<CompileAs Condition="'$(Configuration)|$(Platform)'=='Release|x64'">CompileAsCpp</CompileAs>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\base\CCIMEDispatcher.cpp" />
|
||||
<ClCompile Include="..\base\CCNS.cpp" />
|
||||
<ClCompile Include="..\base\CCProfiling.cpp" />
|
||||
<ClCompile Include="..\base\CCRef.cpp" />
|
||||
<ClCompile Include="..\base\CCScheduler.cpp" />
|
||||
<ClCompile Include="..\base\CCScriptSupport.cpp" />
|
||||
<ClCompile Include="..\base\CCTouch.cpp" />
|
||||
<ClCompile Include="..\base\ccTypes.cpp" />
|
||||
<ClCompile Include="..\base\CCUserDefault.cpp" />
|
||||
<ClCompile Include="..\base\CCUserDefaultAndroid.cpp" />
|
||||
<ClCompile Include="..\base\ccUTF8.cpp" />
|
||||
<ClCompile Include="..\base\ccUtils.cpp" />
|
||||
<ClCompile Include="..\base\CCValue.cpp" />
|
||||
<ClCompile Include="..\base\etc1.cpp" />
|
||||
<ClCompile Include="..\base\s3tc.cpp" />
|
||||
<ClCompile Include="..\base\TGAlib.cpp" />
|
||||
<ClCompile Include="..\base\ZipUtils.cpp" />
|
||||
<ClCompile Include="..\cocos2d.cpp" />
|
||||
<ClCompile Include="..\deprecated\CCArray.cpp" />
|
||||
|
|
@ -345,13 +371,14 @@
|
|||
<ClCompile Include="..\deprecated\CCString.cpp" />
|
||||
<ClCompile Include="..\math\CCAffineTransform.cpp" />
|
||||
<ClCompile Include="..\math\CCGeometry.cpp" />
|
||||
<ClCompile Include="..\math\CCVertex.cpp" />
|
||||
<ClCompile Include="..\math\Mat4.cpp" />
|
||||
<ClCompile Include="..\math\MathUtil.cpp" />
|
||||
<ClCompile Include="..\math\Matrix.cpp" />
|
||||
<ClCompile Include="..\math\Quaternion.cpp" />
|
||||
<ClCompile Include="..\math\TransformUtils.cpp" />
|
||||
<ClCompile Include="..\math\Vector2.cpp" />
|
||||
<ClCompile Include="..\math\Vector3.cpp" />
|
||||
<ClCompile Include="..\math\Vector4.cpp" />
|
||||
<ClCompile Include="..\math\Vec2.cpp" />
|
||||
<ClCompile Include="..\math\Vec3.cpp" />
|
||||
<ClCompile Include="..\math\Vec4.cpp" />
|
||||
<ClCompile Include="..\physics\CCPhysicsBody.cpp" />
|
||||
<ClCompile Include="..\physics\CCPhysicsContact.cpp" />
|
||||
<ClCompile Include="..\physics\CCPhysicsJoint.cpp" />
|
||||
|
|
@ -362,6 +389,32 @@
|
|||
<ClCompile Include="..\physics\chipmunk\CCPhysicsJointInfo_chipmunk.cpp" />
|
||||
<ClCompile Include="..\physics\chipmunk\CCPhysicsShapeInfo_chipmunk.cpp" />
|
||||
<ClCompile Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.cpp" />
|
||||
<ClCompile Include="..\platform\CCFileUtils.cpp" />
|
||||
<ClCompile Include="..\platform\CCGLViewProtocol.cpp" />
|
||||
<ClCompile Include="..\platform\CCImage.cpp" />
|
||||
<ClCompile Include="..\platform\CCSAXParser.cpp" />
|
||||
<ClCompile Include="..\platform\CCThread.cpp" />
|
||||
<ClCompile Include="..\platform\winrt\CCApplication.cpp" />
|
||||
<ClCompile Include="..\platform\winrt\CCCommon.cpp" />
|
||||
<ClCompile Include="..\platform\winrt\CCDevice.cpp" />
|
||||
<ClCompile Include="..\platform\winrt\CCFileUtilsWinRT.cpp" />
|
||||
<ClCompile Include="..\platform\winrt\CCFreeTypeFont.cpp" />
|
||||
<ClCompile Include="..\platform\winrt\CCGLView.cpp" />
|
||||
<ClCompile Include="..\platform\winrt\CCPrecompiledShaders.cpp" />
|
||||
<ClCompile Include="..\platform\winrt\CCPThreadWinRT.cpp" />
|
||||
<ClCompile Include="..\platform\winrt\CCStdC.cpp" />
|
||||
<ClCompile Include="..\platform\winrt\CCWinRTUtils.cpp" />
|
||||
<ClCompile Include="..\platform\winrt\DirectXBase.cpp" />
|
||||
<ClCompile Include="..\platform\winrt\InputEvent.cpp" />
|
||||
<ClCompile Include="..\platform\winrt\pch.cpp">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\platform\winrt\sha1.cpp" />
|
||||
<ClCompile Include="..\renderer\CCBatchCommand.cpp" />
|
||||
<ClCompile Include="..\renderer\CCCustomCommand.cpp" />
|
||||
<ClCompile Include="..\renderer\CCGLProgram.cpp" />
|
||||
|
|
@ -370,10 +423,14 @@
|
|||
<ClCompile Include="..\renderer\CCGLProgramStateCache.cpp" />
|
||||
<ClCompile Include="..\renderer\ccGLStateCache.cpp" />
|
||||
<ClCompile Include="..\renderer\CCGroupCommand.cpp" />
|
||||
<ClCompile Include="..\renderer\CCMeshCommand.cpp" />
|
||||
<ClCompile Include="..\renderer\CCQuadCommand.cpp" />
|
||||
<ClCompile Include="..\renderer\CCRenderCommand.cpp" />
|
||||
<ClCompile Include="..\renderer\CCRenderer.cpp" />
|
||||
<ClCompile Include="..\renderer\ccShaders.cpp" />
|
||||
<ClCompile Include="..\renderer\CCTexture2D.cpp" />
|
||||
<ClCompile Include="..\renderer\CCTextureAtlas.cpp" />
|
||||
<ClCompile Include="..\renderer\CCTextureCache.cpp" />
|
||||
<ClCompile Include="CCAction.cpp" />
|
||||
<ClCompile Include="CCActionCamera.cpp" />
|
||||
<ClCompile Include="CCActionCatmullRom.cpp" />
|
||||
|
|
@ -390,7 +447,6 @@
|
|||
<ClCompile Include="CCAnimation.cpp" />
|
||||
<ClCompile Include="CCAnimationCache.cpp" />
|
||||
<ClCompile Include="CCAtlasNode.cpp" />
|
||||
<ClCompile Include="ccCArray.cpp" />
|
||||
<ClCompile Include="CCClippingNode.cpp" />
|
||||
<ClCompile Include="CCComponent.cpp" />
|
||||
<ClCompile Include="CCComponentContainer.cpp" />
|
||||
|
|
@ -402,36 +458,9 @@
|
|||
<ClCompile Include="CCFontCharMap.cpp" />
|
||||
<ClCompile Include="CCFontFNT.cpp" />
|
||||
<ClCompile Include="CCFontFreeType.cpp" />
|
||||
<ClCompile Include="ccFPSImages.c">
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</CompileAsWinRT>
|
||||
<CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</CompileAsWinRT>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">NotUsing</PrecompiledHeader>
|
||||
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
</ForcedIncludeFiles>
|
||||
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
</ForcedIncludeFiles>
|
||||
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
|
||||
</ForcedIncludeFiles>
|
||||
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
|
||||
</ForcedIncludeFiles>
|
||||
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
|
||||
</ForcedIncludeFiles>
|
||||
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
|
||||
</ForcedIncludeFiles>
|
||||
</ClCompile>
|
||||
<ClCompile Include="CCGLBufferedNode.cpp" />
|
||||
<ClCompile Include="CCGrabber.cpp" />
|
||||
<ClCompile Include="CCGrid.cpp" />
|
||||
<ClCompile Include="CCNodeGrid.cpp" />
|
||||
<ClCompile Include="CCIMEDispatcher.cpp" />
|
||||
<ClCompile Include="CCLabel.cpp" />
|
||||
<ClCompile Include="CCLabelAtlas.cpp" />
|
||||
<ClCompile Include="CCLabelBMFont.cpp" />
|
||||
|
|
@ -442,6 +471,7 @@
|
|||
<ClCompile Include="CCMenuItem.cpp" />
|
||||
<ClCompile Include="CCMotionStreak.cpp" />
|
||||
<ClCompile Include="CCNode.cpp" />
|
||||
<ClCompile Include="CCNodeGrid.cpp" />
|
||||
<ClCompile Include="CCParallaxNode.cpp" />
|
||||
<ClCompile Include="CCParticleBatchNode.cpp" />
|
||||
<ClCompile Include="CCParticleExamples.cpp" />
|
||||
|
|
@ -450,15 +480,11 @@
|
|||
<ClCompile Include="CCProgressTimer.cpp" />
|
||||
<ClCompile Include="CCRenderTexture.cpp" />
|
||||
<ClCompile Include="CCScene.cpp" />
|
||||
<ClCompile Include="CCScriptSupport.cpp" />
|
||||
<ClCompile Include="CCSprite.cpp" />
|
||||
<ClCompile Include="CCSpriteBatchNode.cpp" />
|
||||
<ClCompile Include="CCSpriteFrame.cpp" />
|
||||
<ClCompile Include="CCSpriteFrameCache.cpp" />
|
||||
<ClCompile Include="CCTextFieldTTF.cpp" />
|
||||
<ClCompile Include="CCTexture2D.cpp" />
|
||||
<ClCompile Include="CCTextureAtlas.cpp" />
|
||||
<ClCompile Include="CCTextureCache.cpp" />
|
||||
<ClCompile Include="CCTileMapAtlas.cpp" />
|
||||
<ClCompile Include="CCTMXLayer.cpp" />
|
||||
<ClCompile Include="CCTMXObjectGroup.cpp" />
|
||||
|
|
@ -468,37 +494,6 @@
|
|||
<ClCompile Include="CCTransitionPageTurn.cpp" />
|
||||
<ClCompile Include="CCTransitionProgress.cpp" />
|
||||
<ClCompile Include="CCTweenFunction.cpp" />
|
||||
<ClCompile Include="CCUserDefault.cpp" />
|
||||
<ClCompile Include="ccUTF8.cpp" />
|
||||
<ClCompile Include="ccUtils.cpp" />
|
||||
<ClCompile Include="CCVertex.cpp" />
|
||||
<ClCompile Include="platform\CCGLViewProtocol.cpp" />
|
||||
<ClCompile Include="platform\CCFileUtils.cpp" />
|
||||
<ClCompile Include="platform\CCImage.cpp" />
|
||||
<ClCompile Include="platform\CCSAXParser.cpp" />
|
||||
<ClCompile Include="platform\CCThread.cpp" />
|
||||
<ClCompile Include="platform\winrt\CCApplication.cpp" />
|
||||
<ClCompile Include="platform\winrt\CCCommon.cpp" />
|
||||
<ClCompile Include="platform\winrt\CCDevice.cpp" />
|
||||
<ClCompile Include="platform\winrt\CCFileUtilsWinRT.cpp" />
|
||||
<ClCompile Include="platform\winrt\CCFreeTypeFont.cpp" />
|
||||
<ClCompile Include="platform\winrt\CCGLView.cpp" />
|
||||
<ClCompile Include="platform\winrt\CCPrecompiledShaders.cpp" />
|
||||
<ClCompile Include="platform\winrt\CCPThreadWinRT.cpp" />
|
||||
<ClCompile Include="platform\winrt\CCStdC.cpp" />
|
||||
<ClCompile Include="platform\winrt\CCWinRTUtils.cpp" />
|
||||
<ClCompile Include="platform\winrt\DirectXBase.cpp" />
|
||||
<ClCompile Include="platform\winrt\InputEvent.cpp" />
|
||||
<ClCompile Include="platform\winrt\pch.cpp">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="platform\winrt\sha1.cpp" />
|
||||
<ClCompile Include="TGAlib.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\..\external\ConvertUTF\ConvertUTF.h" />
|
||||
|
|
@ -507,9 +502,14 @@
|
|||
<ClInclude Include="..\..\external\unzip\ioapi.h" />
|
||||
<ClInclude Include="..\..\external\unzip\unzip.h" />
|
||||
<ClInclude Include="..\..\external\xxhash\xxhash.h" />
|
||||
<ClInclude Include="..\3d\CCMesh.h" />
|
||||
<ClInclude Include="..\3d\CCObjLoader.h" />
|
||||
<ClInclude Include="..\3d\CCSprite3D.h" />
|
||||
<ClInclude Include="..\3d\CCSprite3DDataCache.h" />
|
||||
<ClInclude Include="..\base\atitc.h" />
|
||||
<ClInclude Include="..\base\base64.h" />
|
||||
<ClInclude Include="..\base\CCAutoreleasePool.h" />
|
||||
<ClInclude Include="..\base\ccCArray.h" />
|
||||
<ClInclude Include="..\base\ccConfig.h" />
|
||||
<ClInclude Include="..\base\CCConfiguration.h" />
|
||||
<ClInclude Include="..\base\CCConsole.h" />
|
||||
|
|
@ -532,21 +532,33 @@
|
|||
<ClInclude Include="..\base\CCEventMouse.h" />
|
||||
<ClInclude Include="..\base\CCEventTouch.h" />
|
||||
<ClInclude Include="..\base\CCEventType.h" />
|
||||
<ClInclude Include="..\base\ccFPSImages.h" />
|
||||
<ClInclude Include="..\base\CCIMEDelegate.h" />
|
||||
<ClInclude Include="..\base\CCIMEDispatcher.h" />
|
||||
<ClInclude Include="..\base\ccMacros.h" />
|
||||
<ClInclude Include="..\base\CCMap.h" />
|
||||
<ClInclude Include="..\base\CCNS.h" />
|
||||
<ClInclude Include="..\base\CCProfiling.h" />
|
||||
<ClInclude Include="..\base\CCRef.h" />
|
||||
<ClInclude Include="..\base\CCPlatformConfig.h" />
|
||||
<ClInclude Include="..\base\CCPlatformMacros.h" />
|
||||
<ClInclude Include="..\base\CCProfiling.h" />
|
||||
<ClInclude Include="..\base\CCProtocols.h" />
|
||||
<ClInclude Include="..\base\CCRef.h" />
|
||||
<ClInclude Include="..\base\CCRefPtr.h" />
|
||||
<ClInclude Include="..\base\CCScheduler.h" />
|
||||
<ClInclude Include="..\base\CCScriptSupport.h" />
|
||||
<ClInclude Include="..\base\CCTouch.h" />
|
||||
<ClInclude Include="..\base\ccTypes.h" />
|
||||
<ClInclude Include="..\base\CCUserDefault.h" />
|
||||
<ClInclude Include="..\base\ccUTF8.h" />
|
||||
<ClInclude Include="..\base\ccUtils.h" />
|
||||
<ClInclude Include="..\base\CCValue.h" />
|
||||
<ClInclude Include="..\base\CCVector.h" />
|
||||
<ClInclude Include="..\base\etc1.h" />
|
||||
<ClInclude Include="..\base\firePngData.h" />
|
||||
<ClInclude Include="..\base\s3tc.h" />
|
||||
<ClInclude Include="..\base\TGAlib.h" />
|
||||
<ClInclude Include="..\base\uthash.h" />
|
||||
<ClInclude Include="..\base\utlist.h" />
|
||||
<ClInclude Include="..\base\ZipUtils.h" />
|
||||
<ClInclude Include="..\cocos2d.h" />
|
||||
<ClInclude Include="..\deprecated\CCArray.h" />
|
||||
|
|
@ -563,13 +575,14 @@
|
|||
<ClInclude Include="..\math\CCGeometry.h" />
|
||||
<ClInclude Include="..\math\CCMath.h" />
|
||||
<ClInclude Include="..\math\CCMathBase.h" />
|
||||
<ClInclude Include="..\math\CCVertex.h" />
|
||||
<ClInclude Include="..\math\Mat4.h" />
|
||||
<ClInclude Include="..\math\MathUtil.h" />
|
||||
<ClInclude Include="..\math\Matrix.h" />
|
||||
<ClInclude Include="..\math\Quaternion.h" />
|
||||
<ClInclude Include="..\math\TransformUtils.h" />
|
||||
<ClInclude Include="..\math\Vector2.h" />
|
||||
<ClInclude Include="..\math\Vector3.h" />
|
||||
<ClInclude Include="..\math\Vector4.h" />
|
||||
<ClInclude Include="..\math\Vec2.h" />
|
||||
<ClInclude Include="..\math\Vec3.h" />
|
||||
<ClInclude Include="..\math\Vec4.h" />
|
||||
<ClInclude Include="..\physics\CCPhysicsBody.h" />
|
||||
<ClInclude Include="..\physics\CCPhysicsContact.h" />
|
||||
<ClInclude Include="..\physics\CCPhysicsJoint.h" />
|
||||
|
|
@ -581,6 +594,31 @@
|
|||
<ClInclude Include="..\physics\chipmunk\CCPhysicsJointInfo_chipmunk.h" />
|
||||
<ClInclude Include="..\physics\chipmunk\CCPhysicsShapeInfo_chipmunk.h" />
|
||||
<ClInclude Include="..\physics\chipmunk\CCPhysicsWorldInfo_chipmunk.h" />
|
||||
<ClInclude Include="..\platform\CCApplicationProtocol.h" />
|
||||
<ClInclude Include="..\platform\CCCommon.h" />
|
||||
<ClInclude Include="..\platform\CCDevice.h" />
|
||||
<ClInclude Include="..\platform\CCFileUtils.h" />
|
||||
<ClInclude Include="..\platform\CCGLViewProtocol.h" />
|
||||
<ClInclude Include="..\platform\CCImage.h" />
|
||||
<ClInclude Include="..\platform\CCSAXParser.h" />
|
||||
<ClInclude Include="..\platform\CCThread.h" />
|
||||
<ClInclude Include="..\platform\winrt\CCApplication.h" />
|
||||
<ClInclude Include="..\platform\winrt\CCFileUtilsWinRT.h" />
|
||||
<ClInclude Include="..\platform\winrt\CCFreeTypeFont.h" />
|
||||
<ClInclude Include="..\platform\winrt\CCGL.h" />
|
||||
<ClInclude Include="..\platform\winrt\CCGLView.h" />
|
||||
<ClInclude Include="..\platform\winrt\CCGL_Angle.h" />
|
||||
<ClInclude Include="..\platform\winrt\CCPlatformDefine.h" />
|
||||
<ClInclude Include="..\platform\winrt\CCPrecompiledShaders.h" />
|
||||
<ClInclude Include="..\platform\winrt\CCPThreadWinRT.h" />
|
||||
<ClInclude Include="..\platform\winrt\CCStdC.h" />
|
||||
<ClInclude Include="..\platform\winrt\CCWinRTUtils.h" />
|
||||
<ClInclude Include="..\platform\winrt\DirectXBase.h" />
|
||||
<ClInclude Include="..\platform\winrt\DirectXHelper.h" />
|
||||
<ClInclude Include="..\platform\winrt\InputEvent.h" />
|
||||
<ClInclude Include="..\platform\winrt\InputEventTypes.h" />
|
||||
<ClInclude Include="..\platform\winrt\pch.h" />
|
||||
<ClInclude Include="..\platform\winrt\sha1.h" />
|
||||
<ClInclude Include="..\renderer\CCBatchCommand.h" />
|
||||
<ClInclude Include="..\renderer\CCCustomCommand.h" />
|
||||
<ClInclude Include="..\renderer\CCGLProgram.h" />
|
||||
|
|
@ -589,11 +627,15 @@
|
|||
<ClInclude Include="..\renderer\CCGLProgramStateCache.h" />
|
||||
<ClInclude Include="..\renderer\ccGLStateCache.h" />
|
||||
<ClInclude Include="..\renderer\CCGroupCommand.h" />
|
||||
<ClInclude Include="..\renderer\CCMeshCommand.h" />
|
||||
<ClInclude Include="..\renderer\CCQuadCommand.h" />
|
||||
<ClInclude Include="..\renderer\CCRenderCommand.h" />
|
||||
<ClInclude Include="..\renderer\CCRenderCommandPool.h" />
|
||||
<ClInclude Include="..\renderer\CCRenderer.h" />
|
||||
<ClInclude Include="..\renderer\ccShaders.h" />
|
||||
<ClInclude Include="..\renderer\CCTexture2D.h" />
|
||||
<ClInclude Include="..\renderer\CCTextureAtlas.h" />
|
||||
<ClInclude Include="..\renderer\CCTextureCache.h" />
|
||||
<ClInclude Include="CCAction.h" />
|
||||
<ClInclude Include="CCActionCamera.h" />
|
||||
<ClInclude Include="CCActionCatmullRom.h" />
|
||||
|
|
@ -610,56 +652,44 @@
|
|||
<ClInclude Include="CCAnimation.h" />
|
||||
<ClInclude Include="CCAnimationCache.h" />
|
||||
<ClInclude Include="CCAtlasNode.h" />
|
||||
<ClInclude Include="ccCArray.h" />
|
||||
<ClInclude Include="CCClippingNode.h" />
|
||||
<ClInclude Include="CCComponent.h" />
|
||||
<ClInclude Include="CCComponentContainer.h" />
|
||||
<ClInclude Include="ccConfig.h" />
|
||||
<ClInclude Include="CCDeprecated.h" />
|
||||
<ClInclude Include="CCDrawingPrimitives.h" />
|
||||
<ClInclude Include="CCDrawNode.h" />
|
||||
<ClInclude Include="CCEventType.h" />
|
||||
<ClInclude Include="CCFont.h" />
|
||||
<ClInclude Include="CCFontAtlas.h" />
|
||||
<ClInclude Include="CCFontAtlasCache.h" />
|
||||
<ClInclude Include="CCFontCharMap.h" />
|
||||
<ClInclude Include="CCFontFNT.h" />
|
||||
<ClInclude Include="CCFontFreeType.h" />
|
||||
<ClInclude Include="ccFPSImages.h" />
|
||||
<ClInclude Include="CCGLBufferedNode.h" />
|
||||
<ClInclude Include="CCGrabber.h" />
|
||||
<ClInclude Include="CCGrid.h" />
|
||||
<ClInclude Include="CCNodeGrid.h" />
|
||||
<ClInclude Include="CCIMEDelegate.h" />
|
||||
<ClInclude Include="CCIMEDispatcher.h" />
|
||||
<ClInclude Include="CCLabel.h" />
|
||||
<ClInclude Include="CCLabelAtlas.h" />
|
||||
<ClInclude Include="CCLabelBMFont.h" />
|
||||
<ClInclude Include="CCLabelTextFormatter.h" />
|
||||
<ClInclude Include="CCLabelTTF.h" />
|
||||
<ClInclude Include="CCLayer.h" />
|
||||
<ClInclude Include="ccMacros.h" />
|
||||
<ClInclude Include="CCMenu.h" />
|
||||
<ClInclude Include="CCMenuItem.h" />
|
||||
<ClInclude Include="CCMotionStreak.h" />
|
||||
<ClInclude Include="CCNode.h" />
|
||||
<ClInclude Include="CCNodeGrid.h" />
|
||||
<ClInclude Include="CCParallaxNode.h" />
|
||||
<ClInclude Include="CCParticleBatchNode.h" />
|
||||
<ClInclude Include="CCParticleExamples.h" />
|
||||
<ClInclude Include="CCParticleSystem.h" />
|
||||
<ClInclude Include="CCParticleSystemQuad.h" />
|
||||
<ClInclude Include="CCProgressTimer.h" />
|
||||
<ClInclude Include="CCProtocols.h" />
|
||||
<ClInclude Include="CCRenderTexture.h" />
|
||||
<ClInclude Include="CCScene.h" />
|
||||
<ClInclude Include="CCScriptSupport.h" />
|
||||
<ClInclude Include="CCSprite.h" />
|
||||
<ClInclude Include="CCSpriteBatchNode.h" />
|
||||
<ClInclude Include="CCSpriteFrame.h" />
|
||||
<ClInclude Include="CCSpriteFrameCache.h" />
|
||||
<ClInclude Include="CCTextFieldTTF.h" />
|
||||
<ClInclude Include="CCTexture2D.h" />
|
||||
<ClInclude Include="CCTextureAtlas.h" />
|
||||
<ClInclude Include="CCTextureCache.h" />
|
||||
<ClInclude Include="CCTileMapAtlas.h" />
|
||||
<ClInclude Include="CCTMXLayer.h" />
|
||||
<ClInclude Include="CCTMXObjectGroup.h" />
|
||||
|
|
@ -668,53 +698,20 @@
|
|||
<ClInclude Include="CCTransition.h" />
|
||||
<ClInclude Include="CCTransitionPageTurn.h" />
|
||||
<ClInclude Include="CCTransitionProgress.h" />
|
||||
<ClInclude Include="ccTypes.h" />
|
||||
<ClInclude Include="CCTweenFunction.h" />
|
||||
<ClInclude Include="CCUserDefault.h" />
|
||||
<ClInclude Include="ccUTF8.h" />
|
||||
<ClInclude Include="ccUtils.h" />
|
||||
<ClInclude Include="CCVertex.h" />
|
||||
<ClInclude Include="cocos2d.h" />
|
||||
<ClInclude Include="platform\CCApplicationProtocol.h" />
|
||||
<ClInclude Include="platform\CCCommon.h" />
|
||||
<ClInclude Include="platform\CCDevice.h" />
|
||||
<ClInclude Include="platform\CCGLViewProtocol.h" />
|
||||
<ClInclude Include="platform\CCFileUtils.h" />
|
||||
<ClInclude Include="platform\CCImage.h" />
|
||||
<ClInclude Include="platform\CCSAXParser.h" />
|
||||
<ClInclude Include="platform\CCThread.h" />
|
||||
<ClInclude Include="platform\winrt\CCApplication.h" />
|
||||
<ClInclude Include="platform\winrt\CCFileUtilsWinRT.h" />
|
||||
<ClInclude Include="platform\winrt\CCFreeTypeFont.h" />
|
||||
<ClInclude Include="platform\winrt\CCGL.h" />
|
||||
<ClInclude Include="platform\winrt\CCGLView.h" />
|
||||
<ClInclude Include="platform\winrt\CCGL_Angle.h" />
|
||||
<ClInclude Include="platform\winrt\CCPlatformDefine.h" />
|
||||
<ClInclude Include="platform\winrt\CCPrecompiledShaders.h" />
|
||||
<ClInclude Include="platform\winrt\CCPThreadWinRT.h" />
|
||||
<ClInclude Include="platform\winrt\CCStdC.h" />
|
||||
<ClInclude Include="platform\winrt\CCWinRTUtils.h" />
|
||||
<ClInclude Include="platform\winrt\DirectXBase.h" />
|
||||
<ClInclude Include="platform\winrt\DirectXHelper.h" />
|
||||
<ClInclude Include="platform\winrt\InputEvent.h" />
|
||||
<ClInclude Include="platform\winrt\InputEventTypes.h" />
|
||||
<ClInclude Include="platform\winrt\pch.h" />
|
||||
<ClInclude Include="platform\winrt\sha1.h" />
|
||||
<ClInclude Include="TGAlib.h" />
|
||||
<ClInclude Include="uthash.h" />
|
||||
<ClInclude Include="utlist.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Text Include="..\math\CMakeLists.txt" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="..\base\CCUserDefault.mm" />
|
||||
<None Include="..\math\Mat4.inl" />
|
||||
<None Include="..\math\MathUtil.inl" />
|
||||
<None Include="..\math\MathUtilNeon.inl" />
|
||||
<None Include="..\math\Matrix.inl" />
|
||||
<None Include="..\math\Quaternion.inl" />
|
||||
<None Include="..\math\Vector2.inl" />
|
||||
<None Include="..\math\Vector3.inl" />
|
||||
<None Include="..\math\Vector4.inl" />
|
||||
<None Include="..\math\Vec2.inl" />
|
||||
<None Include="..\math\Vec3.inl" />
|
||||
<None Include="..\math\Vec4.inl" />
|
||||
<None Include="..\renderer\ccShader_3D_Color.frag" />
|
||||
<None Include="..\renderer\ccShader_3D_ColorTex.frag" />
|
||||
<None Include="..\renderer\ccShader_3D_PositionTex.vert" />
|
||||
<None Include="..\renderer\ccShader_Label.vert" />
|
||||
<None Include="..\renderer\ccShader_Label_df.frag" />
|
||||
<None Include="..\renderer\ccShader_Label_df_glow.frag" />
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -75,7 +75,7 @@
|
|||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
|
||||
<ClCompile>
|
||||
<PreprocessorDefinitions>%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
|
|
@ -100,7 +100,7 @@
|
|||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
<ClCompile>
|
||||
<PreprocessorDefinitions>_LIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
|
|
@ -125,7 +125,7 @@
|
|||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
|
||||
<ClCompile>
|
||||
<PreprocessorDefinitions>_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
|
|
@ -151,7 +151,7 @@
|
|||
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
|
||||
<ClCompile>
|
||||
<PreprocessorDefinitions>_LIB;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
|
||||
<PrecompiledHeader>NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader>Use</PrecompiledHeader>
|
||||
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
|
||||
<AdditionalUsingDirectories>$(WindowsSDK_MetadataPath);$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
|
||||
<AdditionalIncludeDirectories>$(EngineRoot)external\sqlite3\include;$(EngineRoot)external\unzip;$(EngineRoot)external\edtaa3func;$(EngineRoot)external\tinyxml2;$(EngineRoot)external\png\include\wp8;$(EngineRoot)external\jpeg\include\wp8;$(EngineRoot)external\curl\include\wp8;$(EngineRoot)external\curl\include\wp8\curl;$(EngineRoot)external\tiff\include\wp8;$(EngineRoot)external\freetype2\include\wp8;$(EngineRoot)external\wp8-specific\zlib\include;$(EngineRoot)external\chipmunk\include\chipmunk;$(EngineRoot)external\xxhash;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
|
||||
|
|
@ -261,6 +261,10 @@
|
|||
</ForcedIncludeFiles>
|
||||
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
|
||||
</ForcedIncludeFiles>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">NotUsing</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">NotUsing</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\base\CCIMEDispatcher.cpp" />
|
||||
<ClCompile Include="..\base\CCNS.cpp" />
|
||||
|
|
@ -322,11 +326,16 @@
|
|||
<ClCompile Include="..\platform\winrt\CCWinRTUtils.cpp" />
|
||||
<ClCompile Include="..\platform\winrt\inet_ntop_winrt.cpp" />
|
||||
<ClCompile Include="..\platform\winrt\InputEvent.cpp" />
|
||||
<ClCompile Include="..\platform\winrt\pch.cpp" />
|
||||
<ClCompile Include="..\platform\winrt\sha1.cpp" />
|
||||
<ClCompile Include="..\platform\wp8\CCGLView.cpp" />
|
||||
<ClCompile Include="..\platform\wp8\Direct3DBase.cpp" />
|
||||
<ClCompile Include="..\platform\wp8\DirectXBase.cpp" />
|
||||
<ClCompile Include="..\platform\wp8\pch.cpp">
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>
|
||||
<PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\renderer\CCBatchCommand.cpp" />
|
||||
<ClCompile Include="..\renderer\CCCustomCommand.cpp" />
|
||||
<ClCompile Include="..\renderer\CCGLProgram.cpp" />
|
||||
|
|
@ -527,11 +536,11 @@
|
|||
<ClInclude Include="..\platform\winrt\inet_ntop_winrt.h" />
|
||||
<ClInclude Include="..\platform\winrt\InputEvent.h" />
|
||||
<ClInclude Include="..\platform\winrt\InputEventTypes.h" />
|
||||
<ClInclude Include="..\platform\winrt\pch.h" />
|
||||
<ClInclude Include="..\platform\winrt\sha1.h" />
|
||||
<ClInclude Include="..\platform\wp8\CCGLView.h" />
|
||||
<ClInclude Include="..\platform\wp8\Direct3DBase.h" />
|
||||
<ClInclude Include="..\platform\wp8\DirectXBase.h" />
|
||||
<ClInclude Include="..\platform\wp8\pch.h" />
|
||||
<ClInclude Include="..\renderer\CCBatchCommand.h" />
|
||||
<ClInclude Include="..\renderer\CCCustomCommand.h" />
|
||||
<ClInclude Include="..\renderer\CCGLProgram.h" />
|
||||
|
|
|
|||
|
|
@ -571,9 +571,6 @@
|
|||
<ClCompile Include="..\platform\winrt\InputEvent.cpp">
|
||||
<Filter>platform\winrt</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\platform\winrt\pch.cpp">
|
||||
<Filter>platform\winrt</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\platform\winrt\sha1.cpp">
|
||||
<Filter>platform\winrt</Filter>
|
||||
</ClCompile>
|
||||
|
|
@ -595,6 +592,7 @@
|
|||
<ClCompile Include="..\renderer\CCMeshCommand.cpp">
|
||||
<Filter>renderer</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="..\platform\wp8\pch.cpp" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClInclude Include="..\physics\CCPhysicsBody.h">
|
||||
|
|
@ -1182,9 +1180,6 @@
|
|||
<ClInclude Include="..\platform\winrt\InputEventTypes.h">
|
||||
<Filter>platform\winrt</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\platform\winrt\pch.h">
|
||||
<Filter>platform\winrt</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\platform\winrt\sha1.h">
|
||||
<Filter>platform\winrt</Filter>
|
||||
</ClInclude>
|
||||
|
|
@ -1209,6 +1204,7 @@
|
|||
<ClInclude Include="..\renderer\CCMeshCommand.h">
|
||||
<Filter>renderer</Filter>
|
||||
</ClInclude>
|
||||
<ClInclude Include="..\platform\wp8\pch.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="..\math\Mat4.inl">
|
||||
|
|
|
|||
|
|
@ -31,7 +31,7 @@ NS_CC_BEGIN
|
|||
|
||||
const char* cocos2dVersion()
|
||||
{
|
||||
return "cocos2d-x 3.1rc0";
|
||||
return "cocos2d-x 3.1";
|
||||
}
|
||||
|
||||
NS_CC_END
|
||||
|
|
|
|||
|
|
@ -526,18 +526,20 @@ void PhysicsWorld::updateBodies()
|
|||
return;
|
||||
}
|
||||
|
||||
for (auto& body : _delayAddBodies)
|
||||
// issue #4944, contact callback will be invoked when add/remove body, _delayAddBodies maybe changed, so we need make a copy.
|
||||
auto addCopy = _delayAddBodies;
|
||||
_delayAddBodies.clear();
|
||||
for (auto& body : addCopy)
|
||||
{
|
||||
doAddBody(body);
|
||||
}
|
||||
|
||||
for (auto& body : _delayRemoveBodies)
|
||||
auto removeCopy = _delayRemoveBodies;
|
||||
_delayRemoveBodies.clear();
|
||||
for (auto& body : removeCopy)
|
||||
{
|
||||
doRemoveBody(body);
|
||||
}
|
||||
|
||||
_delayAddBodies.clear();
|
||||
_delayRemoveBodies.clear();
|
||||
}
|
||||
|
||||
void PhysicsWorld::removeBody(int tag)
|
||||
|
|
@ -668,12 +670,16 @@ void PhysicsWorld::updateJoints()
|
|||
return;
|
||||
}
|
||||
|
||||
for (auto joint : _delayAddJoints)
|
||||
auto addCopy = _delayAddJoints;
|
||||
_delayAddJoints.clear();
|
||||
for (auto joint : addCopy)
|
||||
{
|
||||
doAddJoint(joint);
|
||||
}
|
||||
|
||||
for (auto joint : _delayRemoveJoints)
|
||||
auto removeCopy = _delayRemoveJoints;
|
||||
_delayRemoveJoints.clear();
|
||||
for (auto joint : removeCopy)
|
||||
{
|
||||
doRemoveJoint(joint);
|
||||
|
||||
|
|
@ -682,9 +688,6 @@ void PhysicsWorld::updateJoints()
|
|||
delete joint;
|
||||
}
|
||||
}
|
||||
|
||||
_delayAddJoints.clear();
|
||||
_delayRemoveJoints.clear();
|
||||
}
|
||||
|
||||
void PhysicsWorld::removeShape(PhysicsShape* shape)
|
||||
|
|
@ -878,7 +881,7 @@ void PhysicsWorld::setGravity(const Vect& gravity)
|
|||
|
||||
void PhysicsWorld::update(float delta)
|
||||
{
|
||||
if (_delayDirty)
|
||||
while (_delayDirty)
|
||||
{
|
||||
// the updateJoints must run before the updateBodies.
|
||||
updateJoints();
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ THE SOFTWARE.
|
|||
#include "base/ccMacros.h"
|
||||
#include "base/CCDirector.h"
|
||||
#include "base/CCTouch.h"
|
||||
#include "2d/CCIMEDispatcher.h"
|
||||
#include "base/CCIMEDispatcher.h"
|
||||
#include "CCApplication.h"
|
||||
#include "CCWinRTUtils.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -39,9 +39,10 @@ using namespace PhoneDirect3DXamlAppComponent;
|
|||
|
||||
USING_NS_CC;
|
||||
|
||||
Cocos2dRenderer::Cocos2dRenderer(): mInitialized(false), m_loadingComplete(false), m_delegate(nullptr), m_messageBoxDelegate(nullptr)
|
||||
Cocos2dRenderer::Cocos2dRenderer(Windows::Graphics::Display::DisplayOrientations orientation): mInitialized(false), m_loadingComplete(false), m_delegate(nullptr), m_messageBoxDelegate(nullptr)
|
||||
{
|
||||
mApp = new AppDelegate();
|
||||
m_orientation = orientation;
|
||||
}
|
||||
|
||||
// Creates and restores Cocos2d-x after DirectX and Angle contexts are created or updated
|
||||
|
|
@ -53,7 +54,7 @@ void Cocos2dRenderer::CreateGLResources()
|
|||
{
|
||||
mInitialized = true;
|
||||
GLView* glview = GLView::create("Test Cpp");
|
||||
glview->Create(m_eglDisplay, m_eglContext, m_eglSurface, m_renderTargetSize.Width, m_renderTargetSize.Height);
|
||||
glview->Create(m_eglDisplay, m_eglContext, m_eglSurface, m_renderTargetSize.Width, m_renderTargetSize.Height,m_orientation);
|
||||
director->setOpenGLView(glview);
|
||||
CCApplication::getInstance()->run();
|
||||
glview->SetXamlEventDelegate(m_delegate);
|
||||
|
|
|
|||
|
|
@ -32,7 +32,7 @@ class AppDelegate;
|
|||
ref class Cocos2dRenderer sealed : public DirectXBase
|
||||
{
|
||||
public:
|
||||
Cocos2dRenderer();
|
||||
Cocos2dRenderer(Windows::Graphics::Display::DisplayOrientations orientation);
|
||||
|
||||
// Direct3DBase methods.
|
||||
virtual void OnOrientationChanged(Windows::Graphics::Display::DisplayOrientations orientation) override;
|
||||
|
|
@ -64,4 +64,5 @@ private:
|
|||
|
||||
// The AppDelegate for the Cocos2D app
|
||||
AppDelegate* mApp;
|
||||
Windows::Graphics::Display::DisplayOrientations m_orientation;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -40,10 +40,10 @@ using namespace PhoneDirect3DXamlAppComponent;
|
|||
namespace PhoneDirect3DXamlAppComponent
|
||||
{
|
||||
|
||||
Direct3DInterop::Direct3DInterop()
|
||||
: mCurrentOrientation(DisplayOrientations::Portrait), m_delegate(nullptr)
|
||||
Direct3DInterop::Direct3DInterop(Windows::Graphics::Display::DisplayOrientations orientation)
|
||||
: mCurrentOrientation(orientation), m_delegate(nullptr)
|
||||
{
|
||||
m_renderer = ref new Cocos2dRenderer();
|
||||
m_renderer = ref new Cocos2dRenderer(mCurrentOrientation);
|
||||
}
|
||||
|
||||
IDrawingSurfaceBackgroundContentProvider^ Direct3DInterop::CreateContentProvider()
|
||||
|
|
|
|||
|
|
@ -43,7 +43,7 @@ public delegate void RequestAdditionalFrameHandler();
|
|||
public ref class Direct3DInterop sealed : public Windows::Phone::Input::Interop::IDrawingSurfaceManipulationHandler
|
||||
{
|
||||
public:
|
||||
Direct3DInterop();
|
||||
Direct3DInterop(Windows::Graphics::Display::DisplayOrientations orientation);
|
||||
|
||||
Windows::Phone::Graphics::Interop::IDrawingSurfaceBackgroundContentProvider^ CreateContentProvider();
|
||||
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ using Microsoft.Phone.Shell;
|
|||
using Windows.UI.Input;
|
||||
using System.Windows.Threading;
|
||||
using Microsoft.Phone.Info;
|
||||
using Windows.Graphics.Display;
|
||||
|
||||
namespace PhoneDirect3DXamlAppInterop
|
||||
{
|
||||
|
|
@ -53,7 +54,30 @@ namespace PhoneDirect3DXamlAppInterop
|
|||
{
|
||||
if (m_d3dInterop == null)
|
||||
{
|
||||
m_d3dInterop = new Direct3DInterop();
|
||||
PageOrientation pageOrientation = (PageOrientation)GetValue(OrientationProperty);
|
||||
DisplayOrientations displayOrientation;
|
||||
|
||||
switch(pageOrientation)
|
||||
{
|
||||
case PageOrientation.Portrait:
|
||||
case PageOrientation.PortraitUp:
|
||||
displayOrientation = DisplayOrientations.Portrait;
|
||||
break;
|
||||
case PageOrientation.PortraitDown:
|
||||
displayOrientation = DisplayOrientations.PortraitFlipped;
|
||||
break;
|
||||
case PageOrientation.Landscape:
|
||||
case PageOrientation.LandscapeLeft:
|
||||
displayOrientation = DisplayOrientations.Landscape;
|
||||
break;
|
||||
case PageOrientation.LandscapeRight:
|
||||
displayOrientation = DisplayOrientations.LandscapeFlipped;
|
||||
break;
|
||||
default:
|
||||
displayOrientation = DisplayOrientations.Landscape;
|
||||
break;
|
||||
}
|
||||
m_d3dInterop = new Direct3DInterop(displayOrientation);
|
||||
|
||||
// Set WindowBounds to size of DrawingSurface
|
||||
m_d3dInterop.WindowBounds = new Windows.Foundation.Size(
|
||||
|
|
|
|||
|
|
@ -89,7 +89,6 @@ GLView::GLView()
|
|||
{
|
||||
s_pEglView = this;
|
||||
_viewName = "cocos2dx";
|
||||
UpdateOrientationMatrix();
|
||||
}
|
||||
|
||||
GLView::~GLView()
|
||||
|
|
@ -114,8 +113,9 @@ bool GLView::initWithFullScreen(const std::string& viewName)
|
|||
}
|
||||
|
||||
|
||||
bool GLView::Create(EGLDisplay eglDisplay, EGLContext eglContext, EGLSurface eglSurface, float width, float height)
|
||||
bool GLView::Create(EGLDisplay eglDisplay, EGLContext eglContext, EGLSurface eglSurface, float width, float height, DisplayOrientations orientation)
|
||||
{
|
||||
m_orientation = orientation;
|
||||
m_eglDisplay = eglDisplay;
|
||||
m_eglContext = eglContext;
|
||||
m_eglSurface = eglSurface;
|
||||
|
|
|
|||
|
|
@ -71,7 +71,8 @@ public:
|
|||
void HideKeyboard(Windows::Foundation::Rect r);
|
||||
|
||||
// WP8 XAML app
|
||||
virtual bool Create(EGLDisplay eglDisplay, EGLContext eglContext, EGLSurface eglSurface, float width, float height);
|
||||
virtual bool Create(EGLDisplay eglDisplay, EGLContext eglContext, EGLSurface eglSurface, float width, float height
|
||||
,Windows::Graphics::Display::DisplayOrientations orientation);
|
||||
virtual void UpdateDevice(EGLDisplay eglDisplay, EGLContext eglContext, EGLSurface eglSurface);
|
||||
|
||||
void OnPointerPressed(Windows::UI::Core::PointerEventArgs^ args);
|
||||
|
|
|
|||
|
|
@ -0,0 +1 @@
|
|||
#include "pch.h"
|
||||
|
|
@ -0,0 +1,3 @@
|
|||
#pragma once
|
||||
|
||||
#include "cocos2d.h"
|
||||
|
|
@ -2777,6 +2777,719 @@ const unsigned char s_7B67DD242152D35ACC079265FAD9D03DC98182DE[] = {
|
|||
111, 110, 0, 171, 171, 171,
|
||||
};
|
||||
|
||||
const unsigned char s_7CE5EE84ACB6110F7FA29152ECE3344CB6D6620D[] = {
|
||||
|
||||
166, 147, 0, 0, 142, 9, 2, 1,
|
||||
0, 128, 0, 0, 82, 139, 0, 0,
|
||||
10, 0, 0, 0, 97, 95, 112, 111,
|
||||
115, 105, 116, 105, 111, 110, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 255, 255, 255, 255, 80, 139,
|
||||
0, 0, 10, 0, 0, 0, 97, 95,
|
||||
116, 101, 120, 67, 111, 111, 114, 100,
|
||||
1, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 255, 255, 255, 255,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
255, 255, 255, 255, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 255, 255, 255, 255,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
255, 255, 255, 255, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 255, 255, 255, 255,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
255, 255, 255, 255, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 255, 255, 255, 255,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
255, 255, 255, 255, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 255, 255, 255, 255,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
255, 255, 255, 255, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 255, 255, 255, 255,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
255, 255, 255, 255, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 255, 255, 255, 255,
|
||||
1, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 1, 0, 0, 0,
|
||||
0, 3, 0, 0, 0, 92, 139, 0,
|
||||
0, 242, 141, 0, 0, 12, 0, 0,
|
||||
0, 67, 67, 95, 77, 86, 80, 77,
|
||||
97, 116, 114, 105, 120, 0, 0, 0,
|
||||
0, 255, 255, 255, 255, 0, 0, 0,
|
||||
0, 4, 0, 0, 0, 94, 139, 0,
|
||||
0, 0, 0, 0, 0, 11, 0, 0,
|
||||
0, 67, 67, 95, 84, 101, 120, 116,
|
||||
117, 114, 101, 48, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 255, 255, 255, 255,
|
||||
1, 0, 0, 0, 82, 139, 0, 0,
|
||||
241, 141, 0, 0, 7, 0, 0, 0,
|
||||
117, 95, 99, 111, 108, 111, 114, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 255,
|
||||
255, 255, 255, 1, 0, 0, 0, 3,
|
||||
0, 0, 0, 12, 0, 0, 0, 67,
|
||||
67, 95, 77, 86, 80, 77, 97, 116,
|
||||
114, 105, 120, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 11, 0, 0, 0, 67,
|
||||
67, 95, 84, 101, 120, 116, 117, 114,
|
||||
101, 48, 0, 0, 0, 0, 1, 0,
|
||||
0, 0, 7, 0, 0, 0, 117, 95,
|
||||
99, 111, 108, 111, 114, 0, 0, 0,
|
||||
0, 2, 0, 0, 0, 96, 4, 0,
|
||||
0, 192, 4, 0, 0, 0, 0, 0,
|
||||
0, 20, 134, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 68, 88, 66, 67, 157, 116, 105,
|
||||
89, 118, 135, 249, 239, 42, 226, 184,
|
||||
78, 220, 105, 236, 28, 1, 0, 0,
|
||||
0, 96, 4, 0, 0, 6, 0, 0,
|
||||
0, 56, 0, 0, 0, 228, 0, 0,
|
||||
0, 252, 1, 0, 0, 120, 2, 0,
|
||||
0, 176, 3, 0, 0, 228, 3, 0,
|
||||
0, 65, 111, 110, 57, 164, 0, 0,
|
||||
0, 164, 0, 0, 0, 0, 2, 255,
|
||||
255, 112, 0, 0, 0, 52, 0, 0,
|
||||
0, 1, 0, 40, 0, 0, 0, 52,
|
||||
0, 0, 0, 52, 0, 1, 0, 36,
|
||||
0, 0, 0, 52, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 1, 0, 0,
|
||||
0, 0, 0, 0, 0, 1, 2, 255,
|
||||
255, 31, 0, 0, 2, 0, 0, 0,
|
||||
128, 0, 0, 3, 176, 31, 0, 0,
|
||||
2, 0, 0, 0, 144, 0, 8, 15,
|
||||
160, 66, 0, 0, 3, 0, 0, 15,
|
||||
128, 0, 0, 228, 176, 0, 8, 228,
|
||||
160, 5, 0, 0, 3, 0, 0, 15,
|
||||
128, 0, 0, 228, 128, 0, 0, 228,
|
||||
160, 1, 0, 0, 2, 0, 8, 15,
|
||||
128, 0, 0, 228, 128, 1, 0, 0,
|
||||
2, 1, 8, 15, 128, 0, 0, 228,
|
||||
128, 1, 0, 0, 2, 2, 8, 15,
|
||||
128, 0, 0, 228, 128, 1, 0, 0,
|
||||
2, 3, 8, 15, 128, 0, 0, 228,
|
||||
128, 255, 255, 0, 0, 83, 72, 68,
|
||||
82, 16, 1, 0, 0, 64, 0, 0,
|
||||
0, 68, 0, 0, 0, 89, 0, 0,
|
||||
4, 70, 142, 32, 0, 0, 0, 0,
|
||||
0, 1, 0, 0, 0, 90, 0, 0,
|
||||
3, 0, 96, 16, 0, 0, 0, 0,
|
||||
0, 88, 24, 0, 4, 0, 112, 16,
|
||||
0, 0, 0, 0, 0, 85, 85, 0,
|
||||
0, 98, 16, 0, 3, 50, 16, 16,
|
||||
0, 0, 0, 0, 0, 101, 0, 0,
|
||||
3, 242, 32, 16, 0, 0, 0, 0,
|
||||
0, 101, 0, 0, 3, 242, 32, 16,
|
||||
0, 1, 0, 0, 0, 101, 0, 0,
|
||||
3, 242, 32, 16, 0, 2, 0, 0,
|
||||
0, 101, 0, 0, 3, 242, 32, 16,
|
||||
0, 3, 0, 0, 0, 104, 0, 0,
|
||||
2, 1, 0, 0, 0, 69, 0, 0,
|
||||
9, 242, 0, 16, 0, 0, 0, 0,
|
||||
0, 70, 16, 16, 0, 0, 0, 0,
|
||||
0, 70, 126, 16, 0, 0, 0, 0,
|
||||
0, 0, 96, 16, 0, 0, 0, 0,
|
||||
0, 56, 0, 0, 8, 242, 0, 16,
|
||||
0, 0, 0, 0, 0, 70, 14, 16,
|
||||
0, 0, 0, 0, 0, 70, 142, 32,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 54, 0, 0, 5, 242, 32, 16,
|
||||
0, 0, 0, 0, 0, 70, 14, 16,
|
||||
0, 0, 0, 0, 0, 54, 0, 0,
|
||||
5, 242, 32, 16, 0, 1, 0, 0,
|
||||
0, 70, 14, 16, 0, 0, 0, 0,
|
||||
0, 54, 0, 0, 5, 242, 32, 16,
|
||||
0, 2, 0, 0, 0, 70, 14, 16,
|
||||
0, 0, 0, 0, 0, 54, 0, 0,
|
||||
5, 242, 32, 16, 0, 3, 0, 0,
|
||||
0, 70, 14, 16, 0, 0, 0, 0,
|
||||
0, 62, 0, 0, 1, 83, 84, 65,
|
||||
84, 116, 0, 0, 0, 7, 0, 0,
|
||||
0, 1, 0, 0, 0, 0, 0, 0,
|
||||
0, 5, 0, 0, 0, 1, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 1, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 1, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 4, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 82, 68, 69, 70, 48, 1, 0,
|
||||
0, 1, 0, 0, 0, 176, 0, 0,
|
||||
0, 3, 0, 0, 0, 28, 0, 0,
|
||||
0, 0, 4, 255, 255, 0, 65, 0,
|
||||
0, 252, 0, 0, 0, 124, 0, 0,
|
||||
0, 3, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 1, 0, 0,
|
||||
0, 1, 0, 0, 0, 145, 0, 0,
|
||||
0, 2, 0, 0, 0, 5, 0, 0,
|
||||
0, 4, 0, 0, 0, 255, 255, 255,
|
||||
255, 0, 0, 0, 0, 1, 0, 0,
|
||||
0, 13, 0, 0, 0, 166, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 1, 0, 0,
|
||||
0, 0, 0, 0, 0, 115, 97, 109,
|
||||
112, 108, 101, 114, 95, 95, 67, 67,
|
||||
95, 84, 101, 120, 116, 117, 114, 101,
|
||||
48, 0, 116, 101, 120, 116, 117, 114,
|
||||
101, 95, 95, 67, 67, 95, 84, 101,
|
||||
120, 116, 117, 114, 101, 48, 0, 36,
|
||||
71, 108, 111, 98, 97, 108, 115, 0,
|
||||
171, 166, 0, 0, 0, 1, 0, 0,
|
||||
0, 200, 0, 0, 0, 16, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 224, 0, 0, 0, 0, 0, 0,
|
||||
0, 16, 0, 0, 0, 2, 0, 0,
|
||||
0, 236, 0, 0, 0, 0, 0, 0,
|
||||
0, 95, 117, 95, 99, 111, 108, 111,
|
||||
114, 0, 171, 171, 171, 1, 0, 3,
|
||||
0, 1, 0, 4, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 77, 105, 99,
|
||||
114, 111, 115, 111, 102, 116, 32, 40,
|
||||
82, 41, 32, 72, 76, 83, 76, 32,
|
||||
83, 104, 97, 100, 101, 114, 32, 67,
|
||||
111, 109, 112, 105, 108, 101, 114, 32,
|
||||
54, 46, 51, 46, 57, 54, 48, 48,
|
||||
46, 49, 54, 51, 56, 52, 0, 171,
|
||||
171, 73, 83, 71, 78, 44, 0, 0,
|
||||
0, 1, 0, 0, 0, 8, 0, 0,
|
||||
0, 32, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 3, 0, 0,
|
||||
0, 0, 0, 0, 0, 3, 3, 0,
|
||||
0, 84, 69, 88, 67, 79, 79, 82,
|
||||
68, 0, 171, 171, 171, 79, 83, 71,
|
||||
78, 116, 0, 0, 0, 4, 0, 0,
|
||||
0, 8, 0, 0, 0, 104, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 3, 0, 0, 0, 0, 0, 0,
|
||||
0, 15, 0, 0, 0, 104, 0, 0,
|
||||
0, 1, 0, 0, 0, 0, 0, 0,
|
||||
0, 3, 0, 0, 0, 1, 0, 0,
|
||||
0, 15, 0, 0, 0, 104, 0, 0,
|
||||
0, 2, 0, 0, 0, 0, 0, 0,
|
||||
0, 3, 0, 0, 0, 2, 0, 0,
|
||||
0, 15, 0, 0, 0, 104, 0, 0,
|
||||
0, 3, 0, 0, 0, 0, 0, 0,
|
||||
0, 3, 0, 0, 0, 3, 0, 0,
|
||||
0, 15, 0, 0, 0, 83, 86, 95,
|
||||
84, 97, 114, 103, 101, 116, 0, 171,
|
||||
171, 68, 88, 66, 67, 183, 109, 16,
|
||||
202, 49, 89, 17, 26, 134, 90, 213,
|
||||
163, 143, 192, 250, 93, 1, 0, 0,
|
||||
0, 192, 4, 0, 0, 6, 0, 0,
|
||||
0, 56, 0, 0, 0, 76, 1, 0,
|
||||
0, 204, 2, 0, 0, 72, 3, 0,
|
||||
0, 28, 4, 0, 0, 104, 4, 0,
|
||||
0, 65, 111, 110, 57, 12, 1, 0,
|
||||
0, 12, 1, 0, 0, 0, 2, 254,
|
||||
255, 216, 0, 0, 0, 52, 0, 0,
|
||||
0, 1, 0, 36, 0, 0, 0, 48,
|
||||
0, 0, 0, 48, 0, 0, 0, 36,
|
||||
0, 1, 0, 48, 0, 0, 0, 0,
|
||||
0, 4, 0, 1, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 1, 2, 254,
|
||||
255, 81, 0, 0, 5, 5, 0, 15,
|
||||
160, 0, 0, 0, 63, 0, 0, 128,
|
||||
63, 0, 0, 128, 191, 0, 0, 0,
|
||||
0, 31, 0, 0, 2, 5, 0, 0,
|
||||
128, 0, 0, 15, 144, 31, 0, 0,
|
||||
2, 5, 0, 1, 128, 1, 0, 15,
|
||||
144, 9, 0, 0, 3, 0, 0, 1,
|
||||
128, 3, 0, 228, 160, 0, 0, 228,
|
||||
144, 9, 0, 0, 3, 0, 0, 2,
|
||||
128, 4, 0, 228, 160, 0, 0, 228,
|
||||
144, 2, 0, 0, 3, 0, 0, 1,
|
||||
128, 0, 0, 85, 128, 0, 0, 0,
|
||||
128, 5, 0, 0, 3, 0, 0, 4,
|
||||
192, 0, 0, 0, 128, 5, 0, 0,
|
||||
160, 9, 0, 0, 3, 0, 0, 1,
|
||||
128, 2, 0, 228, 160, 0, 0, 228,
|
||||
144, 1, 0, 0, 2, 1, 0, 2,
|
||||
128, 0, 0, 0, 129, 9, 0, 0,
|
||||
3, 1, 0, 1, 128, 1, 0, 228,
|
||||
160, 0, 0, 228, 144, 4, 0, 0,
|
||||
4, 0, 0, 3, 192, 0, 0, 85,
|
||||
128, 0, 0, 228, 160, 1, 0, 228,
|
||||
128, 1, 0, 0, 2, 0, 0, 8,
|
||||
192, 0, 0, 85, 128, 4, 0, 0,
|
||||
4, 0, 0, 3, 224, 1, 0, 228,
|
||||
144, 5, 0, 233, 160, 5, 0, 231,
|
||||
160, 255, 255, 0, 0, 83, 72, 68,
|
||||
82, 120, 1, 0, 0, 64, 0, 1,
|
||||
0, 94, 0, 0, 0, 89, 0, 0,
|
||||
4, 70, 142, 32, 0, 0, 0, 0,
|
||||
0, 4, 0, 0, 0, 95, 0, 0,
|
||||
3, 242, 16, 16, 0, 0, 0, 0,
|
||||
0, 95, 0, 0, 3, 50, 16, 16,
|
||||
0, 1, 0, 0, 0, 101, 0, 0,
|
||||
3, 50, 32, 16, 0, 0, 0, 0,
|
||||
0, 103, 0, 0, 4, 242, 32, 16,
|
||||
0, 1, 0, 0, 0, 1, 0, 0,
|
||||
0, 104, 0, 0, 2, 1, 0, 0,
|
||||
0, 50, 0, 0, 15, 50, 32, 16,
|
||||
0, 0, 0, 0, 0, 70, 16, 16,
|
||||
0, 1, 0, 0, 0, 2, 64, 0,
|
||||
0, 0, 0, 128, 63, 0, 0, 128,
|
||||
191, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 2, 64, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 128, 63, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 17, 0, 0,
|
||||
8, 18, 0, 16, 0, 0, 0, 0,
|
||||
0, 70, 142, 32, 0, 0, 0, 0,
|
||||
0, 1, 0, 0, 0, 70, 30, 16,
|
||||
0, 0, 0, 0, 0, 54, 0, 0,
|
||||
6, 34, 32, 16, 0, 1, 0, 0,
|
||||
0, 10, 0, 16, 128, 65, 0, 0,
|
||||
0, 0, 0, 0, 0, 17, 0, 0,
|
||||
8, 18, 0, 16, 0, 0, 0, 0,
|
||||
0, 70, 142, 32, 0, 0, 0, 0,
|
||||
0, 2, 0, 0, 0, 70, 30, 16,
|
||||
0, 0, 0, 0, 0, 17, 0, 0,
|
||||
8, 34, 0, 16, 0, 0, 0, 0,
|
||||
0, 70, 142, 32, 0, 0, 0, 0,
|
||||
0, 3, 0, 0, 0, 70, 30, 16,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
7, 18, 0, 16, 0, 0, 0, 0,
|
||||
0, 26, 0, 16, 0, 0, 0, 0,
|
||||
0, 10, 0, 16, 0, 0, 0, 0,
|
||||
0, 54, 0, 0, 5, 130, 32, 16,
|
||||
0, 1, 0, 0, 0, 26, 0, 16,
|
||||
0, 0, 0, 0, 0, 56, 0, 0,
|
||||
7, 66, 32, 16, 0, 1, 0, 0,
|
||||
0, 10, 0, 16, 0, 0, 0, 0,
|
||||
0, 1, 64, 0, 0, 0, 0, 0,
|
||||
63, 17, 0, 0, 8, 18, 32, 16,
|
||||
0, 1, 0, 0, 0, 70, 142, 32,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 70, 30, 16, 0, 0, 0, 0,
|
||||
0, 62, 0, 0, 1, 83, 84, 65,
|
||||
84, 116, 0, 0, 0, 10, 0, 0,
|
||||
0, 1, 0, 0, 0, 0, 0, 0,
|
||||
0, 4, 0, 0, 0, 8, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 1, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 1, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 82, 68, 69, 70, 204, 0, 0,
|
||||
0, 1, 0, 0, 0, 72, 0, 0,
|
||||
0, 1, 0, 0, 0, 28, 0, 0,
|
||||
0, 0, 4, 254, 255, 0, 65, 0,
|
||||
0, 152, 0, 0, 0, 60, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 1, 0, 0,
|
||||
0, 0, 0, 0, 0, 36, 71, 108,
|
||||
111, 98, 97, 108, 115, 0, 171, 171,
|
||||
171, 60, 0, 0, 0, 1, 0, 0,
|
||||
0, 96, 0, 0, 0, 64, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 120, 0, 0, 0, 0, 0, 0,
|
||||
0, 64, 0, 0, 0, 2, 0, 0,
|
||||
0, 136, 0, 0, 0, 0, 0, 0,
|
||||
0, 95, 67, 67, 95, 77, 86, 80,
|
||||
77, 97, 116, 114, 105, 120, 0, 171,
|
||||
171, 3, 0, 3, 0, 4, 0, 4,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 77, 105, 99, 114, 111, 115, 111,
|
||||
102, 116, 32, 40, 82, 41, 32, 72,
|
||||
76, 83, 76, 32, 83, 104, 97, 100,
|
||||
101, 114, 32, 67, 111, 109, 112, 105,
|
||||
108, 101, 114, 32, 54, 46, 51, 46,
|
||||
57, 54, 48, 48, 46, 49, 54, 51,
|
||||
56, 52, 0, 171, 171, 73, 83, 71,
|
||||
78, 68, 0, 0, 0, 2, 0, 0,
|
||||
0, 8, 0, 0, 0, 56, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 3, 0, 0, 0, 0, 0, 0,
|
||||
0, 15, 15, 0, 0, 56, 0, 0,
|
||||
0, 1, 0, 0, 0, 0, 0, 0,
|
||||
0, 3, 0, 0, 0, 1, 0, 0,
|
||||
0, 3, 3, 0, 0, 84, 69, 88,
|
||||
67, 79, 79, 82, 68, 0, 171, 171,
|
||||
171, 79, 83, 71, 78, 80, 0, 0,
|
||||
0, 2, 0, 0, 0, 8, 0, 0,
|
||||
0, 56, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 3, 0, 0,
|
||||
0, 0, 0, 0, 0, 3, 12, 0,
|
||||
0, 65, 0, 0, 0, 0, 0, 0,
|
||||
0, 1, 0, 0, 0, 3, 0, 0,
|
||||
0, 1, 0, 0, 0, 15, 0, 0,
|
||||
0, 84, 69, 88, 67, 79, 79, 82,
|
||||
68, 0, 83, 86, 95, 80, 111, 115,
|
||||
105, 116, 105, 111, 110, 0, 171, 171,
|
||||
171,
|
||||
};
|
||||
|
||||
const unsigned char s_7E1EEF397305D0BC2DCDBA4F2DAFBCBA1534E45C[] = {
|
||||
|
||||
166, 147, 0, 0, 142, 9, 2, 1,
|
||||
0, 128, 0, 0, 82, 139, 0, 0,
|
||||
10, 0, 0, 0, 97, 95, 112, 111,
|
||||
115, 105, 116, 105, 111, 110, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 255, 255, 255, 255, 80, 139,
|
||||
0, 0, 10, 0, 0, 0, 97, 95,
|
||||
116, 101, 120, 67, 111, 111, 114, 100,
|
||||
1, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 255, 255, 255, 255,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
255, 255, 255, 255, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 255, 255, 255, 255,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
255, 255, 255, 255, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 255, 255, 255, 255,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
255, 255, 255, 255, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 255, 255, 255, 255,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
255, 255, 255, 255, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 255, 255, 255, 255,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
255, 255, 255, 255, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 255, 255, 255, 255,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
255, 255, 255, 255, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 255, 255, 255, 255,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 2, 0, 0, 0, 92, 139, 0,
|
||||
0, 242, 141, 0, 0, 12, 0, 0,
|
||||
0, 67, 67, 95, 77, 86, 80, 77,
|
||||
97, 116, 114, 105, 120, 0, 0, 0,
|
||||
0, 255, 255, 255, 255, 0, 0, 0,
|
||||
0, 4, 0, 0, 0, 82, 139, 0,
|
||||
0, 241, 141, 0, 0, 7, 0, 0,
|
||||
0, 117, 95, 99, 111, 108, 111, 114,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
255, 255, 255, 255, 1, 0, 0, 0,
|
||||
2, 0, 0, 0, 12, 0, 0, 0,
|
||||
67, 67, 95, 77, 86, 80, 77, 97,
|
||||
116, 114, 105, 120, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 7, 0, 0, 0,
|
||||
117, 95, 99, 111, 108, 111, 114, 0,
|
||||
0, 0, 0, 1, 0, 0, 0, 52,
|
||||
3, 0, 0, 40, 4, 0, 0, 0,
|
||||
0, 0, 0, 20, 134, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 68, 88, 66, 67, 153,
|
||||
8, 62, 201, 202, 170, 111, 182, 149,
|
||||
120, 120, 178, 230, 43, 232, 244, 1,
|
||||
0, 0, 0, 52, 3, 0, 0, 6,
|
||||
0, 0, 0, 56, 0, 0, 0, 168,
|
||||
0, 0, 0, 92, 1, 0, 0, 216,
|
||||
1, 0, 0, 168, 2, 0, 0, 184,
|
||||
2, 0, 0, 65, 111, 110, 57, 104,
|
||||
0, 0, 0, 104, 0, 0, 0, 0,
|
||||
2, 255, 255, 56, 0, 0, 0, 48,
|
||||
0, 0, 0, 1, 0, 36, 0, 0,
|
||||
0, 48, 0, 0, 0, 48, 0, 0,
|
||||
0, 36, 0, 0, 0, 48, 0, 0,
|
||||
0, 0, 0, 1, 0, 0, 0, 0,
|
||||
0, 0, 0, 1, 2, 255, 255, 1,
|
||||
0, 0, 2, 0, 8, 15, 128, 0,
|
||||
0, 228, 160, 1, 0, 0, 2, 1,
|
||||
8, 15, 128, 0, 0, 228, 160, 1,
|
||||
0, 0, 2, 2, 8, 15, 128, 0,
|
||||
0, 228, 160, 1, 0, 0, 2, 3,
|
||||
8, 15, 128, 0, 0, 228, 160, 255,
|
||||
255, 0, 0, 83, 72, 68, 82, 172,
|
||||
0, 0, 0, 64, 0, 0, 0, 43,
|
||||
0, 0, 0, 89, 0, 0, 4, 70,
|
||||
142, 32, 0, 0, 0, 0, 0, 1,
|
||||
0, 0, 0, 101, 0, 0, 3, 242,
|
||||
32, 16, 0, 0, 0, 0, 0, 101,
|
||||
0, 0, 3, 242, 32, 16, 0, 1,
|
||||
0, 0, 0, 101, 0, 0, 3, 242,
|
||||
32, 16, 0, 2, 0, 0, 0, 101,
|
||||
0, 0, 3, 242, 32, 16, 0, 3,
|
||||
0, 0, 0, 54, 0, 0, 6, 242,
|
||||
32, 16, 0, 0, 0, 0, 0, 70,
|
||||
142, 32, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 54, 0, 0, 6, 242,
|
||||
32, 16, 0, 1, 0, 0, 0, 70,
|
||||
142, 32, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 54, 0, 0, 6, 242,
|
||||
32, 16, 0, 2, 0, 0, 0, 70,
|
||||
142, 32, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 54, 0, 0, 6, 242,
|
||||
32, 16, 0, 3, 0, 0, 0, 70,
|
||||
142, 32, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 62, 0, 0, 1, 83,
|
||||
84, 65, 84, 116, 0, 0, 0, 5,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 4, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 1, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 4, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 82, 68, 69, 70, 200,
|
||||
0, 0, 0, 1, 0, 0, 0, 72,
|
||||
0, 0, 0, 1, 0, 0, 0, 28,
|
||||
0, 0, 0, 0, 4, 255, 255, 0,
|
||||
65, 0, 0, 148, 0, 0, 0, 60,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 1,
|
||||
0, 0, 0, 0, 0, 0, 0, 36,
|
||||
71, 108, 111, 98, 97, 108, 115, 0,
|
||||
171, 171, 171, 60, 0, 0, 0, 1,
|
||||
0, 0, 0, 96, 0, 0, 0, 16,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 120, 0, 0, 0, 0,
|
||||
0, 0, 0, 16, 0, 0, 0, 2,
|
||||
0, 0, 0, 132, 0, 0, 0, 0,
|
||||
0, 0, 0, 95, 117, 95, 99, 111,
|
||||
108, 111, 114, 0, 171, 171, 171, 1,
|
||||
0, 3, 0, 1, 0, 4, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 77,
|
||||
105, 99, 114, 111, 115, 111, 102, 116,
|
||||
32, 40, 82, 41, 32, 72, 76, 83,
|
||||
76, 32, 83, 104, 97, 100, 101, 114,
|
||||
32, 67, 111, 109, 112, 105, 108, 101,
|
||||
114, 32, 54, 46, 51, 46, 57, 54,
|
||||
48, 48, 46, 49, 54, 51, 56, 52,
|
||||
0, 171, 171, 73, 83, 71, 78, 8,
|
||||
0, 0, 0, 0, 0, 0, 0, 8,
|
||||
0, 0, 0, 79, 83, 71, 78, 116,
|
||||
0, 0, 0, 4, 0, 0, 0, 8,
|
||||
0, 0, 0, 104, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 3,
|
||||
0, 0, 0, 0, 0, 0, 0, 15,
|
||||
0, 0, 0, 104, 0, 0, 0, 1,
|
||||
0, 0, 0, 0, 0, 0, 0, 3,
|
||||
0, 0, 0, 1, 0, 0, 0, 15,
|
||||
0, 0, 0, 104, 0, 0, 0, 2,
|
||||
0, 0, 0, 0, 0, 0, 0, 3,
|
||||
0, 0, 0, 2, 0, 0, 0, 15,
|
||||
0, 0, 0, 104, 0, 0, 0, 3,
|
||||
0, 0, 0, 0, 0, 0, 0, 3,
|
||||
0, 0, 0, 3, 0, 0, 0, 15,
|
||||
0, 0, 0, 83, 86, 95, 84, 97,
|
||||
114, 103, 101, 116, 0, 171, 171, 68,
|
||||
88, 66, 67, 127, 38, 114, 44, 227,
|
||||
180, 68, 44, 235, 149, 12, 244, 164,
|
||||
251, 61, 185, 1, 0, 0, 0, 40,
|
||||
4, 0, 0, 6, 0, 0, 0, 56,
|
||||
0, 0, 0, 44, 1, 0, 0, 88,
|
||||
2, 0, 0, 212, 2, 0, 0, 168,
|
||||
3, 0, 0, 244, 3, 0, 0, 65,
|
||||
111, 110, 57, 236, 0, 0, 0, 236,
|
||||
0, 0, 0, 0, 2, 254, 255, 184,
|
||||
0, 0, 0, 52, 0, 0, 0, 1,
|
||||
0, 36, 0, 0, 0, 48, 0, 0,
|
||||
0, 48, 0, 0, 0, 36, 0, 1,
|
||||
0, 48, 0, 0, 0, 0, 0, 4,
|
||||
0, 1, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 1, 2, 254, 255, 81,
|
||||
0, 0, 5, 5, 0, 15, 160, 0,
|
||||
0, 0, 63, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 31,
|
||||
0, 0, 2, 5, 0, 0, 128, 0,
|
||||
0, 15, 144, 9, 0, 0, 3, 0,
|
||||
0, 1, 128, 3, 0, 228, 160, 0,
|
||||
0, 228, 144, 9, 0, 0, 3, 0,
|
||||
0, 2, 128, 4, 0, 228, 160, 0,
|
||||
0, 228, 144, 2, 0, 0, 3, 0,
|
||||
0, 1, 128, 0, 0, 85, 128, 0,
|
||||
0, 0, 128, 5, 0, 0, 3, 0,
|
||||
0, 4, 192, 0, 0, 0, 128, 5,
|
||||
0, 0, 160, 9, 0, 0, 3, 0,
|
||||
0, 1, 128, 2, 0, 228, 160, 0,
|
||||
0, 228, 144, 1, 0, 0, 2, 1,
|
||||
0, 2, 128, 0, 0, 0, 129, 9,
|
||||
0, 0, 3, 1, 0, 1, 128, 1,
|
||||
0, 228, 160, 0, 0, 228, 144, 4,
|
||||
0, 0, 4, 0, 0, 3, 192, 0,
|
||||
0, 85, 128, 0, 0, 228, 160, 1,
|
||||
0, 228, 128, 1, 0, 0, 2, 0,
|
||||
0, 8, 192, 0, 0, 85, 128, 255,
|
||||
255, 0, 0, 83, 72, 68, 82, 36,
|
||||
1, 0, 0, 64, 0, 1, 0, 73,
|
||||
0, 0, 0, 89, 0, 0, 4, 70,
|
||||
142, 32, 0, 0, 0, 0, 0, 4,
|
||||
0, 0, 0, 95, 0, 0, 3, 242,
|
||||
16, 16, 0, 0, 0, 0, 0, 103,
|
||||
0, 0, 4, 242, 32, 16, 0, 0,
|
||||
0, 0, 0, 1, 0, 0, 0, 104,
|
||||
0, 0, 2, 1, 0, 0, 0, 17,
|
||||
0, 0, 8, 18, 0, 16, 0, 0,
|
||||
0, 0, 0, 70, 142, 32, 0, 0,
|
||||
0, 0, 0, 1, 0, 0, 0, 70,
|
||||
30, 16, 0, 0, 0, 0, 0, 54,
|
||||
0, 0, 6, 34, 32, 16, 0, 0,
|
||||
0, 0, 0, 10, 0, 16, 128, 65,
|
||||
0, 0, 0, 0, 0, 0, 0, 17,
|
||||
0, 0, 8, 18, 0, 16, 0, 0,
|
||||
0, 0, 0, 70, 142, 32, 0, 0,
|
||||
0, 0, 0, 2, 0, 0, 0, 70,
|
||||
30, 16, 0, 0, 0, 0, 0, 17,
|
||||
0, 0, 8, 34, 0, 16, 0, 0,
|
||||
0, 0, 0, 70, 142, 32, 0, 0,
|
||||
0, 0, 0, 3, 0, 0, 0, 70,
|
||||
30, 16, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 7, 18, 0, 16, 0, 0,
|
||||
0, 0, 0, 26, 0, 16, 0, 0,
|
||||
0, 0, 0, 10, 0, 16, 0, 0,
|
||||
0, 0, 0, 54, 0, 0, 5, 130,
|
||||
32, 16, 0, 0, 0, 0, 0, 26,
|
||||
0, 16, 0, 0, 0, 0, 0, 56,
|
||||
0, 0, 7, 66, 32, 16, 0, 0,
|
||||
0, 0, 0, 10, 0, 16, 0, 0,
|
||||
0, 0, 0, 1, 64, 0, 0, 0,
|
||||
0, 0, 63, 17, 0, 0, 8, 18,
|
||||
32, 16, 0, 0, 0, 0, 0, 70,
|
||||
142, 32, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 70, 30, 16, 0, 0,
|
||||
0, 0, 0, 62, 0, 0, 1, 83,
|
||||
84, 65, 84, 116, 0, 0, 0, 9,
|
||||
0, 0, 0, 1, 0, 0, 0, 0,
|
||||
0, 0, 0, 2, 0, 0, 0, 7,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 1, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 1, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 82, 68, 69, 70, 204,
|
||||
0, 0, 0, 1, 0, 0, 0, 72,
|
||||
0, 0, 0, 1, 0, 0, 0, 28,
|
||||
0, 0, 0, 0, 4, 254, 255, 0,
|
||||
65, 0, 0, 152, 0, 0, 0, 60,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 0, 0, 0, 0, 1,
|
||||
0, 0, 0, 0, 0, 0, 0, 36,
|
||||
71, 108, 111, 98, 97, 108, 115, 0,
|
||||
171, 171, 171, 60, 0, 0, 0, 1,
|
||||
0, 0, 0, 96, 0, 0, 0, 64,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 120, 0, 0, 0, 0,
|
||||
0, 0, 0, 64, 0, 0, 0, 2,
|
||||
0, 0, 0, 136, 0, 0, 0, 0,
|
||||
0, 0, 0, 95, 67, 67, 95, 77,
|
||||
86, 80, 77, 97, 116, 114, 105, 120,
|
||||
0, 171, 171, 3, 0, 3, 0, 4,
|
||||
0, 4, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 77, 105, 99, 114, 111,
|
||||
115, 111, 102, 116, 32, 40, 82, 41,
|
||||
32, 72, 76, 83, 76, 32, 83, 104,
|
||||
97, 100, 101, 114, 32, 67, 111, 109,
|
||||
112, 105, 108, 101, 114, 32, 54, 46,
|
||||
51, 46, 57, 54, 48, 48, 46, 49,
|
||||
54, 51, 56, 52, 0, 171, 171, 73,
|
||||
83, 71, 78, 68, 0, 0, 0, 2,
|
||||
0, 0, 0, 8, 0, 0, 0, 56,
|
||||
0, 0, 0, 0, 0, 0, 0, 0,
|
||||
0, 0, 0, 3, 0, 0, 0, 0,
|
||||
0, 0, 0, 15, 15, 0, 0, 56,
|
||||
0, 0, 0, 1, 0, 0, 0, 0,
|
||||
0, 0, 0, 3, 0, 0, 0, 1,
|
||||
0, 0, 0, 3, 0, 0, 0, 84,
|
||||
69, 88, 67, 79, 79, 82, 68, 0,
|
||||
171, 171, 171, 79, 83, 71, 78, 44,
|
||||
0, 0, 0, 1, 0, 0, 0, 8,
|
||||
0, 0, 0, 32, 0, 0, 0, 0,
|
||||
0, 0, 0, 1, 0, 0, 0, 3,
|
||||
0, 0, 0, 0, 0, 0, 0, 15,
|
||||
0, 0, 0, 83, 86, 95, 80, 111,
|
||||
115, 105, 116, 105, 111, 110, 0,
|
||||
};
|
||||
|
||||
const unsigned char s_847DBFDDA6EC09C57E4ED43012AE2FB5CAC7D8D5[] = {
|
||||
|
||||
166, 147, 0, 0, 142, 9, 2, 1,
|
||||
|
|
@ -5929,7 +6642,7 @@ const unsigned char s_F6BA4519AF2653A53D57FB5D5508F0D8617105D6[] = {
|
|||
105, 111, 110, 0, 171, 171, 171,
|
||||
};
|
||||
|
||||
const int s_numPrograms = 15;
|
||||
const int s_programLengths[] = {2990,2528,4102,3022,2996,3358,2982,3300,3350,3025,3556,2502,2675,3746,2775};
|
||||
const unsigned char* s_programs[] = {s_133478C5A874C1E6F59B418CE6C7C39F1AE0F873,s_13E33F532157A58EC77EDE3B3112560A89D272B2,s_1A69A7CC77C7C8FC62799B0513816EA41FBF3BFE,s_53938AB67AD93ABA0DDB87F3C9889304284E011E,s_67837675F2BB48C0E926316F505FC1538228E0FA,s_78250E25D1929D4A842050738140787BE42541C6,s_7B67DD242152D35ACC079265FAD9D03DC98182DE,s_847DBFDDA6EC09C57E4ED43012AE2FB5CAC7D8D5,s_92BE325B516F887D2C928EDE20ADF428DB01C038,s_A2377A827972A5466DA8637681045D32DA8A817D,s_B5E27B4F3CF7236633255B28CBA530D6EE5CED86,s_E2C7CE1244DE9C76688EFA9463B2A130B6A08893,s_E2D56227712263272BD5218FEA117CD06180F81B,s_F46558C274182079784898CF4968CF431593D5E2,s_F6BA4519AF2653A53D57FB5D5508F0D8617105D6};
|
||||
const char* s_programKeys[] = {"133478C5A874C1E6F59B418CE6C7C39F1AE0F873","13E33F532157A58EC77EDE3B3112560A89D272B2","1A69A7CC77C7C8FC62799B0513816EA41FBF3BFE","53938AB67AD93ABA0DDB87F3C9889304284E011E","67837675F2BB48C0E926316F505FC1538228E0FA","78250E25D1929D4A842050738140787BE42541C6","7B67DD242152D35ACC079265FAD9D03DC98182DE","847DBFDDA6EC09C57E4ED43012AE2FB5CAC7D8D5","92BE325B516F887D2C928EDE20ADF428DB01C038","A2377A827972A5466DA8637681045D32DA8A817D","B5E27B4F3CF7236633255B28CBA530D6EE5CED86","E2C7CE1244DE9C76688EFA9463B2A130B6A08893","E2D56227712263272BD5218FEA117CD06180F81B","F46558C274182079784898CF4968CF431593D5E2","F6BA4519AF2653A53D57FB5D5508F0D8617105D6"};
|
||||
const int s_numPrograms = 17;
|
||||
const int s_programLengths[] = {2990,2528,4102,3022,2996,3358,2982,3073,2559,3300,3350,3025,3556,2502,2675,3746,2775};
|
||||
const unsigned char* s_programs[] = {s_133478C5A874C1E6F59B418CE6C7C39F1AE0F873,s_13E33F532157A58EC77EDE3B3112560A89D272B2,s_1A69A7CC77C7C8FC62799B0513816EA41FBF3BFE,s_53938AB67AD93ABA0DDB87F3C9889304284E011E,s_67837675F2BB48C0E926316F505FC1538228E0FA,s_78250E25D1929D4A842050738140787BE42541C6,s_7B67DD242152D35ACC079265FAD9D03DC98182DE,s_7CE5EE84ACB6110F7FA29152ECE3344CB6D6620D,s_7E1EEF397305D0BC2DCDBA4F2DAFBCBA1534E45C,s_847DBFDDA6EC09C57E4ED43012AE2FB5CAC7D8D5,s_92BE325B516F887D2C928EDE20ADF428DB01C038,s_A2377A827972A5466DA8637681045D32DA8A817D,s_B5E27B4F3CF7236633255B28CBA530D6EE5CED86,s_E2C7CE1244DE9C76688EFA9463B2A130B6A08893,s_E2D56227712263272BD5218FEA117CD06180F81B,s_F46558C274182079784898CF4968CF431593D5E2,s_F6BA4519AF2653A53D57FB5D5508F0D8617105D6};
|
||||
const char* s_programKeys[] = {"133478C5A874C1E6F59B418CE6C7C39F1AE0F873","13E33F532157A58EC77EDE3B3112560A89D272B2","1A69A7CC77C7C8FC62799B0513816EA41FBF3BFE","53938AB67AD93ABA0DDB87F3C9889304284E011E","67837675F2BB48C0E926316F505FC1538228E0FA","78250E25D1929D4A842050738140787BE42541C6","7B67DD242152D35ACC079265FAD9D03DC98182DE","7CE5EE84ACB6110F7FA29152ECE3344CB6D6620D","7E1EEF397305D0BC2DCDBA4F2DAFBCBA1534E45C","847DBFDDA6EC09C57E4ED43012AE2FB5CAC7D8D5","92BE325B516F887D2C928EDE20ADF428DB01C038","A2377A827972A5466DA8637681045D32DA8A817D","B5E27B4F3CF7236633255B28CBA530D6EE5CED86","E2C7CE1244DE9C76688EFA9463B2A130B6A08893","E2D56227712263272BD5218FEA117CD06180F81B","F46558C274182079784898CF4968CF431593D5E2","F6BA4519AF2653A53D57FB5D5508F0D8617105D6"};
|
||||
|
|
|
|||
|
|
@ -504,6 +504,10 @@ bool GLProgram::link()
|
|||
if(!_hasShaderCompiler)
|
||||
{
|
||||
// precompiled shader program is already linked
|
||||
|
||||
//bindPredefinedVertexAttribs();
|
||||
parseVertexAttribs();
|
||||
parseUniforms();
|
||||
return true;
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -268,7 +268,11 @@ void TextureCache::addImageAsyncCallBack(float dt)
|
|||
texture = it->second;
|
||||
}
|
||||
|
||||
asyncStruct->callback(texture);
|
||||
if (asyncStruct->callback)
|
||||
{
|
||||
asyncStruct->callback(texture);
|
||||
}
|
||||
|
||||
if(image)
|
||||
{
|
||||
image->release();
|
||||
|
|
|
|||
|
|
@ -43,4 +43,11 @@
|
|||
-- @param #cc.Node node
|
||||
-- @return ClippingNode#ClippingNode ret (retunr value: cc.ClippingNode)
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#ClippingNode] visit
|
||||
-- @param self
|
||||
-- @param #cc.Renderer renderer
|
||||
-- @param #cc.Mat4 mat4
|
||||
-- @param #bool bool
|
||||
|
||||
return nil
|
||||
|
|
|
|||
|
|
@ -41,6 +41,11 @@
|
|||
-- @param #string str
|
||||
-- @return array_table#array_table ret (return value: array_table)
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#FileUtils] getSearchPaths
|
||||
-- @param self
|
||||
-- @return array_table#array_table ret (return value: array_table)
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#FileUtils] writeToFile
|
||||
-- @param self
|
||||
|
|
@ -54,6 +59,16 @@
|
|||
-- @param #string str
|
||||
-- @return map_table#map_table ret (return value: map_table)
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#FileUtils] setSearchPaths
|
||||
-- @param self
|
||||
-- @param #array_table array
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#FileUtils] setSearchResolutionsOrder
|
||||
-- @param self
|
||||
-- @param #array_table array
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#FileUtils] addSearchResolutionsOrder
|
||||
-- @param self
|
||||
|
|
@ -86,6 +101,11 @@
|
|||
-- @param self
|
||||
-- @param #bool bool
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#FileUtils] getSearchResolutionsOrder
|
||||
-- @param self
|
||||
-- @return array_table#array_table ret (return value: array_table)
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#FileUtils] getWritablePath
|
||||
-- @param self
|
||||
|
|
|
|||
|
|
@ -0,0 +1,39 @@
|
|||
|
||||
--------------------------------
|
||||
-- @module GLProgramCache
|
||||
-- @extend Ref
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#GLProgramCache] addGLProgram
|
||||
-- @param self
|
||||
-- @param #cc.GLProgram glprogram
|
||||
-- @param #string str
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#GLProgramCache] getGLProgram
|
||||
-- @param self
|
||||
-- @param #string str
|
||||
-- @return GLProgram#GLProgram ret (return value: cc.GLProgram)
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#GLProgramCache] reloadDefaultGLPrograms
|
||||
-- @param self
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#GLProgramCache] loadDefaultGLPrograms
|
||||
-- @param self
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#GLProgramCache] destroyInstance
|
||||
-- @param self
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#GLProgramCache] getInstance
|
||||
-- @param self
|
||||
-- @return GLProgramCache#GLProgramCache ret (return value: cc.GLProgramCache)
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#GLProgramCache] GLProgramCache
|
||||
-- @param self
|
||||
|
||||
return nil
|
||||
|
|
@ -0,0 +1,100 @@
|
|||
|
||||
--------------------------------
|
||||
-- @module GLProgramState
|
||||
-- @extend Ref
|
||||
|
||||
--------------------------------
|
||||
-- overload function: setUniformTexture(string, unsigned int)
|
||||
--
|
||||
-- overload function: setUniformTexture(string, cc.Texture2D)
|
||||
--
|
||||
-- @function [parent=#GLProgramState] setUniformTexture
|
||||
-- @param self
|
||||
-- @param #string str
|
||||
-- @param #cc.Texture2D texture2d
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#GLProgramState] setUniformMat4
|
||||
-- @param self
|
||||
-- @param #string str
|
||||
-- @param #cc.Mat4 mat4
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#GLProgramState] getUniformCount
|
||||
-- @param self
|
||||
-- @return long#long ret (return value: long)
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#GLProgramState] setUniformFloat
|
||||
-- @param self
|
||||
-- @param #string str
|
||||
-- @param #float float
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#GLProgramState] setUniformVec3
|
||||
-- @param self
|
||||
-- @param #string str
|
||||
-- @param #cc.Vec3 vec3
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#GLProgramState] setGLProgram
|
||||
-- @param self
|
||||
-- @param #cc.GLProgram glprogram
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#GLProgramState] setUniformVec4
|
||||
-- @param self
|
||||
-- @param #string str
|
||||
-- @param #cc.Vec4 vec4
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#GLProgramState] getVertexAttribCount
|
||||
-- @param self
|
||||
-- @return long#long ret (return value: long)
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#GLProgramState] setUniformInt
|
||||
-- @param self
|
||||
-- @param #string str
|
||||
-- @param #int int
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#GLProgramState] setUniformVec2
|
||||
-- @param self
|
||||
-- @param #string str
|
||||
-- @param #cc.Vec2 vec2
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#GLProgramState] getVertexAttribsFlags
|
||||
-- @param self
|
||||
-- @return unsigned int#unsigned int ret (return value: unsigned int)
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#GLProgramState] apply
|
||||
-- @param self
|
||||
-- @param #cc.Mat4 mat4
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#GLProgramState] getGLProgram
|
||||
-- @param self
|
||||
-- @return GLProgram#GLProgram ret (return value: cc.GLProgram)
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#GLProgramState] create
|
||||
-- @param self
|
||||
-- @param #cc.GLProgram glprogram
|
||||
-- @return GLProgramState#GLProgramState ret (return value: cc.GLProgramState)
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#GLProgramState] getOrCreateWithGLProgramName
|
||||
-- @param self
|
||||
-- @param #string str
|
||||
-- @return GLProgramState#GLProgramState ret (return value: cc.GLProgramState)
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#GLProgramState] getOrCreateWithGLProgram
|
||||
-- @param self
|
||||
-- @param #cc.GLProgram glprogram
|
||||
-- @return GLProgramState#GLProgramState ret (return value: cc.GLProgramState)
|
||||
|
||||
return nil
|
||||
|
|
@ -301,6 +301,13 @@
|
|||
-- @param self
|
||||
-- @param #cc.BlendFunc blendfunc
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#Label] visit
|
||||
-- @param self
|
||||
-- @param #cc.Renderer renderer
|
||||
-- @param #cc.Mat4 mat4
|
||||
-- @param #bool bool
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#Label] getScaleX
|
||||
-- @param self
|
||||
|
|
|
|||
|
|
@ -177,6 +177,13 @@
|
|||
-- @param self
|
||||
-- @return size_table#size_table ret (return value: size_table)
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#LabelTTF] visit
|
||||
-- @param self
|
||||
-- @param #cc.Renderer renderer
|
||||
-- @param #cc.Mat4 mat4
|
||||
-- @param #bool bool
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#LabelTTF] LabelTTF
|
||||
-- @param self
|
||||
|
|
|
|||
|
|
@ -0,0 +1,66 @@
|
|||
|
||||
--------------------------------
|
||||
-- @module Mesh
|
||||
-- @extend Ref
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#Mesh] restore
|
||||
-- @param self
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#Mesh] getMeshVertexAttribCount
|
||||
-- @param self
|
||||
-- @return long#long ret (return value: long)
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#Mesh] getIndexFormat
|
||||
-- @param self
|
||||
-- @return Mesh::IndexFormat#Mesh::IndexFormat ret (return value: cc.Mesh::IndexFormat)
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#Mesh] getVertexSizeInBytes
|
||||
-- @param self
|
||||
-- @return int#int ret (return value: int)
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#Mesh] getPrimitiveType
|
||||
-- @param self
|
||||
-- @return Mesh::PrimitiveType#Mesh::PrimitiveType ret (return value: cc.Mesh::PrimitiveType)
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#Mesh] getIndexCount
|
||||
-- @param self
|
||||
-- @return long#long ret (return value: long)
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#Mesh] getVertexBuffer
|
||||
-- @param self
|
||||
-- @return unsigned int#unsigned int ret (return value: unsigned int)
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#Mesh] getMeshVertexAttribute
|
||||
-- @param self
|
||||
-- @param #int int
|
||||
-- @return MeshVertexAttrib#MeshVertexAttrib ret (return value: cc.MeshVertexAttrib)
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#Mesh] getIndexBuffer
|
||||
-- @param self
|
||||
-- @return unsigned int#unsigned int ret (return value: unsigned int)
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#Mesh] hasVertexAttrib
|
||||
-- @param self
|
||||
-- @param #int int
|
||||
-- @return bool#bool ret (return value: bool)
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#Mesh] create
|
||||
-- @param self
|
||||
-- @param #array_table array
|
||||
-- @param #array_table array
|
||||
-- @param #array_table array
|
||||
-- @param #array_table vector<short, std::allocator<short> >
|
||||
-- @return Mesh#Mesh ret (return value: cc.Mesh)
|
||||
|
||||
return nil
|
||||
|
|
@ -315,6 +315,17 @@
|
|||
-- @param #cc.Component component
|
||||
-- @return bool#bool ret (return value: bool)
|
||||
|
||||
--------------------------------
|
||||
-- overload function: visit()
|
||||
--
|
||||
-- overload function: visit(cc.Renderer, cc.Mat4, bool)
|
||||
--
|
||||
-- @function [parent=#Node] visit
|
||||
-- @param self
|
||||
-- @param #cc.Renderer renderer
|
||||
-- @param #cc.Mat4 mat4
|
||||
-- @param #bool bool
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#Node] isOpacityModifyRGB
|
||||
-- @param self
|
||||
|
|
|
|||
|
|
@ -27,4 +27,11 @@
|
|||
-- @param self
|
||||
-- @return NodeGrid#NodeGrid ret (return value: cc.NodeGrid)
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#NodeGrid] visit
|
||||
-- @param self
|
||||
-- @param #cc.Renderer renderer
|
||||
-- @param #cc.Mat4 mat4
|
||||
-- @param #bool bool
|
||||
|
||||
return nil
|
||||
|
|
|
|||
|
|
@ -33,6 +33,13 @@
|
|||
-- @param #int int
|
||||
-- @param #int int
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#ParallaxNode] visit
|
||||
-- @param self
|
||||
-- @param #cc.Renderer renderer
|
||||
-- @param #cc.Mat4 mat4
|
||||
-- @param #bool bool
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#ParallaxNode] removeChild
|
||||
-- @param self
|
||||
|
|
|
|||
|
|
@ -73,6 +73,13 @@
|
|||
-- @param #cc.Mat4 mat4
|
||||
-- @param #bool bool
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#ParticleBatchNode] visit
|
||||
-- @param self
|
||||
-- @param #cc.Renderer renderer
|
||||
-- @param #cc.Mat4 mat4
|
||||
-- @param #bool bool
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#ParticleBatchNode] reorderChild
|
||||
-- @param self
|
||||
|
|
|
|||
|
|
@ -62,6 +62,13 @@
|
|||
-- @param self
|
||||
-- @return ProtectedNode#ProtectedNode ret (return value: cc.ProtectedNode)
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#ProtectedNode] visit
|
||||
-- @param self
|
||||
-- @param #cc.Renderer renderer
|
||||
-- @param #cc.Mat4 mat4
|
||||
-- @param #bool bool
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#ProtectedNode] updateDisplayedOpacity
|
||||
-- @param self
|
||||
|
|
|
|||
|
|
@ -172,6 +172,13 @@
|
|||
-- @param #cc.Mat4 mat4
|
||||
-- @param #bool bool
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#RenderTexture] visit
|
||||
-- @param self
|
||||
-- @param #cc.Renderer renderer
|
||||
-- @param #cc.Mat4 mat4
|
||||
-- @param #bool bool
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#RenderTexture] RenderTexture
|
||||
-- @param self
|
||||
|
|
|
|||
|
|
@ -12,6 +12,11 @@
|
|||
-- @param self
|
||||
-- @param #string str
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#Sprite3D] getMesh
|
||||
-- @param self
|
||||
-- @return Mesh#Mesh ret (return value: cc.Mesh)
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#Sprite3D] getBlendFunc
|
||||
-- @param self
|
||||
|
|
|
|||
|
|
@ -126,6 +126,13 @@
|
|||
-- @param self
|
||||
-- @return string#string ret (return value: string)
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#SpriteBatchNode] visit
|
||||
-- @param self
|
||||
-- @param #cc.Renderer renderer
|
||||
-- @param #cc.Mat4 mat4
|
||||
-- @param #bool bool
|
||||
|
||||
--------------------------------
|
||||
-- @function [parent=#SpriteBatchNode] sortAllChildren
|
||||
-- @param self
|
||||
|
|
|
|||
|
|
@ -51,6 +51,11 @@
|
|||
-- @field [parent=#cc] Node#Node Node preloaded module
|
||||
|
||||
|
||||
--------------------------------------------------------
|
||||
-- the cc GLProgramState
|
||||
-- @field [parent=#cc] GLProgramState#GLProgramState GLProgramState preloaded module
|
||||
|
||||
|
||||
--------------------------------------------------------
|
||||
-- the cc AtlasNode
|
||||
-- @field [parent=#cc] AtlasNode#AtlasNode AtlasNode preloaded module
|
||||
|
|
@ -1126,6 +1131,11 @@
|
|||
-- @field [parent=#cc] TiledGrid3D#TiledGrid3D TiledGrid3D preloaded module
|
||||
|
||||
|
||||
--------------------------------------------------------
|
||||
-- the cc GLProgramCache
|
||||
-- @field [parent=#cc] GLProgramCache#GLProgramCache GLProgramCache preloaded module
|
||||
|
||||
|
||||
--------------------------------------------------------
|
||||
-- the cc TextureCache
|
||||
-- @field [parent=#cc] TextureCache#TextureCache TextureCache preloaded module
|
||||
|
|
@ -1206,6 +1216,11 @@
|
|||
-- @field [parent=#cc] Sprite3D#Sprite3D Sprite3D preloaded module
|
||||
|
||||
|
||||
--------------------------------------------------------
|
||||
-- the cc Mesh
|
||||
-- @field [parent=#cc] Mesh#Mesh Mesh preloaded module
|
||||
|
||||
|
||||
--------------------------------------------------------
|
||||
-- the cc SimpleAudioEngine
|
||||
-- @field [parent=#cc] SimpleAudioEngine#SimpleAudioEngine SimpleAudioEngine preloaded module
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1548,6 +1548,49 @@ int register_all_cocos2dx(lua_State* tolua_S);
|
|||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -340,6 +340,48 @@ bool luaval_to_vec3(lua_State* L,int lo,cocos2d::Vec3* outValue)
|
|||
return ok;
|
||||
}
|
||||
|
||||
bool luaval_to_vec4(lua_State* L,int lo,cocos2d::Vec4* outValue)
|
||||
{
|
||||
if (nullptr == L || nullptr == outValue)
|
||||
return false;
|
||||
|
||||
bool ok = true;
|
||||
|
||||
tolua_Error tolua_err;
|
||||
if (!tolua_istable(L, lo, 0, &tolua_err) )
|
||||
{
|
||||
#if COCOS2D_DEBUG >=1
|
||||
luaval_to_native_err(L,"#ferror:",&tolua_err);
|
||||
#endif
|
||||
ok = false;
|
||||
}
|
||||
|
||||
|
||||
if (ok)
|
||||
{
|
||||
lua_pushstring(L, "x");
|
||||
lua_gettable(L, lo);
|
||||
outValue->x = lua_isnil(L, -1) ? 0 : lua_tonumber(L, -1);
|
||||
lua_pop(L, 1);
|
||||
|
||||
lua_pushstring(L, "y");
|
||||
lua_gettable(L, lo);
|
||||
outValue->y = lua_isnil(L, -1) ? 0 : lua_tonumber(L, -1);
|
||||
lua_pop(L, 1);
|
||||
|
||||
lua_pushstring(L, "z");
|
||||
lua_gettable(L, lo);
|
||||
outValue->y = lua_isnil(L, -1) ? 0 : lua_tonumber(L, -1);
|
||||
lua_pop(L, 1);
|
||||
|
||||
lua_pushstring(L, "w");
|
||||
lua_gettable(L, lo);
|
||||
outValue->y = lua_isnil(L, -1) ? 0 : lua_tonumber(L, -1);
|
||||
lua_pop(L, 1);
|
||||
}
|
||||
return ok;
|
||||
}
|
||||
|
||||
bool luaval_to_blendfunc(lua_State* L, int lo, cocos2d::BlendFunc* outValue)
|
||||
{
|
||||
if (nullptr == L || nullptr == outValue)
|
||||
|
|
@ -1697,6 +1739,129 @@ bool luaval_to_std_vector_int(lua_State* L, int lo, std::vector<int>* ret)
|
|||
return ok;
|
||||
}
|
||||
|
||||
bool luaval_to_mesh_vertex_attrib(lua_State* L, int lo, cocos2d::MeshVertexAttrib* ret)
|
||||
{
|
||||
if (nullptr == L || nullptr == ret || lua_gettop(L) < lo)
|
||||
return false;
|
||||
|
||||
tolua_Error tolua_err;
|
||||
bool ok = true;
|
||||
|
||||
if (!tolua_istable(L, lo, 0, &tolua_err))
|
||||
{
|
||||
#if COCOS2D_DEBUG >=1
|
||||
luaval_to_native_err(L,"#ferror:",&tolua_err);
|
||||
#endif
|
||||
ok = false;
|
||||
}
|
||||
|
||||
|
||||
if (ok)
|
||||
{
|
||||
lua_pushstring(L, "size"); /* L: paramStack key */
|
||||
lua_gettable(L,lo); /* L: paramStack paramStack[lo][key] */
|
||||
ret->size = (GLint)lua_tonumber(L, -1);
|
||||
lua_pop(L,1);
|
||||
|
||||
lua_pushstring(L, "type"); /* L: paramStack key */
|
||||
lua_gettable(L,lo); /* L: paramStack paramStack[lo][key] */
|
||||
ret->type = (GLenum)lua_tonumber(L, -1);
|
||||
lua_pop(L,1);
|
||||
|
||||
lua_pushstring(L, "vertexAttrib"); /* L: paramStack key */
|
||||
lua_gettable(L,lo); /* L: paramStack paramStack[lo][key] */
|
||||
ret->type = (GLenum)lua_tonumber(L, -1);
|
||||
lua_pop(L,1);
|
||||
|
||||
lua_pushstring(L, "vertexAttrib"); /* L: paramStack key */
|
||||
lua_gettable(L,lo); /* L: paramStack paramStack[lo][key] */
|
||||
ret->type = (GLenum)lua_tonumber(L, -1);
|
||||
lua_pop(L,1);
|
||||
}
|
||||
|
||||
return ok;
|
||||
|
||||
}
|
||||
|
||||
bool luaval_to_std_vector_float(lua_State* L, int lo, std::vector<float>* ret)
|
||||
{
|
||||
if (nullptr == L || nullptr == ret || lua_gettop(L) < lo)
|
||||
return false;
|
||||
|
||||
tolua_Error tolua_err;
|
||||
bool ok = true;
|
||||
|
||||
if (!tolua_istable(L, lo, 0, &tolua_err))
|
||||
{
|
||||
#if COCOS2D_DEBUG >=1
|
||||
luaval_to_native_err(L,"#ferror:",&tolua_err);
|
||||
#endif
|
||||
ok = false;
|
||||
}
|
||||
|
||||
if (ok)
|
||||
{
|
||||
size_t len = lua_objlen(L, lo);
|
||||
for (int i = 0; i < len; i++)
|
||||
{
|
||||
lua_pushnumber(L, i + 1);
|
||||
lua_gettable(L,lo);
|
||||
if(lua_isnumber(L, -1))
|
||||
{
|
||||
ret->push_back((float)tolua_tonumber(L, -1, 0));
|
||||
}
|
||||
else
|
||||
{
|
||||
CCASSERT(false, "float type is needed");
|
||||
}
|
||||
|
||||
lua_pop(L, 1);
|
||||
}
|
||||
}
|
||||
|
||||
return ok;
|
||||
}
|
||||
|
||||
|
||||
bool luaval_to_std_vector_ushort(lua_State* L, int lo, std::vector<unsigned short>* ret)
|
||||
{
|
||||
if (nullptr == L || nullptr == ret || lua_gettop(L) < lo)
|
||||
return false;
|
||||
|
||||
tolua_Error tolua_err;
|
||||
bool ok = true;
|
||||
|
||||
if (!tolua_istable(L, lo, 0, &tolua_err))
|
||||
{
|
||||
#if COCOS2D_DEBUG >=1
|
||||
luaval_to_native_err(L,"#ferror:",&tolua_err);
|
||||
#endif
|
||||
ok = false;
|
||||
}
|
||||
|
||||
if (ok)
|
||||
{
|
||||
size_t len = lua_objlen(L, lo);
|
||||
for (int i = 0; i < len; i++)
|
||||
{
|
||||
lua_pushnumber(L, i + 1);
|
||||
lua_gettable(L,lo);
|
||||
if(lua_isnumber(L, -1))
|
||||
{
|
||||
ret->push_back((unsigned short)tolua_tonumber(L, -1, 0));
|
||||
}
|
||||
else
|
||||
{
|
||||
CCASSERT(false, "unsigned short type is needed");
|
||||
}
|
||||
|
||||
lua_pop(L, 1);
|
||||
}
|
||||
}
|
||||
|
||||
return ok;
|
||||
}
|
||||
|
||||
void vec2_array_to_luaval(lua_State* L,const cocos2d::Vec2* points, int count)
|
||||
{
|
||||
if (NULL == L)
|
||||
|
|
@ -1741,6 +1906,26 @@ void vec3_to_luaval(lua_State* L,const cocos2d::Vec3& vec3)
|
|||
lua_rawset(L, -3);
|
||||
}
|
||||
|
||||
void vec4_to_luaval(lua_State* L,const cocos2d::Vec4& vec3)
|
||||
{
|
||||
if (NULL == L)
|
||||
return;
|
||||
|
||||
lua_newtable(L); /* L: table */
|
||||
lua_pushstring(L, "x"); /* L: table key */
|
||||
lua_pushnumber(L, (lua_Number) vec3.x); /* L: table key value*/
|
||||
lua_rawset(L, -3); /* table[key] = value, L: table */
|
||||
lua_pushstring(L, "y"); /* L: table key */
|
||||
lua_pushnumber(L, (lua_Number) vec3.y); /* L: table key value*/
|
||||
lua_rawset(L, -3);
|
||||
lua_pushstring(L, "z"); /* L: table key */
|
||||
lua_pushnumber(L, (lua_Number) vec3.z); /* L: table key value*/
|
||||
lua_rawset(L, -3);
|
||||
lua_pushstring(L, "w"); /* L: table key */
|
||||
lua_pushnumber(L, (lua_Number) vec3.z); /* L: table key value*/
|
||||
lua_rawset(L, -3);
|
||||
}
|
||||
|
||||
void physics_material_to_luaval(lua_State* L,const PhysicsMaterial& pm)
|
||||
{
|
||||
if (nullptr == L)
|
||||
|
|
@ -2476,3 +2661,97 @@ void ttfconfig_to_luaval(lua_State* L, const cocos2d::TTFConfig& config)
|
|||
lua_pushnumber(L, (lua_Number)config.outlineSize);
|
||||
lua_rawset(L, -3);
|
||||
}
|
||||
|
||||
void mesh_vertex_attrib_to_luaval(lua_State* L, const cocos2d::MeshVertexAttrib& inValue)
|
||||
{
|
||||
if (nullptr == L)
|
||||
return;
|
||||
|
||||
lua_newtable(L);
|
||||
|
||||
lua_pushstring(L, "size");
|
||||
lua_pushnumber(L, (lua_Number)inValue.size);
|
||||
lua_rawset(L, -3);
|
||||
|
||||
lua_pushstring(L, "type");
|
||||
lua_pushnumber(L, (lua_Number)inValue.type);
|
||||
lua_rawset(L, -3);
|
||||
|
||||
lua_pushstring(L, "vertexAttrib");
|
||||
lua_pushnumber(L, (lua_Number)inValue.vertexAttrib);
|
||||
lua_rawset(L, -3);
|
||||
|
||||
lua_pushstring(L, "attribSizeBytes");
|
||||
lua_pushnumber(L, (lua_Number)inValue.attribSizeBytes);
|
||||
lua_rawset(L, -3);
|
||||
}
|
||||
|
||||
|
||||
void ccvector_std_string_to_luaval(lua_State* L, const std::vector<std::string>& inValue)
|
||||
{
|
||||
if (nullptr == L)
|
||||
return;
|
||||
|
||||
lua_newtable(L);
|
||||
|
||||
int index = 1;
|
||||
|
||||
for (const std::string value : inValue)
|
||||
{
|
||||
lua_pushnumber(L, (lua_Number)index);
|
||||
lua_pushstring(L, value.c_str());
|
||||
lua_rawset(L, -3);
|
||||
++index;
|
||||
}
|
||||
}
|
||||
|
||||
void ccvector_int_to_luaval(lua_State* L, const std::vector<int>& inValue)
|
||||
{
|
||||
if (nullptr == L)
|
||||
return;
|
||||
|
||||
lua_newtable(L);
|
||||
|
||||
int index = 1;
|
||||
for (const int value : inValue)
|
||||
{
|
||||
lua_pushnumber(L, (lua_Number)index);
|
||||
lua_pushnumber(L, (lua_Number)value);
|
||||
lua_rawset(L, -3);
|
||||
++index;
|
||||
}
|
||||
}
|
||||
|
||||
void ccvector_float_to_luaval(lua_State* L, const std::vector<float>& inValue)
|
||||
{
|
||||
if (nullptr == L)
|
||||
return;
|
||||
|
||||
lua_newtable(L);
|
||||
|
||||
int index = 1;
|
||||
for (const float value : inValue)
|
||||
{
|
||||
lua_pushnumber(L, (lua_Number)index);
|
||||
lua_pushnumber(L, (lua_Number)value);
|
||||
lua_rawset(L, -3);
|
||||
++index;
|
||||
}
|
||||
}
|
||||
|
||||
void ccvector_ushort_to_luaval(lua_State* L, const std::vector<unsigned short>& inValue)
|
||||
{
|
||||
if (nullptr == L)
|
||||
return;
|
||||
|
||||
lua_newtable(L);
|
||||
|
||||
int index = 1;
|
||||
for (const unsigned short value : inValue)
|
||||
{
|
||||
lua_pushnumber(L, (lua_Number)index);
|
||||
lua_pushnumber(L, (lua_Number)value);
|
||||
lua_rawset(L, -3);
|
||||
++index;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -73,6 +73,7 @@ extern bool luavals_variadic_to_array(lua_State* L,int argc, __Array** ret);
|
|||
extern bool luavals_variadic_to_ccvaluevector(lua_State* L, int argc, cocos2d::ValueVector* ret);
|
||||
extern bool luaval_to_vec2(lua_State* L,int lo,cocos2d::Vec2* outValue);
|
||||
extern bool luaval_to_vec3(lua_State* L,int lo,cocos2d::Vec3* outValue);
|
||||
extern bool luaval_to_vec4(lua_State* L,int lo,cocos2d::Vec4* outValue);
|
||||
extern bool luaval_to_blendfunc(lua_State* L, int lo, cocos2d::BlendFunc* outValue);
|
||||
extern bool luaval_to_ttfconfig(lua_State* L, int lo, cocos2d::TTFConfig* outValue);
|
||||
|
||||
|
|
@ -228,10 +229,14 @@ bool luaval_to_object(lua_State* L, int lo, const char* type, T** ret)
|
|||
return true;
|
||||
}
|
||||
|
||||
extern bool luaval_to_mesh_vertex_attrib(lua_State* L, int lo, cocos2d::MeshVertexAttrib* ret);
|
||||
extern bool luaval_to_std_vector_float(lua_State* L, int lo, std::vector<float>* ret);
|
||||
extern bool luaval_to_std_vector_ushort(lua_State* L, int lo, std::vector<unsigned short>* ret);
|
||||
|
||||
// from native
|
||||
extern void vec2_to_luaval(lua_State* L,const cocos2d::Vec2& vec2);
|
||||
extern void vec3_to_luaval(lua_State* L,const cocos2d::Vec3& vec3);
|
||||
extern void vec4_to_luaval(lua_State* L,const cocos2d::Vec4& vec3);
|
||||
extern void vec2_array_to_luaval(lua_State* L,const cocos2d::Vec2* points, int count);
|
||||
extern void size_to_luaval(lua_State* L,const Size& sz);
|
||||
extern void rect_to_luaval(lua_State* L,const Rect& rt);
|
||||
|
|
@ -372,4 +377,10 @@ void object_to_luaval(lua_State* L,const char* type, T* ret)
|
|||
}
|
||||
}
|
||||
|
||||
void mesh_vertex_attrib_to_luaval(lua_State* L, const cocos2d::MeshVertexAttrib& inValue);
|
||||
void ccvector_std_string_to_luaval(lua_State* L, const std::vector<std::string>& inValue);
|
||||
void ccvector_int_to_luaval(lua_State* L, const std::vector<int>& inValue);
|
||||
void ccvector_float_to_luaval(lua_State* L, const std::vector<float>& inValue);
|
||||
void ccvector_ushort_to_luaval(lua_State* L, const std::vector<unsigned short>& inValue);
|
||||
|
||||
#endif //__COCOS2DX_SCRIPTING_LUA_COCOS2DXSUPPORT_LUABAISCCONVERSIONS_H__
|
||||
|
|
|
|||
|
|
@ -1447,7 +1447,7 @@ static int tolua_Cocos2d_glDrawElements00(lua_State* tolua_S)
|
|||
!tolua_isnumber(tolua_S,2,0,&tolua_err) ||
|
||||
!tolua_isnumber(tolua_S,3,0,&tolua_err) ||
|
||||
!tolua_isnumber(tolua_S,4,0,&tolua_err) ||
|
||||
!tolua_istable(tolua_S,5,0,&tolua_err) ||
|
||||
!tolua_istable(tolua_S,5,1,&tolua_err) ||
|
||||
!tolua_isnoobj(tolua_S,6, &tolua_err)
|
||||
)
|
||||
goto tolua_lerror;
|
||||
|
|
@ -1460,45 +1460,70 @@ static int tolua_Cocos2d_glDrawElements00(lua_State* tolua_S)
|
|||
unsigned int arg3 = (unsigned int)tolua_tonumber(tolua_S, 4, 0);
|
||||
if (GL_UNSIGNED_BYTE == arg2)
|
||||
{
|
||||
unsigned char* unit8Array = new unsigned char[arg3];
|
||||
if (NULL == unit8Array)
|
||||
if (arg3 > 0)
|
||||
{
|
||||
return 0;
|
||||
unsigned char* unit8Array = new unsigned char[arg3];
|
||||
if (NULL == unit8Array)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
for (unsigned int i = 1; i <= arg3; i++)
|
||||
{
|
||||
unit8Array[i-1] = (unsigned char)tolua_tofieldnumber(tolua_S, 5, i, 0);
|
||||
}
|
||||
glDrawElements((GLenum)arg0 , (GLsizei)arg1 , (GLenum)arg2 , (GLvoid*)unit8Array);
|
||||
CC_SAFE_DELETE_ARRAY(unit8Array);
|
||||
|
||||
}
|
||||
for (unsigned int i = 1; i <= arg3; i++)
|
||||
else
|
||||
{
|
||||
unit8Array[i-1] = (unsigned char)tolua_tofieldnumber(tolua_S, 5, i, 0);
|
||||
glDrawElements((GLenum)arg0 , (GLsizei)arg1 , (GLenum)arg2 , nullptr);
|
||||
}
|
||||
glDrawElements((GLenum)arg0 , (GLsizei)arg1 , (GLenum)arg2 , (GLvoid*)unit8Array);
|
||||
CC_SAFE_DELETE_ARRAY(unit8Array);
|
||||
}
|
||||
else if(GL_UNSIGNED_SHORT == arg2)
|
||||
{
|
||||
unsigned short* shortArray = new unsigned short[arg3];
|
||||
if (NULL == shortArray)
|
||||
if (arg3 > 0)
|
||||
{
|
||||
return 0;
|
||||
unsigned short* shortArray = new unsigned short[arg3];
|
||||
if (NULL == shortArray)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
for (unsigned int i = 1; i <= arg3; i++)
|
||||
{
|
||||
shortArray[i-1] = (unsigned short)tolua_tofieldnumber(tolua_S, 5, i, 0);
|
||||
}
|
||||
|
||||
glDrawElements((GLenum)arg0 , (GLsizei)arg1 , (GLenum)arg2 , (GLvoid*)shortArray);
|
||||
|
||||
CC_SAFE_DELETE_ARRAY(shortArray);
|
||||
}
|
||||
for (unsigned int i = 1; i <= arg3; i++)
|
||||
else
|
||||
{
|
||||
shortArray[i-1] = (unsigned short)tolua_tofieldnumber(tolua_S, 5, i, 0);
|
||||
glDrawElements((GLenum)arg0 , (GLsizei)arg1 , (GLenum)arg2 , nullptr);
|
||||
}
|
||||
glDrawElements((GLenum)arg0 , (GLsizei)arg1 , (GLenum)arg2 , (GLvoid*)shortArray);
|
||||
CC_SAFE_DELETE_ARRAY(shortArray);
|
||||
}
|
||||
else if(GL_UNSIGNED_INT == arg2)
|
||||
{
|
||||
unsigned int* intArray = new unsigned int[arg3];
|
||||
if (NULL == intArray)
|
||||
if (arg3 > 0)
|
||||
{
|
||||
return 0;
|
||||
unsigned int* intArray = new unsigned int[arg3];
|
||||
if (NULL == intArray)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
for (unsigned int i = 1; i <= arg3; i++)
|
||||
{
|
||||
intArray[i-1] = (unsigned int)tolua_tofieldnumber(tolua_S, 5, i, 0);
|
||||
}
|
||||
glDrawElements((GLenum)arg0 , (GLsizei)arg1 , (GLenum)arg2 , (GLvoid*)intArray);
|
||||
CC_SAFE_DELETE_ARRAY(intArray);
|
||||
}
|
||||
for (unsigned int i = 1; i <= arg3; i++)
|
||||
else
|
||||
{
|
||||
intArray[i-1] = (unsigned int)tolua_tofieldnumber(tolua_S, 5, i, 0);
|
||||
glDrawElements((GLenum)arg0 , (GLsizei)arg1 , (GLenum)arg2 , nullptr);
|
||||
|
||||
}
|
||||
glDrawElements((GLenum)arg0 , (GLsizei)arg1 , (GLenum)arg2 , (GLvoid*)intArray);
|
||||
CC_SAFE_DELETE_ARRAY(intArray);
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
|
|
|
|||
|
|
@ -5296,6 +5296,133 @@ static void extendConsole(lua_State* tolua_S)
|
|||
lua_pop(tolua_S, 1);
|
||||
}
|
||||
|
||||
static int lua_cocos2dx_GLProgramState_setVertexAttribPointer(lua_State* tolua_S)
|
||||
{
|
||||
int argc = 0;
|
||||
cocos2d::GLProgramState* cobj = nullptr;
|
||||
bool ok = true;
|
||||
|
||||
#if COCOS2D_DEBUG >= 1
|
||||
tolua_Error tolua_err;
|
||||
#endif
|
||||
|
||||
|
||||
#if COCOS2D_DEBUG >= 1
|
||||
if (!tolua_isusertype(tolua_S,1,"cc.GLProgramState",0,&tolua_err)) goto tolua_lerror;
|
||||
#endif
|
||||
|
||||
cobj = (cocos2d::GLProgramState*)tolua_tousertype(tolua_S,1,0);
|
||||
|
||||
#if COCOS2D_DEBUG >= 1
|
||||
if (!cobj)
|
||||
{
|
||||
tolua_error(tolua_S,"invalid 'cobj' in function 'lua_cocos2dx_GLProgramState_setVertexAttribPointer'", nullptr);
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
||||
argc = lua_gettop(tolua_S)-1;
|
||||
if (argc == 6)
|
||||
{
|
||||
std::string arg0;
|
||||
int arg1;
|
||||
unsigned int arg2;
|
||||
bool arg3;
|
||||
int arg4;
|
||||
int arg5;
|
||||
|
||||
ok &= luaval_to_std_string(tolua_S, 2,&arg0);
|
||||
|
||||
ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1);
|
||||
|
||||
ok &= luaval_to_uint32(tolua_S, 4,&arg2);
|
||||
|
||||
ok &= luaval_to_boolean(tolua_S, 5, &arg3);
|
||||
|
||||
ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4);
|
||||
|
||||
ok &= luaval_to_int32(tolua_S, 7, (int *)&arg5);
|
||||
|
||||
if(!ok)
|
||||
return 0;
|
||||
cobj->setVertexAttribPointer(arg0, arg1, arg2, arg3, arg4, (void*)arg5);
|
||||
return 0;
|
||||
}
|
||||
else if (argc == 7)
|
||||
{
|
||||
std::string arg0;
|
||||
int arg1;
|
||||
unsigned int arg2;
|
||||
bool arg3;
|
||||
int arg4;
|
||||
GLfloat* arg5;
|
||||
int arg6;
|
||||
|
||||
|
||||
ok &= luaval_to_std_string(tolua_S, 2,&arg0);
|
||||
|
||||
ok &= luaval_to_int32(tolua_S, 3,(int *)&arg1);
|
||||
|
||||
ok &= luaval_to_uint32(tolua_S, 4,&arg2);
|
||||
|
||||
ok &= luaval_to_boolean(tolua_S, 5, &arg3);
|
||||
|
||||
ok &= luaval_to_int32(tolua_S, 6,(int *)&arg4);
|
||||
|
||||
ok &= luaval_to_int32(tolua_S, 8, (int *)&arg6);
|
||||
|
||||
size_t len = lua_objlen(tolua_S, 7);
|
||||
|
||||
if (len != arg6)
|
||||
{
|
||||
CCLOG("table size is %zu,but input size is %d \n", len, arg6);
|
||||
return 0;
|
||||
}
|
||||
|
||||
arg5 = new GLfloat[len];
|
||||
for (int i = 0; i < len; i++)
|
||||
{
|
||||
lua_pushnumber(tolua_S,i + 1);
|
||||
lua_gettable(tolua_S,7);
|
||||
if (tolua_isnumber(tolua_S, -1, 0, &tolua_err))
|
||||
{
|
||||
arg5[i] = tolua_tonumber(tolua_S, -1, 0);
|
||||
}
|
||||
else
|
||||
{
|
||||
arg5[i] = 0;
|
||||
}
|
||||
lua_pop(tolua_S, 1);
|
||||
}
|
||||
|
||||
cobj->setVertexAttribPointer(arg0, arg1, arg2, arg3, arg4, (void*)arg5);
|
||||
|
||||
CC_SAFE_DELETE(arg5);
|
||||
|
||||
return 0;
|
||||
}
|
||||
CCLOG("%s has wrong number of arguments: %d, was expecting %d \n", "setVertexAttribPointer",argc, 6);
|
||||
return 0;
|
||||
|
||||
#if COCOS2D_DEBUG >= 1
|
||||
tolua_lerror:
|
||||
tolua_error(tolua_S,"#ferror in function 'lua_cocos2dx_GLProgramState_setVertexAttribPointer'.",&tolua_err);
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static void extendGLProgramState(lua_State* tolua_S)
|
||||
{
|
||||
lua_pushstring(tolua_S, "cc.GLProgramState");
|
||||
lua_rawget(tolua_S, LUA_REGISTRYINDEX);
|
||||
if (lua_istable(tolua_S,-1))
|
||||
{
|
||||
tolua_function(tolua_S,"setVertexAttribPointer", lua_cocos2dx_GLProgramState_setVertexAttribPointer);
|
||||
}
|
||||
lua_pop(tolua_S, 1);
|
||||
}
|
||||
|
||||
int register_all_cocos2dx_manual(lua_State* tolua_S)
|
||||
{
|
||||
if (NULL == tolua_S)
|
||||
|
|
@ -5344,5 +5471,7 @@ int register_all_cocos2dx_manual(lua_State* tolua_S)
|
|||
extendLabel(tolua_S);
|
||||
extendTMXTiledMap(tolua_S);
|
||||
extendConsole(tolua_S);
|
||||
extendGLProgramState(tolua_S);
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1195,4 +1195,13 @@ end
|
|||
rawset(ccui.Text,"getStringValue", TextBMFontDeprecated.getStringValue)
|
||||
--functions of ccui.TextBMFont will be deprecated begin
|
||||
|
||||
--functions of cc.ShaderCache will be deprecated begin
|
||||
local ShaderCacheDeprecated = { }
|
||||
function ShaderCacheDeprecated.getProgram(self,strShader)
|
||||
deprecatedTip("cc.ShaderCache:getProgram","cc.ShaderCache:getGLProgram")
|
||||
return self:getGLProgram(strShader)
|
||||
end
|
||||
rawset(cc.ShaderCache,"getProgram", ShaderCacheDeprecated.getProgram)
|
||||
--functions of ccui.TextBMFont will be deprecated begin
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -2187,4 +2187,22 @@ end
|
|||
_G["cc.EGLView"] = DeprecatedClass.EGLView()
|
||||
--EGLView class will be Deprecated,end
|
||||
|
||||
--EGLView class will be Deprecated,begin
|
||||
function DeprecatedClass.EGLView()
|
||||
deprecatedTip("cc.EGLView","cc.GLView")
|
||||
print(cc.GLView)
|
||||
return cc.GLView
|
||||
end
|
||||
_G["cc.EGLView"] = DeprecatedClass.EGLView()
|
||||
--EGLView class will be Deprecated,end
|
||||
|
||||
--ShaderCache class will be Deprecated,begin
|
||||
function DeprecatedClass.ShaderCache()
|
||||
deprecatedTip("cc.ShaderCache","cc.GLProgramCache")
|
||||
return cc.GLProgramCache
|
||||
end
|
||||
cc.ShaderCache = DeprecatedClass.ShaderCache()
|
||||
--ShaderCache class will be Deprecated,end
|
||||
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -25,7 +25,6 @@
|
|||
#ifndef __TestCpp__GUIDefine__
|
||||
#define __TestCpp__GUIDefine__
|
||||
|
||||
#include "cocos2d.h"
|
||||
#include <string>
|
||||
#include "cocostudio/ObjectFactory.h"
|
||||
|
||||
|
|
|
|||
|
|
@ -615,6 +615,9 @@ void CheckBox::copySpecialProperties(Widget *widget)
|
|||
loadTextureBackGroundDisabled(checkBox->_backGroundDisabledFileName, checkBox->_backGroundDisabledTexType);
|
||||
loadTextureFrontCrossDisabled(checkBox->_frontCrossDisabledFileName, checkBox->_frontCrossDisabledTexType);
|
||||
setSelectedState(checkBox->_isSelected);
|
||||
_checkBoxEventListener = checkBox->_checkBoxEventListener;
|
||||
_checkBoxEventSelector = checkBox->_checkBoxEventSelector;
|
||||
_checkBoxEventCallback = checkBox->_checkBoxEventCallback;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -22,7 +22,8 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
|
|||
THE SOFTWARE.
|
||||
****************************************************************************/
|
||||
|
||||
#include "CocosGUI.h"
|
||||
#include "ui/UIHelper.h"
|
||||
#include "ui/UIWidget.h"
|
||||
|
||||
NS_CC_BEGIN
|
||||
|
||||
|
|
|
|||
|
|
@ -25,9 +25,14 @@ THE SOFTWARE.
|
|||
#ifndef __UIHELPER_H__
|
||||
#define __UIHELPER_H__
|
||||
|
||||
#include <string>
|
||||
#include "base/CCPlatformMacros.h"
|
||||
|
||||
NS_CC_BEGIN
|
||||
|
||||
namespace ui {
|
||||
|
||||
class Widget;
|
||||
|
||||
/**
|
||||
* @js NA
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ public:
|
|||
/**
|
||||
* create a imageview
|
||||
*
|
||||
* @param fileName file name of texture.
|
||||
* @param imageFileName file name of texture.
|
||||
*
|
||||
* @param texType @see UI_TEX_TYPE_LOCAL
|
||||
*/
|
||||
|
|
@ -84,7 +84,7 @@ public:
|
|||
/**
|
||||
* Sets if imageview is using scale9 renderer.
|
||||
*
|
||||
* @param true that using scale9 renderer, false otherwise.
|
||||
* @param able true that using scale9 renderer, false otherwise.
|
||||
*/
|
||||
void setScale9Enabled(bool able);
|
||||
|
||||
|
|
|
|||
|
|
@ -183,7 +183,7 @@ bool Layout::isClippingEnabled()
|
|||
|
||||
void Layout::visit(Renderer *renderer, const Mat4 &parentTransform, bool parentTransformUpdated)
|
||||
{
|
||||
if (!_enabled)
|
||||
if (!_visible)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
|
@ -1007,6 +1007,8 @@ void Layout::copySpecialProperties(Widget *widget)
|
|||
setLayoutType(layout->_layoutType);
|
||||
setClippingEnabled(layout->_clippingEnabled);
|
||||
setClippingType(layout->_clippingType);
|
||||
_loopFocus = layout->_loopFocus;
|
||||
_passFocusToChild = layout->_passFocusToChild;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -502,6 +502,9 @@ void ListView::copySpecialProperties(Widget *widget)
|
|||
setItemModel(listViewEx->_model);
|
||||
setItemsMargin(listViewEx->_itemsMargin);
|
||||
setGravity(listViewEx->_gravity);
|
||||
_listViewEventListener = listViewEx->_listViewEventListener;
|
||||
_listViewEventSelector = listViewEx->_listViewEventSelector;
|
||||
_eventCallback = listViewEx->_eventCallback;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -196,7 +196,7 @@ protected:
|
|||
virtual Vector<Node*>& getChildren() override{return ScrollView::getChildren();};
|
||||
virtual const Vector<Node*>& getChildren() const override{return ScrollView::getChildren();};
|
||||
virtual ssize_t getChildrenCount() const override {return ScrollView::getChildrenCount();};
|
||||
virtual Node * getChildByTag(int tag) override {return ScrollView::getChildByTag(tag);};
|
||||
virtual Node * getChildByTag(int tag) const override {return ScrollView::getChildByTag(tag);};
|
||||
virtual Widget* getChildByName(const std::string& name) override {return ScrollView::getChildByName(name);};
|
||||
void updateInnerContainerSize();
|
||||
void remedyLayoutParameter(Widget* item);
|
||||
|
|
|
|||
|
|
@ -626,6 +626,9 @@ void PageView::copySpecialProperties(Widget *widget)
|
|||
if (pageView)
|
||||
{
|
||||
Layout::copySpecialProperties(widget);
|
||||
_eventCallback = pageView->_eventCallback;
|
||||
_pageViewEventListener = pageView->_pageViewEventListener;
|
||||
_pageViewEventSelector = pageView->_pageViewEventSelector;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -183,7 +183,7 @@ protected:
|
|||
virtual Vector<Node*>& getChildren() override{return Widget::getChildren();};
|
||||
virtual const Vector<Node*>& getChildren() const override{return Widget::getChildren();};
|
||||
virtual ssize_t getChildrenCount() const override {return Widget::getChildrenCount();};
|
||||
virtual Node * getChildByTag(int tag) override {return Widget::getChildByTag(tag);};
|
||||
virtual Node * getChildByTag(int tag) const override {return Widget::getChildByTag(tag);};
|
||||
virtual Widget* getChildByName(const std::string& name) override {return Widget::getChildByName(name);};
|
||||
|
||||
Layout* createPage();
|
||||
|
|
|
|||
|
|
@ -301,7 +301,7 @@ ssize_t ScrollView::getChildrenCount() const
|
|||
return _innerContainer->getChildrenCount();
|
||||
}
|
||||
|
||||
Node* ScrollView::getChildByTag(int tag)
|
||||
Node* ScrollView::getChildByTag(int tag) const
|
||||
{
|
||||
return _innerContainer->getChildByTag(tag);
|
||||
}
|
||||
|
|
@ -1764,6 +1764,9 @@ void ScrollView::copySpecialProperties(Widget *widget)
|
|||
setDirection(scrollView->_direction);
|
||||
setBounceEnabled(scrollView->_bounceEnabled);
|
||||
setInertiaScrollEnabled(scrollView->_inertiaScrollEnabled);
|
||||
_scrollViewEventListener = scrollView->_scrollViewEventListener;
|
||||
_scrollViewEventSelector = scrollView->_scrollViewEventSelector;
|
||||
_eventCallback = scrollView->_eventCallback;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -296,7 +296,7 @@ public:
|
|||
|
||||
virtual ssize_t getChildrenCount() const override;
|
||||
|
||||
virtual Node * getChildByTag(int tag) override;
|
||||
virtual Node * getChildByTag(int tag) const override;
|
||||
|
||||
virtual Widget* getChildByName(const std::string& name) override;
|
||||
|
||||
|
|
|
|||
|
|
@ -627,6 +627,9 @@ void Slider::copySpecialProperties(Widget *widget)
|
|||
loadSlidBallTexturePressed(slider->_slidBallPressedTextureFile, slider->_ballPTexType);
|
||||
loadSlidBallTextureDisabled(slider->_slidBallDisabledTextureFile, slider->_ballDTexType);
|
||||
setPercent(slider->getPercent());
|
||||
_sliderEventListener = slider->_sliderEventListener;
|
||||
_sliderEventSelector = slider->_sliderEventSelector;
|
||||
_eventCallback = slider->_eventCallback;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -842,6 +842,9 @@ void TextField::copySpecialProperties(Widget *widget)
|
|||
setDetachWithIME(textField->getDetachWithIME());
|
||||
setInsertText(textField->getInsertText());
|
||||
setDeleteBackward(textField->getDeleteBackward());
|
||||
_eventCallback = textField->_eventCallback;
|
||||
_textFieldEventListener = textField->_textFieldEventListener;
|
||||
_textFieldEventSelector = textField->_textFieldEventSelector;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -77,6 +77,9 @@ namespace experimental{
|
|||
virtual void draw(Renderer *renderer, const Mat4& transform, bool transformUpdated) override;
|
||||
|
||||
protected:
|
||||
virtual cocos2d::ui::Widget* createCloneInstance() override;
|
||||
virtual void copySpecialProperties(Widget* model) override;
|
||||
|
||||
VideoPlayer();
|
||||
virtual ~VideoPlayer();
|
||||
|
||||
|
|
|
|||
|
|
@ -355,6 +355,28 @@ void VideoPlayer::onPlayEvent(VideoPlayer::EventType event)
|
|||
}
|
||||
}
|
||||
|
||||
cocos2d::ui::Widget* VideoPlayer::createCloneInstance()
|
||||
{
|
||||
return VideoPlayer::create();
|
||||
}
|
||||
|
||||
void VideoPlayer::copySpecialProperties(Widget *widget)
|
||||
{
|
||||
VideoPlayer* videoPlayer = dynamic_cast<VideoPlayer*>(widget);
|
||||
if (videoPlayer)
|
||||
{
|
||||
_isPlaying = videoPlayer->_isPlaying;
|
||||
_fullScreenEnabled = videoPlayer->_fullScreenEnabled;
|
||||
_fullScreenDirty = videoPlayer->_fullScreenDirty;
|
||||
_videoURL = videoPlayer->_videoURL;
|
||||
_keepAspectRatioEnabled = videoPlayer->_keepAspectRatioEnabled;
|
||||
_videoSource = videoPlayer->_videoSource;
|
||||
_videoPlayerIndex = videoPlayer->_videoPlayerIndex;
|
||||
_eventCallback = videoPlayer->_eventCallback;
|
||||
_videoView = videoPlayer->_videoView;
|
||||
}
|
||||
}
|
||||
|
||||
void executeVideoCallback(int index,int event)
|
||||
{
|
||||
auto it = s_allVideoPlayers.find(index);
|
||||
|
|
|
|||
|
|
@ -461,4 +461,26 @@ void VideoPlayer::onPlayEvent(VideoPlayer::EventType event)
|
|||
}
|
||||
}
|
||||
|
||||
cocos2d::ui::Widget* VideoPlayer::createCloneInstance()
|
||||
{
|
||||
return VideoPlayer::create();
|
||||
}
|
||||
|
||||
void VideoPlayer::copySpecialProperties(Widget *widget)
|
||||
{
|
||||
VideoPlayer* videoPlayer = dynamic_cast<VideoPlayer*>(widget);
|
||||
if (videoPlayer)
|
||||
{
|
||||
_isPlaying = videoPlayer->_isPlaying;
|
||||
_fullScreenEnabled = videoPlayer->_fullScreenEnabled;
|
||||
_fullScreenDirty = videoPlayer->_fullScreenDirty;
|
||||
_videoURL = videoPlayer->_videoURL;
|
||||
_keepAspectRatioEnabled = videoPlayer->_keepAspectRatioEnabled;
|
||||
_videoSource = videoPlayer->_videoSource;
|
||||
_videoPlayerIndex = videoPlayer->_videoPlayerIndex;
|
||||
_eventCallback = videoPlayer->_eventCallback;
|
||||
_videoView = videoPlayer->_videoView;
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -932,7 +932,6 @@ void Widget::copyProperties(Widget *widget)
|
|||
_ignoreSize = widget->_ignoreSize;
|
||||
_size = widget->_size;
|
||||
_customSize = widget->_customSize;
|
||||
copySpecialProperties(widget);
|
||||
_sizeType = widget->getSizeType();
|
||||
_sizePercent = widget->_sizePercent;
|
||||
_positionType = widget->_positionType;
|
||||
|
|
@ -948,6 +947,14 @@ void Widget::copyProperties(Widget *widget)
|
|||
setFlippedY(widget->isFlippedY());
|
||||
setColor(widget->getColor());
|
||||
setOpacity(widget->getOpacity());
|
||||
_touchEventCallback = widget->_touchEventCallback;
|
||||
_touchEventListener = widget->_touchEventListener;
|
||||
_touchEventSelector = widget->_touchEventSelector;
|
||||
_focused = widget->_focused;
|
||||
_focusEnabled = widget->_focusEnabled;
|
||||
|
||||
copySpecialProperties(widget);
|
||||
|
||||
//FIXME:copy focus properties, also make sure all the subclass the copy behavior is correct
|
||||
Map<int, LayoutParameter*>& layoutParameterDic = widget->_layoutParameterDictionary;
|
||||
for (auto iter = layoutParameterDic.begin(); iter != layoutParameterDic.end(); ++iter)
|
||||
|
|
|
|||
|
|
@ -848,6 +848,8 @@
|
|||
"cocos/platform/wp8/Direct3DBase.h",
|
||||
"cocos/platform/wp8/DirectXBase.cpp",
|
||||
"cocos/platform/wp8/DirectXBase.h",
|
||||
"cocos/platform/wp8/pch.cpp",
|
||||
"cocos/platform/wp8/pch.h",
|
||||
"cocos/platform/wp8/shaders/precompiledshaders.h",
|
||||
"cocos/renderer/CCBatchCommand.cpp",
|
||||
"cocos/renderer/CCBatchCommand.h",
|
||||
|
|
@ -3628,6 +3630,8 @@
|
|||
"cocos/scripting/lua-bindings/auto/api/Follow.lua",
|
||||
"cocos/scripting/lua-bindings/auto/api/FrameData.lua",
|
||||
"cocos/scripting/lua-bindings/auto/api/GLProgram.lua",
|
||||
"cocos/scripting/lua-bindings/auto/api/GLProgramCache.lua",
|
||||
"cocos/scripting/lua-bindings/auto/api/GLProgramState.lua",
|
||||
"cocos/scripting/lua-bindings/auto/api/GLView.lua",
|
||||
"cocos/scripting/lua-bindings/auto/api/GLViewProtocol.lua",
|
||||
"cocos/scripting/lua-bindings/auto/api/GUIReader.lua",
|
||||
|
|
@ -3665,6 +3669,7 @@
|
|||
"cocos/scripting/lua-bindings/auto/api/MenuItemLabel.lua",
|
||||
"cocos/scripting/lua-bindings/auto/api/MenuItemSprite.lua",
|
||||
"cocos/scripting/lua-bindings/auto/api/MenuItemToggle.lua",
|
||||
"cocos/scripting/lua-bindings/auto/api/Mesh.lua",
|
||||
"cocos/scripting/lua-bindings/auto/api/MotionStreak.lua",
|
||||
"cocos/scripting/lua-bindings/auto/api/MoveBy.lua",
|
||||
"cocos/scripting/lua-bindings/auto/api/MoveTo.lua",
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@ using Microsoft.Phone.Shell;
|
|||
using Windows.UI.Input;
|
||||
using System.Windows.Threading;
|
||||
using Microsoft.Phone.Info;
|
||||
using Windows.Graphics.Display;
|
||||
|
||||
namespace PhoneDirect3DXamlAppInterop
|
||||
{
|
||||
|
|
@ -53,7 +54,30 @@ namespace PhoneDirect3DXamlAppInterop
|
|||
{
|
||||
if (m_d3dInterop == null)
|
||||
{
|
||||
m_d3dInterop = new Direct3DInterop();
|
||||
PageOrientation pageOrientation = (PageOrientation)GetValue(OrientationProperty);
|
||||
DisplayOrientations displayOrientation;
|
||||
|
||||
switch(pageOrientation)
|
||||
{
|
||||
case PageOrientation.Portrait:
|
||||
case PageOrientation.PortraitUp:
|
||||
displayOrientation = DisplayOrientations.Portrait;
|
||||
break;
|
||||
case PageOrientation.PortraitDown:
|
||||
displayOrientation = DisplayOrientations.PortraitFlipped;
|
||||
break;
|
||||
case PageOrientation.Landscape:
|
||||
case PageOrientation.LandscapeLeft:
|
||||
displayOrientation = DisplayOrientations.Landscape;
|
||||
break;
|
||||
case PageOrientation.LandscapeRight:
|
||||
displayOrientation = DisplayOrientations.LandscapeFlipped;
|
||||
break;
|
||||
default:
|
||||
displayOrientation = DisplayOrientations.Landscape;
|
||||
break;
|
||||
}
|
||||
m_d3dInterop = new Direct3DInterop(displayOrientation);
|
||||
|
||||
// Set WindowBounds to size of DrawingSurface
|
||||
m_d3dInterop.WindowBounds = new Windows.Foundation.Size(
|
||||
|
|
|
|||
|
|
@ -40,6 +40,21 @@
|
|||
"*.lua"
|
||||
]
|
||||
},
|
||||
{
|
||||
"from": "templates/lua-template-runtime/runtime/rtres",
|
||||
"to": "runtime/mac/PrebuiltRuntimeLua.app/Contents/Resources/rtres",
|
||||
"exclude": []
|
||||
},
|
||||
{
|
||||
"from": "templates/lua-template-runtime/runtime/rtres",
|
||||
"to": "runtime/ios/PrebuiltRuntimeLua.app/rtres",
|
||||
"exclude": []
|
||||
},
|
||||
{
|
||||
"from": "templates/lua-template-runtime/runtime/rtres",
|
||||
"to": "runtime/win32/rtres",
|
||||
"exclude": []
|
||||
},
|
||||
{
|
||||
"from": "cocos/scripting/lua-bindings/script",
|
||||
"to": "runtime/mac/PrebuiltRuntimeLua.app/Contents/Resources",
|
||||
|
|
|
|||
|
|
@ -51,6 +51,13 @@ void ConfigParser::readConfig()
|
|||
{
|
||||
_initViewSize.width = objectInitView["width"].GetUint();
|
||||
_initViewSize.height = objectInitView["height"].GetUint();
|
||||
if (_initViewSize.height>_initViewSize.width)
|
||||
{
|
||||
float tmpvalue =_initViewSize.height;
|
||||
_initViewSize.height = _initViewSize.width;
|
||||
_initViewSize.width = tmpvalue;
|
||||
}
|
||||
|
||||
}
|
||||
if (objectInitView.HasMember("name") && objectInitView["name"].IsString())
|
||||
{
|
||||
|
|
|
|||
|
|
@ -99,50 +99,114 @@ bool reloadScript(const string& modulefile)
|
|||
class ConnectWaitLayer: public Layer
|
||||
{
|
||||
private:
|
||||
LabelTTF* pLabelUploadFile;
|
||||
Label* _labelUploadFile;
|
||||
public:
|
||||
|
||||
ConnectWaitLayer()
|
||||
{
|
||||
int designWidth = 1280;
|
||||
int designHeight = 800;
|
||||
Director::getInstance()->getOpenGLView()->setDesignResolutionSize(designWidth,designHeight,ResolutionPolicy::EXACT_FIT);
|
||||
string playEnbleFile = "rtres/Play1.png";
|
||||
string shineFile = "rtres/shine.png";
|
||||
string backgroundFile = "rtres/landscape.png";
|
||||
if (!ConfigParser::getInstance()->isLanscape())
|
||||
{
|
||||
backgroundFile = "rtres/portrait.png";
|
||||
Director::getInstance()->getOpenGLView()->setDesignResolutionSize(designHeight,designWidth,ResolutionPolicy::EXACT_FIT);
|
||||
}
|
||||
|
||||
auto background = Sprite::create(backgroundFile.c_str());
|
||||
if (background)
|
||||
{
|
||||
background->setAnchorPoint(Vec2(0,0));
|
||||
addChild(background,9999);
|
||||
}
|
||||
|
||||
auto playSprite = Sprite::create(playEnbleFile.c_str());
|
||||
if (playSprite)
|
||||
{
|
||||
playSprite->setPosition(Vec2(902,400));
|
||||
addChild(playSprite,9999);
|
||||
}else
|
||||
{
|
||||
auto labelPlay = LabelTTF::create("play", "Arial", 108);
|
||||
auto menuItem = MenuItemLabel::create(labelPlay, CC_CALLBACK_1(ConnectWaitLayer::playerCallback, this));
|
||||
auto menu = Menu::create(menuItem, NULL);
|
||||
|
||||
menu->setPosition( Point::ZERO );
|
||||
menuItem->setPosition(Vec2(902,400));
|
||||
if (!ConfigParser::getInstance()->isLanscape()) menuItem->setPosition(Vec2(400,500));
|
||||
addChild(menu, 1);
|
||||
}
|
||||
|
||||
auto shineSprite = Sprite::create(shineFile.c_str());
|
||||
if (shineSprite)
|
||||
{
|
||||
shineSprite->setPosition(Vec2(902,400));
|
||||
shineSprite->runAction(RepeatForever::create(Sequence::createWithTwoActions(ScaleBy::create(1.0f, 1.08f),ScaleTo::create(1.0f, 1))));
|
||||
addChild(shineSprite,9999);
|
||||
}
|
||||
|
||||
string strip = getIPAddress();
|
||||
char szIPAddress[512]={0};
|
||||
sprintf(szIPAddress, "LocalIP: %s",strip.c_str());
|
||||
auto label = LabelTTF::create(szIPAddress, "Arial", 24);
|
||||
addChild(label, 9999);
|
||||
label->setPosition( Point(VisibleRect::center().x, VisibleRect::top().y - 30) );
|
||||
|
||||
string strShowMsg ="";
|
||||
sprintf(szIPAddress, "IP: %s",strip.c_str());
|
||||
auto IPlabel = Label::create(szIPAddress, "Arial", 72);
|
||||
IPlabel->setAnchorPoint(Vec2(0,0));
|
||||
int spaceSizex = 72;
|
||||
int spaceSizey = 200;
|
||||
IPlabel->setPosition( Point(VisibleRect::leftTop().x+spaceSizex, VisibleRect::top().y -spaceSizey) );
|
||||
addChild(IPlabel, 9999);
|
||||
|
||||
string strShowMsg = "waiting for file transfer ...";
|
||||
if (CC_PLATFORM_WIN32 == CC_TARGET_PLATFORM || CC_PLATFORM_MAC == CC_TARGET_PLATFORM)
|
||||
{
|
||||
strShowMsg = "waiting for debugger to connect ...";
|
||||
}else
|
||||
}
|
||||
|
||||
_labelUploadFile = Label::create(strShowMsg.c_str(), "Arial", 36);
|
||||
_labelUploadFile->setAnchorPoint(Vec2(0,0));
|
||||
_labelUploadFile->setPosition( Point(VisibleRect::leftTop().x+spaceSizex, IPlabel->getPositionY()-spaceSizex) );
|
||||
_labelUploadFile->setAlignment(TextHAlignment::LEFT);
|
||||
addChild(_labelUploadFile, 10000);
|
||||
|
||||
if (!ConfigParser::getInstance()->isLanscape())
|
||||
{
|
||||
strShowMsg = "waiting for file transfer ...";
|
||||
}
|
||||
auto labelwait = LabelTTF::create(strShowMsg.c_str(), "Arial", 22);
|
||||
addChild(labelwait, 10000);
|
||||
labelwait->setPosition( Point(VisibleRect::center().x, VisibleRect::center().y) );
|
||||
if (playSprite) playSprite->setPosition(400,500);
|
||||
if (shineSprite) shineSprite->setPosition(400,500);
|
||||
_labelUploadFile->setAlignment(TextHAlignment::LEFT);
|
||||
}
|
||||
|
||||
pLabelUploadFile = LabelTTF::create("", "Arial", 22);
|
||||
addChild(pLabelUploadFile, 10000);
|
||||
pLabelUploadFile->setPosition( Point(VisibleRect::center().x, VisibleRect::top().y - 60) );
|
||||
|
||||
auto labelPlay = LabelTTF::create("play", "Arial", 36);
|
||||
auto menuItem = MenuItemLabel::create(labelPlay, CC_CALLBACK_1(ConnectWaitLayer::playerCallback, this));
|
||||
auto menu = Menu::create(menuItem, NULL);
|
||||
if (playSprite)
|
||||
{
|
||||
auto listener = EventListenerTouchOneByOne::create();
|
||||
listener->onTouchBegan = [](Touch* touch, Event *event)->bool{
|
||||
auto target = static_cast<Sprite*>(event->getCurrentTarget());
|
||||
Vec2 point = target->convertToNodeSpace(Director::getInstance()->convertToGL(touch->getLocationInView()));
|
||||
auto rect = Rect(0, 0, target->getContentSize().width, target->getContentSize().height);
|
||||
if (!rect.containsPoint(point)) return false;
|
||||
target->stopAllActions();
|
||||
target->runAction(Sequence::createWithTwoActions(ScaleBy::create(0.05f, 0.9f),ScaleTo::create(0.125f, 1)));
|
||||
return true;
|
||||
};
|
||||
listener->onTouchEnded = [](Touch* touch, Event *event){
|
||||
auto target = static_cast<Sprite*>(event->getCurrentTarget());
|
||||
Vec2 point = target->convertToNodeSpace(Director::getInstance()->convertToGL(touch->getLocationInView()));
|
||||
auto rect = Rect(0, 0, target->getContentSize().width, target->getContentSize().height);
|
||||
if (!rect.containsPoint(point)) return;
|
||||
startScript("");
|
||||
};
|
||||
_eventDispatcher->addEventListenerWithSceneGraphPriority(listener, playSprite);
|
||||
}
|
||||
|
||||
menu->setPosition( Point::ZERO );
|
||||
menuItem->setPosition( Point( VisibleRect::right().x - 50, VisibleRect::bottom().y + 25) );
|
||||
addChild(menu, 1);
|
||||
}
|
||||
|
||||
|
||||
void playerCallback(Object* sender)
|
||||
{
|
||||
startScript("");
|
||||
}
|
||||
|
||||
void showCurRcvFile(string fileName) {
|
||||
pLabelUploadFile->setString(fileName);
|
||||
_labelUploadFile->setString(fileName);
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -30,6 +30,10 @@
|
|||
"from": "../../../config.json",
|
||||
"to": ""
|
||||
},
|
||||
{
|
||||
"from": "../../../runtime/rtres",
|
||||
"to": "rtres"
|
||||
},
|
||||
{
|
||||
"from": "../../cocos2d-x/external/lua/luasocket",
|
||||
"to": "",
|
||||
|
|
|
|||
|
|
@ -128,6 +128,8 @@
|
|||
C09BA7E718BC929700A85A3E /* WorkSpaceDialog.xib in Resources */ = {isa = PBXBuildFile; fileRef = C09BA7E418BC929700A85A3E /* WorkSpaceDialog.xib */; };
|
||||
C09BA7E818BC929700A85A3E /* WorkSpaceDialogController.mm in Sources */ = {isa = PBXBuildFile; fileRef = C09BA7E618BC929700A85A3E /* WorkSpaceDialogController.mm */; };
|
||||
C09BA7EE18BCA49600A85A3E /* NSAppSheetAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = C09BA7ED18BCA49600A85A3E /* NSAppSheetAdditions.m */; };
|
||||
C0F9D4BC192F3E6A0066134A /* rtres in Resources */ = {isa = PBXBuildFile; fileRef = C0F9D4BB192F3E6A0066134A /* rtres */; };
|
||||
C0F9D4BD192F3E6A0066134A /* rtres in Resources */ = {isa = PBXBuildFile; fileRef = C0F9D4BB192F3E6A0066134A /* rtres */; };
|
||||
D6B061351803AC000077942B /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = D6B061341803AC000077942B /* CoreMotion.framework */; };
|
||||
F293B3CD15EB7BE500256477 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3CC15EB7BE500256477 /* QuartzCore.framework */; };
|
||||
F293B3D115EB7BE500256477 /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F293B3D015EB7BE500256477 /* OpenAL.framework */; };
|
||||
|
|
@ -394,6 +396,7 @@
|
|||
C09BA7E618BC929700A85A3E /* WorkSpaceDialogController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WorkSpaceDialogController.mm; sourceTree = "<group>"; };
|
||||
C09BA7EC18BCA49600A85A3E /* NSAppSheetAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NSAppSheetAdditions.h; sourceTree = "<group>"; };
|
||||
C09BA7ED18BCA49600A85A3E /* NSAppSheetAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = NSAppSheetAdditions.m; sourceTree = "<group>"; };
|
||||
C0F9D4BB192F3E6A0066134A /* rtres */ = {isa = PBXFileReference; lastKnownFileType = folder; name = rtres; path = ../../../runtime/rtres; sourceTree = "<group>"; };
|
||||
D6B061341803AC000077942B /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS7.0.sdk/System/Library/Frameworks/CoreMotion.framework; sourceTree = DEVELOPER_DIR; };
|
||||
F293B3C815EB7BE500256477 /* HelloLua iOS.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "HelloLua iOS.app"; sourceTree = BUILT_PRODUCTS_DIR; };
|
||||
F293B3CC15EB7BE500256477 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
|
||||
|
|
@ -642,6 +645,7 @@
|
|||
F293BC4615EB859D00256477 /* Resources */ = {
|
||||
isa = PBXGroup;
|
||||
children = (
|
||||
C0F9D4BB192F3E6A0066134A /* rtres */,
|
||||
C05D1C111923449100B808A4 /* config.json */,
|
||||
C03781B718BF655400FE4F13 /* res */,
|
||||
C03781B818BF655400FE4F13 /* src */,
|
||||
|
|
@ -852,6 +856,7 @@
|
|||
C08D5D5D18E567C6009071A4 /* ltn12.lua in Resources */,
|
||||
C03781EC18BF656A00FE4F13 /* luaoc.lua in Resources */,
|
||||
C07828F918B4D72E00BD2287 /* MainMenu.xib in Resources */,
|
||||
C0F9D4BD192F3E6A0066134A /* rtres in Resources */,
|
||||
5023817617EBBE3400990C9B /* Icon.icns in Resources */,
|
||||
C03781D218BF656A00FE4F13 /* CCBReaderLoad.lua in Resources */,
|
||||
C08D5D5F18E567C6009071A4 /* mbox.lua in Resources */,
|
||||
|
|
@ -894,6 +899,7 @@
|
|||
C03781F118BF656A00FE4F13 /* StudioConstants.lua in Resources */,
|
||||
5023811F17EBBCAC00990C9B /* Icon-152.png in Resources */,
|
||||
C03781D118BF656A00FE4F13 /* CCBReaderLoad.lua in Resources */,
|
||||
C0F9D4BC192F3E6A0066134A /* rtres in Resources */,
|
||||
5023812017EBBCAC00990C9B /* Icon-57.png in Resources */,
|
||||
C03781CF18BF656A00FE4F13 /* AudioEngine.lua in Resources */,
|
||||
C03781B918BF655400FE4F13 /* res in Resources */,
|
||||
|
|
|
|||
|
|
@ -98,16 +98,16 @@ std::string getCurAppPath(void)
|
|||
return;
|
||||
}
|
||||
|
||||
if(!g_landscape)
|
||||
{
|
||||
float tmpvalue =width;
|
||||
width = height;
|
||||
height = tmpvalue;
|
||||
}
|
||||
|
||||
g_eglView = GLView::createWithRect([viewName cStringUsingEncoding:NSUTF8StringEncoding],cocos2d::Rect(0.0f,0.0f,width,height),frameZoomFactor);
|
||||
auto director = Director::getInstance();
|
||||
director->setOpenGLView(g_eglView);
|
||||
g_landscape = false;
|
||||
g_screenSize.width = width;
|
||||
g_screenSize.height = height;
|
||||
if (width > height)
|
||||
{
|
||||
g_landscape = true;
|
||||
}
|
||||
|
||||
window = glfwGetCocoaWindow(g_eglView->getWindow());
|
||||
[NSApp setDelegate: self];
|
||||
|
|
@ -124,12 +124,15 @@ void createSimulator(const char* viewName, float width, float height,bool isLand
|
|||
{
|
||||
if(g_nsAppDelegate)
|
||||
{
|
||||
if((isLandscape && height > width) || (!isLandscape && width > height))
|
||||
g_landscape = isLandscape;
|
||||
if(height > width)
|
||||
{
|
||||
float tmpvalue =width;
|
||||
width = height;
|
||||
height = tmpvalue;
|
||||
}
|
||||
g_screenSize.width = width;
|
||||
g_screenSize.height = height;
|
||||
|
||||
[g_nsAppDelegate createSimulator:[NSString stringWithUTF8String:viewName] viewWidth:width viewHeight:height factor:frameZoomFactor];
|
||||
}
|
||||
|
|
|
|||
|
|
@ -109,9 +109,11 @@ if exist "$(OutDir)\Resource" rd /s /q "$(OutDir)\Resource"
|
|||
mkdir "$(OutDir)\Resource"
|
||||
mkdir "$(OutDir)\Resource\src"
|
||||
mkdir "$(OutDir)\Resource\res"
|
||||
mkdir "$(OutDir)\Resource\rtres"
|
||||
xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script" "$(OutDir)\Resource" /e /Y
|
||||
xcopy "$(ProjectDir)..\..\..\src" "$(OutDir)\Resource\src" /e /Y
|
||||
xcopy "$(ProjectDir)..\..\..\res" "$(OutDir)\Resource\res" /e /Y
|
||||
xcopy "$(ProjectDir)..\..\..\runtime\rtres" "$(OutDir)\Resource\rtres" /e /Y
|
||||
copy "$(ProjectDir)..\..\..\config.json" "$(OutDir)\Resource\config.json" /Y
|
||||
xcopy "$(ProjectDir)..\..\cocos2d-x\external\lua\luasocket\*.lua" "$(OutDir)\Resource" /e /Y</Command>
|
||||
<Message>copy files</Message>
|
||||
|
|
@ -165,9 +167,11 @@ if exist "$(OutDir)\Resource" rd /s /q "$(OutDir)\Resource"
|
|||
mkdir "$(OutDir)\Resource"
|
||||
mkdir "$(OutDir)\Resource\src"
|
||||
mkdir "$(OutDir)\Resource\res"
|
||||
mkdir "$(OutDir)\Resource\rtres"
|
||||
xcopy "$(ProjectDir)..\..\cocos2d-x\cocos\scripting\lua-bindings\script" "$(OutDir)\Resource" /e /Y
|
||||
xcopy "$(ProjectDir)..\..\..\src" "$(OutDir)\Resource\src" /e /Y
|
||||
xcopy "$(ProjectDir)..\..\..\res" "$(OutDir)\Resource\res" /e /Y
|
||||
xcopy "$(ProjectDir)..\..\..\runtime\rtres" "$(OutDir)\Resource\rtres" /e /Y
|
||||
copy "$(ProjectDir)..\..\..\config.json" "$(OutDir)\Resource\config.json" /Y
|
||||
xcopy "$(ProjectDir)..\..\cocos2d-x\external\lua\luasocket\*.lua" "$(OutDir)\Resource" /e /Y</Command>
|
||||
<Message>copy files</Message>
|
||||
|
|
|
|||
|
|
@ -308,23 +308,26 @@ void createSimulator(const char* viewName, float width, float height, bool isLan
|
|||
return;
|
||||
}
|
||||
|
||||
if((isLandscape && height > width) || (!isLandscape && width > height))
|
||||
g_landscape = isLandscape;
|
||||
if(height > width)
|
||||
{
|
||||
float tmpvalue =width;
|
||||
width = height;
|
||||
height = tmpvalue;
|
||||
}
|
||||
|
||||
g_screenSize.width = width;
|
||||
g_screenSize.height = height;
|
||||
|
||||
if(!g_landscape)
|
||||
{
|
||||
float tmpvalue =width;
|
||||
width = height;
|
||||
height = tmpvalue;
|
||||
}
|
||||
|
||||
g_eglView = GLView::createWithRect(viewName,Rect(0,0,width,height),frameZoomFactor);
|
||||
auto director = Director::getInstance();
|
||||
director->setOpenGLView(g_eglView);
|
||||
g_landscape = false;
|
||||
g_screenSize.width = width;
|
||||
g_screenSize.height = height;
|
||||
if (width > height)
|
||||
{
|
||||
g_landscape = true;
|
||||
}
|
||||
|
||||
HWND hWnd=glfwGetWin32Window(g_eglView->getWindow());
|
||||
HMENU hMenu = LoadMenu(GetModuleHandle(NULL), MAKEINTRESOURCE(IDR_MENU_COCOS));
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
{
|
||||
"version":"v3-lua-runtime-1.1.1",
|
||||
"zip_file_size":"20854899",
|
||||
"version":"v3-lua-runtime-1.1.2",
|
||||
"zip_file_size":"21402175",
|
||||
"repo_name":"cocos-runtime-bin",
|
||||
"repo_parent":"https://github.com/chukong/"
|
||||
}
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 24 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 20 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 147 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 131 KiB |
Binary file not shown.
|
After Width: | Height: | Size: 12 KiB |
|
|
@ -27,7 +27,7 @@ KeypadTest::~KeypadTest()
|
|||
|
||||
void KeypadTest::onKeyReleased(EventKeyboard::KeyCode keycode, Event* event)
|
||||
{
|
||||
if (keycode == EventKeyboard::KeyCode::KEY_BACKSPACE)
|
||||
if (keycode == EventKeyboard::KeyCode::KEY_ESCAPE)
|
||||
{
|
||||
_label->setString("BACK clicked!");
|
||||
}
|
||||
|
|
|
|||
|
|
@ -373,7 +373,7 @@ void Effect3DOutline::drawWithSprite(EffectSprite3D* sprite, const Mat4 &transfo
|
|||
glBindBuffer(GL_ARRAY_BUFFER, mesh->getVertexBuffer());
|
||||
_glProgramState->apply(transform);
|
||||
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, mesh->getIndexBuffer());
|
||||
glDrawElements((GLenum)mesh->getPrimitiveType(), mesh->getIndexCount(), (GLenum)mesh->getIndexFormat(), 0);
|
||||
glDrawElements((GLenum)mesh->getPrimitiveType(), (GLsizei)mesh->getIndexCount(), (GLenum)mesh->getIndexFormat(), 0);
|
||||
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
|
||||
glBindBuffer(GL_ARRAY_BUFFER, 0);
|
||||
glDisable(GL_DEPTH_TEST);
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -70,6 +70,8 @@
|
|||
</array>
|
||||
<key>UIPrerenderedIcon</key>
|
||||
<true/>
|
||||
<key>UIStatusBarHidden</key>
|
||||
<true/>
|
||||
<key>UISupportedInterfaceOrientations</key>
|
||||
<array>
|
||||
<string>UIInterfaceOrientationLandscapeRight</string>
|
||||
|
|
|
|||
|
|
@ -36,14 +36,9 @@ bool AppDelegate::applicationDidFinishLaunching()
|
|||
|
||||
auto designSize = Size(480, 320);
|
||||
|
||||
auto pFileUtils = FileUtils::getInstance();
|
||||
|
||||
if (screenSize.height > 320)
|
||||
{
|
||||
auto resourceSize = Size(960, 640);
|
||||
std::vector<std::string> searchPaths;
|
||||
searchPaths.push_back("hd");
|
||||
pFileUtils->setSearchPaths(searchPaths);
|
||||
director->setContentScaleFactor(resourceSize.height/designSize.height);
|
||||
}
|
||||
|
||||
|
|
@ -58,51 +53,6 @@ bool AppDelegate::applicationDidFinishLaunching()
|
|||
register_assetsmanager_test_sample(stack->getLuaState());
|
||||
#endif
|
||||
|
||||
#if (CC_TARGET_PLATFORM == CC_PLATFORM_IOS || CC_TARGET_PLATFORM == CC_PLATFORM_MAC)
|
||||
std::string resPrefix("");
|
||||
#else
|
||||
std::string resPrefix("res/");
|
||||
#endif
|
||||
|
||||
std::vector<std::string> searchPaths = pFileUtils->getSearchPaths();
|
||||
searchPaths.insert(searchPaths.begin(), resPrefix);
|
||||
|
||||
searchPaths.insert(searchPaths.begin(), resPrefix + "cocosbuilderRes");
|
||||
if (screenSize.height > 320)
|
||||
{
|
||||
searchPaths.insert(searchPaths.begin(), resPrefix + "hd");
|
||||
searchPaths.insert(searchPaths.begin(), resPrefix + "ccs-res");
|
||||
searchPaths.insert(searchPaths.begin(), resPrefix + "ccs-res/hd");
|
||||
searchPaths.insert(searchPaths.begin(), resPrefix + "ccs-res/hd/Images");
|
||||
searchPaths.insert(searchPaths.begin(), resPrefix + "ccs-res/hd/scenetest/ArmatureComponentTest");
|
||||
searchPaths.insert(searchPaths.begin(), resPrefix + "ccs-res/hd/scenetest/AttributeComponentTest");
|
||||
searchPaths.insert(searchPaths.begin(), resPrefix + "ccs-res/hd/scenetest/BackgroundComponentTest");
|
||||
searchPaths.insert(searchPaths.begin(), resPrefix + "ccs-res/hd/scenetest/EffectComponentTest");
|
||||
searchPaths.insert(searchPaths.begin(), resPrefix + "ccs-res/hd/scenetest/LoadSceneEdtiorFileTest");
|
||||
searchPaths.insert(searchPaths.begin(), resPrefix + "ccs-res/hd/scenetest/ParticleComponentTest");
|
||||
searchPaths.insert(searchPaths.begin(), resPrefix + "ccs-res/hd/scenetest/SpriteComponentTest");
|
||||
searchPaths.insert(searchPaths.begin(), resPrefix + "ccs-res/hd/scenetest/TmxMapComponentTest");
|
||||
searchPaths.insert(searchPaths.begin(), resPrefix + "ccs-res/hd/scenetest/UIComponentTest");
|
||||
searchPaths.insert(searchPaths.begin(), resPrefix + "ccs-res/hd/scenetest/TriggerTest");
|
||||
}
|
||||
else
|
||||
{
|
||||
searchPaths.insert(searchPaths.begin(), resPrefix + "ccs-res/Images");
|
||||
searchPaths.insert(searchPaths.begin(), resPrefix + "ccs-res/scenetest/ArmatureComponentTest");
|
||||
searchPaths.insert(searchPaths.begin(), resPrefix + "ccs-res/scenetest/AttributeComponentTest");
|
||||
searchPaths.insert(searchPaths.begin(), resPrefix + "ccs-res/scenetest/BackgroundComponentTest");
|
||||
searchPaths.insert(searchPaths.begin(), resPrefix + "ccs-res/scenetest/EffectComponentTest");
|
||||
searchPaths.insert(searchPaths.begin(), resPrefix + "ccs-res/scenetest/LoadSceneEdtiorFileTest");
|
||||
searchPaths.insert(searchPaths.begin(), resPrefix + "ccs-res/scenetest/ParticleComponentTest");
|
||||
searchPaths.insert(searchPaths.begin(), resPrefix + "ccs-res/scenetest/SpriteComponentTest");
|
||||
searchPaths.insert(searchPaths.begin(), resPrefix + "ccs-res/scenetest/TmxMapComponentTest");
|
||||
searchPaths.insert(searchPaths.begin(), resPrefix + "ccs-res/scenetest/UIComponentTest");
|
||||
searchPaths.insert(searchPaths.begin(), resPrefix + "ccs-res/scenetest/TriggerTest");
|
||||
}
|
||||
|
||||
|
||||
FileUtils::getInstance()->setSearchPaths(searchPaths);
|
||||
|
||||
pEngine->executeScriptFile("src/controller.lua");
|
||||
|
||||
return true;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,25 @@
|
|||
require "OpenglConstants"
|
||||
require "Cocos2dConstants"
|
||||
require "Opengl"
|
||||
|
||||
local vertDefaultSource = "\n".."\n" ..
|
||||
"attribute vec4 a_position;\n" ..
|
||||
"attribute vec2 a_texCoord;\n" ..
|
||||
"attribute vec4 a_color;\n\n" ..
|
||||
"\n#ifdef GL_ES\n" ..
|
||||
"varying lowp vec4 v_fragmentColor;\n" ..
|
||||
"varying mediump vec2 v_texCoord;\n" ..
|
||||
"\n#else\n" ..
|
||||
"varying vec4 v_fragmentColor;" ..
|
||||
"varying vec2 v_texCoord;" ..
|
||||
"\n#endif\n" ..
|
||||
"void main()\n" ..
|
||||
"{\n" ..
|
||||
" gl_Position = CC_MVPMatrix * a_position;\n"..
|
||||
" v_fragmentColor = a_color;\n"..
|
||||
" v_texCoord = a_texCoord;\n" ..
|
||||
"} \n"
|
||||
|
||||
local function OpenGLTestMainLayer()
|
||||
local kItemTagBasic = 1000
|
||||
local testCount = 16
|
||||
|
|
@ -174,122 +193,80 @@ local function OpenGLTestMainLayer()
|
|||
end
|
||||
|
||||
local function createShaderMajoriTest()
|
||||
local uniformCenter = 0
|
||||
local uniformResolution = 0
|
||||
local time = 0
|
||||
local squareVertexPositionBuffer = {}
|
||||
local majorLayer = cc.Layer:create()
|
||||
|
||||
InitTitle(majorLayer)
|
||||
--loadShaderVertex
|
||||
local shader = cc.GLProgram:create("Shaders/example_Monjori.vsh", "Shaders/example_Monjori.fsh")
|
||||
|
||||
shader:bindAttribLocation("aVertex", cc.VERTEX_ATTRIB_POSITION)
|
||||
shader:link()
|
||||
shader:updateUniforms()
|
||||
local fileUtiles = cc.FileUtils:getInstance()
|
||||
|
||||
local program = shader:getProgram()
|
||||
local vertSource = vertDefaultSource
|
||||
local fragSource = fileUtiles:getStringFromFile("Shaders/example_Monjori.fsh")
|
||||
local glProgam = cc.GLProgram:createWithByteArrays(vertSource, fragSource)
|
||||
local glprogramstate = cc.GLProgramState:getOrCreateWithGLProgram(glProgam)
|
||||
local resolution = cc.p(256, 256)
|
||||
|
||||
local glNode = gl.glNodeCreate()
|
||||
glNode:setContentSize(cc.size(256, 256))
|
||||
glNode:setAnchorPoint(cc.p(0.5, 0.5))
|
||||
uniformCenter = gl.getUniformLocation(program,"center")
|
||||
uniformResolution = gl.getUniformLocation( program, "resolution")
|
||||
glNode:setGLProgram(shader)
|
||||
|
||||
local function initBuffer()
|
||||
squareVertexPositionBuffer = gl.createBuffer()
|
||||
gl.bindBuffer(gl.ARRAY_BUFFER,squareVertexPositionBuffer)
|
||||
local vertices = { 256,256,0,256,256,0,0,0}
|
||||
gl.bufferData(gl.ARRAY_BUFFER,8,vertices,gl.STATIC_DRAW)
|
||||
gl.bindBuffer(gl.ARRAY_BUFFER, 0)
|
||||
end
|
||||
glNode:setGLProgramState(glprogramstate)
|
||||
glNode:getGLProgramState():setUniformVec2("resolution", resolution)
|
||||
|
||||
local function updateMajori(fTime)
|
||||
time = time + fTime
|
||||
end
|
||||
|
||||
local function majoriDraw(transform, transformUpdated)
|
||||
if nil ~= shader then
|
||||
shader:use()
|
||||
shader:setUniformsForBuiltins(transform)
|
||||
--Uniforms
|
||||
shader:setUniformLocationF32( uniformCenter, size.width/2, size.height/2)
|
||||
shader:setUniformLocationF32( uniformResolution, 256, 256)
|
||||
local w = 256
|
||||
local h = 256
|
||||
|
||||
gl.glEnableVertexAttribs(cc.VERTEX_ATTRIB_FLAG_POSITION)
|
||||
|
||||
--Draw fullscreen Square
|
||||
gl.bindBuffer(gl.ARRAY_BUFFER,squareVertexPositionBuffer)
|
||||
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 2, gl.FLOAT, false, 0, 0)
|
||||
gl.drawArrays(gl.TRIANGLE_STRIP,0,4)
|
||||
gl.bindBuffer(gl.ARRAY_BUFFER,0)
|
||||
end
|
||||
local vertices ={ 0,0, w,0, w,h, 0,0, 0,h, w,h }
|
||||
local glProgramState = glNode:getGLProgramState()
|
||||
glProgramState:setVertexAttribPointer("a_position", 2, gl.FLOAT, false, 0, vertices, #vertices)
|
||||
glProgramState:apply(transform)
|
||||
gl.drawArrays(gl.TRIANGLES, 0, 6)
|
||||
end
|
||||
initBuffer()
|
||||
|
||||
majorLayer:scheduleUpdateWithPriorityLua(updateMajori,0)
|
||||
glNode:registerScriptDrawHandler(majoriDraw)
|
||||
time = 0
|
||||
majorLayer:addChild(glNode,-10)
|
||||
print("pos is ", size.width/2, size.height/2)
|
||||
glNode:setPosition( size.width/2, size.height/2)
|
||||
return majorLayer
|
||||
end
|
||||
|
||||
local function createShaderMandelbrotTest()
|
||||
local uniformCenter = 0
|
||||
local uniformResolution = 0
|
||||
local time = 0
|
||||
local squareVertexPositionBuffer = {}
|
||||
local mandelbrotLayer = cc.Layer:create()
|
||||
|
||||
InitTitle(mandelbrotLayer)
|
||||
--loadShaderVertex
|
||||
local shader = cc.GLProgram:create("Shaders/example_Mandelbrot.vsh", "Shaders/example_Mandelbrot.fsh")
|
||||
|
||||
shader:bindAttribLocation("aVertex", 0)
|
||||
shader:link()
|
||||
shader:updateUniforms()
|
||||
|
||||
local program = shader:getProgram()
|
||||
local fileUtiles = cc.FileUtils:getInstance()
|
||||
local vertSource = vertDefaultSource
|
||||
local fragSource = fileUtiles:getStringFromFile("Shaders/example_Mandelbrot.fsh")
|
||||
local glProgam = cc.GLProgram:createWithByteArrays(vertSource, fragSource)
|
||||
local glprogramstate = cc.GLProgramState:getOrCreateWithGLProgram(glProgam)
|
||||
local resolution = cc.p(256, 256)
|
||||
|
||||
local glNode = gl.glNodeCreate()
|
||||
glNode:setContentSize(cc.size(256,256))
|
||||
glNode:setContentSize(cc.size(256, 256))
|
||||
glNode:setAnchorPoint(cc.p(0.5, 0.5))
|
||||
uniformCenter = gl.getUniformLocation(program,"center")
|
||||
uniformResolution = gl.getUniformLocation( program, "resolution")
|
||||
glNode:setGLProgram(shader)
|
||||
|
||||
local function initBuffer()
|
||||
squareVertexPositionBuffer.buffer_id = gl.createBuffer()
|
||||
gl.bindBuffer(gl.ARRAY_BUFFER,squareVertexPositionBuffer.buffer_id)
|
||||
local vertices = { 256,256,0,256,256,0,0,0}
|
||||
gl.bufferData(gl.ARRAY_BUFFER,8,vertices,gl.STATIC_DRAW)
|
||||
gl.bindBuffer(gl.ARRAY_BUFFER, 0)
|
||||
end
|
||||
glNode:setGLProgramState(glprogramstate)
|
||||
glNode:getGLProgramState():setUniformVec2("resolution", resolution)
|
||||
|
||||
local function updateMandelbrot(fTime)
|
||||
time = time + fTime
|
||||
end
|
||||
|
||||
local function mandelbrotDraw(transform, transformUpdated)
|
||||
if nil ~= shader then
|
||||
shader:use()
|
||||
shader:setUniformsForBuiltins(transform)
|
||||
--Uniforms
|
||||
shader:setUniformLocationF32( uniformCenter, size.width/2, size.height/2)
|
||||
shader:setUniformLocationF32( uniformResolution, 256, 256)
|
||||
local w = 256
|
||||
local h = 256
|
||||
|
||||
gl.glEnableVertexAttribs(0x1)
|
||||
|
||||
--Draw fullscreen Square
|
||||
gl.bindBuffer(gl.ARRAY_BUFFER,squareVertexPositionBuffer.buffer_id)
|
||||
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 2, gl.FLOAT, false, 0, 0)
|
||||
gl.drawArrays(gl.TRIANGLE_STRIP,0,4)
|
||||
gl.bindBuffer(gl.ARRAY_BUFFER,0)
|
||||
end
|
||||
local vertices ={ 0,0, w,0, w,h, 0,0, 0,h, w,h }
|
||||
local glProgramState = glNode:getGLProgramState()
|
||||
glProgramState:setVertexAttribPointer("a_position", 2, gl.FLOAT, false, 0, vertices, #vertices)
|
||||
glProgramState:apply(transform)
|
||||
gl.drawArrays(gl.TRIANGLES, 0, 6)
|
||||
end
|
||||
initBuffer()
|
||||
|
||||
mandelbrotLayer:scheduleUpdateWithPriorityLua(updateMandelbrot,0)
|
||||
glNode:registerScriptDrawHandler(mandelbrotDraw)
|
||||
time = 0
|
||||
|
|
@ -299,59 +276,39 @@ local function OpenGLTestMainLayer()
|
|||
end
|
||||
|
||||
local function createShaderHeartTest()
|
||||
local uniformCenter = 0
|
||||
local uniformResolution = 0
|
||||
local time = 0
|
||||
local squareVertexPositionBuffer = {}
|
||||
|
||||
local heartLayer = cc.Layer:create()
|
||||
|
||||
InitTitle(heartLayer)
|
||||
--loadShaderVertex
|
||||
local shader = cc.GLProgram:create("Shaders/example_Heart.vsh", "Shaders/example_Heart.fsh")
|
||||
|
||||
shader:bindAttribLocation("aVertex", 0)
|
||||
shader:link()
|
||||
shader:updateUniforms()
|
||||
|
||||
local program = shader:getProgram()
|
||||
local fileUtiles = cc.FileUtils:getInstance()
|
||||
local vertSource = vertDefaultSource
|
||||
local fragSource = fileUtiles:getStringFromFile("Shaders/example_Heart.fsh")
|
||||
local glProgam = cc.GLProgram:createWithByteArrays(vertSource, fragSource)
|
||||
local glprogramstate = cc.GLProgramState:getOrCreateWithGLProgram(glProgam)
|
||||
local resolution = cc.p(256, 256)
|
||||
|
||||
local glNode = gl.glNodeCreate()
|
||||
glNode:setContentSize(cc.size(256,256))
|
||||
glNode:setContentSize(cc.size(256, 256))
|
||||
glNode:setAnchorPoint(cc.p(0.5, 0.5))
|
||||
uniformCenter = gl.getUniformLocation(program,"center")
|
||||
uniformResolution = gl.getUniformLocation( program, "resolution")
|
||||
glNode:setGLProgram(shader)
|
||||
|
||||
local function initBuffer()
|
||||
squareVertexPositionBuffer.buffer_id = gl.createBuffer()
|
||||
gl.bindBuffer(gl.ARRAY_BUFFER,squareVertexPositionBuffer.buffer_id)
|
||||
local vertices = { 256,256,0,256,256,0,0,0}
|
||||
gl.bufferData(gl.ARRAY_BUFFER,8,vertices,gl.STATIC_DRAW)
|
||||
gl.bindBuffer(gl.ARRAY_BUFFER, 0)
|
||||
end
|
||||
glNode:setGLProgramState(glprogramstate)
|
||||
glNode:getGLProgramState():setUniformVec2("resolution", resolution)
|
||||
|
||||
local function updateHeart(fTime)
|
||||
time = time + fTime
|
||||
end
|
||||
|
||||
local function heartDraw(transform, transformUpdated)
|
||||
if nil ~= shader then
|
||||
shader:use()
|
||||
shader:setUniformsForBuiltins(transform)
|
||||
--Uniforms
|
||||
shader:setUniformLocationF32( uniformCenter, size.width/2, size.height/2)
|
||||
shader:setUniformLocationF32( uniformResolution, 256, 256)
|
||||
local w = 256
|
||||
local h = 256
|
||||
|
||||
gl.glEnableVertexAttribs(0x1)
|
||||
|
||||
--Draw fullscreen Square
|
||||
gl.bindBuffer(gl.ARRAY_BUFFER,squareVertexPositionBuffer.buffer_id)
|
||||
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 2, gl.FLOAT, false, 0, 0)
|
||||
gl.drawArrays(gl.TRIANGLE_STRIP,0,4)
|
||||
gl.bindBuffer(gl.ARRAY_BUFFER,0)
|
||||
end
|
||||
local vertices ={ 0,0, w,0, w,h, 0,0, 0,h, w,h }
|
||||
local glProgramState = glNode:getGLProgramState()
|
||||
glProgramState:setVertexAttribPointer("a_position", 2, gl.FLOAT, false, 0, vertices, #vertices)
|
||||
glProgramState:apply(transform)
|
||||
gl.drawArrays(gl.TRIANGLES, 0, 6)
|
||||
end
|
||||
initBuffer()
|
||||
|
||||
heartLayer:scheduleUpdateWithPriorityLua(updateHeart,0)
|
||||
glNode:registerScriptDrawHandler(heartDraw)
|
||||
time = 0
|
||||
|
|
@ -361,59 +318,40 @@ local function OpenGLTestMainLayer()
|
|||
end
|
||||
|
||||
local function createShaderPlasmaTest()
|
||||
local uniformCenter = 0
|
||||
local uniformResolution = 0
|
||||
local time = 0
|
||||
local squareVertexPositionBuffer = {}
|
||||
|
||||
local plasmaLayer = cc.Layer:create()
|
||||
|
||||
InitTitle(plasmaLayer)
|
||||
--loadShaderVertex
|
||||
local shader = cc.GLProgram:create("Shaders/example_Plasma.vsh", "Shaders/example_Plasma.fsh")
|
||||
|
||||
shader:bindAttribLocation("aVertex", 0)
|
||||
shader:link()
|
||||
shader:updateUniforms()
|
||||
|
||||
local program = shader:getProgram()
|
||||
local fileUtiles = cc.FileUtils:getInstance()
|
||||
local vertSource = vertDefaultSource
|
||||
local fragSource = fileUtiles:getStringFromFile("Shaders/example_Plasma.fsh")
|
||||
local glProgam = cc.GLProgram:createWithByteArrays(vertSource, fragSource)
|
||||
local glprogramstate = cc.GLProgramState:getOrCreateWithGLProgram(glProgam)
|
||||
local resolution = cc.p(256, 256)
|
||||
|
||||
local glNode = gl.glNodeCreate()
|
||||
glNode:setContentSize(cc.size(256,256))
|
||||
glNode:setContentSize(cc.size(256, 256))
|
||||
glNode:setAnchorPoint(cc.p(0.5, 0.5))
|
||||
uniformCenter = gl.getUniformLocation(program,"center")
|
||||
uniformResolution = gl.getUniformLocation( program, "resolution")
|
||||
glNode:setGLProgram(shader)
|
||||
glNode:setGLProgramState(glprogramstate)
|
||||
glNode:getGLProgramState():setUniformVec2("resolution", resolution)
|
||||
|
||||
local function initBuffer()
|
||||
squareVertexPositionBuffer.buffer_id = gl.createBuffer()
|
||||
gl.bindBuffer(gl.ARRAY_BUFFER,squareVertexPositionBuffer.buffer_id)
|
||||
local vertices = { 256,256,0,256,256,0,0,0}
|
||||
gl.bufferData(gl.ARRAY_BUFFER,8,vertices,gl.STATIC_DRAW)
|
||||
gl.bindBuffer(gl.ARRAY_BUFFER, 0)
|
||||
end
|
||||
|
||||
local function updatePlasma(fTime)
|
||||
time = time + fTime
|
||||
end
|
||||
|
||||
local function plasmaDraw(transform, transformUpdated)
|
||||
if nil ~= shader then
|
||||
shader:use()
|
||||
shader:setUniformsForBuiltins(transform)
|
||||
--Uniforms
|
||||
shader:setUniformLocationF32( uniformCenter, size.width/2, size.height/2)
|
||||
shader:setUniformLocationF32( uniformResolution, 256, 256)
|
||||
local w = 256
|
||||
local h = 256
|
||||
|
||||
gl.glEnableVertexAttribs(0x1)
|
||||
|
||||
--Draw fullscreen Square
|
||||
gl.bindBuffer(gl.ARRAY_BUFFER,squareVertexPositionBuffer.buffer_id)
|
||||
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 2, gl.FLOAT, false, 0, 0)
|
||||
gl.drawArrays(gl.TRIANGLE_STRIP,0,4)
|
||||
gl.bindBuffer(gl.ARRAY_BUFFER,0)
|
||||
end
|
||||
local vertices ={ 0,0, w,0, w,h, 0,0, 0,h, w,h }
|
||||
local glProgramState = glNode:getGLProgramState()
|
||||
glProgramState:setVertexAttribPointer("a_position", 2, gl.FLOAT, false, 0, vertices, #vertices)
|
||||
glProgramState:apply(transform)
|
||||
gl.drawArrays(gl.TRIANGLES, 0, 6)
|
||||
end
|
||||
initBuffer()
|
||||
|
||||
plasmaLayer:scheduleUpdateWithPriorityLua(updatePlasma,0)
|
||||
glNode:registerScriptDrawHandler(plasmaDraw)
|
||||
time = 0
|
||||
|
|
@ -423,59 +361,39 @@ local function OpenGLTestMainLayer()
|
|||
end
|
||||
|
||||
local function createShaderFlowerTest()
|
||||
local uniformCenter = 0
|
||||
local uniformResolution = 0
|
||||
local time = 0
|
||||
local squareVertexPositionBuffer = {}
|
||||
|
||||
local flowerLayer = cc.Layer:create()
|
||||
|
||||
InitTitle(flowerLayer)
|
||||
--loadShaderVertex
|
||||
local shader = cc.GLProgram:create("Shaders/example_Flower.vsh", "Shaders/example_Flower.fsh")
|
||||
|
||||
shader:bindAttribLocation("aVertex", 0)
|
||||
shader:link()
|
||||
shader:updateUniforms()
|
||||
|
||||
local program = shader:getProgram()
|
||||
local fileUtiles = cc.FileUtils:getInstance()
|
||||
local vertSource = vertDefaultSource
|
||||
local fragSource = fileUtiles:getStringFromFile("Shaders/example_Flower.fsh")
|
||||
local glProgam = cc.GLProgram:createWithByteArrays(vertSource, fragSource)
|
||||
local glprogramstate = cc.GLProgramState:getOrCreateWithGLProgram(glProgam)
|
||||
local resolution = cc.p(256, 256)
|
||||
|
||||
local glNode = gl.glNodeCreate()
|
||||
glNode:setContentSize(cc.size(256,256))
|
||||
glNode:setContentSize(cc.size(256, 256))
|
||||
glNode:setAnchorPoint(cc.p(0.5, 0.5))
|
||||
uniformCenter = gl.getUniformLocation(program,"center")
|
||||
uniformResolution = gl.getUniformLocation( program, "resolution")
|
||||
glNode:setGLProgram(shader)
|
||||
|
||||
local function initBuffer()
|
||||
squareVertexPositionBuffer.buffer_id = gl.createBuffer()
|
||||
gl.bindBuffer(gl.ARRAY_BUFFER,squareVertexPositionBuffer.buffer_id)
|
||||
local vertices = { 256,256,0,256,256,0,0,0}
|
||||
gl.bufferData(gl.ARRAY_BUFFER,8,vertices,gl.STATIC_DRAW)
|
||||
gl.bindBuffer(gl.ARRAY_BUFFER, 0)
|
||||
end
|
||||
glNode:setGLProgramState(glprogramstate)
|
||||
glNode:getGLProgramState():setUniformVec2("resolution", resolution)
|
||||
|
||||
local function updateFlower(fTime)
|
||||
time = time + fTime
|
||||
end
|
||||
|
||||
local function flowerDraw(transform, transformUpdated)
|
||||
if nil ~= shader then
|
||||
shader:use()
|
||||
shader:setUniformsForBuiltins(transform)
|
||||
--Uniforms
|
||||
shader:setUniformLocationF32( uniformCenter, size.width/2, size.height/2)
|
||||
shader:setUniformLocationF32( uniformResolution, 256, 256)
|
||||
local w = 256
|
||||
local h = 256
|
||||
|
||||
gl.glEnableVertexAttribs(0x1)
|
||||
|
||||
--Draw fullscreen Square
|
||||
gl.bindBuffer(gl.ARRAY_BUFFER,squareVertexPositionBuffer.buffer_id)
|
||||
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 2, gl.FLOAT, false, 0, 0)
|
||||
gl.drawArrays(gl.TRIANGLE_STRIP,0,4)
|
||||
gl.bindBuffer(gl.ARRAY_BUFFER,0)
|
||||
end
|
||||
local vertices ={ 0,0, w,0, w,h, 0,0, 0,h, w,h }
|
||||
local glProgramState = glNode:getGLProgramState()
|
||||
glProgramState:setVertexAttribPointer("a_position", 2, gl.FLOAT, false, 0, vertices, #vertices)
|
||||
glProgramState:apply(transform)
|
||||
gl.drawArrays(gl.TRIANGLES, 0, 6)
|
||||
end
|
||||
initBuffer()
|
||||
|
||||
flowerLayer:scheduleUpdateWithPriorityLua(updateFlower,0)
|
||||
glNode:registerScriptDrawHandler(flowerDraw)
|
||||
time = 0
|
||||
|
|
@ -485,59 +403,39 @@ local function OpenGLTestMainLayer()
|
|||
end
|
||||
|
||||
local function createShaderJuliaTest()
|
||||
local uniformCenter = 0
|
||||
local uniformResolution = 0
|
||||
local time = 0
|
||||
local squareVertexPositionBuffer = {}
|
||||
|
||||
local juliaLayer = cc.Layer:create()
|
||||
|
||||
InitTitle(juliaLayer)
|
||||
--loadShaderVertex
|
||||
local shader = cc.GLProgram:create("Shaders/example_Julia.vsh", "Shaders/example_Julia.fsh")
|
||||
|
||||
shader:bindAttribLocation("aVertex", 0)
|
||||
shader:link()
|
||||
shader:updateUniforms()
|
||||
|
||||
local program = shader:getProgram()
|
||||
local fileUtiles = cc.FileUtils:getInstance()
|
||||
local vertSource = vertDefaultSource
|
||||
local fragSource = fileUtiles:getStringFromFile("Shaders/example_Julia.fsh")
|
||||
local glProgam = cc.GLProgram:createWithByteArrays(vertSource, fragSource)
|
||||
local glprogramstate = cc.GLProgramState:getOrCreateWithGLProgram(glProgam)
|
||||
local resolution = cc.p(256, 256)
|
||||
|
||||
local glNode = gl.glNodeCreate()
|
||||
glNode:setContentSize(cc.size(256,256))
|
||||
glNode:setContentSize(cc.size(256, 256))
|
||||
glNode:setAnchorPoint(cc.p(0.5, 0.5))
|
||||
uniformCenter = gl.getUniformLocation(program,"center")
|
||||
uniformResolution = gl.getUniformLocation( program, "resolution")
|
||||
glNode:setGLProgram(shader)
|
||||
|
||||
local function initBuffer()
|
||||
squareVertexPositionBuffer.buffer_id = gl.createBuffer()
|
||||
gl.bindBuffer(gl.ARRAY_BUFFER,squareVertexPositionBuffer.buffer_id)
|
||||
local vertices = { 256,256,0,256,256,0,0,0}
|
||||
gl.bufferData(gl.ARRAY_BUFFER,8,vertices,gl.STATIC_DRAW)
|
||||
gl.bindBuffer(gl.ARRAY_BUFFER, 0)
|
||||
end
|
||||
glNode:setGLProgramState(glprogramstate)
|
||||
glNode:getGLProgramState():setUniformVec2("resolution", resolution)
|
||||
|
||||
local function updateJulia(fTime)
|
||||
time = time + fTime
|
||||
end
|
||||
|
||||
local function juliaDraw(transform, transformUpdated)
|
||||
if nil ~= shader then
|
||||
shader:use()
|
||||
shader:setUniformsForBuiltins(transform)
|
||||
--Uniforms
|
||||
shader:setUniformLocationF32( uniformCenter, size.width/2, size.height/2)
|
||||
shader:setUniformLocationF32( uniformResolution, 256, 256)
|
||||
local w = 256
|
||||
local h = 256
|
||||
|
||||
gl.glEnableVertexAttribs(0x1)
|
||||
|
||||
--Draw fullscreen Square
|
||||
gl.bindBuffer(gl.ARRAY_BUFFER,squareVertexPositionBuffer.buffer_id)
|
||||
gl.vertexAttribPointer(cc.VERTEX_ATTRIB_POSITION, 2, gl.FLOAT, false, 0, 0)
|
||||
gl.drawArrays(gl.TRIANGLE_STRIP,0,4)
|
||||
gl.bindBuffer(gl.ARRAY_BUFFER,0)
|
||||
end
|
||||
local vertices ={ 0,0, w,0, w,h, 0,0, 0,h, w,h }
|
||||
local glProgramState = glNode:getGLProgramState()
|
||||
glProgramState:setVertexAttribPointer("a_position", 2, gl.FLOAT, false, 0, vertices, #vertices)
|
||||
glProgramState:apply(transform)
|
||||
gl.drawArrays(gl.TRIANGLES, 0, 6)
|
||||
end
|
||||
initBuffer()
|
||||
|
||||
juliaLayer:scheduleUpdateWithPriorityLua(updateJulia,0)
|
||||
glNode:registerScriptDrawHandler(juliaDraw)
|
||||
time = 0
|
||||
|
|
@ -606,6 +504,7 @@ local function OpenGLTestMainLayer()
|
|||
glNode:setAnchorPoint(cc.p(0.5,0.5))
|
||||
local shaderCache = cc.ShaderCache:getInstance()
|
||||
local shader = shaderCache:getProgram("ShaderPositionTexture")
|
||||
|
||||
local function initGL()
|
||||
texture.texture_id = gl.createTexture()
|
||||
gl.bindTexture(gl.TEXTURE_2D,texture.texture_id )
|
||||
|
|
|
|||
|
|
@ -0,0 +1,74 @@
|
|||
local size = cc.Director:getInstance():getWinSize()
|
||||
|
||||
----------------------------------------
|
||||
----Sprite3DBasicTest
|
||||
----------------------------------------
|
||||
|
||||
local Sprite3DBasicTest = {}
|
||||
Sprite3DBasicTest.__index = Sprite3DBasicTest
|
||||
|
||||
function Sprite3DBasicTest.onTouchesEnd(touches, event)
|
||||
for i = 1,table.getn(touches) do
|
||||
local location = touches[i]:getLocation()
|
||||
Sprite3DBasicTest.addNewSpriteWithCoords(Helper.currentLayer, location.x, location.y )
|
||||
end
|
||||
end
|
||||
|
||||
function Sprite3DBasicTest.addNewSpriteWithCoords(parent,x,y)
|
||||
local sprite = cc.Sprite3D:create("Sprite3DTest/boss1.obj")
|
||||
sprite:setScale(3.0)
|
||||
sprite:setTexture("Sprite3DTest/boss.png")
|
||||
|
||||
parent:addChild(sprite)
|
||||
sprite:setPosition(cc.p(x,y))
|
||||
|
||||
local random = math.random(0, 1)
|
||||
local action = nil
|
||||
if random < 0.2 then
|
||||
action = cc.ScaleBy:create(3,2)
|
||||
elseif random < 0.4 then
|
||||
action = cc.RotateBy:create(3, 360)
|
||||
elseif random < 0.6 then
|
||||
action = cc.Blink:create(1, 3)
|
||||
elseif random < 0.8 then
|
||||
action = cc.TintBy:create(2, 0, -255, -255)
|
||||
else
|
||||
action = cc.FadeOut:create(2)
|
||||
end
|
||||
|
||||
local action_back = action:reverse()
|
||||
local seq = cc.Sequence:create(action, action_back)
|
||||
|
||||
sprite:runAction(cc.RepeatForever:create(seq))
|
||||
end
|
||||
|
||||
function Sprite3DBasicTest.create()
|
||||
local layer = cc.Layer:create()
|
||||
Helper.initWithLayer(layer)
|
||||
Helper.titleLabel:setString("Testing Sprite3D")
|
||||
Helper.subtitleLabel:setString("Tap screen to add more sprites")
|
||||
|
||||
local listener = cc.EventListenerTouchAllAtOnce:create()
|
||||
listener:registerScriptHandler(Sprite3DBasicTest.onTouchesEnd,cc.Handler.EVENT_TOUCHES_ENDED )
|
||||
|
||||
local eventDispatcher = layer:getEventDispatcher()
|
||||
eventDispatcher:addEventListenerWithSceneGraphPriority(listener, layer)
|
||||
|
||||
Sprite3DBasicTest.addNewSpriteWithCoords(layer, size.width / 2, size.height / 2)
|
||||
return layer
|
||||
end
|
||||
|
||||
|
||||
function Sprite3DTest()
|
||||
local scene = cc.Scene:create()
|
||||
|
||||
Helper.createFunctionTable =
|
||||
{
|
||||
Sprite3DBasicTest.create,
|
||||
}
|
||||
|
||||
scene:addChild(Sprite3DBasicTest.create())
|
||||
scene:addChild(CreateBackMenuItem())
|
||||
|
||||
return scene
|
||||
end
|
||||
|
|
@ -1264,16 +1264,33 @@ local function TextureMemoryAlloc()
|
|||
cc.Director:getInstance():getTextureCache():removeUnusedTextures()
|
||||
|
||||
local file = ""
|
||||
if tag == 0 then
|
||||
file = "Images/test_1021x1024.png"
|
||||
elseif tag == 1 then
|
||||
file = "Images/test_1021x1024_rgba8888.pvr"
|
||||
elseif tag == 2 then
|
||||
file = "Images/test_1021x1024_rgb888.pvr"
|
||||
elseif tag == 3 then
|
||||
file = "Images/test_1021x1024_rgba4444.pvr"
|
||||
elseif tag == 4 then
|
||||
file = "Images/test_1021x1024_a8.pvr"
|
||||
|
||||
local targetPlatform = cc.Application:getInstance():getTargetPlatform()
|
||||
|
||||
if cc.PLATFORM_OS_ANDROID == targetPlatform then
|
||||
if tag == 0 then
|
||||
file = "Images/background.png"
|
||||
elseif tag == 1 then
|
||||
file = "Images/fire_rgba8888.pvr"
|
||||
elseif tag == 2 then
|
||||
file = "Images/grossini_prv_rgba8888.pvr"
|
||||
elseif tag == 3 then
|
||||
file = "Images/grossini_prv_rgba4444.pvr"
|
||||
elseif tag == 4 then
|
||||
file = "Images/test_image_a8.pvr"
|
||||
end
|
||||
else
|
||||
if tag == 0 then
|
||||
file = "Images/background.png"
|
||||
elseif tag == 1 then
|
||||
file = "Images/test_image_rgba4444.pvr.gz"
|
||||
elseif tag == 2 then
|
||||
file = "Images/test_image_rgba4444.pvr.gz"
|
||||
elseif tag == 3 then
|
||||
file = "Images/test_image_rgba4444.pvr.gz"
|
||||
elseif tag == 4 then
|
||||
file = "Images/test_image_rgba4444.pvr.gz"
|
||||
end
|
||||
end
|
||||
|
||||
m_pBackground = cc.Sprite:create(file)
|
||||
|
|
|
|||
|
|
@ -8,6 +8,65 @@ require "src/mainMenu"
|
|||
|
||||
|
||||
-- run
|
||||
|
||||
local glView = cc.Director:getInstance():getOpenGLView()
|
||||
local screenSize = glView:getFrameSize()
|
||||
local designSize = {width = 480, height = 320}
|
||||
local fileUtils = cc.FileUtils:getInstance()
|
||||
|
||||
if screenSize.height > 320 then
|
||||
local searchPaths = {}
|
||||
table.insert(searchPaths, "hd")
|
||||
fileUtils:setSearchPaths(searchPaths)
|
||||
end
|
||||
|
||||
local targetPlatform = cc.Application:getInstance():getTargetPlatform()
|
||||
local resPrefix = ""
|
||||
if cc.PLATFORM_OS_IPAD == targetPlatform or cc.PLATFORM_OS_IPHONE == targetPlatform or cc.PLATFORM_OS_MAC == targetPlatform then
|
||||
resPrefix = ""
|
||||
else
|
||||
resPrefix = "res/"
|
||||
end
|
||||
|
||||
local searchPaths = fileUtils:getSearchPaths()
|
||||
table.insert(searchPaths, 1, resPrefix)
|
||||
table.insert(searchPaths, 1, resPrefix .. "cocosbuilderRes")
|
||||
|
||||
if screenSize.height > 320 then
|
||||
table.insert(searchPaths, 1, resPrefix .. "hd")
|
||||
table.insert(searchPaths, 1, resPrefix .. "ccs-res")
|
||||
table.insert(searchPaths, 1, resPrefix .. "ccs-res/hd")
|
||||
table.insert(searchPaths, 1, resPrefix .. "ccs-res/hd/Images")
|
||||
table.insert(searchPaths, 1, resPrefix .. "ccs-res/hd/scenetest/ArmatureComponentTest")
|
||||
table.insert(searchPaths, 1, resPrefix .. "ccs-res/hd/scenetest/AttributeComponentTest")
|
||||
table.insert(searchPaths, 1, resPrefix .. "ccs-res/hd/scenetest/BackgroundComponentTest")
|
||||
table.insert(searchPaths, 1, resPrefix .. "ccs-res/hd/scenetest/EffectComponentTest")
|
||||
table.insert(searchPaths, 1, resPrefix .. "ccs-res/hd/scenetest/LoadSceneEdtiorFileTest")
|
||||
table.insert(searchPaths, 1, resPrefix .. "ccs-res/hd/scenetest/ParticleComponentTest")
|
||||
table.insert(searchPaths, 1, resPrefix .. "ccs-res/hd/scenetest/SpriteComponentTest")
|
||||
table.insert(searchPaths, 1, resPrefix .. "ccs-res/hd/scenetest/TmxMapComponentTest")
|
||||
table.insert(searchPaths, 1, resPrefix .. "ccs-res/hd/scenetest/UIComponentTest")
|
||||
table.insert(searchPaths, 1, resPrefix .. "ccs-res/hd/scenetest/TriggerTest")
|
||||
else
|
||||
table.insert(searchPaths, 1, resPrefix .. "ccs-res/Images")
|
||||
table.insert(searchPaths, 1, resPrefix .. "ccs-res/scenetest/ArmatureComponentTest")
|
||||
table.insert(searchPaths, 1, resPrefix .. "ccs-res/scenetest/AttributeComponentTest")
|
||||
table.insert(searchPaths, 1, resPrefix .. "ccs-res/scenetest/BackgroundComponentTest")
|
||||
table.insert(searchPaths, 1, resPrefix .. "ccs-res/scenetest/EffectComponentTest")
|
||||
table.insert(searchPaths, 1, resPrefix .. "ccs-res/scenetest/LoadSceneEdtiorFileTest")
|
||||
table.insert(searchPaths, 1, resPrefix .. "ccs-res/scenetest/ParticleComponentTest")
|
||||
table.insert(searchPaths, 1, resPrefix .. "ccs-res/scenetest/SpriteComponentTest")
|
||||
table.insert(searchPaths, 1, resPrefix .. "ccs-res/scenetest/TmxMapComponentTest")
|
||||
table.insert(searchPaths, 1, resPrefix .. "ccs-res/scenetest/UIComponentTest")
|
||||
table.insert(searchPaths, 1, resPrefix .. "ccs-res/scenetest/TriggerTest")
|
||||
end
|
||||
|
||||
fileUtils:setSearchPaths(searchPaths)
|
||||
|
||||
local scene = cc.Scene:create()
|
||||
scene:addChild(CreateTestMenu())
|
||||
cc.Director:getInstance():runWithScene(scene)
|
||||
if cc.Director:getInstance():getRunningScene() then
|
||||
cc.Director:getInstance():replaceScene(scene)
|
||||
else
|
||||
cc.Director:getInstance():runWithScene(scene)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -39,6 +39,7 @@ require "src/ParticleTest/ParticleTest"
|
|||
require "src/PerformanceTest/PerformanceTest"
|
||||
require "src/RenderTextureTest/RenderTextureTest"
|
||||
require "src/RotateWorldTest/RotateWorldTest"
|
||||
require "src/Sprite3DTest/Sprite3DTest"
|
||||
require "src/SpriteTest/SpriteTest"
|
||||
require "src/SceneTest/SceneTest"
|
||||
require "src/SpineTest/SpineTest"
|
||||
|
|
@ -102,6 +103,7 @@ local _allTests = {
|
|||
{ isSupported = true, name = "SpineTest" , create_func = SpineTestMain },
|
||||
{ isSupported = false, name = "SchdulerTest" , create_func= SchdulerTestMain },
|
||||
{ isSupported = false, name = "ShaderTest" , create_func= ShaderTestMain },
|
||||
{ isSupported = true, name = "Sprite3DTest" , create_func = Sprite3DTest },
|
||||
{ isSupported = true, name = "SpriteTest" , create_func = SpriteTest },
|
||||
{ isSupported = false, name = "TextInputTest" , create_func= TextInputTestMain },
|
||||
{ isSupported = true, name = "Texture2DTest" , create_func = Texture2dTestMain },
|
||||
|
|
|
|||
|
|
@ -1 +1 @@
|
|||
Subproject commit 0aba499447134661135f55e84681540ade4f766f
|
||||
Subproject commit e9f1775eb85c4ccf429556199634048df920688d
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue