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

Merge pull request #2137 from erwincoumans/master

Browse Source 
fix regression in MJCF import for TinyRenderer, apply mouse move multiplier
This commit is contained in:
erwincoumans
2019-03-03 12:16:10 -08:00
committed by GitHub
parent fb742e4530 d07c86842c
commit 0c1faf18b8
2 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
examples/CommonInterfaces/CommonGraphicsAppInterface.h
View File

@@ -126,13 +126,13 @@ struct CommonGraphicsApp
virtual void drawText(const char* txt, int posX, int posY)
{
float size = 1;
float colorRGBA[4] = {0, 0, 0, 1};
float colorRGBA[4] = { 0, 0, 0, 1 };
drawText(txt, posX, posY, size, colorRGBA);
}
virtual void drawText(const char* txt, int posX, int posY, float size)
{
float colorRGBA[4] = {0, 0, 0, 1};
float colorRGBA[4] = { 0, 0, 0, 1 };
drawText(txt, posX, posY, size, colorRGBA);
}
virtual void drawText(const char* txt, int posX, int posY, float size, float colorRGBA[4]) = 0;
@@ -204,17 +204,17 @@ struct CommonGraphicsApp
if (m_middleMouseButton)
{
cameraTargetPosition += cameraUp * yDelta * 0.01;
cameraTargetPosition += cameraUp * yDelta *m_mouseMoveMultiplier* 0.01;
b3Vector3 fwd = cameraTargetPosition - cameraPosition;
b3Vector3 side = cameraUp.cross(fwd);
side.normalize();
cameraTargetPosition += side * xDelta * 0.01;
cameraTargetPosition += side * xDelta *m_mouseMoveMultiplier* 0.01;
}
if (m_rightMouseButton)
{
cameraDistance -= xDelta * 0.01f;
cameraDistance -= yDelta * 0.01f;
cameraDistance -= xDelta * m_mouseMoveMultiplier*0.01f;
cameraDistance -= yDelta * m_mouseMoveMultiplier*0.01f;
if (cameraDistance < 1)
cameraDistance = 1;
if (cameraDistance > 1000)
@@ -251,7 +251,7 @@ struct CommonGraphicsApp
float cameraDistance = camera->getCameraDistance();
if (deltay < 0 || cameraDistance > 1)
{
cameraDistance -= deltay * 0.01f;
cameraDistance -= deltay*m_wheelMultiplier * 0.01f;
if (cameraDistance < 1)
cameraDistance = 1;
camera->setCameraDistance(cameraDistance);

3
examples/Importers/ImportMJCFDemo/BulletMJCFImporter.cpp
View File

@@ -2251,7 +2251,8 @@ void BulletMJCFImporter::convertLinkVisualShapes2(int linkIndex, int urdfIndex,
if (m_data->m_customVisualShapesConverter)
{
const UrdfLink* link = m_data->getLink(m_data->m_activeModel, urdfIndex);
m_data->m_customVisualShapesConverter->convertVisualShapes(linkIndex, pathPrefix, inertialFrame, link, 0, colObj->getBroadphaseHandle()->getUid(), objectIndex, m_data->m_fileIO);
int uid3 = m_data->m_customVisualShapesConverter->convertVisualShapes(linkIndex, pathPrefix, inertialFrame, link, 0, colObj->getBroadphaseHandle()->getUid(), objectIndex, m_data->m_fileIO);
colObj->setUserIndex3(uid3);
}
}