mirror of
https://github.com/EsotericSoftware/spine-runtimes.git
synced 2026-02-23 10:11:23 +08:00
Ported my fixes and optimization to spine stable
This commit is contained in:
parent
ee61fe3b8f
commit
c8a34cdbd5
File diff suppressed because it is too large
Load Diff
@ -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_
|
||||||
@ -46,14 +47,14 @@ namespace spine {
|
|||||||
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;
|
||||||
@ -68,6 +69,9 @@ namespace spine {
|
|||||||
void setDebugMeshesEnabled(bool enabled);
|
void setDebugMeshesEnabled(bool enabled);
|
||||||
bool getDebugMeshesEnabled() const;
|
bool getDebugMeshesEnabled() const;
|
||||||
|
|
||||||
|
void setDebugBoundingRectEnabled(bool enabled);
|
||||||
|
bool getDebugBoundingRectEnabled() const;
|
||||||
|
|
||||||
// --- Convenience methods for common Skeleton_* functions.
|
// --- Convenience methods for common Skeleton_* functions.
|
||||||
void updateWorldTransform ();
|
void updateWorldTransform ();
|
||||||
|
|
||||||
@ -81,7 +85,7 @@ namespace spine {
|
|||||||
Slot* findSlot (const std::string& slotName) const;
|
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
|
/* Sets the skin used to look up attachments not found in the SkeletonData defaultSkin. Attachments from the new skin are
|
||||||
* attached if the corresponding attachment from the old skin was attached.
|
* attached if the corresponding attachment from the old skin was attached. Returns false if the skin was not found.
|
||||||
* @param skin May be empty string ("") for no skin.*/
|
* @param skin May be empty string ("") for no skin.*/
|
||||||
void setSkin (const std::string& skinName);
|
void setSkin (const std::string& skinName);
|
||||||
/** @param skin May be 0 for no skin.*/
|
/** @param skin May be 0 for no skin.*/
|
||||||
@ -107,13 +111,10 @@ namespace spine {
|
|||||||
void setSlotsRange(int startSlotIndex, int endSlotIndex);
|
void setSlotsRange(int startSlotIndex, int endSlotIndex);
|
||||||
|
|
||||||
// --- BlendProtocol
|
// --- BlendProtocol
|
||||||
virtual void setBlendFunc (const cocos2d::BlendFunc& blendFunc)override;
|
void setBlendFunc (const cocos2d::BlendFunc& blendFunc)override;
|
||||||
virtual const cocos2d::BlendFunc& getBlendFunc () const override;
|
const cocos2d::BlendFunc& getBlendFunc () const override;
|
||||||
virtual void setOpacityModifyRGB (bool value) override;
|
void setOpacityModifyRGB (bool value) override;
|
||||||
virtual bool isOpacityModifyRGB () const override;
|
bool isOpacityModifyRGB () const override;
|
||||||
|
|
||||||
// Frees global memory used for temporay vertex transformations.
|
|
||||||
static void destroyScratchBuffers();
|
|
||||||
|
|
||||||
CC_CONSTRUCTOR_ACCESS:
|
CC_CONSTRUCTOR_ACCESS:
|
||||||
SkeletonRenderer ();
|
SkeletonRenderer ();
|
||||||
@ -136,10 +137,11 @@ namespace spine {
|
|||||||
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;
|
||||||
@ -150,8 +152,10 @@ namespace spine {
|
|||||||
bool _debugSlots;
|
bool _debugSlots;
|
||||||
bool _debugBones;
|
bool _debugBones;
|
||||||
bool _debugMeshes;
|
bool _debugMeshes;
|
||||||
|
bool _debugBoundingRect;
|
||||||
SkeletonClipping* _clipper;
|
SkeletonClipping* _clipper;
|
||||||
VertexEffect* _effect;
|
VertexEffect* _effect;
|
||||||
|
cocos2d::Rect _boundingRect;
|
||||||
|
|
||||||
int _startSlotIndex;
|
int _startSlotIndex;
|
||||||
int _endSlotIndex;
|
int _endSlotIndex;
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user