Add transparency toggle #9
Conversation
src/DDSPreview.py
Outdated
| @@ -328,7 +332,8 @@ def settings(self): | |||
| mobase.PluginSetting("background r", self.__tr("Red channel of background colour"), 0), | |||
| mobase.PluginSetting("background g", self.__tr("Green channel of background colour"), 0), | |||
| mobase.PluginSetting("background b", self.__tr("Blue channel of background colour"), 0), | |||
| mobase.PluginSetting("background a", self.__tr("Alpha channel of background colour"), 0)] | |||
| mobase.PluginSetting("background a", self.__tr("Alpha channel of background colour"), 0), | |||
| mobase.PluginSetting("transparency", self.__tr("If enabled, transparency will be displayed."), True)] | |||
There was a problem hiding this comment.
It'd be more technically accurate to refer to it as alpha rather than transparency or translucency. The whole reason this PR is necessary is that it's not always transparency data.
src/DDSPreview.py
Outdated
| @@ -151,9 +151,11 @@ | |||
| glVersionProfile.setVersion(2, 1) | |||
|
|
|||
| class DDSWidget(QOpenGLWidget): | |||
| def __init__(self, ddsFile, debugContext = False, parent = None, f = Qt.WindowFlags()): | |||
| def __init__(self, ddsPreview, ddsFile, debugContext = False, parent = None, f = Qt.WindowFlags()): | |||
There was a problem hiding this comment.
I'm not keen on creating a cyclic dependency between DDSWidget and DDSPreview. Technically, it's possible to find uses for a DDS widget other than the preview, so we might want to move it out of this plugin into a library and make the plugin depend on that library. You can break the cycle by creating a class that holds the current options which both the widget and preview plugin have a reference to an instance of.
|
It might be worth considering whether it's sensible to treat the alpha channel as something special here. In most image editors that expect to deal with textures, you can toggle channels individually, see specific ones together, and things like that. As an example, here's the manual for Blender's image editor: https://docs.blender.org/manual/en/latest/editors/image/introduction.html#header. Scroll to the Display Channels subheading (it won't let me link it directly). It lets you do extra stuff like view the alpha channel as greyscale, and that's likely to be useful, too. |
|
I have added a drop down menu to select which channels to display. I used the same options as Blender's image editor. The single color channels can look quite bad due to compression in the textures, so that's something to keep in mind when testing them. ImagesDrop down menu: Tool tip on hover: Gif of different channels: BC7 quick compression: BC7 slow compression: |
|
This is my first time doing shader stuff, but it seems to work. Edit: forgot to update the translation file, but I'll wait until the code is acceptable to avoid unnecessary changes |
src/DDSPreview.py
Outdated
|
|
||
| def flattenList(lst: Iterable): | ||
| tmp = [] | ||
| for e in lst: | ||
| if isinstance(e, Iterable): | ||
| tmp += flattenList(e) | ||
| elif isinstance(e, (int, float)): | ||
| tmp += [float(e)] | ||
| else: | ||
| raise ValueError("Can only set a matrix with numbers.") | ||
| return tmp | ||
|
|
||
| if isinstance(matrix, Iterable): | ||
| flattened = flattenList(matrix) | ||
| if len(flattened) != 16: | ||
| raise ValueError("Must provide exactly 16 values.") | ||
| matrix = QMatrix4x4(flattened) | ||
|
|
||
| if isinstance(matrix, QMatrix4x4): | ||
| self.channelMatrix = matrix | ||
| else: | ||
| raise TypeError(str(channels) + " is not a valid ColourChannels object.") | ||
| raise ValueError("Can only set a matrix with numbers.") |
There was a problem hiding this comment.
Can we not just do self.channelMatrix = QMatrix4x4(matrix) and let PyQt6/SIP handle any conversions? I don't think this lets everything that can be converted to a matrix through, and the extra supported stuff and error reporting probably aren't that useful. It's more obvious if it just accepts what people would expect it to accept, which is matrices.
There was a problem hiding this comment.
Yeah, that''s much better. Don't know why I made it so complicated.
Address ModOrganizer2/modorganizer#1714