diff --git a/cocos/2d/libcocos2d_wp8.vcxproj b/cocos/2d/libcocos2d_wp8.vcxproj index 2bd3354056..6b862f370e 100644 --- a/cocos/2d/libcocos2d_wp8.vcxproj +++ b/cocos/2d/libcocos2d_wp8.vcxproj @@ -386,8 +386,10 @@ + + @@ -990,8 +992,10 @@ + + diff --git a/cocos/2d/libcocos2d_wp8.vcxproj.filters b/cocos/2d/libcocos2d_wp8.vcxproj.filters index 93d1161219..9e6d9e7b74 100644 --- a/cocos/2d/libcocos2d_wp8.vcxproj.filters +++ b/cocos/2d/libcocos2d_wp8.vcxproj.filters @@ -1809,6 +1809,12 @@ cocostudio\json + + 3d + + + 3d + @@ -3516,6 +3522,12 @@ cocostudio\json + + 3d + + + 3d + diff --git a/cocos/3d/CCSkybox.h b/cocos/3d/CCSkybox.h index 720c8d4442..266e0eca86 100644 --- a/cocos/3d/CCSkybox.h +++ b/cocos/3d/CCSkybox.h @@ -31,29 +31,48 @@ 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*); - void onDraw(const Mat4& transform, uint32_t flags); - - // Overrides + /** 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; diff --git a/cocos/3d/CCTextureCube.h b/cocos/3d/CCTextureCube.h index f8c25902b4..011c847191 100644 --- a/cocos/3d/CCTextureCube.h +++ b/cocos/3d/CCTextureCube.h @@ -1,4 +1,4 @@ -/**************************************************************************** +/**************************************************************************** Copyright (c) 2015 Chukong Technologies Inc. http://www.cocos2d-x.org @@ -34,28 +34,41 @@ NS_CC_BEGIN /** - texture cube map. - It wraps the cocos2d::Texture2D + 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 path The image resource path. - @create cube texture from 6 textures. + /** 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(); - TextureCube(const TextureCube&); + + /** + * Destructor. + */ virtual ~TextureCube(); protected: