From d5f14bc03790678f0d5d8bc3bd35a44609c5ac58 Mon Sep 17 00:00:00 2001 From: Marco Buono Date: Thu, 5 Sep 2024 13:00:43 -0300 Subject: [PATCH] fix(Blenvy-Blender): handling of `UVec2`, `UVec3` and `UVec4` as uint (#242) --- .../propGroups/conversions_from_prop_group.py | 6 +++--- tools/blenvy/add_ons/bevy_components/registry/registry.py | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/blenvy/add_ons/bevy_components/propGroups/conversions_from_prop_group.py b/tools/blenvy/add_ons/bevy_components/propGroups/conversions_from_prop_group.py index 75366b3..071658b 100644 --- a/tools/blenvy/add_ons/bevy_components/propGroups/conversions_from_prop_group.py +++ b/tools/blenvy/add_ons/bevy_components/propGroups/conversions_from_prop_group.py @@ -10,15 +10,15 @@ conversion_tables = { "glam::Vec2": lambda value: "Vec2(x:"+str(value[0])+ ", y:"+str(value[1])+")", "glam::DVec2": lambda value: "DVec2(x:"+str(value[0])+ ", y:"+str(value[1])+")", - "glam::UVec2": lambda value: "UVec2(x:"+str(value[0])+ ", y:"+str(value[1])+")", + "glam::UVec2": lambda value: "UVec2(x:"+str(int(value[0]))+ ", y:"+str(int(value[1]))+")", "glam::Vec3": lambda value: "Vec3(x:"+str(value[0])+ ", y:"+str(value[1])+ ", z:"+str(value[2])+")", "glam::Vec3A": lambda value: "Vec3A(x:"+str(value[0])+ ", y:"+str(value[1])+ ", z:"+str(value[2])+")", - "glam::UVec3": lambda value: "UVec3(x:"+str(value[0])+ ", y:"+str(value[1])+ ", z:"+str(value[2])+")", + "glam::UVec3": lambda value: "UVec3(x:"+str(int(value[0]))+ ", y:"+str(int(value[1]))+ ", z:"+str(int(value[2]))+")", "glam::Vec4": lambda value: "Vec4(x:"+str(value[0])+ ", y:"+str(value[1])+ ", z:"+str(value[2])+ ", w:"+str(value[3])+")", "glam::DVec4": lambda value: "DVec4(x:"+str(value[0])+ ", y:"+str(value[1])+ ", z:"+str(value[2])+ ", w:"+str(value[3])+")", - "glam::UVec4": lambda value: "UVec4(x:"+str(value[0])+ ", y:"+str(value[1])+ ", z:"+str(value[2])+ ", w:"+str(value[3])+")", + "glam::UVec4": lambda value: "UVec4(x:"+str(int(value[0]))+ ", y:"+str(int(value[1]))+ ", z:"+str(int(value[2]))+ ", w:"+str(int(value[3]))+")", "glam::Quat": lambda value: "Quat(x:"+str(value[0])+ ", y:"+str(value[1])+ ", z:"+str(value[2])+ ", w:"+str(value[3])+")", diff --git a/tools/blenvy/add_ons/bevy_components/registry/registry.py b/tools/blenvy/add_ons/bevy_components/registry/registry.py index ed236ec..11c7238 100644 --- a/tools/blenvy/add_ons/bevy_components/registry/registry.py +++ b/tools/blenvy/add_ons/bevy_components/registry/registry.py @@ -65,17 +65,17 @@ class ComponentsRegistry(PropertyGroup): "glam::Vec2": {"type": FloatVectorProperty, "presets": dict(size = 2) }, "glam::DVec2": {"type": FloatVectorProperty, "presets": dict(size = 2) }, - "glam::UVec2": {"type": FloatVectorProperty, "presets": dict(size = 2) }, + "glam::UVec2": {"type": IntVectorProperty, "presets": {"size": 2, "min": 0} }, "glam::Vec3": {"type": FloatVectorProperty, "presets": {"size":3} }, "glam::Vec3A":{"type": FloatVectorProperty, "presets": {"size":3} }, "glam::DVec3":{"type": FloatVectorProperty, "presets": {"size":3} }, - "glam::UVec3":{"type": FloatVectorProperty, "presets": {"size":3} }, + "glam::UVec3":{"type": IntVectorProperty, "presets": {"size":3, "min":0} }, "glam::Vec4": {"type": FloatVectorProperty, "presets": {"size":4} }, "glam::Vec4A": {"type": FloatVectorProperty, "presets": {"size":4} }, "glam::DVec4": {"type": FloatVectorProperty, "presets": {"size":4} }, - "glam::UVec4":{"type": FloatVectorProperty, "presets": {"size":4, "min":0.0} }, + "glam::UVec4":{"type": IntVectorProperty, "presets": {"size":4, "min":0} }, "glam::Quat": {"type": FloatVectorProperty, "presets": {"size":4} },