Enable MPR by default
Add the contact point from MPR, in addition to SAT/clipping contacts. Added a new kernel to clear/reset the number of contacts in pairs (stored in the z component) Always sample unit sphere directions, if there are more edge-edge combinations than unit sphere directions (162 by default) Remember last running demo for Bullet 3 (and save it in a text file, Bullet Enable the testFileFracture.bullet in the Bullet2FileDemo
This commit is contained in:
@@ -7,7 +7,7 @@
|
||||
#include "BulletDemoEntries.h"
|
||||
|
||||
#define DEMO_SELECTION_COMBOBOX 13
|
||||
|
||||
const char* startFileName = "bulletDemo.txt";
|
||||
static SimpleOpenGL3App* app=0;
|
||||
static GwenUserInterface* gui = 0;
|
||||
static int sCurrentDemoIndex = 0;
|
||||
@@ -120,7 +120,7 @@ void MyComboBoxCallback(int comboId, const char* item)
|
||||
if (strcmp(item,allNames[i])==0)
|
||||
{
|
||||
selectDemo(i);
|
||||
saveCurrentDemoEntry(sCurrentDemoIndex);
|
||||
saveCurrentDemoEntry(sCurrentDemoIndex,startFileName);
|
||||
break;
|
||||
}
|
||||
}
|
||||
@@ -157,7 +157,7 @@ int main(int argc, char* argv[])
|
||||
allNames.push_back(allDemos[i].m_name);
|
||||
}
|
||||
|
||||
selectDemo(loadCurrentDemoEntry());
|
||||
selectDemo(loadCurrentDemoEntry(startFileName));
|
||||
gui->registerComboBox(DEMO_SELECTION_COMBOBOX,allNames.size(),&allNames[0],sCurrentDemoIndex);
|
||||
|
||||
//const char* names2[] = {"comboF", "comboG","comboH"};
|
||||
|
||||
Reference in New Issue
Block a user