Merge pull request #4 from cocos2d/develop

update

Author: akof1314

.travis.yml

@@ -2,7 +2,8 @@ language: cpp
 env:
   matrix:
   - GEN_JSB=YES
-  - PLATFORM=linux DEBUG=1
+  - PLATFORM=linux DEBUG=1 CC_COMPILER=gcc CXX_COMPILER=g++
+  - PLATFORM=linux DEBUG=1 CC_COMPILER=clang CXX_COMPILER=clang++
   # Since switching to C++11 only the ARM version of the nactive client
   # port currently builds.  TODO(sbc): Re-enable all architectures.
   # Disabled travis-ci build for native client port since it doesn't support std::thread, std::mutex.
@@ -23,6 +24,8 @@ env:
       9lV+vgJQDRcFe7dKwtC86vk10EU7Ym2bhVmhMxi/AlmJXgavjmPVdizRT7rh
       X2Ry/Nb6hGRkH3WS0T3D/KG1+e7lP/TMB9bvo6/locLJ2A6Z1YI=
 script:
+- export CC=$CC_COMPILER
+- export CXX=$CXX_COMPILER
 - tools/travis-scripts/run-script.sh
 before_install:
 - tools/travis-scripts/before-install.sh

AUTHORS

@@ -356,6 +356,7 @@ Developers:
 
     ThePickleMan
         Adding 'rotationIsDir' property to ParticleSystem.
+        DrawNode supports to draw triangle, quad bezier, cubic bezier.
 
     Jianghua (jxhgzs)
         Adding an additional transform for CCNode.
@@ -519,6 +520,7 @@ Developers:
         Correcting the type detecting order for Lua CCBProxy::getNodeTypeName.
         Casting variables to their own type, and print warning info if no corresponding lua callback function instead of crash.
         fix of WebSocket url parse error for 'ws://domain.com/websocket' pattern.
+        Fixed a bug that Websocket doesn't support send/receive data which larger than 4096 bytes.
 
     musikov
         Fixing a bug that missing precision when getting strokeColor and fontFillColor
@@ -657,6 +659,7 @@ Developers:
 
     xhcnb
         Device::setAccelerometerEnabled needs to be invoked before adding ACC listener.
+        Fixed a bug that it will get wrong custom properties when use different count custom properties in CocosBuilder.
 
     bopohaa
         Fixed a bug that Webp test crashes.
@@ -704,6 +707,10 @@ Developers:
     daltomi
         Fixed a typo in Director class.
         Removed an unnecessary boolean flag in CCFontAtlasCache.cpp.
+        
+    v1ctor
+        ControlSlider supports to set selected thumb sprite.
+        ControlButton supports to set scale ratio of touchdown state
 
 Retired Core Developers:
     WenSheng Yang

CHANGELOG

@@ -1,6 +1,10 @@
 cocos2d-x-3.0final ?.? ?
 [All]
      [FIX]          Crash was triggered if there is not `textureFileName`section in particle plist file.
+     [FIX]          ControlSlider doesn't support to set selected thumb sprite.
+     [FIX]          ControlButton doesn't support to set scale ratio of touchdown state.
+     [FIX]          Websocket doesn't support send/receive data which larger than 4096 bytes.
+     [NEW]          DrawNode supports to draw triangle, quad bezier, cubic bezier.
 cocos2d-x-3.0beta Jan.7 2014
 [All]
      [NEW]          New label: shadow, outline, glow support

cocos/2d/CCDirector.cpp

@@ -948,17 +948,20 @@ void Director::createStatsLabel()
      */
     float factor = EGLView::getInstance()->getDesignResolutionSize().height / 320.0f;
 
-    _FPSLabel = new LabelAtlas;
+    _FPSLabel = LabelAtlas::create();
+    _FPSLabel->retain();
     _FPSLabel->setIgnoreContentScaleFactor(true);
     _FPSLabel->initWithString("00.0", texture, 12, 32 , '.');
     _FPSLabel->setScale(factor);
 
-    _SPFLabel = new LabelAtlas;
+    _SPFLabel = LabelAtlas::create();
+    _SPFLabel->retain();
     _SPFLabel->setIgnoreContentScaleFactor(true);
     _SPFLabel->initWithString("0.000", texture, 12, 32, '.');
     _SPFLabel->setScale(factor);
 
-    _drawsLabel = new LabelAtlas;
+    _drawsLabel = LabelAtlas::create();
+    _drawsLabel->retain();
     _drawsLabel->setIgnoreContentScaleFactor(true);
     _drawsLabel->initWithString("000", texture, 12, 32, '.');
     _drawsLabel->setScale(factor);

