add basic test texture

This commit is contained in:
erwin coumans
2014-01-17 22:19:12 -08:00
parent 1a507cca52
commit ec4292ad75
9 changed files with 80 additions and 59 deletions

View File

@@ -4,9 +4,9 @@
#include "Bullet3OpenCL/Initialize/b3OpenCLUtils.h"
#include "OpenGLWindow/ShapeData.h"
#include "OpenGLWindow/GLInstancingRenderer.h"
#include "OpenGLWindow/OpenGLInclude.h"
bool gAllowCpuOpenCL = false;
#include "stb_image/stb_image.h"
GpuDemo::GpuDemo()
:m_clData(0)
{
@@ -121,4 +121,11 @@ int GpuDemo::registerGraphicsSphereShape(const ConstructionInfo& ci, float radiu
}
}
return graphicsShapeIndex;
}
}
unsigned char* GpuDemo::loadImage(const char* fileName, int& width, int& height, int& n)
{
unsigned char *data = stbi_load(fileName, &width, &height, &n, 0);
return data;
}