Merge pull request #10 from dabingnn/mesh3d_work

Mesh3d work

Author: Huabing.Xu

cocos/3d/CCSprite3D.cpp

@@ -129,7 +129,10 @@ bool Sprite3D::loadFromObj(const std::string& path)
     return true;
 }
 
-Sprite3D::Sprite3D(): _partcount(0), _mesh(nullptr)
+Sprite3D::Sprite3D()
+: _partcount(0)
+, _mesh(nullptr)
+, _blend(BlendFunc::DISABLE)
 {
 }
 
@@ -237,9 +240,9 @@ void Sprite3D::onDraw(const Matrix &transform, bool transformUpdated)
 {
     glEnable(GL_DEPTH_TEST);
     glEnable(GL_CULL_FACE);
+    GL::blendFunc(_blend.src, _blend.dst);
     // ********** Base Draw *************
 
-    
     Color4F color(getDisplayedColor());
     color.a = getDisplayedOpacity() / 255.0f;
 
@@ -308,5 +311,18 @@ void Sprite3D::onDraw(const Matrix &transform, bool transformUpdated)
 
 }
 
+void Sprite3D::setBlendFunc(const BlendFunc &blendFunc)
+{
+    if(_blend.src != blendFunc.src || _blend.dst != blendFunc.dst)
+    {
+        _blend = blendFunc;
+    }
+}
+
+const BlendFunc& Sprite3D::getBlendFunc() const
+{
+    return _blend;
+}
+
 
 NS_CC_END

cocos/3d/CCSprite3D.h

@@ -7,6 +7,7 @@
 
 #include "base/ccTypes.h"
 #include "2d/CCNode.h"
+#include "2d/CCProtocols.h"
 
 #include "renderer/CCCustomCommand.h"
 
@@ -16,23 +17,18 @@ class GLProgramState;
 class Mesh;
 class Texture2D;
 
-class Sprite3D : public Node
+class Sprite3D : public Node, public BlendProtocol
 {
 public:
     static Sprite3D* create(const std::string &modelPath);
     static Sprite3D* create(const std::string &modelPath, const std::string &texturePath);
-    //static Sprite3D* create(Mesh* mesh, const std::string& texturePath);
-    //todo add if we need multitexture in the sprite3d
-    //static Sprite3D* create(const std::string &modelPath, const std::vector<std::string> &texturePath);
-    //static Sprite3D* create(const std::string &modelPath, const std::vector<std::string> &texturePath);
-
-    int           getMeshPartCount() const;
-    
-    Mesh* getMesh() const { return _mesh; }
 
     void setTexture(const std::string& texFile);
     //void setTexture(Texture2D* texture);
-
+    
+    virtual void setBlendFunc(const BlendFunc &blendFunc) override;
+    virtual const BlendFunc &getBlendFunc() const override;
+    
 protected:
     Sprite3D();
     virtual ~Sprite3D();
@@ -47,6 +43,10 @@ class Sprite3D : public Node
 
     virtual GLProgram* getDefGLProgram(bool textured = true);
 
+    int           getMeshPartCount() const;
+    
+    Mesh* getMesh() const { return _mesh; }
+
     CustomCommand     _customCommand;
     Mesh              *_mesh;
 
@@ -59,7 +59,8 @@ class Sprite3D : public Node
     //Sprite3DEffect*     _effect;
 
     std::string       _path;
-
+    
+    BlendFunc _blend;
 
 };