Fixed mipmaps not enabled.
This commit is contained in:
@@ -236,7 +236,7 @@ lcTexture* lcPiecesLibrary::FindTexture(const char* TextureName, Project* Curren
|
|||||||
|
|
||||||
if (TextureFile.isFile())
|
if (TextureFile.isFile())
|
||||||
{
|
{
|
||||||
lcTexture* Texture = lcLoadTexture(TextureFile.absoluteFilePath(), LC_TEXTURE_WRAPU | LC_TEXTURE_WRAPV);
|
lcTexture* Texture = lcLoadTexture(TextureFile.absoluteFilePath(), LC_TEXTURE_MIPMAPS);
|
||||||
|
|
||||||
if (Texture)
|
if (Texture)
|
||||||
{
|
{
|
||||||
@@ -425,7 +425,7 @@ bool lcPiecesLibrary::OpenArchive(std::unique_ptr<lcFile> File, lcZipFileType Zi
|
|||||||
if ((ZipFileType == lcZipFileType::Official && !memcmp(Name, "LDRAW/PARTS/TEXTURES/", 21)) ||
|
if ((ZipFileType == lcZipFileType::Official && !memcmp(Name, "LDRAW/PARTS/TEXTURES/", 21)) ||
|
||||||
(ZipFileType == lcZipFileType::Unofficial && !memcmp(Name, "PARTS/TEXTURES/", 15)))
|
(ZipFileType == lcZipFileType::Unofficial && !memcmp(Name, "PARTS/TEXTURES/", 15)))
|
||||||
{
|
{
|
||||||
lcTexture* Texture = new lcTexture();
|
lcTexture* Texture = new lcTexture(LC_TEXTURE_MIPMAPS);
|
||||||
mTextures.push_back(Texture);
|
mTextures.push_back(Texture);
|
||||||
|
|
||||||
*Dst = 0;
|
*Dst = 0;
|
||||||
@@ -652,7 +652,7 @@ bool lcPiecesLibrary::OpenDirectory(const QDir& LibraryDir, bool ShowProgress)
|
|||||||
continue;
|
continue;
|
||||||
*Dst = 0;
|
*Dst = 0;
|
||||||
|
|
||||||
lcTexture* Texture = new lcTexture();
|
lcTexture* Texture = new lcTexture(LC_TEXTURE_MIPMAPS);
|
||||||
mTextures.push_back(Texture);
|
mTextures.push_back(Texture);
|
||||||
|
|
||||||
strncpy(Texture->mName, Name, sizeof(Texture->mName));
|
strncpy(Texture->mName, Name, sizeof(Texture->mName));
|
||||||
|
|||||||
@@ -32,11 +32,9 @@ void lcReleaseTexture(lcTexture* Texture)
|
|||||||
delete Texture;
|
delete Texture;
|
||||||
}
|
}
|
||||||
|
|
||||||
lcTexture::lcTexture()
|
lcTexture::lcTexture(int Flags)
|
||||||
|
: mFlags(Flags)
|
||||||
{
|
{
|
||||||
mTexture = 0;
|
|
||||||
mRefCount = 0;
|
|
||||||
mTemporary = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
lcTexture::~lcTexture()
|
lcTexture::~lcTexture()
|
||||||
|
|||||||
+5
-5
@@ -20,7 +20,7 @@
|
|||||||
class lcTexture
|
class lcTexture
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
lcTexture();
|
lcTexture(int Flags = 0);
|
||||||
~lcTexture();
|
~lcTexture();
|
||||||
|
|
||||||
lcTexture(const lcTexture&) = delete;
|
lcTexture(const lcTexture&) = delete;
|
||||||
@@ -89,16 +89,16 @@ public:
|
|||||||
int mHeight;
|
int mHeight;
|
||||||
char mName[LC_TEXTURE_NAME_LEN];
|
char mName[LC_TEXTURE_NAME_LEN];
|
||||||
QString mFileName;
|
QString mFileName;
|
||||||
GLuint mTexture;
|
GLuint mTexture = 0;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
bool Load();
|
bool Load();
|
||||||
bool LoadImages();
|
bool LoadImages();
|
||||||
|
|
||||||
bool mTemporary;
|
bool mTemporary = false;
|
||||||
QAtomicInt mRefCount;
|
QAtomicInt mRefCount = 0;
|
||||||
std::vector<Image> mImages;
|
std::vector<Image> mImages;
|
||||||
int mFlags;
|
int mFlags = 0;
|
||||||
bool mLoading = false;
|
bool mLoading = false;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user