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

Merge remote-tracking branch 'bp/master'

Browse Source
This commit is contained in:
Erwin Coumans
2019-07-31 17:54:29 -07:00
parent 10153b3b3a 789769eac9
commit 397767cb60
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2522,6 +2522,9 @@ class btCompoundShape* BulletMJCFImporter::convertLinkCollisionShapes(int linkIn
{ {
break; break;
} }
default:
{
}
} // switch geom } // switch geom

2
examples/SharedMemory/PhysicsClientC_API.cpp
View File

@@ -4142,7 +4142,7 @@ B3_SHARED_API void b3ComputeProjectionMatrix(float left, float right, float bott
B3_SHARED_API void b3ComputeProjectionMatrixFOV(float fov, float aspect, float nearVal, float farVal, float projectionMatrix[16]) B3_SHARED_API void b3ComputeProjectionMatrixFOV(float fov, float aspect, float nearVal, float farVal, float projectionMatrix[16])
{ {
float yScale = 1.0 / tan((3.141592538 / 180.0) * fov / 2); float yScale = 1.0 / tan((B3_PI / 180.0) * fov / 2);
float xScale = yScale / aspect; float xScale = yScale / aspect;
projectionMatrix[0 * 4 + 0] = xScale; projectionMatrix[0 * 4 + 0] = xScale;

2
examples/TinyRenderer/TinyRenderer.cpp
View File

@@ -396,7 +396,7 @@ void TinyRenderObjectData::createCube(float halfExtentsX, float halfExtentsY, fl
{ {
m_model->addVertex(halfExtentsX * cube_vertices_textured[i * 9], m_model->addVertex(halfExtentsX * cube_vertices_textured[i * 9],
halfExtentsY * cube_vertices_textured[i * 9 + 1], halfExtentsY * cube_vertices_textured[i * 9 + 1],
halfExtentsY * cube_vertices_textured[i * 9 + 2], halfExtentsZ * cube_vertices_textured[i * 9 + 2],
cube_vertices_textured[i * 9 + 4], cube_vertices_textured[i * 9 + 4],
cube_vertices_textured[i * 9 + 5], cube_vertices_textured[i * 9 + 5],
cube_vertices_textured[i * 9 + 6], cube_vertices_textured[i * 9 + 6],