Merge branch 'mesh3d' of https://github.com/super626/cocos2d-x into mesh3d

Author: super626

cocos/cocos2d.h

@@ -261,6 +261,7 @@ THE SOFTWARE.
 
 //3d
 #include "3d/CCSprite3D.h"
+#include "3d/CCMesh.h"
 
 // Audio
 #include "audio/include/SimpleAudioEngine.h"

cocos/renderer/CCGLProgramState.cpp

@@ -240,11 +240,14 @@ void VertexAttribValue::setPointer(GLint size, GLenum type, GLboolean normalized
 GLProgramState* GLProgramState::create(GLProgram *glprogram)
 {
     GLProgramState* ret = nullptr;
-    ret = new (std::nothrow) GLProgramState;
-    if(!ret || !ret->init(glprogram))
-        CC_SAFE_RELEASE(ret);
-
-    return ret;
+    ret = new (std::nothrow) GLProgramState();
+    if(ret && ret->init(glprogram))
+    {
+        ret->autorelease();
+        return ret;
+    }
+    CC_SAFE_DELETE(ret);
+    return nullptr;
 }
 
 GLProgramState* GLProgramState::getOrCreateWithGLProgramName(const std::string &glProgramName )

tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.cpp

@@ -264,6 +264,20 @@ 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";
+const std::string Effect3DOutline::_keyInGLProgramCache = "Effect3DLibrary_Outline";
+GLProgram* Effect3DOutline::getOrCreateProgram()
+{
+    auto program = GLProgramCache::getInstance()->getGLProgram(_keyInGLProgramCache);
+    if(program == nullptr)
+    {
+        program = GLProgram::createWithFilenames(_vertShaderFile, _fragShaderFile);
+        GLProgramCache::getInstance()->addGLProgram(program, _keyInGLProgramCache);
+    }
+    return program;
+}
+
 Effect3DOutline* Effect3DOutline::create()
 {
     Effect3DOutline* effect = new Effect3DOutline();
@@ -282,13 +296,13 @@ Effect3DOutline* Effect3DOutline::create()
 bool Effect3DOutline::init()
 {
 
-    GLProgram* glprogram = GLProgram::createWithFilenames("Shaders3D/OutLine.vert", "Shaders3D/OutLine.frag");
+    GLProgram* glprogram = Effect3DOutline::getOrCreateProgram();
     if(nullptr == glprogram)
     {
         CC_SAFE_DELETE(glprogram);
         return false;
     }
-    _glProgramState = GLProgramState::getOrCreateWithGLProgram(glprogram);
+    _glProgramState = GLProgramState::create(glprogram);
     if(nullptr == _glProgramState)
     {
         return false;

tests/cpp-tests/Classes/Sprite3DTest/Sprite3DTest.h

@@ -27,7 +27,6 @@
 
 #include "../testBasic.h"
 #include "../BaseTest.h"
-#include "3d/CCMesh.h"
 #include <string>
 
 class Sprite3DTestDemo : public BaseTest
@@ -98,6 +97,11 @@ class Effect3DOutline: public Effect3D
     Vec3 _outlineColor;
     float _outlineWidth;
 
+public:
+    static const std::string _vertShaderFile;
+    static const std::string _fragShaderFile;
+    static const std::string _keyInGLProgramCache;
+    static GLProgram* getOrCreateProgram();
 };
 
 class EffectSprite3D : public Sprite3D