update xc3_model, texture layering improvements

Author: ScanMountGoat

CHANGELOG.md

@@ -10,9 +10,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Added field `layers` to `OutputAssignment`.
 * Added type `OutputLayerAssignment`.
 * Added field `color_layers` to `shader_database.ShaderProgram`.
+* Added fields `blend_mode` and `is_fresnel` to `OutputLayerAssignment`.
+* Added fields `blend_mode` and `is_fresnel` to `shader_database.TextureLayer`.
+* Added type `shader_database.LayerBlendMode`.
 
 ### Changed
 * Changed method `ChannelAssignment.textures` to `ChannelAssignment.texture` with a single texture assignment.
+* Combined fields `name` and `channel` for `shader_database.TextureLayer` to a single field `value` of type `shader_database.Dependency`.
 
 ## 0.8.0 - 2024-08-16
 ### Added

xc3_model_py/Cargo.toml

@@ -6,8 +6,8 @@ edition = "2021"
 readme = "../README.md"
 
 [dependencies]
-xc3_model = { git = "https://github.com/ScanMountGoat/xc3_lib", rev = "7a5df85" }
-xc3_lib = { git = "https://github.com/ScanMountGoat/xc3_lib", rev = "7a5df85" }
+xc3_model = { git = "https://github.com/ScanMountGoat/xc3_lib", rev = "4a021c6" }
+xc3_lib = { git = "https://github.com/ScanMountGoat/xc3_lib", rev = "4a021c6" }
 xc3_model_py_derive = { path = "../xc3_model_py_derive" }
 image_dds = "0.6.0"
 pyo3 = { version = "0.21.2", features = ["extension-module", "indexmap"] }

xc3_model_py/src/lib.rs

@@ -5,7 +5,7 @@ use glam::Mat4;
 use numpy::{IntoPyArray, PyArray, PyArrayMethods, PyReadonlyArrayDyn};
 use pyo3::{create_exception, exceptions::PyException, prelude::*, types::PyList};
 use rayon::prelude::*;
-use shader_database::{ShaderDatabase, ShaderProgram};
+use shader_database::{ShaderDatabase, ShaderProgram, LayerBlendMode};
 use vertex::ModelBuffers;
 use xc3_lib::dds::DdsExt;
 
@@ -968,6 +968,8 @@ pub struct OutputLayerAssignment {
     pub z: Option<ChannelAssignment>,
     pub w: Option<ChannelAssignment>,
     pub weight: Option<ChannelAssignment>,
+    pub blend_mode: LayerBlendMode,
+    pub is_fresnel: bool
 }
 
 #[pyclass]

xc3_model_py/src/shader_database.rs

@@ -5,7 +5,7 @@ use pyo3::{
 };
 use smol_str::SmolStr;
 
-use crate::{map_py::MapPy, map_py_wrapper_impl, py_exception};
+use crate::{map_py::MapPy, map_py_wrapper_impl, py_exception, python_enum};
 
 #[pyclass]
 #[derive(Debug, Clone)]
@@ -120,11 +120,21 @@ pub struct AttributeDependency {
 #[derive(Debug, Clone, MapPy)]
 #[map(xc3_model::shader_database::TextureLayer)]
 pub struct TextureLayer {
-    pub name: String,
-    pub channel: Option<char>,
+    pub value: Dependency,
     pub ratio: Option<Py<Dependency>>,
+    pub blend_mode: LayerBlendMode,
+    pub is_fresnel: bool,
 }
 
+python_enum!(
+    LayerBlendMode,
+    xc3_model::shader_database::LayerBlendMode,
+    Mix,
+    MixRatio,
+    Add,
+    AddNormal
+);
+
 // Workaround for representing Rust enums in Python.
 #[pymethods]
 impl Dependency {
@@ -197,6 +207,7 @@ pub fn shader_database(py: Python, module: &Bound<'_, PyModule>) -> PyResult<()>
     m.add_class::<TexCoordParams>()?;
     m.add_class::<AttributeDependency>()?;
     m.add_class::<TextureLayer>()?;
+    m.add_class::<LayerBlendMode>()?;
 
     module.add_submodule(&m)?;
     Ok(())

xc3_model_py/xc3_model_py/__init__.pyi

@@ -497,6 +497,8 @@ class OutputLayerAssignment:
     z: Optional[ChannelAssignment]
     w: Optional[ChannelAssignment]
     weight: Optional[ChannelAssignment]
+    blend_mode: shader_database.LayerBlendMode
+    is_fresnel: bool
 
 class ChannelAssignment:
     def texture(self) -> Optional[TextureAssignment]: ...

xc3_model_py/xc3_model_py/shader_database.pyi

@@ -1,4 +1,4 @@
-from typing import Optional, Tuple
+from typing import ClassVar, Optional, Tuple
 
 class ShaderDatabase:
     @staticmethod
@@ -54,6 +54,13 @@ class AttributeDependency:
     channels: str
 
 class TextureLayer:
-    name: str
-    channel: Optional[str]
+    value: Dependency
     ratio: Optional[Dependency]
+    blend_mode: LayerBlendMode
+    is_fresnel: bool
+
+class LayerBlendMode:
+    Mix: ClassVar[LayerBlendMode]
+    MixRatio: ClassVar[LayerBlendMode]
+    Add: ClassVar[LayerBlendMode]
+    AddNormal: ClassVar[LayerBlendMode]