Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

allow obsolete OpenGL2 drawer to render with z-up axis.

Browse Source
This commit is contained in:
erwincoumans
2016-11-12 11:59:40 -08:00
parent 7577c6d893
commit 9bad64fed9
7 changed files with 33 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
examples/Importers/ImportMJCFDemo/ImportMJCFSetup.cpp
View File

@@ -44,7 +44,7 @@ public:
};
btAlignedObjectArray<std::string> gFileNameArray;
static btAlignedObjectArray<std::string> gMCFJFileNameArray;
#define MAX_NUM_MOTORS 1024
@@ -94,7 +94,7 @@ ImportMJCFSetup::ImportMJCFSetup(struct GUIHelperInterface* helper, int option,
setFileName(fileName);
} else
{
gFileNameArray.clear();
gMCFJFileNameArray.clear();
@@ -112,26 +112,26 @@ ImportMJCFSetup::ImportMJCFSetup(struct GUIHelperInterface* helper, int option,
b3Printf("mjcf_files.txt entry %s",fileName);
if (result==1)
{
gFileNameArray.push_back(fileName);
gMCFJFileNameArray.push_back(fileName);
}
} while (result==1);
fclose(f);
}
if (gFileNameArray.size()==0)
if (gMCFJFileNameArray.size()==0)
{
gFileNameArray.push_back("quadruped/quadruped.mjcf");
gMCFJFileNameArray.push_back("quadruped/quadruped.mjcf");
}
int numFileNames = gFileNameArray.size();
int numFileNames = gMCFJFileNameArray.size();
if (count>=numFileNames)
{
count=0;
}
sprintf(m_fileName,"%s",gFileNameArray[count++].c_str());
sprintf(m_fileName,"%s",gMCFJFileNameArray[count++].c_str());
}
}