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

prevent an issue in TinyRendererSetup example

Browse Source
This commit is contained in:
Erwin Coumans
2016-09-14 00:30:58 +01:00
parent 5e09b17baf
commit f9679bd594
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
examples/RenderingExamples/TinyRendererSetup.cpp
View File

@@ -53,6 +53,7 @@ struct TinyRendererSetupInternalData
m_animateRenderer(0) m_animateRenderer(0)
{ {
m_depthBuffer.resize(m_width*m_height); m_depthBuffer.resize(m_width*m_height);
// m_segmentationMaskBuffer.resize(m_width*m_height);
} }
void updateTransforms() void updateTransforms()
@@ -190,14 +191,19 @@ TinyRendererSetup::TinyRendererSetup(struct GUIHelperInterface* gui)
&m_internalData->m_segmentationMaskBuffer, &m_internalData->m_segmentationMaskBuffer,
m_internalData->m_renderObjects.size()); m_internalData->m_renderObjects.size());
meshData.m_gfxShape->m_scaling[0] = scaling[0];
meshData.m_gfxShape->m_scaling[1] = scaling[1];
meshData.m_gfxShape->m_scaling[2] = scaling[2];
const int* indices = &meshData.m_gfxShape->m_indices->at(0); const int* indices = &meshData.m_gfxShape->m_indices->at(0);
ob->registerMeshShape(&meshData.m_gfxShape->m_vertices->at(0).xyzw[0], ob->registerMeshShape(&meshData.m_gfxShape->m_vertices->at(0).xyzw[0],
meshData.m_gfxShape->m_numvertices, meshData.m_gfxShape->m_numvertices,
indices, indices,
meshData.m_gfxShape->m_numIndices,color, meshData.m_textureImage,meshData.m_textureWidth,meshData.m_textureHeight); meshData.m_gfxShape->m_numIndices,color, meshData.m_textureImage,meshData.m_textureWidth,meshData.m_textureHeight);
ob->m_localScaling.setValue(scaling[0],scaling[1],scaling[2]);
m_internalData->m_renderObjects.push_back(ob); m_internalData->m_renderObjects.push_back(ob);

2
examples/TinyRenderer/TinyRenderer.cpp
View File

@@ -268,7 +268,7 @@ void TinyRenderer::renderObject(TinyRenderObjectData& renderData)
renderData.m_viewportMatrix = viewport(0,0,width, height); renderData.m_viewportMatrix = viewport(0,0,width, height);
b3AlignedObjectArray<float>& zbuffer = renderData.m_depthBuffer; b3AlignedObjectArray<float>& zbuffer = renderData.m_depthBuffer;
int* segmentationMaskBufferPtr = renderData.m_segmentationMaskBufferPtr?&renderData.m_segmentationMaskBufferPtr->at(0):0; int* segmentationMaskBufferPtr = (renderData.m_segmentationMaskBufferPtr && renderData.m_segmentationMaskBufferPtr->size())?&renderData.m_segmentationMaskBufferPtr->at(0):0;
TGAImage& frame = renderData.m_rgbColorBuffer; TGAImage& frame = renderData.m_rgbColorBuffer;