From 53c5073749d1f61fd5eccd827b1efd1369f6c5f3 Mon Sep 17 00:00:00 2001 From: Patrick Dulebohn Date: Fri, 20 Aug 2021 09:56:16 -0400 Subject: [PATCH] Add new Plasma Material properties and UI Start of Plasma Material Panel additions --- korman/exporter/material.py | 2 +- korman/properties/__init__.py | 2 ++ korman/properties/prop_material.py | 28 ++++++++++++++++++++++ korman/ui/__init__.py | 1 + korman/ui/ui_material.py | 38 ++++++++++++++++++++++++++++++ 5 files changed, 70 insertions(+), 1 deletion(-) create mode 100644 korman/properties/prop_material.py create mode 100644 korman/ui/ui_material.py diff --git a/korman/exporter/material.py b/korman/exporter/material.py index 36feec2..4f7b4d8 100644 --- a/korman/exporter/material.py +++ b/korman/exporter/material.py @@ -1401,7 +1401,7 @@ class MaterialConverter: state = layer.state is_waveset = bo.plasma_modifiers.water_basic.enabled - if bo.data.show_double_sided: + if bm.plasma_material.plasma_double_sided: if is_waveset: self._report.warn("FORCING single sided--this is a waveset (are you insane?)") else: diff --git a/korman/properties/__init__.py b/korman/properties/__init__.py index 9980638..c249296 100644 --- a/korman/properties/__init__.py +++ b/korman/properties/__init__.py @@ -19,6 +19,7 @@ from .prop_anim import * from .prop_camera import * from .prop_image import * from .prop_lamp import * +from .prop_material import * from . import modifiers from .prop_object import * from .prop_scene import * @@ -32,6 +33,7 @@ def register(): bpy.types.Camera.plasma_camera = bpy.props.PointerProperty(type=PlasmaCamera) bpy.types.Image.plasma_image = bpy.props.PointerProperty(type=PlasmaImage) bpy.types.Lamp.plasma_lamp = bpy.props.PointerProperty(type=PlasmaLamp) + byp.types.Material.plasma_material = bpy.Props.PointerProperty(type=PlasmaMaterial) bpy.types.Object.plasma_net = bpy.props.PointerProperty(type=PlasmaNet) bpy.types.Object.plasma_object = bpy.props.PointerProperty(type=PlasmaObject) bpy.types.Scene.plasma_scene = bpy.props.PointerProperty(type=PlasmaScene) diff --git a/korman/properties/prop_material.py b/korman/properties/prop_material.py new file mode 100644 index 0000000..46f36a9 --- /dev/null +++ b/korman/properties/prop_material.py @@ -0,0 +1,28 @@ +# This file is part of Korman. +# +# Korman is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Korman is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Korman. If not, see . + +import bpy +from bpy.props import * + +from .. import idprops + +class PlasmaMaterial(bpy.types.PropertyGroup): + bl_name = "material.plasma_material" + + plasma_double_sided = BoolProperty(name="Double Sided", + description="Sets this material as double sided (formerly TWOSIDE)", + default=False) + + diff --git a/korman/ui/__init__.py b/korman/ui/__init__.py index d5a2ac6..92e54fa 100644 --- a/korman/ui/__init__.py +++ b/korman/ui/__init__.py @@ -18,6 +18,7 @@ from .ui_camera import * from .ui_image import * from .ui_lamp import * from .ui_list import * +from .ui_material import * from .ui_menus import * from .ui_modifiers import * from .ui_object import * diff --git a/korman/ui/ui_material.py b/korman/ui/ui_material.py new file mode 100644 index 0000000..0cdddef --- /dev/null +++ b/korman/ui/ui_material.py @@ -0,0 +1,38 @@ +# This file is part of Korman. +# +# Korman is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Korman is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Korman. If not, see . + +import bpy + +from . import ui_list + +class MaterialButtonsPanel: + bl_space_type = "PROPERTIES" + bl_region_type = "WINDOW" + bl_context = "material" + + +class PlasmaMaterialPanel(MaterialButtonsPanel, bpy.types.Panel): + bl_label = "Plasma Material Options" + + def draw(self, context): + material = context.material, getattr(context, "material_slot", None) + mat_props = material.plasma_material + layout = self.layout + + split = layout.split() + col = split.column() + sub = col.column() + col.prop(mat_props, "plasma_double_sided") +