2012-11-09 12:08:18 +08:00
|
|
|
/* Copyright (c) 2012 Scott Lembcke and Howling Moon Software
|
|
|
|
* Copyright (c) 2012 cocos2d-x.org
|
2018-01-29 16:25:32 +08:00
|
|
|
* Copyright (c) 2013-2016 Chukong Technologies Inc.
|
|
|
|
* Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
|
2012-11-09 12:08:18 +08:00
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
|
|
* of this software and associated documentation files (the "Software"), to deal
|
|
|
|
* in the Software without restriction, including without limitation the rights
|
|
|
|
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
|
|
* copies of the Software, and to permit persons to whom the Software is
|
|
|
|
* furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice shall be included in
|
|
|
|
* all copies or substantial portions of the Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
|
|
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
|
|
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
|
|
* SOFTWARE.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Code copied & pasted from SpacePatrol game https://github.com/slembcke/SpacePatrol
|
|
|
|
*
|
|
|
|
* Renamed and added some changes for cocos2d
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
|
|
|
#ifndef __CCDRAWNODES_CCDRAW_NODE_H__
|
|
|
|
#define __CCDRAWNODES_CCDRAW_NODE_H__
|
|
|
|
|
2014-04-27 01:11:22 +08:00
|
|
|
#include "2d/CCNode.h"
|
2014-04-30 08:37:36 +08:00
|
|
|
#include "base/ccTypes.h"
|
|
|
|
#include "renderer/CCCustomCommand.h"
|
2014-09-11 15:39:56 +08:00
|
|
|
#include "math/CCMath.h"
|
2012-11-09 12:08:18 +08:00
|
|
|
|
|
|
|
NS_CC_BEGIN
|
|
|
|
|
2015-11-25 23:26:57 +08:00
|
|
|
static const int DEFAULT_LINE_WIDTH = 2;
|
|
|
|
|
2014-09-11 15:39:56 +08:00
|
|
|
class PointArray;
|
2015-03-21 17:06:26 +08:00
|
|
|
/**
|
|
|
|
* @addtogroup _2d
|
|
|
|
* @{
|
|
|
|
*/
|
2014-09-11 15:39:56 +08:00
|
|
|
|
2015-03-21 17:06:26 +08:00
|
|
|
/** @class DrawNode
|
|
|
|
* @brief Node that draws dots, segments and polygons.
|
|
|
|
* Faster than the "drawing primitives" since they draws everything in one single batch.
|
|
|
|
* @since v2.1
|
|
|
|
*/
|
2013-06-20 14:13:12 +08:00
|
|
|
class CC_DLL DrawNode : public Node
|
2012-11-09 12:08:18 +08:00
|
|
|
{
|
|
|
|
public:
|
2015-03-21 17:06:26 +08:00
|
|
|
/** creates and initialize a DrawNode node.
|
|
|
|
*
|
|
|
|
* @return Return an autorelease object.
|
|
|
|
*/
|
2019-06-05 17:58:33 +08:00
|
|
|
static DrawNode* create(float defaultLineWidth = DEFAULT_LINE_WIDTH);
|
2015-03-21 17:06:26 +08:00
|
|
|
|
|
|
|
/** Draw a point.
|
|
|
|
*
|
|
|
|
* @param point A Vec2 used to point.
|
|
|
|
* @param pointSize The point size.
|
|
|
|
* @param color The point color.
|
2015-03-28 14:28:16 +08:00
|
|
|
* @js NA
|
2015-03-21 17:06:26 +08:00
|
|
|
*/
|
2014-09-11 15:39:56 +08:00
|
|
|
void drawPoint(const Vec2& point, const float pointSize, const Color4F &color);
|
|
|
|
|
2015-03-21 17:06:26 +08:00
|
|
|
/** Draw a group point.
|
|
|
|
*
|
|
|
|
* @param position A Vec2 pointer.
|
|
|
|
* @param numberOfPoints The number of points.
|
|
|
|
* @param color The point color.
|
2015-03-28 14:28:16 +08:00
|
|
|
* @js NA
|
2015-03-21 17:06:26 +08:00
|
|
|
*/
|
2014-09-11 15:39:56 +08:00
|
|
|
void drawPoints(const Vec2 *position, unsigned int numberOfPoints, const Color4F &color);
|
2015-03-21 17:06:26 +08:00
|
|
|
|
|
|
|
/** Draw a group point.
|
|
|
|
*
|
|
|
|
* @param position A Vec2 pointer.
|
|
|
|
* @param numberOfPoints The number of points.
|
|
|
|
* @param pointSize The point size.
|
|
|
|
* @param color The point color.
|
2015-03-28 14:28:16 +08:00
|
|
|
* @js NA
|
2015-03-21 17:06:26 +08:00
|
|
|
*/
|
2015-01-07 11:02:31 +08:00
|
|
|
void drawPoints(const Vec2 *position, unsigned int numberOfPoints, const float pointSize, const Color4F &color);
|
2014-09-11 15:39:56 +08:00
|
|
|
|
2015-03-21 17:06:26 +08:00
|
|
|
/** Draw an line from origin to destination with color.
|
|
|
|
*
|
|
|
|
* @param origin The line origin.
|
|
|
|
* @param destination The line destination.
|
|
|
|
* @param color The line color.
|
2015-03-28 14:28:16 +08:00
|
|
|
* @js NA
|
2015-03-21 17:06:26 +08:00
|
|
|
*/
|
2014-09-11 15:39:56 +08:00
|
|
|
void drawLine(const Vec2 &origin, const Vec2 &destination, const Color4F &color);
|
|
|
|
|
2015-03-21 17:06:26 +08:00
|
|
|
/** Draws a rectangle given the origin and destination point measured in points.
|
|
|
|
* The origin and the destination can not have the same x and y coordinate.
|
|
|
|
*
|
|
|
|
* @param origin The rectangle origin.
|
|
|
|
* @param destination The rectangle destination.
|
|
|
|
* @param color The rectangle color.
|
|
|
|
*/
|
2014-09-11 15:39:56 +08:00
|
|
|
void drawRect(const Vec2 &origin, const Vec2 &destination, const Color4F &color);
|
|
|
|
|
2015-03-21 17:06:26 +08:00
|
|
|
/** Draws a polygon given a pointer to point coordinates and the number of vertices measured in points.
|
|
|
|
* The polygon can be closed or open.
|
|
|
|
*
|
|
|
|
* @param poli A pointer to point coordinates.
|
|
|
|
* @param numberOfPoints The number of vertices measured in points.
|
|
|
|
* @param closePolygon The polygon can be closed or open.
|
|
|
|
* @param color The polygon color.
|
|
|
|
*/
|
2014-09-11 15:39:56 +08:00
|
|
|
void drawPoly(const Vec2 *poli, unsigned int numberOfPoints, bool closePolygon, const Color4F &color);
|
|
|
|
|
2015-03-21 17:06:26 +08:00
|
|
|
/** Draws a circle given the center, radius and number of segments.
|
|
|
|
*
|
|
|
|
* @param center The circle center point.
|
|
|
|
* @param radius The circle rotate of radius.
|
2015-05-21 08:22:59 +08:00
|
|
|
* @param angle The circle angle.
|
2015-03-21 17:06:26 +08:00
|
|
|
* @param segments The number of segments.
|
|
|
|
* @param drawLineToCenter Whether or not draw the line from the origin to center.
|
|
|
|
* @param scaleX The scale value in x.
|
|
|
|
* @param scaleY The scale value in y.
|
|
|
|
* @param color Set the circle color.
|
|
|
|
*/
|
2014-09-11 15:39:56 +08:00
|
|
|
void drawCircle( const Vec2& center, float radius, float angle, unsigned int segments, bool drawLineToCenter, float scaleX, float scaleY, const Color4F &color);
|
|
|
|
|
2015-03-21 17:06:26 +08:00
|
|
|
/** Draws a circle given the center, radius and number of segments.
|
|
|
|
*
|
|
|
|
* @param center The circle center point.
|
|
|
|
* @param radius The circle rotate of radius.
|
2015-05-21 08:22:59 +08:00
|
|
|
* @param angle The circle angle.
|
2015-03-21 17:06:26 +08:00
|
|
|
* @param segments The number of segments.
|
|
|
|
* @param drawLineToCenter Whether or not draw the line from the origin to center.
|
|
|
|
* @param color Set the circle color.
|
|
|
|
*/
|
2014-09-11 15:39:56 +08:00
|
|
|
void drawCircle(const Vec2 ¢er, float radius, float angle, unsigned int segments, bool drawLineToCenter, const Color4F &color);
|
|
|
|
|
2015-03-21 17:06:26 +08:00
|
|
|
/** Draws a quad bezier path.
|
|
|
|
*
|
|
|
|
* @param origin The origin of the bezier path.
|
|
|
|
* @param control The control of the bezier path.
|
|
|
|
* @param destination The destination of the bezier path.
|
2015-11-04 16:09:58 +08:00
|
|
|
* @param segments The number of segments.
|
2015-03-21 17:06:26 +08:00
|
|
|
* @param color Set the quad bezier color.
|
|
|
|
*/
|
2014-09-11 15:39:56 +08:00
|
|
|
void drawQuadBezier(const Vec2 &origin, const Vec2 &control, const Vec2 &destination, unsigned int segments, const Color4F &color);
|
2014-09-12 07:33:34 +08:00
|
|
|
|
2015-03-21 17:06:26 +08:00
|
|
|
/** Draw a cubic bezier curve with color and number of segments
|
|
|
|
*
|
|
|
|
* @param origin The origin of the bezier path.
|
|
|
|
* @param control1 The first control of the bezier path.
|
|
|
|
* @param control2 The second control of the bezier path.
|
|
|
|
* @param destination The destination of the bezier path.
|
2015-11-04 16:09:58 +08:00
|
|
|
* @param segments The number of segments.
|
2015-03-21 17:06:26 +08:00
|
|
|
* @param color Set the cubic bezier color.
|
|
|
|
*/
|
2014-09-11 15:39:56 +08:00
|
|
|
void drawCubicBezier(const Vec2 &origin, const Vec2 &control1, const Vec2 &control2, const Vec2 &destination, unsigned int segments, const Color4F &color);
|
|
|
|
|
2015-03-21 17:06:26 +08:00
|
|
|
/** Draws a Cardinal Spline path.
|
|
|
|
*
|
|
|
|
* @param config A array point.
|
|
|
|
* @param tension The tension of the spline.
|
2015-11-04 16:09:58 +08:00
|
|
|
* @param segments The number of segments.
|
2015-03-21 17:06:26 +08:00
|
|
|
* @param color Set the Spline color.
|
|
|
|
*/
|
2014-09-11 15:39:56 +08:00
|
|
|
void drawCardinalSpline(PointArray *config, float tension, unsigned int segments, const Color4F &color);
|
|
|
|
|
2015-03-21 17:06:26 +08:00
|
|
|
/** Draws a Catmull Rom path.
|
|
|
|
*
|
|
|
|
* @param points A point array of control point.
|
2015-11-04 16:09:58 +08:00
|
|
|
* @param segments The number of segments.
|
2015-03-21 17:06:26 +08:00
|
|
|
* @param color The Catmull Rom color.
|
|
|
|
*/
|
2014-09-11 15:39:56 +08:00
|
|
|
void drawCatmullRom(PointArray *points, unsigned int segments, const Color4F &color);
|
|
|
|
|
2015-03-21 17:06:26 +08:00
|
|
|
/** draw a dot at a position, with a given radius and color.
|
|
|
|
*
|
|
|
|
* @param pos The dot center.
|
|
|
|
* @param radius The dot radius.
|
|
|
|
* @param color The dot color.
|
|
|
|
*/
|
2014-05-15 01:07:09 +08:00
|
|
|
void drawDot(const Vec2 &pos, float radius, const Color4F &color);
|
2012-11-09 12:08:18 +08:00
|
|
|
|
2015-03-21 17:06:26 +08:00
|
|
|
/** Draws a rectangle with 4 points.
|
|
|
|
*
|
|
|
|
* @param p1 The rectangle vertex point.
|
|
|
|
* @param p2 The rectangle vertex point.
|
|
|
|
* @param p3 The rectangle vertex point.
|
|
|
|
* @param p4 The rectangle vertex point.
|
|
|
|
* @param color The rectangle color.
|
|
|
|
*/
|
2015-01-07 11:44:16 +08:00
|
|
|
void drawRect(const Vec2 &p1, const Vec2 &p2, const Vec2 &p3, const Vec2& p4, const Color4F &color);
|
2014-09-11 15:39:56 +08:00
|
|
|
|
2015-03-21 17:06:26 +08:00
|
|
|
/** Draws a solid rectangle given the origin and destination point measured in points.
|
|
|
|
* The origin and the destination can not have the same x and y coordinate.
|
|
|
|
*
|
|
|
|
* @param origin The rectangle origin.
|
|
|
|
* @param destination The rectangle destination.
|
|
|
|
* @param color The rectangle color.
|
2015-03-28 14:28:16 +08:00
|
|
|
* @js NA
|
2015-03-21 17:06:26 +08:00
|
|
|
*/
|
2014-09-11 15:39:56 +08:00
|
|
|
void drawSolidRect(const Vec2 &origin, const Vec2 &destination, const Color4F &color);
|
|
|
|
|
2015-03-21 17:06:26 +08:00
|
|
|
/** Draws a solid polygon given a pointer to CGPoint coordinates, the number of vertices measured in points, and a color.
|
|
|
|
*
|
|
|
|
* @param poli A solid polygon given a pointer to CGPoint coordinates.
|
|
|
|
* @param numberOfPoints The number of vertices measured in points.
|
|
|
|
* @param color The solid polygon color.
|
2015-03-28 14:28:16 +08:00
|
|
|
* @js NA
|
2015-03-21 17:06:26 +08:00
|
|
|
*/
|
2014-09-11 15:39:56 +08:00
|
|
|
void drawSolidPoly(const Vec2 *poli, unsigned int numberOfPoints, const Color4F &color);
|
|
|
|
|
2015-03-21 17:06:26 +08:00
|
|
|
/** Draws a solid circle given the center, radius and number of segments.
|
|
|
|
* @param center The circle center point.
|
|
|
|
* @param radius The circle rotate of radius.
|
2015-05-21 08:22:59 +08:00
|
|
|
* @param angle The circle angle.
|
2015-03-21 17:06:26 +08:00
|
|
|
* @param segments The number of segments.
|
|
|
|
* @param scaleX The scale value in x.
|
|
|
|
* @param scaleY The scale value in y.
|
|
|
|
* @param color The solid circle color.
|
2015-03-28 14:28:16 +08:00
|
|
|
* @js NA
|
2015-03-21 17:06:26 +08:00
|
|
|
*/
|
2014-09-11 15:39:56 +08:00
|
|
|
void drawSolidCircle(const Vec2& center, float radius, float angle, unsigned int segments, float scaleX, float scaleY, const Color4F &color);
|
|
|
|
|
2015-03-21 17:06:26 +08:00
|
|
|
/** Draws a solid circle given the center, radius and number of segments.
|
|
|
|
* @param center The circle center point.
|
|
|
|
* @param radius The circle rotate of radius.
|
2015-05-21 08:22:59 +08:00
|
|
|
* @param angle The circle angle.
|
2015-03-21 17:06:26 +08:00
|
|
|
* @param segments The number of segments.
|
|
|
|
* @param color The solid circle color.
|
2015-03-28 14:28:16 +08:00
|
|
|
* @js NA
|
2015-03-21 17:06:26 +08:00
|
|
|
*/
|
2014-09-11 15:39:56 +08:00
|
|
|
void drawSolidCircle(const Vec2& center, float radius, float angle, unsigned int segments, const Color4F& color);
|
|
|
|
|
2015-03-21 17:06:26 +08:00
|
|
|
/** draw a segment with a radius and color.
|
|
|
|
*
|
|
|
|
* @param from The segment origin.
|
|
|
|
* @param to The segment destination.
|
|
|
|
* @param radius The segment radius.
|
|
|
|
* @param color The segment color.
|
|
|
|
*/
|
2014-05-15 01:07:09 +08:00
|
|
|
void drawSegment(const Vec2 &from, const Vec2 &to, float radius, const Color4F &color);
|
2012-11-09 12:08:18 +08:00
|
|
|
|
2013-09-13 11:41:20 +08:00
|
|
|
/** draw a polygon with a fill color and line color
|
|
|
|
* @code
|
|
|
|
* When this function bound into js or lua,the parameter will be changed
|
|
|
|
* In js: var drawPolygon(var Arrayofpoints, var fillColor, var width, var borderColor)
|
|
|
|
* In lua:local drawPolygon(local pointTable,local tableCount,local fillColor,local width,local borderColor)
|
|
|
|
* @endcode
|
2015-03-21 17:06:26 +08:00
|
|
|
* @param verts A pointer to point coordinates.
|
|
|
|
* @param count The number of verts measured in points.
|
|
|
|
* @param fillColor The color will fill in polygon.
|
|
|
|
* @param borderWidth The border of line width.
|
|
|
|
* @param borderColor The border of line color.
|
2015-03-28 14:28:16 +08:00
|
|
|
* @js NA
|
2013-09-13 11:41:20 +08:00
|
|
|
*/
|
2014-09-11 15:39:56 +08:00
|
|
|
void drawPolygon(const Vec2 *verts, int count, const Color4F &fillColor, float borderWidth, const Color4F &borderColor);
|
2013-10-14 11:41:55 +08:00
|
|
|
|
2015-03-21 17:06:26 +08:00
|
|
|
/** draw a triangle with color.
|
|
|
|
*
|
|
|
|
* @param p1 The triangle vertex point.
|
|
|
|
* @param p2 The triangle vertex point.
|
|
|
|
* @param p3 The triangle vertex point.
|
|
|
|
* @param color The triangle color.
|
2015-03-28 14:28:16 +08:00
|
|
|
* @js NA
|
2015-03-21 17:06:26 +08:00
|
|
|
*/
|
2014-05-15 01:07:09 +08:00
|
|
|
void drawTriangle(const Vec2 &p1, const Vec2 &p2, const Vec2 &p3, const Color4F &color);
|
2013-10-14 11:41:55 +08:00
|
|
|
|
2012-11-09 12:08:18 +08:00
|
|
|
/** Clear the geometry in the node's buffer. */
|
|
|
|
void clear();
|
2015-03-21 17:06:26 +08:00
|
|
|
/** Get the color mixed mode.
|
2013-09-13 11:41:20 +08:00
|
|
|
* @lua NA
|
|
|
|
*/
|
2013-07-05 16:49:22 +08:00
|
|
|
const BlendFunc& getBlendFunc() const;
|
2015-03-21 17:06:26 +08:00
|
|
|
/** Set the color mixed mode.
|
2013-09-13 11:41:20 +08:00
|
|
|
* @code
|
|
|
|
* When this function bound into js or lua,the parameter will be changed
|
|
|
|
* In js: var setBlendFunc(var src, var dst)
|
|
|
|
* @endcode
|
|
|
|
* @lua NA
|
|
|
|
*/
|
2013-07-05 16:49:22 +08:00
|
|
|
void setBlendFunc(const BlendFunc &blendFunc);
|
2013-12-19 03:43:45 +08:00
|
|
|
|
2013-07-18 07:56:19 +08:00
|
|
|
// Overrides
|
2014-05-31 07:42:05 +08:00
|
|
|
virtual void draw(Renderer *renderer, const Mat4 &transform, uint32_t flags) override;
|
2018-09-20 15:18:03 +08:00
|
|
|
|
|
|
|
virtual void visit(Renderer* renderer, const Mat4 &parentTransform, uint32_t parentFlags) override;
|
2014-03-24 17:44:01 +08:00
|
|
|
|
2019-06-05 17:58:33 +08:00
|
|
|
void setLineWidth(float lineWidth);
|
2015-11-12 09:49:49 +08:00
|
|
|
|
2015-11-12 18:23:56 +08:00
|
|
|
// Get CocosStudio guide lines width.
|
2019-06-05 17:58:33 +08:00
|
|
|
float getLineWidth();
|
2015-11-12 09:49:49 +08:00
|
|
|
|
2018-09-20 15:18:03 +08:00
|
|
|
/**
|
|
|
|
* When isolated is set, the position of the node is no longer affected by parent nodes.
|
|
|
|
* Which means it will be drawn just like a root node.
|
|
|
|
*/
|
|
|
|
void setIsolated(bool isolated) { _isolated = isolated; }
|
|
|
|
|
|
|
|
bool isIsolated() const { return _isolated; }
|
|
|
|
|
2014-03-24 17:44:01 +08:00
|
|
|
CC_CONSTRUCTOR_ACCESS:
|
2019-06-05 17:58:33 +08:00
|
|
|
DrawNode(float lineWidth = DEFAULT_LINE_WIDTH);
|
2013-11-15 08:21:49 +08:00
|
|
|
virtual ~DrawNode();
|
2015-03-15 02:33:15 +08:00
|
|
|
virtual bool init() override;
|
2013-11-15 08:21:49 +08:00
|
|
|
|
2014-03-24 17:44:01 +08:00
|
|
|
protected:
|
2013-12-05 17:19:01 +08:00
|
|
|
void ensureCapacity(int count);
|
2014-09-11 15:39:56 +08:00
|
|
|
void ensureCapacityGLPoint(int count);
|
|
|
|
void ensureCapacityGLLine(int count);
|
2013-07-18 07:56:19 +08:00
|
|
|
|
metal support for cocos2d-x (#19305)
* remove deprecated files
* remove some deprecated codes
* remove more deprecated codes
* remove ui deprecated codes
* remove more deprecated codes
* remove deprecated codes in ccmenuitem
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes
* remove more deprecated codes
* remove more deprecated codes
* remove vr related codes and ignore some modules
* remove allocator
* remove some config
* 【Feature】add back-end project file
* [Feature] add back-end file
* add pipeline descriptor and shader cache
* [Feature] support sprite for backend
* [Feature] remove unneeded code
* [Feature] according to es2.0 spec, you must use clamp-to-edge as texture wrap mode, and no mipmapping for non-power-of-two texture
* [Feature] set texture wrap mode to clamp-to-edge, and no mipmapping for non-power-of-two texture
* [Feature] remove macro define to .cpp file
* [Feature] add log info
* [Feature] add PipelineDescriptor for TriangleCommand
* [Feature] add PipelineDescriptor object as member of TriangleCommand
* [Feature] add getPipelineDescriptor method
* add renderbackend
* complete pipeline descriptor
* [Feature] add viewport in RenderCommand
* set viewport when rendrering
* [Feature] occur error when using RendererBackend, to be fixed.
* a workaround to fix black screen on macOS 10.14 (#19090)
* add rendererbackend init function
* fix typo
* [Feature] modify testFile
* [BugFix] modify shader path
* [Feature] set default viewport
* fix projection
* [Feature] modify log info
* [BugFix] change viewport data type to int
* [BugFix] add BindGroup to PipelienDescriptor
* [BugFix] change a_position to vec3 in sprite.vert
* [BugFix] set vertexLayout according to V3F_C4B_T2F structure
* [Feature] revert a_position to vec4
* [Feature] renderer should not use gl codes directly
* [Feature] it's better not use default value parameter
* fix depth test setting
* rendererbackend -> renderer
* clear color and depth at begin
* add metal backend
* metal support normalized attribute
* simplify codes
* update external
* add render pass desctriptor in pipeline descriptor
* fix warnings
* fix crash and memeory leak
* refactor Texture2D
* put pipeline descriptor into render command
* simplify codes
* [Feature] update Sprite
* fix crash when closing app
* [Feature] update SpriteBatchNode and TextureAtlas
* support render texture(not finish)
* [Feature] remove unused code
* make tests work on mac
* fix download-deps path error
* make tests work on iOS
* [Feature] support ttf under normal label effect
* refactor triangle command processing
* let renderer handle more common commands
* refactor backend
* make render texture work
* [Feature] refactor backend for GL
* [Feature]Renaming to make it easy to understand
* [Feature] change warp mode to CLAMP_TO_EDGE
* fix ghost
* simplify visit render queue logic
* support progress timer without rial mode
* support partcile system
* Feature/update label (#149)
* [BugFix] fix compile error
* [Feature] support outline effect in ios
* [Feature] add shader file
* [BugFix] fix begin and end RenderPass
* [Feature] update CustomCommand
* [Feature] revert project.pbxproj
* [Feature] simplify codes
* [BugFix] pack AI88 to RGBA8888 only when outline enable
* [Feature] support shadow effect in Label
* [Feature] support BMFont
* [Feature] support glow effect
* [Feature] simplify shader files
* LabelAtlas work
* handle blend function correctly
* support tile map
* don't share buffer in metal
* alloc buffer size as needed
* support more tilemap
* Merge branch 'minggo/metal-support' into feature/updateLabel
* minggo/metal-support:
support tile map
handle blend function correctly
LabelAtlas work
Feature/update label (#149)
support partcile system
# Conflicts:
# cocos/2d/CCLabel.cpp
# cocos/2d/CCSprite.cpp
# cocos/2d/CCSpriteBatchNode.cpp
# cocos/renderer/CCQuadCommand.cpp
# cocos/renderer/CCQuadCommand.h
* render texture work without saving file
* use global viewport
* grid3d works
* remove grabber
* tiled3d works
* [BugFix] fix label bug
* [Feature] add updateSubData for buffer
* [Feature] remove setVertexCount
* support depth test
* add callback command
* [Feature] add UITest
* [Feature] update UITest
* [Feature] remove unneeded codes
* fix custom command issue
* fix layer color blend issue
* [BugFix] fix iOS compile error
* [Feature] remove unneeded codes
* [Feature] fix updateVertexBuffer
* layerradial works
* add draw test back
* fix batch issue
* fix compiling error
* [BugFix] support ETC1
* [BugFix] get the correct pipelineDescriptor
* [BugFix] skip draw when backendTexture nullptr
* clipping node support
* [Feature] add shader files
* fix stencil issue in metal
* [Feature] update UILayoutTest
* [BugFix] skip drawing when vertexCount is zero
* refactor renderer
* add set global z order for stencil manager commands
* fix warnings caused by type
* remove viewport in render command
* [Feature] fix warnings caused by type
* [BugFix] clear vertexCount and indexCount for CustomComand when needed
* [Feature] update clear for CustomCommand
* ios use metal
* fix viewport issue
* fix LayerColorGradient crash
* [cmake] transport to android and windows (#160)
* save point 1
* compile on windows
* run on android
* revert useless change
* android set CC_ENABLE_CACHE_TEXTURE_DATA to 1
* add initGlew
* fix android crash
* add TODO new-renderer
* review update
* revert onGLFWWindowPosCallback
* fix android compiling error
* Impl progress radial (#162)
* progresstimer add radial impl
* default drawType to element
* dec invoke times of createVertexBuffer (#163)
* support depth/stencil format for gl backend
* simplify progress timer codes
* support motionstreak, effect is wrong
* fix motionstreak issue
* [Feature] update Scissor Test (#161)
* [Feature] update Scissor Test
* [Feature] update ScissorTest
* [Feature] rename function
* [Feature] get constant reference if needed
* [Feature] show render status (#164)
* improve performance
* fix depth state
* fill error that triangle vertex/index number bigger than buffer
* fix compiline error in release mode
* fix buffer conflict between CPU and GPU on iOS/macOS
* Renderer refactor (#165)
* use one vertes/index buffer with opengl
* fix error on windows
* custom command support index format config
* CCLayer: compact vertex data structure
* update comment
* fix doc
* support fast tilemap
* pass index format instead
* fix some wrong effect
* fix render texture error
* fix texture per-element size
* fix texture format error
* BlendFunc type refactor, GLenum -> backend::BlendFactor (#167)
* BlendFunc use backend::BlendFactor as inner field
* update comments
* use int to replace GLenum
* update xcode project fiel
* rename to GLBlendConst
* add ccConstants.h
* update xcode project file
* update copyright
* remove primitive command
* remove CCPrimitive.cpp/.h
* remove deprecated files
* remove unneeded files
* remove multiple view support
* remove multiple view support
* remove the usage of frame buffer in camera
* director don't use frame buffer
* remove FrameBuffer
* remove BatchCommand
* add some api reference
* add physics2d back
* fix crash when close app on mac
* improve render texture
* fix rendertexture issue
* fix rendertexture issue
* simplify codes
* CMake support for mac & ios (#169)
* update cmake
* fix compile error
* update 3rd libs version
* remove CCThread.h/.cpp
* remove ccthread
* use audio engine to implement simple audio engine
* remove unneeded codes
* remove deprecated codes
* remove winrt macro
* remove CC_USE_WIC
* set partcile blend function in more elegant way
* remove unneeded codes
* remove unneeded codes
* cmake works on windows
* update project setting
* improve performance
* GLFloat -> float
* sync v3 cmake improvements into metal-support (#172)
* pick: modern cmake, compile definitions improvement (#19139)
* modern cmake, use target_compile_definitions partly
* simplify macro define, remove USE_*
* modern cmake, macro define
* add physics 2d macro define into ccConfig.h
* remove USE_CHIPMUNK macro in build.gradle
* remove CocosSelectModule.cmake
* shrink useless define
* simplify compile options config, re-add if necessary
* update external for tmp CI test
* un-quote target_compile_options value
* add "-g" parameter only when debug mode
* keep single build type when generator Xcode & VS projecy
* update external for tmp CI tes
* add static_cast<char>(-1), fix -Wc++11-narrowing
* simplify win32 compile define
* not modify code, only improve compile options
# Conflicts:
# .gitignore
# cmake/Modules/CocosConfigDepend.cmake
# cocos/CMakeLists.txt
# external/config.json
# tests/cpp-tests/CMakeLists.txt
* modern cmake, improve cmake_compiler_flags (#19145)
* cmake_compiler_flags
* Fix typo
* Fix typo2
* Remove chanages from Android.mk
* correct lua template cmake build (#19149)
* don't add -Wno-deprecated into jsb target
* correct lua template cmake build
* fix win32 lua template compile error
* prevent cmake in-source-build friendly (#19151)
* pick: Copy resources to "Resources/" on win32 like in linux configuration
* add "/Z7" for cpp-tests on windows
* [cmake] fix iOS xcode property setting failed (#19208)
* fix iOS xcode property setting failed
* use search_depend_libs_recursive at dlls collect
* fix typo
* [cmake] add find_host_library into iOS toolchain file (#19230)
* pick: [lua android] use luajit & template cmake update (#19239)
* increase cmake stability , remove tests/CMakeLists.txt (#19261)
* cmake win32 Precompiled header (#19273)
* Precompiled header
* Fix
* Precompiled header for cocos
* Precompiled header jscocos2d
* Fix for COCOS2D_DEBUG is always 1 on Android (#19291)
Related #19289
* little build fix, tests cpp-tests works on mac
* sync v3 build related codes into metal-support (#173)
* strict initialization for std::array
* remove proj.win32 project configs
* modern cmake, cmake_cleanup_remove_unused_variables (#19146)
* Switch travis CI to xenial (#19207)
* Switch travis CI to xenial
* Remove language: android
* Set language: cpp
* Fix java problem
* Update sdkmanager
* Fix sdkmanger
* next sdkmanager fix
* Remove xenial from android
* revert to sdk-tools-{system}-3859397
* Remove linux cmake install
* Update before-install.sh
* Update .travis.yml
* Simplify install-deps-linux.sh, tested on Ubuntu 16.04 (#19212)
* Simplify install-deps-linux.sh
* Cleanup
* pick: install ninja
* update cocos2d-console submodule
* for metal-support alpha release, we only test cpp
* add HelloCpp into project(Cocos2d-x) for tmp test
* update extenal metal-support-4
* update uniform setting
* [Feature] update BindGroup
* [Feature] empty-test
* [Feature] cpp-test
* [Feature] fix GL compiler error
* [Feature] fix GL crash
* [Feature] empty-test
* [Feature] cpp-tests
* [feature] improve frameRate
* [feature] fix opengl compile error
* [feature] fix opengl compile error
* [BugFix] fix compute maxLocation error
* [Feature] update setting unifrom
* [Feature] fix namespace
* [Feature] remove unneeded code
* [Bugfix] fix project file
* [Feature] update review
* [texture2d] impl texture format support (#175)
* texture update
* update
* update texture
* commit
* compile on windows
* ddd
* rename
* rename methods
* no crash
* save gl
* save
* save
* rename
* move out pixel format convert functions
* metal crash
* update
* update android
* support gles compressed texture format
* support more compress format
* add more conversion methods
* ss
* save
* update conversion methods
* add PVRTC format support
* reformat
* add marco linux
* fix GL marcro
* pvrtc supported only by ios 8.0+
* remove unused cmake
* revert change
* refactor Texture2D::initWithData
* fix conversion log
* refactor Texture2D::initWithData
* remove some OpenGL constants for PVRTC
* add todo
* fix typo
* AutoTest works on mac/iOS by disable part cases, sync v3 bug fix (#174)
* review cpp-tests, and fix part issues on start auto test
* sync png format fix: Node:Particle3D abnormal texture effects #19204
* fix cpp-tests SpritePolygon crash, wrong png format (#19170)
* fix wrong png convert format from sRGB to Gray
* erase plist index if all frames was erased
* test_A8.png have I8 format, fix it
* [CCSpriteCache] allow re-add plist & add testcase (#19175)
* allow re-add plist & add testcase
* remove comments/rename method/update testcase
* fix isSpriteFramesWithFileLoaded & add testcase
* remove used variable
* remove unused variable
* fix double free issues when js/lua-tests exit on iOS (#19236)
* disable part cases, AutoTest works without crash on mac
* update cocos2dx files json, to test cocos new next
* fix spritecache plist parsing issue (#19269)
* [linux] Fix FileUtils::getContents with folder (#19157)
* fix FileUtils::getContents on linux/mac
* use stat.st_mode
* simplify
* [CCFileUtils] win32 getFileSize (#19176)
* win32 getFileSize
* fix stat
* [cpp test-Android]20:FileUtils/2 change title (#19197)
* sync #19200
* sync #19231
* [android lua] improve performance of lua loader (#19234)
* [lua] improve performance of lua loader
* remove cache fix
* Revert "fix spritecache plist parsing issue (#19269)"
This reverts commit f3a85ece4307a7b90816c34489d1ed2c8fd11baf.
* remove win32 project files ref in template.json
* add metal framework lnk ref into cpp template
* test on iOS, and disable part cases
* alBufferData instead of alBufferDataStatic for small audio file on Apple (#19227)
* changes AudioCache to use alBufferData instead of alBufferDataStatic
(also makes test 19 faster to trigger openal bugs faster)
The original problem: CrashIfClientProvidedBogusAudioBufferList
https://github.com/cocos2d/cocos2d-x/issues/18948
is not happening anymore, but there's still a not very frequent issue
that makes OpenAL crash with a call stack like this.
AudioCache::readDataTask > alBufferData > CleanUpDeadBufferList
It happes more frequently when the device is "cold", which means after
half an hour of not using the device (locked).
I could not find the actual source code for iOS OpenAL, so I used the
macOS versions:
https://opensource.apple.com/source/OpenAL/OpenAL-48.7/Source/OpenAL/oalImp.cpp.auto.html
They seem to use CAGuard.h to make sure the dead buffer list
has no threading issues. I'm worried because the CAGuard code I found
has macos and win32 define but no iOS, so I'm not sure. I guess the
iOS version is different and has the guard.
I could not find a place in the code that's unprotected by the locks
except the InitializeBufferMap() which should not be called more than
once from cocos, and there's a workaround in AudioEngine-impl for it.
I reduced the occurence of the CleanUpDeadBufferList crash by moving
the guard in ~AudioCache to cover the alDeleteBuffers call.
* remove hack method "setTimeout" on audio
* AutoTest works on iOS
* support set ios deployment target for root project
* enable all texture2d cases, since Jiang have fixed
* add CCTextureUtils to xcode project file (#176)
* add leak cases for SpriteFrameCache (#177)
* re-add SpriteFrameCache cases
* update template file json
* Update SpriteFrameCacheTest.cpp
* fix compiling error
2019-01-18 15:08:25 +08:00
|
|
|
void updateShader();
|
|
|
|
void setVertexLayout(CustomCommand& cmd);
|
|
|
|
void updateBlendState(CustomCommand& cmd);
|
|
|
|
void updateUniforms(const Mat4 &transform, CustomCommand& cmd);
|
2013-07-18 07:56:19 +08:00
|
|
|
|
2018-09-20 15:18:03 +08:00
|
|
|
int _bufferCapacity = 0;
|
2019-06-05 17:58:33 +08:00
|
|
|
int _bufferCount = 0;
|
2018-09-20 15:18:03 +08:00
|
|
|
V2F_C4B_T2F *_buffer = nullptr;
|
2014-09-11 15:39:56 +08:00
|
|
|
|
2018-09-20 15:18:03 +08:00
|
|
|
int _bufferCapacityGLPoint = 0;
|
2019-06-05 17:58:33 +08:00
|
|
|
int _bufferCountGLPoint = 0;
|
2018-09-20 15:18:03 +08:00
|
|
|
V2F_C4B_T2F *_bufferGLPoint = nullptr;
|
2014-09-11 15:39:56 +08:00
|
|
|
Color4F _pointColor;
|
2018-09-20 15:18:03 +08:00
|
|
|
int _pointSize = 0;
|
2014-09-11 15:39:56 +08:00
|
|
|
|
2018-09-20 15:18:03 +08:00
|
|
|
int _bufferCapacityGLLine = 0;
|
2019-06-05 17:58:33 +08:00
|
|
|
int _bufferCountGLLine = 0;
|
2018-09-20 15:18:03 +08:00
|
|
|
V2F_C4B_T2F *_bufferGLLine = nullptr;
|
2013-07-18 07:56:19 +08:00
|
|
|
|
2013-07-20 13:01:27 +08:00
|
|
|
BlendFunc _blendFunc;
|
metal support for cocos2d-x (#19305)
* remove deprecated files
* remove some deprecated codes
* remove more deprecated codes
* remove ui deprecated codes
* remove more deprecated codes
* remove deprecated codes in ccmenuitem
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes
* remove more deprecated codes
* remove more deprecated codes
* remove vr related codes and ignore some modules
* remove allocator
* remove some config
* 【Feature】add back-end project file
* [Feature] add back-end file
* add pipeline descriptor and shader cache
* [Feature] support sprite for backend
* [Feature] remove unneeded code
* [Feature] according to es2.0 spec, you must use clamp-to-edge as texture wrap mode, and no mipmapping for non-power-of-two texture
* [Feature] set texture wrap mode to clamp-to-edge, and no mipmapping for non-power-of-two texture
* [Feature] remove macro define to .cpp file
* [Feature] add log info
* [Feature] add PipelineDescriptor for TriangleCommand
* [Feature] add PipelineDescriptor object as member of TriangleCommand
* [Feature] add getPipelineDescriptor method
* add renderbackend
* complete pipeline descriptor
* [Feature] add viewport in RenderCommand
* set viewport when rendrering
* [Feature] occur error when using RendererBackend, to be fixed.
* a workaround to fix black screen on macOS 10.14 (#19090)
* add rendererbackend init function
* fix typo
* [Feature] modify testFile
* [BugFix] modify shader path
* [Feature] set default viewport
* fix projection
* [Feature] modify log info
* [BugFix] change viewport data type to int
* [BugFix] add BindGroup to PipelienDescriptor
* [BugFix] change a_position to vec3 in sprite.vert
* [BugFix] set vertexLayout according to V3F_C4B_T2F structure
* [Feature] revert a_position to vec4
* [Feature] renderer should not use gl codes directly
* [Feature] it's better not use default value parameter
* fix depth test setting
* rendererbackend -> renderer
* clear color and depth at begin
* add metal backend
* metal support normalized attribute
* simplify codes
* update external
* add render pass desctriptor in pipeline descriptor
* fix warnings
* fix crash and memeory leak
* refactor Texture2D
* put pipeline descriptor into render command
* simplify codes
* [Feature] update Sprite
* fix crash when closing app
* [Feature] update SpriteBatchNode and TextureAtlas
* support render texture(not finish)
* [Feature] remove unused code
* make tests work on mac
* fix download-deps path error
* make tests work on iOS
* [Feature] support ttf under normal label effect
* refactor triangle command processing
* let renderer handle more common commands
* refactor backend
* make render texture work
* [Feature] refactor backend for GL
* [Feature]Renaming to make it easy to understand
* [Feature] change warp mode to CLAMP_TO_EDGE
* fix ghost
* simplify visit render queue logic
* support progress timer without rial mode
* support partcile system
* Feature/update label (#149)
* [BugFix] fix compile error
* [Feature] support outline effect in ios
* [Feature] add shader file
* [BugFix] fix begin and end RenderPass
* [Feature] update CustomCommand
* [Feature] revert project.pbxproj
* [Feature] simplify codes
* [BugFix] pack AI88 to RGBA8888 only when outline enable
* [Feature] support shadow effect in Label
* [Feature] support BMFont
* [Feature] support glow effect
* [Feature] simplify shader files
* LabelAtlas work
* handle blend function correctly
* support tile map
* don't share buffer in metal
* alloc buffer size as needed
* support more tilemap
* Merge branch 'minggo/metal-support' into feature/updateLabel
* minggo/metal-support:
support tile map
handle blend function correctly
LabelAtlas work
Feature/update label (#149)
support partcile system
# Conflicts:
# cocos/2d/CCLabel.cpp
# cocos/2d/CCSprite.cpp
# cocos/2d/CCSpriteBatchNode.cpp
# cocos/renderer/CCQuadCommand.cpp
# cocos/renderer/CCQuadCommand.h
* render texture work without saving file
* use global viewport
* grid3d works
* remove grabber
* tiled3d works
* [BugFix] fix label bug
* [Feature] add updateSubData for buffer
* [Feature] remove setVertexCount
* support depth test
* add callback command
* [Feature] add UITest
* [Feature] update UITest
* [Feature] remove unneeded codes
* fix custom command issue
* fix layer color blend issue
* [BugFix] fix iOS compile error
* [Feature] remove unneeded codes
* [Feature] fix updateVertexBuffer
* layerradial works
* add draw test back
* fix batch issue
* fix compiling error
* [BugFix] support ETC1
* [BugFix] get the correct pipelineDescriptor
* [BugFix] skip draw when backendTexture nullptr
* clipping node support
* [Feature] add shader files
* fix stencil issue in metal
* [Feature] update UILayoutTest
* [BugFix] skip drawing when vertexCount is zero
* refactor renderer
* add set global z order for stencil manager commands
* fix warnings caused by type
* remove viewport in render command
* [Feature] fix warnings caused by type
* [BugFix] clear vertexCount and indexCount for CustomComand when needed
* [Feature] update clear for CustomCommand
* ios use metal
* fix viewport issue
* fix LayerColorGradient crash
* [cmake] transport to android and windows (#160)
* save point 1
* compile on windows
* run on android
* revert useless change
* android set CC_ENABLE_CACHE_TEXTURE_DATA to 1
* add initGlew
* fix android crash
* add TODO new-renderer
* review update
* revert onGLFWWindowPosCallback
* fix android compiling error
* Impl progress radial (#162)
* progresstimer add radial impl
* default drawType to element
* dec invoke times of createVertexBuffer (#163)
* support depth/stencil format for gl backend
* simplify progress timer codes
* support motionstreak, effect is wrong
* fix motionstreak issue
* [Feature] update Scissor Test (#161)
* [Feature] update Scissor Test
* [Feature] update ScissorTest
* [Feature] rename function
* [Feature] get constant reference if needed
* [Feature] show render status (#164)
* improve performance
* fix depth state
* fill error that triangle vertex/index number bigger than buffer
* fix compiline error in release mode
* fix buffer conflict between CPU and GPU on iOS/macOS
* Renderer refactor (#165)
* use one vertes/index buffer with opengl
* fix error on windows
* custom command support index format config
* CCLayer: compact vertex data structure
* update comment
* fix doc
* support fast tilemap
* pass index format instead
* fix some wrong effect
* fix render texture error
* fix texture per-element size
* fix texture format error
* BlendFunc type refactor, GLenum -> backend::BlendFactor (#167)
* BlendFunc use backend::BlendFactor as inner field
* update comments
* use int to replace GLenum
* update xcode project fiel
* rename to GLBlendConst
* add ccConstants.h
* update xcode project file
* update copyright
* remove primitive command
* remove CCPrimitive.cpp/.h
* remove deprecated files
* remove unneeded files
* remove multiple view support
* remove multiple view support
* remove the usage of frame buffer in camera
* director don't use frame buffer
* remove FrameBuffer
* remove BatchCommand
* add some api reference
* add physics2d back
* fix crash when close app on mac
* improve render texture
* fix rendertexture issue
* fix rendertexture issue
* simplify codes
* CMake support for mac & ios (#169)
* update cmake
* fix compile error
* update 3rd libs version
* remove CCThread.h/.cpp
* remove ccthread
* use audio engine to implement simple audio engine
* remove unneeded codes
* remove deprecated codes
* remove winrt macro
* remove CC_USE_WIC
* set partcile blend function in more elegant way
* remove unneeded codes
* remove unneeded codes
* cmake works on windows
* update project setting
* improve performance
* GLFloat -> float
* sync v3 cmake improvements into metal-support (#172)
* pick: modern cmake, compile definitions improvement (#19139)
* modern cmake, use target_compile_definitions partly
* simplify macro define, remove USE_*
* modern cmake, macro define
* add physics 2d macro define into ccConfig.h
* remove USE_CHIPMUNK macro in build.gradle
* remove CocosSelectModule.cmake
* shrink useless define
* simplify compile options config, re-add if necessary
* update external for tmp CI test
* un-quote target_compile_options value
* add "-g" parameter only when debug mode
* keep single build type when generator Xcode & VS projecy
* update external for tmp CI tes
* add static_cast<char>(-1), fix -Wc++11-narrowing
* simplify win32 compile define
* not modify code, only improve compile options
# Conflicts:
# .gitignore
# cmake/Modules/CocosConfigDepend.cmake
# cocos/CMakeLists.txt
# external/config.json
# tests/cpp-tests/CMakeLists.txt
* modern cmake, improve cmake_compiler_flags (#19145)
* cmake_compiler_flags
* Fix typo
* Fix typo2
* Remove chanages from Android.mk
* correct lua template cmake build (#19149)
* don't add -Wno-deprecated into jsb target
* correct lua template cmake build
* fix win32 lua template compile error
* prevent cmake in-source-build friendly (#19151)
* pick: Copy resources to "Resources/" on win32 like in linux configuration
* add "/Z7" for cpp-tests on windows
* [cmake] fix iOS xcode property setting failed (#19208)
* fix iOS xcode property setting failed
* use search_depend_libs_recursive at dlls collect
* fix typo
* [cmake] add find_host_library into iOS toolchain file (#19230)
* pick: [lua android] use luajit & template cmake update (#19239)
* increase cmake stability , remove tests/CMakeLists.txt (#19261)
* cmake win32 Precompiled header (#19273)
* Precompiled header
* Fix
* Precompiled header for cocos
* Precompiled header jscocos2d
* Fix for COCOS2D_DEBUG is always 1 on Android (#19291)
Related #19289
* little build fix, tests cpp-tests works on mac
* sync v3 build related codes into metal-support (#173)
* strict initialization for std::array
* remove proj.win32 project configs
* modern cmake, cmake_cleanup_remove_unused_variables (#19146)
* Switch travis CI to xenial (#19207)
* Switch travis CI to xenial
* Remove language: android
* Set language: cpp
* Fix java problem
* Update sdkmanager
* Fix sdkmanger
* next sdkmanager fix
* Remove xenial from android
* revert to sdk-tools-{system}-3859397
* Remove linux cmake install
* Update before-install.sh
* Update .travis.yml
* Simplify install-deps-linux.sh, tested on Ubuntu 16.04 (#19212)
* Simplify install-deps-linux.sh
* Cleanup
* pick: install ninja
* update cocos2d-console submodule
* for metal-support alpha release, we only test cpp
* add HelloCpp into project(Cocos2d-x) for tmp test
* update extenal metal-support-4
* update uniform setting
* [Feature] update BindGroup
* [Feature] empty-test
* [Feature] cpp-test
* [Feature] fix GL compiler error
* [Feature] fix GL crash
* [Feature] empty-test
* [Feature] cpp-tests
* [feature] improve frameRate
* [feature] fix opengl compile error
* [feature] fix opengl compile error
* [BugFix] fix compute maxLocation error
* [Feature] update setting unifrom
* [Feature] fix namespace
* [Feature] remove unneeded code
* [Bugfix] fix project file
* [Feature] update review
* [texture2d] impl texture format support (#175)
* texture update
* update
* update texture
* commit
* compile on windows
* ddd
* rename
* rename methods
* no crash
* save gl
* save
* save
* rename
* move out pixel format convert functions
* metal crash
* update
* update android
* support gles compressed texture format
* support more compress format
* add more conversion methods
* ss
* save
* update conversion methods
* add PVRTC format support
* reformat
* add marco linux
* fix GL marcro
* pvrtc supported only by ios 8.0+
* remove unused cmake
* revert change
* refactor Texture2D::initWithData
* fix conversion log
* refactor Texture2D::initWithData
* remove some OpenGL constants for PVRTC
* add todo
* fix typo
* AutoTest works on mac/iOS by disable part cases, sync v3 bug fix (#174)
* review cpp-tests, and fix part issues on start auto test
* sync png format fix: Node:Particle3D abnormal texture effects #19204
* fix cpp-tests SpritePolygon crash, wrong png format (#19170)
* fix wrong png convert format from sRGB to Gray
* erase plist index if all frames was erased
* test_A8.png have I8 format, fix it
* [CCSpriteCache] allow re-add plist & add testcase (#19175)
* allow re-add plist & add testcase
* remove comments/rename method/update testcase
* fix isSpriteFramesWithFileLoaded & add testcase
* remove used variable
* remove unused variable
* fix double free issues when js/lua-tests exit on iOS (#19236)
* disable part cases, AutoTest works without crash on mac
* update cocos2dx files json, to test cocos new next
* fix spritecache plist parsing issue (#19269)
* [linux] Fix FileUtils::getContents with folder (#19157)
* fix FileUtils::getContents on linux/mac
* use stat.st_mode
* simplify
* [CCFileUtils] win32 getFileSize (#19176)
* win32 getFileSize
* fix stat
* [cpp test-Android]20:FileUtils/2 change title (#19197)
* sync #19200
* sync #19231
* [android lua] improve performance of lua loader (#19234)
* [lua] improve performance of lua loader
* remove cache fix
* Revert "fix spritecache plist parsing issue (#19269)"
This reverts commit f3a85ece4307a7b90816c34489d1ed2c8fd11baf.
* remove win32 project files ref in template.json
* add metal framework lnk ref into cpp template
* test on iOS, and disable part cases
* alBufferData instead of alBufferDataStatic for small audio file on Apple (#19227)
* changes AudioCache to use alBufferData instead of alBufferDataStatic
(also makes test 19 faster to trigger openal bugs faster)
The original problem: CrashIfClientProvidedBogusAudioBufferList
https://github.com/cocos2d/cocos2d-x/issues/18948
is not happening anymore, but there's still a not very frequent issue
that makes OpenAL crash with a call stack like this.
AudioCache::readDataTask > alBufferData > CleanUpDeadBufferList
It happes more frequently when the device is "cold", which means after
half an hour of not using the device (locked).
I could not find the actual source code for iOS OpenAL, so I used the
macOS versions:
https://opensource.apple.com/source/OpenAL/OpenAL-48.7/Source/OpenAL/oalImp.cpp.auto.html
They seem to use CAGuard.h to make sure the dead buffer list
has no threading issues. I'm worried because the CAGuard code I found
has macos and win32 define but no iOS, so I'm not sure. I guess the
iOS version is different and has the guard.
I could not find a place in the code that's unprotected by the locks
except the InitializeBufferMap() which should not be called more than
once from cocos, and there's a workaround in AudioEngine-impl for it.
I reduced the occurence of the CleanUpDeadBufferList crash by moving
the guard in ~AudioCache to cover the alDeleteBuffers call.
* remove hack method "setTimeout" on audio
* AutoTest works on iOS
* support set ios deployment target for root project
* enable all texture2d cases, since Jiang have fixed
* add CCTextureUtils to xcode project file (#176)
* add leak cases for SpriteFrameCache (#177)
* re-add SpriteFrameCache cases
* update template file json
* Update SpriteFrameCacheTest.cpp
* fix compiling error
2019-01-18 15:08:25 +08:00
|
|
|
|
|
|
|
backend::ProgramState* _programStatePoint = nullptr;
|
|
|
|
backend::ProgramState* _programStateLine = nullptr;
|
|
|
|
|
2013-12-26 21:19:12 +08:00
|
|
|
CustomCommand _customCommand;
|
2014-09-11 15:39:56 +08:00
|
|
|
CustomCommand _customCommandGLPoint;
|
|
|
|
CustomCommand _customCommandGLLine;
|
2013-07-18 07:56:19 +08:00
|
|
|
|
2018-09-20 15:18:03 +08:00
|
|
|
bool _dirty = false;
|
|
|
|
bool _dirtyGLPoint = false;
|
|
|
|
bool _dirtyGLLine = false;
|
|
|
|
bool _isolated = false;
|
2019-06-05 17:58:33 +08:00
|
|
|
float _lineWidth = 0.0f;
|
2020-01-09 17:09:29 +08:00
|
|
|
float _defaultLineWidth = 0.0f;
|
2013-11-15 08:21:49 +08:00
|
|
|
private:
|
|
|
|
CC_DISALLOW_COPY_AND_ASSIGN(DrawNode);
|
2012-11-09 12:08:18 +08:00
|
|
|
};
|
2015-03-21 17:06:26 +08:00
|
|
|
/** @} */
|
2012-11-09 12:08:18 +08:00
|
|
|
NS_CC_END
|
|
|
|
|
|
|
|
#endif // __CCDRAWNODES_CCDRAW_NODE_H__
|