cocos/2d/CCDrawNode.cpp

@@ -456,6 +456,86 @@ void DrawNode::drawPolygon(Point *verts, int count, const Color4F &fillColor, fl
     free(extrude);
 }
 
+void DrawNode::drawTriangle(const Point &p1, const Point &p2, const Point &p3, const Color4F &color)
+{
+    unsigned int vertex_count = 2*3;
+    ensureCapacity(vertex_count);
+
+    Color4B col = Color4B(color);
+    V2F_C4B_T2F a = {Vertex2F(p1.x, p1.y), col, Tex2F(0.0, 0.0) };
+    V2F_C4B_T2F b = {Vertex2F(p2.x, p2.y), col, Tex2F(0.0,  0.0) };
+    V2F_C4B_T2F c = {Vertex2F(p3.x, p3.y), col, Tex2F(0.0,  0.0) };
+
+    V2F_C4B_T2F_Triangle *triangles = (V2F_C4B_T2F_Triangle *)(_buffer + _bufferCount);
+    V2F_C4B_T2F_Triangle triangle = {a, b, c};
+    triangles[0] = triangle;
+
+    _bufferCount += vertex_count;
+    _dirty = true;
+}
+
+void DrawNode::drawCubicBezier(const Point& from, const Point& control1, const Point& control2, const Point& to, unsigned int segments, const Color4F &color)
+{
+    unsigned int vertex_count = (segments + 1) * 3;
+    ensureCapacity(vertex_count);
+
+    Tex2F texCoord = Tex2F(0.0, 0.0);
+    Color4B col = Color4B(color);
+    Vertex2F vertex;
+    Vertex2F firstVertex = Vertex2F(from.x, from.y);
+    Vertex2F lastVertex = Vertex2F(to.x, to.y);
+
+    float t = 0;
+    for(unsigned int i = segments + 1; i > 0; i--)
+    {
+        float x = powf(1 - t, 3) * from.x + 3.0f * powf(1 - t, 2) * t * control1.x + 3.0f * (1 - t) * t * t * control2.x + t * t * t * to.x;
+        float y = powf(1 - t, 3) * from.y + 3.0f * powf(1 - t, 2) * t * control1.y + 3.0f * (1 - t) * t * t * control2.y + t * t * t * to.y;
+        vertex = Vertex2F(x, y);
+
+        V2F_C4B_T2F a = {firstVertex, col, texCoord };
+        V2F_C4B_T2F b = {lastVertex, col, texCoord };
+        V2F_C4B_T2F c = {vertex, col, texCoord };
+        V2F_C4B_T2F_Triangle triangle = {a, b, c};
+        ((V2F_C4B_T2F_Triangle *)(_buffer + _bufferCount))[0] = triangle;
+
+        lastVertex = vertex;
+        t += 1.0f / segments;
+        _bufferCount += 3;
+    }
+    _dirty = true;
+}
+
+void DrawNode::drawQuadraticBezier(const Point& from, const Point& control, const Point& to, unsigned int segments, const Color4F &color)
+{
+    unsigned int vertex_count = (segments + 1) * 3;
+    ensureCapacity(vertex_count);
+
+    Tex2F texCoord = Tex2F(0.0, 0.0);
+    Color4B col = Color4B(color);
+    Vertex2F vertex;
+    Vertex2F firstVertex = Vertex2F(from.x, from.y);
+    Vertex2F lastVertex = Vertex2F(to.x, to.y);
+
+    float t = 0;
+    for(unsigned int i = segments + 1; i > 0; i--)
+    {
+        float x = powf(1 - t, 2) * from.x + 2.0f * (1 - t) * t * control.x + t * t * to.x;
+        float y = powf(1 - t, 2) * from.y + 2.0f * (1 - t) * t * control.y + t * t * to.y;
+        vertex = Vertex2F(x, y);
+
+        V2F_C4B_T2F a = {firstVertex, col, texCoord };
+        V2F_C4B_T2F b = {lastVertex, col, texCoord };
+        V2F_C4B_T2F c = {vertex, col, texCoord };
+        V2F_C4B_T2F_Triangle triangle = {a, b, c};
+        ((V2F_C4B_T2F_Triangle *)(_buffer + _bufferCount))[0] = triangle;
+
+        lastVertex = vertex;
+        t += 1.0f / segments;
+        _bufferCount += 3;
+    }
+    _dirty = true;
+}
+
 void DrawNode::clear()
 {
     _bufferCount = 0;

cocos/2d/CCDrawNode.h

@@ -63,6 +63,15 @@ class CC_DLL DrawNode : public Node
     * @endcode
     */
     void drawPolygon(Point *verts, int count, const Color4F &fillColor, float borderWidth, const Color4F &borderColor);
+	
+    /** draw a triangle with color */
+    void drawTriangle(const Point &p1, const Point &p2, const Point &p3, const Color4F &color);
+
+    /** draw a cubic bezier curve with color and number of segments */
+    void drawCubicBezier(const Point& from, const Point& control1, const Point& control2, const Point& to, unsigned int segments, const Color4F &color);
+
+    /** draw a quadratic bezier curve with color and number of segments */
+    void drawQuadraticBezier(const Point& from, const Point& control, const Point& to, unsigned int segments, const Color4F &color);
 
     /** Clear the geometry in the node's buffer. */
     void clear();

cocos/2d/CCLabelAtlas.cpp

@@ -43,15 +43,30 @@ NS_CC_BEGIN
 
 //CCLabelAtlas - Creation & Init
 
+LabelAtlas* LabelAtlas::create()
+{
+    LabelAtlas* ret = new LabelAtlas();
+    if (ret)
+    {
+        ret->autorelease();
+    }
+    else
+    {
+        CC_SAFE_RELEASE_NULL(ret);
+    }
+    
+    return ret;
+}
+
 LabelAtlas* LabelAtlas::create(const std::string& string, const std::string& charMapFile, int itemWidth, int itemHeight, int startCharMap)
 {
-    LabelAtlas *pRet = new LabelAtlas();
-    if(pRet && pRet->initWithString(string, charMapFile, itemWidth, itemHeight, startCharMap))
+    LabelAtlas* ret = new LabelAtlas();
+    if(ret && ret->initWithString(string, charMapFile, itemWidth, itemHeight, startCharMap))
     {
-        pRet->autorelease();
-        return pRet;
+        ret->autorelease();
+        return ret;
     }
-    CC_SAFE_DELETE(pRet);
+    CC_SAFE_DELETE(ret);
     return nullptr;
 }
 

cocos/2d/CCLabelAtlas.h

@@ -52,23 +52,11 @@ A more flexible class is LabelBMFont. It supports variable width characters and
 class CC_DLL LabelAtlas : public AtlasNode, public LabelProtocol
 {
 public:
-    /**
-     * @js ctor
-     */
-    LabelAtlas()
-        :_string("")
-    {}
-    /**
-     * @js NA
-     * @lua NA
-     */
-    virtual ~LabelAtlas()
-    { 
-        _string.clear(); 
-    }
-
+    /** creates an empty LabelAtlas, user need to call initWithString(...) later to make this object work properly **/
+    static LabelAtlas* create();
+    
     /** creates the LabelAtlas with a string, a char map file(the atlas), the width and height of each element and the starting char of the atlas */
-    static LabelAtlas * create(const std::string& string, const std::string& charMapFile, int itemWidth, int itemHeight, int startCharMap);
+    static LabelAtlas* create(const std::string& string, const std::string& charMapFile, int itemWidth, int itemHeight, int startCharMap);
 
     /** creates the LabelAtlas with a string and a configuration file
      @since v2.0
@@ -98,6 +86,15 @@ class CC_DLL LabelAtlas : public AtlasNode, public LabelProtocol
 #endif
 
 protected:
+    LabelAtlas()
+    :_string("")
+    {}
+
+    virtual ~LabelAtlas()
+    {
+        _string.clear();
+    }
+    
     // string to render
     std::string _string;
     // the first char in the charmap

cocos/2d/CCMenuItem.cpp

@@ -348,9 +348,8 @@ bool MenuItemAtlasFont::initWithString(const std::string& value, const std::stri
 bool MenuItemAtlasFont::initWithString(const std::string& value, const std::string& charMapFile, int itemWidth, int itemHeight, char startCharMap, const ccMenuCallback& callback)
 {
     CCASSERT( value.size() != 0, "value length must be greater than 0");
-    LabelAtlas *label = new LabelAtlas();
+    LabelAtlas *label = LabelAtlas::create();
     label->initWithString(value, charMapFile, itemWidth, itemHeight, startCharMap);
-    label->autorelease();
     if (MenuItemLabel::initWithLabel(label, callback))
     {
         // do something ?

cocos/2d/CCTextureCache.cpp

@@ -183,7 +183,7 @@ void TextureCache::loadImage()
                    break;
            }
            _imageInfoMutex.unlock();
-           if(infoSize > 0 && pos < infoSize)
+           if(infoSize == 0 || pos < infoSize)
                generateImage = true;
         }