Ported my fixes and optimization to spine stable

This commit is contained in:
unknown 2019-07-01 17:15:03 +02:00
parent ee61fe3b8f
commit c8a34cdbd5
2 changed files with 1135 additions and 979 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,30 +1,31 @@
/****************************************************************************** /******************************************************************************
* Spine Runtimes License Agreement * Spine Runtimes Software License v2.5
* Last updated May 1, 2019. Replaces all prior versions.
* *
* Copyright (c) 2013-2019, Esoteric Software LLC * Copyright (c) 2013-2016, Esoteric Software
* All rights reserved.
* *
* Integration of the Spine Runtimes into software or otherwise creating * You are granted a perpetual, non-exclusive, non-sublicensable, and
* derivative works of the Spine Runtimes is permitted under the terms and * non-transferable license to use, install, execute, and perform the Spine
* conditions of Section 2 of the Spine Editor License Agreement: * Runtimes software and derivative works solely for personal or internal
* http://esotericsoftware.com/spine-editor-license * use. Without the written permission of Esoteric Software (see Section 2 of
* the Spine Software License Agreement), you may not (a) modify, translate,
* adapt, or develop new applications using the Spine Runtimes or otherwise
* create derivative works or improvements of the Spine Runtimes or (b) remove,
* delete, alter, or obscure any trademarks or any copyright, trademark, patent,
* or other intellectual property or proprietary rights notices on or in the
* Software, including any copy thereof. Redistributions in binary or source
* form must include this license and terms.
* *
* Otherwise, it is permitted to integrate the Spine Runtimes into software * THIS SOFTWARE IS PROVIDED BY ESOTERIC SOFTWARE "AS IS" AND ANY EXPRESS OR
* or otherwise create derivative works of the Spine Runtimes (collectively, * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* "Products"), provided that each user of the Products must obtain their own * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
* Spine Editor license and redistribution of the Products in any form must * EVENT SHALL ESOTERIC SOFTWARE BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* include this license and copyright notice. * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, BUSINESS INTERRUPTION, OR LOSS OF
* THIS SOFTWARE IS PROVIDED BY ESOTERIC SOFTWARE LLC "AS IS" AND ANY EXPRESS * USE, DATA, OR PROFITS) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* NO EVENT SHALL ESOTERIC SOFTWARE LLC BE LIABLE FOR ANY DIRECT, INDIRECT, * POSSIBILITY OF SUCH DAMAGE.
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES, BUSINESS
* INTERRUPTION, OR LOSS OF USE, DATA, OR PROFITS) HOWEVER CAUSED AND ON ANY
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*****************************************************************************/ *****************************************************************************/
#ifndef SPINE_SKELETONRENDERER_H_ #ifndef SPINE_SKELETONRENDERER_H_
@ -35,127 +36,130 @@
namespace spine { namespace spine {
class AttachmentVertices; class AttachmentVertices;
/* Draws a skeleton. */ /* Draws a skeleton. */
class SkeletonRenderer: public cocos2d::Node, public cocos2d::BlendProtocol { class SkeletonRenderer: public cocos2d::Node, public cocos2d::BlendProtocol {
public: public:
CREATE_FUNC(SkeletonRenderer); CREATE_FUNC(SkeletonRenderer);
static SkeletonRenderer* createWithSkeleton(Skeleton* skeleton, bool ownsSkeleton = false, bool ownsSkeletonData = false); static SkeletonRenderer* createWithSkeleton(Skeleton* skeleton, bool ownsSkeleton = false, bool ownsSkeletonData = false);
static SkeletonRenderer* createWithData (SkeletonData* skeletonData, bool ownsSkeletonData = false); static SkeletonRenderer* createWithData (SkeletonData* skeletonData, bool ownsSkeletonData = false);
static SkeletonRenderer* createWithFile (const std::string& skeletonDataFile, Atlas* atlas, float scale = 1); static SkeletonRenderer* createWithFile (const std::string& skeletonDataFile, Atlas* atlas, float scale = 1);
static SkeletonRenderer* createWithFile (const std::string& skeletonDataFile, const std::string& atlasFile, float scale = 1); static SkeletonRenderer* createWithFile (const std::string& skeletonDataFile, const std::string& atlasFile, float scale = 1);
virtual void update (float deltaTime) override; void update (float deltaTime) override;
virtual void draw (cocos2d::Renderer* renderer, const cocos2d::Mat4& transform, uint32_t transformFlags) override; void draw (cocos2d::Renderer* renderer, const cocos2d::Mat4& transform, uint32_t transformFlags) override;
virtual void drawDebug (cocos2d::Renderer* renderer, const cocos2d::Mat4& transform, uint32_t transformFlags); //virtual bool isAutoCulled () const override;
virtual cocos2d::Rect getBoundingBox () const override; cocos2d::Rect getBoundingBox () const override;
virtual void onEnter () override; void onEnter () override;
virtual void onExit () override; void onExit () override;
Skeleton* getSkeleton(); Skeleton* getSkeleton() const;
void setTimeScale(float scale); void setTimeScale(float scale);
float getTimeScale() const; float getTimeScale() const;
/* */ /* */
void setDebugSlotsEnabled(bool enabled); void setDebugSlotsEnabled(bool enabled);
bool getDebugSlotsEnabled() const; bool getDebugSlotsEnabled() const;
void setDebugBonesEnabled(bool enabled); void setDebugBonesEnabled(bool enabled);
bool getDebugBonesEnabled() const; bool getDebugBonesEnabled() const;
void setDebugMeshesEnabled(bool enabled); void setDebugMeshesEnabled(bool enabled);
bool getDebugMeshesEnabled() const; bool getDebugMeshesEnabled() const;
// --- Convenience methods for common Skeleton_* functions. void setDebugBoundingRectEnabled(bool enabled);
void updateWorldTransform (); bool getDebugBoundingRectEnabled() const;
void setToSetupPose (); // --- Convenience methods for common Skeleton_* functions.
void setBonesToSetupPose (); void updateWorldTransform ();
void setSlotsToSetupPose ();
/* Returns 0 if the bone was not found. */ void setToSetupPose ();
Bone* findBone (const std::string& boneName) const; void setBonesToSetupPose ();
/* Returns 0 if the slot was not found. */ void setSlotsToSetupPose ();
Slot* findSlot (const std::string& slotName) const;
/* Sets the skin used to look up attachments not found in the SkeletonData defaultSkin. Attachments from the new skin are /* Returns 0 if the bone was not found. */
* attached if the corresponding attachment from the old skin was attached. Bone* findBone (const std::string& boneName) const;
* @param skin May be empty string ("") for no skin.*/ /* Returns 0 if the slot was not found. */
void setSkin (const std::string& skinName); Slot* findSlot (const std::string& slotName) const;
/** @param skin May be 0 for no skin.*/
void setSkin (const char* skinName);
/* Returns 0 if the slot or attachment was not found. */ /* Sets the skin used to look up attachments not found in the SkeletonData defaultSkin. Attachments from the new skin are
Attachment* getAttachment (const std::string& slotName, const std::string& attachmentName) const; * attached if the corresponding attachment from the old skin was attached. Returns false if the skin was not found.
/* Returns false if the slot or attachment was not found. * @param skin May be empty string ("") for no skin.*/
* @param attachmentName May be empty string ("") for no attachment. */ void setSkin (const std::string& skinName);
bool setAttachment (const std::string& slotName, const std::string& attachmentName); /** @param skin May be 0 for no skin.*/
/* @param attachmentName May be 0 for no attachment. */ void setSkin (const char* skinName);
bool setAttachment (const std::string& slotName, const char* attachmentName);
/* Enables/disables two color tinting for this instance. May break batching */ /* Returns 0 if the slot or attachment was not found. */
void setTwoColorTint(bool enabled); Attachment* getAttachment (const std::string& slotName, const std::string& attachmentName) const;
/* Whether two color tinting is enabled */ /* Returns false if the slot or attachment was not found.
bool isTwoColorTint(); * @param attachmentName May be empty string ("") for no attachment. */
bool setAttachment (const std::string& slotName, const std::string& attachmentName);
/* @param attachmentName May be 0 for no attachment. */
bool setAttachment (const std::string& slotName, const char* attachmentName);
/* Sets the vertex effect to be used, set to 0 to disable vertex effects */ /* Enables/disables two color tinting for this instance. May break batching */
void setVertexEffect(VertexEffect* effect); void setTwoColorTint(bool enabled);
/* Whether two color tinting is enabled */
bool isTwoColorTint();
/* Sets the range of slots that should be rendered. Use -1, -1 to clear the range */ /* Sets the vertex effect to be used, set to 0 to disable vertex effects */
void setSlotsRange(int startSlotIndex, int endSlotIndex); void setVertexEffect(VertexEffect* effect);
// --- BlendProtocol /* Sets the range of slots that should be rendered. Use -1, -1 to clear the range */
virtual void setBlendFunc (const cocos2d::BlendFunc& blendFunc)override; void setSlotsRange(int startSlotIndex, int endSlotIndex);
virtual const cocos2d::BlendFunc& getBlendFunc () const override;
virtual void setOpacityModifyRGB (bool value) override;
virtual bool isOpacityModifyRGB () const override;
// Frees global memory used for temporay vertex transformations. // --- BlendProtocol
static void destroyScratchBuffers(); void setBlendFunc (const cocos2d::BlendFunc& blendFunc)override;
const cocos2d::BlendFunc& getBlendFunc () const override;
void setOpacityModifyRGB (bool value) override;
bool isOpacityModifyRGB () const override;
CC_CONSTRUCTOR_ACCESS: CC_CONSTRUCTOR_ACCESS:
SkeletonRenderer (); SkeletonRenderer ();
SkeletonRenderer(Skeleton* skeleton, bool ownsSkeleton = false, bool ownsSkeletonData = false, bool ownsAtlas = false); SkeletonRenderer(Skeleton* skeleton, bool ownsSkeleton = false, bool ownsSkeletonData = false, bool ownsAtlas = false);
SkeletonRenderer (SkeletonData* skeletonData, bool ownsSkeletonData = false); SkeletonRenderer (SkeletonData* skeletonData, bool ownsSkeletonData = false);
SkeletonRenderer (const std::string& skeletonDataFile, Atlas* atlas, float scale = 1); SkeletonRenderer (const std::string& skeletonDataFile, Atlas* atlas, float scale = 1);
SkeletonRenderer (const std::string& skeletonDataFile, const std::string& atlasFile, float scale = 1); SkeletonRenderer (const std::string& skeletonDataFile, const std::string& atlasFile, float scale = 1);
virtual ~SkeletonRenderer (); virtual ~SkeletonRenderer ();
void initWithSkeleton(Skeleton* skeleton, bool ownsSkeleton = false, bool ownsSkeletonData = false, bool ownsAtlas = false); void initWithSkeleton(Skeleton* skeleton, bool ownsSkeleton = false, bool ownsSkeletonData = false, bool ownsAtlas = false);
void initWithData (SkeletonData* skeletonData, bool ownsSkeletonData = false); void initWithData (SkeletonData* skeletonData, bool ownsSkeletonData = false);
void initWithJsonFile (const std::string& skeletonDataFile, Atlas* atlas, float scale = 1); void initWithJsonFile (const std::string& skeletonDataFile, Atlas* atlas, float scale = 1);
void initWithJsonFile (const std::string& skeletonDataFile, const std::string& atlasFile, float scale = 1); void initWithJsonFile (const std::string& skeletonDataFile, const std::string& atlasFile, float scale = 1);
void initWithBinaryFile (const std::string& skeletonDataFile, Atlas* atlas, float scale = 1); void initWithBinaryFile (const std::string& skeletonDataFile, Atlas* atlas, float scale = 1);
void initWithBinaryFile (const std::string& skeletonDataFile, const std::string& atlasFile, float scale = 1); void initWithBinaryFile (const std::string& skeletonDataFile, const std::string& atlasFile, float scale = 1);
virtual void initialize (); virtual void initialize ();
protected: protected:
void setSkeletonData (SkeletonData* skeletonData, bool ownsSkeletonData); void setSkeletonData (SkeletonData* skeletonData, bool ownsSkeletonData);
void setupGLProgramState(bool twoColorTintEnabled); void setupGLProgramState(bool twoColorTintEnabled);
virtual void drawDebug (cocos2d::Renderer* renderer, const cocos2d::Mat4& transform, uint32_t transformFlags);
bool _ownsSkeletonData; bool _ownsSkeletonData;
bool _ownsSkeleton; bool _ownsSkeleton;
bool _ownsAtlas; bool _ownsAtlas = false;
Atlas* _atlas; Atlas* _atlas;
AttachmentLoader* _attachmentLoader; AttachmentLoader* _attachmentLoader;
cocos2d::CustomCommand _debugCommand; cocos2d::CustomCommand _debugCommand;
cocos2d::BlendFunc _blendFunc; cocos2d::BlendFunc _blendFunc;
bool _premultipliedAlpha; bool _premultipliedAlpha;
Skeleton* _skeleton; Skeleton* _skeleton;
float _timeScale; float _timeScale;
bool _debugSlots; bool _debugSlots;
bool _debugBones; bool _debugBones;
bool _debugMeshes; bool _debugMeshes;
SkeletonClipping* _clipper; bool _debugBoundingRect;
VertexEffect* _effect; SkeletonClipping* _clipper;
VertexEffect* _effect;
cocos2d::Rect _boundingRect;
int _startSlotIndex; int _startSlotIndex;
int _endSlotIndex; int _endSlotIndex;
}; };
} }