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

Merge pull request #14350 from xiaofeng11/v3_simfix 

Fix when start simulator in CocoStudio to run a scene, can not read the correct config.json on MacOSX
This commit is contained in:
xiaofeng11 2015-11-09 23:32:35 +08:00
parent c08b4a0f9d 3aeb5e0389
commit 0682832ed7
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tools/simulator/frameworks/runtime-src/proj.ios_mac/mac/SimulatorApp.mm
View File

@ -206,6 +206,7 @@ static void glfwDropFunc(GLFWwindow *window, int count, const char **files)
// set project directory as search root path
string solutionDir = tmpConfig.getProjectDir();
string spath = solutionDir;
if (!solutionDir.empty())
{
for (int i = 0; i < solutionDir.size(); ++i)
@ -215,6 +216,24 @@ static void glfwDropFunc(GLFWwindow *window, int count, const char **files)
solutionDir[i] = '/';
}
}
spath = solutionDir;
if (spath[spath.length() - 1] == '/') {
spath = spath.substr(0, spath.length() - 1);
}
string strExtention = FileUtils::getInstance()->getFileExtension(spath);
int pos = -1;
if(strExtention.compare(".csd") == 0)
{
pos = spath.rfind('/');
if(pos > 0)
spath = spath.substr(0, pos);
}
pos = spath.rfind('/');
if(pos > 0)
spath = spath.substr(0, pos+1);
FileUtils::getInstance()->addSearchPath(spath);
FileUtils::getInstance()->setDefaultResourceRootPath(solutionDir);
FileUtils::getInstance()->addSearchPath(solutionDir);
FileUtils::getInstance()->addSearchPath(tmpConfig.getProjectDir());
@ -226,7 +245,9 @@ static void glfwDropFunc(GLFWwindow *window, int count, const char **files)
// parse config.json
auto parser = ConfigParser::getInstance();
auto configPath = solutionDir.append(CONFIG_FILE);
auto configPath = spath.append(CONFIG_FILE);
if(!FileUtils::getInstance()->isFileExist(configPath))
configPath = solutionDir.append(CONFIG_FILE);
parser->readConfig(configPath);
// set information