2014-06-11 11:10:07 +08:00
|
|
|
/****************************************************************************
|
|
|
|
Copyright (c) 2013 cocos2d-x.org
|
2018-01-29 16:25:32 +08:00
|
|
|
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
|
2014-06-11 11:10:07 +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.
|
|
|
|
****************************************************************************/
|
|
|
|
|
2016-03-20 21:53:44 +08:00
|
|
|
#include "editor-support/cocostudio/ActionTimeline/CCActionTimelineCache.h"
|
|
|
|
#include "editor-support/cocostudio/ActionTimeline/CSLoader.h"
|
|
|
|
#include "editor-support/cocostudio/ActionTimeline/CCFrame.h"
|
|
|
|
#include "editor-support/cocostudio/ActionTimeline/CCTimeLine.h"
|
|
|
|
#include "editor-support/cocostudio/ActionTimeline/CCActionTimeline.h"
|
2014-08-29 15:39:52 +08:00
|
|
|
#include "platform/CCFileUtils.h"
|
|
|
|
#include "2d/CCSpriteFrameCache.h"
|
|
|
|
#include "2d/CCSpriteFrame.h"
|
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
|
|
|
#include "base/ccUtils.h"
|
2014-06-11 11:10:07 +08:00
|
|
|
|
2016-03-20 21:53:44 +08:00
|
|
|
#include "editor-support/cocostudio/CSParseBinary_generated.h"
|
2014-11-21 15:15:38 +08:00
|
|
|
|
2014-12-14 17:14:16 +08:00
|
|
|
#include "tinyxml2.h"
|
2014-11-21 15:15:38 +08:00
|
|
|
#include "flatbuffers/flatbuffers.h"
|
|
|
|
#include "flatbuffers/util.h"
|
2014-10-09 18:28:09 +08:00
|
|
|
|
2016-03-20 21:53:44 +08:00
|
|
|
#include "editor-support/cocostudio/FlatBuffersSerialize.h"
|
2014-12-08 14:32:33 +08:00
|
|
|
|
2014-10-09 18:28:09 +08:00
|
|
|
#include <fstream>
|
|
|
|
|
2014-06-11 11:10:07 +08:00
|
|
|
using namespace cocos2d;
|
2014-11-21 15:15:38 +08:00
|
|
|
using namespace flatbuffers;
|
2014-06-11 11:10:07 +08:00
|
|
|
|
|
|
|
namespace cocostudio {
|
|
|
|
namespace timeline{
|
|
|
|
|
2015-01-12 10:55:15 +08:00
|
|
|
static const char* Property_VisibleForFrame = "VisibleForFrame";
|
|
|
|
static const char* Property_Position = "Position";
|
|
|
|
static const char* Property_Scale = "Scale";
|
|
|
|
static const char* Property_RotationSkew = "RotationSkew";
|
|
|
|
static const char* Property_CColor = "CColor";
|
|
|
|
static const char* Property_FileData = "FileData";
|
|
|
|
static const char* Property_FrameEvent = "FrameEvent";
|
|
|
|
static const char* Property_Alpha = "Alpha";
|
2015-01-22 11:20:01 +08:00
|
|
|
static const char* Property_AnchorPoint = "AnchorPoint";
|
2015-01-12 10:55:15 +08:00
|
|
|
static const char* Property_ZOrder = "ZOrder";
|
|
|
|
static const char* Property_ActionValue = "ActionValue";
|
2015-08-17 13:05:29 +08:00
|
|
|
static const char* Property_BlendValue = "BlendFunc";
|
2014-06-11 11:10:07 +08:00
|
|
|
|
|
|
|
static const char* ACTION = "action";
|
|
|
|
static const char* DURATION = "duration";
|
|
|
|
static const char* TIMELINES = "timelines";
|
|
|
|
static const char* FRAME_TYPE = "frameType";
|
|
|
|
static const char* FRAMES = "frames";
|
|
|
|
static const char* FRAME_INDEX = "frameIndex";
|
|
|
|
static const char* TWEEN = "tween";
|
|
|
|
static const char* TIME_SPEED = "speed";
|
|
|
|
static const char* ACTION_TAG = "actionTag";
|
|
|
|
static const char* INNER_ACTION = "innerActionType";
|
|
|
|
static const char* START_FRAME = "startFrame";
|
|
|
|
|
|
|
|
static const char* X = "x";
|
|
|
|
static const char* Y = "y";
|
|
|
|
static const char* ROTATION = "rotation";
|
|
|
|
static const char* RED = "red";
|
|
|
|
static const char* GREEN = "green";
|
|
|
|
static const char* BLUE = "blue";
|
|
|
|
static const char* Value = "value";
|
|
|
|
|
|
|
|
|
2014-06-13 16:03:03 +08:00
|
|
|
static ActionTimelineCache* _sharedActionCache = nullptr;
|
2014-06-11 11:10:07 +08:00
|
|
|
|
2014-06-13 16:03:03 +08:00
|
|
|
ActionTimelineCache* ActionTimelineCache::getInstance()
|
2014-06-11 11:10:07 +08:00
|
|
|
{
|
|
|
|
if (! _sharedActionCache)
|
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
_sharedActionCache = new (std::nothrow) ActionTimelineCache();
|
2014-06-11 11:10:07 +08:00
|
|
|
_sharedActionCache->init();
|
|
|
|
}
|
|
|
|
|
|
|
|
return _sharedActionCache;
|
|
|
|
}
|
|
|
|
|
2014-06-13 16:03:03 +08:00
|
|
|
void ActionTimelineCache::destroyInstance()
|
2014-06-11 11:10:07 +08:00
|
|
|
{
|
|
|
|
CC_SAFE_DELETE(_sharedActionCache);
|
|
|
|
}
|
|
|
|
|
2014-06-13 16:03:03 +08:00
|
|
|
void ActionTimelineCache::purge()
|
2014-06-11 11:10:07 +08:00
|
|
|
{
|
|
|
|
_animationActions.clear();
|
|
|
|
}
|
|
|
|
|
2014-06-13 16:03:03 +08:00
|
|
|
void ActionTimelineCache::init()
|
2014-06-11 11:10:07 +08:00
|
|
|
{
|
|
|
|
using namespace std::placeholders;
|
2015-01-12 10:55:15 +08:00
|
|
|
/*
|
2014-06-13 16:03:03 +08:00
|
|
|
_funcs.insert(Pair(FrameType_VisibleFrame, std::bind(&ActionTimelineCache::loadVisibleFrame, this, _1)));
|
|
|
|
_funcs.insert(Pair(FrameType_PositionFrame, std::bind(&ActionTimelineCache::loadPositionFrame, this, _1)));
|
|
|
|
_funcs.insert(Pair(FrameType_ScaleFrame, std::bind(&ActionTimelineCache::loadScaleFrame, this, _1)));
|
|
|
|
_funcs.insert(Pair(FrameType_RotationFrame, std::bind(&ActionTimelineCache::loadRotationFrame, this, _1)));
|
|
|
|
_funcs.insert(Pair(FrameType_SkewFrame, std::bind(&ActionTimelineCache::loadSkewFrame, this, _1)));
|
|
|
|
_funcs.insert(Pair(FrameType_RotationSkewFrame, std::bind(&ActionTimelineCache::loadRotationSkewFrame, this, _1)));
|
|
|
|
_funcs.insert(Pair(FrameType_AnchorFrame, std::bind(&ActionTimelineCache::loadAnchorPointFrame, this, _1)));
|
|
|
|
_funcs.insert(Pair(FrameType_InnerActionFrame, std::bind(&ActionTimelineCache::loadInnerActionFrame, this, _1)));
|
|
|
|
_funcs.insert(Pair(FrameType_ColorFrame, std::bind(&ActionTimelineCache::loadColorFrame, this, _1)));
|
|
|
|
_funcs.insert(Pair(FrameType_TextureFrame, std::bind(&ActionTimelineCache::loadTextureFrame, this, _1)));
|
|
|
|
_funcs.insert(Pair(FrameType_EventFrame, std::bind(&ActionTimelineCache::loadEventFrame, this, _1)));
|
|
|
|
_funcs.insert(Pair(FrameType_ZOrderFrame, std::bind(&ActionTimelineCache::loadZOrderFrame, this, _1)));
|
2015-01-12 10:55:15 +08:00
|
|
|
*/
|
2014-06-11 11:10:07 +08:00
|
|
|
|
|
|
|
}
|
|
|
|
|
2014-06-13 16:03:03 +08:00
|
|
|
void ActionTimelineCache::removeAction(const std::string& fileName)
|
2014-06-11 11:10:07 +08:00
|
|
|
{
|
|
|
|
if (_animationActions.find(fileName) != _animationActions.end())
|
|
|
|
{
|
|
|
|
_animationActions.erase(fileName);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-10-09 18:28:09 +08:00
|
|
|
ActionTimeline* ActionTimelineCache::createAction(const std::string& filename)
|
|
|
|
{
|
|
|
|
std::string path = filename;
|
|
|
|
size_t pos = path.find_last_of('.');
|
|
|
|
std::string suffix = path.substr(pos + 1, path.length());
|
|
|
|
|
|
|
|
ActionTimelineCache* cache = ActionTimelineCache::getInstance();
|
|
|
|
|
|
|
|
if (suffix == "csb")
|
|
|
|
{
|
2014-12-01 12:46:29 +08:00
|
|
|
return cache->createActionWithFlatBuffersFile(filename);
|
2014-10-09 18:28:09 +08:00
|
|
|
}
|
|
|
|
else if (suffix == "json" || suffix == "ExportJson")
|
|
|
|
{
|
|
|
|
return cache->createActionFromJson(filename);
|
|
|
|
}
|
|
|
|
|
|
|
|
return nullptr;
|
|
|
|
}
|
|
|
|
|
|
|
|
ActionTimeline* ActionTimelineCache::createActionFromJson(const std::string& fileName)
|
2014-06-11 11:10:07 +08:00
|
|
|
{
|
2014-06-13 16:03:03 +08:00
|
|
|
ActionTimeline* action = _animationActions.at(fileName);
|
2014-06-11 11:10:07 +08:00
|
|
|
if (action == nullptr)
|
|
|
|
{
|
|
|
|
action = loadAnimationActionWithFile(fileName);
|
|
|
|
}
|
|
|
|
return action->clone();
|
|
|
|
}
|
|
|
|
|
2016-01-14 16:16:37 +08:00
|
|
|
ActionTimeline* ActionTimelineCache::createActionFromContent(const std::string& fileName, const std::string& content)
|
|
|
|
{
|
|
|
|
ActionTimeline* action = _animationActions.at(fileName);
|
|
|
|
if (action == nullptr)
|
|
|
|
{
|
|
|
|
action = loadAnimationActionWithContent(fileName, content);
|
|
|
|
}
|
|
|
|
return action->clone();
|
|
|
|
}
|
|
|
|
|
2014-06-13 16:03:03 +08:00
|
|
|
ActionTimeline* ActionTimelineCache::loadAnimationActionWithFile(const std::string& fileName)
|
2014-06-11 11:10:07 +08:00
|
|
|
{
|
|
|
|
// Read content from file
|
2014-08-29 15:39:52 +08:00
|
|
|
std::string fullPath = FileUtils::getInstance()->fullPathForFilename(fileName);
|
2014-06-11 11:10:07 +08:00
|
|
|
std::string contentStr = FileUtils::getInstance()->getStringFromFile(fullPath);
|
|
|
|
|
|
|
|
return loadAnimationActionWithContent(fileName, contentStr);
|
|
|
|
}
|
|
|
|
|
2014-06-13 16:03:03 +08:00
|
|
|
ActionTimeline* ActionTimelineCache::loadAnimationActionWithContent(const std::string&fileName, const std::string& content)
|
2014-06-11 11:10:07 +08:00
|
|
|
{
|
|
|
|
// if already exists an action with filename, then return this action
|
2014-06-13 16:03:03 +08:00
|
|
|
ActionTimeline* action = _animationActions.at(fileName);
|
2014-06-11 11:10:07 +08:00
|
|
|
if(action)
|
|
|
|
return action;
|
|
|
|
|
|
|
|
rapidjson::Document doc;
|
|
|
|
doc.Parse<0>(content.c_str());
|
|
|
|
if (doc.HasParseError())
|
|
|
|
{
|
2015-05-25 11:43:03 +08:00
|
|
|
CCLOG("GetParseError %d\n", doc.GetParseError());
|
2014-06-11 11:10:07 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
const rapidjson::Value& json = DICTOOL->getSubDictionary_json(doc, ACTION);
|
|
|
|
|
2014-06-13 16:03:03 +08:00
|
|
|
action = ActionTimeline::create();
|
2014-06-11 11:10:07 +08:00
|
|
|
|
|
|
|
action->setDuration(DICTOOL->getIntValue_json(json, DURATION));
|
|
|
|
action->setTimeSpeed(DICTOOL->getFloatValue_json(json, TIME_SPEED, 1.0f));
|
|
|
|
|
|
|
|
int timelineLength = DICTOOL->getArrayCount_json(json, TIMELINES);
|
|
|
|
for (int i = 0; i<timelineLength; i++)
|
|
|
|
{
|
|
|
|
const rapidjson::Value& dic = DICTOOL->getSubDictionary_json(json, TIMELINES, i);
|
|
|
|
Timeline* timeline = loadTimeline(dic);
|
|
|
|
|
|
|
|
if(timeline)
|
|
|
|
action->addTimeline(timeline);
|
|
|
|
}
|
|
|
|
|
|
|
|
_animationActions.insert(fileName, action);
|
|
|
|
|
|
|
|
return action;
|
|
|
|
}
|
|
|
|
|
2014-06-13 16:03:03 +08:00
|
|
|
Timeline* ActionTimelineCache::loadTimeline(const rapidjson::Value& json)
|
2014-06-11 11:10:07 +08:00
|
|
|
{
|
|
|
|
Timeline* timeline = nullptr;
|
|
|
|
|
|
|
|
// get frame type
|
|
|
|
const char* frameType = DICTOOL->getStringValue_json(json, FRAME_TYPE);
|
|
|
|
if(frameType == nullptr)
|
|
|
|
return nullptr;
|
|
|
|
|
|
|
|
if(frameType && _funcs.find(frameType) != _funcs.end())
|
|
|
|
{
|
|
|
|
timeline = Timeline::create();
|
|
|
|
|
|
|
|
int actionTag = DICTOOL->getIntValue_json(json, ACTION_TAG);
|
|
|
|
timeline->setActionTag(actionTag);
|
|
|
|
|
|
|
|
FrameCreateFunc func = _funcs.at(frameType);
|
|
|
|
|
|
|
|
int length = DICTOOL->getArrayCount_json(json, FRAMES);
|
|
|
|
for (int i = 0; i<length; i++)
|
|
|
|
{
|
|
|
|
const rapidjson::Value& dic = DICTOOL->getSubDictionary_json(json, FRAMES, i);
|
|
|
|
|
|
|
|
Frame* frame = nullptr;
|
|
|
|
|
|
|
|
if (func != nullptr)
|
|
|
|
{
|
|
|
|
frame = func(dic);
|
|
|
|
|
|
|
|
int frameIndex = DICTOOL->getIntValue_json(dic, FRAME_INDEX);
|
|
|
|
frame->setFrameIndex(frameIndex);
|
|
|
|
|
|
|
|
bool tween = DICTOOL->getBooleanValue_json(dic, TWEEN, false);
|
|
|
|
frame->setTween(tween);
|
|
|
|
}
|
|
|
|
|
|
|
|
timeline->addFrame(frame);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return timeline;
|
|
|
|
}
|
|
|
|
|
2014-06-13 16:03:03 +08:00
|
|
|
Frame* ActionTimelineCache::loadVisibleFrame(const rapidjson::Value& json)
|
2014-06-11 11:10:07 +08:00
|
|
|
{
|
|
|
|
VisibleFrame* frame = VisibleFrame::create();
|
|
|
|
|
|
|
|
bool visible = DICTOOL->getBooleanValue_json(json, Value);
|
|
|
|
frame->setVisible(visible);
|
|
|
|
|
|
|
|
return frame;
|
|
|
|
}
|
|
|
|
|
2014-06-13 16:03:03 +08:00
|
|
|
Frame* ActionTimelineCache::loadPositionFrame(const rapidjson::Value& json)
|
2014-06-11 11:10:07 +08:00
|
|
|
{
|
|
|
|
PositionFrame* frame = PositionFrame::create();
|
|
|
|
|
|
|
|
float x = DICTOOL->getFloatValue_json(json, X);
|
|
|
|
float y = DICTOOL->getFloatValue_json(json, Y);
|
|
|
|
frame->setPosition(Point(x,y));
|
|
|
|
|
|
|
|
return frame;
|
|
|
|
}
|
|
|
|
|
2014-06-13 16:03:03 +08:00
|
|
|
Frame* ActionTimelineCache::loadScaleFrame(const rapidjson::Value& json)
|
2014-06-11 11:10:07 +08:00
|
|
|
{
|
|
|
|
ScaleFrame* frame = ScaleFrame::create();
|
|
|
|
|
|
|
|
float scalex = DICTOOL->getFloatValue_json(json, X);
|
|
|
|
float scaley = DICTOOL->getFloatValue_json(json, Y);
|
|
|
|
|
|
|
|
frame->setScaleX(scalex);
|
|
|
|
frame->setScaleY(scaley);
|
|
|
|
|
|
|
|
return frame;
|
|
|
|
}
|
|
|
|
|
2014-06-13 16:03:03 +08:00
|
|
|
Frame* ActionTimelineCache::loadSkewFrame(const rapidjson::Value& json)
|
2014-06-11 11:10:07 +08:00
|
|
|
{
|
|
|
|
SkewFrame* frame = SkewFrame::create();
|
|
|
|
|
|
|
|
float skewx = DICTOOL->getFloatValue_json(json, X);
|
|
|
|
float skewy = DICTOOL->getFloatValue_json(json, Y);
|
|
|
|
|
|
|
|
frame->setSkewX(skewx);
|
|
|
|
frame->setSkewY(skewy);
|
|
|
|
|
|
|
|
return frame;
|
|
|
|
}
|
|
|
|
|
2014-06-13 16:03:03 +08:00
|
|
|
Frame* ActionTimelineCache::loadRotationSkewFrame(const rapidjson::Value& json)
|
2014-06-11 11:10:07 +08:00
|
|
|
{
|
|
|
|
RotationSkewFrame* frame = RotationSkewFrame::create();
|
|
|
|
|
|
|
|
float skewx = DICTOOL->getFloatValue_json(json, X);
|
|
|
|
float skewy = DICTOOL->getFloatValue_json(json, Y);
|
|
|
|
|
|
|
|
frame->setSkewX(skewx);
|
|
|
|
frame->setSkewY(skewy);
|
|
|
|
|
|
|
|
return frame;
|
|
|
|
}
|
|
|
|
|
2014-06-13 16:03:03 +08:00
|
|
|
Frame* ActionTimelineCache::loadRotationFrame(const rapidjson::Value& json)
|
2014-06-11 11:10:07 +08:00
|
|
|
{
|
|
|
|
RotationFrame* frame = RotationFrame::create();
|
|
|
|
|
|
|
|
float rotation = DICTOOL->getFloatValue_json(json, ROTATION);
|
|
|
|
frame->setRotation(rotation);
|
|
|
|
|
|
|
|
return frame;
|
|
|
|
}
|
|
|
|
|
2014-06-13 16:03:03 +08:00
|
|
|
Frame* ActionTimelineCache::loadAnchorPointFrame (const rapidjson::Value& json)
|
2014-06-11 11:10:07 +08:00
|
|
|
{
|
|
|
|
AnchorPointFrame* frame = AnchorPointFrame::create();
|
|
|
|
|
|
|
|
float anchorx = DICTOOL->getFloatValue_json(json, X);
|
|
|
|
float anchory = DICTOOL->getFloatValue_json(json, Y);
|
|
|
|
|
|
|
|
frame->setAnchorPoint(Point(anchorx, anchory));
|
|
|
|
|
|
|
|
return frame;
|
|
|
|
}
|
|
|
|
|
2014-06-13 16:03:03 +08:00
|
|
|
Frame* ActionTimelineCache::loadInnerActionFrame(const rapidjson::Value& json)
|
2014-06-11 11:10:07 +08:00
|
|
|
{
|
|
|
|
InnerActionFrame* frame = InnerActionFrame::create();
|
|
|
|
|
|
|
|
InnerActionType type = (InnerActionType)DICTOOL->getIntValue_json(json, INNER_ACTION);
|
|
|
|
int startFrame = DICTOOL->getIntValue_json(json, START_FRAME);
|
|
|
|
|
|
|
|
frame->setInnerActionType(type);
|
|
|
|
frame->setStartFrameIndex(startFrame);
|
|
|
|
|
|
|
|
return frame;
|
|
|
|
}
|
|
|
|
|
2014-06-13 16:03:03 +08:00
|
|
|
Frame* ActionTimelineCache::loadColorFrame(const rapidjson::Value& json)
|
2014-06-11 11:10:07 +08:00
|
|
|
{
|
|
|
|
ColorFrame* frame = ColorFrame::create();
|
|
|
|
|
2019-06-05 17:58:33 +08:00
|
|
|
uint8_t red = (uint8_t)DICTOOL->getIntValue_json(json, RED);
|
|
|
|
uint8_t green = (uint8_t)DICTOOL->getIntValue_json(json, GREEN);
|
|
|
|
uint8_t blue = (uint8_t)DICTOOL->getIntValue_json(json, BLUE);
|
2014-06-11 11:10:07 +08:00
|
|
|
|
|
|
|
frame->setColor(Color3B(red, green, blue));
|
|
|
|
|
|
|
|
return frame;
|
|
|
|
}
|
|
|
|
|
2014-06-13 16:03:03 +08:00
|
|
|
Frame* ActionTimelineCache::loadTextureFrame(const rapidjson::Value& json)
|
2014-06-11 11:10:07 +08:00
|
|
|
{
|
|
|
|
TextureFrame* frame = TextureFrame::create();
|
|
|
|
|
|
|
|
const char* texture = DICTOOL->getStringValue_json(json, Value);
|
|
|
|
|
2014-06-23 10:12:54 +08:00
|
|
|
if(texture != nullptr)
|
2014-06-11 21:11:22 +08:00
|
|
|
{
|
|
|
|
std::string path = texture;
|
2014-06-11 11:10:07 +08:00
|
|
|
|
2014-06-11 21:11:22 +08:00
|
|
|
SpriteFrame* spriteFrame = SpriteFrameCache::getInstance()->getSpriteFrameByName(path);
|
|
|
|
if(spriteFrame == nullptr)
|
|
|
|
{
|
2014-10-09 18:28:09 +08:00
|
|
|
std::string jsonPath = CSLoader::getInstance()->getJsonPath();
|
2014-06-11 21:11:22 +08:00
|
|
|
path = jsonPath + texture;
|
|
|
|
}
|
|
|
|
|
2014-06-13 19:52:53 +08:00
|
|
|
frame->setTextureName(path);
|
2014-06-11 21:11:22 +08:00
|
|
|
}
|
2014-06-11 11:10:07 +08:00
|
|
|
return frame;
|
|
|
|
}
|
|
|
|
|
2014-06-13 16:03:03 +08:00
|
|
|
Frame* ActionTimelineCache::loadEventFrame(const rapidjson::Value& json)
|
2014-06-11 11:10:07 +08:00
|
|
|
{
|
|
|
|
EventFrame* frame = EventFrame::create();
|
|
|
|
|
|
|
|
const char* evnt = DICTOOL->getStringValue_json(json, Value);
|
|
|
|
|
2014-06-23 10:12:54 +08:00
|
|
|
if(evnt != nullptr)
|
2014-06-11 11:10:07 +08:00
|
|
|
frame->setEvent(evnt);
|
|
|
|
|
|
|
|
return frame;
|
|
|
|
}
|
|
|
|
|
2014-06-13 16:03:03 +08:00
|
|
|
Frame* ActionTimelineCache::loadZOrderFrame(const rapidjson::Value& json)
|
2014-06-11 11:10:07 +08:00
|
|
|
{
|
|
|
|
ZOrderFrame* frame = ZOrderFrame::create();
|
|
|
|
|
|
|
|
int zorder = DICTOOL->getIntValue_json(json, Value);
|
|
|
|
frame->setZOrder(zorder);
|
|
|
|
|
|
|
|
return frame;
|
|
|
|
}
|
2016-01-14 16:16:37 +08:00
|
|
|
|
2014-11-21 15:15:38 +08:00
|
|
|
ActionTimeline* ActionTimelineCache::createActionWithFlatBuffersFile(const std::string &fileName)
|
2014-10-09 18:28:09 +08:00
|
|
|
{
|
|
|
|
ActionTimeline* action = _animationActions.at(fileName);
|
2014-11-21 15:15:38 +08:00
|
|
|
if (action == NULL)
|
2014-10-09 18:28:09 +08:00
|
|
|
{
|
2014-11-21 15:15:38 +08:00
|
|
|
action = loadAnimationActionWithFlatBuffersFile(fileName);
|
2014-10-09 18:28:09 +08:00
|
|
|
}
|
|
|
|
return action->clone();
|
|
|
|
}
|
|
|
|
|
2016-01-14 16:16:37 +08:00
|
|
|
ActionTimeline* ActionTimelineCache::createActionWithDataBuffer(Data data, const std::string &fileName)
|
|
|
|
{
|
|
|
|
ActionTimeline* action = _animationActions.at(fileName);
|
|
|
|
if (action == NULL)
|
|
|
|
{
|
|
|
|
action = loadAnimationWithDataBuffer(data, fileName);
|
|
|
|
}
|
|
|
|
return action->clone();
|
|
|
|
}
|
|
|
|
|
2014-11-21 15:15:38 +08:00
|
|
|
ActionTimeline* ActionTimelineCache::loadAnimationActionWithFlatBuffersFile(const std::string &fileName)
|
2014-10-09 18:28:09 +08:00
|
|
|
{
|
|
|
|
// if already exists an action with filename, then return this action
|
|
|
|
ActionTimeline* action = _animationActions.at(fileName);
|
|
|
|
if (action)
|
|
|
|
return action;
|
|
|
|
|
2014-11-21 15:15:38 +08:00
|
|
|
std::string path = fileName;
|
2014-10-09 18:28:09 +08:00
|
|
|
|
2016-02-03 23:12:37 +08:00
|
|
|
std::string fullPath = FileUtils::getInstance()->fullPathForFilename(fileName);
|
2014-10-09 18:28:09 +08:00
|
|
|
|
2014-12-03 10:54:16 +08:00
|
|
|
CC_ASSERT(FileUtils::getInstance()->isFileExist(fullPath));
|
|
|
|
|
|
|
|
Data buf = FileUtils::getInstance()->getDataFromFile(fullPath);
|
2015-07-27 11:55:18 +08:00
|
|
|
action = createActionWithDataBuffer(buf);
|
|
|
|
_animationActions.insert(fileName, action);
|
|
|
|
|
|
|
|
return action;
|
|
|
|
}
|
|
|
|
|
2016-01-15 00:49:48 +08:00
|
|
|
ActionTimeline* ActionTimelineCache::loadAnimationWithDataBuffer(const cocos2d::Data& data, const std::string& fileName)
|
2015-07-27 11:55:18 +08:00
|
|
|
{
|
|
|
|
// if already exists an action with filename, then return this action
|
|
|
|
ActionTimeline* action = _animationActions.at(fileName);
|
|
|
|
if (action)
|
|
|
|
return action;
|
|
|
|
|
|
|
|
std::string path = fileName;
|
|
|
|
|
2016-02-03 23:12:37 +08:00
|
|
|
std::string fullPath = FileUtils::getInstance()->fullPathForFilename(fileName);
|
2015-07-27 11:55:18 +08:00
|
|
|
|
|
|
|
CC_ASSERT(FileUtils::getInstance()->isFileExist(fullPath));
|
|
|
|
|
|
|
|
action = createActionWithDataBuffer(data);
|
|
|
|
_animationActions.insert(fileName, action);
|
|
|
|
|
|
|
|
return action;
|
|
|
|
}
|
|
|
|
|
2016-01-15 00:49:48 +08:00
|
|
|
ActionTimeline* ActionTimelineCache::createActionWithDataBuffer(const cocos2d::Data& data)
|
2015-07-27 11:55:18 +08:00
|
|
|
{
|
|
|
|
auto csparsebinary = GetCSParseBinary(data.getBytes());
|
|
|
|
|
|
|
|
auto nodeAction = csparsebinary->action();
|
|
|
|
auto action = ActionTimeline::create();
|
|
|
|
|
2014-11-21 15:15:38 +08:00
|
|
|
int duration = nodeAction->duration();
|
|
|
|
action->setDuration(duration);
|
|
|
|
float speed = nodeAction->speed();
|
|
|
|
action->setTimeSpeed(speed);
|
2014-10-09 18:28:09 +08:00
|
|
|
|
2015-01-12 10:55:15 +08:00
|
|
|
auto animationlist = csparsebinary->animationList();
|
|
|
|
int animationcount = animationlist->size();
|
|
|
|
for (int i = 0; i < animationcount; i++)
|
|
|
|
{
|
|
|
|
auto animationdata = animationlist->Get(i);
|
|
|
|
AnimationInfo info;
|
|
|
|
info.name = animationdata->name()->c_str();
|
|
|
|
info.startIndex = animationdata->startIndex();
|
|
|
|
info.endIndex = animationdata->endIndex();
|
|
|
|
action->addAnimationInfo(info);
|
|
|
|
}
|
|
|
|
|
2015-10-20 15:49:12 +08:00
|
|
|
auto timeLines = nodeAction->timeLines();
|
|
|
|
int timelineLength = timeLines->size();
|
2016-01-12 17:21:01 +08:00
|
|
|
std::multimap<std::string,timeline::Timeline*> properTimelineMap;// order the timelines depends property name
|
2014-11-21 15:15:38 +08:00
|
|
|
for (int i = 0; i < timelineLength; i++)
|
2014-10-09 18:28:09 +08:00
|
|
|
{
|
2015-10-20 15:49:12 +08:00
|
|
|
auto timelineFlatBuf = timeLines->Get(i);
|
2014-11-21 15:15:38 +08:00
|
|
|
Timeline* timeline = loadTimelineWithFlatBuffers(timelineFlatBuf);
|
2014-10-09 18:28:09 +08:00
|
|
|
if (timeline)
|
2015-10-20 15:49:12 +08:00
|
|
|
{
|
2016-11-08 11:50:00 +08:00
|
|
|
properTimelineMap.emplace(timelineFlatBuf->property()->c_str(), timeline);
|
2015-10-20 15:49:12 +08:00
|
|
|
}
|
2014-10-09 18:28:09 +08:00
|
|
|
}
|
2015-07-27 11:55:18 +08:00
|
|
|
|
2015-10-20 15:49:12 +08:00
|
|
|
for (const auto& properTimelinePair : properTimelineMap)
|
|
|
|
{
|
|
|
|
action->addTimeline(properTimelinePair.second);
|
|
|
|
}
|
2014-10-09 18:28:09 +08:00
|
|
|
return action;
|
|
|
|
}
|
|
|
|
|
2014-11-21 15:15:38 +08:00
|
|
|
Timeline* ActionTimelineCache::loadTimelineWithFlatBuffers(const flatbuffers::TimeLine *flatbuffers)
|
2014-10-09 18:28:09 +08:00
|
|
|
{
|
|
|
|
Timeline* timeline = nullptr;
|
|
|
|
|
2015-01-12 10:55:15 +08:00
|
|
|
// property
|
|
|
|
std::string property = flatbuffers->property()->c_str();
|
|
|
|
if(property == "")
|
2014-11-21 15:15:38 +08:00
|
|
|
return nullptr;
|
|
|
|
|
2014-10-09 18:28:09 +08:00
|
|
|
|
2015-01-12 10:55:15 +08:00
|
|
|
if(property != "")
|
2014-10-09 18:28:09 +08:00
|
|
|
{
|
|
|
|
timeline = Timeline::create();
|
2014-11-21 15:15:38 +08:00
|
|
|
|
|
|
|
int actionTag = flatbuffers->actionTag();
|
2014-10-09 18:28:09 +08:00
|
|
|
timeline->setActionTag(actionTag);
|
|
|
|
|
|
|
|
|
2014-11-21 15:15:38 +08:00
|
|
|
auto framesFlatbuf = flatbuffers->frames();
|
|
|
|
int length = framesFlatbuf->size();
|
|
|
|
for (int i = 0; i < length; i++)
|
2014-10-09 18:28:09 +08:00
|
|
|
{
|
2014-11-21 15:15:38 +08:00
|
|
|
auto frameFlatbuf = framesFlatbuf->Get(i);
|
|
|
|
Frame* frame = nullptr;
|
|
|
|
|
2015-01-12 10:55:15 +08:00
|
|
|
if (property == Property_VisibleForFrame)
|
|
|
|
{
|
|
|
|
auto boolFrame = frameFlatbuf->boolFrame();
|
|
|
|
frame = loadVisibleFrameWithFlatBuffers(boolFrame);
|
|
|
|
}
|
|
|
|
else if (property == Property_Position)
|
2014-11-21 15:15:38 +08:00
|
|
|
{
|
2015-01-12 10:55:15 +08:00
|
|
|
auto potisionFrame = frameFlatbuf->pointFrame();
|
|
|
|
frame = loadPositionFrameWithFlatBuffers(potisionFrame);
|
|
|
|
}
|
|
|
|
else if (property == Property_Scale)
|
|
|
|
{
|
|
|
|
auto scaleFrame = frameFlatbuf->scaleFrame();
|
|
|
|
frame = loadScaleFrameWithFlatBuffers(scaleFrame);
|
2014-11-21 15:15:38 +08:00
|
|
|
}
|
2015-01-12 10:55:15 +08:00
|
|
|
else if (property == Property_RotationSkew)
|
2014-11-21 15:15:38 +08:00
|
|
|
{
|
2015-01-12 10:55:15 +08:00
|
|
|
auto scaleFrame = frameFlatbuf->scaleFrame();
|
|
|
|
frame = loadRotationSkewFrameWithFlatBuffers(scaleFrame);
|
2014-11-21 15:15:38 +08:00
|
|
|
}
|
2015-01-12 10:55:15 +08:00
|
|
|
else if (property == Property_CColor)
|
2014-11-21 15:15:38 +08:00
|
|
|
{
|
2015-01-12 10:55:15 +08:00
|
|
|
auto colorFrame = frameFlatbuf->colorFrame();
|
|
|
|
frame = loadColorFrameWithFlatBuffers(colorFrame);
|
2014-11-21 15:15:38 +08:00
|
|
|
}
|
2015-01-12 10:55:15 +08:00
|
|
|
else if (property == Property_FrameEvent)
|
2014-11-21 15:15:38 +08:00
|
|
|
{
|
|
|
|
auto eventFrame = frameFlatbuf->eventFrame();
|
|
|
|
frame = loadEventFrameWithFlatBuffers(eventFrame);
|
|
|
|
}
|
2015-01-12 10:55:15 +08:00
|
|
|
else if (property == Property_FileData)
|
2014-11-21 15:15:38 +08:00
|
|
|
{
|
2015-01-12 10:55:15 +08:00
|
|
|
auto textureFrame = frameFlatbuf->textureFrame();
|
|
|
|
frame = loadTextureFrameWithFlatBuffers(textureFrame);
|
2014-11-21 15:15:38 +08:00
|
|
|
}
|
2015-01-12 10:55:15 +08:00
|
|
|
else if (property == Property_Alpha)
|
2014-11-21 15:15:38 +08:00
|
|
|
{
|
2015-01-12 10:55:15 +08:00
|
|
|
auto intFrame = frameFlatbuf->intFrame();
|
|
|
|
frame = loadAlphaFrameWithFlatBuffers(intFrame);
|
2014-11-21 15:15:38 +08:00
|
|
|
}
|
2015-01-22 11:20:01 +08:00
|
|
|
else if (property == Property_AnchorPoint)
|
|
|
|
{
|
|
|
|
auto scaleFrame = frameFlatbuf->scaleFrame();
|
|
|
|
frame = loadAnchorPointFrameWithFlatBuffers(scaleFrame);
|
|
|
|
}
|
2015-01-12 10:55:15 +08:00
|
|
|
else if (property == Property_ZOrder)
|
2014-11-21 15:15:38 +08:00
|
|
|
{
|
2015-01-12 10:55:15 +08:00
|
|
|
auto intFrame = frameFlatbuf->intFrame();
|
|
|
|
frame = loadZOrderFrameWithFlatBuffers(intFrame);
|
2014-11-21 15:15:38 +08:00
|
|
|
}
|
2015-01-12 10:55:15 +08:00
|
|
|
else if (property == Property_ActionValue)
|
2014-11-21 15:15:38 +08:00
|
|
|
{
|
2015-01-12 10:55:15 +08:00
|
|
|
auto innerActionFrame = frameFlatbuf->innerActionFrame();
|
|
|
|
frame = loadInnerActionFrameWithFlatBuffers(innerActionFrame);
|
2014-11-21 15:15:38 +08:00
|
|
|
}
|
2015-08-17 13:05:29 +08:00
|
|
|
else if (property == Property_BlendValue)
|
|
|
|
{
|
|
|
|
auto blendFrame = frameFlatbuf->blendFrame();
|
|
|
|
frame = loadBlendFrameWithFlatBuffers(blendFrame);
|
|
|
|
}
|
|
|
|
|
2015-01-12 10:55:15 +08:00
|
|
|
if (!frame)
|
2014-11-21 15:15:38 +08:00
|
|
|
{
|
2015-01-12 10:55:15 +08:00
|
|
|
CCLOG("frame is invalid.");
|
|
|
|
continue;
|
2014-11-21 15:15:38 +08:00
|
|
|
}
|
2014-10-09 18:28:09 +08:00
|
|
|
timeline->addFrame(frame);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return timeline;
|
|
|
|
}
|
2015-01-12 10:55:15 +08:00
|
|
|
|
|
|
|
Frame* ActionTimelineCache::loadVisibleFrameWithFlatBuffers(const flatbuffers::BoolFrame *flatbuffers)
|
2014-10-09 18:28:09 +08:00
|
|
|
{
|
|
|
|
VisibleFrame* frame = VisibleFrame::create();
|
|
|
|
|
2015-01-23 09:02:33 +08:00
|
|
|
bool visible = flatbuffers->value() != 0;
|
2014-10-09 18:28:09 +08:00
|
|
|
|
2015-01-12 10:55:15 +08:00
|
|
|
frame->setVisible(visible);
|
2014-10-09 18:28:09 +08:00
|
|
|
|
2014-11-21 15:15:38 +08:00
|
|
|
int frameIndex = flatbuffers->frameIndex();
|
|
|
|
frame->setFrameIndex(frameIndex);
|
|
|
|
|
2015-01-23 09:02:33 +08:00
|
|
|
bool tween = flatbuffers->tween() != 0;
|
2014-11-21 15:15:38 +08:00
|
|
|
frame->setTween(tween);
|
2014-10-09 18:28:09 +08:00
|
|
|
|
2015-04-09 16:55:15 +08:00
|
|
|
auto easingData = flatbuffers->easingData();
|
|
|
|
if (easingData)
|
|
|
|
{
|
|
|
|
loadEasingDataWithFlatBuffers(frame, easingData);
|
|
|
|
}
|
|
|
|
|
2014-10-09 18:28:09 +08:00
|
|
|
return frame;
|
|
|
|
}
|
2014-11-21 15:15:38 +08:00
|
|
|
|
2015-01-12 10:55:15 +08:00
|
|
|
Frame* ActionTimelineCache::loadPositionFrameWithFlatBuffers(const flatbuffers::PointFrame *flatbuffers)
|
2014-10-09 18:28:09 +08:00
|
|
|
{
|
2015-01-12 10:55:15 +08:00
|
|
|
PositionFrame* frame = PositionFrame::create();
|
2014-10-09 18:28:09 +08:00
|
|
|
|
2016-09-06 10:14:14 +08:00
|
|
|
auto f_position = flatbuffers->position();
|
2015-01-12 10:55:15 +08:00
|
|
|
Vec2 position(f_position->x(), f_position->y());
|
|
|
|
frame->setPosition(position);
|
2014-10-09 18:28:09 +08:00
|
|
|
|
2014-11-21 15:15:38 +08:00
|
|
|
int frameIndex = flatbuffers->frameIndex();
|
|
|
|
frame->setFrameIndex(frameIndex);
|
2014-10-09 18:28:09 +08:00
|
|
|
|
2015-01-23 09:02:33 +08:00
|
|
|
bool tween = flatbuffers->tween() != 0;
|
2014-11-21 15:15:38 +08:00
|
|
|
frame->setTween(tween);
|
2014-10-09 18:28:09 +08:00
|
|
|
|
2015-04-09 16:55:15 +08:00
|
|
|
auto easingData = flatbuffers->easingData();
|
|
|
|
if (easingData)
|
|
|
|
{
|
|
|
|
loadEasingDataWithFlatBuffers(frame, easingData);
|
|
|
|
}
|
|
|
|
|
2014-10-09 18:28:09 +08:00
|
|
|
return frame;
|
|
|
|
}
|
|
|
|
|
2015-01-12 10:55:15 +08:00
|
|
|
Frame* ActionTimelineCache::loadScaleFrameWithFlatBuffers(const flatbuffers::ScaleFrame *flatbuffers)
|
2014-10-09 18:28:09 +08:00
|
|
|
{
|
2015-01-12 10:55:15 +08:00
|
|
|
ScaleFrame* frame = ScaleFrame::create();
|
2014-10-09 18:28:09 +08:00
|
|
|
|
2015-01-12 10:55:15 +08:00
|
|
|
auto f_scale = flatbuffers->scale();
|
|
|
|
Vec2 scale(f_scale->scaleX(), f_scale->scaleY());
|
|
|
|
frame->setScaleX(scale.x);
|
|
|
|
frame->setScaleY(scale.y);
|
2014-10-09 18:28:09 +08:00
|
|
|
|
2014-11-21 15:15:38 +08:00
|
|
|
int frameIndex = flatbuffers->frameIndex();
|
|
|
|
frame->setFrameIndex(frameIndex);
|
2014-10-09 18:28:09 +08:00
|
|
|
|
2015-01-23 09:02:33 +08:00
|
|
|
bool tween = flatbuffers->tween() != 0;
|
2014-11-21 15:15:38 +08:00
|
|
|
frame->setTween(tween);
|
2014-10-09 18:28:09 +08:00
|
|
|
|
2015-04-09 16:55:15 +08:00
|
|
|
auto easingData = flatbuffers->easingData();
|
|
|
|
if (easingData)
|
|
|
|
{
|
|
|
|
loadEasingDataWithFlatBuffers(frame, easingData);
|
|
|
|
}
|
|
|
|
|
2014-10-09 18:28:09 +08:00
|
|
|
return frame;
|
|
|
|
}
|
|
|
|
|
2015-01-12 10:55:15 +08:00
|
|
|
Frame* ActionTimelineCache::loadRotationSkewFrameWithFlatBuffers(const flatbuffers::ScaleFrame *flatbuffers)
|
2014-10-09 18:28:09 +08:00
|
|
|
{
|
2015-01-12 10:55:15 +08:00
|
|
|
RotationSkewFrame* frame = RotationSkewFrame::create();
|
2014-10-09 18:28:09 +08:00
|
|
|
|
2015-01-12 10:55:15 +08:00
|
|
|
auto f_scale = flatbuffers->scale();
|
|
|
|
Vec2 rotationSkew(f_scale->scaleX(), f_scale->scaleY());
|
|
|
|
frame->setSkewX(rotationSkew.x);
|
|
|
|
frame->setSkewY(rotationSkew.y);
|
2014-10-09 18:28:09 +08:00
|
|
|
|
2014-11-21 15:15:38 +08:00
|
|
|
int frameIndex = flatbuffers->frameIndex();
|
|
|
|
frame->setFrameIndex(frameIndex);
|
|
|
|
|
2015-01-23 09:02:33 +08:00
|
|
|
bool tween = flatbuffers->tween() != 0;
|
2014-11-21 15:15:38 +08:00
|
|
|
frame->setTween(tween);
|
2014-10-09 18:28:09 +08:00
|
|
|
|
2015-04-09 16:55:15 +08:00
|
|
|
auto easingData = flatbuffers->easingData();
|
|
|
|
if (easingData)
|
|
|
|
{
|
|
|
|
loadEasingDataWithFlatBuffers(frame, easingData);
|
|
|
|
}
|
|
|
|
|
2014-10-09 18:28:09 +08:00
|
|
|
return frame;
|
|
|
|
}
|
|
|
|
|
2015-01-12 10:55:15 +08:00
|
|
|
Frame* ActionTimelineCache::loadColorFrameWithFlatBuffers(const flatbuffers::ColorFrame *flatbuffers)
|
2014-10-09 18:28:09 +08:00
|
|
|
{
|
2014-11-21 15:15:38 +08:00
|
|
|
ColorFrame* frame = ColorFrame::create();
|
2014-10-09 18:28:09 +08:00
|
|
|
|
2014-11-21 15:15:38 +08:00
|
|
|
auto f_color = flatbuffers->color();
|
|
|
|
Color3B color(f_color->r(), f_color->g(), f_color->b());
|
2015-01-12 10:55:15 +08:00
|
|
|
frame->setColor(color);
|
2014-12-09 15:13:09 +08:00
|
|
|
|
2014-11-21 15:15:38 +08:00
|
|
|
int frameIndex = flatbuffers->frameIndex();
|
|
|
|
frame->setFrameIndex(frameIndex);
|
|
|
|
|
2015-01-23 09:02:33 +08:00
|
|
|
bool tween = flatbuffers->tween() != 0;
|
2014-11-21 15:15:38 +08:00
|
|
|
frame->setTween(tween);
|
2014-10-09 18:28:09 +08:00
|
|
|
|
2015-04-09 16:55:15 +08:00
|
|
|
auto easingData = flatbuffers->easingData();
|
|
|
|
if (easingData)
|
|
|
|
{
|
|
|
|
loadEasingDataWithFlatBuffers(frame, easingData);
|
|
|
|
}
|
|
|
|
|
2014-10-09 18:28:09 +08:00
|
|
|
return frame;
|
|
|
|
}
|
|
|
|
|
2015-01-12 10:55:15 +08:00
|
|
|
Frame* ActionTimelineCache::loadTextureFrameWithFlatBuffers(const flatbuffers::TextureFrame *flatbuffers)
|
2014-10-09 18:28:09 +08:00
|
|
|
{
|
2014-12-10 12:36:14 +08:00
|
|
|
std::string path = "";
|
|
|
|
int resourceType = 0;
|
|
|
|
std::string plist = "";
|
|
|
|
|
2014-11-21 15:15:38 +08:00
|
|
|
TextureFrame* frame = TextureFrame::create();
|
2014-10-09 18:28:09 +08:00
|
|
|
|
2015-01-12 10:55:15 +08:00
|
|
|
auto fileNameData = flatbuffers->textureFile();
|
2014-12-10 12:36:14 +08:00
|
|
|
|
|
|
|
resourceType = fileNameData->resourceType();
|
|
|
|
switch (resourceType)
|
2014-12-08 15:48:24 +08:00
|
|
|
{
|
2014-12-10 12:36:14 +08:00
|
|
|
case 0:
|
|
|
|
{
|
|
|
|
path = fileNameData->path()->c_str();
|
|
|
|
if (FileUtils::getInstance()->isFileExist(path))
|
|
|
|
{
|
|
|
|
std::string fullPath = FileUtils::getInstance()->fullPathForFilename(path);
|
|
|
|
path = fullPath;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
path = "";
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
case 1:
|
|
|
|
{
|
|
|
|
plist = fileNameData->plistFile()->c_str();
|
|
|
|
if (FileUtils::getInstance()->isFileExist(plist))
|
|
|
|
{
|
|
|
|
path = fileNameData->path()->c_str();
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
path = "";
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
default:
|
|
|
|
break;
|
2014-12-08 15:48:24 +08:00
|
|
|
}
|
2014-12-10 12:36:14 +08:00
|
|
|
|
2014-11-21 15:15:38 +08:00
|
|
|
frame->setTextureName(path);
|
2014-10-09 18:28:09 +08:00
|
|
|
|
2014-11-21 15:15:38 +08:00
|
|
|
int frameIndex = flatbuffers->frameIndex();
|
|
|
|
frame->setFrameIndex(frameIndex);
|
|
|
|
|
2015-01-23 09:02:33 +08:00
|
|
|
bool tween = flatbuffers->tween() != 0;
|
2014-11-21 15:15:38 +08:00
|
|
|
frame->setTween(tween);
|
2014-10-09 18:28:09 +08:00
|
|
|
|
2015-04-09 16:55:15 +08:00
|
|
|
auto easingData = flatbuffers->easingData();
|
|
|
|
if (easingData)
|
|
|
|
{
|
|
|
|
loadEasingDataWithFlatBuffers(frame, easingData);
|
|
|
|
}
|
|
|
|
|
2014-10-09 18:28:09 +08:00
|
|
|
return frame;
|
|
|
|
}
|
2014-12-08 14:32:33 +08:00
|
|
|
|
2015-01-12 10:55:15 +08:00
|
|
|
Frame* ActionTimelineCache::loadEventFrameWithFlatBuffers(const flatbuffers::EventFrame *flatbuffers)
|
|
|
|
{
|
|
|
|
EventFrame* frame = EventFrame::create();
|
|
|
|
|
|
|
|
std::string event = flatbuffers->value()->c_str();
|
|
|
|
|
|
|
|
if (event != "")
|
2015-04-09 16:55:15 +08:00
|
|
|
frame->setEvent(event);
|
2015-01-12 10:55:15 +08:00
|
|
|
|
|
|
|
int frameIndex = flatbuffers->frameIndex();
|
|
|
|
frame->setFrameIndex(frameIndex);
|
|
|
|
|
2015-01-23 09:02:33 +08:00
|
|
|
bool tween = flatbuffers->tween() != 0;
|
2015-01-12 10:55:15 +08:00
|
|
|
frame->setTween(tween);
|
|
|
|
|
2015-04-09 16:55:15 +08:00
|
|
|
auto easingData = flatbuffers->easingData();
|
|
|
|
if (easingData)
|
|
|
|
{
|
|
|
|
loadEasingDataWithFlatBuffers(frame, easingData);
|
|
|
|
}
|
|
|
|
|
2015-01-12 10:55:15 +08:00
|
|
|
return frame;
|
|
|
|
}
|
|
|
|
|
|
|
|
Frame* ActionTimelineCache::loadAlphaFrameWithFlatBuffers(const flatbuffers::IntFrame *flatbuffers)
|
|
|
|
{
|
|
|
|
AlphaFrame* frame = AlphaFrame::create();
|
|
|
|
|
|
|
|
int alpha = flatbuffers->value();
|
|
|
|
|
|
|
|
frame->setAlpha(alpha);
|
|
|
|
|
|
|
|
int frameIndex = flatbuffers->frameIndex();
|
|
|
|
frame->setFrameIndex(frameIndex);
|
|
|
|
|
2015-01-23 09:02:33 +08:00
|
|
|
bool tween = flatbuffers->tween() != 0;
|
2015-01-12 10:55:15 +08:00
|
|
|
frame->setTween(tween);
|
|
|
|
|
|
|
|
return frame;
|
|
|
|
}
|
|
|
|
|
2015-04-09 16:55:15 +08:00
|
|
|
Frame* ActionTimelineCache::loadAnchorPointFrameWithFlatBuffers(const flatbuffers::ScaleFrame *flatbuffers)
|
|
|
|
{
|
|
|
|
AnchorPointFrame* frame = AnchorPointFrame::create();
|
|
|
|
|
|
|
|
auto f_scale = flatbuffers->scale();
|
|
|
|
Vec2 scale(f_scale->scaleX(), f_scale->scaleY());
|
|
|
|
frame->setAnchorPoint(scale);
|
|
|
|
|
|
|
|
int frameIndex = flatbuffers->frameIndex();
|
|
|
|
frame->setFrameIndex(frameIndex);
|
|
|
|
|
|
|
|
bool tween = flatbuffers->tween() != 0;
|
|
|
|
frame->setTween(tween);
|
|
|
|
|
|
|
|
auto easingData = flatbuffers->easingData();
|
|
|
|
if (easingData)
|
2015-01-22 11:20:01 +08:00
|
|
|
{
|
2015-04-09 16:55:15 +08:00
|
|
|
loadEasingDataWithFlatBuffers(frame, easingData);
|
2015-01-22 11:20:01 +08:00
|
|
|
}
|
|
|
|
|
2015-04-09 16:55:15 +08:00
|
|
|
return frame;
|
|
|
|
}
|
|
|
|
|
2015-01-12 10:55:15 +08:00
|
|
|
Frame* ActionTimelineCache::loadZOrderFrameWithFlatBuffers(const flatbuffers::IntFrame *flatbuffers)
|
|
|
|
{
|
|
|
|
ZOrderFrame* frame = ZOrderFrame::create();
|
|
|
|
|
|
|
|
int zorder = flatbuffers->value();
|
|
|
|
|
|
|
|
frame->setZOrder(zorder);
|
|
|
|
|
|
|
|
int frameIndex = flatbuffers->frameIndex();
|
|
|
|
frame->setFrameIndex(frameIndex);
|
|
|
|
|
2015-01-23 09:02:33 +08:00
|
|
|
bool tween = flatbuffers->tween() != 0;
|
2015-01-12 10:55:15 +08:00
|
|
|
frame->setTween(tween);
|
|
|
|
|
2015-04-09 16:55:15 +08:00
|
|
|
auto easingData = flatbuffers->easingData();
|
|
|
|
if (easingData)
|
|
|
|
{
|
|
|
|
loadEasingDataWithFlatBuffers(frame, easingData);
|
|
|
|
}
|
|
|
|
|
2015-01-12 10:55:15 +08:00
|
|
|
return frame;
|
|
|
|
}
|
|
|
|
|
|
|
|
Frame* ActionTimelineCache::loadInnerActionFrameWithFlatBuffers(const flatbuffers::InnerActionFrame *flatbuffers)
|
|
|
|
{
|
|
|
|
InnerActionFrame* frame = InnerActionFrame::create();
|
|
|
|
|
|
|
|
InnerActionType innerActionType = (InnerActionType)flatbuffers->innerActionType();
|
|
|
|
|
|
|
|
std::string currentAnimationFrame = flatbuffers->currentAniamtionName()->c_str();
|
|
|
|
|
|
|
|
int singleFrameIndex = flatbuffers->singleFrameIndex();
|
|
|
|
|
|
|
|
int frameIndex = flatbuffers->frameIndex();
|
|
|
|
frame->setFrameIndex(frameIndex);
|
|
|
|
|
2015-01-23 09:02:33 +08:00
|
|
|
bool tween = flatbuffers->tween() != 0;
|
2015-01-12 10:55:15 +08:00
|
|
|
frame->setTween(tween);
|
|
|
|
|
|
|
|
frame->setInnerActionType(innerActionType);
|
|
|
|
frame->setSingleFrameIndex(singleFrameIndex);
|
|
|
|
|
|
|
|
frame->setEnterWithName(true);
|
|
|
|
frame->setAnimationName(currentAnimationFrame);
|
|
|
|
|
2015-04-09 16:55:15 +08:00
|
|
|
auto easingData = flatbuffers->easingData();
|
|
|
|
if (easingData)
|
|
|
|
{
|
|
|
|
loadEasingDataWithFlatBuffers(frame, easingData);
|
|
|
|
}
|
|
|
|
|
2015-01-12 10:55:15 +08:00
|
|
|
return frame;
|
|
|
|
}
|
|
|
|
|
2015-08-17 13:05:29 +08:00
|
|
|
Frame* ActionTimelineCache::loadBlendFrameWithFlatBuffers(const flatbuffers::BlendFrame* flatbuffers)
|
|
|
|
{
|
|
|
|
BlendFuncFrame* frame = BlendFuncFrame::create();
|
|
|
|
cocos2d::BlendFunc blend;
|
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
|
|
|
blend.src = backend::BlendFactor::ONE;
|
|
|
|
blend.dst = backend::BlendFactor::ONE_MINUS_SRC_ALPHA;
|
2015-08-17 13:05:29 +08:00
|
|
|
if (nullptr != flatbuffers->blendFunc())
|
|
|
|
{
|
metal support for cocos2d-x (#19305)
* remove deprecated files
* remove some deprecated codes
* remove more deprecated codes
* remove ui deprecated codes
* remove more deprecated codes
* remove deprecated codes in ccmenuitem
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes
* remove more deprecated codes
* remove more deprecated codes
* remove vr related codes and ignore some modules
* remove allocator
* remove some config
* 【Feature】add back-end project file
* [Feature] add back-end file
* add pipeline descriptor and shader cache
* [Feature] support sprite for backend
* [Feature] remove unneeded code
* [Feature] according to es2.0 spec, you must use clamp-to-edge as texture wrap mode, and no mipmapping for non-power-of-two texture
* [Feature] set texture wrap mode to clamp-to-edge, and no mipmapping for non-power-of-two texture
* [Feature] remove macro define to .cpp file
* [Feature] add log info
* [Feature] add PipelineDescriptor for TriangleCommand
* [Feature] add PipelineDescriptor object as member of TriangleCommand
* [Feature] add getPipelineDescriptor method
* add renderbackend
* complete pipeline descriptor
* [Feature] add viewport in RenderCommand
* set viewport when rendrering
* [Feature] occur error when using RendererBackend, to be fixed.
* a workaround to fix black screen on macOS 10.14 (#19090)
* add rendererbackend init function
* fix typo
* [Feature] modify testFile
* [BugFix] modify shader path
* [Feature] set default viewport
* fix projection
* [Feature] modify log info
* [BugFix] change viewport data type to int
* [BugFix] add BindGroup to PipelienDescriptor
* [BugFix] change a_position to vec3 in sprite.vert
* [BugFix] set vertexLayout according to V3F_C4B_T2F structure
* [Feature] revert a_position to vec4
* [Feature] renderer should not use gl codes directly
* [Feature] it's better not use default value parameter
* fix depth test setting
* rendererbackend -> renderer
* clear color and depth at begin
* add metal backend
* metal support normalized attribute
* simplify codes
* update external
* add render pass desctriptor in pipeline descriptor
* fix warnings
* fix crash and memeory leak
* refactor Texture2D
* put pipeline descriptor into render command
* simplify codes
* [Feature] update Sprite
* fix crash when closing app
* [Feature] update SpriteBatchNode and TextureAtlas
* support render texture(not finish)
* [Feature] remove unused code
* make tests work on mac
* fix download-deps path error
* make tests work on iOS
* [Feature] support ttf under normal label effect
* refactor triangle command processing
* let renderer handle more common commands
* refactor backend
* make render texture work
* [Feature] refactor backend for GL
* [Feature]Renaming to make it easy to understand
* [Feature] change warp mode to CLAMP_TO_EDGE
* fix ghost
* simplify visit render queue logic
* support progress timer without rial mode
* support partcile system
* Feature/update label (#149)
* [BugFix] fix compile error
* [Feature] support outline effect in ios
* [Feature] add shader file
* [BugFix] fix begin and end RenderPass
* [Feature] update CustomCommand
* [Feature] revert project.pbxproj
* [Feature] simplify codes
* [BugFix] pack AI88 to RGBA8888 only when outline enable
* [Feature] support shadow effect in Label
* [Feature] support BMFont
* [Feature] support glow effect
* [Feature] simplify shader files
* LabelAtlas work
* handle blend function correctly
* support tile map
* don't share buffer in metal
* alloc buffer size as needed
* support more tilemap
* Merge branch 'minggo/metal-support' into feature/updateLabel
* minggo/metal-support:
support tile map
handle blend function correctly
LabelAtlas work
Feature/update label (#149)
support partcile system
# Conflicts:
# cocos/2d/CCLabel.cpp
# cocos/2d/CCSprite.cpp
# cocos/2d/CCSpriteBatchNode.cpp
# cocos/renderer/CCQuadCommand.cpp
# cocos/renderer/CCQuadCommand.h
* render texture work without saving file
* use global viewport
* grid3d works
* remove grabber
* tiled3d works
* [BugFix] fix label bug
* [Feature] add updateSubData for buffer
* [Feature] remove setVertexCount
* support depth test
* add callback command
* [Feature] add UITest
* [Feature] update UITest
* [Feature] remove unneeded codes
* fix custom command issue
* fix layer color blend issue
* [BugFix] fix iOS compile error
* [Feature] remove unneeded codes
* [Feature] fix updateVertexBuffer
* layerradial works
* add draw test back
* fix batch issue
* fix compiling error
* [BugFix] support ETC1
* [BugFix] get the correct pipelineDescriptor
* [BugFix] skip draw when backendTexture nullptr
* clipping node support
* [Feature] add shader files
* fix stencil issue in metal
* [Feature] update UILayoutTest
* [BugFix] skip drawing when vertexCount is zero
* refactor renderer
* add set global z order for stencil manager commands
* fix warnings caused by type
* remove viewport in render command
* [Feature] fix warnings caused by type
* [BugFix] clear vertexCount and indexCount for CustomComand when needed
* [Feature] update clear for CustomCommand
* ios use metal
* fix viewport issue
* fix LayerColorGradient crash
* [cmake] transport to android and windows (#160)
* save point 1
* compile on windows
* run on android
* revert useless change
* android set CC_ENABLE_CACHE_TEXTURE_DATA to 1
* add initGlew
* fix android crash
* add TODO new-renderer
* review update
* revert onGLFWWindowPosCallback
* fix android compiling error
* Impl progress radial (#162)
* progresstimer add radial impl
* default drawType to element
* dec invoke times of createVertexBuffer (#163)
* support depth/stencil format for gl backend
* simplify progress timer codes
* support motionstreak, effect is wrong
* fix motionstreak issue
* [Feature] update Scissor Test (#161)
* [Feature] update Scissor Test
* [Feature] update ScissorTest
* [Feature] rename function
* [Feature] get constant reference if needed
* [Feature] show render status (#164)
* improve performance
* fix depth state
* fill error that triangle vertex/index number bigger than buffer
* fix compiline error in release mode
* fix buffer conflict between CPU and GPU on iOS/macOS
* Renderer refactor (#165)
* use one vertes/index buffer with opengl
* fix error on windows
* custom command support index format config
* CCLayer: compact vertex data structure
* update comment
* fix doc
* support fast tilemap
* pass index format instead
* fix some wrong effect
* fix render texture error
* fix texture per-element size
* fix texture format error
* BlendFunc type refactor, GLenum -> backend::BlendFactor (#167)
* BlendFunc use backend::BlendFactor as inner field
* update comments
* use int to replace GLenum
* update xcode project fiel
* rename to GLBlendConst
* add ccConstants.h
* update xcode project file
* update copyright
* remove primitive command
* remove CCPrimitive.cpp/.h
* remove deprecated files
* remove unneeded files
* remove multiple view support
* remove multiple view support
* remove the usage of frame buffer in camera
* director don't use frame buffer
* remove FrameBuffer
* remove BatchCommand
* add some api reference
* add physics2d back
* fix crash when close app on mac
* improve render texture
* fix rendertexture issue
* fix rendertexture issue
* simplify codes
* CMake support for mac & ios (#169)
* update cmake
* fix compile error
* update 3rd libs version
* remove CCThread.h/.cpp
* remove ccthread
* use audio engine to implement simple audio engine
* remove unneeded codes
* remove deprecated codes
* remove winrt macro
* remove CC_USE_WIC
* set partcile blend function in more elegant way
* remove unneeded codes
* remove unneeded codes
* cmake works on windows
* update project setting
* improve performance
* GLFloat -> float
* sync v3 cmake improvements into metal-support (#172)
* pick: modern cmake, compile definitions improvement (#19139)
* modern cmake, use target_compile_definitions partly
* simplify macro define, remove USE_*
* modern cmake, macro define
* add physics 2d macro define into ccConfig.h
* remove USE_CHIPMUNK macro in build.gradle
* remove CocosSelectModule.cmake
* shrink useless define
* simplify compile options config, re-add if necessary
* update external for tmp CI test
* un-quote target_compile_options value
* add "-g" parameter only when debug mode
* keep single build type when generator Xcode & VS projecy
* update external for tmp CI tes
* add static_cast<char>(-1), fix -Wc++11-narrowing
* simplify win32 compile define
* not modify code, only improve compile options
# Conflicts:
# .gitignore
# cmake/Modules/CocosConfigDepend.cmake
# cocos/CMakeLists.txt
# external/config.json
# tests/cpp-tests/CMakeLists.txt
* modern cmake, improve cmake_compiler_flags (#19145)
* cmake_compiler_flags
* Fix typo
* Fix typo2
* Remove chanages from Android.mk
* correct lua template cmake build (#19149)
* don't add -Wno-deprecated into jsb target
* correct lua template cmake build
* fix win32 lua template compile error
* prevent cmake in-source-build friendly (#19151)
* pick: Copy resources to "Resources/" on win32 like in linux configuration
* add "/Z7" for cpp-tests on windows
* [cmake] fix iOS xcode property setting failed (#19208)
* fix iOS xcode property setting failed
* use search_depend_libs_recursive at dlls collect
* fix typo
* [cmake] add find_host_library into iOS toolchain file (#19230)
* pick: [lua android] use luajit & template cmake update (#19239)
* increase cmake stability , remove tests/CMakeLists.txt (#19261)
* cmake win32 Precompiled header (#19273)
* Precompiled header
* Fix
* Precompiled header for cocos
* Precompiled header jscocos2d
* Fix for COCOS2D_DEBUG is always 1 on Android (#19291)
Related #19289
* little build fix, tests cpp-tests works on mac
* sync v3 build related codes into metal-support (#173)
* strict initialization for std::array
* remove proj.win32 project configs
* modern cmake, cmake_cleanup_remove_unused_variables (#19146)
* Switch travis CI to xenial (#19207)
* Switch travis CI to xenial
* Remove language: android
* Set language: cpp
* Fix java problem
* Update sdkmanager
* Fix sdkmanger
* next sdkmanager fix
* Remove xenial from android
* revert to sdk-tools-{system}-3859397
* Remove linux cmake install
* Update before-install.sh
* Update .travis.yml
* Simplify install-deps-linux.sh, tested on Ubuntu 16.04 (#19212)
* Simplify install-deps-linux.sh
* Cleanup
* pick: install ninja
* update cocos2d-console submodule
* for metal-support alpha release, we only test cpp
* add HelloCpp into project(Cocos2d-x) for tmp test
* update extenal metal-support-4
* update uniform setting
* [Feature] update BindGroup
* [Feature] empty-test
* [Feature] cpp-test
* [Feature] fix GL compiler error
* [Feature] fix GL crash
* [Feature] empty-test
* [Feature] cpp-tests
* [feature] improve frameRate
* [feature] fix opengl compile error
* [feature] fix opengl compile error
* [BugFix] fix compute maxLocation error
* [Feature] update setting unifrom
* [Feature] fix namespace
* [Feature] remove unneeded code
* [Bugfix] fix project file
* [Feature] update review
* [texture2d] impl texture format support (#175)
* texture update
* update
* update texture
* commit
* compile on windows
* ddd
* rename
* rename methods
* no crash
* save gl
* save
* save
* rename
* move out pixel format convert functions
* metal crash
* update
* update android
* support gles compressed texture format
* support more compress format
* add more conversion methods
* ss
* save
* update conversion methods
* add PVRTC format support
* reformat
* add marco linux
* fix GL marcro
* pvrtc supported only by ios 8.0+
* remove unused cmake
* revert change
* refactor Texture2D::initWithData
* fix conversion log
* refactor Texture2D::initWithData
* remove some OpenGL constants for PVRTC
* add todo
* fix typo
* AutoTest works on mac/iOS by disable part cases, sync v3 bug fix (#174)
* review cpp-tests, and fix part issues on start auto test
* sync png format fix: Node:Particle3D abnormal texture effects #19204
* fix cpp-tests SpritePolygon crash, wrong png format (#19170)
* fix wrong png convert format from sRGB to Gray
* erase plist index if all frames was erased
* test_A8.png have I8 format, fix it
* [CCSpriteCache] allow re-add plist & add testcase (#19175)
* allow re-add plist & add testcase
* remove comments/rename method/update testcase
* fix isSpriteFramesWithFileLoaded & add testcase
* remove used variable
* remove unused variable
* fix double free issues when js/lua-tests exit on iOS (#19236)
* disable part cases, AutoTest works without crash on mac
* update cocos2dx files json, to test cocos new next
* fix spritecache plist parsing issue (#19269)
* [linux] Fix FileUtils::getContents with folder (#19157)
* fix FileUtils::getContents on linux/mac
* use stat.st_mode
* simplify
* [CCFileUtils] win32 getFileSize (#19176)
* win32 getFileSize
* fix stat
* [cpp test-Android]20:FileUtils/2 change title (#19197)
* sync #19200
* sync #19231
* [android lua] improve performance of lua loader (#19234)
* [lua] improve performance of lua loader
* remove cache fix
* Revert "fix spritecache plist parsing issue (#19269)"
This reverts commit f3a85ece4307a7b90816c34489d1ed2c8fd11baf.
* remove win32 project files ref in template.json
* add metal framework lnk ref into cpp template
* test on iOS, and disable part cases
* alBufferData instead of alBufferDataStatic for small audio file on Apple (#19227)
* changes AudioCache to use alBufferData instead of alBufferDataStatic
(also makes test 19 faster to trigger openal bugs faster)
The original problem: CrashIfClientProvidedBogusAudioBufferList
https://github.com/cocos2d/cocos2d-x/issues/18948
is not happening anymore, but there's still a not very frequent issue
that makes OpenAL crash with a call stack like this.
AudioCache::readDataTask > alBufferData > CleanUpDeadBufferList
It happes more frequently when the device is "cold", which means after
half an hour of not using the device (locked).
I could not find the actual source code for iOS OpenAL, so I used the
macOS versions:
https://opensource.apple.com/source/OpenAL/OpenAL-48.7/Source/OpenAL/oalImp.cpp.auto.html
They seem to use CAGuard.h to make sure the dead buffer list
has no threading issues. I'm worried because the CAGuard code I found
has macos and win32 define but no iOS, so I'm not sure. I guess the
iOS version is different and has the guard.
I could not find a place in the code that's unprotected by the locks
except the InitializeBufferMap() which should not be called more than
once from cocos, and there's a workaround in AudioEngine-impl for it.
I reduced the occurence of the CleanUpDeadBufferList crash by moving
the guard in ~AudioCache to cover the alDeleteBuffers call.
* remove hack method "setTimeout" on audio
* AutoTest works on iOS
* support set ios deployment target for root project
* enable all texture2d cases, since Jiang have fixed
* add CCTextureUtils to xcode project file (#176)
* add leak cases for SpriteFrameCache (#177)
* re-add SpriteFrameCache cases
* update template file json
* Update SpriteFrameCacheTest.cpp
* fix compiling error
2019-01-18 15:08:25 +08:00
|
|
|
blend.src = utils::toBackendBlendFactor(flatbuffers->blendFunc()->src());
|
|
|
|
blend.dst = utils::toBackendBlendFactor(flatbuffers->blendFunc()->dst());
|
2015-08-17 13:05:29 +08:00
|
|
|
}
|
|
|
|
frame->setBlendFunc(blend);
|
|
|
|
|
|
|
|
int frameIndex = flatbuffers->frameIndex();
|
|
|
|
frame->setFrameIndex(frameIndex);
|
|
|
|
|
|
|
|
bool tween = flatbuffers->tween() != 0;
|
|
|
|
frame->setTween(tween);
|
|
|
|
|
2015-08-17 16:19:29 +08:00
|
|
|
// easing data won't use in blend frame
|
|
|
|
//auto easingData = flatbuffers->easingData();
|
|
|
|
//if (easingData)
|
|
|
|
//{
|
|
|
|
// loadEasingDataWithFlatBuffers(frame, easingData);
|
|
|
|
//}
|
2015-08-17 13:05:29 +08:00
|
|
|
|
|
|
|
return frame;
|
|
|
|
}
|
|
|
|
|
2015-04-09 16:55:15 +08:00
|
|
|
void ActionTimelineCache::loadEasingDataWithFlatBuffers(cocostudio::timeline::Frame *frame,
|
|
|
|
const flatbuffers::EasingData *flatbuffers)
|
|
|
|
{
|
|
|
|
int type = flatbuffers->type();
|
|
|
|
frame->setTweenType((cocos2d::tweenfunc::TweenType)type);
|
|
|
|
auto points = flatbuffers->points();
|
|
|
|
if (points)
|
|
|
|
{
|
2015-04-10 17:05:55 +08:00
|
|
|
std::vector<float> easings;
|
2015-04-09 16:55:15 +08:00
|
|
|
for (auto it = points->begin(); it != points->end(); ++it)
|
|
|
|
{
|
|
|
|
easings.push_back(it->x());
|
|
|
|
easings.push_back(it->y());
|
|
|
|
}
|
2015-04-10 17:05:55 +08:00
|
|
|
frame->setEasingParams(easings);
|
2015-04-09 16:55:15 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-12-08 14:32:33 +08:00
|
|
|
ActionTimeline* ActionTimelineCache::createActionWithFlatBuffersForSimulator(const std::string& fileName)
|
|
|
|
{
|
|
|
|
FlatBuffersSerialize* fbs = FlatBuffersSerialize::getInstance();
|
|
|
|
fbs->_isSimulator = true;
|
|
|
|
auto builder = fbs->createFlatBuffersWithXMLFileForSimulator(fileName);
|
|
|
|
|
|
|
|
auto csparsebinary = GetCSParseBinary(builder->GetBufferPointer());
|
|
|
|
auto nodeAction = csparsebinary->action();
|
|
|
|
|
2017-02-08 13:58:11 +08:00
|
|
|
auto action = ActionTimeline::create();
|
2014-12-08 14:32:33 +08:00
|
|
|
|
|
|
|
int duration = nodeAction->duration();
|
|
|
|
action->setDuration(duration);
|
|
|
|
|
|
|
|
float speed = nodeAction->speed();
|
|
|
|
action->setTimeSpeed(speed);
|
|
|
|
|
2015-01-12 10:55:15 +08:00
|
|
|
auto animationlist = csparsebinary->animationList();
|
|
|
|
int animationcount = animationlist->size();
|
|
|
|
for (int i = 0; i < animationcount; i++)
|
|
|
|
{
|
|
|
|
auto animationdata = animationlist->Get(i);
|
|
|
|
AnimationInfo info;
|
|
|
|
info.name = animationdata->name()->c_str();
|
|
|
|
info.startIndex = animationdata->startIndex();
|
|
|
|
info.endIndex = animationdata->endIndex();
|
|
|
|
action->addAnimationInfo(info);
|
|
|
|
}
|
|
|
|
|
2014-12-08 14:32:33 +08:00
|
|
|
auto timeLines = nodeAction->timeLines();
|
|
|
|
int timelineLength = timeLines->size();
|
2015-10-20 15:49:12 +08:00
|
|
|
std::multimap<std::string, cocostudio::timeline::Timeline*> properTimelineMap;// order the timelines depends property name
|
2014-12-08 14:32:33 +08:00
|
|
|
for (int i = 0; i < timelineLength; i++)
|
|
|
|
{
|
|
|
|
auto timelineFlatBuf = timeLines->Get(i);
|
|
|
|
Timeline* timeline = loadTimelineWithFlatBuffers(timelineFlatBuf);
|
|
|
|
if (timeline)
|
2015-10-20 15:49:12 +08:00
|
|
|
{
|
2016-11-08 11:50:00 +08:00
|
|
|
properTimelineMap.emplace(timelineFlatBuf->property()->c_str(), timeline);
|
2015-10-20 15:49:12 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for (const auto& properTimelinePair : properTimelineMap)
|
|
|
|
{
|
|
|
|
action->addTimeline(properTimelinePair.second);
|
2014-12-08 14:32:33 +08:00
|
|
|
}
|
|
|
|
fbs->deleteFlatBufferBuilder();
|
|
|
|
return action;
|
|
|
|
}
|
2014-06-11 11:10:07 +08:00
|
|
|
|
|
|
|
}
|
2014-06-20 11:36:48 +08:00
|
|
|
}
|