From 29b49991a27fcebdd5932078a3a27edfaae052cf Mon Sep 17 00:00:00 2001 From: Haroon Qureshi Date: Wed, 24 Jun 2026 02:17:24 -0700 Subject: [PATCH] Rename mjrf_getSamplerType to mjrf_getTextureSamplerType. PiperOrigin-RevId: 937193469 Change-Id: I56f856e257fa1cf99b643f794139ef85817a0bb9 --- include/mujoco/mjrfilament.h | 2 +- src/experimental/filament/compat/scene_geom_util.cc | 2 +- src/render/filament/mjrfilament.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/mujoco/mjrfilament.h b/include/mujoco/mjrfilament.h index 4b962c7f..1d976c71 100644 --- a/include/mujoco/mjrfilament.h +++ b/include/mujoco/mjrfilament.h @@ -219,7 +219,7 @@ int mjrf_getTextureWidth(const mjrfTexture* texture); int mjrf_getTextureHeight(const mjrfTexture* texture); // Returns the sampler type (mjrSamplerType) used by the texture. -int mjrf_getSamplerType(const mjrfTexture* texture); +int mjrf_getTextureSamplerType(const mjrfTexture* texture); // ## Meshes (mjrfMesh) // diff --git a/src/experimental/filament/compat/scene_geom_util.cc b/src/experimental/filament/compat/scene_geom_util.cc index 84ad6727..997ee92d 100644 --- a/src/experimental/filament/compat/scene_geom_util.cc +++ b/src/experimental/filament/compat/scene_geom_util.cc @@ -201,7 +201,7 @@ static void UpdateGeomMaterial(mjrfRenderable* renderable, const mjvGeom& geom, if (material.color_texture) { const bool tex_uniform = model->mat_texuniform[geom.matid]; - if (mjrf_getSamplerType(material.color_texture) == mjTEXTURE_2D) { + if (mjrf_getTextureSamplerType(material.color_texture) == mjTEXTURE_2D) { // For 2D textures, `tex_repeat` specifies how many times the texture // image is repeated. The `tex_uniform` flag determines if the repetition // is applied at in object space (false) or in world space (true). diff --git a/src/render/filament/mjrfilament.cc b/src/render/filament/mjrfilament.cc index 2125990c..d3c61304 100644 --- a/src/render/filament/mjrfilament.cc +++ b/src/render/filament/mjrfilament.cc @@ -193,7 +193,7 @@ int mjrf_getTextureHeight(const mjrfTexture* texture) { return mujoco::Texture::downcast(texture)->GetHeight(); } -int mjrf_getSamplerType(const mjrfTexture* texture) { +int mjrf_getTextureSamplerType(const mjrfTexture* texture) { return mujoco::Texture::downcast(texture)->GetSamplerType(); }