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

Merge pull request #1625 from erwincoumans/master

Browse Source 
explicit cast from double to float in TinyRendererVisualShapeConverte…
This commit is contained in:
erwincoumans
2018-04-04 17:01:11 -07:00
committed by GitHub
parent b4f038fd67 380e59be6a
commit 85b376867e
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/SharedMemory/plugins/tinyRendererPlugin/TinyRendererVisualShapeConverter.cpp
View File

@@ -593,7 +593,7 @@ void TinyRendererVisualShapeConverter::convertVisualShapes(
colorIndex &=3; colorIndex &=3;
btVector4 color; btVector4 color;
color = sColors[colorIndex]; color = sColors[colorIndex];
float rgbaColor[4] = {color[0],color[1],color[2],color[3]}; float rgbaColor[4] = {(float)color[0],(float)color[1],(float)color[2],(float)color[3]};
//if (colObj->getCollisionShape()->getShapeType()==STATIC_PLANE_PROXYTYPE) //if (colObj->getCollisionShape()->getShapeType()==STATIC_PLANE_PROXYTYPE)
//{ //{
// color.setValue(1,1,1,1); // color.setValue(1,1,1,1);
@@ -773,7 +773,7 @@ void TinyRendererVisualShapeConverter::changeRGBAColor(int bodyUniqueId, int lin
TinyRendererObjectArray** ptrptr = m_data->m_swRenderInstances.getAtIndex(i); TinyRendererObjectArray** ptrptr = m_data->m_swRenderInstances.getAtIndex(i);
if (ptrptr && *ptrptr) if (ptrptr && *ptrptr)
{ {
float rgba[4] = {rgbaColor[0], rgbaColor[1], rgbaColor[2], rgbaColor[3]}; float rgba[4] = {(float)rgbaColor[0], (float)rgbaColor[1], (float)rgbaColor[2], (float)rgbaColor[3]};
TinyRendererObjectArray* visuals = *ptrptr; TinyRendererObjectArray* visuals = *ptrptr;
if ((bodyUniqueId == visuals->m_objectUniqueId) && (linkIndex == visuals->m_linkIndex)) if ((bodyUniqueId == visuals->m_objectUniqueId) && (linkIndex == visuals->m_linkIndex))
{ {