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

premake4 add option --enable_static_vr_plugin to statically link the VR sync plugin

Browse Source 
fix texture caching from previous commit (what happened there?)
This commit is contained in:
erwincoumans
2017-10-25 10:00:45 -07:00
parent 9385f36505
commit 6a9300809d
9 changed files with 71 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
examples/RenderingExamples/TinyRendererSetup.cpp
View File

@@ -169,9 +169,9 @@ TinyRendererSetup::TinyRendererSetup(struct GUIHelperInterface* gui)
{
int textureIndex = -1;
if (meshData.m_textureImage)
if (meshData.m_textureImage1)
{
textureIndex = m_guiHelper->getRenderInterface()->registerTexture(meshData.m_textureImage,meshData.m_textureWidth,meshData.m_textureHeight);
textureIndex = m_guiHelper->getRenderInterface()->registerTexture(meshData.m_textureImage1,meshData.m_textureWidth,meshData.m_textureHeight);
}
shapeId = m_guiHelper->getRenderInterface()->registerShape(&meshData.m_gfxShape->m_vertices->at(0).xyzw[0],
@@ -205,7 +205,7 @@ TinyRendererSetup::TinyRendererSetup(struct GUIHelperInterface* gui)
ob->registerMeshShape(&meshData.m_gfxShape->m_vertices->at(0).xyzw[0],
meshData.m_gfxShape->m_numvertices,
indices,
meshData.m_gfxShape->m_numIndices,color, meshData.m_textureImage,meshData.m_textureWidth,meshData.m_textureHeight);
meshData.m_gfxShape->m_numIndices,color, meshData.m_textureImage1,meshData.m_textureWidth,meshData.m_textureHeight);
ob->m_localScaling.setValue(scaling[0],scaling[1],scaling[2]);
@@ -214,7 +214,10 @@ TinyRendererSetup::TinyRendererSetup(struct GUIHelperInterface* gui)
delete meshData.m_gfxShape;
delete meshData.m_textureImage;
if (!meshData.m_isCached)
{
delete meshData.m_textureImage1;
}
}
}
}