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

Merge branch 'v3' into v3_comments 

Conflicts:
	cocos/renderer/ccShaders.h
This commit is contained in:
Huabing.Xu 2015-03-27 12:05:15 +08:00
parent 3d657df9f6 29c5da8429
commit 0367d752af
61 changed files with 1118 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG
View File

@ -1,4 +1,6 @@
cocos2d-x-3.6beta Apr.14 2015
cocos2d-x-3.6beta0 Apr.14 2015
[NEW] 3D: added texturecub supported
[FIX] Sprite3D: memory leak
cocos2d-x-3.5 Mar.23 2015

32
build/cocos2d_libs.xcodeproj/project.pbxproj
View File

@ -2564,6 +2564,14 @@
B68779051A8CA82E00643ABF /* CCParticleSystem3D.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B68778F61A8CA82E00643ABF /* CCParticleSystem3D.cpp */; };
B68779061A8CA82E00643ABF /* CCParticleSystem3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B68778F71A8CA82E00643ABF /* CCParticleSystem3D.h */; };
B68779071A8CA82E00643ABF /* CCParticleSystem3D.h in Headers */ = {isa = PBXBuildFile; fileRef = B68778F71A8CA82E00643ABF /* CCParticleSystem3D.h */; };
B6D38B8A1AC3AFAC00043997 /* CCSkybox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6D38B861AC3AFAC00043997 /* CCSkybox.cpp */; };
B6D38B8B1AC3AFAC00043997 /* CCSkybox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6D38B861AC3AFAC00043997 /* CCSkybox.cpp */; };
B6D38B8C1AC3AFAC00043997 /* CCSkybox.h in Headers */ = {isa = PBXBuildFile; fileRef = B6D38B871AC3AFAC00043997 /* CCSkybox.h */; };
B6D38B8D1AC3AFAC00043997 /* CCSkybox.h in Headers */ = {isa = PBXBuildFile; fileRef = B6D38B871AC3AFAC00043997 /* CCSkybox.h */; };
B6D38B8E1AC3AFAC00043997 /* CCTextureCube.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6D38B881AC3AFAC00043997 /* CCTextureCube.cpp */; };
B6D38B8F1AC3AFAC00043997 /* CCTextureCube.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B6D38B881AC3AFAC00043997 /* CCTextureCube.cpp */; };
B6D38B901AC3AFAC00043997 /* CCTextureCube.h in Headers */ = {isa = PBXBuildFile; fileRef = B6D38B891AC3AFAC00043997 /* CCTextureCube.h */; };
B6D38B911AC3AFAC00043997 /* CCTextureCube.h in Headers */ = {isa = PBXBuildFile; fileRef = B6D38B891AC3AFAC00043997 /* CCTextureCube.h */; };
D0FD03491A3B51AA00825BB5 /* CCAllocatorBase.h in Headers */ = {isa = PBXBuildFile; fileRef = D0FD033B1A3B51AA00825BB5 /* CCAllocatorBase.h */; };
D0FD034A1A3B51AA00825BB5 /* CCAllocatorBase.h in Headers */ = {isa = PBXBuildFile; fileRef = D0FD033B1A3B51AA00825BB5 /* CCAllocatorBase.h */; };
D0FD034B1A3B51AA00825BB5 /* CCAllocatorDiagnostics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0FD033C1A3B51AA00825BB5 /* CCAllocatorDiagnostics.cpp */; };
@ -3973,6 +3981,14 @@
B68778F51A8CA82E00643ABF /* CCParticle3DRender.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCParticle3DRender.h; path = Particle3D/CCParticle3DRender.h; sourceTree = "<group>"; };
B68778F61A8CA82E00643ABF /* CCParticleSystem3D.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = CCParticleSystem3D.cpp; path = Particle3D/CCParticleSystem3D.cpp; sourceTree = "<group>"; };
B68778F71A8CA82E00643ABF /* CCParticleSystem3D.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CCParticleSystem3D.h; path = Particle3D/CCParticleSystem3D.h; sourceTree = "<group>"; };
B6D38B861AC3AFAC00043997 /* CCSkybox.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCSkybox.cpp; sourceTree = "<group>"; };
B6D38B871AC3AFAC00043997 /* CCSkybox.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSkybox.h; sourceTree = "<group>"; };
B6D38B881AC3AFAC00043997 /* CCTextureCube.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCTextureCube.cpp; sourceTree = "<group>"; };
B6D38B891AC3AFAC00043997 /* CCTextureCube.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCTextureCube.h; sourceTree = "<group>"; };
B6D38B941AC3B45600043997 /* ccShader_3D_Particle.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_3D_Particle.frag; sourceTree = "<group>"; };
B6D38B951AC3B45600043997 /* ccShader_3D_Particle.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_3D_Particle.vert; sourceTree = "<group>"; };
B6D38B961AC3B45600043997 /* ccShader_3D_Skybox.frag */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_3D_Skybox.frag; sourceTree = "<group>"; };
B6D38B971AC3B45600043997 /* ccShader_3D_Skybox.vert */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.glsl; path = ccShader_3D_Skybox.vert; sourceTree = "<group>"; };
D0FD033B1A3B51AA00825BB5 /* CCAllocatorBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAllocatorBase.h; sourceTree = "<group>"; };
D0FD033C1A3B51AA00825BB5 /* CCAllocatorDiagnostics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCAllocatorDiagnostics.cpp; sourceTree = "<group>"; };
D0FD033D1A3B51AA00825BB5 /* CCAllocatorDiagnostics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAllocatorDiagnostics.h; sourceTree = "<group>"; };
@ -5857,6 +5873,10 @@
5034CA5D191D591900CE6051 /* shaders */ = {
isa = PBXGroup;
children = (
B6D38B941AC3B45600043997 /* ccShader_3D_Particle.frag */,
B6D38B951AC3B45600043997 /* ccShader_3D_Particle.vert */,
B6D38B961AC3B45600043997 /* ccShader_3D_Skybox.frag */,
B6D38B971AC3B45600043997 /* ccShader_3D_Skybox.vert */,
B20564AA1A6E5744001C1B6E /* ccShader_PositionColorTextureAsPointsize.vert */,
B67C624319D4186F00F11FC6 /* ccShader_3D_ColorNormal.frag */,
B67C624419D4186F00F11FC6 /* ccShader_3D_ColorNormalTex.frag */,
@ -6153,6 +6173,10 @@
B29594B81926D61F003EEF37 /* 3d */ = {
isa = PBXGroup;
children = (
B6D38B861AC3AFAC00043997 /* CCSkybox.cpp */,
B6D38B871AC3AFAC00043997 /* CCSkybox.h */,
B6D38B881AC3AFAC00043997 /* CCTextureCube.cpp */,
B6D38B891AC3AFAC00043997 /* CCTextureCube.h */,
5E9F61221A3FFE3D0038DE01 /* CCFrustum.cpp */,
5E9F61231A3FFE3D0038DE01 /* CCFrustum.h */,
5E9F61241A3FFE3D0038DE01 /* CCPlane.cpp */,
@ -6548,6 +6572,7 @@
15AE1A5319AAD40300C27E9E /* b2Draw.h in Headers */,
B665E25C1AA80A6500DDB1C5 /* CCPUDoEnableComponentEventHandler.h in Headers */,
38B8E2E319E671D2002D7CE7 /* UILayoutComponent.h in Headers */,
B6D38B8C1AC3AFAC00043997 /* CCSkybox.h in Headers */,
5034CA39191D591100CE6051 /* ccShader_PositionColorLengthTexture.frag in Headers */,
292DB14B19B4574100A80320 /* UIEditBoxImpl-mac.h in Headers */,
B29A7E3F19EE1B7700872B35 /* AnimationState.h in Headers */,
@ -7013,6 +7038,7 @@
50ABBD621925AB0000A911A9 /* Vec4.h in Headers */,
B60C5BD619AC68B10056FBDE /* CCBillBoard.h in Headers */,
15AE1BA419AADFDF00C27E9E /* UILayoutManager.h in Headers */,
B6D38B901AC3AFAC00043997 /* CCTextureCube.h in Headers */,
1A01C69418F57BE800EFE3A6 /* CCFloat.h in Headers */,
1A57034D180BD09B0088DEC7 /* tinyxml2.h in Headers */,
15AE18F519AAD35000C27E9E /* CCArmatureDefine.h in Headers */,
@ -7575,6 +7601,7 @@
1A570224180BCC1A0088DEC7 /* CCParticleBatchNode.h in Headers */,
15AE1AC919AAD40300C27E9E /* b2Joint.h in Headers */,
382383EF1A258FA7002C4610 /* flatbuffers.h in Headers */,
B6D38B911AC3AFAC00043997 /* CCTextureCube.h in Headers */,
B665E2811AA80A6500DDB1C5 /* CCPUDoScaleEventHandlerTranslator.h in Headers */,
15AE196819AAD35100C27E9E /* CCUtilMath.h in Headers */,
B29A7E2019EE1B7700872B35 /* BoneData.h in Headers */,
@ -7770,6 +7797,7 @@
B665E2CD1AA80A6500DDB1C5 /* CCPUGravityAffectorTranslator.h in Headers */,
50ABBD4F1925AB0000A911A9 /* MathUtil.h in Headers */,
1A01C69718F57BE800EFE3A6 /* CCInteger.h in Headers */,
B6D38B8D1AC3AFAC00043997 /* CCSkybox.h in Headers */,
15AE1C0619AAE01E00C27E9E /* CCTableViewCell.h in Headers */,
B665E4251AA80A6600DDB1C5 /* CCPUTranslateManager.h in Headers */,
15AE19AB19AAD39700C27E9E /* ListViewReader.h in Headers */,
@ -8021,6 +8049,7 @@
50ABBDA71925AB4100A911A9 /* CCRenderCommand.cpp in Sources */,
B665E35E1AA80A6500DDB1C5 /* CCPUOnRandomObserverTranslator.cpp in Sources */,
B665E24E1AA80A6500DDB1C5 /* CCPUColorAffectorTranslator.cpp in Sources */,
B6D38B8E1AC3AFAC00043997 /* CCTextureCube.cpp in Sources */,
15AE1B9B19AADFDF00C27E9E /* UIRelativeBox.cpp in Sources */,
B665E3E21AA80A6600DDB1C5 /* CCPUSineForceAffector.cpp in Sources */,
50ABBD501925AB0000A911A9 /* Quaternion.cpp in Sources */,
@ -8328,6 +8357,7 @@
15AE182019AAD2F700C27E9E /* CCBundleReader.cpp in Sources */,
B665E2421AA80A6500DDB1C5 /* CCPUCollisionAvoidanceAffector.cpp in Sources */,
15AE1AD819AAD41000C27E9E /* b2Rope.cpp in Sources */,
B6D38B8A1AC3AFAC00043997 /* CCSkybox.cpp in Sources */,
B665E3521AA80A6500DDB1C5 /* CCPUOnQuotaObserver.cpp in Sources */,
B29A7DC719EE1B7700872B35 /* SkeletonRenderer.cpp in Sources */,
15AE1A7C19AAD40300C27E9E /* b2MotorJoint.cpp in Sources */,
@ -8848,6 +8878,7 @@
15AE1AA519AAD40300C27E9E /* b2Fixture.cpp in Sources */,
B29A7DE219EE1B7700872B35 /* MeshAttachment.c in Sources */,
50ED2BE719BEAF7900A0AB90 /* UIEditBoxImpl-wp8.cpp in Sources */,
B6D38B8F1AC3AFAC00043997 /* CCTextureCube.cpp in Sources */,
15AE1BAD19AADFDF00C27E9E /* UILayoutParameter.cpp in Sources */,
3823843E1A259140002C4610 /* SingleNodeReader.cpp in Sources */,
B29A7DDE19EE1B7700872B35 /* BoneData.c in Sources */,
@ -8886,6 +8917,7 @@
15AE1A9D19AAD40300C27E9E /* b2StackAllocator.cpp in Sources */,
B665E34F1AA80A6500DDB1C5 /* CCPUOnPositionObserverTranslator.cpp in Sources */,
1A5701EF180BCB8C0088DEC7 /* CCTransitionProgress.cpp in Sources */,
B6D38B8B1AC3AFAC00043997 /* CCSkybox.cpp in Sources */,
1A5701F8180BCBAD0088DEC7 /* CCMenu.cpp in Sources */,
382384141A259092002C4610 /* NodeReaderProtocol.cpp in Sources */,
50ABBD511925AB0000A911A9 /* Quaternion.cpp in Sources */,

2
cocos/2d/CCAction.h
View File

@ -109,7 +109,7 @@ public:
* @param time A value between 0 and 1.
*/
virtual void update(float time);
/** Return certain target..
/** Return certain target.
*
* @return A certain target.
*/

4
cocos/2d/CCActionCamera.h
View File

@ -124,9 +124,9 @@ public:
* @param t Duration in seconds.
* @param radius The start radius.
* @param deltaRadius The delta radius.
* @param angelZ The start Angel in Z.
* @param angleZ The start Angel in Z.
* @param deltaAngleZ The delta angle in Z.
* @param angelX The start Angel in X.
* @param angleX The start Angel in X.
* @param deltaAngleX The delta angle in X.
* @return An OrbitCamera.
*/

4
cocos/2d/CCActionCatmullRom.h
View File

@ -168,7 +168,7 @@ public:
/** Creates an action with a Cardinal Spline array of points and tension.
* @param duration In seconds.
* @param point An PointArray.
* @param points An PointArray.
* @param tension Goodness of fit.
* @code
* When this function bound to js or lua,the input params are changed.
@ -192,7 +192,7 @@ public:
* Initializes the action with a duration and an array of points.
*
* @param duration In seconds.
* @param point An PointArray.
* @param points An PointArray.
* @param tension Goodness of fit.
*/
bool initWithDuration(float duration, PointArray* points, float tension);

6
cocos/2d/CCAnimation.h
View File

@ -45,10 +45,10 @@ class SpriteFrame;
* @{
*/
/** AnimationFrame
/** @class AnimationFrame
*
* A frame of the animation. It contains information like:
* - sprite frame name.
* - sprite frame name.
* - # of delay units.
* - offset
@ -222,7 +222,7 @@ public:
/** Sets the delay in seconds of the "delay unit".
*
* @param setDelayPerUnit The delay in seconds of the "delay unit".
* @param delayPerUnit The delay in seconds of the "delay unit".
*/
void setDelayPerUnit(float delayPerUnit) { _delayPerUnit = delayPerUnit; };

6
cocos/2d/CCNode.h
View File

@ -739,9 +739,9 @@ public:
*
* If the child is added to a 'running' node, then 'onEnter' and 'onEnterTransitionDidFinish' will be called immediately.
*
* @param child A child node.
* @param zOrder Z order for drawing priority. Please refer to `setLocalZOrder(int)`.
* @param tag An integer to identify the node easily. Please refer to `setTag(int)`.
* @param child A child node.
* @param localZOrder Z order for drawing priority. Please refer to `setLocalZOrder(int)`.
* @param tag An integer to identify the node easily. Please refer to `setTag(int)`.
*
* Please use `addChild(Node* child, int localZOrder, const std::string &name)` instead.
*/

7
cocos/2d/CCRenderTexture.h
View File

@ -97,6 +97,7 @@ public:
* @param g Green.
* @param b Blue.
* @param a Alpha.
* @param depthValue The depth Value.
*/
virtual void beginWithClear(float r, float g, float b, float a, float depthValue);
@ -129,13 +130,13 @@ public:
/** Clears the texture with a specified depth value.
*
* @param A specified depth value.
* @param depthValue A specified depth value.
*/
virtual void clearDepth(float depthValue);
/** Clears the texture with a specified stencil value.
*
* @param A specified stencil value.
* @param stencilValue A specified stencil value.
*/
virtual void clearStencil(int stencilValue);
@ -256,7 +257,7 @@ public:
/** Sets the Sprite being used.
*
* @param A Sprite.
* @param sprite A Sprite.
*/
inline void setSprite(Sprite* sprite) {
CC_SAFE_RETAIN(sprite);

16
cocos/2d/CCSprite.h
View File

@ -443,7 +443,7 @@ CC_CONSTRUCTOR_ACCESS:
*
* @param texture A pointer to an existing Texture2D object.
* You can use a Texture2D object for many sprites.
* @return true if the sprite is initialized properly, false otherwise.
* @return True if the sprite is initialized properly, false otherwise.
*/
virtual bool initWithTexture(Texture2D *texture);
@ -455,7 +455,7 @@ CC_CONSTRUCTOR_ACCESS:
* @param texture A pointer to an exisiting Texture2D object.
* You can use a Texture2D object for many sprites.
* @param rect Only the contents inside rect of this texture will be applied for this sprite.
* @return true if the sprite is initialized properly, false otherwise.
* @return True if the sprite is initialized properly, false otherwise.
*/
virtual bool initWithTexture(Texture2D *texture, const Rect& rect);
@ -468,15 +468,15 @@ CC_CONSTRUCTOR_ACCESS:
* @param texture A Texture2D object whose texture will be applied to this sprite.
* @param rect A rectangle assigned the contents of texture.
* @param rotated Whether or not the texture rectangle is rotated.
* @return true if the sprite is initialized properly, false otherwise.
* @return True if the sprite is initialized properly, false otherwise.
*/
virtual bool initWithTexture(Texture2D *texture, const Rect& rect, bool rotated);
/**
* Initializes a sprite with an SpriteFrame. The texture and rect in SpriteFrame will be applied on this sprite.
*
* @param pSpriteFrame A SpriteFrame object. It should includes a valid texture and a rect.
* @return true if the sprite is initialized properly, false otherwise.
* @param spriteFrame A SpriteFrame object. It should includes a valid texture and a rect.
* @return True if the sprite is initialized properly, false otherwise.
*/
virtual bool initWithSpriteFrame(SpriteFrame *spriteFrame);
@ -487,7 +487,7 @@ CC_CONSTRUCTOR_ACCESS:
* If the SpriteFrame doesn't exist it will raise an exception.
*
* @param spriteFrameName A key string that can fected a volid SpriteFrame from SpriteFrameCache.
* @return true if the sprite is initialized properly, false otherwise.
* @return True if the sprite is initialized properly, false otherwise.
*/
virtual bool initWithSpriteFrameName(const std::string& spriteFrameName);
@ -499,7 +499,7 @@ CC_CONSTRUCTOR_ACCESS:
* After initialization, the rect used will be the size of the image. The offset will be (0,0).
*
* @param filename The path to an image file in local file system.
* @return true if the sprite is initialized properly, false otherwise.
* @return True if the sprite is initialized properly, false otherwise.
* @js init
* @lua init
*/
@ -514,7 +514,7 @@ CC_CONSTRUCTOR_ACCESS:
*
* @param filename The path to an image file in local file system.
* @param rect The rectangle assigned the content area from texture.
* @return true if the sprite is initialized properly, false otherwise.
* @return True if the sprite is initialized properly, false otherwise.
* @js init
* @lua init
*/

2
cocos/2d/CCTMXLayer.h
View File

@ -226,7 +226,7 @@ public:
/** Set tileset information for the layer.
*
* @param The tileset information for the layer.
* @param info The tileset information for the layer.
*/
inline void setTileSet(TMXTilesetInfo* info) {
CC_SAFE_RETAIN(info);

2
cocos/2d/CCTMXObjectGroup.h
View File

@ -63,7 +63,7 @@ public:
/** Set the group name.
*
* @param groupname A string,it is used to set the group name.
* @param groupName A string,it is used to set the group name.
*/
inline void setGroupName(const std::string& groupName){ _groupName = groupName; }

2
cocos/2d/CCTMXTiledMap.h
View File

@ -201,7 +201,7 @@ public:
/** Set the tiles's size property measured in pixels.
*
* @param The tiles's size property measured in pixels.
* @param tileSize The tiles's size property measured in pixels.
*/
inline void setTileSize(const Size& tileSize) { _tileSize = tileSize; };

4
cocos/2d/libcocos2d.vcxproj
View File

@ -388,8 +388,10 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
<ClCompile Include="..\3d\CCPlane.cpp" />
<ClCompile Include="..\3d\CCRay.cpp" />
<ClCompile Include="..\3d\CCSkeleton3D.cpp" />
<ClCompile Include="..\3d\CCSkybox.cpp" />
<ClCompile Include="..\3d\CCSprite3D.cpp" />
<ClCompile Include="..\3d\CCSprite3DMaterial.cpp" />
<ClCompile Include="..\3d\CCTextureCube.cpp" />
<ClCompile Include="..\audio\AudioEngine.cpp" />
<ClCompile Include="..\audio\win32\AudioCache.cpp" />
<ClCompile Include="..\audio\win32\AudioEngine-win32.cpp" />
@ -912,8 +914,10 @@ xcopy /Y /Q "$(ProjectDir)..\..\external\chipmunk\prebuilt\win32\release-lib\*.*
<ClInclude Include="..\3d\CCPlane.h" />
<ClInclude Include="..\3d\CCRay.h" />
<ClInclude Include="..\3d\CCSkeleton3D.h" />
<ClInclude Include="..\3d\CCSkybox.h" />
<ClInclude Include="..\3d\CCSprite3D.h" />
<ClInclude Include="..\3d\CCSprite3DMaterial.h" />
<ClInclude Include="..\3d\CCTextureCube.h" />
<ClInclude Include="..\3d\cocos3d.h" />
<ClInclude Include="..\audio\include\AudioEngine.h" />
<ClInclude Include="..\audio\include\Export.h" />

12
cocos/2d/libcocos2d.vcxproj.filters
View File

@ -1333,6 +1333,12 @@
<ClCompile Include="..\3d\CCAABB.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCSkybox.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCTextureCube.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\..\extensions\Particle3D\PU\CCPUAffector.cpp">
<Filter>extension\Particle3D\ParticleUniverse</Filter>
</ClCompile>
@ -3040,6 +3046,12 @@
<ClInclude Include="..\physics\CCPhysicsHelper.h">
<Filter>physics</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCSkybox.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCTextureCube.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\platform\CCPlatformConfig.h">
<Filter>platform</Filter>
</ClInclude>

4
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems
View File

@ -219,8 +219,10 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\3d\CCPlane.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\3d\CCRay.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\3d\CCSkeleton3D.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\3d\CCSkybox.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\3d\CCSprite3D.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\3d\CCSprite3DMaterial.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\3d\CCTextureCube.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\3d\cocos3d.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\audio\include\AudioEngine.h" />
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\audio\include\Export.h" />
@ -802,8 +804,10 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\3d\CCPlane.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\3d\CCRay.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\3d\CCSkeleton3D.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\3d\CCSkybox.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\3d\CCSprite3D.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\3d\CCSprite3DMaterial.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\3d\CCTextureCube.cpp" />
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\audio\winrt\Audio.cpp">
<PrecompiledHeader>NotUsing</PrecompiledHeader>
<ForcedIncludeFiles>

14
cocos/2d/libcocos2d_8_1/libcocos2d_8_1/libcocos2d_8_1.Shared/libcocos2d_8_1.Shared.vcxitems.filters
View File

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClInclude Include="$(MSBuildThisFileDirectory)targetver.h" />
@ -1737,6 +1737,12 @@
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\CCObjectExtensionData.h">
<Filter>cocostudio\json</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\3d\CCSkybox.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="$(MSBuildThisFileDirectory)..\..\..\..\3d\CCTextureCube.h">
<Filter>3d</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\cocos2d.cpp" />
@ -3300,6 +3306,12 @@
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\editor-support\cocostudio\CCObjectExtensionData.cpp">
<Filter>cocostudio\json</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\3d\CCSkybox.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="$(MSBuildThisFileDirectory)..\..\..\..\3d\CCTextureCube.cpp">
<Filter>3d</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="2d">

4
cocos/2d/libcocos2d_wp8.vcxproj
View File

@ -386,8 +386,10 @@
<ClInclude Include="..\3d\CCPlane.h" />
<ClInclude Include="..\3d\CCRay.h" />
<ClInclude Include="..\3d\CCSkeleton3D.h" />
<ClInclude Include="..\3d\CCSkybox.h" />
<ClInclude Include="..\3d\CCSprite3D.h" />
<ClInclude Include="..\3d\CCSprite3DMaterial.h" />
<ClInclude Include="..\3d\CCTextureCube.h" />
<ClInclude Include="..\3d\cocos3d.h" />
<ClInclude Include="..\audio\include\Export.h" />
<ClInclude Include="..\audio\include\SimpleAudioEngine.h" />
@ -990,8 +992,10 @@
<ClCompile Include="..\3d\CCPlane.cpp" />
<ClCompile Include="..\3d\CCRay.cpp" />
<ClCompile Include="..\3d\CCSkeleton3D.cpp" />
<ClCompile Include="..\3d\CCSkybox.cpp" />
<ClCompile Include="..\3d\CCSprite3D.cpp" />
<ClCompile Include="..\3d\CCSprite3DMaterial.cpp" />
<ClCompile Include="..\3d\CCTextureCube.cpp" />
<ClCompile Include="..\audio\wp8\Audio.cpp">
<ForcedIncludeFiles Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
</ForcedIncludeFiles>

12
cocos/2d/libcocos2d_wp8.vcxproj.filters
View File

@ -1809,6 +1809,12 @@
<ClCompile Include="..\editor-support\cocostudio\CCObjectExtensionData.cpp">
<Filter>cocostudio\json</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCSkybox.cpp">
<Filter>3d</Filter>
</ClCompile>
<ClCompile Include="..\3d\CCTextureCube.cpp">
<Filter>3d</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="CCAction.h">
@ -3516,6 +3522,12 @@
<ClInclude Include="..\editor-support\cocostudio\CCObjectExtensionData.h">
<Filter>cocostudio\json</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCSkybox.h">
<Filter>3d</Filter>
</ClInclude>
<ClInclude Include="..\3d\CCTextureCube.h">
<Filter>3d</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\math\Mat4.inl">

4
cocos/3d/Android.mk
View File

@ -21,7 +21,9 @@ CCMeshVertexIndexData.cpp \
CCSprite3DMaterial.cpp \
CCObjLoader.cpp \
CCSkeleton3D.cpp \
CCSprite3D.cpp
CCSprite3D.cpp \
CCSkybox.cpp \
CCTextureCube.cpp
LOCAL_EXPORT_C_INCLUDES := $(LOCAL_PATH)/..

191
cocos/3d/CCSkybox.cpp Normal file
View File

@ -0,0 +1,191 @@
/****************************************************************************
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "3d/CCSkybox.h"
#include "3d/CCTextureCube.h"
NS_CC_BEGIN
Skybox::Skybox()
: _vao(0)
, _vertexBuffer(0)
, _indexBuffer(0)
,_texture(nullptr)
{
}
Skybox::~Skybox()
{
glDeleteBuffers(1, &_vertexBuffer);
glDeleteBuffers(1, &_indexBuffer);
_vertexBuffer = 0;
_indexBuffer = 0;
if (Configuration::getInstance()->supportsShareableVAO())
{
glDeleteVertexArrays(1, &_vao);
GL::bindVAO(0);
_vao = 0;
}
_texture->release();
}
bool Skybox::init()
{
// create and set our custom shader
auto shader = GLProgramCache::getInstance()->getGLProgram(GLProgram::SHADER_3D_SKYBOX);
auto state = GLProgramState::create(shader);
state->setVertexAttribPointer(GLProgram::ATTRIBUTE_NAME_POSITION, 3, GL_FLOAT, GL_FALSE, sizeof(Vec3), nullptr);
setGLProgramState(state);
initBuffers();
CHECK_GL_ERROR_DEBUG();
return true;
}
void Skybox::initBuffers()
{
if (Configuration::getInstance()->supportsShareableVAO())
{
glGenVertexArrays(1, &_vao);
GL::bindVAO(_vao);
}
// init vertex buffer object
Vec3 vexBuf[] =
{
Vec3(1, -1, 1), Vec3(1, 1, 1), Vec3(-1, 1, 1), Vec3(-1, -1, 1),
Vec3(1, -1, -1), Vec3(1, 1, -1), Vec3(-1, 1, -1), Vec3(-1, -1, -1)
};
glGenBuffers(1, &_vertexBuffer);
glBindBuffer(GL_ARRAY_BUFFER, _vertexBuffer);
glBufferData(GL_ARRAY_BUFFER, sizeof(vexBuf), vexBuf, GL_STATIC_DRAW);
// init index buffer object
const unsigned char idxBuf[] = { 2, 1, 0, 3, 2, 0, // font
1, 5, 4, 1, 4, 0, // right
4, 5, 6, 4, 6, 7, // back
7, 6, 2, 7, 2, 3, // left
2, 6, 5, 2, 5, 1, // up
3, 0, 4, 3, 4, 7 // down
};
glGenBuffers(1, &_indexBuffer);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _indexBuffer);
glBufferData(GL_ELEMENT_ARRAY_BUFFER, sizeof(idxBuf), idxBuf, GL_STATIC_DRAW);
if (Configuration::getInstance()->supportsShareableVAO())
{
glEnableVertexAttribArray(GLProgram::VERTEX_ATTRIB_POSITION);
getGLProgramState()->applyAttributes(false);
GL::bindVAO(0);
}
}
void Skybox::draw(Renderer* renderer, const Mat4& transform, uint32_t flags)
{
_customCommand.init(_globalZOrder);
_customCommand.func = CC_CALLBACK_0(Skybox::onDraw, this, transform, flags);
renderer->addCommand(&_customCommand);
}
void Skybox::onDraw(const Mat4& transform, uint32_t flags)
{
auto state = getGLProgramState();
state->apply(transform);
GLboolean depthFlag = glIsEnabled(GL_DEPTH_TEST);
GLint depthFunc;
glGetIntegerv(GL_DEPTH_FUNC, &depthFunc);
glEnable(GL_DEPTH_TEST);
glDepthFunc(GL_LEQUAL);
if (Configuration::getInstance()->supportsShareableVAO())
{
GL::bindVAO(_vao);
}
else
{
GL::enableVertexAttribs(GL::VERTEX_ATTRIB_FLAG_POSITION);
glBindBuffer(GL_ARRAY_BUFFER, _vertexBuffer);
glVertexAttribPointer(GLProgram::VERTEX_ATTRIB_POSITION, 3, GL_FLOAT, GL_FALSE, sizeof(Vec3), nullptr);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _indexBuffer);
}
glDrawElements(GL_TRIANGLES, (GLsizei)36, GL_UNSIGNED_BYTE, nullptr);
if (Configuration::getInstance()->supportsShareableVAO())
{
GL::bindVAO(0);
}
else
{
glBindBuffer(GL_ARRAY_BUFFER, 0);
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
}
CC_INCREMENT_GL_DRAWN_BATCHES_AND_VERTICES(1, 8);
glDepthFunc(depthFunc);
if (!depthFlag)
glDisable(GL_DEPTH_TEST);
CHECK_GL_ERROR_DEBUG();
}
void Skybox::setTexture(TextureCube* texture)
{
CCASSERT(texture != nullptr, __FUNCTION__);
texture->retain();
if (_texture)
_texture->release();
_texture = texture;
getGLProgramState()->setUniformTexture("u_Env", _texture);
}
void Skybox::reload()
{
auto glProgram = getGLProgramState()->getGLProgram();
glProgram->reset();
glProgram->initWithFilenames("Shaders3D/Skybox.vert", "Shaders3D/Skybox.frag");
glProgram->link();
glProgram->updateUniforms();
initBuffers();
}
NS_CC_END

89
cocos/3d/CCSkybox.h Normal file
View File

@ -0,0 +1,89 @@
/****************************************************************************
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#ifndef __SKYBOX_H__
#define __SKYBOX_H__
#include "cocos2d.h"
NS_CC_BEGIN
class TextureCube;
/**
* Sky box technology usually used to simulate infinity sky, mountains and other phenomena.
*/
class CC_DLL Skybox : public Node
{
public:
CREATE_FUNC(Skybox);
/**texture getter and setter*/
void setTexture(TextureCube*);
/** draw Skybox object */
virtual void draw(Renderer* renderer, const Mat4& transform, uint32_t flags) override;
/** reload sky box after GLESContext reconstructed.*/
void reload();
CC_CONSTRUCTOR_ACCESS:
/**
* Constructor.
*/
Skybox();
/**
* Destructor.
*/
virtual ~Skybox();
/**
* init Skybox.
*/
virtual bool init();
protected:
/**
* init internal buffers for Skybox.
*/
void initBuffers();
void onDraw(const Mat4& transform, uint32_t flags);
GLuint _vao;
GLuint _vertexBuffer;
GLuint _indexBuffer;
CustomCommand _customCommand;
TextureCube* _texture;
private:
CC_DISALLOW_COPY_AND_ASSIGN(Skybox);
};
NS_CC_END
#endif // __SKYBOX_H__

263
cocos/3d/CCTextureCube.cpp Normal file
View File

@ -0,0 +1,263 @@
/****************************************************************************
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#include "3d/CCTextureCube.h"
#include "platform/CCImage.h"
#include "platform/CCFileUtils.h"
NS_CC_BEGIN
unsigned char* getImageData(Image* img, Texture2D::PixelFormat& ePixFmt)
{
unsigned char* pTmpData = img->getData();
unsigned int* inPixel32 = nullptr;
unsigned char* inPixel8 = nullptr;
unsigned short* outPixel16 = nullptr;
bool bHasAlpha = img->hasAlpha();
size_t uBPP = img->getBitPerPixel();
int nWidth = img->getWidth();
int nHeight = img->getHeight();
// compute pixel format
if (bHasAlpha)
{
ePixFmt = Texture2D::PixelFormat::DEFAULT;
}
else
{
if (uBPP >= 8)
{
ePixFmt = Texture2D::PixelFormat::RGB888;
}
else
{
ePixFmt = Texture2D::PixelFormat::RGB565;
}
}
// Repack the pixel data into the right format
unsigned int uLen = nWidth * nHeight;
if (ePixFmt == Texture2D::PixelFormat::RGB565)
{
if (bHasAlpha)
{
// Convert "RRRRRRRRRGGGGGGGGBBBBBBBBAAAAAAAA" to "RRRRRGGGGGGBBBBB"
inPixel32 = (unsigned int*)img->getData();
pTmpData = new unsigned char[nWidth * nHeight * 2];
outPixel16 = (unsigned short*)pTmpData;
for (unsigned int i = 0; i < uLen; ++i, ++inPixel32)
{
*outPixel16++ =
((((*inPixel32 >> 0) & 0xFF) >> 3) << 11) | // R
((((*inPixel32 >> 8) & 0xFF) >> 2) << 5) | // G
((((*inPixel32 >> 16) & 0xFF) >> 3) << 0); // B
}
}
else
{
// Convert "RRRRRRRRGGGGGGGGBBBBBBBB" to "RRRRRGGGGGGBBBBB"
pTmpData = new unsigned char[nWidth * nHeight * 2];
outPixel16 = (unsigned short*)pTmpData;
inPixel8 = (unsigned char*)img->getData();
for (unsigned int i = 0; i < uLen; ++i)
{
unsigned char R = *inPixel8++;
unsigned char G = *inPixel8++;
unsigned char B = *inPixel8++;
*outPixel16++ =
((R >> 3) << 11) | // R
((G >> 2) << 5) | // G
((B >> 3) << 0); // B
}
}
}
if (bHasAlpha && ePixFmt == Texture2D::PixelFormat::RGB888)
{
// Convert "RRRRRRRRRGGGGGGGGBBBBBBBBAAAAAAAA" to "RRRRRRRRGGGGGGGGBBBBBBBB"
inPixel32 = (unsigned int*)img->getData();
pTmpData = new unsigned char[nWidth * nHeight * 3];
unsigned char* outPixel8 = pTmpData;
for (unsigned int i = 0; i < uLen; ++i, ++inPixel32)
{
*outPixel8++ = (*inPixel32 >> 0) & 0xFF; // R
*outPixel8++ = (*inPixel32 >> 8) & 0xFF; // G
*outPixel8++ = (*inPixel32 >> 16) & 0xFF; // B
}
}
return pTmpData;
}
Image* createImage(const std::string& path)
{
// Split up directory and filename
// MUTEX:
// Needed since addImageAsync calls this method from a different thread
std::string fullpath = FileUtils::getInstance()->fullPathForFilename(path);
if (fullpath.size() == 0)
{
return nullptr;
}
// all images are handled by UIImage except PVR extension that is handled by our own handler
Image* image = nullptr;
do
{
image = new (std::nothrow) Image();
CC_BREAK_IF(nullptr == image);
bool bRet = image->initWithImageFile(fullpath);
CC_BREAK_IF(!bRet);
}
while (0);
return image;
}
TextureCube::TextureCube()
{
_imgPath.resize(6);
}
TextureCube::~TextureCube()
{
}
TextureCube* TextureCube::create(const std::string& positive_x, const std::string& negative_x,
const std::string& positive_y, const std::string& negative_y,
const std::string& positive_z, const std::string& negative_z)
{
auto ret = new (std::nothrow) TextureCube();
if (ret && ret->init(positive_x, negative_x, positive_y, negative_y, positive_z, negative_z))
{
ret->autorelease();
return ret;
}
CC_SAFE_DELETE(ret);
return nullptr;
}
bool TextureCube::init(const std::string& positive_x, const std::string& negative_x,
const std::string& positive_y, const std::string& negative_y,
const std::string& positive_z, const std::string& negative_z)
{
_imgPath[0] = positive_x;
_imgPath[1] = negative_x;
_imgPath[2] = positive_y;
_imgPath[3] = negative_y;
_imgPath[4] = positive_z;
_imgPath[5] = negative_z;
std::vector<Image*> images(6);
images[0] = createImage(positive_x);
images[1] = createImage(negative_x);
images[2] = createImage(positive_y);
images[3] = createImage(negative_y);
images[4] = createImage(positive_z);
images[5] = createImage(negative_z);
GLuint handle;
glGenTextures(1, &handle);
glBindTexture(GL_TEXTURE_CUBE_MAP, handle);
for (int i = 0; i < 6; i++)
{
Image* img = images[i];
Texture2D::PixelFormat ePixelFmt;
unsigned char* pData = getImageData(img, ePixelFmt);
if (ePixelFmt == Texture2D::PixelFormat::RGBA8888)
{
glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i,
0, // level
GL_RGBA, // internal format
img->getWidth(), // width
img->getHeight(), // height
0, // border
GL_RGBA, // format
GL_UNSIGNED_BYTE, // type
pData); // pixel data
}
else if (ePixelFmt == Texture2D::PixelFormat::RGB888)
{
glTexImage2D(GL_TEXTURE_CUBE_MAP_POSITIVE_X + i,
0, // level
GL_RGB, // internal format
img->getWidth(), // width
img->getHeight(), // height
0, // border
GL_RGB, // format
GL_UNSIGNED_BYTE, // type
pData); // pixel data
}
if (pData != img->getData())
delete[] pData;
}
glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
_name = handle;
glBindTexture(GL_TEXTURE_CUBE_MAP, 0);
for (auto img: images)
{
CC_SAFE_RELEASE(img);
}
return true;
}
void TextureCube::setTexParameters(const TexParams& texParams)
{
CCASSERT(_name != 0, __FUNCTION__);
glBindTexture(GL_TEXTURE_CUBE_MAP, _name);
glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MIN_FILTER, texParams.wrapS);
glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_MAG_FILTER, texParams.wrapS);
glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_S, texParams.wrapS);
glTexParameteri(GL_TEXTURE_CUBE_MAP, GL_TEXTURE_WRAP_T, texParams.wrapT);
glBindTexture(GL_TEXTURE_CUBE_MAP, 0);
}
bool TextureCube::reloadTexture()
{
return init(_imgPath[0], _imgPath[1], _imgPath[2], _imgPath[3], _imgPath[4], _imgPath[5]);
}
NS_CC_END

84
cocos/3d/CCTextureCube.h Normal file
View File

@ -0,0 +1,84 @@
/****************************************************************************
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
****************************************************************************/
#ifndef __CCTEXTURECUBE_H__
#define __CCTEXTURECUBE_H__
#include "renderer/CCTexture2D.h"
#include <string>
#include <unordered_map>
#include "base/ccTypes.h"
NS_CC_BEGIN
/**
TextureCube is a collection of six separate square textures that are put
onto the faces of an imaginary cube.
*/
class CC_DLL TextureCube: public Texture2D
{
public:
/** create cube texture from 6 textures.
@param positive_x texture for the right side of the texture cube face.
@param negative_x texture for the up side of the texture cube face.
@param positive_y texture for the top side of the texture cube face
@param negative_y texture for the bottom side of the texture cube face
@param positive_z texture for the forward side of the texture cube face.
@param negative_z texture for the rear side of the texture cube face.
@return A new texture cube inited with given parameters.
*/
static TextureCube* create(const std::string& positive_x, const std::string& negative_x,
const std::string& positive_y, const std::string& negative_y,
const std::string& positive_z, const std::string& negative_z);
/** Sets the min filter, mag filter, wrap s and wrap t texture parameters.
If the texture size is NPOT (non power of 2), then in can only use GL_CLAMP_TO_EDGE in GL_TEXTURE_WRAP_{S,T}.
*/
void setTexParameters(const TexParams&);
/** reload texture cube after GLESContext reconstructed.*/
bool reloadTexture();
CC_CONSTRUCTOR_ACCESS:
/**
* Constructor.
*/
TextureCube();
/**
* Destructor.
*/
virtual ~TextureCube();
protected:
bool init(const std::string& positive_x, const std::string& negative_x,
const std::string& positive_y, const std::string& negative_y,
const std::string& positive_z, const std::string& negative_z);
private:
std::vector<std::string> _imgPath;
};
NS_CC_END
#endif // __CCTEXTURECUBE_H__

2
cocos/3d/CMakeLists.txt
View File

@ -23,5 +23,7 @@ set(COCOS_3D_SRC
3d/CCSprite3D.cpp
3d/CCSprite3DMaterial.cpp
3d/CCBillBoard.cpp
3d/CCSkybox.cpp
3d/CCTextureCube.cpp
)

5
cocos/audio/include/AudioEngine.h
View File

@ -194,10 +194,11 @@ public:
/**
* Sets the current playback position of an audio instance.
*
* @param audioID An audioID returned by the play2d function.
* @param audioID An audioID returned by the play2d function.
* @param sec The offset in seconds from the start to seek to.
* @return
*/
static bool setCurrentTime(int audioID, float time);
static bool setCurrentTime(int audioID, float sec);
/**
* Gets the current playback position of an audio instance.

2
cocos/base/CCMap.h
View File

@ -47,7 +47,7 @@ NS_CC_BEGIN
/**
* Similar to std::unordered_map, but it will manage reference count automatically internally.
* Which means it will invoke Ref::retain() when adding an element, and invoke Ref::release() when removing an element.
* @warn The element should be `Ref` or its sub-class.
* @warning The element should be `Ref` or its sub-class.
* @lua NA
*/
template <class K, class V>

6
cocos/base/CCNS.h
View File

@ -37,7 +37,7 @@ NS_CC_BEGIN
/**
* @brief Returns a Core Graphics rectangle structure corresponding to the data in a given string.
* @param pszContent A string object whose contents are of the form "{{x,y},{w, h}}",
* @param str A string object whose contents are of the form "{{x,y},{w, h}}",
* where x is the x coordinate, y is the y coordinate, w is the width, and h is the height.
* These components can represent integer or float values.
* An example of a valid string is "{{3,2},{4,5}}".
@ -49,7 +49,7 @@ Rect CC_DLL RectFromString(const std::string& str);
/**
* @brief Returns a Core Graphics point structure corresponding to the data in a given string.
* @param pszContent A string object whose contents are of the form "{x,y}",
* @param str A string object whose contents are of the form "{x,y}",
* where x is the x coordinate and y is the y coordinate.
* The x and y values can represent integer or float values.
* An example of a valid string is "{3.0,2.5}".
@ -61,7 +61,7 @@ Vec2 CC_DLL PointFromString(const std::string& str);
/**
* @brief Returns a Core Graphics size structure corresponding to the data in a given string.
* @param pszContent A string object whose contents are of the form "{w, h}",
* @param str A string object whose contents are of the form "{w, h}",
* where w is the width and h is the height.
* The w and h values can be integer or float values.
* An example of a valid string is "{3.0,2.5}".

4
cocos/base/ccConfig.h
View File

@ -90,7 +90,7 @@ THE SOFTWARE.
#define CC_FIX_ARTIFACTS_BY_STRECHING_TEXEL 0
#endif
/** @def CC_DIRECTOR_FPS_INTERVAL
/** @def CC_DIRECTOR_STATS_INTERVAL
* Seconds between FPS updates.
* 0.5 seconds, means that the FPS number will be updated every 0.5 seconds.
* Having a bigger number means a more reliable FPS.
@ -284,7 +284,7 @@ THE SOFTWARE.
/** @def CC_CONSTRUCTOR_ACCESS
* Indicate the init functions access modifier. If value equals to protected, then these functions are protected.
* If value equals to public, these functions are public
* If value equals to public, these functions are public,
* protected by default.
*/
#ifndef CC_CONSTRUCTOR_ACCESS

2
cocos/cocos2d.h
View File

@ -285,6 +285,8 @@ THE SOFTWARE.
#include "3d/CCBillBoard.h"
#include "3d/CCFrustum.h"
#include "3d/CCPlane.h"
#include "3d/CCTextureCube.h"
#include "3d/CCSkybox.h"
// Deprecated include
#include "deprecated/CCDictionary.h"

2
cocos/network/SocketIO.h
View File

@ -252,7 +252,7 @@ public:
/**
* Used to register a socket.io event callback.
* Event argument should be passed using CC_CALLBACK2(&Base::function, this).
* @param eventName.
* @param eventName the name of event.
* @param e the callback function.
*/
void on(const std::string& eventName, SIOEvent e);

2
cocos/physics/CCPhysicsBody.h
View File

@ -399,7 +399,7 @@ public:
/**
* @brief Set the body mass.
*
* @attension If you need add/subtract mass to body, don't use setMass(getMass() +/- mass), because the mass of body may be equal to PHYSICS_INFINITY, it will cause some unexpected result, please use addMass() instead.
* @attention If you need add/subtract mass to body, don't use setMass(getMass() +/- mass), because the mass of body may be equal to PHYSICS_INFINITY, it will cause some unexpected result, please use addMass() instead.
*/
void setMass(float mass);

8
cocos/physics/CCPhysicsShape.h
View File

@ -486,7 +486,7 @@ public:
/**
* Get this polygon's points array count.
*
* @preturn An interger number.
* @return An interger number.
*/
int getPointsCount() const;
@ -523,7 +523,7 @@ public:
/**
* Get this box's width and height.
*
* @preturn An Size object.
* @return An Size object.
*/
Size getSize() const;
@ -621,7 +621,7 @@ public:
/**
* Get this polygon's points array count.
*
* @preturn An interger number.
* @return An interger number.
*/
int getPointsCount() const;
@ -700,7 +700,7 @@ public:
/**
* Get this chain's points array count.
*
* @preturn An interger number.
* @return An interger number.
*/
int getPointsCount() const;

5
cocos/platform/CCGLView.h
View File

@ -70,7 +70,10 @@ enum class ResolutionPolicy
UNKNOWN,
};
/** @struct GLContextAttrs Have six opengl Context Attrs. */
/** @struct GLContextAttrs
*
* There are six opengl Context Attrs.
*/
struct GLContextAttrs
{
int redBits;

1
cocos/renderer/CCGLProgram.cpp
View File

@ -72,6 +72,7 @@ const char* GLProgram::SHADER_3D_POSITION_NORMAL_TEXTURE = "Shader3DPositionNorm
const char* GLProgram::SHADER_3D_SKINPOSITION_NORMAL_TEXTURE = "Shader3DSkinPositionNormalTexture";
const char* GLProgram::SHADER_3D_PARTICLE_COLOR = "Shader3DParticleColor";
const char* GLProgram::SHADER_3D_PARTICLE_TEXTURE = "Shader3DParticleTexture";
const char* GLProgram::SHADER_3D_SKYBOX = "Shader3DSkybox";
// uniform names

5
cocos/renderer/CCGLProgram.h
View File

@ -218,6 +218,11 @@ public:
*/
static const char* SHADER_3D_PARTICLE_COLOR;
/**
Built in shader for skybox
*/
static const char* SHADER_3D_SKYBOX;
/**
end of built shader types.
@}

12
cocos/renderer/CCGLProgramCache.cpp
View File

@ -63,6 +63,7 @@ enum {
kShaderType_3DSkinPositionNormalTex,
kShaderType_3DParticleTex,
kShaderType_3DParticleColor,
kShaderType_3DSkyBox,
#if CC_TARGET_PLATFORM == CC_PLATFORM_WP8 || defined(WP8_SHADER_COMPILER)
kShaderType_PositionColor_noMVP_GrayScale,
#endif
@ -245,6 +246,10 @@ void GLProgramCache::loadDefaultGLPrograms()
p = new GLProgram();
loadDefaultGLProgram(p, kShaderType_3DParticleTex);
_programs.insert(std::make_pair(GLProgram::SHADER_3D_PARTICLE_TEXTURE, p));
p = new GLProgram();
loadDefaultGLProgram(p, kShaderType_3DSkyBox);
_programs.insert(std::make_pair(GLProgram::SHADER_3D_SKYBOX, p));
}
void GLProgramCache::reloadDefaultGLPrograms()
@ -372,6 +377,10 @@ void GLProgramCache::reloadDefaultGLPrograms()
p = getGLProgram(GLProgram::SHADER_3D_PARTICLE_COLOR);
p->reset();
loadDefaultGLProgram(p, kShaderType_3DParticleColor);
p = getGLProgram(GLProgram::SHADER_3D_SKYBOX);
p->reset();
loadDefaultGLProgram(p, kShaderType_3DSkyBox);
}
void GLProgramCache::loadDefaultGLProgram(GLProgram *p, int type)
@ -463,6 +472,9 @@ void GLProgramCache::loadDefaultGLProgram(GLProgram *p, int type)
case kShaderType_3DParticleColor:
p->initWithByteArrays(cc3D_Particle_vert, cc3D_Particle_color_frag);
break;
case kShaderType_3DSkyBox:
p->initWithByteArrays(cc3D_Skybox_vert, cc3D_Skybox_frag);
break;
#if CC_TARGET_PLATFORM == CC_PLATFORM_WP8 || defined(WP8_SHADER_COMPILER)
case kShaderType_PositionColor_noMVP_GrayScale:
p->initWithByteArrays(ccPositionTextureColor_noMVP_vert, ccUIGrayScale_frag);

7
cocos/renderer/CCGLProgramState.cpp
View File

@ -80,6 +80,11 @@ void UniformValue::apply()
GL::bindTexture2DN(_value.tex.textureUnit, _value.tex.textureId);
break;
case GL_SAMPLER_CUBE:
_glprogram->setUniformLocationWith1i(_uniform->location, _value.tex.textureUnit);
GL::bindTextureN(_value.tex.textureUnit, _value.tex.textureId, GL_TEXTURE_CUBE_MAP);
break;
case GL_INT:
_glprogram->setUniformLocationWith1i(_uniform->location, _value.intValue);
break;
@ -135,7 +140,7 @@ void UniformValue::setFloat(float value)
void UniformValue::setTexture(GLuint textureId, GLuint textureUnit)
{
CCASSERT(_uniform->type == GL_SAMPLER_2D, "Wrong type. expecting GL_SAMPLER_2D");
//CCASSERT(_uniform->type == GL_SAMPLER_2D, "Wrong type. expecting GL_SAMPLER_2D");
_value.tex.textureId = textureId;
_value.tex.textureUnit = textureUnit;
_useCallback = false;

1
cocos/renderer/CCTexture2D.h
View File

@ -282,6 +282,7 @@ public:
@param text A null terminated string.
@param fontName The font name.
@param fontSize The font size.
@param dimensions The font dimension.
@param hAlignment The font horizontal text alignment type.
@param vAlignment The font vertical text alignment type.

20
cocos/renderer/ccGLStateCache.cpp
View File

@ -148,17 +148,33 @@ void bindTexture2D(GLuint textureId)
void bindTexture2DN(GLuint textureUnit, GLuint textureId)
{
#if CC_ENABLE_GL_STATE_CACHE
CCASSERT(textureUnit < MAX_ACTIVE_TEXTURE, "textureUnit is too big");
if (s_currentBoundTexture[textureUnit] != textureId)
{
s_currentBoundTexture[textureUnit] = textureId;
activeTexture(GL_TEXTURE0 + textureUnit);
glBindTexture(GL_TEXTURE_2D, textureId);
}
#else
glActiveTexture(GL_TEXTURE0 + textureUnit);
glBindTexture(GL_TEXTURE_2D, textureId);
#endif
}
void bindTextureN(GLuint textureUnit, GLuint textureId, GLuint textureType/* = GL_TEXTURE_2D*/)
{
#if CC_ENABLE_GL_STATE_CACHE
CCASSERT(textureUnit < MAX_ACTIVE_TEXTURE, "textureUnit is too big");
if (s_currentBoundTexture[textureUnit] != textureId)
{
s_currentBoundTexture[textureUnit] = textureId;
activeTexture(GL_TEXTURE0 + textureUnit);
glBindTexture(GL_TEXTURE_2D, textureId);
glBindTexture(textureType, textureId);
}
#else
glActiveTexture(GL_TEXTURE0 + textureUnit);
glBindTexture(GL_TEXTURE_2D, textureId);
glBindTexture(textureType, textureId);
#endif
}

7
cocos/renderer/ccGLStateCache.h
View File

@ -126,7 +126,6 @@ void CC_DLL enableVertexAttribs(uint32_t flags);
*/
void CC_DLL bindTexture2D(GLuint textureId);
/**
* If the texture is not already bound to a given unit, it binds it.
*
@ -135,6 +134,12 @@ void CC_DLL bindTexture2D(GLuint textureId);
*/
void CC_DLL bindTexture2DN(GLuint textureUnit, GLuint textureId);
/** If the texture is not already bound to a given unit, it binds it.
* If CC_ENABLE_GL_STATE_CACHE is disabled, it will call glBindTexture() directly.
* @since v3.6
*/
void CC_DLL bindTextureN(GLuint textureUnit, GLuint textureId, GLuint textureType = GL_TEXTURE_2D);
/**
* It will delete a given texture. If the texture was bound, it will invalidate the cached.
*

13
cocos/renderer/ccShader_3D_Skybox.frag Normal file
View File

@ -0,0 +1,13 @@
const char* cc3D_Skybox_frag = STRINGIFY(
\n#ifdef GL_ES\n
varying mediump vec3 v_reflect;
\n#else\n
varying vec3 v_reflect;
\n#endif\n
uniform samplerCube u_Env;
void main(void)
{
gl_FragColor = textureCube(u_Env, v_reflect);
}
);

18
cocos/renderer/ccShader_3D_Skybox.vert Normal file
View File

@ -0,0 +1,18 @@
const char* cc3D_Skybox_vert = STRINGIFY(
attribute vec4 a_position;
varying vec3 v_reflect;
void main(void)
{
mat4 MVMatrixLimited = CC_MVMatrix;
MVMatrixLimited[0][3] = 0.0;
MVMatrixLimited[1][3] = 0.0;
MVMatrixLimited[2][3] = 0.0;
vec4 position = MVMatrixLimited* a_position;
v_reflect = a_position.xyz;
gl_Position = position.xyww;
}
);

2
cocos/renderer/ccShaders.cpp
View File

@ -82,5 +82,7 @@ NS_CC_BEGIN
#include "ccShader_3D_ColorNormalTex.frag"
#include "ccShader_3D_Particle.vert"
#include "ccShader_3D_Particle.frag"
#include "ccShader_3D_Skybox.vert"
#include "ccShader_3D_Skybox.frag"
NS_CC_END

2
cocos/renderer/ccShaders.h
View File

@ -84,6 +84,8 @@ extern CC_DLL const GLchar * cc3D_ColorNormal_frag;
extern CC_DLL const GLchar * cc3D_Particle_vert;
extern CC_DLL const GLchar * cc3D_Particle_tex_frag;
extern CC_DLL const GLchar * cc3D_Particle_color_frag;
extern CC_DLL const GLchar * cc3D_Skybox_vert;
extern CC_DLL const GLchar * cc3D_Skybox_frag;
NS_CC_END

4
cocos/scripting/lua-bindings/auto/api/ClippingRectangleNode.lua
View File

@ -13,7 +13,7 @@
--------------------------------
-- brief Enable/Disable the clipping.<br>
-- param Pass true to enable clipping. Pass false to disable clipping.
-- param enabled Pass true to enable clipping. Pass false to disable clipping.
-- @function [parent=#ClippingRectangleNode] setClippingEnabled
-- @param self
-- @param #bool enabled
@ -28,7 +28,7 @@
--------------------------------
-- brief Set the clipping rectangle.<br>
-- param Specify the clipping rectangle.
-- param clippingRegion Specify the clipping rectangle.
-- @function [parent=#ClippingRectangleNode] setClippingRegion
-- @param self
-- @param #rect_table clippingRegion

2
cocos/scripting/lua-bindings/auto/api/Lens3D.lua
View File

@ -6,7 +6,7 @@
--------------------------------
-- brief Set the center position of lens effect.<br>
-- param The center position will be set.
-- param position The center position will be set.
-- @function [parent=#Lens3D] setPosition
-- @param self
-- @param #vec2_table position

2
cocos/scripting/lua-bindings/auto/api/Shaky3D.lua
View File

@ -6,7 +6,7 @@
--------------------------------
-- brief Create the action with a range, shake Z vertices, a grid and duration.<br>
-- param duration Specify the duration of the Shaky3D action. It's a value in seconds.<br>
-- param initWithDuration Specify the duration of the Shaky3D action. It's a value in seconds.<br>
-- param gridSize Specify the size of the grid.<br>
-- param range Specify the range of the shaky effect.<br>
-- param shakeZ Specify whether shake on the z axis.<br>

6
cocos/scripting/lua-bindings/manual/CCLuaStack.h
View File

@ -321,7 +321,7 @@ public:
* By calling this function, the number of return value is numResults(may be > 1).
* All the return values are stored in the resultArray.
*
* @param nHandler the index count corresponding to the lua function.
* @param handler the index count corresponding to the lua function.
* @param numArgs the number of variables.
* @param numResults the number of return value.
* @param resultArray a array used to store the return value.
@ -381,7 +381,7 @@ public:
*
* @param L the current lua_State.
* @param chunk the buffer pointer.
* @param chunSize the size of buffer.
* @param chunkSize the size of buffer.
* @param chunkName the name of chunk pointer.
* @return 0, LUA_ERRSYNTAX or LUA_ERRMEM:.
* @lua NA
@ -402,7 +402,7 @@ public:
/**
* Load the Lua chunks from current lua_State.
*
* @param l the current lua_State.
* @param L the current lua_State.
* @return 1 if load sucessfully otherwise 0.
* @lua NA
* @js NA

26
cocos/scripting/lua-bindings/manual/LuaBasicConversions.h
View File

@ -58,7 +58,7 @@ cocos2d::log(__VA_ARGS__); \
* @param L the current lua_State.
* @param lo the given accpetable index of stack.
* @param type the typename used to judge.
* @int def whether has default value.
* @param def whether has default value.
* @return Return true if the typename of userdata at the given accepteable index of stack is equal to type, otherwise return false.
* @lua NA
* @js NA
@ -849,9 +849,9 @@ extern bool luaval_to_std_vector_ushort(lua_State* L, int lo, std::vector<unsign
* If the table has the `x`, `y`, `z` and `w` keys and the corresponding values are not nil, this function would assign the values to the corresponding members of outValue.Otherwise, the value of members of outValue would be 0.
* @param L the current lua_State.
* @param lo the given accpetable index of stack.
* @param ret the pointer to a cocos2d::Quaternion object which stores the values from the Lua table.
* @param outValue the pointer to a cocos2d::Quaternion object which stores the values from the Lua table.
* @param funcName the name of calling function, it is used for error output in the debug model.
* @return Return true if the value at the given accpetable index of stack is a table, otherwise return false.
* @return true if the value at the given accpetable index of stack is a table, otherwise return false.
* @lua NA
* @js NA
*/
@ -895,7 +895,7 @@ extern void vec3_to_luaval(lua_State* L,const cocos2d::Vec3& vec3);
* The format of table as follows: {x=numberValue1, y=numberValue2, z=numberValue3, w=numberValue4}
*
* @param L the current lua_State.
* @param vec3 a cocos2d::Vec4 object.
* @param vec4 a cocos2d::Vec4 object.
* @lua NA
* @js NA
*/
@ -908,7 +908,7 @@ extern void vec4_to_luaval(lua_State* L,const cocos2d::Vec4& vec4);
*
* @param L the current lua_State.
* @param points a pointer points to a cocos2d::Vec2 array.
* @int count the number of cocos2d::Vec2 object should be converted to a Lua table and push into the Lua stack.
* @param count the number of cocos2d::Vec2 object should be converted to a Lua table and push into the Lua stack.
* @lua NA
* @js NA
*/
@ -930,7 +930,7 @@ extern void size_to_luaval(lua_State* L,const Size& sz);
* The format of table as follows: {x=numberValue1, y=numberValue2, width=numberValue3, height=numberValue4}
*
* @param L the current lua_State.
* @param sz a cocos2d::Rect object.
* @param rt a cocos2d::Rect object.
* @lua NA
* @js NA
*/
@ -1104,7 +1104,7 @@ CC_DEPRECATED_ATTRIBUTE static inline void points_to_luaval(lua_State* L,const c
* The object in the cocos2d::Vector which would be pushed into the table should be Ref type.
*
* @param L the current lua_State.
* @param verAttrib a cocos2d::Vector object.
* @param inValue a cocos2d::Vector object.
* @lua NA
* @js NA
*/
@ -1146,7 +1146,7 @@ void ccvector_to_luaval(lua_State* L,const cocos2d::Vector<T>& inValue)
* The object in the cocos2d::Map which would be pushed into the table should be Ref type.
*
* @param L the current lua_State.
* @param verAttrib a cocos2d::Map object.
* @param v a cocos2d::Map object.
* @lua NA
* @js NA
*/
@ -1190,7 +1190,7 @@ void ccmap_string_key_to_luaval(lua_State* L, const cocos2d::Map<std::string, T>
* Value::Type::INT_KEY_MAP -> push a hash table into the Lua stack.
*
* @param L the current lua_State.
* @param verAttrib a cocos2d::Value object.
* @param inValue a cocos2d::Value object.
* @lua NA
* @js NA
*/
@ -1201,7 +1201,7 @@ void ccvalue_to_luaval(lua_State* L,const cocos2d::Value& inValue);
* The type of value of the key/value pair would be boolean,number, integer, string, array table, hash table.
*
* @param L the current lua_State.
* @param verAttrib a cocos2d::ValueMap object.
* @param inValue a cocos2d::ValueMap object.
* @lua NA
* @js NA
*/
@ -1212,7 +1212,7 @@ void ccvaluemap_to_luaval(lua_State* L,const cocos2d::ValueMap& inValue);
* The type of value of the key/value pair would be boolean,number, integer, string, array table, hash table.
*
* @param L the current lua_State.
* @param verAttrib a cocos2d::Map object.
* @param inValue a cocos2d::ValueMapIntKey object.
* @lua NA
* @js NA
*/
@ -1223,7 +1223,7 @@ void ccvaluemapintkey_to_luaval(lua_State* L, const cocos2d::ValueMapIntKey& inV
* The type of value of the key/value pair would be boolean,number, integer, string, array table, hash table.
*
* @param L the current lua_State.
* @param verAttrib a cocos2d::ValueVector object.
* @param inValue a cocos2d::ValueVector object.
* @lua NA
* @js NA
*/
@ -1235,7 +1235,7 @@ void ccvaluevector_to_luaval(lua_State* L, const cocos2d::ValueVector& inValue);
* Get the real typename for the specified typename.
* Because all override functions wouldn't be bound,so we must use `typeid` to get the real class name.
*
* @param T the pointer points to a object.
* @param ret the pointer points to a type T object.
* @param type the string pointer points to specified typename.
* @return return the pointer points to the real typename, or nullptr.
*/

6
templates/cocos2dx_files.json
View File

@ -275,10 +275,14 @@
"cocos/3d/CCRay.h",
"cocos/3d/CCSkeleton3D.cpp",
"cocos/3d/CCSkeleton3D.h",
"cocos/3d/CCSkybox.cpp",
"cocos/3d/CCSkybox.h",
"cocos/3d/CCSprite3D.cpp",
"cocos/3d/CCSprite3D.h",
"cocos/3d/CCSprite3DMaterial.cpp",
"cocos/3d/CCSprite3DMaterial.h",
"cocos/3d/CCTextureCube.cpp",
"cocos/3d/CCTextureCube.h",
"cocos/3d/CMakeLists.txt",
"cocos/3d/cocos3d.h",
"cocos/Android.mk",
@ -1117,6 +1121,8 @@
"cocos/renderer/ccShader_3D_Particle.vert",
"cocos/renderer/ccShader_3D_PositionNormalTex.vert",
"cocos/renderer/ccShader_3D_PositionTex.vert",
"cocos/renderer/ccShader_3D_Skybox.frag",
"cocos/renderer/ccShader_3D_Skybox.vert",
"cocos/renderer/ccShader_Label.vert",
"cocos/renderer/ccShader_Label_df.frag",
"cocos/renderer/ccShader_Label_df_glow.frag",

130
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
View File

@ -30,6 +30,8 @@
#include "3d/CCAttachNode.h"
#include "3d/CCRay.h"
#include "3d/CCSprite3D.h"
#include "3d/CCTextureCube.h"
#include "3d/CCSkybox.h"
#include "renderer/CCVertexIndexBuffer.h"
#include "DrawNode3D.h"
@ -71,7 +73,8 @@ static std::function<Layer*()> createFunctions[] =
CL(QuaternionTest),
CL(Sprite3DEmptyTest),
CL(UseCaseSprite3D),
CL(Sprite3DForceDepthTest)
CL(Sprite3DForceDepthTest),
CL(Sprite3DCubeMapTest)
};
#define MAX_LAYER (sizeof(createFunctions) / sizeof(createFunctions[0]))
@ -2336,3 +2339,128 @@ void UseCaseSprite3D::update(float delta)
circle->setPositionZ(z);
}
}
Sprite3DCubeMapTest::Sprite3DCubeMapTest() :
_textureCube(nullptr),
_skyBox(nullptr),
_teapot(nullptr)
{
auto s = Director::getInstance()->getWinSize();
addNewSpriteWithCoords(Vec2(s.width / 2, s.height / 2));
}
Sprite3DCubeMapTest::~Sprite3DCubeMapTest()
{
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WP8 || CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)
Director::getInstance()->getEventDispatcher()->removeEventListener(_backToForegroundListener);
#endif
_teapot->release();
_skyBox->release();
_textureCube->release();
}
std::string Sprite3DCubeMapTest::title() const
{
return "CubeMap & Skybox Test";
}
std::string Sprite3DCubeMapTest::subtitle() const
{
return "";
}
void Sprite3DCubeMapTest::addNewSpriteWithCoords(Vec2 p)
{
Size visibleSize = Director::getInstance()->getVisibleSize();
auto _camera = Camera::createPerspective(60, visibleSize.width / visibleSize.height, 0.1, 200);
_camera->setCameraFlag(CameraFlag::USER1);
// create a teapot
_teapot = Sprite3D::create("Sprite3DTest/teapot.c3b");
_teapot->retain();
//create and set our custom shader
auto shader = GLProgram::createWithFilenames("Sprite3DTest/cube_map.vert", "Sprite3DTest/cube_map.frag");
auto state = GLProgramState::create(shader);
// create the second texture for cylinder
_textureCube = TextureCube::create("Sprite3DTest/skybox/left.jpg", "Sprite3DTest/skybox/right.jpg",
"Sprite3DTest/skybox/top.jpg", "Sprite3DTest/skybox/bottom.jpg",
"Sprite3DTest/skybox/front.jpg", "Sprite3DTest/skybox/back.jpg");
_textureCube->retain();
//set texture parameters
Texture2D::TexParams tRepeatParams;
tRepeatParams.magFilter = GL_NEAREST;
tRepeatParams.minFilter = GL_NEAREST;
tRepeatParams.wrapS = GL_MIRRORED_REPEAT;
tRepeatParams.wrapT = GL_MIRRORED_REPEAT;
_textureCube->setTexParameters(tRepeatParams);
// pass the texture sampler to our custom shader
state->setUniformTexture("u_cubeTex", _textureCube);
_teapot->setGLProgramState(state);
_teapot->setPosition3D(Vec3(0, -5, -20));
_teapot->setRotation3D(Vec3(-90, 180, 0));
auto rotate_action = RotateBy::create(1.5, Vec3(0, 30, 0));
_teapot->runAction(RepeatForever::create(rotate_action));
//pass mesh's attribute to shader
long offset = 0;
auto attributeCount = _teapot->getMesh()->getMeshVertexAttribCount();
for (auto i = 0; i < attributeCount; i++)
{
auto meshattribute = _teapot->getMesh()->getMeshVertexAttribute(i);
state->setVertexAttribPointer(s_attributeNames[meshattribute.vertexAttrib],
meshattribute.size,
meshattribute.type,
GL_FALSE,
_teapot->getMesh()->getVertexSizeInBytes(),
(GLvoid*)offset);
offset += meshattribute.attribSizeBytes;
}
addChild(_teapot);
addChild(_camera);
setCameraMask(2);
{
// config skybox
_skyBox = Skybox::create();
_skyBox->retain();
_skyBox->setTexture(_textureCube);
addChild(_skyBox);
}
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WP8 || CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)
_backToForegroundListener = EventListenerCustom::create(EVENT_RENDERER_RECREATED,
[this](EventCustom*)
{
auto state = _teapot->getGLProgramState();
auto glProgram = state->getGLProgram();
glProgram->reset();
glProgram->initWithFilenames("Sprite3DTest/cube_map.vert", "Sprite3DTest/cube_map.frag");
glProgram->link();
glProgram->updateUniforms();
_textureCube->reloadTexture();
Texture2D::TexParams tRepeatParams;
tRepeatParams.magFilter = GL_NEAREST;
tRepeatParams.minFilter = GL_NEAREST;
tRepeatParams.wrapS = GL_MIRRORED_REPEAT;
tRepeatParams.wrapT = GL_MIRRORED_REPEAT;
_textureCube->setTexParameters(tRepeatParams);
state->setUniformTexture("u_cubeTex", _textureCube);
_skyBox->reload();
_skyBox->setTexture(_textureCube);
});
Director::getInstance()->getEventDispatcher()->addEventListenerWithFixedPriority(_backToForegroundListener, -1);
#endif
}

26
tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
View File

@ -498,4 +498,30 @@ public:
virtual void runThisTest();
};
namespace cocos2d
{
class TextureCube;
class Skybox;
}
class Sprite3DCubeMapTest : public Sprite3DTestDemo
{
public:
CREATE_FUNC(Sprite3DCubeMapTest);
Sprite3DCubeMapTest();
~Sprite3DCubeMapTest();
virtual std::string title() const override;
virtual std::string subtitle() const override;
void addNewSpriteWithCoords(Vec2);
protected:
cocos2d::TextureCube* _textureCube;
Skybox* _skyBox;
Sprite3D* _teapot;
#if (CC_TARGET_PLATFORM == CC_PLATFORM_ANDROID || CC_TARGET_PLATFORM == CC_PLATFORM_WP8 || CC_TARGET_PLATFORM == CC_PLATFORM_WINRT)
EventListenerCustom* _backToForegroundListener;
#endif
};
#endif

8
tests/cpp-tests/Resources/Sprite3DTest/cube_map.frag Normal file
View File

@ -0,0 +1,8 @@
varying vec3 v_reflect;
uniform samplerCube u_cubeTex;
void main(void)
{
gl_FragColor = textureCube(u_cubeTex, v_reflect);
}

16
tests/cpp-tests/Resources/Sprite3DTest/cube_map.vert Normal file
View File

@ -0,0 +1,16 @@
attribute vec4 a_position;
attribute vec3 a_normal;
varying vec3 v_reflect;
void main(void)
{
gl_Position = CC_MVPMatrix * a_position;
// compute reflect
vec4 positionWorldViewSpace = CC_MVMatrix * a_position;;
vec3 vEyeVertex = normalize(positionWorldViewSpace.xyz / positionWorldViewSpace.w);
vec3 v_normalVector = CC_NormalMatrix * a_normal;
v_reflect = normalize(reflect(vEyeVertex, v_normalVector));
}

BIN
tests/cpp-tests/Resources/Sprite3DTest/skybox/back.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 24 KiB

BIN
tests/cpp-tests/Resources/Sprite3DTest/skybox/bottom.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 43 KiB

BIN
tests/cpp-tests/Resources/Sprite3DTest/skybox/front.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

BIN
tests/cpp-tests/Resources/Sprite3DTest/skybox/left.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 25 KiB

BIN
tests/cpp-tests/Resources/Sprite3DTest/skybox/right.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 30 KiB

BIN
tests/cpp-tests/Resources/Sprite3DTest/skybox/top.jpg Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 34 KiB

68
tests/lua-tests/src/Sprite3DTest/Sprite3DTest.lua
View File

@ -1026,12 +1026,75 @@ end
function AsyncLoadSprite3DTest:onExit()
----------------------------------------
----Sprite3DCubeTexture
----------------------------------------
local Sprite3DCubeMap = {}
Sprite3DCubeMap.__index = Sprite3DCubeMap
function Sprite3DCubeMap.create()
local layer = cc.Layer:create()
Helper.initWithLayer(layer)
Helper.titleLabel:setString("Sprite3D CubeMap/Skybox Test")
local visSize = cc.Director:getInstance():getVisibleSize()
local camera = cc.Camera:createPerspective(68, visSize.width / visSize.height, 0.1, 200)
camera:setCameraFlag(2)
layer:addChild(camera)
local fileName = "Sprite3DTest/teapot.c3b"
local teapot = cc.Sprite3D:create(fileName)
teapot:setPosition3D({x = 0, y = -5, z = -20})
teapot:setRotation3D({x = -90, y = 180, z = 0})
local texCube = cc.TextureCube:create("Sprite3DTest/skybox/left.jpg", "Sprite3DTest/skybox/right.jpg",
"Sprite3DTest/skybox/top.jpg", "Sprite3DTest/skybox/bottom.jpg",
"Sprite3DTest/skybox/front.jpg", "Sprite3DTest/skybox/back.jpg");
local program = cc.GLProgram:createWithFilenames("Sprite3DTest/cube_map.vert", "Sprite3DTest/cube_map.frag")
local state = cc.GLProgramState:create(program)
attriNames = {
"a_position", "a_color",
"a_texCoord", "a_texCoord1", "a_texCoord2", "a_texCoord3",
"a_normal", "a_blendWeight", "a_blendIndex"
}
--pass mesh's attribute to shader
local offset = 0
local attributeCount = teapot:getMesh():getMeshVertexAttribCount()
for i = 0, attributeCount-1 do
local meshattribute = teapot:getMesh():getMeshVertexAttribute(i)
state:setVertexAttribPointer(attriNames[meshattribute.vertexAttrib+1],
meshattribute.size,
meshattribute.type,
false,
teapot:getMesh():getVertexSizeInBytes(),
offset);
offset = offset + meshattribute.attribSizeBytes
end
state:setUniformTexture("u_cubeTex", texCube:getName())
teapot:setGLProgramState(state)
teapot:setCameraMask(2)
local rotate_action = cc.RotateBy:create(1.5, { x = 0.0, y = 30.0, z = 0.0})
teapot:runAction(cc.RepeatForever:create(rotate_action));
layer:addChild(teapot)
local skybox = cc.Skybox:create()
skybox:setTexture(texCube)
layer:addChild(skybox)
return layer
>>>>>>> 4ea27173daf6b04cf0b917faa7911dde448cbdca
end
function Sprite3DTest()
local scene = cc.Scene:create()
Helper.createFunctionTable =
Helper.createFunctionTable =
{
Sprite3DBasicTest.create,
Sprite3DHitTest.create,
@ -1041,7 +1104,8 @@ function Sprite3DTest()
Sprite3DReskinTest.create,
Sprite3DWithOBBPerfromanceTest.create,
Sprite3DMirrorTest.create,
AsyncLoadSprite3DTest.create
AsyncLoadSprite3DTest.create,
Sprite3DCubeMap.create,
}
scene:addChild(Sprite3DBasicTest.create())