CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Do not display invalid shaders

Browse Source 
Signed-off-by: Trial97 <alexandru.tripon97@gmail.com>
This commit is contained in:
Trial97 2023-09-25 22:33:36 +03:00
parent 0406e168e7
commit 86b47b3421
No known key found for this signature in database
GPG Key ID: 55EF5DA53DB36318
3 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
launcher/minecraft/mod/ShaderPack.cpp
View File

@ -22,7 +22,7 @@
#include "ShaderPack.h" #include "ShaderPack.h"
#include "minecraft/mod/tasks/LocalShaderPackParseTask.h" #include <QRegularExpression>
void ShaderPack::setPackFormat(ShaderPackFormat new_format) void ShaderPack::setPackFormat(ShaderPackFormat new_format)
{ {
@ -35,3 +35,8 @@ bool ShaderPack::valid() const
{ {
return m_pack_format != ShaderPackFormat::INVALID; return m_pack_format != ShaderPackFormat::INVALID;
} }
bool ShaderPack::applyFilter(QRegularExpression filter) const
{
return valid() && Resource::applyFilter(filter);
}

1
launcher/minecraft/mod/ShaderPack.h
View File

@ -54,6 +54,7 @@ class ShaderPack : public Resource {
void setPackFormat(ShaderPackFormat new_format); void setPackFormat(ShaderPackFormat new_format);
bool valid() const override; bool valid() const override;
[[nodiscard]] bool applyFilter(QRegularExpression filter) const override;
protected: protected:
mutable QMutex m_data_lock; mutable QMutex m_data_lock;

13
launcher/minecraft/mod/ShaderPackFolderModel.h
View File

@ -1,6 +1,9 @@
#pragma once #pragma once
#include "ResourceFolderModel.h" #include "ResourceFolderModel.h"
#include "minecraft/mod/ShaderPack.h"
#include "minecraft/mod/tasks/BasicFolderLoadTask.h"
#include "minecraft/mod/tasks/LocalShaderPackParseTask.h"
class ShaderPackFolderModel : public ResourceFolderModel { class ShaderPackFolderModel : public ResourceFolderModel {
Q_OBJECT Q_OBJECT
@ -9,4 +12,14 @@ class ShaderPackFolderModel : public ResourceFolderModel {
explicit ShaderPackFolderModel(const QString& dir, BaseInstance* instance) : ResourceFolderModel(QDir(dir), instance) {} explicit ShaderPackFolderModel(const QString& dir, BaseInstance* instance) : ResourceFolderModel(QDir(dir), instance) {}
virtual QString id() const override { return "shaderpacks"; } virtual QString id() const override { return "shaderpacks"; }
[[nodiscard]] Task* createUpdateTask() override
{
return new BasicFolderLoadTask(m_dir, [](QFileInfo const& entry) { return makeShared<ShaderPack>(entry); });
}
[[nodiscard]] Task* createParseTask(Resource& resource) override
{
return new LocalShaderPackParseTask(m_next_resolution_ticket, static_cast<ShaderPack&>(resource));
}
}; };