manolas
/
vcglib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- fixed compile time errors with qt 5.0

This commit is contained in:
granzuglia 2013-05-24 16:31:16 +00:00
parent 5f59f1fa5a
commit 6b7ca162ce
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wrap/gl/splatting_apss/splatrenderer.h
View File

@ -163,7 +163,7 @@ QString SplatRenderer<MeshType>::loadSource(const QString& func,const QString& f
QFile f(":/SplatRenderer/shaders/" + filename); QFile f(":/SplatRenderer/shaders/" + filename);
if (!f.open(QFile::ReadOnly)) if (!f.open(QFile::ReadOnly))
{ {
std::cerr << "failed to load shader file " << filename.toAscii().data() << "\n"; std::cerr << "failed to load shader file " << filename.toUtf8().data() << "\n";
return res; return res;
} }
else qDebug("Succesfully loaded shader func '%s' in file '%s'",qPrintable(func),qPrintable(filename)); else qDebug("Succesfully loaded shader func '%s' in file '%s'",qPrintable(func),qPrintable(filename));
@ -207,8 +207,8 @@ void SplatRenderer<MeshType>::configureShaders()
{ {
QString vsrc = shading + defines + mShaderSrcs[k*2+0]; QString vsrc = shading + defines + mShaderSrcs[k*2+0];
QString fsrc = shading + defines + mShaderSrcs[k*2+1]; QString fsrc = shading + defines + mShaderSrcs[k*2+1];
mShaders[k].SetSources(mShaderSrcs[k*2+0]!="" ? vsrc.toAscii().data() : 0, mShaders[k].SetSources(mShaderSrcs[k*2+0]!="" ? vsrc.toUtf8().data() : 0,
mShaderSrcs[k*2+1]!="" ? fsrc.toAscii().data() : 0); mShaderSrcs[k*2+1]!="" ? fsrc.toUtf8().data() : 0);
mShaders[k].prog.Link(); mShaders[k].prog.Link();
if (mShaderSrcs[k*2+0]!="") if (mShaderSrcs[k*2+0]!="")
{ {