2013-09-09 10:29:02 +08:00
|
|
|
/****************************************************************************
|
2018-01-29 16:25:32 +08:00
|
|
|
Copyright (c) 2013-2016 Chukong Technologies Inc.
|
|
|
|
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
|
2013-09-09 10:29:02 +08:00
|
|
|
|
|
|
|
http://www.cocos2d-x.org
|
|
|
|
|
|
|
|
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.
|
|
|
|
****************************************************************************/
|
|
|
|
|
2014-04-27 01:35:57 +08:00
|
|
|
#include "physics/CCPhysicsWorld.h"
|
2013-12-26 23:55:05 +08:00
|
|
|
#if CC_USE_PHYSICS
|
2015-01-06 10:29:07 +08:00
|
|
|
#include <algorithm>
|
2013-11-06 15:43:29 +08:00
|
|
|
#include <climits>
|
|
|
|
|
2016-03-01 05:53:00 +08:00
|
|
|
#include "chipmunk/chipmunk_private.h"
|
2016-03-20 21:53:44 +08:00
|
|
|
#include "physics/CCPhysicsBody.h"
|
|
|
|
#include "physics/CCPhysicsShape.h"
|
|
|
|
#include "physics/CCPhysicsContact.h"
|
|
|
|
#include "physics/CCPhysicsJoint.h"
|
|
|
|
#include "physics/CCPhysicsHelper.h"
|
2013-09-16 21:22:22 +08:00
|
|
|
|
2014-04-27 01:11:22 +08:00
|
|
|
#include "2d/CCDrawNode.h"
|
2014-05-02 07:42:35 +08:00
|
|
|
#include "2d/CCScene.h"
|
2014-04-30 08:37:36 +08:00
|
|
|
#include "base/CCDirector.h"
|
|
|
|
#include "base/CCEventDispatcher.h"
|
|
|
|
#include "base/CCEventCustom.h"
|
2013-09-09 10:29:02 +08:00
|
|
|
|
|
|
|
NS_CC_BEGIN
|
2016-03-01 05:53:00 +08:00
|
|
|
const float PHYSICS_INFINITY = FLT_MAX;
|
2013-11-01 16:26:03 +08:00
|
|
|
extern const char* PHYSICSCONTACT_EVENT_NAME;
|
|
|
|
|
2013-12-06 11:46:13 +08:00
|
|
|
const int PhysicsWorld::DEBUGDRAW_NONE = 0x00;
|
|
|
|
const int PhysicsWorld::DEBUGDRAW_SHAPE = 0x01;
|
|
|
|
const int PhysicsWorld::DEBUGDRAW_JOINT = 0x02;
|
|
|
|
const int PhysicsWorld::DEBUGDRAW_CONTACT = 0x04;
|
|
|
|
const int PhysicsWorld::DEBUGDRAW_ALL = DEBUGDRAW_SHAPE | DEBUGDRAW_JOINT | DEBUGDRAW_CONTACT;
|
|
|
|
|
2013-10-21 23:16:21 +08:00
|
|
|
namespace
|
|
|
|
{
|
|
|
|
typedef struct RayCastCallbackInfo
|
|
|
|
{
|
|
|
|
PhysicsWorld* world;
|
2013-11-07 16:23:50 +08:00
|
|
|
PhysicsRayCastCallbackFunc func;
|
2014-05-15 01:07:09 +08:00
|
|
|
Vec2 p1;
|
|
|
|
Vec2 p2;
|
2013-10-21 23:16:21 +08:00
|
|
|
void* data;
|
|
|
|
}RayCastCallbackInfo;
|
|
|
|
|
|
|
|
typedef struct RectQueryCallbackInfo
|
|
|
|
{
|
|
|
|
PhysicsWorld* world;
|
2013-12-13 16:26:26 +08:00
|
|
|
PhysicsQueryRectCallbackFunc func;
|
2013-10-21 23:16:21 +08:00
|
|
|
void* data;
|
|
|
|
}RectQueryCallbackInfo;
|
2013-11-11 16:23:42 +08:00
|
|
|
|
|
|
|
typedef struct PointQueryCallbackInfo
|
|
|
|
{
|
|
|
|
PhysicsWorld* world;
|
2013-12-13 16:26:26 +08:00
|
|
|
PhysicsQueryPointCallbackFunc func;
|
2013-11-11 16:23:42 +08:00
|
|
|
void* data;
|
|
|
|
}PointQueryCallbackInfo;
|
2013-10-21 23:16:21 +08:00
|
|
|
}
|
2013-10-09 13:41:19 +08:00
|
|
|
|
2013-10-21 23:16:21 +08:00
|
|
|
class PhysicsWorldCallback
|
2013-09-09 10:29:02 +08:00
|
|
|
{
|
2013-10-21 23:16:21 +08:00
|
|
|
public:
|
2016-03-01 05:53:00 +08:00
|
|
|
static cpBool collisionBeginCallbackFunc(cpArbiter *arb, struct cpSpace *space, PhysicsWorld *world);
|
|
|
|
static cpBool collisionPreSolveCallbackFunc(cpArbiter *arb, cpSpace *space, PhysicsWorld *world);
|
2013-10-21 23:16:21 +08:00
|
|
|
static void collisionPostSolveCallbackFunc(cpArbiter *arb, cpSpace *space, PhysicsWorld *world);
|
|
|
|
static void collisionSeparateCallbackFunc(cpArbiter *arb, cpSpace *space, PhysicsWorld *world);
|
2016-03-01 05:53:00 +08:00
|
|
|
static void rayCastCallbackFunc(cpShape *shape, cpVect point, cpVect normal, cpFloat alpha, RayCastCallbackInfo *info);
|
2013-11-18 03:10:13 +08:00
|
|
|
static void queryRectCallbackFunc(cpShape *shape, RectQueryCallbackInfo *info);
|
2016-03-01 05:53:00 +08:00
|
|
|
static void queryPointFunc(cpShape *shape, cpVect point, cpFloat distance, cpVect gradient, PointQueryCallbackInfo *info);
|
|
|
|
static void getShapesAtPointFunc(cpShape *shape, cpVect point, cpFloat distance, cpVect gradient, Vector<PhysicsShape*>* arr);
|
2013-09-09 10:29:02 +08:00
|
|
|
|
2013-10-22 18:00:24 +08:00
|
|
|
public:
|
2013-10-21 23:16:21 +08:00
|
|
|
static bool continues;
|
|
|
|
};
|
|
|
|
|
|
|
|
bool PhysicsWorldCallback::continues = true;
|
|
|
|
|
2016-11-16 09:48:37 +08:00
|
|
|
cpBool PhysicsWorldCallback::collisionBeginCallbackFunc(cpArbiter *arb, struct cpSpace* /*space*/, PhysicsWorld *world)
|
2013-10-21 23:16:21 +08:00
|
|
|
{
|
2013-09-16 22:51:48 +08:00
|
|
|
CP_ARBITER_GET_SHAPES(arb, a, b);
|
2013-09-16 21:22:22 +08:00
|
|
|
|
2016-03-01 05:53:00 +08:00
|
|
|
PhysicsShape *shapeA = static_cast<PhysicsShape*>(cpShapeGetUserData(a));
|
|
|
|
PhysicsShape *shapeB = static_cast<PhysicsShape*>(cpShapeGetUserData(b));
|
|
|
|
CC_ASSERT(shapeA != nullptr && shapeB != nullptr);
|
2013-09-16 21:22:22 +08:00
|
|
|
|
2016-03-01 05:53:00 +08:00
|
|
|
auto contact = PhysicsContact::construct(shapeA, shapeB);
|
|
|
|
cpArbiterSetUserData(arb, contact);
|
2013-10-25 10:31:22 +08:00
|
|
|
contact->_contactInfo = arb;
|
2013-09-16 22:51:48 +08:00
|
|
|
|
2013-10-25 10:31:22 +08:00
|
|
|
return world->collisionBeginCallback(*contact);
|
2013-09-16 22:51:48 +08:00
|
|
|
}
|
|
|
|
|
2016-11-16 09:48:37 +08:00
|
|
|
cpBool PhysicsWorldCallback::collisionPreSolveCallbackFunc(cpArbiter *arb, cpSpace* /*space*/, PhysicsWorld *world)
|
2013-09-16 22:51:48 +08:00
|
|
|
{
|
2016-03-01 05:53:00 +08:00
|
|
|
return world->collisionPreSolveCallback(*static_cast<PhysicsContact*>(cpArbiterGetUserData(arb)));
|
2013-09-16 22:51:48 +08:00
|
|
|
}
|
|
|
|
|
2016-11-16 09:48:37 +08:00
|
|
|
void PhysicsWorldCallback::collisionPostSolveCallbackFunc(cpArbiter *arb, cpSpace* /*space*/, PhysicsWorld *world)
|
2013-09-16 22:51:48 +08:00
|
|
|
{
|
2016-03-01 05:53:00 +08:00
|
|
|
world->collisionPostSolveCallback(*static_cast<PhysicsContact*>(cpArbiterGetUserData(arb)));
|
2013-09-16 22:51:48 +08:00
|
|
|
}
|
|
|
|
|
2016-11-16 09:48:37 +08:00
|
|
|
void PhysicsWorldCallback::collisionSeparateCallbackFunc(cpArbiter *arb, cpSpace* /*space*/, PhysicsWorld *world)
|
2013-09-16 22:51:48 +08:00
|
|
|
{
|
2016-03-01 05:53:00 +08:00
|
|
|
PhysicsContact* contact = static_cast<PhysicsContact*>(cpArbiterGetUserData(arb));
|
2013-09-16 22:51:48 +08:00
|
|
|
|
|
|
|
world->collisionSeparateCallback(*contact);
|
|
|
|
|
|
|
|
delete contact;
|
2013-09-16 21:22:22 +08:00
|
|
|
}
|
2013-09-09 10:29:02 +08:00
|
|
|
|
2016-03-01 05:53:00 +08:00
|
|
|
void PhysicsWorldCallback::rayCastCallbackFunc(cpShape *shape, cpVect point, cpVect normal, cpFloat alpha, RayCastCallbackInfo *info)
|
2013-10-21 23:16:21 +08:00
|
|
|
{
|
|
|
|
if (!PhysicsWorldCallback::continues)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2016-03-01 05:53:00 +08:00
|
|
|
PhysicsShape *physicsShape = static_cast<PhysicsShape*>(cpShapeGetUserData(shape));
|
|
|
|
CC_ASSERT(physicsShape != nullptr);
|
2013-10-21 23:16:21 +08:00
|
|
|
|
2013-11-07 16:23:50 +08:00
|
|
|
PhysicsRayCastInfo callbackInfo =
|
2013-11-05 15:54:33 +08:00
|
|
|
{
|
2016-03-01 05:53:00 +08:00
|
|
|
physicsShape,
|
2013-11-05 15:54:33 +08:00
|
|
|
info->p1,
|
|
|
|
info->p2,
|
2016-03-01 05:53:00 +08:00
|
|
|
PhysicsHelper::cpv2point(point),
|
|
|
|
PhysicsHelper::cpv2point(normal),
|
|
|
|
static_cast<float>(alpha),
|
2013-11-05 15:54:33 +08:00
|
|
|
};
|
|
|
|
|
2013-11-07 16:23:50 +08:00
|
|
|
PhysicsWorldCallback::continues = info->func(*info->world, callbackInfo, info->data);
|
2013-10-21 23:16:21 +08:00
|
|
|
}
|
|
|
|
|
2013-11-18 03:10:13 +08:00
|
|
|
void PhysicsWorldCallback::queryRectCallbackFunc(cpShape *shape, RectQueryCallbackInfo *info)
|
2013-10-21 23:16:21 +08:00
|
|
|
{
|
2016-03-01 05:53:00 +08:00
|
|
|
PhysicsShape *physicsShape = static_cast<PhysicsShape*>(cpShapeGetUserData(shape));
|
|
|
|
CC_ASSERT(physicsShape != nullptr);
|
2013-10-21 23:16:21 +08:00
|
|
|
|
|
|
|
if (!PhysicsWorldCallback::continues)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2016-03-01 05:53:00 +08:00
|
|
|
PhysicsWorldCallback::continues = info->func(*info->world, *physicsShape, info->data);
|
|
|
|
}
|
|
|
|
|
2016-11-16 09:48:37 +08:00
|
|
|
void PhysicsWorldCallback::getShapesAtPointFunc(cpShape *shape, cpVect /*point*/, cpFloat /*distance*/, cpVect /*gradient*/, Vector<PhysicsShape*>* arr)
|
2016-03-01 05:53:00 +08:00
|
|
|
{
|
|
|
|
PhysicsShape *physicsShape = static_cast<PhysicsShape*>(cpShapeGetUserData(shape));
|
|
|
|
CC_ASSERT(physicsShape != nullptr);
|
|
|
|
arr->pushBack(physicsShape);
|
|
|
|
}
|
|
|
|
|
2016-11-16 09:48:37 +08:00
|
|
|
void PhysicsWorldCallback::queryPointFunc(cpShape *shape, cpVect /*point*/, cpFloat /*distance*/, cpVect /*gradient*/, PointQueryCallbackInfo *info)
|
2016-03-01 05:53:00 +08:00
|
|
|
{
|
|
|
|
PhysicsShape *physicsShape = static_cast<PhysicsShape*>(cpShapeGetUserData(shape));
|
|
|
|
CC_ASSERT(physicsShape != nullptr);
|
|
|
|
PhysicsWorldCallback::continues = info->func(*info->world, *physicsShape, info->data);
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline cpSpaceDebugColor RGBAColor(float r, float g, float b, float a){
|
|
|
|
cpSpaceDebugColor color = {r, g, b, a};
|
|
|
|
return color;
|
|
|
|
}
|
|
|
|
|
|
|
|
static inline cpSpaceDebugColor LAColor(float l, float a){
|
|
|
|
cpSpaceDebugColor color = {l, l, l, a};
|
|
|
|
return color;
|
2013-10-21 23:16:21 +08:00
|
|
|
}
|
|
|
|
|
2016-11-16 09:48:37 +08:00
|
|
|
static void DrawCircle(cpVect p, cpFloat /*a*/, cpFloat r, cpSpaceDebugColor outline, cpSpaceDebugColor fill, cpDataPointer data)
|
2013-10-23 17:28:23 +08:00
|
|
|
{
|
2016-03-01 05:53:00 +08:00
|
|
|
const Color4F fillColor(fill.r, fill.g, fill.b, fill.a);
|
|
|
|
const Color4F outlineColor(outline.r, outline.g, outline.b, outline.a);
|
|
|
|
DrawNode* drawNode = static_cast<DrawNode*>(data);
|
|
|
|
float radius = PhysicsHelper::cpfloat2float(r);
|
|
|
|
Vec2 centre = PhysicsHelper::cpv2point(p);
|
2013-10-23 17:28:23 +08:00
|
|
|
|
2016-03-01 05:53:00 +08:00
|
|
|
static const int CIRCLE_SEG_NUM = 12;
|
|
|
|
Vec2 seg[CIRCLE_SEG_NUM] = {};
|
2013-10-23 17:28:23 +08:00
|
|
|
|
2016-03-01 05:53:00 +08:00
|
|
|
for (int i = 0; i < CIRCLE_SEG_NUM; ++i)
|
|
|
|
{
|
|
|
|
float angle = (float)i * M_PI / (float)CIRCLE_SEG_NUM * 2.0f;
|
|
|
|
Vec2 d(radius * cosf(angle), radius * sinf(angle));
|
|
|
|
seg[i] = centre + d;
|
|
|
|
}
|
|
|
|
drawNode->drawPolygon(seg, CIRCLE_SEG_NUM, fillColor, 1, outlineColor);
|
2013-10-23 17:28:23 +08:00
|
|
|
}
|
|
|
|
|
2016-11-16 09:48:37 +08:00
|
|
|
static void DrawFatSegment(cpVect a, cpVect b, cpFloat r, cpSpaceDebugColor outline, cpSpaceDebugColor /*fill*/, cpDataPointer data)
|
2013-11-11 16:23:42 +08:00
|
|
|
{
|
2016-03-01 05:53:00 +08:00
|
|
|
const Color4F outlineColor(outline.r, outline.g, outline.b, outline.a);
|
|
|
|
DrawNode* drawNode = static_cast<DrawNode*>(data);
|
|
|
|
drawNode->drawSegment(PhysicsHelper::cpv2point(a),
|
|
|
|
PhysicsHelper::cpv2point(b),
|
|
|
|
PhysicsHelper::cpfloat2float(r==0 ? 1 : r), outlineColor);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void DrawSegment(cpVect a, cpVect b, cpSpaceDebugColor color, cpDataPointer data)
|
|
|
|
{
|
|
|
|
DrawFatSegment(a, b, 0.0, color, color, data);
|
|
|
|
}
|
|
|
|
|
2016-11-16 09:48:37 +08:00
|
|
|
static void DrawPolygon(int count, const cpVect *verts, cpFloat /*r*/, cpSpaceDebugColor outline, cpSpaceDebugColor fill, cpDataPointer data)
|
2016-03-01 05:53:00 +08:00
|
|
|
{
|
|
|
|
const Color4F fillColor(fill.r, fill.g, fill.b, fill.a);
|
|
|
|
const Color4F outlineColor(outline.r, outline.g, outline.b, outline.a);
|
|
|
|
DrawNode* drawNode = static_cast<DrawNode*>(data);
|
|
|
|
int num = count;
|
|
|
|
Vec2* seg = new (std::nothrow) Vec2[num];
|
|
|
|
for(int i=0;i<num;++i)
|
|
|
|
seg[i] = PhysicsHelper::cpv2point(verts[i]);
|
2013-11-11 16:23:42 +08:00
|
|
|
|
2016-03-01 05:53:00 +08:00
|
|
|
drawNode->drawPolygon(seg, num, fillColor, 1.0f, outlineColor);
|
2013-11-11 16:23:42 +08:00
|
|
|
|
2016-03-01 05:53:00 +08:00
|
|
|
delete[] seg;
|
|
|
|
}
|
|
|
|
|
2016-11-16 09:48:37 +08:00
|
|
|
static void DrawDot(cpFloat /*size*/, cpVect pos, cpSpaceDebugColor color, cpDataPointer data)
|
2016-03-01 05:53:00 +08:00
|
|
|
{
|
|
|
|
const Color4F dotColor(color.r, color.g, color.b, color.a);
|
|
|
|
DrawNode* drawNode = static_cast<DrawNode*>(data);
|
|
|
|
drawNode->drawDot(PhysicsHelper::cpv2point(pos), 2, dotColor);
|
|
|
|
}
|
|
|
|
|
2016-11-16 09:48:37 +08:00
|
|
|
static cpSpaceDebugColor ColorForShape(cpShape *shape, cpDataPointer /*data*/)
|
2016-03-01 05:53:00 +08:00
|
|
|
{
|
|
|
|
if(cpShapeGetSensor(shape)){
|
|
|
|
return LAColor(1.0f, 0.3f);
|
|
|
|
} else {
|
|
|
|
cpBody *body = cpShapeGetBody(shape);
|
|
|
|
|
|
|
|
if(cpBodyIsSleeping(body)){
|
|
|
|
return LAColor(0.2f, 0.3f);
|
|
|
|
} else if(body->sleeping.idleTime > shape->space->sleepTimeThreshold) {
|
|
|
|
return LAColor(0.66f, 0.3f);
|
|
|
|
} else {
|
|
|
|
|
2019-06-05 17:58:33 +08:00
|
|
|
float intensity = (cpBodyGetType(body) == CP_BODY_TYPE_STATIC ? 0.15f : 0.75f);
|
2016-03-01 05:53:00 +08:00
|
|
|
return RGBAColor(intensity, 0.0f, 0.0f, 0.3f);
|
|
|
|
}
|
|
|
|
}
|
2013-11-11 16:23:42 +08:00
|
|
|
}
|
|
|
|
|
2016-03-01 05:53:00 +08:00
|
|
|
|
2013-09-16 21:22:22 +08:00
|
|
|
void PhysicsWorld::debugDraw()
|
|
|
|
{
|
2013-11-08 14:25:03 +08:00
|
|
|
if (_debugDraw == nullptr)
|
|
|
|
{
|
2016-03-01 05:53:00 +08:00
|
|
|
_debugDraw = DrawNode::create();
|
2018-09-20 15:18:03 +08:00
|
|
|
_debugDraw->setIsolated(true);
|
2016-03-01 05:53:00 +08:00
|
|
|
_debugDraw->retain();
|
|
|
|
Director::getInstance()->getRunningScene()->addChild(_debugDraw);
|
2013-11-08 14:25:03 +08:00
|
|
|
}
|
|
|
|
|
2016-03-01 05:53:00 +08:00
|
|
|
cpSpaceDebugDrawOptions drawOptions = {
|
|
|
|
DrawCircle,
|
|
|
|
DrawSegment,
|
|
|
|
DrawFatSegment,
|
|
|
|
DrawPolygon,
|
|
|
|
DrawDot,
|
|
|
|
|
|
|
|
(cpSpaceDebugDrawFlags)(_debugDrawMask),
|
|
|
|
|
|
|
|
{1.0f, 0.0f, 0.0f, 1.0f},
|
|
|
|
ColorForShape,
|
|
|
|
{0.0f, 0.75f, 0.0f, 1.0f},
|
|
|
|
{0.0f, 0.0f, 1.0f, 1.0f},
|
|
|
|
_debugDraw,
|
|
|
|
};
|
|
|
|
if (_debugDraw)
|
2013-09-16 21:22:22 +08:00
|
|
|
{
|
2016-03-01 05:53:00 +08:00
|
|
|
_debugDraw->clear();
|
|
|
|
cpSpaceDebugDraw(_cpSpace, &drawOptions);
|
2013-10-29 17:31:35 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-03-01 05:53:00 +08:00
|
|
|
bool PhysicsWorld::collisionBeginCallback(PhysicsContact& contact)
|
2013-09-16 21:22:22 +08:00
|
|
|
{
|
2013-10-18 15:34:13 +08:00
|
|
|
bool ret = true;
|
2013-11-01 14:50:06 +08:00
|
|
|
|
2013-10-29 17:31:35 +08:00
|
|
|
PhysicsShape* shapeA = contact.getShapeA();
|
|
|
|
PhysicsShape* shapeB = contact.getShapeB();
|
|
|
|
PhysicsBody* bodyA = shapeA->getBody();
|
|
|
|
PhysicsBody* bodyB = shapeB->getBody();
|
2013-10-25 10:31:22 +08:00
|
|
|
std::vector<PhysicsJoint*> jointsA = bodyA->getJoints();
|
|
|
|
|
|
|
|
// check the joint is collision enable or not
|
|
|
|
for (PhysicsJoint* joint : jointsA)
|
|
|
|
{
|
2013-10-28 11:08:41 +08:00
|
|
|
if (std::find(_joints.begin(), _joints.end(), joint) == _joints.end())
|
|
|
|
{
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2013-11-06 15:43:29 +08:00
|
|
|
if (!joint->isCollisionEnabled())
|
2013-10-25 10:31:22 +08:00
|
|
|
{
|
2013-10-28 16:17:19 +08:00
|
|
|
PhysicsBody* body = joint->getBodyA() == bodyA ? joint->getBodyB() : joint->getBodyA();
|
2013-10-25 10:31:22 +08:00
|
|
|
|
|
|
|
if (body == bodyB)
|
|
|
|
{
|
2013-11-06 15:43:29 +08:00
|
|
|
contact.setNotificationEnable(false);
|
2013-10-25 10:31:22 +08:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2013-10-18 15:34:13 +08:00
|
|
|
|
2013-10-25 10:31:22 +08:00
|
|
|
// bitmask check
|
2013-10-29 17:31:35 +08:00
|
|
|
if ((shapeA->getCategoryBitmask() & shapeB->getContactTestBitmask()) == 0
|
2014-02-25 10:24:20 +08:00
|
|
|
|| (shapeA->getContactTestBitmask() & shapeB->getCategoryBitmask()) == 0)
|
2013-09-16 21:22:22 +08:00
|
|
|
{
|
2013-11-06 15:43:29 +08:00
|
|
|
contact.setNotificationEnable(false);
|
2013-09-16 21:22:22 +08:00
|
|
|
}
|
|
|
|
|
2013-10-29 17:31:35 +08:00
|
|
|
if (shapeA->getGroup() != 0 && shapeA->getGroup() == shapeB->getGroup())
|
|
|
|
{
|
|
|
|
ret = shapeA->getGroup() > 0;
|
2013-11-01 16:26:03 +08:00
|
|
|
}
|
|
|
|
else
|
2013-10-18 15:34:13 +08:00
|
|
|
{
|
2013-10-29 17:31:35 +08:00
|
|
|
if ((shapeA->getCategoryBitmask() & shapeB->getCollisionBitmask()) == 0
|
|
|
|
|| (shapeB->getCategoryBitmask() & shapeA->getCollisionBitmask()) == 0)
|
|
|
|
{
|
|
|
|
ret = false;
|
|
|
|
}
|
2013-10-18 15:34:13 +08:00
|
|
|
}
|
|
|
|
|
2014-02-25 15:27:25 +08:00
|
|
|
if (contact.isNotificationEnabled())
|
|
|
|
{
|
|
|
|
contact.setEventCode(PhysicsContact::EventCode::BEGIN);
|
|
|
|
contact.setWorld(this);
|
2015-09-18 11:48:43 +08:00
|
|
|
_eventDispatcher->dispatchEvent(&contact);
|
2014-02-25 15:27:25 +08:00
|
|
|
}
|
2013-10-18 15:34:13 +08:00
|
|
|
|
2013-11-01 14:50:06 +08:00
|
|
|
return ret ? contact.resetResult() : false;
|
2013-09-16 21:22:22 +08:00
|
|
|
}
|
2013-09-09 10:29:02 +08:00
|
|
|
|
2016-03-01 05:53:00 +08:00
|
|
|
bool PhysicsWorld::collisionPreSolveCallback(PhysicsContact& contact)
|
2013-09-09 10:29:02 +08:00
|
|
|
{
|
2013-11-06 15:43:29 +08:00
|
|
|
if (!contact.isNotificationEnabled())
|
2013-11-01 16:26:03 +08:00
|
|
|
{
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2013-11-01 14:50:06 +08:00
|
|
|
contact.setEventCode(PhysicsContact::EventCode::PRESOLVE);
|
|
|
|
contact.setWorld(this);
|
2015-09-18 11:48:43 +08:00
|
|
|
_eventDispatcher->dispatchEvent(&contact);
|
2013-10-18 15:34:13 +08:00
|
|
|
|
2013-11-01 14:50:06 +08:00
|
|
|
return contact.resetResult();
|
2013-09-16 21:22:22 +08:00
|
|
|
}
|
|
|
|
|
2013-10-25 10:31:22 +08:00
|
|
|
void PhysicsWorld::collisionPostSolveCallback(PhysicsContact& contact)
|
2013-09-16 21:22:22 +08:00
|
|
|
{
|
2013-11-06 15:43:29 +08:00
|
|
|
if (!contact.isNotificationEnabled())
|
2013-11-01 16:26:03 +08:00
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2013-11-01 14:50:06 +08:00
|
|
|
contact.setEventCode(PhysicsContact::EventCode::POSTSOLVE);
|
|
|
|
contact.setWorld(this);
|
2015-09-18 11:48:43 +08:00
|
|
|
_eventDispatcher->dispatchEvent(&contact);
|
2013-09-16 21:22:22 +08:00
|
|
|
}
|
|
|
|
|
2013-10-18 15:34:13 +08:00
|
|
|
void PhysicsWorld::collisionSeparateCallback(PhysicsContact& contact)
|
2013-09-16 21:22:22 +08:00
|
|
|
{
|
2013-11-06 15:43:29 +08:00
|
|
|
if (!contact.isNotificationEnabled())
|
2013-11-01 16:26:03 +08:00
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2015-04-25 05:02:39 +08:00
|
|
|
contact.setEventCode(PhysicsContact::EventCode::SEPARATE);
|
2013-11-01 14:50:06 +08:00
|
|
|
contact.setWorld(this);
|
2015-09-18 11:48:43 +08:00
|
|
|
_eventDispatcher->dispatchEvent(&contact);
|
2013-09-16 21:22:22 +08:00
|
|
|
}
|
|
|
|
|
2014-05-15 01:07:09 +08:00
|
|
|
void PhysicsWorld::rayCast(PhysicsRayCastCallbackFunc func, const Vec2& point1, const Vec2& point2, void* data)
|
2013-09-17 14:31:43 +08:00
|
|
|
{
|
2013-11-25 17:57:06 +08:00
|
|
|
CCASSERT(func != nullptr, "func shouldn't be nullptr");
|
|
|
|
|
|
|
|
if (func != nullptr)
|
2013-10-22 18:00:24 +08:00
|
|
|
{
|
2015-01-16 14:15:06 +08:00
|
|
|
if (!_delayAddBodies.empty() || !_delayRemoveBodies.empty())
|
|
|
|
{
|
|
|
|
updateBodies();
|
|
|
|
}
|
2013-11-07 16:23:50 +08:00
|
|
|
RayCastCallbackInfo info = { this, func, point1, point2, data };
|
2013-10-22 18:00:24 +08:00
|
|
|
|
|
|
|
PhysicsWorldCallback::continues = true;
|
2015-01-06 10:29:07 +08:00
|
|
|
cpSpaceSegmentQuery(_cpSpace,
|
2013-10-22 18:00:24 +08:00
|
|
|
PhysicsHelper::point2cpv(point1),
|
|
|
|
PhysicsHelper::point2cpv(point2),
|
2016-03-01 05:53:00 +08:00
|
|
|
0.0f,
|
|
|
|
CP_SHAPE_FILTER_ALL,
|
2013-10-22 18:00:24 +08:00
|
|
|
(cpSpaceSegmentQueryFunc)PhysicsWorldCallback::rayCastCallbackFunc,
|
|
|
|
&info);
|
|
|
|
}
|
2013-10-21 23:16:21 +08:00
|
|
|
}
|
|
|
|
|
2013-12-13 16:26:26 +08:00
|
|
|
void PhysicsWorld::queryRect(PhysicsQueryRectCallbackFunc func, const Rect& rect, void* data)
|
2013-10-21 23:16:21 +08:00
|
|
|
{
|
2013-11-11 15:31:20 +08:00
|
|
|
CCASSERT(func != nullptr, "func shouldn't be nullptr");
|
2013-11-05 15:54:33 +08:00
|
|
|
|
2013-11-07 16:23:50 +08:00
|
|
|
if (func != nullptr)
|
2013-10-22 18:00:24 +08:00
|
|
|
{
|
2015-01-16 14:15:06 +08:00
|
|
|
if (!_delayAddBodies.empty() || !_delayRemoveBodies.empty())
|
|
|
|
{
|
|
|
|
updateBodies();
|
|
|
|
}
|
2013-11-07 16:23:50 +08:00
|
|
|
RectQueryCallbackInfo info = {this, func, data};
|
2013-10-22 18:00:24 +08:00
|
|
|
|
|
|
|
PhysicsWorldCallback::continues = true;
|
2015-01-06 10:29:07 +08:00
|
|
|
cpSpaceBBQuery(_cpSpace,
|
2013-10-22 18:00:24 +08:00
|
|
|
PhysicsHelper::rect2cpbb(rect),
|
2016-03-01 05:53:00 +08:00
|
|
|
CP_SHAPE_FILTER_ALL,
|
2013-11-18 03:10:13 +08:00
|
|
|
(cpSpaceBBQueryFunc)PhysicsWorldCallback::queryRectCallbackFunc,
|
2013-10-22 18:00:24 +08:00
|
|
|
&info);
|
|
|
|
}
|
2013-10-21 23:16:21 +08:00
|
|
|
}
|
|
|
|
|
2014-05-15 01:07:09 +08:00
|
|
|
void PhysicsWorld::queryPoint(PhysicsQueryPointCallbackFunc func, const Vec2& point, void* data)
|
2013-11-11 15:03:17 +08:00
|
|
|
{
|
2013-11-11 15:31:20 +08:00
|
|
|
CCASSERT(func != nullptr, "func shouldn't be nullptr");
|
2013-11-11 15:03:17 +08:00
|
|
|
|
|
|
|
if (func != nullptr)
|
|
|
|
{
|
2015-01-16 14:15:06 +08:00
|
|
|
if (!_delayAddBodies.empty() || !_delayRemoveBodies.empty())
|
|
|
|
{
|
|
|
|
updateBodies();
|
|
|
|
}
|
2013-11-11 16:23:42 +08:00
|
|
|
PointQueryCallbackInfo info = {this, func, data};
|
2013-11-11 15:03:17 +08:00
|
|
|
|
|
|
|
PhysicsWorldCallback::continues = true;
|
2016-03-01 05:53:00 +08:00
|
|
|
cpSpacePointQuery(_cpSpace,
|
2013-11-11 16:23:42 +08:00
|
|
|
PhysicsHelper::point2cpv(point),
|
|
|
|
0,
|
2016-03-01 05:53:00 +08:00
|
|
|
CP_SHAPE_FILTER_ALL,
|
|
|
|
(cpSpacePointQueryFunc)PhysicsWorldCallback::queryPointFunc,
|
2013-11-11 16:23:42 +08:00
|
|
|
&info);
|
2013-11-11 15:03:17 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-05-15 01:07:09 +08:00
|
|
|
Vector<PhysicsShape*> PhysicsWorld::getShapes(const Vec2& point) const
|
2013-10-23 17:28:23 +08:00
|
|
|
{
|
2013-12-07 10:48:02 +08:00
|
|
|
Vector<PhysicsShape*> arr;
|
2016-03-01 05:53:00 +08:00
|
|
|
cpSpacePointQuery(_cpSpace,
|
2013-10-23 17:28:23 +08:00
|
|
|
PhysicsHelper::point2cpv(point),
|
|
|
|
0,
|
2016-03-01 05:53:00 +08:00
|
|
|
CP_SHAPE_FILTER_ALL,
|
|
|
|
(cpSpacePointQueryFunc)PhysicsWorldCallback::getShapesAtPointFunc,
|
2013-12-07 10:48:02 +08:00
|
|
|
&arr);
|
2013-10-23 17:28:23 +08:00
|
|
|
|
2013-12-10 16:06:05 +08:00
|
|
|
return arr;
|
2013-10-23 17:28:23 +08:00
|
|
|
}
|
|
|
|
|
2014-05-15 01:07:09 +08:00
|
|
|
PhysicsShape* PhysicsWorld::getShape(const Vec2& point) const
|
2013-10-23 10:11:08 +08:00
|
|
|
{
|
2016-03-01 05:53:00 +08:00
|
|
|
cpShape* shape = cpSpacePointQueryNearest(_cpSpace,
|
2013-10-23 17:28:23 +08:00
|
|
|
PhysicsHelper::point2cpv(point),
|
|
|
|
0,
|
2016-03-01 05:53:00 +08:00
|
|
|
CP_SHAPE_FILTER_ALL,
|
2013-10-23 17:28:23 +08:00
|
|
|
nullptr);
|
2016-03-01 05:53:00 +08:00
|
|
|
return shape == nullptr ? nullptr : static_cast<PhysicsShape*>(cpShapeGetUserData(shape));
|
2013-10-23 10:11:08 +08:00
|
|
|
}
|
|
|
|
|
2015-09-08 09:54:01 +08:00
|
|
|
bool PhysicsWorld::init()
|
2013-11-25 10:08:52 +08:00
|
|
|
{
|
|
|
|
do
|
|
|
|
{
|
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
|
|
|
#if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
|
2016-03-01 05:53:00 +08:00
|
|
|
_cpSpace = cpSpaceNew();
|
|
|
|
#else
|
|
|
|
_cpSpace = cpHastySpaceNew();
|
|
|
|
cpHastySpaceSetThreads(_cpSpace, 0);
|
|
|
|
#endif
|
2015-01-06 10:29:07 +08:00
|
|
|
CC_BREAK_IF(_cpSpace == nullptr);
|
2013-11-25 10:08:52 +08:00
|
|
|
|
2015-01-06 10:29:07 +08:00
|
|
|
cpSpaceSetGravity(_cpSpace, PhysicsHelper::point2cpv(_gravity));
|
2013-11-25 10:08:52 +08:00
|
|
|
|
2016-03-01 05:53:00 +08:00
|
|
|
cpCollisionHandler *handler = cpSpaceAddDefaultCollisionHandler(_cpSpace);
|
|
|
|
handler->userData = this;
|
|
|
|
handler->beginFunc = (cpCollisionBeginFunc)PhysicsWorldCallback::collisionBeginCallbackFunc;
|
|
|
|
handler->preSolveFunc = (cpCollisionPreSolveFunc)PhysicsWorldCallback::collisionPreSolveCallbackFunc;
|
|
|
|
handler->postSolveFunc = (cpCollisionPostSolveFunc)PhysicsWorldCallback::collisionPostSolveCallbackFunc;
|
|
|
|
handler->separateFunc = (cpCollisionSeparateFunc)PhysicsWorldCallback::collisionSeparateCallbackFunc;
|
2013-11-25 10:08:52 +08:00
|
|
|
|
|
|
|
return true;
|
|
|
|
} while (false);
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
void PhysicsWorld::addBody(PhysicsBody* body)
|
|
|
|
{
|
|
|
|
CCASSERT(body != nullptr, "the body can not be nullptr");
|
|
|
|
|
|
|
|
if (body->getWorld() == this)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (body->getWorld() != nullptr)
|
|
|
|
{
|
|
|
|
body->removeFromWorld();
|
|
|
|
}
|
|
|
|
|
|
|
|
addBodyOrDelay(body);
|
2013-12-07 10:48:02 +08:00
|
|
|
_bodies.pushBack(body);
|
2013-11-25 10:08:52 +08:00
|
|
|
body->_world = this;
|
|
|
|
}
|
|
|
|
|
|
|
|
void PhysicsWorld::doAddBody(PhysicsBody* body)
|
|
|
|
{
|
|
|
|
if (body->isEnabled())
|
|
|
|
{
|
|
|
|
// add body to space
|
2016-03-01 05:53:00 +08:00
|
|
|
if (!cpSpaceContainsBody(_cpSpace, body->_cpBody))
|
2013-11-25 10:08:52 +08:00
|
|
|
{
|
2015-01-06 10:29:07 +08:00
|
|
|
cpSpaceAddBody(_cpSpace, body->_cpBody);
|
2013-11-25 10:08:52 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// add shapes to space
|
2013-12-07 10:48:02 +08:00
|
|
|
for (auto& shape : body->getShapes())
|
2013-11-25 10:08:52 +08:00
|
|
|
{
|
|
|
|
addShape(dynamic_cast<PhysicsShape*>(shape));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void PhysicsWorld::addBodyOrDelay(PhysicsBody* body)
|
|
|
|
{
|
2013-12-11 18:07:14 +08:00
|
|
|
auto removeBodyIter = _delayRemoveBodies.find(body);
|
|
|
|
if (removeBodyIter != _delayRemoveBodies.end())
|
2013-11-25 10:08:52 +08:00
|
|
|
{
|
2013-12-11 18:07:14 +08:00
|
|
|
_delayRemoveBodies.erase(removeBodyIter);
|
2013-11-25 10:08:52 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2015-01-07 17:08:04 +08:00
|
|
|
if (_delayAddBodies.find(body) == _delayAddBodies.end())
|
2013-11-25 10:08:52 +08:00
|
|
|
{
|
2015-01-07 17:08:04 +08:00
|
|
|
_delayAddBodies.pushBack(body);
|
2013-11-25 10:08:52 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void PhysicsWorld::updateBodies()
|
|
|
|
{
|
2015-01-06 10:29:07 +08:00
|
|
|
if (cpSpaceIsLocked(_cpSpace))
|
2013-11-25 10:08:52 +08:00
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2014-05-21 16:07:49 +08:00
|
|
|
// issue #4944, contact callback will be invoked when add/remove body, _delayAddBodies maybe changed, so we need make a copy.
|
|
|
|
auto addCopy = _delayAddBodies;
|
|
|
|
_delayAddBodies.clear();
|
|
|
|
for (auto& body : addCopy)
|
2013-11-25 10:08:52 +08:00
|
|
|
{
|
2013-12-07 10:48:02 +08:00
|
|
|
doAddBody(body);
|
2013-11-25 10:08:52 +08:00
|
|
|
}
|
|
|
|
|
2014-05-21 16:07:49 +08:00
|
|
|
auto removeCopy = _delayRemoveBodies;
|
|
|
|
_delayRemoveBodies.clear();
|
|
|
|
for (auto& body : removeCopy)
|
2013-11-25 10:08:52 +08:00
|
|
|
{
|
2013-12-07 10:48:02 +08:00
|
|
|
doRemoveBody(body);
|
2013-11-25 10:08:52 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void PhysicsWorld::removeBody(int tag)
|
|
|
|
{
|
2013-12-07 10:48:02 +08:00
|
|
|
for (auto& body : _bodies)
|
2013-11-25 10:08:52 +08:00
|
|
|
{
|
|
|
|
if (body->getTag() == tag)
|
|
|
|
{
|
|
|
|
removeBody(body);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void PhysicsWorld::removeBody(PhysicsBody* body)
|
|
|
|
{
|
|
|
|
if (body->getWorld() != this)
|
|
|
|
{
|
2015-09-22 16:08:23 +08:00
|
|
|
CCLOG("Physics Warning: this body doesn't belong to this world");
|
2013-11-25 10:08:52 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2015-09-22 16:08:23 +08:00
|
|
|
// destroy the body's joints
|
2015-01-07 17:08:04 +08:00
|
|
|
auto removeCopy = body->_joints;
|
|
|
|
for (auto joint : removeCopy)
|
2013-11-25 10:08:52 +08:00
|
|
|
{
|
2015-01-07 17:08:04 +08:00
|
|
|
removeJoint(joint, true);
|
2013-11-25 10:08:52 +08:00
|
|
|
}
|
|
|
|
body->_joints.clear();
|
|
|
|
|
|
|
|
removeBodyOrDelay(body);
|
2013-12-12 14:45:30 +08:00
|
|
|
_bodies.eraseObject(body);
|
2013-11-25 10:08:52 +08:00
|
|
|
body->_world = nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
void PhysicsWorld::removeBodyOrDelay(PhysicsBody* body)
|
|
|
|
{
|
2013-12-07 10:48:02 +08:00
|
|
|
if (_delayAddBodies.getIndex(body) != CC_INVALID_INDEX)
|
2013-11-25 10:08:52 +08:00
|
|
|
{
|
2013-12-12 14:45:30 +08:00
|
|
|
_delayAddBodies.eraseObject(body);
|
2013-11-25 10:08:52 +08:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2015-01-06 10:29:07 +08:00
|
|
|
if (cpSpaceIsLocked(_cpSpace))
|
2013-11-25 10:08:52 +08:00
|
|
|
{
|
2013-12-07 10:48:02 +08:00
|
|
|
if (_delayRemoveBodies.getIndex(body) == CC_INVALID_INDEX)
|
2013-11-25 10:08:52 +08:00
|
|
|
{
|
2013-12-07 10:48:02 +08:00
|
|
|
_delayRemoveBodies.pushBack(body);
|
2013-11-25 10:08:52 +08:00
|
|
|
}
|
|
|
|
}else
|
|
|
|
{
|
|
|
|
doRemoveBody(body);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2013-11-25 17:57:06 +08:00
|
|
|
void PhysicsWorld::removeJoint(PhysicsJoint* joint, bool destroy)
|
|
|
|
{
|
2015-01-07 17:08:04 +08:00
|
|
|
if (joint)
|
2013-11-25 17:57:06 +08:00
|
|
|
{
|
2015-01-07 17:08:04 +08:00
|
|
|
if (joint->getWorld() != this && destroy)
|
2013-11-25 17:57:06 +08:00
|
|
|
{
|
2015-09-22 16:08:23 +08:00
|
|
|
CCLOG("physics warning: the joint is not in this world, it won't be destroyed until the body it connects is destroyed");
|
2015-01-07 17:08:04 +08:00
|
|
|
return;
|
2013-11-25 17:57:06 +08:00
|
|
|
}
|
2015-01-07 17:08:04 +08:00
|
|
|
|
2016-06-28 22:11:22 +08:00
|
|
|
joint->_destroyMark = destroy;
|
2015-09-25 18:12:16 +08:00
|
|
|
|
|
|
|
bool removedFromDelayAdd = false;
|
|
|
|
auto it = std::find(_delayAddJoints.begin(), _delayAddJoints.end(), joint);
|
|
|
|
if (it != _delayAddJoints.end())
|
|
|
|
{
|
|
|
|
_delayAddJoints.erase(it);
|
|
|
|
removedFromDelayAdd = true;
|
|
|
|
}
|
|
|
|
|
2015-01-07 17:08:04 +08:00
|
|
|
if (cpSpaceIsLocked(_cpSpace))
|
2013-11-25 17:57:06 +08:00
|
|
|
{
|
2015-09-25 18:12:16 +08:00
|
|
|
if (removedFromDelayAdd)
|
2015-01-07 17:08:04 +08:00
|
|
|
return;
|
|
|
|
if (std::find(_delayRemoveJoints.rbegin(), _delayRemoveJoints.rend(), joint) == _delayRemoveJoints.rend())
|
|
|
|
{
|
|
|
|
_delayRemoveJoints.push_back(joint);
|
|
|
|
}
|
2013-11-25 17:57:06 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2015-01-07 17:08:04 +08:00
|
|
|
doRemoveJoint(joint);
|
2013-11-25 17:57:06 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void PhysicsWorld::updateJoints()
|
|
|
|
{
|
2015-01-06 10:29:07 +08:00
|
|
|
if (cpSpaceIsLocked(_cpSpace))
|
2013-11-25 17:57:06 +08:00
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2015-01-07 17:08:04 +08:00
|
|
|
for (auto joint : _delayAddJoints)
|
2013-11-25 17:57:06 +08:00
|
|
|
{
|
2015-01-07 17:08:04 +08:00
|
|
|
joint->_world = this;
|
|
|
|
if (joint->initJoint())
|
|
|
|
{
|
|
|
|
_joints.push_back(joint);
|
|
|
|
}
|
|
|
|
else
|
2013-11-25 17:57:06 +08:00
|
|
|
{
|
|
|
|
delete joint;
|
|
|
|
}
|
|
|
|
}
|
2015-01-07 17:08:04 +08:00
|
|
|
_delayAddJoints.clear();
|
|
|
|
|
|
|
|
for (auto joint : _delayRemoveJoints)
|
|
|
|
{
|
|
|
|
doRemoveJoint(joint);
|
|
|
|
}
|
|
|
|
_delayRemoveJoints.clear();
|
2018-10-19 18:11:50 +08:00
|
|
|
|
|
|
|
for (auto joint : _joints) {
|
|
|
|
joint->flushDelayTasks();
|
|
|
|
}
|
2013-11-25 17:57:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void PhysicsWorld::removeShape(PhysicsShape* shape)
|
|
|
|
{
|
2015-01-06 10:29:07 +08:00
|
|
|
if (shape)
|
2013-11-25 17:57:06 +08:00
|
|
|
{
|
2015-01-06 10:29:07 +08:00
|
|
|
for (auto cps : shape->_cpShapes)
|
|
|
|
{
|
|
|
|
if (cpSpaceContainsShape(_cpSpace, cps))
|
|
|
|
{
|
|
|
|
cpSpaceRemoveShape(_cpSpace, cps);
|
|
|
|
}
|
|
|
|
}
|
2013-11-25 17:57:06 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-01-07 17:08:04 +08:00
|
|
|
void PhysicsWorld::addJoint(PhysicsJoint* joint)
|
2013-11-25 17:57:06 +08:00
|
|
|
{
|
2015-01-07 17:08:04 +08:00
|
|
|
if (joint)
|
2013-11-25 17:57:06 +08:00
|
|
|
{
|
2015-09-25 18:12:16 +08:00
|
|
|
CCASSERT(joint->getWorld() == nullptr, "Can not add joint already add to other world!");
|
2013-11-25 17:57:06 +08:00
|
|
|
|
2015-09-25 18:12:16 +08:00
|
|
|
joint->_world = this;
|
2015-01-07 17:08:04 +08:00
|
|
|
auto it = std::find(_delayRemoveJoints.begin(), _delayRemoveJoints.end(), joint);
|
|
|
|
if (it != _delayRemoveJoints.end())
|
2013-11-25 17:57:06 +08:00
|
|
|
{
|
2015-01-07 17:08:04 +08:00
|
|
|
_delayRemoveJoints.erase(it);
|
|
|
|
return;
|
2013-11-25 17:57:06 +08:00
|
|
|
}
|
|
|
|
|
2015-01-07 17:08:04 +08:00
|
|
|
if (std::find(_delayAddJoints.begin(), _delayAddJoints.end(), joint) == _delayAddJoints.end())
|
|
|
|
{
|
|
|
|
_delayAddJoints.push_back(joint);
|
|
|
|
}
|
2013-11-25 17:57:06 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void PhysicsWorld::removeAllJoints(bool destroy)
|
|
|
|
{
|
2015-01-07 17:08:04 +08:00
|
|
|
auto removeCopy = _joints;
|
|
|
|
for (auto joint : removeCopy)
|
2013-11-25 17:57:06 +08:00
|
|
|
{
|
2015-01-07 17:08:04 +08:00
|
|
|
removeJoint(joint, destroy);
|
2013-11-25 17:57:06 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-01-06 10:29:07 +08:00
|
|
|
void PhysicsWorld::addShape(PhysicsShape* physicsShape)
|
2013-11-25 17:57:06 +08:00
|
|
|
{
|
2015-01-06 10:29:07 +08:00
|
|
|
if (physicsShape)
|
2013-11-25 17:57:06 +08:00
|
|
|
{
|
2015-01-06 10:29:07 +08:00
|
|
|
for (auto shape : physicsShape->_cpShapes)
|
|
|
|
{
|
|
|
|
cpSpaceAddShape(_cpSpace, shape);
|
|
|
|
}
|
2013-11-25 17:57:06 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void PhysicsWorld::doRemoveBody(PhysicsBody* body)
|
|
|
|
{
|
|
|
|
CCASSERT(body != nullptr, "the body can not be nullptr");
|
|
|
|
|
2015-09-22 16:08:23 +08:00
|
|
|
// remove shapes
|
2013-12-07 14:28:14 +08:00
|
|
|
for (auto& shape : body->getShapes())
|
2013-11-25 17:57:06 +08:00
|
|
|
{
|
2013-12-11 22:09:59 +08:00
|
|
|
removeShape(shape);
|
2013-11-25 17:57:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
// remove body
|
2015-01-06 10:29:07 +08:00
|
|
|
if (cpSpaceContainsBody(_cpSpace, body->_cpBody))
|
|
|
|
{
|
|
|
|
cpSpaceRemoveBody(_cpSpace, body->_cpBody);
|
|
|
|
}
|
2013-11-25 17:57:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void PhysicsWorld::doRemoveJoint(PhysicsJoint* joint)
|
|
|
|
{
|
2015-01-06 10:29:07 +08:00
|
|
|
for (auto constraint : joint->_cpConstraints)
|
|
|
|
{
|
|
|
|
cpSpaceRemoveConstraint(_cpSpace, constraint);
|
|
|
|
}
|
2015-01-07 17:08:04 +08:00
|
|
|
_joints.remove(joint);
|
|
|
|
joint->_world = nullptr;
|
|
|
|
|
|
|
|
if (joint->getBodyA())
|
|
|
|
{
|
|
|
|
joint->getBodyA()->removeJoint(joint);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (joint->getBodyB())
|
|
|
|
{
|
|
|
|
joint->getBodyB()->removeJoint(joint);
|
|
|
|
}
|
|
|
|
|
2016-06-28 22:11:22 +08:00
|
|
|
if (joint->_destroyMark)
|
2015-01-07 17:08:04 +08:00
|
|
|
{
|
|
|
|
delete joint;
|
|
|
|
}
|
2013-11-25 17:57:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void PhysicsWorld::removeAllBodies()
|
|
|
|
{
|
2013-12-11 22:09:59 +08:00
|
|
|
for (auto& child : _bodies)
|
2013-11-25 17:57:06 +08:00
|
|
|
{
|
|
|
|
removeBodyOrDelay(child);
|
|
|
|
child->_world = nullptr;
|
|
|
|
}
|
|
|
|
|
2013-12-07 14:28:14 +08:00
|
|
|
_bodies.clear();
|
2013-11-25 17:57:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
void PhysicsWorld::setDebugDrawMask(int mask)
|
|
|
|
{
|
2017-06-05 10:56:52 +08:00
|
|
|
if (mask == DEBUGDRAW_NONE && _debugDraw)
|
2013-11-25 17:57:06 +08:00
|
|
|
{
|
2016-03-01 05:53:00 +08:00
|
|
|
_debugDraw->removeFromParent();
|
|
|
|
CC_SAFE_RELEASE_NULL(_debugDraw);
|
2013-11-25 17:57:06 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
_debugDrawMask = mask;
|
|
|
|
}
|
|
|
|
|
2013-12-07 14:28:14 +08:00
|
|
|
const Vector<PhysicsBody*>& PhysicsWorld::getAllBodies() const
|
2013-11-25 17:57:06 +08:00
|
|
|
{
|
|
|
|
return _bodies;
|
|
|
|
}
|
|
|
|
|
|
|
|
PhysicsBody* PhysicsWorld::getBody(int tag) const
|
|
|
|
{
|
2013-12-07 14:28:14 +08:00
|
|
|
for (auto& body : _bodies)
|
2013-11-25 17:57:06 +08:00
|
|
|
{
|
2013-12-07 14:28:14 +08:00
|
|
|
if (body->getTag() == tag)
|
2013-11-25 17:57:06 +08:00
|
|
|
{
|
2013-12-07 14:28:14 +08:00
|
|
|
return body;
|
2013-11-25 17:57:06 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
2015-09-18 11:48:43 +08:00
|
|
|
void PhysicsWorld::setGravity(const Vec2& gravity)
|
2013-11-25 17:57:06 +08:00
|
|
|
{
|
|
|
|
_gravity = gravity;
|
2015-01-06 10:29:07 +08:00
|
|
|
cpSpaceSetGravity(_cpSpace, PhysicsHelper::point2cpv(gravity));
|
2013-11-25 17:57:06 +08:00
|
|
|
}
|
|
|
|
|
2014-09-08 06:14:40 +08:00
|
|
|
void PhysicsWorld::setSubsteps(int steps)
|
|
|
|
{
|
|
|
|
if(steps > 0)
|
|
|
|
{
|
|
|
|
_substeps = steps;
|
|
|
|
if (steps > 1)
|
|
|
|
{
|
|
|
|
_updateRate = 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-06-12 12:45:21 +08:00
|
|
|
void PhysicsWorld::step(float delta)
|
|
|
|
{
|
|
|
|
if (_autoStep)
|
|
|
|
{
|
|
|
|
CCLOG("Physics Warning: You need to close auto step( setAutoStep(false) ) first");
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
update(delta, true);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void PhysicsWorld::update(float delta, bool userCall/* = false*/)
|
2013-11-25 17:57:06 +08:00
|
|
|
{
|
2018-10-16 16:37:51 +08:00
|
|
|
|
|
|
|
if(_preUpdateCallback) _preUpdateCallback(); //fix #11154
|
|
|
|
|
2015-09-08 09:54:01 +08:00
|
|
|
if(!_delayAddBodies.empty())
|
2015-01-27 16:13:45 +08:00
|
|
|
{
|
|
|
|
updateBodies();
|
|
|
|
}
|
|
|
|
else if (!_delayRemoveBodies.empty())
|
2013-11-25 17:57:06 +08:00
|
|
|
{
|
|
|
|
updateBodies();
|
2015-01-16 14:15:06 +08:00
|
|
|
}
|
2018-10-16 16:37:51 +08:00
|
|
|
|
2015-09-18 11:48:43 +08:00
|
|
|
auto sceneToWorldTransform = _scene->getNodeToParentTransform();
|
|
|
|
beforeSimulation(_scene, sceneToWorldTransform, 1.f, 1.f, 0.f);
|
|
|
|
|
2015-01-16 14:15:06 +08:00
|
|
|
if (!_delayAddJoints.empty() || !_delayRemoveJoints.empty())
|
|
|
|
{
|
2015-01-07 17:08:04 +08:00
|
|
|
updateJoints();
|
2013-11-25 17:57:06 +08:00
|
|
|
}
|
2018-10-16 16:37:51 +08:00
|
|
|
|
2015-04-10 17:01:21 +08:00
|
|
|
if (delta < FLT_EPSILON)
|
|
|
|
{
|
|
|
|
return;
|
|
|
|
}
|
2018-10-16 16:37:51 +08:00
|
|
|
|
2014-06-12 12:45:21 +08:00
|
|
|
if (userCall)
|
2013-12-13 16:26:26 +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
|
|
|
#if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
|
2016-03-01 05:53:00 +08:00
|
|
|
cpSpaceStep(_cpSpace, delta);
|
|
|
|
#else
|
|
|
|
cpHastySpaceStep(_cpSpace, delta);
|
|
|
|
#endif
|
2014-06-12 12:45:21 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
_updateTime += delta;
|
2016-03-01 05:53:00 +08:00
|
|
|
if(_fixedRate)
|
2014-06-12 12:45:21 +08:00
|
|
|
{
|
2016-03-01 05:53:00 +08:00
|
|
|
const float step = 1.0f / _fixedRate;
|
|
|
|
const float dt = step * _speed;
|
|
|
|
while(_updateTime>step)
|
2014-06-12 12:45:21 +08:00
|
|
|
{
|
2016-03-01 05:53:00 +08:00
|
|
|
_updateTime-=step;
|
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
|
|
|
#if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
|
2016-03-01 05:53:00 +08:00
|
|
|
cpSpaceStep(_cpSpace, dt);
|
|
|
|
#else
|
|
|
|
cpHastySpaceStep(_cpSpace, dt);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
if (++_updateRateCount >= _updateRate)
|
|
|
|
{
|
|
|
|
const float dt = _updateTime * _speed / _substeps;
|
|
|
|
for (int i = 0; i < _substeps; ++i)
|
|
|
|
{
|
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
|
|
|
#if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
|
2016-03-01 05:53:00 +08:00
|
|
|
cpSpaceStep(_cpSpace, dt);
|
|
|
|
#else
|
|
|
|
cpHastySpaceStep(_cpSpace, dt);
|
|
|
|
#endif
|
|
|
|
for (auto& body : _bodies)
|
|
|
|
{
|
|
|
|
body->update(dt);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
_updateRateCount = 0;
|
|
|
|
_updateTime = 0.0f;
|
2014-06-12 12:45:21 +08:00
|
|
|
}
|
2014-02-24 16:17:42 +08:00
|
|
|
}
|
2013-12-13 16:26:26 +08:00
|
|
|
}
|
2013-11-25 17:57:06 +08:00
|
|
|
|
|
|
|
if (_debugDrawMask != DEBUGDRAW_NONE)
|
|
|
|
{
|
|
|
|
debugDraw();
|
|
|
|
}
|
2015-09-18 11:48:43 +08:00
|
|
|
|
|
|
|
// Update physics position, should loop as the same sequence as node tree.
|
|
|
|
// PhysicsWorld::afterSimulation() will depend on the sequence.
|
|
|
|
afterSimulation(_scene, sceneToWorldTransform, 0.f);
|
2018-10-16 16:37:51 +08:00
|
|
|
|
|
|
|
if(_postUpdateCallback) _postUpdateCallback(); //fix #11154
|
2015-09-18 11:48:43 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
PhysicsWorld* PhysicsWorld::construct(Scene* scene)
|
|
|
|
{
|
|
|
|
PhysicsWorld * world = new (std::nothrow) PhysicsWorld();
|
|
|
|
if (world && world->init())
|
|
|
|
{
|
|
|
|
world->_scene = scene;
|
|
|
|
world->_eventDispatcher = scene->getEventDispatcher();
|
|
|
|
return world;
|
|
|
|
}
|
|
|
|
|
|
|
|
CC_SAFE_DELETE(world);
|
|
|
|
return nullptr;
|
2013-11-25 17:57:06 +08:00
|
|
|
}
|
|
|
|
|
2013-09-10 17:36:49 +08:00
|
|
|
PhysicsWorld::PhysicsWorld()
|
2014-05-15 01:07:09 +08:00
|
|
|
: _gravity(Vec2(0.0f, -98.0f))
|
2013-09-16 21:22:22 +08:00
|
|
|
, _speed(1.0f)
|
2013-12-13 16:26:26 +08:00
|
|
|
, _updateRate(1)
|
|
|
|
, _updateRateCount(0)
|
|
|
|
, _updateTime(0.0f)
|
2014-09-08 06:14:40 +08:00
|
|
|
, _substeps(1)
|
2016-03-01 05:53:00 +08:00
|
|
|
, _fixedRate(0)
|
2015-01-06 10:29:07 +08:00
|
|
|
, _cpSpace(nullptr)
|
2015-05-01 17:19:30 +08:00
|
|
|
, _updateBodyTransform(false)
|
2014-05-02 07:42:35 +08:00
|
|
|
, _scene(nullptr)
|
2014-06-12 12:45:21 +08:00
|
|
|
, _autoStep(true)
|
2013-11-08 14:25:03 +08:00
|
|
|
, _debugDraw(nullptr)
|
2015-03-13 06:47:58 +08:00
|
|
|
, _debugDrawMask(DEBUGDRAW_NONE)
|
2015-09-18 11:48:43 +08:00
|
|
|
, _eventDispatcher(nullptr)
|
2013-09-09 10:29:02 +08:00
|
|
|
{
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
PhysicsWorld::~PhysicsWorld()
|
|
|
|
{
|
2013-11-07 14:17:57 +08:00
|
|
|
removeAllJoints(true);
|
2013-10-29 17:31:35 +08:00
|
|
|
removeAllBodies();
|
2015-01-06 10:29:07 +08:00
|
|
|
if (_cpSpace)
|
|
|
|
{
|
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
|
|
|
#if CC_TARGET_PLATFORM == CC_PLATFORM_WIN32
|
2016-03-01 05:53:00 +08:00
|
|
|
cpSpaceFree(_cpSpace);
|
|
|
|
#else
|
|
|
|
cpHastySpaceFree(_cpSpace);
|
|
|
|
#endif
|
2015-01-06 10:29:07 +08:00
|
|
|
}
|
2016-03-01 05:53:00 +08:00
|
|
|
CC_SAFE_RELEASE_NULL(_debugDraw);
|
2013-11-08 14:25:03 +08:00
|
|
|
}
|
|
|
|
|
2015-09-18 11:48:43 +08:00
|
|
|
void PhysicsWorld::beforeSimulation(Node *node, const Mat4& parentToWorldTransform, float nodeParentScaleX, float nodeParentScaleY, float parentRotation)
|
|
|
|
{
|
|
|
|
auto scaleX = nodeParentScaleX * node->getScaleX();
|
|
|
|
auto scaleY = nodeParentScaleY * node->getScaleY();
|
|
|
|
auto rotation = parentRotation + node->getRotation();
|
|
|
|
|
|
|
|
auto nodeToWorldTransform = parentToWorldTransform * node->getNodeToParentTransform();
|
|
|
|
|
|
|
|
auto physicsBody = node->getPhysicsBody();
|
|
|
|
if (physicsBody)
|
|
|
|
{
|
|
|
|
physicsBody->beforeSimulation(parentToWorldTransform, nodeToWorldTransform, scaleX, scaleY, rotation);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (auto child : node->getChildren())
|
|
|
|
beforeSimulation(child, nodeToWorldTransform, scaleX, scaleY, rotation);
|
|
|
|
}
|
|
|
|
|
|
|
|
void PhysicsWorld::afterSimulation(Node *node, const Mat4& parentToWorldTransform, float parentRotation)
|
|
|
|
{
|
|
|
|
auto nodeToWorldTransform = parentToWorldTransform * node->getNodeToParentTransform();
|
|
|
|
auto nodeRotation = parentRotation + node->getRotation();
|
|
|
|
|
|
|
|
auto physicsBody = node->getPhysicsBody();
|
|
|
|
if (physicsBody)
|
|
|
|
{
|
|
|
|
physicsBody->afterSimulation(parentToWorldTransform, parentRotation);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (auto child : node->getChildren())
|
|
|
|
afterSimulation(child, nodeToWorldTransform, nodeRotation);
|
|
|
|
}
|
|
|
|
|
2018-10-16 16:37:51 +08:00
|
|
|
void PhysicsWorld::setPostUpdateCallback(const std::function<void()> &callback)
|
|
|
|
{
|
|
|
|
_postUpdateCallback = callback;
|
|
|
|
}
|
|
|
|
|
|
|
|
void PhysicsWorld::setPreUpdateCallback(const std::function<void()> &callback)
|
|
|
|
{
|
|
|
|
_preUpdateCallback = callback;
|
|
|
|
}
|
|
|
|
|
2013-09-09 10:40:31 +08:00
|
|
|
NS_CC_END
|
2013-09-16 21:22:22 +08:00
|
|
|
|
|
|
|
#endif // CC_USE_PHYSICS
|