2013-02-01 11:20:46 +08:00
|
|
|
/****************************************************************************
|
|
|
|
Copyright (c) 2010-2012 cocos2d-x.org
|
|
|
|
Copyright (c) 2011 Zynga Inc.
|
2018-01-29 16:25:32 +08:00
|
|
|
Copyright (c) 2013-2016 Chukong Technologies Inc.
|
|
|
|
Copyright (c) 2017-2018 Xiamen Yaji Software Co., Ltd.
|
2013-02-01 11:20:46 +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.
|
|
|
|
****************************************************************************/
|
|
|
|
#import <Foundation/Foundation.h>
|
|
|
|
|
2016-03-21 11:02:00 +08:00
|
|
|
#include "platform/apple/CCFileUtils-apple.h"
|
2014-09-10 03:18:31 +08:00
|
|
|
|
2015-07-10 14:37:42 +08:00
|
|
|
#include <ftw.h>
|
|
|
|
|
2013-02-01 11:20:46 +08:00
|
|
|
#include <string>
|
|
|
|
#include <stack>
|
2014-09-10 03:18:31 +08:00
|
|
|
|
2014-04-30 08:37:36 +08:00
|
|
|
#include "base/CCDirector.h"
|
2014-09-10 03:18:31 +08:00
|
|
|
#include "platform/CCFileUtils.h"
|
|
|
|
#include "platform/CCSAXParser.h"
|
2013-02-01 11:20:46 +08:00
|
|
|
|
2018-09-17 10:47:41 +08:00
|
|
|
|
|
|
|
#define DECLARE_GUARD std::lock_guard<std::recursive_mutex> mutexGuard(_mutex)
|
|
|
|
|
2013-02-01 11:20:46 +08:00
|
|
|
NS_CC_BEGIN
|
|
|
|
|
2016-04-14 11:59:25 +08:00
|
|
|
struct FileUtilsApple::IMPL {
|
|
|
|
IMPL(NSBundle* bundle):bundle_([NSBundle mainBundle]) {}
|
|
|
|
void setBundle(NSBundle* bundle) {
|
|
|
|
bundle_ = bundle;
|
|
|
|
}
|
|
|
|
NSBundle* getBundle() const {
|
|
|
|
return bundle_;
|
|
|
|
}
|
|
|
|
private:
|
|
|
|
NSBundle* bundle_;
|
|
|
|
};
|
|
|
|
|
2016-05-23 18:26:19 +08:00
|
|
|
static id convertCCValueToNSObject(const cocos2d::Value &value);
|
|
|
|
static cocos2d::Value convertNSObjectToCCValue(id object);
|
2013-02-03 10:56:59 +08:00
|
|
|
|
2016-05-23 18:26:19 +08:00
|
|
|
static void addNSObjectToCCMap(id nsKey, id nsValue, ValueMap& dict);
|
|
|
|
static void addCCValueToNSDictionary(const std::string& key, const Value& value, NSMutableDictionary *dict);
|
|
|
|
static void addNSObjectToCCVector(id item, ValueVector& array);
|
|
|
|
static void addCCValueToNSArray(const Value& value, NSMutableArray *array);
|
|
|
|
|
|
|
|
static id convertCCValueToNSObject(const cocos2d::Value &value)
|
|
|
|
{
|
|
|
|
switch (value.getType())
|
|
|
|
{
|
|
|
|
case Value::Type::NONE:
|
|
|
|
return [NSNull null];
|
|
|
|
|
|
|
|
case Value::Type::STRING:
|
|
|
|
return [NSString stringWithCString:value.asString().c_str() encoding:NSUTF8StringEncoding];
|
|
|
|
|
|
|
|
case Value::Type::BYTE:
|
|
|
|
return [NSNumber numberWithInt:value.asByte()];
|
|
|
|
|
|
|
|
case Value::Type::INTEGER:
|
|
|
|
return [NSNumber numberWithInt:value.asInt()];
|
|
|
|
|
|
|
|
case Value::Type::UNSIGNED:
|
|
|
|
return [NSNumber numberWithUnsignedInt:value.asUnsignedInt()];
|
|
|
|
|
|
|
|
case Value::Type::FLOAT:
|
|
|
|
return [NSNumber numberWithFloat:value.asFloat()];
|
|
|
|
|
|
|
|
case Value::Type::DOUBLE:
|
|
|
|
return [NSNumber numberWithDouble:value.asDouble()];
|
|
|
|
|
|
|
|
case Value::Type::BOOLEAN:
|
|
|
|
return [NSNumber numberWithBool:value.asBool()];
|
|
|
|
|
|
|
|
case Value::Type::VECTOR: {
|
|
|
|
NSMutableArray *array = [NSMutableArray array];
|
|
|
|
const ValueVector &vector = value.asValueVector();
|
|
|
|
for (const auto &e : vector) {
|
|
|
|
addCCValueToNSArray(e, array);
|
|
|
|
}
|
|
|
|
return array;
|
|
|
|
}
|
|
|
|
|
|
|
|
case Value::Type::MAP: {
|
|
|
|
NSMutableDictionary *dictionary = [NSMutableDictionary dictionary];
|
|
|
|
const ValueMap &map = value.asValueMap();
|
2016-10-27 15:10:24 +08:00
|
|
|
for (auto& iter : map) {
|
|
|
|
addCCValueToNSDictionary(iter.first, iter.second, dictionary);
|
2016-05-23 18:26:19 +08:00
|
|
|
}
|
|
|
|
return dictionary;
|
|
|
|
}
|
|
|
|
|
|
|
|
case Value::Type::INT_KEY_MAP:
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return [NSNull null];
|
|
|
|
}
|
|
|
|
|
|
|
|
static cocos2d::Value convertNSObjectToCCValue(id item)
|
2013-02-03 10:56:59 +08:00
|
|
|
{
|
|
|
|
// add string value into array
|
2013-12-03 14:47:35 +08:00
|
|
|
if ([item isKindOfClass:[NSString class]])
|
|
|
|
{
|
2016-05-23 18:26:19 +08:00
|
|
|
return Value([item UTF8String]);
|
2013-02-03 10:56:59 +08:00
|
|
|
}
|
2016-05-23 18:26:19 +08:00
|
|
|
|
2013-02-03 10:56:59 +08:00
|
|
|
// add number value into array(such as int, float, bool and so on)
|
2014-03-19 11:58:11 +08:00
|
|
|
// the value is a number
|
2013-12-03 14:47:35 +08:00
|
|
|
if ([item isKindOfClass:[NSNumber class]])
|
|
|
|
{
|
2014-03-19 11:58:11 +08:00
|
|
|
NSNumber* num = item;
|
|
|
|
const char* numType = [num objCType];
|
|
|
|
if(num == (void*)kCFBooleanFalse || num == (void*)kCFBooleanTrue)
|
|
|
|
{
|
2016-02-16 17:01:54 +08:00
|
|
|
bool v = [num boolValue];
|
2016-05-23 18:26:19 +08:00
|
|
|
return Value(v);
|
2014-03-19 11:58:11 +08:00
|
|
|
}
|
|
|
|
else if(strcmp(numType, @encode(float)) == 0)
|
|
|
|
{
|
2016-05-23 18:26:19 +08:00
|
|
|
return Value([num floatValue]);
|
2014-03-19 11:58:11 +08:00
|
|
|
}
|
|
|
|
else if(strcmp(numType, @encode(double)) == 0)
|
|
|
|
{
|
2016-05-23 18:26:19 +08:00
|
|
|
return Value([num doubleValue]);
|
2014-03-19 11:58:11 +08:00
|
|
|
}
|
2016-05-23 18:26:19 +08:00
|
|
|
else
|
|
|
|
{
|
|
|
|
return Value([num intValue]);
|
2014-03-19 11:58:11 +08:00
|
|
|
}
|
2013-02-03 10:56:59 +08:00
|
|
|
}
|
2016-05-23 18:26:19 +08:00
|
|
|
|
|
|
|
|
2013-02-03 10:56:59 +08:00
|
|
|
// add dictionary value into array
|
2013-12-03 14:47:35 +08:00
|
|
|
if ([item isKindOfClass:[NSDictionary class]])
|
|
|
|
{
|
2013-12-04 17:46:57 +08:00
|
|
|
ValueMap dict;
|
2013-12-03 14:47:35 +08:00
|
|
|
for (id subKey in [item allKeys])
|
|
|
|
{
|
2013-02-03 10:56:59 +08:00
|
|
|
id subValue = [item objectForKey:subKey];
|
2016-05-23 18:26:19 +08:00
|
|
|
addNSObjectToCCMap(subKey, subValue, dict);
|
2013-02-03 10:56:59 +08:00
|
|
|
}
|
2016-05-23 18:26:19 +08:00
|
|
|
|
|
|
|
return Value(dict);
|
2013-02-03 10:56:59 +08:00
|
|
|
}
|
2016-05-23 18:26:19 +08:00
|
|
|
|
2013-02-03 10:56:59 +08:00
|
|
|
// add array value into array
|
2013-12-03 14:47:35 +08:00
|
|
|
if ([item isKindOfClass:[NSArray class]])
|
|
|
|
{
|
2013-12-04 17:46:57 +08:00
|
|
|
ValueVector subArray;
|
2013-12-03 14:47:35 +08:00
|
|
|
for (id subItem in item)
|
|
|
|
{
|
2016-05-23 18:26:19 +08:00
|
|
|
addNSObjectToCCVector(subItem, subArray);
|
2013-02-03 10:56:59 +08:00
|
|
|
}
|
2016-05-23 18:26:19 +08:00
|
|
|
return Value(subArray);
|
2013-02-03 10:56:59 +08:00
|
|
|
}
|
2016-05-23 18:26:19 +08:00
|
|
|
|
|
|
|
return Value::Null;
|
2013-02-03 10:56:59 +08:00
|
|
|
}
|
|
|
|
|
2016-05-23 18:26:19 +08:00
|
|
|
static void addNSObjectToCCVector(id item, ValueVector& array)
|
2013-04-13 16:55:24 +08:00
|
|
|
{
|
2016-05-23 18:26:19 +08:00
|
|
|
array.push_back(convertNSObjectToCCValue(item));
|
|
|
|
}
|
2014-07-24 18:56:59 +08:00
|
|
|
|
2016-05-23 18:26:19 +08:00
|
|
|
static void addCCValueToNSArray(const Value& value, NSMutableArray *array)
|
|
|
|
{
|
|
|
|
[array addObject:convertCCValueToNSObject(value)];
|
2013-04-13 16:55:24 +08:00
|
|
|
}
|
|
|
|
|
2016-05-23 18:26:19 +08:00
|
|
|
static void addNSObjectToCCMap(id nsKey, id nsValue, ValueMap& dict)
|
2013-02-03 10:56:59 +08:00
|
|
|
{
|
|
|
|
// the key must be a string
|
2013-12-03 14:47:35 +08:00
|
|
|
CCASSERT([nsKey isKindOfClass:[NSString class]], "The key should be a string!");
|
|
|
|
std::string key = [nsKey UTF8String];
|
2016-05-23 18:26:19 +08:00
|
|
|
dict[key] = convertNSObjectToCCValue(nsValue);
|
2013-02-03 10:56:59 +08:00
|
|
|
}
|
|
|
|
|
2016-05-23 18:26:19 +08:00
|
|
|
static void addCCValueToNSDictionary(const std::string& key, const Value& value, NSMutableDictionary *dict)
|
2013-04-13 16:55:24 +08:00
|
|
|
{
|
2013-12-03 14:47:35 +08:00
|
|
|
NSString *NSkey = [NSString stringWithCString:key.c_str() encoding:NSUTF8StringEncoding];
|
2016-05-23 18:26:19 +08:00
|
|
|
[dict setObject:convertCCValueToNSObject(value) forKey:NSkey];
|
2013-04-13 16:55:24 +08:00
|
|
|
}
|
|
|
|
|
2016-05-23 18:26:19 +08:00
|
|
|
|
2016-04-14 11:59:25 +08:00
|
|
|
FileUtilsApple::FileUtilsApple() : pimpl_(new IMPL([NSBundle mainBundle])) {
|
2014-07-24 18:56:59 +08:00
|
|
|
}
|
|
|
|
|
2016-05-09 20:08:56 +08:00
|
|
|
FileUtilsApple::~FileUtilsApple() = default;
|
|
|
|
|
2016-04-14 11:59:25 +08:00
|
|
|
#if CC_FILEUTILS_APPLE_ENABLE_OBJC
|
2014-07-24 18:56:59 +08:00
|
|
|
void FileUtilsApple::setBundle(NSBundle* bundle) {
|
2016-04-14 11:59:25 +08:00
|
|
|
pimpl_->setBundle(bundle);
|
2014-07-24 18:56:59 +08:00
|
|
|
}
|
2016-04-14 11:59:25 +08:00
|
|
|
#endif
|
2013-09-07 06:33:28 +08:00
|
|
|
|
|
|
|
#pragma mark - FileUtils
|
|
|
|
|
|
|
|
static NSFileManager* s_fileManager = [NSFileManager defaultManager];
|
|
|
|
|
2013-07-12 06:24:23 +08:00
|
|
|
FileUtils* FileUtils::getInstance()
|
2013-02-01 11:20:46 +08:00
|
|
|
{
|
2013-12-18 17:47:20 +08:00
|
|
|
if (s_sharedFileUtils == nullptr)
|
2013-02-01 11:20:46 +08:00
|
|
|
{
|
2014-08-28 07:31:57 +08:00
|
|
|
s_sharedFileUtils = new (std::nothrow) FileUtilsApple();
|
2013-07-23 20:44:08 +08:00
|
|
|
if(!s_sharedFileUtils->init())
|
|
|
|
{
|
|
|
|
delete s_sharedFileUtils;
|
2013-12-18 17:47:20 +08:00
|
|
|
s_sharedFileUtils = nullptr;
|
2013-09-07 06:33:28 +08:00
|
|
|
CCLOG("ERROR: Could not init CCFileUtilsApple");
|
2013-07-23 20:44:08 +08:00
|
|
|
}
|
2013-02-01 11:20:46 +08:00
|
|
|
}
|
|
|
|
return s_sharedFileUtils;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2013-09-07 13:52:23 +08:00
|
|
|
std::string FileUtilsApple::getWritablePath() const
|
2013-02-01 11:20:46 +08:00
|
|
|
{
|
2018-09-17 10:47:41 +08:00
|
|
|
DECLARE_GUARD;
|
2015-02-28 18:21:57 +08:00
|
|
|
if (_writablePath.length())
|
|
|
|
{
|
|
|
|
return _writablePath;
|
|
|
|
}
|
|
|
|
|
2013-02-01 11:20:46 +08:00
|
|
|
// save to document folder
|
2013-02-06 18:11:27 +08:00
|
|
|
NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
|
2013-02-01 11:20:46 +08:00
|
|
|
NSString *documentsDirectory = [paths objectAtIndex:0];
|
|
|
|
std::string strRet = [documentsDirectory UTF8String];
|
|
|
|
strRet.append("/");
|
|
|
|
return strRet;
|
|
|
|
}
|
|
|
|
|
2014-04-02 15:35:09 +08:00
|
|
|
bool FileUtilsApple::isFileExistInternal(const std::string& filePath) const
|
2013-02-01 11:20:46 +08:00
|
|
|
{
|
2014-04-02 15:35:09 +08:00
|
|
|
if (filePath.empty())
|
2013-04-25 21:51:13 +08:00
|
|
|
{
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2013-12-18 17:47:20 +08:00
|
|
|
bool ret = false;
|
2014-07-24 18:56:59 +08:00
|
|
|
|
2013-12-18 17:47:20 +08:00
|
|
|
if (filePath[0] != '/')
|
2013-02-01 11:20:46 +08:00
|
|
|
{
|
2013-04-25 22:02:20 +08:00
|
|
|
std::string path;
|
2013-02-01 11:20:46 +08:00
|
|
|
std::string file;
|
2013-12-18 17:47:20 +08:00
|
|
|
size_t pos = filePath.find_last_of("/");
|
2013-02-01 11:20:46 +08:00
|
|
|
if (pos != std::string::npos)
|
|
|
|
{
|
2013-12-18 17:47:20 +08:00
|
|
|
file = filePath.substr(pos+1);
|
|
|
|
path = filePath.substr(0, pos+1);
|
2013-04-25 22:02:20 +08:00
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-12-18 17:47:20 +08:00
|
|
|
file = filePath;
|
2013-04-25 22:02:20 +08:00
|
|
|
}
|
2014-07-24 18:56:59 +08:00
|
|
|
|
2016-04-14 11:59:25 +08:00
|
|
|
NSString* fullpath = [pimpl_->getBundle() pathForResource:[NSString stringWithUTF8String:file.c_str()]
|
2013-04-25 22:02:20 +08:00
|
|
|
ofType:nil
|
|
|
|
inDirectory:[NSString stringWithUTF8String:path.c_str()]];
|
|
|
|
if (fullpath != nil) {
|
2013-12-18 17:47:20 +08:00
|
|
|
ret = true;
|
2013-02-01 11:20:46 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
// Search path is an absolute path.
|
2013-12-18 17:47:20 +08:00
|
|
|
if ([s_fileManager fileExistsAtPath:[NSString stringWithUTF8String:filePath.c_str()]]) {
|
|
|
|
ret = true;
|
2013-02-01 11:20:46 +08:00
|
|
|
}
|
|
|
|
}
|
2014-07-24 18:56:59 +08:00
|
|
|
|
2013-12-18 17:47:20 +08:00
|
|
|
return ret;
|
2013-02-01 11:20:46 +08:00
|
|
|
}
|
|
|
|
|
2015-07-13 17:06:01 +08:00
|
|
|
static int unlink_cb(const char *fpath, const struct stat *sb, int typeflag, struct FTW *ftwbuf)
|
2015-07-10 14:37:42 +08:00
|
|
|
{
|
2015-07-13 17:06:01 +08:00
|
|
|
auto ret = remove(fpath);
|
|
|
|
if (ret)
|
2015-07-10 14:37:42 +08:00
|
|
|
{
|
2015-07-13 17:06:01 +08:00
|
|
|
log("Fail to remove: %s ",fpath);
|
2015-07-10 14:37:42 +08:00
|
|
|
}
|
2016-03-29 21:39:16 +08:00
|
|
|
|
2015-07-13 17:06:01 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2018-09-17 10:47:41 +08:00
|
|
|
bool FileUtilsApple::removeDirectory(const std::string& path) const
|
2015-07-13 17:06:01 +08:00
|
|
|
{
|
2016-06-22 14:31:26 +08:00
|
|
|
if (path.empty())
|
2015-07-13 17:06:01 +08:00
|
|
|
{
|
2016-06-22 14:31:26 +08:00
|
|
|
CCLOGERROR("Fail to remove directory, path is empty!");
|
2015-07-13 17:06:01 +08:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (nftw(path.c_str(),unlink_cb, 64, FTW_DEPTH | FTW_PHYS))
|
|
|
|
return false;
|
|
|
|
else
|
|
|
|
return true;
|
2015-07-10 14:37:42 +08:00
|
|
|
}
|
|
|
|
|
2019-09-04 10:03:38 +08:00
|
|
|
std::string FileUtilsApple::getPathForDirectory(const std::string &dir, const std::string &resolutionDiretory, const std::string &searchPath) const
|
|
|
|
{
|
|
|
|
auto path = searchPath + resolutionDiretory + dir;
|
|
|
|
|
|
|
|
if(!path.empty() && path[path.length() -1] == '/') {
|
|
|
|
path.erase(path.end() - 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if(path[0] == '/')
|
|
|
|
{
|
|
|
|
BOOL isDir = false;
|
|
|
|
if([s_fileManager fileExistsAtPath:[NSString stringWithUTF8String:dir.c_str()]
|
|
|
|
isDirectory:&isDir]) {
|
|
|
|
return isDir ? path : "";
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
|
|
|
NSString *fullpath = [pimpl_->getBundle() pathForResource:[NSString stringWithUTF8String:path.c_str()]
|
|
|
|
ofType:nil];
|
|
|
|
if(fullpath != nil) {
|
|
|
|
return [fullpath UTF8String];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return "";
|
|
|
|
}
|
|
|
|
|
|
|
|
|
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
|
|
|
std::string FileUtilsApple::getFullPathForFilenameWithinDirectory(const std::string& directory, const std::string& filename) const
|
2013-02-01 11:20:46 +08:00
|
|
|
{
|
2013-12-18 17:47:20 +08:00
|
|
|
if (directory[0] != '/')
|
2013-02-01 11:20:46 +08:00
|
|
|
{
|
2016-04-14 11:59:25 +08:00
|
|
|
NSString* fullpath = [pimpl_->getBundle() pathForResource:[NSString stringWithUTF8String:filename.c_str()]
|
2013-02-01 11:20:46 +08:00
|
|
|
ofType:nil
|
2013-12-18 17:47:20 +08:00
|
|
|
inDirectory:[NSString stringWithUTF8String:directory.c_str()]];
|
2013-02-01 11:20:46 +08:00
|
|
|
if (fullpath != nil) {
|
|
|
|
return [fullpath UTF8String];
|
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
{
|
2013-12-18 17:47:20 +08:00
|
|
|
std::string fullPath = directory+filename;
|
2013-02-01 11:20:46 +08:00
|
|
|
// Search path is an absolute path.
|
|
|
|
if ([s_fileManager fileExistsAtPath:[NSString stringWithUTF8String:fullPath.c_str()]]) {
|
|
|
|
return fullPath;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return "";
|
|
|
|
}
|
|
|
|
|
2018-09-17 10:47:41 +08:00
|
|
|
ValueMap FileUtilsApple::getValueMapFromFile(const std::string& filename) const
|
2013-02-01 18:48:44 +08:00
|
|
|
{
|
2016-03-29 21:39:16 +08:00
|
|
|
auto d(FileUtils::getInstance()->getDataFromFile(filename));
|
|
|
|
return getValueMapFromData(reinterpret_cast<char*>(d.getBytes()), static_cast<int>(d.getSize()));
|
2013-02-01 18:48:44 +08:00
|
|
|
}
|
|
|
|
|
2018-09-17 10:47:41 +08:00
|
|
|
ValueMap FileUtilsApple::getValueMapFromData(const char* filedata, int filesize) const
|
2014-07-29 17:06:43 +08:00
|
|
|
{
|
|
|
|
NSData* file = [NSData dataWithBytes:filedata length:filesize];
|
|
|
|
NSPropertyListFormat format;
|
|
|
|
NSError* error;
|
|
|
|
NSDictionary* dict = [NSPropertyListSerialization propertyListWithData:file options:NSPropertyListImmutable format:&format error:&error];
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2014-07-29 17:06:43 +08:00
|
|
|
ValueMap ret;
|
2015-07-07 14:06:59 +08:00
|
|
|
|
2014-07-29 17:06:43 +08:00
|
|
|
if (dict != nil)
|
|
|
|
{
|
|
|
|
for (id key in [dict allKeys])
|
|
|
|
{
|
|
|
|
id value = [dict objectForKey:key];
|
2016-05-23 18:26:19 +08:00
|
|
|
addNSObjectToCCMap(key, value, ret);
|
2014-07-29 17:06:43 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2018-09-17 10:47:41 +08:00
|
|
|
bool FileUtilsApple::writeToFile(const ValueMap& dict, const std::string &fullPath) const
|
2013-04-13 16:55:24 +08:00
|
|
|
{
|
2015-07-07 14:06:59 +08:00
|
|
|
return writeValueMapToFile(dict, fullPath);
|
|
|
|
}
|
|
|
|
|
2018-09-17 10:47:41 +08:00
|
|
|
bool FileUtils::writeValueMapToFile(const ValueMap& dict, const std::string& fullPath) const
|
2015-07-07 14:06:59 +08:00
|
|
|
{
|
2016-06-10 13:52:35 +08:00
|
|
|
valueMapCompact(const_cast<ValueMap&>(dict));
|
2013-06-20 14:13:12 +08:00
|
|
|
//CCLOG("iOS||Mac Dictionary %d write to file %s", dict->_ID, fullPath.c_str());
|
2013-04-13 16:55:24 +08:00
|
|
|
NSMutableDictionary *nsDict = [NSMutableDictionary dictionary];
|
2016-03-29 21:39:16 +08:00
|
|
|
|
2016-10-27 15:10:24 +08:00
|
|
|
for (auto& iter : dict)
|
2013-04-13 16:55:24 +08:00
|
|
|
{
|
2016-10-27 15:10:24 +08:00
|
|
|
addCCValueToNSDictionary(iter.first, iter.second, nsDict);
|
2013-04-13 16:55:24 +08:00
|
|
|
}
|
2016-03-29 21:39:16 +08:00
|
|
|
|
2013-04-13 16:55:24 +08:00
|
|
|
NSString *file = [NSString stringWithUTF8String:fullPath.c_str()];
|
2013-04-16 12:38:53 +08:00
|
|
|
// do it atomically
|
2016-06-10 13:52:35 +08:00
|
|
|
return [nsDict writeToFile:file atomically:YES];
|
|
|
|
}
|
2016-03-29 21:39:16 +08:00
|
|
|
|
2018-09-17 10:47:41 +08:00
|
|
|
void FileUtilsApple::valueMapCompact(ValueMap& valueMap) const
|
2016-06-10 13:52:35 +08:00
|
|
|
{
|
|
|
|
auto itr = valueMap.begin();
|
|
|
|
while(itr != valueMap.end()){
|
|
|
|
auto vtype = itr->second.getType();
|
|
|
|
switch(vtype){
|
|
|
|
case Value::Type::NONE:{
|
|
|
|
itr = valueMap.erase(itr);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case Value::Type::MAP:{
|
|
|
|
valueMapCompact(itr->second.asValueMap());
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case Value::Type::VECTOR:{
|
|
|
|
valueVectorCompact(itr->second.asValueVector());
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2016-10-27 15:10:24 +08:00
|
|
|
++itr;
|
2016-06-10 13:52:35 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-09-17 10:47:41 +08:00
|
|
|
void FileUtilsApple::valueVectorCompact(ValueVector& valueVector) const
|
2016-06-10 13:52:35 +08:00
|
|
|
{
|
|
|
|
auto itr = valueVector.begin();
|
|
|
|
while(itr != valueVector.end()){
|
|
|
|
auto vtype = (*itr).getType();
|
|
|
|
switch(vtype){
|
|
|
|
case Value::Type::NONE:{
|
|
|
|
itr = valueVector.erase(itr);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case Value::Type::MAP:{
|
|
|
|
valueMapCompact((*itr).asValueMap());
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case Value::Type::VECTOR:{
|
|
|
|
valueVectorCompact((*itr).asValueVector());
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2016-10-27 15:10:24 +08:00
|
|
|
++itr;
|
2016-06-10 13:52:35 +08:00
|
|
|
}
|
2013-04-13 16:55:24 +08:00
|
|
|
}
|
|
|
|
|
2018-09-17 10:47:41 +08:00
|
|
|
bool FileUtils::writeValueVectorToFile(const ValueVector& vecData, const std::string& fullPath) const
|
2015-07-07 14:06:59 +08:00
|
|
|
{
|
|
|
|
NSString* path = [NSString stringWithUTF8String:fullPath.c_str()];
|
|
|
|
NSMutableArray* array = [NSMutableArray array];
|
2016-03-29 21:39:16 +08:00
|
|
|
|
2015-07-07 14:06:59 +08:00
|
|
|
for (const auto &e : vecData)
|
|
|
|
{
|
2016-05-23 18:26:19 +08:00
|
|
|
addCCValueToNSArray(e, array);
|
2015-07-07 14:06:59 +08:00
|
|
|
}
|
2016-03-29 21:39:16 +08:00
|
|
|
|
2015-07-07 14:06:59 +08:00
|
|
|
[array writeToFile:path atomically:YES];
|
2016-03-29 21:39:16 +08:00
|
|
|
|
2015-07-07 14:06:59 +08:00
|
|
|
return true;
|
|
|
|
}
|
2018-09-17 10:47:41 +08:00
|
|
|
ValueVector FileUtilsApple::getValueVectorFromFile(const std::string& filename) const
|
2013-02-01 18:48:44 +08:00
|
|
|
{
|
|
|
|
// NSString* pPath = [NSString stringWithUTF8String:pFileName];
|
|
|
|
// NSString* pathExtension= [pPath pathExtension];
|
|
|
|
// pPath = [pPath stringByDeletingPathExtension];
|
|
|
|
// pPath = [[NSBundle mainBundle] pathForResource:pPath ofType:pathExtension];
|
2013-06-20 14:13:12 +08:00
|
|
|
// fixing cannot read data using Array::createWithContentsOfFile
|
2013-09-07 13:52:23 +08:00
|
|
|
std::string fullPath = fullPathForFilename(filename);
|
2013-08-22 10:15:47 +08:00
|
|
|
NSString* path = [NSString stringWithUTF8String:fullPath.c_str()];
|
|
|
|
NSArray* array = [NSArray arrayWithContentsOfFile:path];
|
2014-07-24 18:56:59 +08:00
|
|
|
|
2013-12-04 17:46:57 +08:00
|
|
|
ValueVector ret;
|
2014-07-24 18:56:59 +08:00
|
|
|
|
2013-08-22 10:15:47 +08:00
|
|
|
for (id value in array)
|
|
|
|
{
|
2016-05-23 18:26:19 +08:00
|
|
|
addNSObjectToCCVector(value, ret);
|
2013-02-01 18:48:44 +08:00
|
|
|
}
|
2014-07-24 18:56:59 +08:00
|
|
|
|
2013-08-22 10:15:47 +08:00
|
|
|
return ret;
|
2013-02-01 18:48:44 +08:00
|
|
|
}
|
|
|
|
|
2018-09-17 10:47:41 +08:00
|
|
|
bool FileUtilsApple::createDirectory(const std::string& path) const
|
2016-04-18 17:52:20 +08:00
|
|
|
{
|
|
|
|
CCASSERT(!path.empty(), "Invalid path");
|
|
|
|
|
|
|
|
if (isDirectoryExist(path))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
NSError* error;
|
|
|
|
|
2016-04-19 15:17:31 +08:00
|
|
|
bool result = [s_fileManager createDirectoryAtPath:[NSString stringWithUTF8String:path.c_str()] withIntermediateDirectories:YES attributes:nil error:&error];
|
|
|
|
|
|
|
|
if(!result && error != nil)
|
|
|
|
{
|
|
|
|
CCLOGERROR("Fail to create directory \"%s\": %s", path.c_str(), [error.localizedDescription UTF8String]);
|
|
|
|
}
|
|
|
|
|
|
|
|
return result;
|
2016-04-18 17:52:20 +08:00
|
|
|
}
|
|
|
|
|
2013-02-01 11:20:46 +08:00
|
|
|
NS_CC_END
|