add class static variable for EffectOutline

dabingnn · dabingnn · commit 377d3bccd85d · 2014-05-16T11:19:56.000-07:00
diff --git a/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp b/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp
@@ -264,6 +264,13 @@ void EffectSprite3D::addEffect(Effect3DOutline* effect, ssize_t order)
     std::sort(std::begin(_effects), std::end(_effects), tuple_sort);
 }
 
+const std::string Effect3DOutline::_vertShaderFile = "Shaders3D/OutLine.vert";
+const std::string Effect3DOutline::_fragShaderFile = "Shaders3D/OutLine.frag";
+//GLProgram* Effect3DOutline::getorCreateProgram()
+//{
+//    return nullptr;
+//}
+
 Effect3DOutline* Effect3DOutline::create()
 {
     Effect3DOutline* effect = new Effect3DOutline();
@@ -282,7 +289,7 @@ Effect3DOutline* Effect3DOutline::create()
 bool Effect3DOutline::init()
 {
 
-    GLProgram* glprogram = GLProgram::createWithFilenames("Shaders3D/OutLine.vert", "Shaders3D/OutLine.frag");
+    GLProgram* glprogram = GLProgram::createWithFilenames(_vertShaderFile, _fragShaderFile);
     if(nullptr == glprogram)
     {
         CC_SAFE_DELETE(glprogram);
diff --git a/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h b/tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h
@@ -97,6 +97,10 @@ class Effect3DOutline: public Effect3D
     Vec3 _outlineColor;
     float _outlineWidth;
     
+public:
+    static const std::string _vertShaderFile;
+    static const std::string _fragShaderFile;
+    //static GLProgram* getorCreateProgram();
 };
 
 class EffectSprite3D : public Sprite3D

Original file line number	Diff line number	Diff line change
`@@ -264,6 +264,13 @@ void EffectSprite3D::addEffect(Effect3DOutline* effect, ssize_t order)`
`264`	`264`	`std::sort(std::begin(_effects), std::end(_effects), tuple_sort);`
`265`	`265`	`}`
`266`	`266`
	`267`	`+const std::string Effect3DOutline::_vertShaderFile = "Shaders3D/OutLine.vert";`
	`268`	`+const std::string Effect3DOutline::_fragShaderFile = "Shaders3D/OutLine.frag";`
	`269`	`+//GLProgram* Effect3DOutline::getorCreateProgram()`
	`270`	`+//{`
	`271`	`+// return nullptr;`
	`272`	`+//}`
	`273`	`+`
`267`	`274`	`Effect3DOutline* Effect3DOutline::create()`
`268`	`275`	`{`
`269`	`276`	`Effect3DOutline* effect = new Effect3DOutline();`
`@@ -282,7 +289,7 @@ Effect3DOutline* Effect3DOutline::create()`
`282`	`289`	`bool Effect3DOutline::init()`
`283`	`290`	`{`
`284`	`291`
`285`		`- GLProgram* glprogram = GLProgram::createWithFilenames("Shaders3D/OutLine.vert", "Shaders3D/OutLine.frag");`
	`292`	`+ GLProgram* glprogram = GLProgram::createWithFilenames(_vertShaderFile, _fragShaderFile);`
`286`	`293`	`if(nullptr == glprogram)`
`287`	`294`	`{`
`288`	`295`	`CC_SAFE_DELETE(glprogram);`