Still use V3F_T2F_C4B for sprite render

Author: halx99

core/2d/AnchoredSprite.cpp

@@ -147,7 +147,7 @@ AnchoredSprite* AnchoredSprite::create()
     return nullptr;
 }
 
-void AnchoredSprite::setVertexCoords(const Rect& rect, V3F_T2F_C4F_Quad* outQuad)
+void AnchoredSprite::setVertexCoords(const Rect& rect, V3F_T2F_C4B_Quad* outQuad)
 {
     float relativeOffsetX = _unflippedOffsetPositionFromCenter.x - getContentSize().x * _spriteVertexAnchor.x;
     float relativeOffsetY = _unflippedOffsetPositionFromCenter.y - getContentSize().y * _spriteVertexAnchor.y;

core/2d/AnchoredSprite.h

@@ -143,7 +143,7 @@ class AX_DLL AnchoredSprite : public Sprite
     virtual Rect getTouchRect();
 
 protected:
-    virtual void setVertexCoords(const Rect& rect, V3F_T2F_C4F_Quad* outQuad) override;
+    virtual void setVertexCoords(const Rect& rect, V3F_T2F_C4B_Quad* outQuad) override;
     Vec2 _spriteVertexAnchor = Vec2::ANCHOR_MIDDLE;
 };
 

core/2d/AutoPolygon.cpp

@@ -63,7 +63,7 @@ PolygonInfo::PolygonInfo(const PolygonInfo& other) : triangles(), _isVertsOwner(
     _filename         = other._filename;
     _isVertsOwner     = true;
     _rect             = other._rect;
-    triangles.verts   = new V3F_T2F_C4F[other.triangles.vertCount];
+    triangles.verts   = new V3F_T2F_C4B[other.triangles.vertCount];
     triangles.indices = new unsigned short[other.triangles.indexCount];
     AXASSERT(triangles.verts && triangles.indices, "not enough memory");
     triangles.vertCount  = other.triangles.vertCount;
@@ -80,7 +80,7 @@ PolygonInfo& PolygonInfo::operator=(const PolygonInfo& other)
         _filename         = other._filename;
         _isVertsOwner     = true;
         _rect             = other._rect;
-        triangles.verts   = new V3F_T2F_C4F[other.triangles.vertCount];
+        triangles.verts   = new V3F_T2F_C4B[other.triangles.vertCount];
         triangles.indices = new unsigned short[other.triangles.indexCount];
         AXASSERT(triangles.verts && triangles.indices, "not enough memory");
         triangles.vertCount  = other.triangles.vertCount;
@@ -97,17 +97,17 @@ PolygonInfo::~PolygonInfo()
     releaseVertsAndIndices();
 }
 
-void PolygonInfo::setQuad(V3F_T2F_C4F_Quad* quad)
+void PolygonInfo::setQuad(V3F_T2F_C4B_Quad* quad)
 {
     releaseVertsAndIndices();
     _isVertsOwner        = false;
     triangles.indices    = quadIndices9;
     triangles.vertCount  = 4;
     triangles.indexCount = 6;
-    triangles.verts      = (V3F_T2F_C4F*)quad;
+    triangles.verts      = (V3F_T2F_C4B*)quad;
 }
 
-void PolygonInfo::setQuads(V3F_T2F_C4F_Quad* quad, int numberOfQuads)
+void PolygonInfo::setQuads(V3F_T2F_C4B_Quad* quad, int numberOfQuads)
 {
     AXASSERT(numberOfQuads >= 1 && numberOfQuads <= 9, "Invalid number of Quads");
 
@@ -116,7 +116,7 @@ void PolygonInfo::setQuads(V3F_T2F_C4F_Quad* quad, int numberOfQuads)
     triangles.indices    = quadIndices9;
     triangles.vertCount  = 4 * numberOfQuads;
     triangles.indexCount = 6 * numberOfQuads;
-    triangles.verts      = (V3F_T2F_C4F*)quad;
+    triangles.verts      = (V3F_T2F_C4B*)quad;
 }
 
 void PolygonInfo::setTriangles(const TrianglesCommand::Triangles& other)
