Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

config for mac

This commit is contained in:
geron-cn 2015-07-23 15:13:14 +08:00
parent d46c8c6802
commit 7255b5308b
7 changed files with 74 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
build/cocos2d_libs.xcodeproj/project.pbxproj
View File

@ -3561,6 +3561,17 @@
B6DD2FF61B04825B00E47F5F /* fastlz.c in Sources */ = {isa = PBXBuildFile; fileRef = B6DD2FA51B04825B00E47F5F /* fastlz.c */; };
B6DD2FF71B04825B00E47F5F /* fastlz.h in Headers */ = {isa = PBXBuildFile; fileRef = B6DD2FA61B04825B00E47F5F /* fastlz.h */; };
B6DD2FF81B04825B00E47F5F /* fastlz.h in Headers */ = {isa = PBXBuildFile; fileRef = B6DD2FA61B04825B00E47F5F /* fastlz.h */; };
C50306691B60B583001E6D43 /* CCBoneNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C50306631B60B583001E6D43 /* CCBoneNode.cpp */; };
C503066A1B60B583001E6D43 /* CCBoneNode.h in Headers */ = {isa = PBXBuildFile; fileRef = C50306641B60B583001E6D43 /* CCBoneNode.h */; };
C503066B1B60B583001E6D43 /* CCSkeletonNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C50306651B60B583001E6D43 /* CCSkeletonNode.cpp */; };
C503066C1B60B583001E6D43 /* CCSkeletonNode.h in Headers */ = {isa = PBXBuildFile; fileRef = C50306661B60B583001E6D43 /* CCSkeletonNode.h */; };
C503066D1B60B583001E6D43 /* CCSkinNode.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C50306671B60B583001E6D43 /* CCSkinNode.cpp */; };
C503066E1B60B583001E6D43 /* CCSkinNode.h in Headers */ = {isa = PBXBuildFile; fileRef = C50306681B60B583001E6D43 /* CCSkinNode.h */; };
C50306751B60B5B2001E6D43 /* BoneNodeReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C50306701B60B5B2001E6D43 /* BoneNodeReader.cpp */; };
C50306761B60B5B2001E6D43 /* BoneNodeReader.h in Headers */ = {isa = PBXBuildFile; fileRef = C50306711B60B5B2001E6D43 /* BoneNodeReader.h */; };
C50306771B60B5B2001E6D43 /* CSBoneBinary_generated.h in Headers */ = {isa = PBXBuildFile; fileRef = C50306721B60B5B2001E6D43 /* CSBoneBinary_generated.h */; };
C50306781B60B5B2001E6D43 /* SkeletonNodeReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C50306731B60B5B2001E6D43 /* SkeletonNodeReader.cpp */; };
C50306791B60B5B2001E6D43 /* SkeletonNodeReader.h in Headers */ = {isa = PBXBuildFile; fileRef = C50306741B60B5B2001E6D43 /* SkeletonNodeReader.h */; };
D0FD03491A3B51AA00825BB5 /* CCAllocatorBase.h in Headers */ = {isa = PBXBuildFile; fileRef = D0FD033B1A3B51AA00825BB5 /* CCAllocatorBase.h */; };
D0FD034A1A3B51AA00825BB5 /* CCAllocatorBase.h in Headers */ = {isa = PBXBuildFile; fileRef = D0FD033B1A3B51AA00825BB5 /* CCAllocatorBase.h */; };
D0FD034B1A3B51AA00825BB5 /* CCAllocatorDiagnostics.cpp in Sources */ = {isa = PBXBuildFile; fileRef = D0FD033C1A3B51AA00825BB5 /* CCAllocatorDiagnostics.cpp */; };
@ -5477,6 +5488,17 @@
B6DD2FA31B04825B00E47F5F /* DetourTileCacheBuilder.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DetourTileCacheBuilder.h; sourceTree = "<group>"; };
B6DD2FA51B04825B00E47F5F /* fastlz.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = fastlz.c; sourceTree = "<group>"; };
B6DD2FA61B04825B00E47F5F /* fastlz.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = fastlz.h; sourceTree = "<group>"; };
C50306631B60B583001E6D43 /* CCBoneNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCBoneNode.cpp; sourceTree = "<group>"; };
C50306641B60B583001E6D43 /* CCBoneNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCBoneNode.h; sourceTree = "<group>"; };
C50306651B60B583001E6D43 /* CCSkeletonNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCSkeletonNode.cpp; sourceTree = "<group>"; };
C50306661B60B583001E6D43 /* CCSkeletonNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSkeletonNode.h; sourceTree = "<group>"; };
C50306671B60B583001E6D43 /* CCSkinNode.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCSkinNode.cpp; sourceTree = "<group>"; };
C50306681B60B583001E6D43 /* CCSkinNode.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCSkinNode.h; sourceTree = "<group>"; };
C50306701B60B5B2001E6D43 /* BoneNodeReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = BoneNodeReader.cpp; path = SkeletonReader/BoneNodeReader.cpp; sourceTree = "<group>"; };
C50306711B60B5B2001E6D43 /* BoneNodeReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = BoneNodeReader.h; path = SkeletonReader/BoneNodeReader.h; sourceTree = "<group>"; };
C50306721B60B5B2001E6D43 /* CSBoneBinary_generated.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = CSBoneBinary_generated.h; path = SkeletonReader/CSBoneBinary_generated.h; sourceTree = "<group>"; };
C50306731B60B5B2001E6D43 /* SkeletonNodeReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = SkeletonNodeReader.cpp; path = SkeletonReader/SkeletonNodeReader.cpp; sourceTree = "<group>"; };
C50306741B60B5B2001E6D43 /* SkeletonNodeReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SkeletonNodeReader.h; path = SkeletonReader/SkeletonNodeReader.h; sourceTree = "<group>"; };
D0FD033B1A3B51AA00825BB5 /* CCAllocatorBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAllocatorBase.h; sourceTree = "<group>"; };
D0FD033C1A3B51AA00825BB5 /* CCAllocatorDiagnostics.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CCAllocatorDiagnostics.cpp; sourceTree = "<group>"; };
D0FD033D1A3B51AA00825BB5 /* CCAllocatorDiagnostics.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CCAllocatorDiagnostics.h; sourceTree = "<group>"; };
@ -5547,6 +5569,7 @@
0634A4C4194B19E400E608AF /* ActionTimeline */ = {
isa = PBXGroup;
children = (
C50306621B60B56C001E6D43 /* Skeleton */,
4D76BE381A4AAF0A00102962 /* CCActionTimelineNode.cpp */,
4D76BE391A4AAF0A00102962 /* CCActionTimelineNode.h */,
38B8E2D319E66581002D7CE7 /* CSLoader.cpp */,
@ -7557,6 +7580,7 @@
50FCEB6818C72017004AD434 /* WidgetReader */ = {
isa = PBXGroup;
children = (
C503066F1B60B590001E6D43 /* SkeletonReader */,
18956BAF1A9DFBEC006E9155 /* Particle3DReader */,
182C5CE21A9D70C000C30D34 /* UserCameraReader */,
182C5CD31A98F2F400C30D34 /* Sprite3DReader */,
@ -8785,6 +8809,31 @@
path = ../external/recast/fastlz;
sourceTree = "<group>";
};
C50306621B60B56C001E6D43 /* Skeleton */ = {
isa = PBXGroup;
children = (
C50306631B60B583001E6D43 /* CCBoneNode.cpp */,
C50306641B60B583001E6D43 /* CCBoneNode.h */,
C50306651B60B583001E6D43 /* CCSkeletonNode.cpp */,
C50306661B60B583001E6D43 /* CCSkeletonNode.h */,
C50306671B60B583001E6D43 /* CCSkinNode.cpp */,
C50306681B60B583001E6D43 /* CCSkinNode.h */,
);
name = Skeleton;
sourceTree = "<group>";
};
C503066F1B60B590001E6D43 /* SkeletonReader */ = {
isa = PBXGroup;
children = (
C50306701B60B5B2001E6D43 /* BoneNodeReader.cpp */,
C50306711B60B5B2001E6D43 /* BoneNodeReader.h */,
C50306721B60B5B2001E6D43 /* CSBoneBinary_generated.h */,
C50306731B60B5B2001E6D43 /* SkeletonNodeReader.cpp */,
C50306741B60B5B2001E6D43 /* SkeletonNodeReader.h */,
);
name = SkeletonReader;
sourceTree = "<group>";
};
D0FD03391A3B51AA00825BB5 /* allocator */ = {
isa = PBXGroup;
children = (
@ -8932,6 +8981,7 @@
15AE187B19AAD33D00C27E9E /* CCBAnimationManager.h in Headers */,
B665E2841AA80A6500DDB1C5 /* CCPUDoStopSystemEventHandler.h in Headers */,
B6CAB52D1AF9AA1A00B9B856 /* btSerializer.h in Headers */,
C503066C1B60B583001E6D43 /* CCSkeletonNode.h in Headers */,
B665E3E01AA80A6600DDB1C5 /* CCPUSimpleSpline.h in Headers */,
B6DD2FAD1B04825B00E47F5F /* DetourDebugDraw.h in Headers */,
B665E42C1AA80A6600DDB1C5 /* CCPUVelocityMatchingAffector.h in Headers */,
@ -8962,6 +9012,7 @@
1A570073180BC5A10088DEC7 /* CCActionGrid.h in Headers */,
15AE1BCC19AAE01E00C27E9E /* CCControlButton.h in Headers */,
B6CAB3D71AF9AA1A00B9B856 /* btSolve2LinearConstraint.h in Headers */,
C50306771B60B5B2001E6D43 /* CSBoneBinary_generated.h in Headers */,
B6CAB3E51AF9AA1A00B9B856 /* btActionInterface.h in Headers */,
5034CA3B191D591100CE6051 /* ccShader_PositionColor.vert in Headers */,
B665E3101AA80A6500DDB1C5 /* CCPUObserver.h in Headers */,
@ -9191,6 +9242,7 @@
1A5701F0180BCB8C0088DEC7 /* CCTransitionProgress.h in Headers */,
1A5701F9180BCBAD0088DEC7 /* CCMenu.h in Headers */,
B6CAB4A11AF9AA1A00B9B856 /* PosixThreadSupport.h in Headers */,
C50306791B60B5B2001E6D43 /* SkeletonNodeReader.h in Headers */,
B665E3001AA80A6500DDB1C5 /* CCPUMaterialTranslator.h in Headers */,
B665E33C1AA80A6500DDB1C5 /* CCPUOnEventFlagObserver.h in Headers */,
50ABBD401925AB0000A911A9 /* CCMath.h in Headers */,
@ -9336,6 +9388,7 @@
1A57028C180BCC900088DEC7 /* CCSpriteFrameCache.h in Headers */,
B6CAB21D1AF9AA1A00B9B856 /* btBoxBoxCollisionAlgorithm.h in Headers */,
B6CAAFEC1AF9A9E100B9B856 /* CCPhysics3DConstraint.h in Headers */,
C503066E1B60B583001E6D43 /* CCSkinNode.h in Headers */,
5027253A190BF1B900AAF4ED /* cocos2d.h in Headers */,
B665E3041AA80A6500DDB1C5 /* CCPUMeshSurfaceEmitter.h in Headers */,
15AE1B5A19AADA9900C27E9E /* UIText.h in Headers */,
@ -9534,6 +9587,7 @@
B6CAB2E31AF9AA1A00B9B856 /* btShapeHull.h in Headers */,
B29A7E0D19EE1B7700872B35 /* Bone.h in Headers */,
15AE186719AAD31D00C27E9E /* CDXMacOSXSupport.h in Headers */,
C503066A1B60B583001E6D43 /* CCBoneNode.h in Headers */,
B6CAB5131AF9AA1A00B9B856 /* btMatrixX.h in Headers */,
B6CAB4091AF9AA1A00B9B856 /* btMultiBodyJointLimitConstraint.h in Headers */,
B6CAB4B91AF9AA1A00B9B856 /* SpuFakeDma.h in Headers */,
@ -9642,6 +9696,7 @@
B24AA987195A675C007B4522 /* CCFastTMXLayer.h in Headers */,
15AE188F19AAD33D00C27E9E /* CCLabelTTFLoader.h in Headers */,
50ABBEBD1925AB6F00A911A9 /* ccUtils.h in Headers */,
C50306761B60B5B2001E6D43 /* BoneNodeReader.h in Headers */,
B6CAB4171AF9AA1A00B9B856 /* btMultiBodySolverConstraint.h in Headers */,
15AE19A119AAD39600C27E9E /* TextAtlasReader.h in Headers */,
50ABC0231926664800A911A9 /* CCGLViewImpl-desktop.h in Headers */,
@ -10890,6 +10945,7 @@
46A170E61807CECA005B8026 /* CCPhysicsBody.cpp in Sources */,
B665E40A1AA80A6600DDB1C5 /* CCPUSphereSurfaceEmitterTranslator.cpp in Sources */,
B677B0D91B18492D006762CB /* CCNavMeshUtils.cpp in Sources */,
C503066D1B60B583001E6D43 /* CCSkinNode.cpp in Sources */,
50ABBDA71925AB4100A911A9 /* CCRenderCommand.cpp in Sources */,
B665E35E1AA80A6500DDB1C5 /* CCPUOnRandomObserverTranslator.cpp in Sources */,
B6CAB2931AF9AA1A00B9B856 /* btCompoundShape.cpp in Sources */,
@ -11091,6 +11147,7 @@
1A5701A5180BCB590088DEC7 /* CCFontAtlasCache.cpp in Sources */,
15AE1A7A19AAD40300C27E9E /* b2PolygonContact.cpp in Sources */,
3823842F1A259112002C4610 /* ParticleReader.cpp in Sources */,
C503066B1B60B583001E6D43 /* CCSkeletonNode.cpp in Sources */,
15AE191119AAD35000C27E9E /* CCProcessBase.cpp in Sources */,
B6CAB2B31AF9AA1A00B9B856 /* btConvexShape.cpp in Sources */,
15AE18EE19AAD35000C27E9E /* CCArmature.cpp in Sources */,
@ -11112,6 +11169,7 @@
B6CAB4C51AF9AA1A00B9B856 /* boxBoxDistance.cpp in Sources */,
B6CAB29F1AF9AA1A00B9B856 /* btConvex2dShape.cpp in Sources */,
B6CAB4331AF9AA1A00B9B856 /* btGpu3DGridBroadphase.cpp in Sources */,
C50306691B60B583001E6D43 /* CCBoneNode.cpp in Sources */,
85B3743A1B204B9400C488D6 /* clipper.cpp in Sources */,
15AE1A8819AAD40300C27E9E /* b2PrismaticJoint.cpp in Sources */,
182C5CB21A95964700C30D34 /* Node3DReader.cpp in Sources */,
@ -11183,6 +11241,7 @@
B665E2CE1AA80A6500DDB1C5 /* CCPUInterParticleCollider.cpp in Sources */,
50ABBDAD1925AB4100A911A9 /* CCRenderer.cpp in Sources */,
15AE199019AAD37200C27E9E /* ImageViewReader.cpp in Sources */,
C50306781B60B5B2001E6D43 /* SkeletonNodeReader.cpp in Sources */,
B6CAB3DD1AF9AA1A00B9B856 /* btTypedConstraint.cpp in Sources */,
B665E28A1AA80A6500DDB1C5 /* CCPUDynamicAttribute.cpp in Sources */,
B665E2A21AA80A6500DDB1C5 /* CCPUEventHandlerManager.cpp in Sources */,
@ -11198,6 +11257,7 @@
1A1645B2191B726C008C7C7F /* ConvertUTFWrapper.cpp in Sources */,
B665E3B21AA80A6500DDB1C5 /* CCPURendererTranslator.cpp in Sources */,
15AE1BC919AAE01E00C27E9E /* CCControl.cpp in Sources */,
C50306751B60B5B2001E6D43 /* BoneNodeReader.cpp in Sources */,
B6CAB3BF1AF9AA1A00B9B856 /* btHinge2Constraint.cpp in Sources */,
B29A7DD119EE1B7700872B35 /* Skin.c in Sources */,
B6CAB1F51AF9AA1A00B9B856 /* btDbvt.cpp in Sources */,

31
cocos/editor-support/cocostudio/ActionTimeline/CCBoneNode.cpp
View File

@ -259,37 +259,6 @@ cocos2d::Rect BoneNode::getVisibleSkinsRect() const
return displayRect;
}
AffineTransform BoneNode::getBoneToSkeletonAffineTransform() const
{
auto retTrans = AffineTransform::IDENTITY;
if (_rootSkeleton == nullptr)
{
CCLOG("can not tranform before added to Skeleton");
return retTrans;
}
retTrans = this->getNodeToParentAffineTransform();
for (Node *p = _parent; p != _rootSkeleton; p = p->getParent())
retTrans = AffineTransformConcat(retTrans, p->getNodeToParentAffineTransform());
return retTrans;
}
Mat4 BoneNode::getBoneToSkeletonTransform() const
{
auto retMat = Mat4::IDENTITY;
if (_rootSkeleton == nullptr)
{
CCLOG("can not tranform before added to Skeleton");
return retMat;
}
retMat = this->getNodeToParentTransform();
for (Node *p = _parent; p != _rootSkeleton; p = p->getParent())
{
retMat = p->getNodeToParentTransform() * retMat;
}
return retMat;
}
void BoneNode::setBlendFunc(const BlendFunc &blendFunc)
{
_blendFunc = blendFunc;

7
cocos/editor-support/cocostudio/ActionTimeline/CCBoneNode.h
View File

@ -134,16 +134,13 @@ public:
virtual void setContentSize(const cocos2d::Size& contentSize);
virtual void setAnchorPoint(const cocos2d::Vec2& anchorPoint);
cocos2d::AffineTransform getBoneToSkeletonAffineTransform() const;
cocos2d::Mat4 getBoneToSkeletonTransform() const;
#ifdef CC_STUDIO_ENABLED_VIEW
// hit test , bonePoint is in self coordinate
virtual bool isPointOnRack(const cocos2d::Vec2& bonePoint);
#endif
CC_CONSTRUCTOR_ACCESS :
CC_CONSTRUCTOR_ACCESS:
BoneNode();
virtual ~BoneNode();
virtual bool init() override;

3
cocos/editor-support/cocostudio/ActionTimeline/CCSkeletonNode.cpp
View File

@ -73,7 +73,8 @@ Rect SkeletonNode::getBoundingBox() const
auto allbones = getAllSubBones();
for (const auto& bone : allbones)
{
Rect r = RectApplyAffineTransform(bone->getVisibleSkinsRect(), bone->getBoneToSkeletonAffineTransform());
Rect r = RectApplyAffineTransform(bone->getVisibleSkinsRect(),
bone->getNodeToParentAffineTransform(bone->getRootSkeletonNode()));
if (r.equals(Rect::ZERO))
continue;

5
cocos/editor-support/cocostudio/ActionTimeline/CCSkeletonNode.h
View File

@ -72,11 +72,12 @@ public:
cocos2d::Rect getBoundingBox() const override;
protected:
CC_CONSTRUCTOR_ACCESS:
SkeletonNode();
virtual ~SkeletonNode();
virtual bool init() override;
protected:
virtual void updateVertices() override;
virtual void updateColor() override;

10
cocos/editor-support/cocostudio/WidgetReader/SkeletonReader/BoneNodeReader.cpp
View File

@ -69,12 +69,12 @@ Offset<Table> BoneNodeReader::createOptionsWithFlatBuffers(const tinyxml2::XMLEl
std::string name = child->Name();
if (name == "BlendFunc")
{
const tinyxml2::XMLAttribute* attribute = child->FirstAttribute();
const tinyxml2::XMLAttribute* battribute = child->FirstAttribute();
while (attribute)
while (battribute)
{
name = attribute->Name();
std::string value = attribute->Value();
name = battribute->Name();
std::string value = battribute->Value();
if (name == "Src")
{
@ -85,7 +85,7 @@ Offset<Table> BoneNodeReader::createOptionsWithFlatBuffers(const tinyxml2::XMLEl
blendFunc.dst = atoi(value.c_str());
}
attribute = attribute->Next();
battribute = battribute->Next();
}
}

4
tests/cpp-tests/Classes/ExtensionsTest/CocoStudioActionTimelineTest/ActionTimelineTestScene.cpp
View File

@ -411,7 +411,7 @@ void TestActionTimelineSkeleton::onEnter()
auto skeletonToP = skeletonNode->getNodeToParentAffineTransform();
auto bonePtoSkeletonPTrans = AffineTransformConcat(
static_cast<BoneNode*>((weaponHandeBone->getParent())
)->getBoneToSkeletonAffineTransform(),
)->getNodeToParentAffineTransform(skeletonNode),
skeletonToP);
leftbottom = PointApplyAffineTransform(leftbottom, bonePtoSkeletonPTrans);
righttop = PointApplyAffineTransform(righttop, bonePtoSkeletonPTrans);
@ -432,7 +432,7 @@ void TestActionTimelineSkeleton::onEnter()
lefttop.x = rect.getMinX(); lefttop.y = rect.getMaxY();
rightbottom.x = rect.getMaxX(); rightbottom.y = rect.getMinY();
auto boneToSkeletonParentTrans = AffineTransformConcat(
weaponHandeBone->getBoneToSkeletonAffineTransform(), skeletonToP);
weaponHandeBone->getNodeToParentAffineTransform(skeletonNode), skeletonToP);
leftbottom = PointApplyAffineTransform(leftbottom, boneToSkeletonParentTrans);
righttop = PointApplyAffineTransform(righttop, boneToSkeletonParentTrans);
lefttop = PointApplyAffineTransform(lefttop, boneToSkeletonParentTrans);