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

a few compile/warning fixes

Browse Source
This commit is contained in:
Erwin Coumans
2017-07-01 10:01:55 -07:00
parent c17625a4d0
commit 9cf747b35b
4 changed files with 4 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/ExampleBrowser/OpenGLGuiHelper.cpp
View File

@@ -292,10 +292,10 @@ int OpenGLGuiHelper::registerTexture(const unsigned char* texels, int width, int
return textureId;
}
void OpenGLGuiHelper::changeTexture(int textureUniqueId, const unsigned char* texels, int width, int height)
void OpenGLGuiHelper::changeTexture(int textureUniqueId, const unsigned char* rgbTexels, int width, int height)
{
bool flipPixelsY = true;
m_data->m_glApp->m_renderer->updateTexture(textureUniqueId, texels,flipPixelsY);
m_data->m_glApp->m_renderer->updateTexture(textureUniqueId, rgbTexels,flipPixelsY);
}

4
examples/OpenGLWindow/GLInstancingRenderer.cpp
View File

@@ -1440,8 +1440,8 @@ void GLInstancingRenderer::updateCamera(int upAxis)
////#define STB_IMAGE_WRITE_IMPLEMENTATION
#include "third_party/stblib/stb_image_write.h"
//#define STB_IMAGE_WRITE_IMPLEMENTATION
#include "stb_image/stb_image_write.h"
void writeTextureToPng(int textureWidth, int textureHeight, const char* fileName, int numComponents)
{

5
examples/pybullet/pybullet.c
View File

@@ -4651,11 +4651,6 @@ static PyObject* pybullet_loadTexture(PyObject* self, PyObject* args, PyObject*
item = PyInt_FromLong(b3GetStatusTextureUniqueId(statusHandle));
return item;
}
else
{
PyErr_SetString(SpamError, "Error loading texture");
return NULL;
}
}
PyErr_SetString(SpamError, "Error loading texture");