From e9f486eebbc9e0c9aa9e59842d5b83857b5c6bca Mon Sep 17 00:00:00 2001 From: Erwin Coumans Date: Sun, 13 Sep 2020 18:32:52 -0700 Subject: [PATCH] narrow from double to float please --- .../plugins/eglPlugin/eglRendererVisualShapeConverter.cpp | 2 +- .../tinyRendererPlugin/TinyRendererVisualShapeConverter.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/SharedMemory/plugins/eglPlugin/eglRendererVisualShapeConverter.cpp b/examples/SharedMemory/plugins/eglPlugin/eglRendererVisualShapeConverter.cpp index 17d86c8eb..867050880 100644 --- a/examples/SharedMemory/plugins/eglPlugin/eglRendererVisualShapeConverter.cpp +++ b/examples/SharedMemory/plugins/eglPlugin/eglRendererVisualShapeConverter.cpp @@ -918,7 +918,7 @@ static btVector4 sColors[4] = int EGLRendererVisualShapeConverter::registerShapeAndInstance(const b3VisualShapeData& visualShape, const float* vertices, int numvertices, const int* indices, int numIndices, int primitiveType, int textureId, int orgGraphicsUniqueId, int bodyUniqueId, int linkIndex) { int uniqueId = orgGraphicsUniqueId; - float rgbaColor[4] = { visualShape.m_rgbaColor[0],visualShape.m_rgbaColor[1],visualShape.m_rgbaColor[2],visualShape.m_rgbaColor[3] }; + float rgbaColor[4] = { (float)visualShape.m_rgbaColor[0],(float)visualShape.m_rgbaColor[1], (float)visualShape.m_rgbaColor[2],(float)visualShape.m_rgbaColor[3] }; EGLRendererObjectArray** visualsPtr = m_data->m_swRenderInstances[uniqueId]; if (visualsPtr == 0) diff --git a/examples/SharedMemory/plugins/tinyRendererPlugin/TinyRendererVisualShapeConverter.cpp b/examples/SharedMemory/plugins/tinyRendererPlugin/TinyRendererVisualShapeConverter.cpp index ef68b9613..a192b7bbc 100644 --- a/examples/SharedMemory/plugins/tinyRendererPlugin/TinyRendererVisualShapeConverter.cpp +++ b/examples/SharedMemory/plugins/tinyRendererPlugin/TinyRendererVisualShapeConverter.cpp @@ -942,7 +942,7 @@ int TinyRendererVisualShapeConverter::registerShapeAndInstance( const b3VisualSh //those are primary soft bodies, possibly cloth, make them double-sided by default tinyObj->m_doubleSided = true; - float rgbaColor[4] = { visualShape.m_rgbaColor[0],visualShape.m_rgbaColor[1],visualShape.m_rgbaColor[2],visualShape.m_rgbaColor[3] }; + float rgbaColor[4] = { (float)visualShape.m_rgbaColor[0],(float)visualShape.m_rgbaColor[1],(float)visualShape.m_rgbaColor[2],(float)visualShape.m_rgbaColor[3] }; { B3_PROFILE("registerMeshShape");