2012-04-19 14:35:52 +08:00
|
|
|
/****************************************************************************
|
2013-02-01 11:20:46 +08:00
|
|
|
Copyright (c) 2010-2013 cocos2d-x.org
|
2018-01-29 16:25:32 +08:00
|
|
|
Copyright (c) 2013-2016 Chukong Technologies Inc.
|
|
|
|
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
|
2012-04-19 14:35:52 +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.
|
|
|
|
****************************************************************************/
|
2013-02-01 11:20:46 +08:00
|
|
|
#ifndef __CC_FILEUTILS_H__
|
|
|
|
#define __CC_FILEUTILS_H__
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2014-05-17 05:36:00 +08:00
|
|
|
#include <string>
|
|
|
|
#include <vector>
|
|
|
|
#include <unordered_map>
|
2016-04-26 13:37:22 +08:00
|
|
|
#include <type_traits>
|
2018-09-17 10:47:41 +08:00
|
|
|
#include <mutex>
|
2014-05-17 05:36:00 +08:00
|
|
|
|
2014-09-10 08:17:07 +08:00
|
|
|
#include "platform/CCPlatformMacros.h"
|
2014-04-30 08:37:36 +08:00
|
|
|
#include "base/ccTypes.h"
|
2014-04-27 01:35:57 +08:00
|
|
|
#include "base/CCValue.h"
|
|
|
|
#include "base/CCData.h"
|
2017-01-13 10:05:46 +08:00
|
|
|
#include "base/CCAsyncTaskPool.h"
|
|
|
|
#include "base/CCScheduler.h"
|
|
|
|
#include "base/CCDirector.h"
|
2012-04-19 14:35:52 +08:00
|
|
|
|
|
|
|
NS_CC_BEGIN
|
|
|
|
|
2012-06-20 18:09:11 +08:00
|
|
|
/**
|
2015-06-01 13:43:56 +08:00
|
|
|
* @addtogroup platform
|
2012-06-20 18:09:11 +08:00
|
|
|
* @{
|
|
|
|
*/
|
|
|
|
|
2016-04-26 13:37:22 +08:00
|
|
|
|
|
|
|
class ResizableBuffer {
|
|
|
|
public:
|
|
|
|
virtual ~ResizableBuffer() {}
|
|
|
|
virtual void resize(size_t size) = 0;
|
|
|
|
virtual void* buffer() const = 0;
|
|
|
|
};
|
|
|
|
|
|
|
|
template<typename T>
|
|
|
|
class ResizableBufferAdapter { };
|
|
|
|
|
|
|
|
|
|
|
|
template<typename CharT, typename Traits, typename Allocator>
|
|
|
|
class ResizableBufferAdapter< std::basic_string<CharT, Traits, Allocator> > : public ResizableBuffer {
|
|
|
|
typedef std::basic_string<CharT, Traits, Allocator> BufferType;
|
|
|
|
BufferType* _buffer;
|
|
|
|
public:
|
|
|
|
explicit ResizableBufferAdapter(BufferType* buffer) : _buffer(buffer) {}
|
|
|
|
virtual void resize(size_t size) override {
|
|
|
|
_buffer->resize((size + sizeof(CharT) - 1) / sizeof(CharT));
|
|
|
|
}
|
|
|
|
virtual void* buffer() const override {
|
2016-07-05 14:27:11 +08:00
|
|
|
// can not invoke string::front() if it is empty
|
|
|
|
|
2016-07-05 14:28:30 +08:00
|
|
|
if (_buffer->empty())
|
2016-07-05 14:27:11 +08:00
|
|
|
return nullptr;
|
|
|
|
else
|
|
|
|
return &_buffer->front();
|
2016-04-26 13:37:22 +08:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
template<typename T, typename Allocator>
|
|
|
|
class ResizableBufferAdapter< std::vector<T, Allocator> > : public ResizableBuffer {
|
|
|
|
typedef std::vector<T, Allocator> BufferType;
|
|
|
|
BufferType* _buffer;
|
|
|
|
public:
|
|
|
|
explicit ResizableBufferAdapter(BufferType* buffer) : _buffer(buffer) {}
|
|
|
|
virtual void resize(size_t size) override {
|
|
|
|
_buffer->resize((size + sizeof(T) - 1) / sizeof(T));
|
|
|
|
}
|
|
|
|
virtual void* buffer() const override {
|
2016-07-05 14:27:11 +08:00
|
|
|
// can not invoke vector::front() if it is empty
|
|
|
|
|
2016-07-05 14:28:30 +08:00
|
|
|
if (_buffer->empty())
|
2016-07-05 14:27:11 +08:00
|
|
|
return nullptr;
|
|
|
|
else
|
|
|
|
return &_buffer->front();
|
2016-04-26 13:37:22 +08:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
template<>
|
|
|
|
class ResizableBufferAdapter<Data> : public ResizableBuffer {
|
|
|
|
typedef Data BufferType;
|
|
|
|
BufferType* _buffer;
|
|
|
|
public:
|
|
|
|
explicit ResizableBufferAdapter(BufferType* buffer) : _buffer(buffer) {}
|
|
|
|
virtual void resize(size_t size) override {
|
2017-12-12 17:49:11 +08:00
|
|
|
size_t oldSize = static_cast<size_t>(_buffer->getSize());
|
|
|
|
if (oldSize != size) {
|
2016-04-26 13:37:22 +08:00
|
|
|
auto old = _buffer->getBytes();
|
|
|
|
void* buffer = realloc(old, size);
|
|
|
|
if (buffer)
|
|
|
|
_buffer->fastSet((unsigned char*)buffer, size);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
virtual void* buffer() const override {
|
|
|
|
return _buffer->getBytes();
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2015-03-24 10:34:44 +08:00
|
|
|
/** Helper class to handle file operations. */
|
2013-08-22 18:16:50 +08:00
|
|
|
class CC_DLL FileUtils
|
2012-04-19 14:35:52 +08:00
|
|
|
{
|
|
|
|
public:
|
2013-01-26 22:31:57 +08:00
|
|
|
/**
|
2013-06-20 14:13:12 +08:00
|
|
|
* Gets the instance of FileUtils.
|
2013-01-26 22:31:57 +08:00
|
|
|
*/
|
2013-07-12 06:24:23 +08:00
|
|
|
static FileUtils* getInstance();
|
|
|
|
|
2013-01-26 22:31:57 +08:00
|
|
|
/**
|
2013-06-20 14:13:12 +08:00
|
|
|
* Destroys the instance of FileUtils.
|
2013-01-26 22:31:57 +08:00
|
|
|
*/
|
2013-07-12 06:24:23 +08:00
|
|
|
static void destroyInstance();
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2014-12-26 11:34:31 +08:00
|
|
|
/**
|
|
|
|
* You can inherit from platform dependent implementation of FileUtils, such as FileUtilsAndroid,
|
|
|
|
* and use this function to set delegate, then FileUtils will invoke delegate's implementation.
|
2015-10-23 15:37:33 +08:00
|
|
|
* For example, your resources are encrypted, so you need to decrypt it after reading data from
|
2014-12-26 11:34:31 +08:00
|
|
|
* resources, then you can implement all getXXX functions, and engine will invoke your own getXX
|
|
|
|
* functions when reading data of resources.
|
2014-12-26 14:25:55 +08:00
|
|
|
*
|
|
|
|
* If you don't want to system default implementation after setting delegate, you can just pass nullptr
|
|
|
|
* to this function.
|
|
|
|
*
|
2015-03-27 17:09:54 +08:00
|
|
|
* @warning It will delete previous delegate
|
2015-03-24 10:34:44 +08:00
|
|
|
* @lua NA
|
2014-12-26 11:34:31 +08:00
|
|
|
*/
|
2014-12-26 14:25:55 +08:00
|
|
|
static void setDelegate(FileUtils *delegate);
|
2013-07-12 06:24:23 +08:00
|
|
|
|
2013-02-01 11:20:46 +08:00
|
|
|
/**
|
2013-06-20 14:13:12 +08:00
|
|
|
* The destructor of FileUtils.
|
2013-09-13 13:52:42 +08:00
|
|
|
* @js NA
|
|
|
|
* @lua NA
|
2013-02-01 11:20:46 +08:00
|
|
|
*/
|
2013-06-20 14:13:12 +08:00
|
|
|
virtual ~FileUtils();
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2013-01-26 22:31:57 +08:00
|
|
|
/**
|
2015-03-24 10:34:44 +08:00
|
|
|
* Purges full path caches.
|
2013-01-26 22:31:57 +08:00
|
|
|
*/
|
2013-02-01 11:20:46 +08:00
|
|
|
virtual void purgeCachedEntries();
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2013-12-18 14:58:17 +08:00
|
|
|
/**
|
|
|
|
* Gets string from a file.
|
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual std::string getStringFromFile(const std::string& filename) const;
|
2017-01-13 10:05:46 +08:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Gets string from a file, async off the main cocos thread
|
|
|
|
*
|
|
|
|
* @param path filepath for the string to be read. Can be relative or absolute path
|
|
|
|
* @param callback Function that will be called when file is read. Will be called
|
|
|
|
* on the main cocos thread.
|
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual void getStringFromFile(const std::string& path, std::function<void(std::string)> callback) const;
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2013-12-18 14:58:17 +08:00
|
|
|
/**
|
|
|
|
* Creates binary data from a file.
|
|
|
|
* @return A data object.
|
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual Data getDataFromFile(const std::string& filename) const;
|
2017-01-13 10:05:46 +08:00
|
|
|
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2017-01-13 10:05:46 +08:00
|
|
|
/**
|
|
|
|
* Gets a binary data object from a file, async off the main cocos thread.
|
|
|
|
*
|
|
|
|
* @param filename filepath for the data to be read. Can be relative or absolute path
|
|
|
|
* @param callback Function that will be called when file is read. Will be called
|
|
|
|
* on the main cocos thread.
|
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual void getDataFromFile(const std::string& filename, std::function<void(Data)> callback) const;
|
2016-04-26 13:37:22 +08:00
|
|
|
|
|
|
|
enum class Status
|
|
|
|
{
|
|
|
|
OK = 0,
|
|
|
|
NotExists = 1, // File not exists
|
|
|
|
OpenFailed = 2, // Open file failed.
|
2016-06-25 11:58:55 +08:00
|
|
|
ReadFailed = 3, // Read failed
|
2016-04-26 13:37:22 +08:00
|
|
|
NotInitialized = 4, // FileUtils is not initializes
|
|
|
|
TooLarge = 5, // The file is too large (great than 2^32-1)
|
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
|
|
|
ObtainSizeFailed = 6, // Failed to obtain the file size.
|
|
|
|
NotRegularFileType = 7 // File type is not S_IFREG
|
2016-04-26 13:37:22 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Gets whole file contents as string from a file.
|
|
|
|
*
|
|
|
|
* Unlike getStringFromFile, these getContents methods:
|
|
|
|
* - read file in binary mode (does not convert CRLF to LF).
|
|
|
|
* - does not truncate the string when '\0' is found (returned string of getContents may have '\0' in the middle.).
|
|
|
|
*
|
|
|
|
* The template version of can accept cocos2d::Data, std::basic_string and std::vector.
|
|
|
|
*
|
2016-07-10 16:38:32 +08:00
|
|
|
* @code
|
2016-04-26 13:37:22 +08:00
|
|
|
* std::string sbuf;
|
|
|
|
* FileUtils::getInstance()->getContents("path/to/file", &sbuf);
|
|
|
|
*
|
|
|
|
* std::vector<int> vbuf;
|
|
|
|
* FileUtils::getInstance()->getContents("path/to/file", &vbuf);
|
|
|
|
*
|
|
|
|
* Data dbuf;
|
|
|
|
* FileUtils::getInstance()->getContents("path/to/file", &dbuf);
|
2016-07-10 16:38:32 +08:00
|
|
|
* @endcode
|
2016-04-26 13:37:22 +08:00
|
|
|
*
|
|
|
|
* Note: if you read to std::vector<T> and std::basic_string<T> where T is not 8 bit type,
|
|
|
|
* you may get 0 ~ sizeof(T)-1 bytes padding.
|
|
|
|
*
|
|
|
|
* - To write a new buffer class works with getContents, just extend ResizableBuffer.
|
|
|
|
* - To write a adapter for existing class, write a specialized ResizableBufferAdapter for that class, see follow code.
|
|
|
|
*
|
2016-07-10 16:38:32 +08:00
|
|
|
* @code
|
2016-04-26 13:37:22 +08:00
|
|
|
* NS_CC_BEGIN // ResizableBufferAdapter needed in cocos2d namespace.
|
|
|
|
* template<>
|
|
|
|
* class ResizableBufferAdapter<AlreadyExistsBuffer> : public ResizableBuffer {
|
|
|
|
* public:
|
|
|
|
* ResizableBufferAdapter(AlreadyExistsBuffer* buffer) {
|
|
|
|
* // your code here
|
|
|
|
* }
|
|
|
|
* virtual void resize(size_t size) override {
|
|
|
|
* // your code here
|
|
|
|
* }
|
|
|
|
* virtual void* buffer() const override {
|
|
|
|
* // your code here
|
|
|
|
* }
|
|
|
|
* };
|
|
|
|
* NS_CC_END
|
2016-07-10 16:38:32 +08:00
|
|
|
* @endcode
|
2016-04-26 13:37:22 +08:00
|
|
|
*
|
|
|
|
* @param[in] filename The resource file name which contains the path.
|
|
|
|
* @param[out] buffer The buffer where the file contents are store to.
|
|
|
|
* @return Returns:
|
|
|
|
* - Status::OK when there is no error, the buffer is filled with the contents of file.
|
|
|
|
* - Status::NotExists when file not exists, the buffer will not changed.
|
|
|
|
* - Status::OpenFailed when cannot open file, the buffer will not changed.
|
2016-06-25 11:58:55 +08:00
|
|
|
* - Status::ReadFailed when read end up before read whole, the buffer will fill with already read bytes.
|
2016-04-26 13:37:22 +08:00
|
|
|
* - Status::NotInitialized when FileUtils is not initializes, the buffer will not changed.
|
|
|
|
* - Status::TooLarge when there file to be read is too large (> 2^32-1), the buffer will not changed.
|
|
|
|
* - Status::ObtainSizeFailed when failed to obtain the file size, the buffer will not changed.
|
|
|
|
*/
|
|
|
|
template <
|
|
|
|
typename T,
|
|
|
|
typename Enable = typename std::enable_if<
|
|
|
|
std::is_base_of< ResizableBuffer, ResizableBufferAdapter<T> >::value
|
|
|
|
>::type
|
|
|
|
>
|
2018-09-17 10:47:41 +08:00
|
|
|
Status getContents(const std::string& filename, T* buffer) const {
|
2016-04-26 13:37:22 +08:00
|
|
|
ResizableBufferAdapter<T> buf(buffer);
|
|
|
|
return getContents(filename, &buf);
|
|
|
|
}
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual Status getContents(const std::string& filename, ResizableBuffer* buffer) const;
|
2016-04-26 13:37:22 +08:00
|
|
|
|
2012-04-19 14:35:52 +08:00
|
|
|
/**
|
2013-02-01 15:41:41 +08:00
|
|
|
* Gets resource file data from a zip file.
|
|
|
|
*
|
2013-07-26 06:53:24 +08:00
|
|
|
* @param[in] filename The resource file name which contains the relative path of the zip file.
|
2013-08-01 21:40:13 +08:00
|
|
|
* @param[out] size If the file read operation succeeds, it will be the data size, otherwise 0.
|
2013-12-18 17:47:20 +08:00
|
|
|
* @return Upon success, a pointer to the data is returned, otherwise nullptr.
|
|
|
|
* @warning Recall: you are responsible for calling free() on any Non-nullptr pointer returned.
|
2013-02-01 15:41:41 +08:00
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual unsigned char* getFileDataFromZip(const std::string& zipFilePath, const std::string& filename, ssize_t *size) const;
|
2012-04-19 14:35:52 +08:00
|
|
|
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2013-01-18 18:05:32 +08:00
|
|
|
/** Returns the fullpath for a given filename.
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2013-01-29 16:28:59 +08:00
|
|
|
First it will try to get a new filename from the "filenameLookup" dictionary.
|
|
|
|
If a new filename can't be found on the dictionary, it will use the original filename.
|
2013-06-20 14:13:12 +08:00
|
|
|
Then it will try to obtain the full path of the filename using the FileUtils search rules: resolutions, and search paths.
|
2013-01-29 15:50:57 +08:00
|
|
|
The file search is based on the array element order of search paths and resolution directories.
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2013-01-29 15:50:57 +08:00
|
|
|
For instance:
|
2013-01-29 16:28:59 +08:00
|
|
|
|
2015-07-07 14:06:59 +08:00
|
|
|
We set two elements("/mnt/sdcard/", "internal_dir/") to search paths vector by setSearchPaths,
|
|
|
|
and set three elements("resources-ipadhd/", "resources-ipad/", "resources-iphonehd")
|
|
|
|
to resolutions vector by setSearchResolutionsOrder. The "internal_dir" is relative to "Resources/".
|
2013-01-29 15:50:57 +08:00
|
|
|
|
2015-07-07 14:06:59 +08:00
|
|
|
If we have a file named 'sprite.png', the mapping in fileLookup dictionary contains `key: sprite.png -> value: sprite.pvr.gz`.
|
|
|
|
Firstly, it will replace 'sprite.png' with 'sprite.pvr.gz', then searching the file sprite.pvr.gz as follows:
|
2013-01-29 16:28:59 +08:00
|
|
|
|
2015-07-07 14:06:59 +08:00
|
|
|
/mnt/sdcard/resources-ipadhd/sprite.pvr.gz (if not found, search next)
|
|
|
|
/mnt/sdcard/resources-ipad/sprite.pvr.gz (if not found, search next)
|
|
|
|
/mnt/sdcard/resources-iphonehd/sprite.pvr.gz (if not found, search next)
|
|
|
|
/mnt/sdcard/sprite.pvr.gz (if not found, search next)
|
|
|
|
internal_dir/resources-ipadhd/sprite.pvr.gz (if not found, search next)
|
|
|
|
internal_dir/resources-ipad/sprite.pvr.gz (if not found, search next)
|
|
|
|
internal_dir/resources-iphonehd/sprite.pvr.gz (if not found, search next)
|
|
|
|
internal_dir/sprite.pvr.gz (if not found, return "sprite.png")
|
2013-01-29 16:28:59 +08:00
|
|
|
|
|
|
|
If the filename contains relative path like "gamescene/uilayer/sprite.png",
|
|
|
|
and the mapping in fileLookup dictionary contains `key: gamescene/uilayer/sprite.png -> value: gamescene/uilayer/sprite.pvr.gz`.
|
|
|
|
The file search order will be:
|
|
|
|
|
2015-07-07 14:06:59 +08:00
|
|
|
/mnt/sdcard/gamescene/uilayer/resources-ipadhd/sprite.pvr.gz (if not found, search next)
|
|
|
|
/mnt/sdcard/gamescene/uilayer/resources-ipad/sprite.pvr.gz (if not found, search next)
|
|
|
|
/mnt/sdcard/gamescene/uilayer/resources-iphonehd/sprite.pvr.gz (if not found, search next)
|
|
|
|
/mnt/sdcard/gamescene/uilayer/sprite.pvr.gz (if not found, search next)
|
|
|
|
internal_dir/gamescene/uilayer/resources-ipadhd/sprite.pvr.gz (if not found, search next)
|
|
|
|
internal_dir/gamescene/uilayer/resources-ipad/sprite.pvr.gz (if not found, search next)
|
|
|
|
internal_dir/gamescene/uilayer/resources-iphonehd/sprite.pvr.gz (if not found, search next)
|
|
|
|
internal_dir/gamescene/uilayer/sprite.pvr.gz (if not found, return "gamescene/uilayer/sprite.png")
|
2013-01-29 16:28:59 +08:00
|
|
|
|
2013-07-26 06:53:24 +08:00
|
|
|
If the new file can't be found on the file system, it will return the parameter filename directly.
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2013-01-18 18:05:32 +08:00
|
|
|
This method was added to simplify multiplatform support. Whether you are using cocos2d-js or any cross-compilation toolchain like StellaSDK or Apportable,
|
2013-01-29 16:28:59 +08:00
|
|
|
you might need to load different resources for a given file in the different platforms.
|
2013-01-29 15:50:57 +08:00
|
|
|
|
2013-01-18 18:05:32 +08:00
|
|
|
@since v2.1
|
|
|
|
*/
|
2015-04-07 22:15:15 +08:00
|
|
|
virtual std::string fullPathForFilename(const std::string &filename) const;
|
2015-07-07 14:06:59 +08:00
|
|
|
|
metal support for cocos2d-x (#19305)
* remove deprecated files
* remove some deprecated codes
* remove more deprecated codes
* remove ui deprecated codes
* remove more deprecated codes
* remove deprecated codes in ccmenuitem
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes
* remove more deprecated codes
* remove more deprecated codes
* remove vr related codes and ignore some modules
* remove allocator
* remove some config
* 【Feature】add back-end project file
* [Feature] add back-end file
* add pipeline descriptor and shader cache
* [Feature] support sprite for backend
* [Feature] remove unneeded code
* [Feature] according to es2.0 spec, you must use clamp-to-edge as texture wrap mode, and no mipmapping for non-power-of-two texture
* [Feature] set texture wrap mode to clamp-to-edge, and no mipmapping for non-power-of-two texture
* [Feature] remove macro define to .cpp file
* [Feature] add log info
* [Feature] add PipelineDescriptor for TriangleCommand
* [Feature] add PipelineDescriptor object as member of TriangleCommand
* [Feature] add getPipelineDescriptor method
* add renderbackend
* complete pipeline descriptor
* [Feature] add viewport in RenderCommand
* set viewport when rendrering
* [Feature] occur error when using RendererBackend, to be fixed.
* a workaround to fix black screen on macOS 10.14 (#19090)
* add rendererbackend init function
* fix typo
* [Feature] modify testFile
* [BugFix] modify shader path
* [Feature] set default viewport
* fix projection
* [Feature] modify log info
* [BugFix] change viewport data type to int
* [BugFix] add BindGroup to PipelienDescriptor
* [BugFix] change a_position to vec3 in sprite.vert
* [BugFix] set vertexLayout according to V3F_C4B_T2F structure
* [Feature] revert a_position to vec4
* [Feature] renderer should not use gl codes directly
* [Feature] it's better not use default value parameter
* fix depth test setting
* rendererbackend -> renderer
* clear color and depth at begin
* add metal backend
* metal support normalized attribute
* simplify codes
* update external
* add render pass desctriptor in pipeline descriptor
* fix warnings
* fix crash and memeory leak
* refactor Texture2D
* put pipeline descriptor into render command
* simplify codes
* [Feature] update Sprite
* fix crash when closing app
* [Feature] update SpriteBatchNode and TextureAtlas
* support render texture(not finish)
* [Feature] remove unused code
* make tests work on mac
* fix download-deps path error
* make tests work on iOS
* [Feature] support ttf under normal label effect
* refactor triangle command processing
* let renderer handle more common commands
* refactor backend
* make render texture work
* [Feature] refactor backend for GL
* [Feature]Renaming to make it easy to understand
* [Feature] change warp mode to CLAMP_TO_EDGE
* fix ghost
* simplify visit render queue logic
* support progress timer without rial mode
* support partcile system
* Feature/update label (#149)
* [BugFix] fix compile error
* [Feature] support outline effect in ios
* [Feature] add shader file
* [BugFix] fix begin and end RenderPass
* [Feature] update CustomCommand
* [Feature] revert project.pbxproj
* [Feature] simplify codes
* [BugFix] pack AI88 to RGBA8888 only when outline enable
* [Feature] support shadow effect in Label
* [Feature] support BMFont
* [Feature] support glow effect
* [Feature] simplify shader files
* LabelAtlas work
* handle blend function correctly
* support tile map
* don't share buffer in metal
* alloc buffer size as needed
* support more tilemap
* Merge branch 'minggo/metal-support' into feature/updateLabel
* minggo/metal-support:
support tile map
handle blend function correctly
LabelAtlas work
Feature/update label (#149)
support partcile system
# Conflicts:
# cocos/2d/CCLabel.cpp
# cocos/2d/CCSprite.cpp
# cocos/2d/CCSpriteBatchNode.cpp
# cocos/renderer/CCQuadCommand.cpp
# cocos/renderer/CCQuadCommand.h
* render texture work without saving file
* use global viewport
* grid3d works
* remove grabber
* tiled3d works
* [BugFix] fix label bug
* [Feature] add updateSubData for buffer
* [Feature] remove setVertexCount
* support depth test
* add callback command
* [Feature] add UITest
* [Feature] update UITest
* [Feature] remove unneeded codes
* fix custom command issue
* fix layer color blend issue
* [BugFix] fix iOS compile error
* [Feature] remove unneeded codes
* [Feature] fix updateVertexBuffer
* layerradial works
* add draw test back
* fix batch issue
* fix compiling error
* [BugFix] support ETC1
* [BugFix] get the correct pipelineDescriptor
* [BugFix] skip draw when backendTexture nullptr
* clipping node support
* [Feature] add shader files
* fix stencil issue in metal
* [Feature] update UILayoutTest
* [BugFix] skip drawing when vertexCount is zero
* refactor renderer
* add set global z order for stencil manager commands
* fix warnings caused by type
* remove viewport in render command
* [Feature] fix warnings caused by type
* [BugFix] clear vertexCount and indexCount for CustomComand when needed
* [Feature] update clear for CustomCommand
* ios use metal
* fix viewport issue
* fix LayerColorGradient crash
* [cmake] transport to android and windows (#160)
* save point 1
* compile on windows
* run on android
* revert useless change
* android set CC_ENABLE_CACHE_TEXTURE_DATA to 1
* add initGlew
* fix android crash
* add TODO new-renderer
* review update
* revert onGLFWWindowPosCallback
* fix android compiling error
* Impl progress radial (#162)
* progresstimer add radial impl
* default drawType to element
* dec invoke times of createVertexBuffer (#163)
* support depth/stencil format for gl backend
* simplify progress timer codes
* support motionstreak, effect is wrong
* fix motionstreak issue
* [Feature] update Scissor Test (#161)
* [Feature] update Scissor Test
* [Feature] update ScissorTest
* [Feature] rename function
* [Feature] get constant reference if needed
* [Feature] show render status (#164)
* improve performance
* fix depth state
* fill error that triangle vertex/index number bigger than buffer
* fix compiline error in release mode
* fix buffer conflict between CPU and GPU on iOS/macOS
* Renderer refactor (#165)
* use one vertes/index buffer with opengl
* fix error on windows
* custom command support index format config
* CCLayer: compact vertex data structure
* update comment
* fix doc
* support fast tilemap
* pass index format instead
* fix some wrong effect
* fix render texture error
* fix texture per-element size
* fix texture format error
* BlendFunc type refactor, GLenum -> backend::BlendFactor (#167)
* BlendFunc use backend::BlendFactor as inner field
* update comments
* use int to replace GLenum
* update xcode project fiel
* rename to GLBlendConst
* add ccConstants.h
* update xcode project file
* update copyright
* remove primitive command
* remove CCPrimitive.cpp/.h
* remove deprecated files
* remove unneeded files
* remove multiple view support
* remove multiple view support
* remove the usage of frame buffer in camera
* director don't use frame buffer
* remove FrameBuffer
* remove BatchCommand
* add some api reference
* add physics2d back
* fix crash when close app on mac
* improve render texture
* fix rendertexture issue
* fix rendertexture issue
* simplify codes
* CMake support for mac & ios (#169)
* update cmake
* fix compile error
* update 3rd libs version
* remove CCThread.h/.cpp
* remove ccthread
* use audio engine to implement simple audio engine
* remove unneeded codes
* remove deprecated codes
* remove winrt macro
* remove CC_USE_WIC
* set partcile blend function in more elegant way
* remove unneeded codes
* remove unneeded codes
* cmake works on windows
* update project setting
* improve performance
* GLFloat -> float
* sync v3 cmake improvements into metal-support (#172)
* pick: modern cmake, compile definitions improvement (#19139)
* modern cmake, use target_compile_definitions partly
* simplify macro define, remove USE_*
* modern cmake, macro define
* add physics 2d macro define into ccConfig.h
* remove USE_CHIPMUNK macro in build.gradle
* remove CocosSelectModule.cmake
* shrink useless define
* simplify compile options config, re-add if necessary
* update external for tmp CI test
* un-quote target_compile_options value
* add "-g" parameter only when debug mode
* keep single build type when generator Xcode & VS projecy
* update external for tmp CI tes
* add static_cast<char>(-1), fix -Wc++11-narrowing
* simplify win32 compile define
* not modify code, only improve compile options
# Conflicts:
# .gitignore
# cmake/Modules/CocosConfigDepend.cmake
# cocos/CMakeLists.txt
# external/config.json
# tests/cpp-tests/CMakeLists.txt
* modern cmake, improve cmake_compiler_flags (#19145)
* cmake_compiler_flags
* Fix typo
* Fix typo2
* Remove chanages from Android.mk
* correct lua template cmake build (#19149)
* don't add -Wno-deprecated into jsb target
* correct lua template cmake build
* fix win32 lua template compile error
* prevent cmake in-source-build friendly (#19151)
* pick: Copy resources to "Resources/" on win32 like in linux configuration
* add "/Z7" for cpp-tests on windows
* [cmake] fix iOS xcode property setting failed (#19208)
* fix iOS xcode property setting failed
* use search_depend_libs_recursive at dlls collect
* fix typo
* [cmake] add find_host_library into iOS toolchain file (#19230)
* pick: [lua android] use luajit & template cmake update (#19239)
* increase cmake stability , remove tests/CMakeLists.txt (#19261)
* cmake win32 Precompiled header (#19273)
* Precompiled header
* Fix
* Precompiled header for cocos
* Precompiled header jscocos2d
* Fix for COCOS2D_DEBUG is always 1 on Android (#19291)
Related #19289
* little build fix, tests cpp-tests works on mac
* sync v3 build related codes into metal-support (#173)
* strict initialization for std::array
* remove proj.win32 project configs
* modern cmake, cmake_cleanup_remove_unused_variables (#19146)
* Switch travis CI to xenial (#19207)
* Switch travis CI to xenial
* Remove language: android
* Set language: cpp
* Fix java problem
* Update sdkmanager
* Fix sdkmanger
* next sdkmanager fix
* Remove xenial from android
* revert to sdk-tools-{system}-3859397
* Remove linux cmake install
* Update before-install.sh
* Update .travis.yml
* Simplify install-deps-linux.sh, tested on Ubuntu 16.04 (#19212)
* Simplify install-deps-linux.sh
* Cleanup
* pick: install ninja
* update cocos2d-console submodule
* for metal-support alpha release, we only test cpp
* add HelloCpp into project(Cocos2d-x) for tmp test
* update extenal metal-support-4
* update uniform setting
* [Feature] update BindGroup
* [Feature] empty-test
* [Feature] cpp-test
* [Feature] fix GL compiler error
* [Feature] fix GL crash
* [Feature] empty-test
* [Feature] cpp-tests
* [feature] improve frameRate
* [feature] fix opengl compile error
* [feature] fix opengl compile error
* [BugFix] fix compute maxLocation error
* [Feature] update setting unifrom
* [Feature] fix namespace
* [Feature] remove unneeded code
* [Bugfix] fix project file
* [Feature] update review
* [texture2d] impl texture format support (#175)
* texture update
* update
* update texture
* commit
* compile on windows
* ddd
* rename
* rename methods
* no crash
* save gl
* save
* save
* rename
* move out pixel format convert functions
* metal crash
* update
* update android
* support gles compressed texture format
* support more compress format
* add more conversion methods
* ss
* save
* update conversion methods
* add PVRTC format support
* reformat
* add marco linux
* fix GL marcro
* pvrtc supported only by ios 8.0+
* remove unused cmake
* revert change
* refactor Texture2D::initWithData
* fix conversion log
* refactor Texture2D::initWithData
* remove some OpenGL constants for PVRTC
* add todo
* fix typo
* AutoTest works on mac/iOS by disable part cases, sync v3 bug fix (#174)
* review cpp-tests, and fix part issues on start auto test
* sync png format fix: Node:Particle3D abnormal texture effects #19204
* fix cpp-tests SpritePolygon crash, wrong png format (#19170)
* fix wrong png convert format from sRGB to Gray
* erase plist index if all frames was erased
* test_A8.png have I8 format, fix it
* [CCSpriteCache] allow re-add plist & add testcase (#19175)
* allow re-add plist & add testcase
* remove comments/rename method/update testcase
* fix isSpriteFramesWithFileLoaded & add testcase
* remove used variable
* remove unused variable
* fix double free issues when js/lua-tests exit on iOS (#19236)
* disable part cases, AutoTest works without crash on mac
* update cocos2dx files json, to test cocos new next
* fix spritecache plist parsing issue (#19269)
* [linux] Fix FileUtils::getContents with folder (#19157)
* fix FileUtils::getContents on linux/mac
* use stat.st_mode
* simplify
* [CCFileUtils] win32 getFileSize (#19176)
* win32 getFileSize
* fix stat
* [cpp test-Android]20:FileUtils/2 change title (#19197)
* sync #19200
* sync #19231
* [android lua] improve performance of lua loader (#19234)
* [lua] improve performance of lua loader
* remove cache fix
* Revert "fix spritecache plist parsing issue (#19269)"
This reverts commit f3a85ece4307a7b90816c34489d1ed2c8fd11baf.
* remove win32 project files ref in template.json
* add metal framework lnk ref into cpp template
* test on iOS, and disable part cases
* alBufferData instead of alBufferDataStatic for small audio file on Apple (#19227)
* changes AudioCache to use alBufferData instead of alBufferDataStatic
(also makes test 19 faster to trigger openal bugs faster)
The original problem: CrashIfClientProvidedBogusAudioBufferList
https://github.com/cocos2d/cocos2d-x/issues/18948
is not happening anymore, but there's still a not very frequent issue
that makes OpenAL crash with a call stack like this.
AudioCache::readDataTask > alBufferData > CleanUpDeadBufferList
It happes more frequently when the device is "cold", which means after
half an hour of not using the device (locked).
I could not find the actual source code for iOS OpenAL, so I used the
macOS versions:
https://opensource.apple.com/source/OpenAL/OpenAL-48.7/Source/OpenAL/oalImp.cpp.auto.html
They seem to use CAGuard.h to make sure the dead buffer list
has no threading issues. I'm worried because the CAGuard code I found
has macos and win32 define but no iOS, so I'm not sure. I guess the
iOS version is different and has the guard.
I could not find a place in the code that's unprotected by the locks
except the InitializeBufferMap() which should not be called more than
once from cocos, and there's a workaround in AudioEngine-impl for it.
I reduced the occurence of the CleanUpDeadBufferList crash by moving
the guard in ~AudioCache to cover the alDeleteBuffers call.
* remove hack method "setTimeout" on audio
* AutoTest works on iOS
* support set ios deployment target for root project
* enable all texture2d cases, since Jiang have fixed
* add CCTextureUtils to xcode project file (#176)
* add leak cases for SpriteFrameCache (#177)
* re-add SpriteFrameCache cases
* update template file json
* Update SpriteFrameCacheTest.cpp
* fix compiling error
2019-01-18 15:08:25 +08:00
|
|
|
|
2013-01-18 18:05:32 +08:00
|
|
|
/**
|
|
|
|
* Loads the filenameLookup dictionary from the contents of a filename.
|
2015-07-07 14:06:59 +08:00
|
|
|
*
|
2013-01-18 18:05:32 +08:00
|
|
|
* @note The plist file name should follow the format below:
|
2015-07-07 14:06:59 +08:00
|
|
|
*
|
2013-02-01 15:41:41 +08:00
|
|
|
* @code
|
2013-01-18 18:05:32 +08:00
|
|
|
* <?xml version="1.0" encoding="UTF-8"?>
|
|
|
|
* <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
|
|
|
* <plist version="1.0">
|
|
|
|
* <dict>
|
2013-01-25 20:51:52 +08:00
|
|
|
* <key>filenames</key>
|
2013-01-18 18:05:32 +08:00
|
|
|
* <dict>
|
|
|
|
* <key>sounds/click.wav</key>
|
|
|
|
* <string>sounds/click.caf</string>
|
|
|
|
* <key>sounds/endgame.wav</key>
|
|
|
|
* <string>sounds/endgame.caf</string>
|
|
|
|
* <key>sounds/gem-0.wav</key>
|
|
|
|
* <string>sounds/gem-0.caf</string>
|
|
|
|
* </dict>
|
|
|
|
* <key>metadata</key>
|
|
|
|
* <dict>
|
|
|
|
* <key>version</key>
|
|
|
|
* <integer>1</integer>
|
|
|
|
* </dict>
|
|
|
|
* </dict>
|
|
|
|
* </plist>
|
2013-02-01 15:41:41 +08:00
|
|
|
* @endcode
|
2013-01-18 18:05:32 +08:00
|
|
|
* @param filename The plist file name.
|
|
|
|
*
|
|
|
|
@since v2.1
|
2013-09-13 11:41:20 +08:00
|
|
|
* @js loadFilenameLookup
|
|
|
|
* @lua loadFilenameLookup
|
2013-01-18 18:05:32 +08:00
|
|
|
*/
|
2013-09-07 13:54:08 +08:00
|
|
|
virtual void loadFilenameLookupDictionaryFromFile(const std::string &filename);
|
2015-07-07 14:06:59 +08:00
|
|
|
|
|
|
|
/**
|
2013-01-28 23:28:14 +08:00
|
|
|
* Sets the filenameLookup dictionary.
|
|
|
|
*
|
2016-07-03 23:42:10 +08:00
|
|
|
* @param filenameLookupDict The dictionary for replacing filename.
|
2013-01-28 23:28:14 +08:00
|
|
|
* @since v2.1
|
2013-01-18 18:05:32 +08:00
|
|
|
*/
|
2013-12-04 17:46:57 +08:00
|
|
|
virtual void setFilenameLookupDictionary(const ValueMap& filenameLookupDict);
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2013-01-28 23:28:14 +08:00
|
|
|
/**
|
2015-03-24 10:34:44 +08:00
|
|
|
* Gets full path from a file name and the path of the relative file.
|
2013-07-26 06:53:24 +08:00
|
|
|
* @param filename The file name.
|
2016-07-03 23:42:10 +08:00
|
|
|
* @param relativeFile The path of the relative file.
|
2013-01-28 23:28:14 +08:00
|
|
|
* @return The full path.
|
2013-07-26 06:53:24 +08:00
|
|
|
* e.g. filename: hello.png, pszRelativeFile: /User/path1/path2/hello.plist
|
2013-01-28 23:40:56 +08:00
|
|
|
* Return: /User/path1/path2/hello.pvr (If there a a key(hello.png)-value(hello.pvr) in FilenameLookup dictionary. )
|
2013-01-28 23:28:14 +08:00
|
|
|
*
|
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual std::string fullPathFromRelativeFile(const std::string &filename, const std::string &relativeFile) const;
|
2013-01-23 22:29:00 +08:00
|
|
|
|
2015-07-07 14:06:59 +08:00
|
|
|
/**
|
2013-01-28 23:28:14 +08:00
|
|
|
* Sets the array that contains the search order of the resources.
|
2013-01-26 22:31:57 +08:00
|
|
|
*
|
2013-01-28 23:28:14 +08:00
|
|
|
* @param searchResolutionsOrder The source array that contains the search order of the resources.
|
2015-03-24 10:34:44 +08:00
|
|
|
* @see getSearchResolutionsOrder(), fullPathForFilename(const char*).
|
2013-01-26 22:31:57 +08:00
|
|
|
* @since v2.1
|
2013-09-13 11:41:20 +08:00
|
|
|
* In js:var setSearchResolutionsOrder(var jsval)
|
|
|
|
* @lua NA
|
2013-01-23 22:29:00 +08:00
|
|
|
*/
|
2013-02-01 11:20:46 +08:00
|
|
|
virtual void setSearchResolutionsOrder(const std::vector<std::string>& searchResolutionsOrder);
|
2013-02-04 12:41:24 +08:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Append search order of the resources.
|
|
|
|
*
|
|
|
|
* @see setSearchResolutionsOrder(), fullPathForFilename().
|
|
|
|
* @since v2.1
|
|
|
|
*/
|
2014-07-02 10:29:09 +08:00
|
|
|
virtual void addSearchResolutionsOrder(const std::string &order,const bool front=false);
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2013-01-28 23:28:14 +08:00
|
|
|
/**
|
|
|
|
* Gets the array that contains the search order of the resources.
|
|
|
|
*
|
2013-02-01 15:41:41 +08:00
|
|
|
* @see setSearchResolutionsOrder(const std::vector<std::string>&), fullPathForFilename(const char*).
|
2013-01-28 23:28:14 +08:00
|
|
|
* @since v2.1
|
2013-09-13 11:41:20 +08:00
|
|
|
* @lua NA
|
2013-01-28 23:28:14 +08:00
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual const std::vector<std::string> getSearchResolutionsOrder() const;
|
2015-07-07 14:06:59 +08:00
|
|
|
|
|
|
|
/**
|
2013-01-26 22:31:57 +08:00
|
|
|
* Sets the array of search paths.
|
2015-07-07 14:06:59 +08:00
|
|
|
*
|
2013-01-26 22:31:57 +08:00
|
|
|
* You can use this array to modify the search path of the resources.
|
|
|
|
* If you want to use "themes" or search resources in the "cache", you can do it easily by adding new entries in this array.
|
2013-01-29 15:50:57 +08:00
|
|
|
*
|
2013-01-29 16:45:11 +08:00
|
|
|
* @note This method could access relative path and absolute path.
|
2013-06-20 14:13:12 +08:00
|
|
|
* If the relative path was passed to the vector, FileUtils will add the default resource directory before the relative path.
|
2013-01-29 16:45:11 +08:00
|
|
|
* For instance:
|
2015-07-07 14:06:59 +08:00
|
|
|
* On Android, the default resource root path is "assets/".
|
|
|
|
* If "/mnt/sdcard/" and "resources-large" were set to the search paths vector,
|
|
|
|
* "resources-large" will be converted to "assets/resources-large" since it was a relative path.
|
2013-01-29 16:45:11 +08:00
|
|
|
*
|
2013-01-29 15:50:57 +08:00
|
|
|
* @param searchPaths The array contains search paths.
|
2013-02-01 15:41:41 +08:00
|
|
|
* @see fullPathForFilename(const char*)
|
2013-01-26 22:31:57 +08:00
|
|
|
* @since v2.1
|
2013-09-13 11:41:20 +08:00
|
|
|
* In js:var setSearchPaths(var jsval);
|
|
|
|
* @lua NA
|
2013-01-23 22:29:00 +08:00
|
|
|
*/
|
2013-02-01 11:20:46 +08:00
|
|
|
virtual void setSearchPaths(const std::vector<std::string>& searchPaths);
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2017-03-06 16:59:43 +08:00
|
|
|
/**
|
|
|
|
* Get default resource root path.
|
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
const std::string getDefaultResourceRootPath() const;
|
2017-03-06 16:59:43 +08:00
|
|
|
|
2014-12-25 20:33:47 +08:00
|
|
|
/**
|
|
|
|
* Set default resource root path.
|
|
|
|
*/
|
|
|
|
void setDefaultResourceRootPath(const std::string& path);
|
|
|
|
|
2013-02-04 12:41:24 +08:00
|
|
|
/**
|
|
|
|
* Add search path.
|
|
|
|
*
|
|
|
|
* @since v2.1
|
|
|
|
*/
|
2014-07-02 10:29:09 +08:00
|
|
|
void addSearchPath(const std::string & path, const bool front=false);
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2013-01-28 23:28:14 +08:00
|
|
|
/**
|
|
|
|
* Gets the array of search paths.
|
2015-07-07 14:06:59 +08:00
|
|
|
*
|
2017-03-06 16:59:43 +08:00
|
|
|
* @return The array of search paths which may contain the prefix of default resource root path.
|
|
|
|
* @note In best practise, getter function should return the value of setter function passes in.
|
|
|
|
* But since we should not break the compatibility, we keep using the old logic.
|
|
|
|
* Therefore, If you want to get the original search paths, please call 'getOriginalSearchPaths()' instead.
|
2013-02-01 15:41:41 +08:00
|
|
|
* @see fullPathForFilename(const char*).
|
2013-09-13 11:41:20 +08:00
|
|
|
* @lua NA
|
2013-01-28 23:28:14 +08:00
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual const std::vector<std::string> getSearchPaths() const;
|
2012-08-09 12:49:33 +08:00
|
|
|
|
2017-03-06 16:59:43 +08:00
|
|
|
/**
|
|
|
|
* Gets the original search path array set by 'setSearchPaths' or 'addSearchPath'.
|
|
|
|
* @return The array of the original search paths
|
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual const std::vector<std::string> getOriginalSearchPaths() const;
|
2017-03-06 16:59:43 +08:00
|
|
|
|
2012-04-19 14:35:52 +08:00
|
|
|
/**
|
2013-02-06 18:04:40 +08:00
|
|
|
* Gets the writable path.
|
2013-02-01 18:48:44 +08:00
|
|
|
* @return The path that can be write/read a file in
|
2013-02-01 15:41:41 +08:00
|
|
|
*/
|
2013-09-07 13:54:08 +08:00
|
|
|
virtual std::string getWritablePath() const = 0;
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2014-12-25 20:33:47 +08:00
|
|
|
/**
|
2015-03-24 10:34:44 +08:00
|
|
|
* Sets writable path.
|
2014-12-25 20:33:47 +08:00
|
|
|
*/
|
|
|
|
virtual void setWritablePath(const std::string& writablePath);
|
|
|
|
|
2014-06-20 18:01:34 +08:00
|
|
|
/**
|
2015-03-24 10:34:44 +08:00
|
|
|
* Sets whether to pop-up a message box when failed to load an image.
|
2014-06-20 18:01:34 +08:00
|
|
|
*/
|
|
|
|
virtual void setPopupNotify(bool notify);
|
2015-07-07 14:06:59 +08:00
|
|
|
|
|
|
|
/** Checks whether to pop up a message box when failed to load an image.
|
2015-03-24 10:34:44 +08:00
|
|
|
* @return True if pop up a message box when failed to load an image, false if not.
|
|
|
|
*/
|
2015-04-07 22:15:15 +08:00
|
|
|
virtual bool isPopupNotify() const;
|
2014-06-20 18:01:34 +08:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Converts the contents of a file to a ValueMap.
|
2015-03-24 10:34:44 +08:00
|
|
|
* @param filename The filename of the file to gets content.
|
|
|
|
* @return ValueMap of the file contents.
|
2014-06-20 18:01:34 +08:00
|
|
|
* @note This method is used internally.
|
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual ValueMap getValueMapFromFile(const std::string& filename) const;
|
2014-07-29 17:06:43 +08:00
|
|
|
|
2015-07-07 14:06:59 +08:00
|
|
|
|
|
|
|
/** Converts the contents of a file to a ValueMap.
|
|
|
|
* This method is used internally.
|
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual ValueMap getValueMapFromData(const char* filedata, int filesize) const;
|
2015-03-24 10:34:44 +08:00
|
|
|
|
2015-07-07 14:06:59 +08:00
|
|
|
/**
|
|
|
|
* write a ValueMap into a plist file
|
|
|
|
*
|
|
|
|
*@param dict the ValueMap want to save
|
|
|
|
*@param fullPath The full path to the file you want to save a string
|
|
|
|
*@return bool
|
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual bool writeToFile(const ValueMap& dict, const std::string& fullPath) const;
|
2015-07-07 14:06:59 +08:00
|
|
|
|
|
|
|
/**
|
|
|
|
* write a string into a file
|
|
|
|
*
|
|
|
|
* @param dataStr the string want to save
|
|
|
|
* @param fullPath The full path to the file you want to save a string
|
|
|
|
* @return bool True if write success
|
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual bool writeStringToFile(const std::string& dataStr, const std::string& fullPath) const;
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2017-01-13 10:05:46 +08:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Write a string to a file, done async off the main cocos thread
|
|
|
|
* Use this function if you need file access without blocking the main thread.
|
|
|
|
*
|
|
|
|
* This function takes a std::string by value on purpose, to leverage move sematics.
|
|
|
|
* If you want to avoid a copy of your datastr, use std::move/std::forward if appropriate
|
|
|
|
*
|
|
|
|
* @param dataStr the string want to save
|
|
|
|
* @param fullPath The full path to the file you want to save a string
|
|
|
|
* @param callback The function called once the string has been written to a file. This
|
|
|
|
* function will be executed on the main cocos thread. It will have on boolean argument
|
|
|
|
* signifying if the write was successful.
|
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual void writeStringToFile(std::string dataStr, const std::string& fullPath, std::function<void(bool)> callback) const;
|
2017-01-13 10:05:46 +08:00
|
|
|
|
2015-07-07 14:06:59 +08:00
|
|
|
/**
|
|
|
|
* write Data into a file
|
|
|
|
*
|
2016-01-27 13:39:31 +08:00
|
|
|
*@param data the data want to save
|
2015-07-07 14:06:59 +08:00
|
|
|
*@param fullPath The full path to the file you want to save a string
|
|
|
|
*@return bool
|
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual bool writeDataToFile(const Data& data, const std::string& fullPath) const;
|
2017-01-13 10:05:46 +08:00
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Write Data into a file, done async off the main cocos thread.
|
|
|
|
*
|
|
|
|
* Use this function if you need to write Data while not blocking the main cocos thread.
|
|
|
|
*
|
|
|
|
* This function takes Data by value on purpose, to leverage move sematics.
|
|
|
|
* If you want to avoid a copy of your data, use std::move/std::forward if appropriate
|
|
|
|
*
|
|
|
|
*@param data The data that will be written to disk
|
|
|
|
*@param fullPath The absolute file path that the data will be written to
|
|
|
|
*@param callback The function that will be called when data is written to disk. This
|
|
|
|
* function will be executed on the main cocos thread. It will have on boolean argument
|
|
|
|
* signifying if the write was successful.
|
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual void writeDataToFile(Data data, const std::string& fullPath, std::function<void(bool)> callback) const;
|
2015-07-07 14:06:59 +08:00
|
|
|
|
|
|
|
/**
|
|
|
|
* write ValueMap into a plist file
|
|
|
|
*
|
|
|
|
*@param dict the ValueMap want to save
|
|
|
|
*@param fullPath The full path to the file you want to save a string
|
|
|
|
*@return bool
|
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual bool writeValueMapToFile(const ValueMap& dict, const std::string& fullPath) const;
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2017-01-13 10:05:46 +08:00
|
|
|
/**
|
|
|
|
* Write a ValueMap into a file, done async off the main cocos thread.
|
|
|
|
*
|
|
|
|
* Use this function if you need to write a ValueMap while not blocking the main cocos thread.
|
|
|
|
*
|
|
|
|
* This function takes ValueMap by value on purpose, to leverage move sematics.
|
|
|
|
* If you want to avoid a copy of your dict, use std::move/std::forward if appropriate
|
|
|
|
*
|
|
|
|
*@param dict The ValueMap that will be written to disk
|
|
|
|
*@param fullPath The absolute file path that the data will be written to
|
|
|
|
*@param callback The function that will be called when dict is written to disk. This
|
|
|
|
* function will be executed on the main cocos thread. It will have on boolean argument
|
|
|
|
* signifying if the write was successful.
|
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual void writeValueMapToFile(ValueMap dict, const std::string& fullPath, std::function<void(bool)> callback) const;
|
2017-01-13 10:05:46 +08:00
|
|
|
|
2015-07-07 14:06:59 +08:00
|
|
|
/**
|
|
|
|
* write ValueVector into a plist file
|
|
|
|
*
|
|
|
|
*@param vecData the ValueVector want to save
|
|
|
|
*@param fullPath The full path to the file you want to save a string
|
|
|
|
*@return bool
|
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual bool writeValueVectorToFile(const ValueVector& vecData, const std::string& fullPath) const;
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2017-01-13 10:05:46 +08:00
|
|
|
/**
|
|
|
|
* Write a ValueVector into a file, done async off the main cocos thread.
|
|
|
|
*
|
|
|
|
* Use this function if you need to write a ValueVector while not blocking the main cocos thread.
|
|
|
|
*
|
|
|
|
* This function takes ValueVector by value on purpose, to leverage move sematics.
|
|
|
|
* If you want to avoid a copy of your dict, use std::move/std::forward if appropriate
|
|
|
|
*
|
|
|
|
*@param vecData The ValueVector that will be written to disk
|
|
|
|
*@param fullPath The absolute file path that the data will be written to
|
|
|
|
*@param callback The function that will be called when vecData is written to disk. This
|
|
|
|
* function will be executed on the main cocos thread. It will have on boolean argument
|
|
|
|
* signifying if the write was successful.
|
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual void writeValueVectorToFile(ValueVector vecData, const std::string& fullPath, std::function<void(bool)> callback) const;
|
2017-01-13 10:05:46 +08:00
|
|
|
|
2015-04-19 19:00:27 +08:00
|
|
|
/**
|
|
|
|
* Windows fopen can't support UTF-8 filename
|
|
|
|
* Need convert all parameters fopen and other 3rd-party libs
|
|
|
|
*
|
2016-07-03 23:42:10 +08:00
|
|
|
* @param filenameUtf8 std::string name file for conversion from utf-8
|
2015-04-19 19:00:27 +08:00
|
|
|
* @return std::string ansi filename in current locale
|
|
|
|
*/
|
|
|
|
virtual std::string getSuitableFOpen(const std::string& filenameUtf8) const;
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2015-03-24 10:34:44 +08:00
|
|
|
// Converts the contents of a file to a ValueVector.
|
|
|
|
// This method is used internally.
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual ValueVector getValueVectorFromFile(const std::string& filename) const;
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2013-02-01 11:20:46 +08:00
|
|
|
/**
|
2013-02-01 18:48:44 +08:00
|
|
|
* Checks whether a file exists.
|
2013-02-01 11:20:46 +08:00
|
|
|
*
|
2013-02-01 22:19:58 +08:00
|
|
|
* @note If a relative path was passed in, it will be inserted a default root path at the beginning.
|
2015-03-24 10:34:44 +08:00
|
|
|
* @param filename The path of the file, it could be a relative or absolute path.
|
|
|
|
* @return True if the file exists, false if not.
|
2013-02-01 11:20:46 +08:00
|
|
|
*/
|
2014-04-02 16:33:05 +08:00
|
|
|
virtual bool isFileExist(const std::string& filename) const;
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2017-01-13 10:05:46 +08:00
|
|
|
/**
|
|
|
|
* Checks if a file exists, done async off the main cocos thread.
|
|
|
|
*
|
|
|
|
* Use this function if you need to check if a file exists while not blocking the main cocos thread.
|
|
|
|
*
|
|
|
|
* @note If a relative path was passed in, it will be inserted a default root path at the beginning.
|
|
|
|
* @param filename The path of the file, it could be a relative or absolute path.
|
|
|
|
* @param callback The function that will be called when the operation is complete. Will have one boolean
|
|
|
|
* argument, true if the file exists, false otherwise.
|
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual void isFileExist(const std::string& filename, std::function<void(bool)> callback) const;
|
2017-01-13 10:05:46 +08:00
|
|
|
|
2015-08-06 03:21:16 +08:00
|
|
|
/**
|
|
|
|
* Gets filename extension is a suffix (separated from the base filename by a dot) in lower case.
|
|
|
|
* Examples of filename extensions are .png, .jpeg, .exe, .dmg and .txt.
|
|
|
|
* @param filePath The path of the file, it could be a relative or absolute path.
|
|
|
|
* @return suffix for filename in lower case or empty if a dot not found.
|
|
|
|
*/
|
|
|
|
virtual std::string getFileExtension(const std::string& filePath) const;
|
|
|
|
|
2013-02-01 11:20:46 +08:00
|
|
|
/**
|
|
|
|
* Checks whether the path is an absolute path.
|
2013-02-01 22:19:58 +08:00
|
|
|
*
|
2013-02-01 16:46:15 +08:00
|
|
|
* @note On Android, if the parameter passed in is relative to "assets/", this method will treat it as an absolute path.
|
|
|
|
* Also on Blackberry, path starts with "app/native/Resources/" is treated as an absolute path.
|
2013-02-01 11:20:46 +08:00
|
|
|
*
|
2015-03-24 10:34:44 +08:00
|
|
|
* @param path The path that needs to be checked.
|
|
|
|
* @return True if it's an absolute path, false if not.
|
2013-02-01 11:20:46 +08:00
|
|
|
*/
|
2013-09-07 13:54:08 +08:00
|
|
|
virtual bool isAbsolutePath(const std::string& path) const;
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2014-06-20 18:01:34 +08:00
|
|
|
/**
|
2015-03-24 10:34:44 +08:00
|
|
|
* Checks whether the path is a directory.
|
2014-06-20 18:01:34 +08:00
|
|
|
*
|
2014-07-08 18:26:11 +08:00
|
|
|
* @param dirPath The path of the directory, it could be a relative or an absolute path.
|
2015-03-24 10:34:44 +08:00
|
|
|
* @return True if the directory exists, false if not.
|
2014-06-20 18:01:34 +08:00
|
|
|
*/
|
2015-04-07 22:15:15 +08:00
|
|
|
virtual bool isDirectoryExist(const std::string& dirPath) const;
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2017-01-13 10:05:46 +08:00
|
|
|
/**
|
2017-03-15 16:09:02 +08:00
|
|
|
* Checks whether the absoulate path is a directory, async off of the main cocos thread.
|
|
|
|
*
|
|
|
|
* @param dirPath The path of the directory, it must be an absolute path
|
|
|
|
* @param callback that will accept a boolean, true if the file exists, false otherwise.
|
|
|
|
* Callback will happen on the main cocos thread.
|
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual void isDirectoryExist(const std::string& fullPath, std::function<void(bool)> callback) const;
|
2017-01-13 10:05:46 +08:00
|
|
|
|
2012-04-19 14:35:52 +08:00
|
|
|
/**
|
2015-03-24 10:34:44 +08:00
|
|
|
* Creates a directory.
|
2014-06-20 18:01:34 +08:00
|
|
|
*
|
2014-07-08 18:26:11 +08:00
|
|
|
* @param dirPath The path of the directory, it must be an absolute path.
|
2015-03-24 10:34:44 +08:00
|
|
|
* @return True if the directory have been created successfully, false if not.
|
2013-02-01 15:41:41 +08:00
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual bool createDirectory(const std::string& dirPath) const;
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2017-01-13 10:05:46 +08:00
|
|
|
/**
|
|
|
|
* Create a directory, async off the main cocos thread.
|
|
|
|
*
|
|
|
|
* @param dirPath the path of the directory, it must be an absolute path
|
|
|
|
* @param callback The function that will be called when the operation is complete. Will have one boolean
|
|
|
|
* argument, true if the directory was successfully, false otherwise.
|
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual void createDirectory(const std::string& dirPath, std::function<void(bool)> callback) const;
|
2017-01-13 10:05:46 +08:00
|
|
|
|
2013-12-03 14:47:35 +08:00
|
|
|
/**
|
2015-03-24 10:34:44 +08:00
|
|
|
* Removes a directory.
|
2014-06-20 18:01:34 +08:00
|
|
|
*
|
|
|
|
* @param dirPath The full path of the directory, it must be an absolute path.
|
2015-03-24 10:34:44 +08:00
|
|
|
* @return True if the directory have been removed successfully, false if not.
|
2013-12-03 14:47:35 +08:00
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual bool removeDirectory(const std::string& dirPath) const;
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2017-01-13 10:05:46 +08:00
|
|
|
/**
|
|
|
|
* Removes a directory, async off the main cocos thread.
|
|
|
|
*
|
|
|
|
* @param dirPath the path of the directory, it must be an absolute path
|
|
|
|
* @param callback The function that will be called when the operation is complete. Will have one boolean
|
|
|
|
* argument, true if the directory was successfully removed, false otherwise.
|
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual void removeDirectory(const std::string& dirPath, std::function<void(bool)> callback) const;
|
2017-01-13 10:05:46 +08:00
|
|
|
|
2013-12-03 14:47:35 +08:00
|
|
|
/**
|
2015-03-24 10:34:44 +08:00
|
|
|
* Removes a file.
|
2014-06-20 18:01:34 +08:00
|
|
|
*
|
|
|
|
* @param filepath The full path of the file, it must be an absolute path.
|
2015-03-24 10:34:44 +08:00
|
|
|
* @return True if the file have been removed successfully, false if not.
|
2013-12-03 14:47:35 +08:00
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual bool removeFile(const std::string &filepath) const;
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2017-01-13 10:05:46 +08:00
|
|
|
/**
|
|
|
|
* Removes a file, async off the main cocos thread.
|
|
|
|
*
|
|
|
|
* @param filepath the path of the file to remove, it must be an absolute path
|
|
|
|
* @param callback The function that will be called when the operation is complete. Will have one boolean
|
|
|
|
* argument, true if the file was successfully removed, false otherwise.
|
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual void removeFile(const std::string &filepath, std::function<void(bool)> callback) const;
|
2017-01-13 10:05:46 +08:00
|
|
|
|
2013-12-03 14:47:35 +08:00
|
|
|
/**
|
2015-03-24 10:34:44 +08:00
|
|
|
* Renames a file under the given directory.
|
2014-06-20 18:01:34 +08:00
|
|
|
*
|
|
|
|
* @param path The parent directory path of the file, it must be an absolute path.
|
|
|
|
* @param oldname The current name of the file.
|
|
|
|
* @param name The new name of the file.
|
2015-03-24 10:34:44 +08:00
|
|
|
* @return True if the file have been renamed successfully, false if not.
|
2013-12-03 14:47:35 +08:00
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual bool renameFile(const std::string &path, const std::string &oldname, const std::string &name) const;
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2017-01-13 10:05:46 +08:00
|
|
|
/**
|
|
|
|
* Renames a file under the given directory, async off the main cocos thread.
|
|
|
|
*
|
|
|
|
* @param path The parent directory path of the file, it must be an absolute path.
|
|
|
|
* @param oldname The current name of the file.
|
|
|
|
* @param name The new name of the file.
|
|
|
|
* @param callback The function that will be called when the operation is complete. Will have one boolean
|
|
|
|
* argument, true if the file was successfully renamed, false otherwise.
|
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual void renameFile(const std::string &path, const std::string &oldname, const std::string &name, std::function<void(bool)> callback) const;
|
2017-01-13 10:05:46 +08:00
|
|
|
|
2015-08-13 15:14:10 +08:00
|
|
|
/**
|
|
|
|
* Renames a file under the given directory.
|
|
|
|
*
|
|
|
|
* @param oldfullpath The current fullpath of the file. Includes path and name.
|
|
|
|
* @param newfullpath The new fullpath of the file. Includes path and name.
|
|
|
|
* @return True if the file have been renamed successfully, false if not.
|
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual bool renameFile(const std::string &oldfullpath, const std::string &newfullpath) const;
|
2015-08-13 15:14:10 +08:00
|
|
|
|
2017-01-13 10:05:46 +08:00
|
|
|
/**
|
|
|
|
* Renames a file under the given directory, async off the main cocos thread.
|
|
|
|
*
|
|
|
|
* @param oldfullpath The current fullpath of the file. Includes path and name.
|
|
|
|
* @param newfullpath The new fullpath of the file. Includes path and name.
|
|
|
|
* @param callback The function that will be called when the operation is complete. Will have one boolean
|
|
|
|
* argument, true if the file was successfully renamed, false otherwise.
|
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual void renameFile(const std::string &oldfullpath, const std::string &newfullpath, std::function<void(bool)> callback) const;
|
2017-01-13 10:05:46 +08:00
|
|
|
|
2014-06-20 18:01:34 +08:00
|
|
|
/**
|
2015-03-24 10:34:44 +08:00
|
|
|
* Retrieve the file size.
|
2014-06-20 18:01:34 +08:00
|
|
|
*
|
|
|
|
* @note If a relative path was passed in, it will be inserted a default root path at the beginning.
|
|
|
|
* @param filepath The path of the file, it could be a relative or absolute path.
|
|
|
|
* @return The file size.
|
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual long getFileSize(const std::string &filepath) const;
|
2014-01-15 09:22:45 +08:00
|
|
|
|
2017-01-13 10:05:46 +08:00
|
|
|
/**
|
|
|
|
* Retrieve the file size, async off the main cocos thread.
|
|
|
|
*
|
|
|
|
* @note If a relative path was passed in, it will be inserted a default root path at the beginning.
|
|
|
|
* @param filepath The path of the file, it could be a relative or absolute path.
|
|
|
|
* @param callback The function that will be called when the operation is complete. Will have one long
|
|
|
|
* argument, the file size.
|
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual void getFileSize(const std::string &filepath, std::function<void(long)> callback) const;
|
2017-01-13 10:05:46 +08:00
|
|
|
|
2017-03-15 16:09:02 +08:00
|
|
|
/**
|
|
|
|
* List all files in a directory.
|
|
|
|
*
|
|
|
|
* @param dirPath The path of the directory, it could be a relative or an absolute path.
|
|
|
|
* @return File paths in a string vector
|
|
|
|
*/
|
|
|
|
virtual std::vector<std::string> listFiles(const std::string& dirPath) const;
|
2017-04-19 09:14:06 +08:00
|
|
|
|
|
|
|
/**
|
|
|
|
* List all files in a directory async, off of the main cocos thread.
|
|
|
|
*
|
|
|
|
* @param dirPath The path of the directory, it could be a relative or an absolute path.
|
|
|
|
* @param callback The callback to be called once the list operation is complete. Will be called on the main cocos thread.
|
|
|
|
* @js NA
|
|
|
|
* @lua NA
|
|
|
|
*/
|
|
|
|
virtual void listFilesAsync(const std::string& dirPath, std::function<void(std::vector<std::string>)> callback) const;
|
2017-03-15 16:09:02 +08:00
|
|
|
|
|
|
|
/**
|
|
|
|
* List all files recursively in a directory.
|
|
|
|
*
|
|
|
|
* @param dirPath The path of the directory, it could be a relative or an absolute path.
|
|
|
|
* @return File paths in a string vector
|
|
|
|
*/
|
|
|
|
virtual void listFilesRecursively(const std::string& dirPath, std::vector<std::string> *files) const;
|
|
|
|
|
2017-04-19 09:14:06 +08:00
|
|
|
/**
|
|
|
|
* List all files recursively in a directory, async off the main cocos thread.
|
|
|
|
*
|
|
|
|
* @param dirPath The path of the directory, it could be a relative or an absolute path.
|
|
|
|
* @param callback The callback to be called once the list operation is complete.
|
|
|
|
* Will be called on the main cocos thread.
|
|
|
|
* @js NA
|
|
|
|
* @lua NA
|
|
|
|
*/
|
|
|
|
virtual void listFilesRecursivelyAsync(const std::string& dirPath, std::function<void(std::vector<std::string>)> callback) const;
|
|
|
|
|
2015-03-24 10:34:44 +08:00
|
|
|
/** Returns the full path cache. */
|
2018-09-17 10:47:41 +08:00
|
|
|
const std::unordered_map<std::string, std::string> getFullPathCache() const { return _fullPathCache; }
|
2014-01-15 09:22:45 +08:00
|
|
|
|
2016-11-18 09:23:44 +08:00
|
|
|
/**
|
2017-03-16 13:47:45 +08:00
|
|
|
* Gets the new filename from the filename lookup dictionary.
|
|
|
|
* It is possible to have a override names.
|
|
|
|
* @param filename The original filename.
|
|
|
|
* @return The new filename after searching in the filename lookup dictionary.
|
|
|
|
* If the original filename wasn't in the dictionary, it will return the original filename.
|
|
|
|
*/
|
2016-11-18 09:23:44 +08:00
|
|
|
virtual std::string getNewFilename(const std::string &filename) const;
|
|
|
|
|
2012-08-08 17:42:04 +08:00
|
|
|
protected:
|
2013-02-01 15:41:41 +08:00
|
|
|
/**
|
|
|
|
* The default constructor.
|
|
|
|
*/
|
2013-06-20 14:13:12 +08:00
|
|
|
FileUtils();
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2013-02-01 15:41:41 +08:00
|
|
|
/**
|
2013-06-20 14:13:12 +08:00
|
|
|
* Initializes the instance of FileUtils. It will set _searchPathArray and _searchResolutionsOrderArray to default values.
|
2013-02-01 15:41:41 +08:00
|
|
|
*
|
|
|
|
* @note When you are porting Cocos2d-x to a new platform, you may need to take care of this method.
|
2013-06-20 14:13:12 +08:00
|
|
|
* You could assign a default value to _defaultResRootPath in the subclass of FileUtils(e.g. FileUtilsAndroid). Then invoke the FileUtils::init().
|
2015-09-22 16:08:23 +08:00
|
|
|
* @return true if succeed, otherwise it returns false.
|
2013-02-01 15:41:41 +08:00
|
|
|
*
|
|
|
|
*/
|
2013-02-01 11:20:46 +08:00
|
|
|
virtual bool init();
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2014-04-02 15:35:09 +08:00
|
|
|
/**
|
2014-07-28 11:14:11 +08:00
|
|
|
* Checks whether a file exists without considering search paths and resolution orders.
|
2015-03-24 10:34:44 +08:00
|
|
|
* @param filename The file (with absolute path) to look up for
|
2014-07-28 11:14:11 +08:00
|
|
|
* @return Returns true if the file found at the given absolute path, otherwise returns false
|
2014-04-02 15:35:09 +08:00
|
|
|
*/
|
|
|
|
virtual bool isFileExistInternal(const std::string& filename) const = 0;
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2014-07-08 18:26:11 +08:00
|
|
|
/**
|
2014-07-28 11:14:11 +08:00
|
|
|
* Checks whether a directory exists without considering search paths and resolution orders.
|
2015-03-24 10:34:44 +08:00
|
|
|
* @param dirPath The directory (with absolute path) to look up for
|
2014-07-28 11:14:11 +08:00
|
|
|
* @return Returns true if the directory found at the given absolute path, otherwise returns false
|
2014-07-08 18:26:11 +08:00
|
|
|
*/
|
2015-07-13 17:06:01 +08:00
|
|
|
virtual bool isDirectoryExistInternal(const std::string& dirPath) const;
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2013-02-01 11:20:46 +08:00
|
|
|
/**
|
2013-02-01 15:41:41 +08:00
|
|
|
* Gets full path for filename, resolution directory and search path.
|
2013-02-01 11:20:46 +08:00
|
|
|
*
|
|
|
|
* @param filename The file name.
|
|
|
|
* @param resolutionDirectory The resolution directory.
|
|
|
|
* @param searchPath The search path.
|
2013-02-01 22:19:58 +08:00
|
|
|
* @return The full path of the file. It will return an empty string if the full path of the file doesn't exist.
|
2013-02-01 11:20:46 +08:00
|
|
|
*/
|
2015-04-07 22:15:15 +08:00
|
|
|
virtual std::string getPathForFilename(const std::string& filename, const std::string& resolutionDirectory, const std::string& searchPath) const;
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2019-09-04 10:03:38 +08:00
|
|
|
virtual std::string getPathForDirectory(const std::string &dir, const std::string &resolutionDiretory, const std::string &searchPath) const;
|
|
|
|
|
|
|
|
|
2013-02-01 15:41:41 +08:00
|
|
|
/**
|
|
|
|
* Gets full path for the directory and the filename.
|
|
|
|
*
|
|
|
|
* @note Only iOS and Mac need to override this method since they are using
|
|
|
|
* `[[NSBundle mainBundle] pathForResource: ofType: inDirectory:]` to make a full path.
|
|
|
|
* Other platforms will use the default implementation of this method.
|
2015-03-24 10:34:44 +08:00
|
|
|
* @param directory The directory contains the file we are looking for.
|
|
|
|
* @param filename The name of the file.
|
2013-02-01 15:41:41 +08:00
|
|
|
* @return The full path of the file, if the file can't be found, it will return an empty string.
|
|
|
|
*/
|
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
|
|
|
virtual std::string getFullPathForFilenameWithinDirectory(const std::string& directory, const std::string& filename) const;
|
2019-09-04 10:03:38 +08:00
|
|
|
|
|
|
|
|
metal support for cocos2d-x (#19305)
* remove deprecated files
* remove some deprecated codes
* remove more deprecated codes
* remove ui deprecated codes
* remove more deprecated codes
* remove deprecated codes in ccmenuitem
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes
* remove more deprecated codes
* remove more deprecated codes
* remove vr related codes and ignore some modules
* remove allocator
* remove some config
* 【Feature】add back-end project file
* [Feature] add back-end file
* add pipeline descriptor and shader cache
* [Feature] support sprite for backend
* [Feature] remove unneeded code
* [Feature] according to es2.0 spec, you must use clamp-to-edge as texture wrap mode, and no mipmapping for non-power-of-two texture
* [Feature] set texture wrap mode to clamp-to-edge, and no mipmapping for non-power-of-two texture
* [Feature] remove macro define to .cpp file
* [Feature] add log info
* [Feature] add PipelineDescriptor for TriangleCommand
* [Feature] add PipelineDescriptor object as member of TriangleCommand
* [Feature] add getPipelineDescriptor method
* add renderbackend
* complete pipeline descriptor
* [Feature] add viewport in RenderCommand
* set viewport when rendrering
* [Feature] occur error when using RendererBackend, to be fixed.
* a workaround to fix black screen on macOS 10.14 (#19090)
* add rendererbackend init function
* fix typo
* [Feature] modify testFile
* [BugFix] modify shader path
* [Feature] set default viewport
* fix projection
* [Feature] modify log info
* [BugFix] change viewport data type to int
* [BugFix] add BindGroup to PipelienDescriptor
* [BugFix] change a_position to vec3 in sprite.vert
* [BugFix] set vertexLayout according to V3F_C4B_T2F structure
* [Feature] revert a_position to vec4
* [Feature] renderer should not use gl codes directly
* [Feature] it's better not use default value parameter
* fix depth test setting
* rendererbackend -> renderer
* clear color and depth at begin
* add metal backend
* metal support normalized attribute
* simplify codes
* update external
* add render pass desctriptor in pipeline descriptor
* fix warnings
* fix crash and memeory leak
* refactor Texture2D
* put pipeline descriptor into render command
* simplify codes
* [Feature] update Sprite
* fix crash when closing app
* [Feature] update SpriteBatchNode and TextureAtlas
* support render texture(not finish)
* [Feature] remove unused code
* make tests work on mac
* fix download-deps path error
* make tests work on iOS
* [Feature] support ttf under normal label effect
* refactor triangle command processing
* let renderer handle more common commands
* refactor backend
* make render texture work
* [Feature] refactor backend for GL
* [Feature]Renaming to make it easy to understand
* [Feature] change warp mode to CLAMP_TO_EDGE
* fix ghost
* simplify visit render queue logic
* support progress timer without rial mode
* support partcile system
* Feature/update label (#149)
* [BugFix] fix compile error
* [Feature] support outline effect in ios
* [Feature] add shader file
* [BugFix] fix begin and end RenderPass
* [Feature] update CustomCommand
* [Feature] revert project.pbxproj
* [Feature] simplify codes
* [BugFix] pack AI88 to RGBA8888 only when outline enable
* [Feature] support shadow effect in Label
* [Feature] support BMFont
* [Feature] support glow effect
* [Feature] simplify shader files
* LabelAtlas work
* handle blend function correctly
* support tile map
* don't share buffer in metal
* alloc buffer size as needed
* support more tilemap
* Merge branch 'minggo/metal-support' into feature/updateLabel
* minggo/metal-support:
support tile map
handle blend function correctly
LabelAtlas work
Feature/update label (#149)
support partcile system
# Conflicts:
# cocos/2d/CCLabel.cpp
# cocos/2d/CCSprite.cpp
# cocos/2d/CCSpriteBatchNode.cpp
# cocos/renderer/CCQuadCommand.cpp
# cocos/renderer/CCQuadCommand.h
* render texture work without saving file
* use global viewport
* grid3d works
* remove grabber
* tiled3d works
* [BugFix] fix label bug
* [Feature] add updateSubData for buffer
* [Feature] remove setVertexCount
* support depth test
* add callback command
* [Feature] add UITest
* [Feature] update UITest
* [Feature] remove unneeded codes
* fix custom command issue
* fix layer color blend issue
* [BugFix] fix iOS compile error
* [Feature] remove unneeded codes
* [Feature] fix updateVertexBuffer
* layerradial works
* add draw test back
* fix batch issue
* fix compiling error
* [BugFix] support ETC1
* [BugFix] get the correct pipelineDescriptor
* [BugFix] skip draw when backendTexture nullptr
* clipping node support
* [Feature] add shader files
* fix stencil issue in metal
* [Feature] update UILayoutTest
* [BugFix] skip drawing when vertexCount is zero
* refactor renderer
* add set global z order for stencil manager commands
* fix warnings caused by type
* remove viewport in render command
* [Feature] fix warnings caused by type
* [BugFix] clear vertexCount and indexCount for CustomComand when needed
* [Feature] update clear for CustomCommand
* ios use metal
* fix viewport issue
* fix LayerColorGradient crash
* [cmake] transport to android and windows (#160)
* save point 1
* compile on windows
* run on android
* revert useless change
* android set CC_ENABLE_CACHE_TEXTURE_DATA to 1
* add initGlew
* fix android crash
* add TODO new-renderer
* review update
* revert onGLFWWindowPosCallback
* fix android compiling error
* Impl progress radial (#162)
* progresstimer add radial impl
* default drawType to element
* dec invoke times of createVertexBuffer (#163)
* support depth/stencil format for gl backend
* simplify progress timer codes
* support motionstreak, effect is wrong
* fix motionstreak issue
* [Feature] update Scissor Test (#161)
* [Feature] update Scissor Test
* [Feature] update ScissorTest
* [Feature] rename function
* [Feature] get constant reference if needed
* [Feature] show render status (#164)
* improve performance
* fix depth state
* fill error that triangle vertex/index number bigger than buffer
* fix compiline error in release mode
* fix buffer conflict between CPU and GPU on iOS/macOS
* Renderer refactor (#165)
* use one vertes/index buffer with opengl
* fix error on windows
* custom command support index format config
* CCLayer: compact vertex data structure
* update comment
* fix doc
* support fast tilemap
* pass index format instead
* fix some wrong effect
* fix render texture error
* fix texture per-element size
* fix texture format error
* BlendFunc type refactor, GLenum -> backend::BlendFactor (#167)
* BlendFunc use backend::BlendFactor as inner field
* update comments
* use int to replace GLenum
* update xcode project fiel
* rename to GLBlendConst
* add ccConstants.h
* update xcode project file
* update copyright
* remove primitive command
* remove CCPrimitive.cpp/.h
* remove deprecated files
* remove unneeded files
* remove multiple view support
* remove multiple view support
* remove the usage of frame buffer in camera
* director don't use frame buffer
* remove FrameBuffer
* remove BatchCommand
* add some api reference
* add physics2d back
* fix crash when close app on mac
* improve render texture
* fix rendertexture issue
* fix rendertexture issue
* simplify codes
* CMake support for mac & ios (#169)
* update cmake
* fix compile error
* update 3rd libs version
* remove CCThread.h/.cpp
* remove ccthread
* use audio engine to implement simple audio engine
* remove unneeded codes
* remove deprecated codes
* remove winrt macro
* remove CC_USE_WIC
* set partcile blend function in more elegant way
* remove unneeded codes
* remove unneeded codes
* cmake works on windows
* update project setting
* improve performance
* GLFloat -> float
* sync v3 cmake improvements into metal-support (#172)
* pick: modern cmake, compile definitions improvement (#19139)
* modern cmake, use target_compile_definitions partly
* simplify macro define, remove USE_*
* modern cmake, macro define
* add physics 2d macro define into ccConfig.h
* remove USE_CHIPMUNK macro in build.gradle
* remove CocosSelectModule.cmake
* shrink useless define
* simplify compile options config, re-add if necessary
* update external for tmp CI test
* un-quote target_compile_options value
* add "-g" parameter only when debug mode
* keep single build type when generator Xcode & VS projecy
* update external for tmp CI tes
* add static_cast<char>(-1), fix -Wc++11-narrowing
* simplify win32 compile define
* not modify code, only improve compile options
# Conflicts:
# .gitignore
# cmake/Modules/CocosConfigDepend.cmake
# cocos/CMakeLists.txt
# external/config.json
# tests/cpp-tests/CMakeLists.txt
* modern cmake, improve cmake_compiler_flags (#19145)
* cmake_compiler_flags
* Fix typo
* Fix typo2
* Remove chanages from Android.mk
* correct lua template cmake build (#19149)
* don't add -Wno-deprecated into jsb target
* correct lua template cmake build
* fix win32 lua template compile error
* prevent cmake in-source-build friendly (#19151)
* pick: Copy resources to "Resources/" on win32 like in linux configuration
* add "/Z7" for cpp-tests on windows
* [cmake] fix iOS xcode property setting failed (#19208)
* fix iOS xcode property setting failed
* use search_depend_libs_recursive at dlls collect
* fix typo
* [cmake] add find_host_library into iOS toolchain file (#19230)
* pick: [lua android] use luajit & template cmake update (#19239)
* increase cmake stability , remove tests/CMakeLists.txt (#19261)
* cmake win32 Precompiled header (#19273)
* Precompiled header
* Fix
* Precompiled header for cocos
* Precompiled header jscocos2d
* Fix for COCOS2D_DEBUG is always 1 on Android (#19291)
Related #19289
* little build fix, tests cpp-tests works on mac
* sync v3 build related codes into metal-support (#173)
* strict initialization for std::array
* remove proj.win32 project configs
* modern cmake, cmake_cleanup_remove_unused_variables (#19146)
* Switch travis CI to xenial (#19207)
* Switch travis CI to xenial
* Remove language: android
* Set language: cpp
* Fix java problem
* Update sdkmanager
* Fix sdkmanger
* next sdkmanager fix
* Remove xenial from android
* revert to sdk-tools-{system}-3859397
* Remove linux cmake install
* Update before-install.sh
* Update .travis.yml
* Simplify install-deps-linux.sh, tested on Ubuntu 16.04 (#19212)
* Simplify install-deps-linux.sh
* Cleanup
* pick: install ninja
* update cocos2d-console submodule
* for metal-support alpha release, we only test cpp
* add HelloCpp into project(Cocos2d-x) for tmp test
* update extenal metal-support-4
* update uniform setting
* [Feature] update BindGroup
* [Feature] empty-test
* [Feature] cpp-test
* [Feature] fix GL compiler error
* [Feature] fix GL crash
* [Feature] empty-test
* [Feature] cpp-tests
* [feature] improve frameRate
* [feature] fix opengl compile error
* [feature] fix opengl compile error
* [BugFix] fix compute maxLocation error
* [Feature] update setting unifrom
* [Feature] fix namespace
* [Feature] remove unneeded code
* [Bugfix] fix project file
* [Feature] update review
* [texture2d] impl texture format support (#175)
* texture update
* update
* update texture
* commit
* compile on windows
* ddd
* rename
* rename methods
* no crash
* save gl
* save
* save
* rename
* move out pixel format convert functions
* metal crash
* update
* update android
* support gles compressed texture format
* support more compress format
* add more conversion methods
* ss
* save
* update conversion methods
* add PVRTC format support
* reformat
* add marco linux
* fix GL marcro
* pvrtc supported only by ios 8.0+
* remove unused cmake
* revert change
* refactor Texture2D::initWithData
* fix conversion log
* refactor Texture2D::initWithData
* remove some OpenGL constants for PVRTC
* add todo
* fix typo
* AutoTest works on mac/iOS by disable part cases, sync v3 bug fix (#174)
* review cpp-tests, and fix part issues on start auto test
* sync png format fix: Node:Particle3D abnormal texture effects #19204
* fix cpp-tests SpritePolygon crash, wrong png format (#19170)
* fix wrong png convert format from sRGB to Gray
* erase plist index if all frames was erased
* test_A8.png have I8 format, fix it
* [CCSpriteCache] allow re-add plist & add testcase (#19175)
* allow re-add plist & add testcase
* remove comments/rename method/update testcase
* fix isSpriteFramesWithFileLoaded & add testcase
* remove used variable
* remove unused variable
* fix double free issues when js/lua-tests exit on iOS (#19236)
* disable part cases, AutoTest works without crash on mac
* update cocos2dx files json, to test cocos new next
* fix spritecache plist parsing issue (#19269)
* [linux] Fix FileUtils::getContents with folder (#19157)
* fix FileUtils::getContents on linux/mac
* use stat.st_mode
* simplify
* [CCFileUtils] win32 getFileSize (#19176)
* win32 getFileSize
* fix stat
* [cpp test-Android]20:FileUtils/2 change title (#19197)
* sync #19200
* sync #19231
* [android lua] improve performance of lua loader (#19234)
* [lua] improve performance of lua loader
* remove cache fix
* Revert "fix spritecache plist parsing issue (#19269)"
This reverts commit f3a85ece4307a7b90816c34489d1ed2c8fd11baf.
* remove win32 project files ref in template.json
* add metal framework lnk ref into cpp template
* test on iOS, and disable part cases
* alBufferData instead of alBufferDataStatic for small audio file on Apple (#19227)
* changes AudioCache to use alBufferData instead of alBufferDataStatic
(also makes test 19 faster to trigger openal bugs faster)
The original problem: CrashIfClientProvidedBogusAudioBufferList
https://github.com/cocos2d/cocos2d-x/issues/18948
is not happening anymore, but there's still a not very frequent issue
that makes OpenAL crash with a call stack like this.
AudioCache::readDataTask > alBufferData > CleanUpDeadBufferList
It happes more frequently when the device is "cold", which means after
half an hour of not using the device (locked).
I could not find the actual source code for iOS OpenAL, so I used the
macOS versions:
https://opensource.apple.com/source/OpenAL/OpenAL-48.7/Source/OpenAL/oalImp.cpp.auto.html
They seem to use CAGuard.h to make sure the dead buffer list
has no threading issues. I'm worried because the CAGuard code I found
has macos and win32 define but no iOS, so I'm not sure. I guess the
iOS version is different and has the guard.
I could not find a place in the code that's unprotected by the locks
except the InitializeBufferMap() which should not be called more than
once from cocos, and there's a workaround in AudioEngine-impl for it.
I reduced the occurence of the CleanUpDeadBufferList crash by moving
the guard in ~AudioCache to cover the alDeleteBuffers call.
* remove hack method "setTimeout" on audio
* AutoTest works on iOS
* support set ios deployment target for root project
* enable all texture2d cases, since Jiang have fixed
* add CCTextureUtils to xcode project file (#176)
* add leak cases for SpriteFrameCache (#177)
* re-add SpriteFrameCache cases
* update template file json
* Update SpriteFrameCacheTest.cpp
* fix compiling error
2019-01-18 15:08:25 +08:00
|
|
|
/**
|
|
|
|
* Returns the fullpath for a given dirname.
|
|
|
|
* @since 3.17.1
|
|
|
|
*/
|
|
|
|
virtual std::string fullPathForDirectory(const std::string &dirname) const;
|
2018-09-17 10:47:41 +08:00
|
|
|
|
|
|
|
/**
|
|
|
|
* mutex used to protect fields.
|
|
|
|
*/
|
|
|
|
mutable std::recursive_mutex _mutex;
|
|
|
|
|
|
|
|
|
2013-01-18 18:05:32 +08:00
|
|
|
/** Dictionary used to lookup filenames based on a key.
|
2013-02-01 22:19:58 +08:00
|
|
|
* It is used internally by the following methods:
|
|
|
|
*
|
|
|
|
* std::string fullPathForFilename(const char*);
|
|
|
|
*
|
|
|
|
* @since v2.1
|
2013-01-18 18:05:32 +08:00
|
|
|
*/
|
2013-12-04 17:46:57 +08:00
|
|
|
ValueMap _filenameLookupDict;
|
2015-07-07 14:06:59 +08:00
|
|
|
|
|
|
|
/**
|
2013-02-01 15:41:41 +08:00
|
|
|
* The vector contains resolution folders.
|
2013-02-01 17:16:33 +08:00
|
|
|
* The lower index of the element in this vector, the higher priority for this resolution directory.
|
2013-02-01 15:41:41 +08:00
|
|
|
*/
|
2013-06-15 14:03:30 +08:00
|
|
|
std::vector<std::string> _searchResolutionsOrderArray;
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2013-02-01 15:41:41 +08:00
|
|
|
/**
|
|
|
|
* The vector contains search paths.
|
2013-02-01 17:16:33 +08:00
|
|
|
* The lower index of the element in this vector, the higher priority for this search path.
|
2013-02-01 15:41:41 +08:00
|
|
|
*/
|
2013-06-15 14:03:30 +08:00
|
|
|
std::vector<std::string> _searchPathArray;
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2017-03-06 16:59:43 +08:00
|
|
|
/**
|
|
|
|
* The search paths which was set by 'setSearchPaths' / 'addSearchPath'.
|
|
|
|
*/
|
|
|
|
std::vector<std::string> _originalSearchPaths;
|
|
|
|
|
2013-02-01 15:41:41 +08:00
|
|
|
/**
|
|
|
|
* The default root path of resources.
|
2013-06-20 14:13:12 +08:00
|
|
|
* If the default root path of resources needs to be changed, do it in the `init` method of FileUtils's subclass.
|
2013-02-01 17:16:33 +08:00
|
|
|
* For instance:
|
2013-06-20 14:13:12 +08:00
|
|
|
* On Android, the default root path of resources will be assigned with "assets/" in FileUtilsAndroid::init().
|
|
|
|
* Similarly on Blackberry, we assign "app/native/Resources/" to this variable in FileUtilsBlackberry::init().
|
2013-02-01 15:41:41 +08:00
|
|
|
*/
|
2013-06-15 14:03:30 +08:00
|
|
|
std::string _defaultResRootPath;
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2013-02-01 16:46:15 +08:00
|
|
|
/**
|
metal support for cocos2d-x (#19305)
* remove deprecated files
* remove some deprecated codes
* remove more deprecated codes
* remove ui deprecated codes
* remove more deprecated codes
* remove deprecated codes in ccmenuitem
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes
* remove more deprecated codes
* remove more deprecated codes
* remove vr related codes and ignore some modules
* remove allocator
* remove some config
* 【Feature】add back-end project file
* [Feature] add back-end file
* add pipeline descriptor and shader cache
* [Feature] support sprite for backend
* [Feature] remove unneeded code
* [Feature] according to es2.0 spec, you must use clamp-to-edge as texture wrap mode, and no mipmapping for non-power-of-two texture
* [Feature] set texture wrap mode to clamp-to-edge, and no mipmapping for non-power-of-two texture
* [Feature] remove macro define to .cpp file
* [Feature] add log info
* [Feature] add PipelineDescriptor for TriangleCommand
* [Feature] add PipelineDescriptor object as member of TriangleCommand
* [Feature] add getPipelineDescriptor method
* add renderbackend
* complete pipeline descriptor
* [Feature] add viewport in RenderCommand
* set viewport when rendrering
* [Feature] occur error when using RendererBackend, to be fixed.
* a workaround to fix black screen on macOS 10.14 (#19090)
* add rendererbackend init function
* fix typo
* [Feature] modify testFile
* [BugFix] modify shader path
* [Feature] set default viewport
* fix projection
* [Feature] modify log info
* [BugFix] change viewport data type to int
* [BugFix] add BindGroup to PipelienDescriptor
* [BugFix] change a_position to vec3 in sprite.vert
* [BugFix] set vertexLayout according to V3F_C4B_T2F structure
* [Feature] revert a_position to vec4
* [Feature] renderer should not use gl codes directly
* [Feature] it's better not use default value parameter
* fix depth test setting
* rendererbackend -> renderer
* clear color and depth at begin
* add metal backend
* metal support normalized attribute
* simplify codes
* update external
* add render pass desctriptor in pipeline descriptor
* fix warnings
* fix crash and memeory leak
* refactor Texture2D
* put pipeline descriptor into render command
* simplify codes
* [Feature] update Sprite
* fix crash when closing app
* [Feature] update SpriteBatchNode and TextureAtlas
* support render texture(not finish)
* [Feature] remove unused code
* make tests work on mac
* fix download-deps path error
* make tests work on iOS
* [Feature] support ttf under normal label effect
* refactor triangle command processing
* let renderer handle more common commands
* refactor backend
* make render texture work
* [Feature] refactor backend for GL
* [Feature]Renaming to make it easy to understand
* [Feature] change warp mode to CLAMP_TO_EDGE
* fix ghost
* simplify visit render queue logic
* support progress timer without rial mode
* support partcile system
* Feature/update label (#149)
* [BugFix] fix compile error
* [Feature] support outline effect in ios
* [Feature] add shader file
* [BugFix] fix begin and end RenderPass
* [Feature] update CustomCommand
* [Feature] revert project.pbxproj
* [Feature] simplify codes
* [BugFix] pack AI88 to RGBA8888 only when outline enable
* [Feature] support shadow effect in Label
* [Feature] support BMFont
* [Feature] support glow effect
* [Feature] simplify shader files
* LabelAtlas work
* handle blend function correctly
* support tile map
* don't share buffer in metal
* alloc buffer size as needed
* support more tilemap
* Merge branch 'minggo/metal-support' into feature/updateLabel
* minggo/metal-support:
support tile map
handle blend function correctly
LabelAtlas work
Feature/update label (#149)
support partcile system
# Conflicts:
# cocos/2d/CCLabel.cpp
# cocos/2d/CCSprite.cpp
# cocos/2d/CCSpriteBatchNode.cpp
# cocos/renderer/CCQuadCommand.cpp
# cocos/renderer/CCQuadCommand.h
* render texture work without saving file
* use global viewport
* grid3d works
* remove grabber
* tiled3d works
* [BugFix] fix label bug
* [Feature] add updateSubData for buffer
* [Feature] remove setVertexCount
* support depth test
* add callback command
* [Feature] add UITest
* [Feature] update UITest
* [Feature] remove unneeded codes
* fix custom command issue
* fix layer color blend issue
* [BugFix] fix iOS compile error
* [Feature] remove unneeded codes
* [Feature] fix updateVertexBuffer
* layerradial works
* add draw test back
* fix batch issue
* fix compiling error
* [BugFix] support ETC1
* [BugFix] get the correct pipelineDescriptor
* [BugFix] skip draw when backendTexture nullptr
* clipping node support
* [Feature] add shader files
* fix stencil issue in metal
* [Feature] update UILayoutTest
* [BugFix] skip drawing when vertexCount is zero
* refactor renderer
* add set global z order for stencil manager commands
* fix warnings caused by type
* remove viewport in render command
* [Feature] fix warnings caused by type
* [BugFix] clear vertexCount and indexCount for CustomComand when needed
* [Feature] update clear for CustomCommand
* ios use metal
* fix viewport issue
* fix LayerColorGradient crash
* [cmake] transport to android and windows (#160)
* save point 1
* compile on windows
* run on android
* revert useless change
* android set CC_ENABLE_CACHE_TEXTURE_DATA to 1
* add initGlew
* fix android crash
* add TODO new-renderer
* review update
* revert onGLFWWindowPosCallback
* fix android compiling error
* Impl progress radial (#162)
* progresstimer add radial impl
* default drawType to element
* dec invoke times of createVertexBuffer (#163)
* support depth/stencil format for gl backend
* simplify progress timer codes
* support motionstreak, effect is wrong
* fix motionstreak issue
* [Feature] update Scissor Test (#161)
* [Feature] update Scissor Test
* [Feature] update ScissorTest
* [Feature] rename function
* [Feature] get constant reference if needed
* [Feature] show render status (#164)
* improve performance
* fix depth state
* fill error that triangle vertex/index number bigger than buffer
* fix compiline error in release mode
* fix buffer conflict between CPU and GPU on iOS/macOS
* Renderer refactor (#165)
* use one vertes/index buffer with opengl
* fix error on windows
* custom command support index format config
* CCLayer: compact vertex data structure
* update comment
* fix doc
* support fast tilemap
* pass index format instead
* fix some wrong effect
* fix render texture error
* fix texture per-element size
* fix texture format error
* BlendFunc type refactor, GLenum -> backend::BlendFactor (#167)
* BlendFunc use backend::BlendFactor as inner field
* update comments
* use int to replace GLenum
* update xcode project fiel
* rename to GLBlendConst
* add ccConstants.h
* update xcode project file
* update copyright
* remove primitive command
* remove CCPrimitive.cpp/.h
* remove deprecated files
* remove unneeded files
* remove multiple view support
* remove multiple view support
* remove the usage of frame buffer in camera
* director don't use frame buffer
* remove FrameBuffer
* remove BatchCommand
* add some api reference
* add physics2d back
* fix crash when close app on mac
* improve render texture
* fix rendertexture issue
* fix rendertexture issue
* simplify codes
* CMake support for mac & ios (#169)
* update cmake
* fix compile error
* update 3rd libs version
* remove CCThread.h/.cpp
* remove ccthread
* use audio engine to implement simple audio engine
* remove unneeded codes
* remove deprecated codes
* remove winrt macro
* remove CC_USE_WIC
* set partcile blend function in more elegant way
* remove unneeded codes
* remove unneeded codes
* cmake works on windows
* update project setting
* improve performance
* GLFloat -> float
* sync v3 cmake improvements into metal-support (#172)
* pick: modern cmake, compile definitions improvement (#19139)
* modern cmake, use target_compile_definitions partly
* simplify macro define, remove USE_*
* modern cmake, macro define
* add physics 2d macro define into ccConfig.h
* remove USE_CHIPMUNK macro in build.gradle
* remove CocosSelectModule.cmake
* shrink useless define
* simplify compile options config, re-add if necessary
* update external for tmp CI test
* un-quote target_compile_options value
* add "-g" parameter only when debug mode
* keep single build type when generator Xcode & VS projecy
* update external for tmp CI tes
* add static_cast<char>(-1), fix -Wc++11-narrowing
* simplify win32 compile define
* not modify code, only improve compile options
# Conflicts:
# .gitignore
# cmake/Modules/CocosConfigDepend.cmake
# cocos/CMakeLists.txt
# external/config.json
# tests/cpp-tests/CMakeLists.txt
* modern cmake, improve cmake_compiler_flags (#19145)
* cmake_compiler_flags
* Fix typo
* Fix typo2
* Remove chanages from Android.mk
* correct lua template cmake build (#19149)
* don't add -Wno-deprecated into jsb target
* correct lua template cmake build
* fix win32 lua template compile error
* prevent cmake in-source-build friendly (#19151)
* pick: Copy resources to "Resources/" on win32 like in linux configuration
* add "/Z7" for cpp-tests on windows
* [cmake] fix iOS xcode property setting failed (#19208)
* fix iOS xcode property setting failed
* use search_depend_libs_recursive at dlls collect
* fix typo
* [cmake] add find_host_library into iOS toolchain file (#19230)
* pick: [lua android] use luajit & template cmake update (#19239)
* increase cmake stability , remove tests/CMakeLists.txt (#19261)
* cmake win32 Precompiled header (#19273)
* Precompiled header
* Fix
* Precompiled header for cocos
* Precompiled header jscocos2d
* Fix for COCOS2D_DEBUG is always 1 on Android (#19291)
Related #19289
* little build fix, tests cpp-tests works on mac
* sync v3 build related codes into metal-support (#173)
* strict initialization for std::array
* remove proj.win32 project configs
* modern cmake, cmake_cleanup_remove_unused_variables (#19146)
* Switch travis CI to xenial (#19207)
* Switch travis CI to xenial
* Remove language: android
* Set language: cpp
* Fix java problem
* Update sdkmanager
* Fix sdkmanger
* next sdkmanager fix
* Remove xenial from android
* revert to sdk-tools-{system}-3859397
* Remove linux cmake install
* Update before-install.sh
* Update .travis.yml
* Simplify install-deps-linux.sh, tested on Ubuntu 16.04 (#19212)
* Simplify install-deps-linux.sh
* Cleanup
* pick: install ninja
* update cocos2d-console submodule
* for metal-support alpha release, we only test cpp
* add HelloCpp into project(Cocos2d-x) for tmp test
* update extenal metal-support-4
* update uniform setting
* [Feature] update BindGroup
* [Feature] empty-test
* [Feature] cpp-test
* [Feature] fix GL compiler error
* [Feature] fix GL crash
* [Feature] empty-test
* [Feature] cpp-tests
* [feature] improve frameRate
* [feature] fix opengl compile error
* [feature] fix opengl compile error
* [BugFix] fix compute maxLocation error
* [Feature] update setting unifrom
* [Feature] fix namespace
* [Feature] remove unneeded code
* [Bugfix] fix project file
* [Feature] update review
* [texture2d] impl texture format support (#175)
* texture update
* update
* update texture
* commit
* compile on windows
* ddd
* rename
* rename methods
* no crash
* save gl
* save
* save
* rename
* move out pixel format convert functions
* metal crash
* update
* update android
* support gles compressed texture format
* support more compress format
* add more conversion methods
* ss
* save
* update conversion methods
* add PVRTC format support
* reformat
* add marco linux
* fix GL marcro
* pvrtc supported only by ios 8.0+
* remove unused cmake
* revert change
* refactor Texture2D::initWithData
* fix conversion log
* refactor Texture2D::initWithData
* remove some OpenGL constants for PVRTC
* add todo
* fix typo
* AutoTest works on mac/iOS by disable part cases, sync v3 bug fix (#174)
* review cpp-tests, and fix part issues on start auto test
* sync png format fix: Node:Particle3D abnormal texture effects #19204
* fix cpp-tests SpritePolygon crash, wrong png format (#19170)
* fix wrong png convert format from sRGB to Gray
* erase plist index if all frames was erased
* test_A8.png have I8 format, fix it
* [CCSpriteCache] allow re-add plist & add testcase (#19175)
* allow re-add plist & add testcase
* remove comments/rename method/update testcase
* fix isSpriteFramesWithFileLoaded & add testcase
* remove used variable
* remove unused variable
* fix double free issues when js/lua-tests exit on iOS (#19236)
* disable part cases, AutoTest works without crash on mac
* update cocos2dx files json, to test cocos new next
* fix spritecache plist parsing issue (#19269)
* [linux] Fix FileUtils::getContents with folder (#19157)
* fix FileUtils::getContents on linux/mac
* use stat.st_mode
* simplify
* [CCFileUtils] win32 getFileSize (#19176)
* win32 getFileSize
* fix stat
* [cpp test-Android]20:FileUtils/2 change title (#19197)
* sync #19200
* sync #19231
* [android lua] improve performance of lua loader (#19234)
* [lua] improve performance of lua loader
* remove cache fix
* Revert "fix spritecache plist parsing issue (#19269)"
This reverts commit f3a85ece4307a7b90816c34489d1ed2c8fd11baf.
* remove win32 project files ref in template.json
* add metal framework lnk ref into cpp template
* test on iOS, and disable part cases
* alBufferData instead of alBufferDataStatic for small audio file on Apple (#19227)
* changes AudioCache to use alBufferData instead of alBufferDataStatic
(also makes test 19 faster to trigger openal bugs faster)
The original problem: CrashIfClientProvidedBogusAudioBufferList
https://github.com/cocos2d/cocos2d-x/issues/18948
is not happening anymore, but there's still a not very frequent issue
that makes OpenAL crash with a call stack like this.
AudioCache::readDataTask > alBufferData > CleanUpDeadBufferList
It happes more frequently when the device is "cold", which means after
half an hour of not using the device (locked).
I could not find the actual source code for iOS OpenAL, so I used the
macOS versions:
https://opensource.apple.com/source/OpenAL/OpenAL-48.7/Source/OpenAL/oalImp.cpp.auto.html
They seem to use CAGuard.h to make sure the dead buffer list
has no threading issues. I'm worried because the CAGuard code I found
has macos and win32 define but no iOS, so I'm not sure. I guess the
iOS version is different and has the guard.
I could not find a place in the code that's unprotected by the locks
except the InitializeBufferMap() which should not be called more than
once from cocos, and there's a workaround in AudioEngine-impl for it.
I reduced the occurence of the CleanUpDeadBufferList crash by moving
the guard in ~AudioCache to cover the alDeleteBuffers call.
* remove hack method "setTimeout" on audio
* AutoTest works on iOS
* support set ios deployment target for root project
* enable all texture2d cases, since Jiang have fixed
* add CCTextureUtils to xcode project file (#176)
* add leak cases for SpriteFrameCache (#177)
* re-add SpriteFrameCache cases
* update template file json
* Update SpriteFrameCacheTest.cpp
* fix compiling error
2019-01-18 15:08:25 +08:00
|
|
|
* The full path cache for normal files. When a file is found, it will be added into this cache.
|
2013-02-01 18:48:44 +08:00
|
|
|
* This variable is used for improving the performance of file search.
|
2013-02-01 16:46:15 +08:00
|
|
|
*/
|
2015-04-07 22:15:15 +08:00
|
|
|
mutable std::unordered_map<std::string, std::string> _fullPathCache;
|
2015-07-07 14:06:59 +08:00
|
|
|
|
metal support for cocos2d-x (#19305)
* remove deprecated files
* remove some deprecated codes
* remove more deprecated codes
* remove ui deprecated codes
* remove more deprecated codes
* remove deprecated codes in ccmenuitem
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes in ui
* remove more deprecated codes
* remove more deprecated codes
* remove more deprecated codes
* remove vr related codes and ignore some modules
* remove allocator
* remove some config
* 【Feature】add back-end project file
* [Feature] add back-end file
* add pipeline descriptor and shader cache
* [Feature] support sprite for backend
* [Feature] remove unneeded code
* [Feature] according to es2.0 spec, you must use clamp-to-edge as texture wrap mode, and no mipmapping for non-power-of-two texture
* [Feature] set texture wrap mode to clamp-to-edge, and no mipmapping for non-power-of-two texture
* [Feature] remove macro define to .cpp file
* [Feature] add log info
* [Feature] add PipelineDescriptor for TriangleCommand
* [Feature] add PipelineDescriptor object as member of TriangleCommand
* [Feature] add getPipelineDescriptor method
* add renderbackend
* complete pipeline descriptor
* [Feature] add viewport in RenderCommand
* set viewport when rendrering
* [Feature] occur error when using RendererBackend, to be fixed.
* a workaround to fix black screen on macOS 10.14 (#19090)
* add rendererbackend init function
* fix typo
* [Feature] modify testFile
* [BugFix] modify shader path
* [Feature] set default viewport
* fix projection
* [Feature] modify log info
* [BugFix] change viewport data type to int
* [BugFix] add BindGroup to PipelienDescriptor
* [BugFix] change a_position to vec3 in sprite.vert
* [BugFix] set vertexLayout according to V3F_C4B_T2F structure
* [Feature] revert a_position to vec4
* [Feature] renderer should not use gl codes directly
* [Feature] it's better not use default value parameter
* fix depth test setting
* rendererbackend -> renderer
* clear color and depth at begin
* add metal backend
* metal support normalized attribute
* simplify codes
* update external
* add render pass desctriptor in pipeline descriptor
* fix warnings
* fix crash and memeory leak
* refactor Texture2D
* put pipeline descriptor into render command
* simplify codes
* [Feature] update Sprite
* fix crash when closing app
* [Feature] update SpriteBatchNode and TextureAtlas
* support render texture(not finish)
* [Feature] remove unused code
* make tests work on mac
* fix download-deps path error
* make tests work on iOS
* [Feature] support ttf under normal label effect
* refactor triangle command processing
* let renderer handle more common commands
* refactor backend
* make render texture work
* [Feature] refactor backend for GL
* [Feature]Renaming to make it easy to understand
* [Feature] change warp mode to CLAMP_TO_EDGE
* fix ghost
* simplify visit render queue logic
* support progress timer without rial mode
* support partcile system
* Feature/update label (#149)
* [BugFix] fix compile error
* [Feature] support outline effect in ios
* [Feature] add shader file
* [BugFix] fix begin and end RenderPass
* [Feature] update CustomCommand
* [Feature] revert project.pbxproj
* [Feature] simplify codes
* [BugFix] pack AI88 to RGBA8888 only when outline enable
* [Feature] support shadow effect in Label
* [Feature] support BMFont
* [Feature] support glow effect
* [Feature] simplify shader files
* LabelAtlas work
* handle blend function correctly
* support tile map
* don't share buffer in metal
* alloc buffer size as needed
* support more tilemap
* Merge branch 'minggo/metal-support' into feature/updateLabel
* minggo/metal-support:
support tile map
handle blend function correctly
LabelAtlas work
Feature/update label (#149)
support partcile system
# Conflicts:
# cocos/2d/CCLabel.cpp
# cocos/2d/CCSprite.cpp
# cocos/2d/CCSpriteBatchNode.cpp
# cocos/renderer/CCQuadCommand.cpp
# cocos/renderer/CCQuadCommand.h
* render texture work without saving file
* use global viewport
* grid3d works
* remove grabber
* tiled3d works
* [BugFix] fix label bug
* [Feature] add updateSubData for buffer
* [Feature] remove setVertexCount
* support depth test
* add callback command
* [Feature] add UITest
* [Feature] update UITest
* [Feature] remove unneeded codes
* fix custom command issue
* fix layer color blend issue
* [BugFix] fix iOS compile error
* [Feature] remove unneeded codes
* [Feature] fix updateVertexBuffer
* layerradial works
* add draw test back
* fix batch issue
* fix compiling error
* [BugFix] support ETC1
* [BugFix] get the correct pipelineDescriptor
* [BugFix] skip draw when backendTexture nullptr
* clipping node support
* [Feature] add shader files
* fix stencil issue in metal
* [Feature] update UILayoutTest
* [BugFix] skip drawing when vertexCount is zero
* refactor renderer
* add set global z order for stencil manager commands
* fix warnings caused by type
* remove viewport in render command
* [Feature] fix warnings caused by type
* [BugFix] clear vertexCount and indexCount for CustomComand when needed
* [Feature] update clear for CustomCommand
* ios use metal
* fix viewport issue
* fix LayerColorGradient crash
* [cmake] transport to android and windows (#160)
* save point 1
* compile on windows
* run on android
* revert useless change
* android set CC_ENABLE_CACHE_TEXTURE_DATA to 1
* add initGlew
* fix android crash
* add TODO new-renderer
* review update
* revert onGLFWWindowPosCallback
* fix android compiling error
* Impl progress radial (#162)
* progresstimer add radial impl
* default drawType to element
* dec invoke times of createVertexBuffer (#163)
* support depth/stencil format for gl backend
* simplify progress timer codes
* support motionstreak, effect is wrong
* fix motionstreak issue
* [Feature] update Scissor Test (#161)
* [Feature] update Scissor Test
* [Feature] update ScissorTest
* [Feature] rename function
* [Feature] get constant reference if needed
* [Feature] show render status (#164)
* improve performance
* fix depth state
* fill error that triangle vertex/index number bigger than buffer
* fix compiline error in release mode
* fix buffer conflict between CPU and GPU on iOS/macOS
* Renderer refactor (#165)
* use one vertes/index buffer with opengl
* fix error on windows
* custom command support index format config
* CCLayer: compact vertex data structure
* update comment
* fix doc
* support fast tilemap
* pass index format instead
* fix some wrong effect
* fix render texture error
* fix texture per-element size
* fix texture format error
* BlendFunc type refactor, GLenum -> backend::BlendFactor (#167)
* BlendFunc use backend::BlendFactor as inner field
* update comments
* use int to replace GLenum
* update xcode project fiel
* rename to GLBlendConst
* add ccConstants.h
* update xcode project file
* update copyright
* remove primitive command
* remove CCPrimitive.cpp/.h
* remove deprecated files
* remove unneeded files
* remove multiple view support
* remove multiple view support
* remove the usage of frame buffer in camera
* director don't use frame buffer
* remove FrameBuffer
* remove BatchCommand
* add some api reference
* add physics2d back
* fix crash when close app on mac
* improve render texture
* fix rendertexture issue
* fix rendertexture issue
* simplify codes
* CMake support for mac & ios (#169)
* update cmake
* fix compile error
* update 3rd libs version
* remove CCThread.h/.cpp
* remove ccthread
* use audio engine to implement simple audio engine
* remove unneeded codes
* remove deprecated codes
* remove winrt macro
* remove CC_USE_WIC
* set partcile blend function in more elegant way
* remove unneeded codes
* remove unneeded codes
* cmake works on windows
* update project setting
* improve performance
* GLFloat -> float
* sync v3 cmake improvements into metal-support (#172)
* pick: modern cmake, compile definitions improvement (#19139)
* modern cmake, use target_compile_definitions partly
* simplify macro define, remove USE_*
* modern cmake, macro define
* add physics 2d macro define into ccConfig.h
* remove USE_CHIPMUNK macro in build.gradle
* remove CocosSelectModule.cmake
* shrink useless define
* simplify compile options config, re-add if necessary
* update external for tmp CI test
* un-quote target_compile_options value
* add "-g" parameter only when debug mode
* keep single build type when generator Xcode & VS projecy
* update external for tmp CI tes
* add static_cast<char>(-1), fix -Wc++11-narrowing
* simplify win32 compile define
* not modify code, only improve compile options
# Conflicts:
# .gitignore
# cmake/Modules/CocosConfigDepend.cmake
# cocos/CMakeLists.txt
# external/config.json
# tests/cpp-tests/CMakeLists.txt
* modern cmake, improve cmake_compiler_flags (#19145)
* cmake_compiler_flags
* Fix typo
* Fix typo2
* Remove chanages from Android.mk
* correct lua template cmake build (#19149)
* don't add -Wno-deprecated into jsb target
* correct lua template cmake build
* fix win32 lua template compile error
* prevent cmake in-source-build friendly (#19151)
* pick: Copy resources to "Resources/" on win32 like in linux configuration
* add "/Z7" for cpp-tests on windows
* [cmake] fix iOS xcode property setting failed (#19208)
* fix iOS xcode property setting failed
* use search_depend_libs_recursive at dlls collect
* fix typo
* [cmake] add find_host_library into iOS toolchain file (#19230)
* pick: [lua android] use luajit & template cmake update (#19239)
* increase cmake stability , remove tests/CMakeLists.txt (#19261)
* cmake win32 Precompiled header (#19273)
* Precompiled header
* Fix
* Precompiled header for cocos
* Precompiled header jscocos2d
* Fix for COCOS2D_DEBUG is always 1 on Android (#19291)
Related #19289
* little build fix, tests cpp-tests works on mac
* sync v3 build related codes into metal-support (#173)
* strict initialization for std::array
* remove proj.win32 project configs
* modern cmake, cmake_cleanup_remove_unused_variables (#19146)
* Switch travis CI to xenial (#19207)
* Switch travis CI to xenial
* Remove language: android
* Set language: cpp
* Fix java problem
* Update sdkmanager
* Fix sdkmanger
* next sdkmanager fix
* Remove xenial from android
* revert to sdk-tools-{system}-3859397
* Remove linux cmake install
* Update before-install.sh
* Update .travis.yml
* Simplify install-deps-linux.sh, tested on Ubuntu 16.04 (#19212)
* Simplify install-deps-linux.sh
* Cleanup
* pick: install ninja
* update cocos2d-console submodule
* for metal-support alpha release, we only test cpp
* add HelloCpp into project(Cocos2d-x) for tmp test
* update extenal metal-support-4
* update uniform setting
* [Feature] update BindGroup
* [Feature] empty-test
* [Feature] cpp-test
* [Feature] fix GL compiler error
* [Feature] fix GL crash
* [Feature] empty-test
* [Feature] cpp-tests
* [feature] improve frameRate
* [feature] fix opengl compile error
* [feature] fix opengl compile error
* [BugFix] fix compute maxLocation error
* [Feature] update setting unifrom
* [Feature] fix namespace
* [Feature] remove unneeded code
* [Bugfix] fix project file
* [Feature] update review
* [texture2d] impl texture format support (#175)
* texture update
* update
* update texture
* commit
* compile on windows
* ddd
* rename
* rename methods
* no crash
* save gl
* save
* save
* rename
* move out pixel format convert functions
* metal crash
* update
* update android
* support gles compressed texture format
* support more compress format
* add more conversion methods
* ss
* save
* update conversion methods
* add PVRTC format support
* reformat
* add marco linux
* fix GL marcro
* pvrtc supported only by ios 8.0+
* remove unused cmake
* revert change
* refactor Texture2D::initWithData
* fix conversion log
* refactor Texture2D::initWithData
* remove some OpenGL constants for PVRTC
* add todo
* fix typo
* AutoTest works on mac/iOS by disable part cases, sync v3 bug fix (#174)
* review cpp-tests, and fix part issues on start auto test
* sync png format fix: Node:Particle3D abnormal texture effects #19204
* fix cpp-tests SpritePolygon crash, wrong png format (#19170)
* fix wrong png convert format from sRGB to Gray
* erase plist index if all frames was erased
* test_A8.png have I8 format, fix it
* [CCSpriteCache] allow re-add plist & add testcase (#19175)
* allow re-add plist & add testcase
* remove comments/rename method/update testcase
* fix isSpriteFramesWithFileLoaded & add testcase
* remove used variable
* remove unused variable
* fix double free issues when js/lua-tests exit on iOS (#19236)
* disable part cases, AutoTest works without crash on mac
* update cocos2dx files json, to test cocos new next
* fix spritecache plist parsing issue (#19269)
* [linux] Fix FileUtils::getContents with folder (#19157)
* fix FileUtils::getContents on linux/mac
* use stat.st_mode
* simplify
* [CCFileUtils] win32 getFileSize (#19176)
* win32 getFileSize
* fix stat
* [cpp test-Android]20:FileUtils/2 change title (#19197)
* sync #19200
* sync #19231
* [android lua] improve performance of lua loader (#19234)
* [lua] improve performance of lua loader
* remove cache fix
* Revert "fix spritecache plist parsing issue (#19269)"
This reverts commit f3a85ece4307a7b90816c34489d1ed2c8fd11baf.
* remove win32 project files ref in template.json
* add metal framework lnk ref into cpp template
* test on iOS, and disable part cases
* alBufferData instead of alBufferDataStatic for small audio file on Apple (#19227)
* changes AudioCache to use alBufferData instead of alBufferDataStatic
(also makes test 19 faster to trigger openal bugs faster)
The original problem: CrashIfClientProvidedBogusAudioBufferList
https://github.com/cocos2d/cocos2d-x/issues/18948
is not happening anymore, but there's still a not very frequent issue
that makes OpenAL crash with a call stack like this.
AudioCache::readDataTask > alBufferData > CleanUpDeadBufferList
It happes more frequently when the device is "cold", which means after
half an hour of not using the device (locked).
I could not find the actual source code for iOS OpenAL, so I used the
macOS versions:
https://opensource.apple.com/source/OpenAL/OpenAL-48.7/Source/OpenAL/oalImp.cpp.auto.html
They seem to use CAGuard.h to make sure the dead buffer list
has no threading issues. I'm worried because the CAGuard code I found
has macos and win32 define but no iOS, so I'm not sure. I guess the
iOS version is different and has the guard.
I could not find a place in the code that's unprotected by the locks
except the InitializeBufferMap() which should not be called more than
once from cocos, and there's a workaround in AudioEngine-impl for it.
I reduced the occurence of the CleanUpDeadBufferList crash by moving
the guard in ~AudioCache to cover the alDeleteBuffers call.
* remove hack method "setTimeout" on audio
* AutoTest works on iOS
* support set ios deployment target for root project
* enable all texture2d cases, since Jiang have fixed
* add CCTextureUtils to xcode project file (#176)
* add leak cases for SpriteFrameCache (#177)
* re-add SpriteFrameCache cases
* update template file json
* Update SpriteFrameCacheTest.cpp
* fix compiling error
2019-01-18 15:08:25 +08:00
|
|
|
/**
|
|
|
|
* The full path cache for directories. When a diretory is found, it will be added into this cache.
|
|
|
|
* This variable is used for improving the performance of file search.
|
|
|
|
*/
|
|
|
|
mutable std::unordered_map<std::string, std::string> _fullPathCacheDir;
|
|
|
|
|
2014-12-25 20:33:47 +08:00
|
|
|
/**
|
|
|
|
* Writable path.
|
|
|
|
*/
|
|
|
|
std::string _writablePath;
|
|
|
|
|
2013-02-01 15:41:41 +08:00
|
|
|
/**
|
2013-06-20 14:13:12 +08:00
|
|
|
* The singleton pointer of FileUtils.
|
2013-02-01 15:41:41 +08:00
|
|
|
*/
|
2013-06-20 14:13:12 +08:00
|
|
|
static FileUtils* s_sharedFileUtils;
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2016-06-10 13:52:35 +08:00
|
|
|
/**
|
|
|
|
* Remove null value key (for iOS)
|
|
|
|
*/
|
2018-09-17 10:47:41 +08:00
|
|
|
virtual void valueMapCompact(ValueMap& valueMap) const;
|
|
|
|
virtual void valueVectorCompact(ValueVector& valueVector) const;
|
2017-01-13 10:05:46 +08:00
|
|
|
|
|
|
|
template<typename T, typename R, typename ...ARGS>
|
|
|
|
static void performOperationOffthread(T&& action, R&& callback, ARGS&& ...args)
|
|
|
|
{
|
|
|
|
|
|
|
|
// Visual Studio 2013 does not support using std::bind to forward template parameters into
|
|
|
|
// a lambda. To get around this, we will just copy these arguments via lambda capture
|
|
|
|
#if defined(_MSC_VER) && _MSC_VER < 1900
|
|
|
|
auto lambda = [action, callback, args...]()
|
|
|
|
{
|
|
|
|
Director::getInstance()->getScheduler()->performFunctionInCocosThread(std::bind(callback, action(args...)));
|
|
|
|
};
|
|
|
|
#else
|
|
|
|
// As cocos2d-x uses c++11, we will use std::bind to leverage move sematics to
|
|
|
|
// move our arguments into our lambda, to potentially avoid copying.
|
2017-02-06 15:15:16 +08:00
|
|
|
auto lambda = std::bind([](const T& actionIn, const R& callbackIn, const ARGS& ...argsIn)
|
2017-01-13 10:05:46 +08:00
|
|
|
{
|
2017-02-06 15:15:16 +08:00
|
|
|
Director::getInstance()->getScheduler()->performFunctionInCocosThread(std::bind(callbackIn, actionIn(argsIn...)));
|
2017-01-13 10:05:46 +08:00
|
|
|
}, std::forward<T>(action), std::forward<R>(callback), std::forward<ARGS>(args)...);
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
AsyncTaskPool::getInstance()->enqueue(AsyncTaskPool::TaskType::TASK_IO, [](void*){}, nullptr, std::move(lambda));
|
|
|
|
}
|
2012-04-19 14:35:52 +08:00
|
|
|
};
|
|
|
|
|
2015-03-24 11:15:40 +08:00
|
|
|
// end of support group
|
|
|
|
/** @} */
|
2012-06-20 18:09:11 +08:00
|
|
|
|
2012-04-19 14:35:52 +08:00
|
|
|
NS_CC_END
|
|
|
|
|
2013-02-01 11:20:46 +08:00
|
|
|
#endif // __CC_FILEUTILS_H__
|