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

modify

This commit is contained in:
yangxiao 2015-03-26 13:05:42 +08:00
parent 7af9957e1c
commit c23746fbcd
6 changed files with 95 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos/3d/CCSkybox.cpp
View File

@ -1,5 +1,5 @@
/****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org
@ -22,8 +22,8 @@
THE SOFTWARE.
****************************************************************************/
#include "CCSkybox.h"
#include "CCTextureCube.h"
#include "3d/CCSkybox.h"
#include "3d/CCTextureCube.h"
NS_CC_BEGIN

2
cocos/3d/CCSkybox.h
View File

@ -1,5 +1,5 @@
/****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org

4
cocos/3d/CCTextureCube.cpp
View File

@ -1,5 +1,5 @@
/****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org
@ -20,7 +20,7 @@
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"

4
cocos/3d/CCTextureCube.h
View File

@ -1,5 +1,5 @@
/****************************************************************************
Copyright (c) 2014 Chukong Technologies Inc.
Copyright (c) 2015 Chukong Technologies Inc.
http://www.cocos2d-x.org
@ -20,7 +20,7 @@
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__

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

@ -2362,7 +2362,7 @@ Sprite3DCubeMapTest::~Sprite3DCubeMapTest()
std::string Sprite3DCubeMapTest::title() const
{
return "CubeMap && Skybox Test";
return "CubeMap & Skybox Test";
}
std::string Sprite3DCubeMapTest::subtitle() const

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

@ -30,12 +30,12 @@
#include <string>
namespace cocos2d {
class Animate3D;
class Sprite3D;
class Delay;
class Ray;
class DrawNode3D;
class GLProgramState;
class Animate3D;
class Sprite3D;
class Delay;
class Ray;
class DrawNode3D;
class GLProgramState;
}
class Sprite3DTestDemo : public BaseTest