History

Merge branch 'master' of https://github.com/highfidelity/hifi into external-glm

Stephen Birarda committed 12 years ago

Commit 90d4bbe2 parents 284cd6b a39b03184 files · +2904 −279Browse files

Showing the changes to interface/src/renderer/TextureCache.cpp (1 of 84 files). Show all

Unified · Split

interface/src/renderer/TextureCache.cpp+6−3
@@ -114,7 +114,8 @@ GLuint TextureCache::getFileTextureID(const QString& filename) { · 113 unmodified lines
114 glBindTexture(GL_TEXTURE_2D, id);114 glBindTexture(GL_TEXTURE_2D, id);
115 glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, image.width(), image.height(), 1,115 glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, image.width(), image.height(), 1,
116 GL_BGRA, GL_UNSIGNED_BYTE, image.constBits());116 GL_BGRA, GL_UNSIGNED_BYTE, image.constBits());
117 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);117 glGenerateMipmap(GL_TEXTURE_2D);
118 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
118 glBindTexture(GL_TEXTURE_2D, 0);119 glBindTexture(GL_TEXTURE_2D, 0);
119 120
120 _fileTextureIDs.insert(filename, id);121 _fileTextureIDs.insert(filename, id);
@@ -336,7 +337,8 @@ void NetworkTexture::setImage(const QImage& image, const glm::vec4& averageColor · 215 unmodified lines
336 glBindTexture(GL_TEXTURE_2D, getID());337 glBindTexture(GL_TEXTURE_2D, getID());
337 glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, image.width(), image.height(), 1,338 glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, image.width(), image.height(), 1,
338 GL_BGRA, GL_UNSIGNED_BYTE, image.constBits());339 GL_BGRA, GL_UNSIGNED_BYTE, image.constBits());
339 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);340 glGenerateMipmap(GL_TEXTURE_2D);
341 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
340 glBindTexture(GL_TEXTURE_2D, 0);342 glBindTexture(GL_TEXTURE_2D, 0);
341}343}
342 344
@@ -389,7 +391,8 @@ QSharedPointer<Texture> DilatableNetworkTexture::getDilatedTexture(float dilatio · 46 unmodified lines
389 glBindTexture(GL_TEXTURE_2D, texture->getID());391 glBindTexture(GL_TEXTURE_2D, texture->getID());
390 glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, dilatedImage.width(), dilatedImage.height(), 1,392 glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, dilatedImage.width(), dilatedImage.height(), 1,
391 GL_BGRA, GL_UNSIGNED_BYTE, dilatedImage.constBits());393 GL_BGRA, GL_UNSIGNED_BYTE, dilatedImage.constBits());
392 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);394 glGenerateMipmap(GL_TEXTURE_2D);
395 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
393 glBindTexture(GL_TEXTURE_2D, 0);396 glBindTexture(GL_TEXTURE_2D, 0);
394 }397 }
395 398