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

Merge pull request #118 from songchengjiang/light_new 

Deleted Plane Model
This commit is contained in:
XiaoYang 2014-08-28 10:22:36 +08:00
parent 6b686ae0db 014ba0d12e
commit 20b5b251d5
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cocos/renderer/CCGLProgram.h
View File

@ -103,9 +103,9 @@ public:
enum
{
UNIFORM_ENABLED_DIRECTIONAL_LIGHT_NUM,
UNIFORM_ENABLED_POINT_LIGHT_NUM,
UNIFORM_ENABLED_SPOT_LIGHT_NUM,
//UNIFORM_ENABLED_DIRECTIONAL_LIGHT_NUM,
//UNIFORM_ENABLED_POINT_LIGHT_NUM,
//UNIFORM_ENABLED_SPOT_LIGHT_NUM,
UNIFORM_AMBIENT_COLOR,
UNIFORM_P_MATRIX,
UNIFORM_MV_MATRIX,

18
tests/cpp-tests/Classes/LightTest/LightTestDemo.cpp
View File

@ -146,15 +146,15 @@ void LightTestDemo::addSprite()
{
auto s = Director::getInstance()->getWinSize();
{
std::string fileName = "Sprite3DTest/plane.c3b";
auto sprite = Sprite3D::create(fileName);
sprite->setRotation3D(Vec3(-90.0, 0.0, 0.0));
sprite->setScale(5.0f);
sprite->setPosition(Vec2(0.0, -50.0));
addChild(sprite);
sprite->setCameraMask(2);
}
//{
// std::string fileName = "Sprite3DTest/plane.c3b";
// auto sprite = Sprite3D::create(fileName);
// sprite->setRotation3D(Vec3(-90.0, 0.0, 0.0));
// sprite->setScale(5.0f);
// sprite->setPosition(Vec2(0.0, -50.0));
// addChild(sprite);
// sprite->setCameraMask(2);
//}
{
std::string fileName = "Sprite3DTest/orc.c3b";