Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #15448 from xpol/remove-internal-use-of-getFileData 

Fixes deprecated warnings
This commit is contained in:
minggo 2016-04-19 10:24:49 +08:00
parent 5f6f35fb91 bd263d6be4
commit b182adae5b
2 changed files with 111 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

202
cocos/editor-support/cocostudio/CCDataReaderHelper.cpp
View File

@ -140,6 +140,16 @@ static const char *COLOR_INFO = "color";
static const char *CONFIG_FILE_PATH = "config_file_path";
static const char *CONTENT_SCALE = "content_scale";
static std::string readFileContent(const std::string& filename, bool binary) {
auto fs = FileUtils::getInstance();
if (binary) {
Data data(fs->getDataFromFile(filename));
return std::string((const char*)data.getBytes(), data.getSize());
}
return fs->getStringFromFile(filename);
};
namespace cocostudio {
@ -300,16 +310,11 @@ void DataReaderHelper::addDataFromFile(const std::string& filePath)
// Read content from file
std::string fullPath = FileUtils::getInstance()->fullPathForFilename(filePath);
bool isbinaryfilesrc = fileExtension == ".csb";
std::string filemode("r");
if(isbinaryfilesrc)
filemode += "b";
ssize_t filesize;
_dataReaderHelper->_getFileMutex.lock();
unsigned char *pBytes = FileUtils::getInstance()->getFileData(filePath, filemode.c_str(), &filesize);
std::string contentStr((const char*)pBytes,filesize);
std::string contentStr(readFileContent(fullPath, isbinaryfilesrc));
_dataReaderHelper->_getFileMutex.unlock();
DataInfo dataInfo;
dataInfo.filename = filePath;
dataInfo.asyncStruct = nullptr;
@ -326,8 +331,6 @@ void DataReaderHelper::addDataFromFile(const std::string& filePath)
{
DataReaderHelper::addDataFromBinaryCache(contentStr.c_str(),&dataInfo);
}
free(pBytes);
}
void DataReaderHelper::addDataFromFileAsync(const std::string& imagePath, const std::string& plistPath, const std::string& filePath, Ref *target, SEL_SCHEDULE selector)
@ -409,26 +412,13 @@ void DataReaderHelper::addDataFromFileAsync(const std::string& imagePath, const
std::string fullPath = FileUtils::getInstance()->fullPathForFilename(filePath);
bool isbinaryfilesrc = fileExtension == ".csb";
std::string filereadmode("r");
if (isbinaryfilesrc) {
filereadmode += "b";
}
ssize_t size;
// FIXME: fileContent is being leaked
// This getFileData only read exportJson file, it takes only a little time.
// This only read exportJson file, it takes only a little time.
// Large image files are loaded in DataReaderHelper::addDataFromJsonCache(dataInfo) asynchronously.
_dataReaderHelper->_getFileMutex.lock();
unsigned char *pBytes = FileUtils::getInstance()->getFileData(fullPath, filereadmode.c_str(), &size);
data->fileContent.assign(readFileContent(fullPath, isbinaryfilesrc));
_dataReaderHelper->_getFileMutex.unlock();
Data bytecpy;
bytecpy.copy(pBytes, size);
data->fileContent = std::string((const char*)bytecpy.getBytes(), size);
// fix memory leak for v3.3
free(pBytes);
if (fileExtension == ".xml")
{
data->configType = DragonBone_XML;
@ -919,7 +909,7 @@ MovementBoneData *DataReaderHelper::decodeMovementBone(tinyxml2::XMLElement *mov
frameXML = frameXML->NextSiblingElement(FRAME);
}
//! Change rotation range from (-180 -- 180) to (-infinity -- infinity)
auto frames = movBoneData->frameList;
for (long j = movBoneData->frameList.size() - 1; j >= 0; j--)
@ -1225,12 +1215,12 @@ void DataReaderHelper::addDataFromJsonCache(const std::string& fileContent, Data
{
rapidjson::Document json;
rapidjson::StringStream stream(fileContent.c_str());
if (fileContent.size() >= 3) {
// Skip BOM if exists
const unsigned char* c = (const unsigned char *)fileContent.c_str();
unsigned bom = c[0] | (c[1] << 8) | (c[2] << 16);
if (bom == 0xBFBBEF) // UTF8 BOM
{
stream.Take();
@ -1238,19 +1228,19 @@ void DataReaderHelper::addDataFromJsonCache(const std::string& fileContent, Data
stream.Take();
}
}
json.ParseStream<0>(stream);
if (json.HasParseError()) {
CCLOG("GetParseError %d\n",json.GetParseError());
}
dataInfo->contentScale = DICTOOL->getFloatValue_json(json, CONTENT_SCALE, 1.0f);
// Decode armatures
int length = DICTOOL->getArrayCount_json(json, ARMATURE_DATA);
for (int i = 0; i < length; i++)
{
const rapidjson::Value &armatureDic = DICTOOL->getSubDictionary_json(json, ARMATURE_DATA, i);
const rapidjson::Value &armatureDic = DICTOOL->getSubDictionary_json(json, ARMATURE_DATA, i);
ArmatureData *armatureData = decodeArmature(armatureDic, dataInfo);
if (dataInfo->asyncStruct)
@ -1285,7 +1275,7 @@ void DataReaderHelper::addDataFromJsonCache(const std::string& fileContent, Data
}
// Decode textures
length = DICTOOL->getArrayCount_json(json, TEXTURE_DATA);
length = DICTOOL->getArrayCount_json(json, TEXTURE_DATA);
for (int i = 0; i < length; i++)
{
const rapidjson::Value &textureDic = DICTOOL->getSubDictionary_json(json, TEXTURE_DATA, i);
@ -1353,7 +1343,7 @@ ArmatureData *DataReaderHelper::decodeArmature(const rapidjson::Value& json, Dat
dataInfo->cocoStudioVersion = armatureData->dataVersion = DICTOOL->getFloatValue_json(json, VERSION, 0.1f);
int length = DICTOOL->getArrayCount_json(json, BONE_DATA, 0);
int length = DICTOOL->getArrayCount_json(json, BONE_DATA, 0);
for (int i = 0; i < length; i++)
{
const rapidjson::Value &dic = DICTOOL->getSubDictionary_json(json, BONE_DATA, i); //json[BONE_DATA][i];
@ -1389,7 +1379,7 @@ BoneData *DataReaderHelper::decodeBone(const rapidjson::Value& json, DataInfo *d
for (int i = 0; i < length; i++)
{
const rapidjson::Value &dic = DICTOOL->getSubDictionary_json(json, DISPLAY_DATA, i);
const rapidjson::Value &dic = DICTOOL->getSubDictionary_json(json, DISPLAY_DATA, i);
DisplayData *displayData = decodeBoneDisplay(dic, dataInfo);
boneData->addDisplayData(displayData);
displayData->release();
@ -1646,7 +1636,7 @@ FrameData *DataReaderHelper::decodeFrame(const rapidjson::Value& json, DataInfo
{
frameData->easingParams = new (std::nothrow) float[length];
frameData->easingParamNumber = length;
for (int i = 0; i < length; i++)
{
frameData->easingParams[i] = DICTOOL->getFloatValueFromArray_json(json, A_EASING_PARAM, i);
@ -1725,11 +1715,11 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json,
{
if (DICTOOL->checkObjectExist_json(json, 0))
{
const rapidjson::Value &colorDic = DICTOOL->getSubDictionary_json(json, 0);
node->a = DICTOOL->getIntValue_json(colorDic, A_ALPHA, 255);
node->r = DICTOOL->getIntValue_json(colorDic, A_RED, 255);
node->g = DICTOOL->getIntValue_json(colorDic, A_GREEN, 255);
node->b = DICTOOL->getIntValue_json(colorDic, A_BLUE, 255);
const rapidjson::Value &colorDic = DICTOOL->getSubDictionary_json(json, 0);
node->a = DICTOOL->getIntValue_json(colorDic, A_ALPHA, 255);
node->r = DICTOOL->getIntValue_json(colorDic, A_RED, 255);
node->g = DICTOOL->getIntValue_json(colorDic, A_GREEN, 255);
node->b = DICTOOL->getIntValue_json(colorDic, A_BLUE, 255);
node->isUseColorInfo = true;
}
@ -1739,17 +1729,17 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json,
if (DICTOOL->checkObjectExist_json(json, COLOR_INFO))
{
const rapidjson::Value &colorDic = DICTOOL->getSubDictionary_json(json, COLOR_INFO); //json.getSubDictionary(COLOR_INFO);
node->a = DICTOOL->getIntValue_json(colorDic, A_ALPHA, 255);
node->r = DICTOOL->getIntValue_json(colorDic, A_RED, 255);
node->g = DICTOOL->getIntValue_json(colorDic, A_GREEN, 255);
node->b = DICTOOL->getIntValue_json(colorDic, A_BLUE, 255);
node->a = DICTOOL->getIntValue_json(colorDic, A_ALPHA, 255);
node->r = DICTOOL->getIntValue_json(colorDic, A_RED, 255);
node->g = DICTOOL->getIntValue_json(colorDic, A_GREEN, 255);
node->b = DICTOOL->getIntValue_json(colorDic, A_BLUE, 255);
node->isUseColorInfo = true;
}
}
}
void DataReaderHelper::addDataFromBinaryCache(const char *fileContent, DataInfo *dataInfo)
{
CocoLoader tCocoLoader;
@ -1761,7 +1751,7 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json,
{
stExpCocoNode *tpChildArray = tpRootCocoNode->GetChildArray(&tCocoLoader);
int nCount = tpRootCocoNode->GetChildNum();
dataInfo->contentScale = 1.0f;
int length = 0;
std::string key;
@ -1855,10 +1845,10 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json,
CCLOG("load CONFIG_FILE_PATH error.");
return;
}
std::string filePath = path;
filePath = filePath.erase(filePath.find_last_of("."));
if (dataInfo->asyncStruct)
{
dataInfo->configFileQueue.push(filePath);
@ -1867,7 +1857,7 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json,
{
std::string plistPath = filePath + ".plist";
std::string pngPath = filePath + ".png";
ArmatureDataManager::getInstance()->addSpriteFrameFromFile((dataInfo->baseFilePath + plistPath), (dataInfo->baseFilePath + pngPath), dataInfo->filename);
}
}
@ -1876,7 +1866,7 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json,
}
}
}
ArmatureData* DataReaderHelper::decodeArmature(CocoLoader *cocoLoader, stExpCocoNode *cocoNode, DataInfo *dataInfo)
{
ArmatureData *armatureData = new (std::nothrow) ArmatureData();
@ -1887,10 +1877,10 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json,
{
armatureData->name = name;
}
float version = utils::atof(pAramtureDataArray[1].GetValue(cocoLoader));
dataInfo->cocoStudioVersion = armatureData->dataVersion = version; //DICTOOL->getFloatValue_json(json, VERSION, 0.1f);
int length = pAramtureDataArray[3].GetChildNum(); //DICTOOL->getArrayCount_json(json, BONE_DATA, 0);
stExpCocoNode *pBoneChildren = pAramtureDataArray[3].GetChildArray(cocoLoader);
stExpCocoNode* child;
@ -1902,17 +1892,17 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json,
armatureData->addBoneData(boneData);
boneData->release();
}
return armatureData;
}
BoneData* DataReaderHelper::decodeBone(CocoLoader *cocoLoader, stExpCocoNode *cocoNode, DataInfo *dataInfo)
{
BoneData *boneData = new (std::nothrow) BoneData();
boneData->init();
decodeNode(boneData, cocoLoader, cocoNode, dataInfo);
int length = cocoNode->GetChildNum();
stExpCocoNode *pBoneChildren = cocoNode->GetChildArray(cocoLoader);
stExpCocoNode* child;
@ -1953,16 +1943,16 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json,
}
}
}
return boneData;
}
DisplayData* DataReaderHelper::decodeBoneDisplay(CocoLoader *cocoLoader, stExpCocoNode *cocoNode, DataInfo *dataInfo)
{
stExpCocoNode* children = cocoNode->GetChildArray(cocoLoader);
stExpCocoNode* child = &children[1];
const char *str = nullptr;
std::string key = child->GetName(cocoLoader);
str = child->GetValue(cocoLoader);
DisplayData *displayData = nullptr;
@ -1970,14 +1960,14 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json,
{
str = child->GetValue(cocoLoader);
DisplayType displayType = (DisplayType)(atoi(str));
int length = 0;
switch (displayType)
{
case CS_DISPLAY_SPRITE:
{
displayData = new (std::nothrow) SpriteDisplayData();
const char *name = children[0].GetValue(cocoLoader);
if(name != nullptr)
{
@ -2021,18 +2011,18 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json,
sdd->skinData.skewY = utils::atof(str);
}
}
sdd->skinData.x *= dataInfo->contentScale;
sdd->skinData.y *= dataInfo->contentScale;
}
}
}
break;
case CS_DISPLAY_ARMATURE:
{
displayData = new (std::nothrow) ArmatureDisplayData();
const char *name = cocoNode[0].GetValue(cocoLoader);
if(name != nullptr)
{
@ -2069,18 +2059,18 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json,
break;
default:
displayData = new (std::nothrow) SpriteDisplayData();
break;
}
displayData->displayType = displayType;
}
return displayData;
}
AnimationData* DataReaderHelper::decodeAnimation(CocoLoader *cocoLoader, stExpCocoNode *cocoNode, DataInfo *dataInfo)
{
AnimationData *aniData = new (std::nothrow) AnimationData();
int length = cocoNode->GetChildNum();
stExpCocoNode *pAnimationData = cocoNode->GetChildArray(cocoLoader);
const char *str = nullptr;
@ -2118,10 +2108,10 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json,
{
MovementData *movementData = new (std::nothrow) MovementData();
movementData->scale = 1.0f;
int length = cocoNode->GetChildNum();
stExpCocoNode *pMoveDataArray = cocoNode->GetChildArray(cocoLoader);
const char *str = nullptr;
std::string key;
stExpCocoNode* child;
@ -2203,12 +2193,12 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json,
}
return movementData;
}
MovementBoneData* DataReaderHelper::decodeMovementBone(CocoLoader *cocoLoader, stExpCocoNode *cocoNode, DataInfo *dataInfo)
{
MovementBoneData *movementBoneData = new (std::nothrow) MovementBoneData();
movementBoneData->init();
int length = cocoNode->GetChildNum();
stExpCocoNode *pMovementBoneDataArray = cocoNode->GetChildArray(cocoLoader);
stExpCocoNode* movebonechild;
@ -2241,7 +2231,7 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json,
FrameData *frameData = decodeFrame(cocoLoader, &pFrameDataArray[ii], dataInfo);
movementBoneData->addFrameData(frameData);
frameData->release();
if (dataInfo->cocoStudioVersion < VERSION_COMBINED)
{
frameData->frameID = movementBoneData->duration;
@ -2250,15 +2240,15 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json,
}
}
}
const ssize_t framesizemusone = movementBoneData->frameList.size()-1;
if (dataInfo->cocoStudioVersion < VERSION_CHANGE_ROTATION_RANGE)
{
//! Change rotation range from (-180 -- 180) to (-infinity -- infinity)
cocos2d::Vector<FrameData*> frames =movementBoneData->frameList;
ssize_t imusone =0;
ssize_t i =0;
for (i = framesizemusone; i >= 0; i--)
@ -2268,12 +2258,12 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json,
imusone = i-1;
float difSkewX = frames.at(i)->skewX - frames.at(imusone)->skewX;
float difSkewY = frames.at(i)->skewY - frames.at(imusone)->skewY;
if (difSkewX < -M_PI || difSkewX > M_PI)
{
frames.at(imusone)->skewX = difSkewX < 0 ? frames.at(imusone)->skewX - 2 * M_PI : frames.at(imusone)->skewX + 2 * M_PI;
}
if (difSkewY < -M_PI || difSkewY > M_PI)
{
frames.at(imusone)->skewY = difSkewY < 0 ? frames.at(imusone)->skewY - 2 * M_PI : frames.at(imusone)->skewY + 2 * M_PI;
@ -2281,8 +2271,8 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json,
}
}
}
if (dataInfo->cocoStudioVersion < VERSION_COMBINED)
{
if (movementBoneData->frameList.size() > 0)
@ -2293,16 +2283,16 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json,
frameData->frameID = movementBoneData->duration;
}
}
return movementBoneData;
}
FrameData* DataReaderHelper::decodeFrame(CocoLoader *cocoLoader, stExpCocoNode *cocoNode, DataInfo *dataInfo)
{
FrameData *frameData = new (std::nothrow) FrameData();
decodeNode(frameData, cocoLoader, cocoNode, dataInfo);
int length = cocoNode->GetChildNum();
stExpCocoNode *pFrameDataArray = cocoNode->GetChildArray(cocoLoader);
const char *str = nullptr;
@ -2322,7 +2312,7 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json,
{
if(str != nullptr)
{
frameData->displayIndex = atoi(str);
frameData->displayIndex = atoi(str);
}
}
else if (key.compare(A_BLEND_SRC) == 0)
@ -2346,7 +2336,7 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json,
{
if (strcmp("1", str) != 0)
{
frameData->isTween = false;
frameData->isTween = false;
}
}
}
@ -2394,23 +2384,23 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json,
}
}
}
}
}
return frameData;
}
TextureData* DataReaderHelper::decodeTexture(CocoLoader *cocoLoader, stExpCocoNode *cocoNode)
{
TextureData *textureData = new (std::nothrow) TextureData();
textureData->init();
if(cocoNode == nullptr)
{
return textureData;
}
int length = cocoNode->GetChildNum();
stExpCocoNode *pTextureDataArray = cocoNode->GetChildArray(cocoLoader);
const char *str = nullptr;
@ -2467,12 +2457,12 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json,
}
return textureData;
}
ContourData* DataReaderHelper::decodeContour(CocoLoader *cocoLoader, stExpCocoNode *cocoNode)
{
ContourData *contourData = new (std::nothrow) ContourData();
contourData->init();
int length = cocoNode->GetChildNum();
stExpCocoNode *verTexPointArray = cocoNode->GetChildArray(cocoLoader);
const char *str = nullptr;
@ -2497,13 +2487,13 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json,
}
return contourData;
}
void DataReaderHelper::decodeNode(BaseData *node, CocoLoader *cocoLoader, stExpCocoNode* cocoNode, DataInfo *dataInfo)
{
int length = cocoNode->GetChildNum();
stExpCocoNode *NodeArray = cocoNode->GetChildArray(cocoLoader);
const char *str = nullptr;
bool isVersionL = dataInfo->cocoStudioVersion < VERSION_COLOR_READING;
stExpCocoNode* child;
for (int i = 0; i < length; ++i)
@ -2548,41 +2538,41 @@ void DataReaderHelper::decodeNode(BaseData *node, const rapidjson::Value& json,
if(child->GetChildNum() == 4)
{
stExpCocoNode *ChildArray = child->GetChildArray(cocoLoader);
node->a = atoi(ChildArray[0].GetValue(cocoLoader));
node->r = atoi(ChildArray[1].GetValue(cocoLoader));
node->g = atoi(ChildArray[2].GetValue(cocoLoader));
node->b = atoi(ChildArray[3].GetValue(cocoLoader));
}
}
node->isUseColorInfo = true;
}
}
}
if (isVersionL)
{
int colorcoount = NodeArray[0].GetChildNum();
if(colorcoount>0)
{
if (NodeArray[0].GetType(cocoLoader) == rapidjson::kObjectType)
{
if(NodeArray[0].GetChildNum() == 4)
{
stExpCocoNode *ChildArray = NodeArray[0].GetChildArray(cocoLoader);
node->a = atoi(ChildArray[0].GetValue(cocoLoader));
node->r = atoi(ChildArray[1].GetValue(cocoLoader));
node->g = atoi(ChildArray[2].GetValue(cocoLoader));
node->b = atoi(ChildArray[3].GetValue(cocoLoader));
}
}
node->isUseColorInfo = true;
}
}