@@ -159,7 +159,7 @@ unsigned int PolygonInfo::getTrianglesCount() const
 float PolygonInfo::getArea() const
 {
     float area              = 0;
-    V3F_T2F_C4F* verts      = triangles.verts;
+    V3F_T2F_C4B* verts      = triangles.verts;
     unsigned short* indices = triangles.indices;
     for (unsigned int i = 0; i < triangles.indexCount; i += 3)
     {
@@ -610,7 +610,7 @@ TrianglesCommand::Triangles AutoPolygon::triangulate(const std::vector<Vec2>& po
     std::vector<p2t::Triangle*> tris = cdt.GetTriangles();
 
     axstd::pod_vector<unsigned short> indices(tris.size() * 3);
-    axstd::pod_vector<V3F_T2F_C4F> verts;
+    axstd::pod_vector<V3F_T2F_C4B> verts;
     verts.reserve(indices.size() / 2);  // we won't know the size of verts until we process all of the triangles!
 
     unsigned short idx = 0;
@@ -654,7 +654,7 @@ TrianglesCommand::Triangles AutoPolygon::triangulate(const std::vector<Vec2>& po
     return triangles;
 }
 
-void AutoPolygon::calculateUV(const Rect& rect, V3F_T2F_C4F* verts, ssize_t count)
+void AutoPolygon::calculateUV(const Rect& rect, V3F_T2F_C4B* verts, ssize_t count)
 {
     /*
      whole texture UV coordination

core/2d/AutoPolygon.h

@@ -80,17 +80,17 @@ class AX_DLL PolygonInfo
      * set the data to be a pointer to a quad
      * the member verts will not be released when this PolygonInfo destructs
      * as the verts memory are managed by other objects
-     * @param quad  a pointer to the V3F_T2F_C4F_Quad object
+     * @param quad  a pointer to the V3F_T2F_C4B_Quad object
      */
-    void setQuad(V3F_T2F_C4F_Quad* quad);
+    void setQuad(V3F_T2F_C4B_Quad* quad);
 
     /**
      * set the data to be a pointer to a number of Quads
      * the member verts will not be released when this PolygonInfo destructs
      * as the verts memory are managed by other objects
-     * @param quad  a pointer to the V3F_T2F_C4F_Quad quads
+     * @param quad  a pointer to the V3F_T2F_C4B_Quad quads
      */
-    void setQuads(V3F_T2F_C4F_Quad* quads, int numberOfQuads);
+    void setQuads(V3F_T2F_C4B_Quad* quads, int numberOfQuads);
 
     /**
      * set the data to be a pointer to a triangles
@@ -225,7 +225,7 @@ class AX_DLL AutoPolygon
      * ap.calculateUV(rect, myPolygons.verts, 20);
      * @endcode
      */
-    void calculateUV(const Rect& rect, V3F_T2F_C4F* verts, ssize_t count);
+    void calculateUV(const Rect& rect, V3F_T2F_C4B* verts, ssize_t count);
 
     /**
      * a helper function, packing trace, reduce, expand, triangulate and calculate uv in one function

core/2d/CameraBackgroundBrush.h

@@ -179,7 +179,7 @@ class AX_DLL CameraBackgroundDepthBrush : public CameraBackgroundBrush
     CustomCommand _customCommand;
 
     bool _clearColor;
-    std::vector<V3F_T2F_C4F> _vertices;
+    std::vector<V3F_T2F_C4B> _vertices;
     struct
     {
         uint32_t stencilWriteMask            = 0;

core/2d/FastTMXLayer.cpp

@@ -275,7 +275,7 @@ void FastTMXLayer::updateTiles(const Rect& culledRect)
 
 void FastTMXLayer::updateVertexBuffer()
 {
-    unsigned int vertexBufferSize = (unsigned int)(sizeof(V3F_T2F_C4F) * _totalQuads.size() * 4);
+    unsigned int vertexBufferSize = (unsigned int)(sizeof(V3F_T2F_C4B) * _totalQuads.size() * 4);
     if (!_vertexBuffer)
     {
         _vertexBuffer = backend::DriverBase::getInstance()->newBuffer(vertexBufferSize, backend::BufferType::VERTEX, backend::BufferUsage::STATIC);
@@ -503,7 +503,7 @@ void FastTMXLayer::updateTotalQuads()
         _tileToQuadIndex.resize(int(_layerSize.width * _layerSize.height), -1);
         _indicesVertexZOffsets.clear();
 
-        auto color = Color::WHITE;
+        auto color = Color4B::WHITE;
         color.a    = getDisplayedOpacity();
 
         if (_texture->hasPremultipliedAlpha())

core/2d/FastTMXLayer.h

@@ -371,7 +371,7 @@ class AX_DLL FastTMXLayer : public Node
     float _cameraZoomDirty;
 
     std::vector<int> _tileToQuadIndex;
-    std::vector<V3F_T2F_C4F_Quad> _totalQuads;
+    std::vector<V3F_T2F_C4B_Quad> _totalQuads;
 #ifdef AX_FAST_TILEMAP_32_BIT_INDICES
     std::vector<unsigned int> _indices;
 #else

core/2d/Label.cpp

@@ -1841,15 +1841,15 @@ void Label::updateBuffer(TextureAtlas* textureAtlas, CustomCommand& customComman
 {
     if (textureAtlas->getTotalQuads() > customCommand.getVertexCapacity())
     {
-        customCommand.createVertexBuffer((unsigned int)sizeof(V3F_T2F_C4F_Quad),
+        customCommand.createVertexBuffer((unsigned int)sizeof(V3F_T2F_C4B_Quad),
                                          (unsigned int)textureAtlas->getTotalQuads(),
                                          CustomCommand::BufferUsage::DYNAMIC);
         customCommand.createIndexBuffer(CustomCommand::IndexFormat::U_SHORT,
                                         (unsigned int)textureAtlas->getTotalQuads() * 6,
                                         CustomCommand::BufferUsage::DYNAMIC);
     }
     customCommand.updateVertexBuffer(textureAtlas->getQuads(),
-                                     (unsigned int)(textureAtlas->getTotalQuads() * sizeof(V3F_T2F_C4F_Quad)));
+                                     (unsigned int)(textureAtlas->getTotalQuads() * sizeof(V3F_T2F_C4B_Quad)));
     customCommand.updateIndexBuffer(textureAtlas->getIndices(),
                                     (unsigned int)(textureAtlas->getTotalQuads() * 6 * sizeof(unsigned short)));
     customCommand.setIndexDrawInfo(0, (unsigned int)(textureAtlas->getTotalQuads() * 6));
@@ -1961,7 +1961,7 @@ void Label::updateEffectUniforms(BatchCommand& batch,
             _displayedOpacity  = _shadowColor.a * (oldOPacity / 255.0f) * 255;
             setColor(Color3B(_shadowColor));
             batch.shadowCommand.updateVertexBuffer(
-                textureAtlas->getQuads(), (unsigned int)(textureAtlas->getTotalQuads() * sizeof(V3F_T2F_C4F_Quad)));
+                textureAtlas->getQuads(), (unsigned int)(textureAtlas->getTotalQuads() * sizeof(V3F_T2F_C4B_Quad)));
             batch.shadowCommand.init(_globalZOrder);
             renderer->addCommand(&batch.shadowCommand);
 

core/2d/LabelAtlas.cpp

@@ -161,7 +161,7 @@ void LabelAtlas::updateAtlasValues()
     }
 
     AXASSERT(n <= _textureAtlas->getCapacity(), "updateAtlasValues: Invalid String length");
-    V3F_T2F_C4F_Quad* quads = _textureAtlas->getQuads();
+    auto quads = _textureAtlas->getQuads();
     for (ssize_t i = 0; i < n; i++)
     {
 
@@ -203,7 +203,7 @@ void LabelAtlas::updateAtlasValues()
         quads[i].tr.position.x = (float)(i * _itemWidth + _itemWidth);
         quads[i].tr.position.y = (float)(_itemHeight);
         quads[i].tr.position.z = 0.0f;
-        Color c(_displayedColor, _displayedOpacity / 255.0f);
+        Color4B c(_displayedColor, _displayedOpacity);
         quads[i].tl.color = c;
         quads[i].tr.color = c;
         quads[i].bl.color = c;

core/2d/ParticleBatchNode.cpp

@@ -474,7 +474,7 @@ void ParticleBatchNode::increaseAtlasCapacityTo(ssize_t quantity)
 // sets a 0'd quad into the quads array
 void ParticleBatchNode::disableParticle(int particleIndex)
 {
-    V3F_T2F_C4F_Quad* quad = &((_textureAtlas->getQuads())[particleIndex]);
+    auto quad = &((_textureAtlas->getQuads())[particleIndex]);
     quad->br.position.x = quad->br.position.y = quad->tr.position.x = quad->tr.position.y = quad->tl.position.x =
         quad->tl.position.y = quad->bl.position.x = quad->bl.position.y = 0.0f;
 }