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

apply mouse move multiplier

Browse Source
This commit is contained in:
erwincoumans
2019-03-03 11:35:30 -08:00
parent bd0501d3fc
commit 23dd0b50f9
1 changed files with 24 additions and 24 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) virtual void drawText(const char* txt, int posX, int posY)
{ {
float size = 1; float size = 1;
float colorRGBA[4] = {0, 0, 0, 1}; float colorRGBA[4] = { 0, 0, 0, 1 };
drawText(txt, posX, posY, size, colorRGBA); drawText(txt, posX, posY, size, colorRGBA);
} }
virtual void drawText(const char* txt, int posX, int posY, float size) 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); drawText(txt, posX, posY, size, colorRGBA);
} }
virtual void drawText(const char* txt, int posX, int posY, float size, float colorRGBA[4]) = 0; 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) if (m_middleMouseButton)
{ {
cameraTargetPosition += cameraUp * yDelta * 0.01; cameraTargetPosition += cameraUp * yDelta *m_mouseMoveMultiplier* 0.01;
b3Vector3 fwd = cameraTargetPosition - cameraPosition; b3Vector3 fwd = cameraTargetPosition - cameraPosition;
b3Vector3 side = cameraUp.cross(fwd); b3Vector3 side = cameraUp.cross(fwd);
side.normalize(); side.normalize();
cameraTargetPosition += side * xDelta * 0.01; cameraTargetPosition += side * xDelta *m_mouseMoveMultiplier* 0.01;
} }
if (m_rightMouseButton) if (m_rightMouseButton)
{ {
cameraDistance -= xDelta * 0.01f; cameraDistance -= xDelta * m_mouseMoveMultiplier*0.01f;
cameraDistance -= yDelta * 0.01f; cameraDistance -= yDelta * m_mouseMoveMultiplier*0.01f;
if (cameraDistance < 1) if (cameraDistance < 1)
cameraDistance = 1; cameraDistance = 1;
if (cameraDistance > 1000) if (cameraDistance > 1000)
@@ -251,7 +251,7 @@ struct CommonGraphicsApp
float cameraDistance = camera->getCameraDistance(); float cameraDistance = camera->getCameraDistance();
if (deltay < 0 || cameraDistance > 1) if (deltay < 0 || cameraDistance > 1)
{ {
cameraDistance -= deltay * 0.01f; cameraDistance -= deltay*m_wheelMultiplier * 0.01f;
if (cameraDistance < 1) if (cameraDistance < 1)
cameraDistance = 1; cameraDistance = 1;
camera->setCameraDistance(cameraDistance); camera->setCameraDistance(cameraDistance);