31
cocos/scripting/lua-bindings/manual/Cocos2dxLuaLoader.cpp
View File

@ -38,7 +38,7 @@ extern "C"
{
static const std::string BYTECODE_FILE_EXT = ".luac";
static const std::string NOT_BYTECODE_FILE_EXT = ".lua";
std::string filename(luaL_checkstring(L, 1));
size_t pos = filename.rfind(BYTECODE_FILE_EXT);
if (pos != std::string::npos)
@ -53,27 +53,26 @@ extern "C"
filename = filename.substr(0, pos);
}
}
pos = filename.find_first_of(".");
while (pos != std::string::npos)
{
filename.replace(pos, 1, "/");
pos = filename.find_first_of(".");
}
// search file in package.path
unsigned char* chunk = nullptr;
ssize_t chunkSize = 0;
Data chunk;
std::string chunkName;
FileUtils* utils = FileUtils::getInstance();
lua_getglobal(L, "package");
lua_getfield(L, -1, "path");
std::string searchpath(lua_tostring(L, -1));
lua_pop(L, 1);
size_t begin = 0;
size_t next = searchpath.find_first_of(";", 0);
do
{
if (next == std::string::npos)
@ -83,12 +82,12 @@ extern "C"
{
prefix = prefix.substr(2);
}
pos = prefix.find("?.lua");
chunkName = prefix.substr(0, pos) + filename + BYTECODE_FILE_EXT;
if (utils->isFileExist(chunkName))
{
chunk = utils->getFileData(chunkName.c_str(), "rb", &chunkSize);
chunk = utils->getDataFromFile(chunkName);
break;
}
else
@ -96,27 +95,27 @@ extern "C"
chunkName = prefix.substr(0, pos) + filename + NOT_BYTECODE_FILE_EXT;
if (utils->isFileExist(chunkName))
{
chunk = utils->getFileData(chunkName.c_str(), "rb", &chunkSize);
chunk = utils->getDataFromFile(chunkName);
break;
}
}
begin = next + 1;
next = searchpath.find_first_of(";", begin);
} while (begin < (int)searchpath.length());
if (chunk)
if (chunk.getSize() > 0)
{
LuaStack* stack = LuaEngine::getInstance()->getLuaStack();
stack->luaLoadBuffer(L, (char*)chunk, (int)chunkSize, chunkName.c_str());
free(chunk);
stack->luaLoadBuffer(L, reinterpret_cast<const char*>(chunk.getBytes()),
static_cast<int>(chunk.getSize()), chunkName.c_str());
}
else
{
CCLOG("can not get file data of %s", chunkName.c_str());
return 0;
}
return 1;
}
}