Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

KHR_texture_transform for NormalTexture/OcclusionTexture #394

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

KHR_texture_transform for NormalTexture/OcclusionTexture #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9bf1feb
KHR_texture_transform for NormalTexture/OcclusionTexture
apitenko Oct 30, 2023
53bc211
Merge branch 'main' into main
alteous Jan 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions gltf-json/src/extensions/material.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ use serde_derive::{Deserialize, Serialize};
#[cfg(feature = "extensions")]
use serde_json::{Map, Value};

#[cfg(feature = "KHR_texture_transform")]
use super::texture::TextureTransform;

/// The material appearance of a primitive.
#[derive(Clone, Debug, Default, Deserialize, Serialize, Validate)]
pub struct Material {
Expand Down Expand Up @@ -137,17 +140,43 @@ pub struct PbrSpecularGlossiness {
/// Defines the normal texture of a material.
#[derive(Clone, Debug, Default, Deserialize, Serialize, Validate)]
pub struct NormalTexture {
#[cfg(feature = "KHR_texture_transform")]
#[serde(
default,
rename = "KHR_texture_transform",
skip_serializing_if = "Option::is_none"
)]
pub texture_transform: Option<TextureTransform>,

#[cfg(feature = "extensions")]
#[serde(default, flatten)]
pub others: Map<String, Value>,

/// Optional application specific data.
#[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
#[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
pub extras: Extras,
}

/// Defines the occlusion texture of a material.
#[derive(Clone, Debug, Default, Deserialize, Serialize, Validate)]
pub struct OcclusionTexture {
#[cfg(feature = "KHR_texture_transform")]
#[serde(
default,
rename = "KHR_texture_transform",
skip_serializing_if = "Option::is_none"
)]
pub texture_transform: Option<TextureTransform>,

#[cfg(feature = "extensions")]
#[serde(default, flatten)]
pub others: Map<String, Value>,

/// Optional application specific data.
#[cfg_attr(feature = "extras", serde(skip_serializing_if = "Option::is_none"))]
#[cfg_attr(not(feature = "extras"), serde(skip_serializing))]
pub extras: Extras,
}

/// The diffuse factor of a material.
Expand Down
27 changes: 27 additions & 0 deletions src/material.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ pub use json::material::AlphaMode;
#[cfg(feature = "extensions")]
use serde_json::{Map, Value};

#[cfg(feature = "KHR_texture_transform")]
use crate::texture::TextureTransform;

lazy_static! {
static ref DEFAULT_MATERIAL: json::material::Material = Default::default();
}
Expand Down Expand Up @@ -630,6 +633,18 @@ impl<'a> NormalTexture<'a> {
pub fn extras(&self) -> &'a json::Extras {
&self.json.extras
}

/// Returns texture transform information
#[cfg(feature = "KHR_texture_transform")]
#[cfg_attr(docsrs, doc(cfg(feature = "KHR_texture_transform")))]
pub fn texture_transform(&self) -> Option<TextureTransform<'a>> {
self.json
.extensions
.as_ref()?
.texture_transform
.as_ref()
.map(TextureTransform::new)
}
}

/// Defines the occlusion texture of a material.
Expand Down Expand Up @@ -685,6 +700,18 @@ impl<'a> OcclusionTexture<'a> {
pub fn extras(&self) -> &'a json::Extras {
&self.json.extras
}

/// Returns texture transform information
#[cfg(feature = "KHR_texture_transform")]
#[cfg_attr(docsrs, doc(cfg(feature = "KHR_texture_transform")))]
pub fn texture_transform(&self) -> Option<TextureTransform<'a>> {
self.json
.extensions
.as_ref()?
.texture_transform
.as_ref()
.map(TextureTransform::new)
}
}

impl<'a> AsRef<texture::Texture<'a>> for NormalTexture<'a> {
Expand Down
Loading