diff --git a/headers/enduro2d/high/components/colliders.hpp b/headers/enduro2d/high/components/colliders.hpp index dffe1829..34a0a1be 100644 --- a/headers/enduro2d/high/components/colliders.hpp +++ b/headers/enduro2d/high/components/colliders.hpp @@ -17,24 +17,8 @@ namespace e2d::impl Collider& offset(const v2f& value) noexcept; [[nodiscard]] const v2f& offset() const noexcept; - - Collider& sensor(bool value) noexcept; - [[nodiscard]] bool sensor() const noexcept; - - Collider& density(f32 value) noexcept; - [[nodiscard]] f32 density() const noexcept; - - Collider& friction(f32 value) noexcept; - [[nodiscard]] f32 friction() const noexcept; - - Collider& restitution(f32 value) noexcept; - [[nodiscard]] f32 restitution() const noexcept; private: v2f offset_ = v2f::zero(); - bool sensor_ = false; - f32 density_ = 1.f; - f32 friction_ = 0.2f; - f32 restitution_ = 0.f; }; } @@ -166,50 +150,6 @@ namespace e2d::impl const v2f& collider_base::offset() const noexcept { return offset_; } - - template < typename Collider > - Collider& collider_base::sensor(bool value) noexcept { - sensor_ = value; - return static_cast(*this); - } - - template < typename Collider > - bool collider_base::sensor() const noexcept { - return sensor_; - } - - template < typename Collider > - Collider& collider_base::density(f32 value) noexcept { - density_ = math::max(0.f, value); - return static_cast(*this); - } - - template < typename Collider > - f32 collider_base::density() const noexcept { - return density_; - } - - template < typename Collider > - Collider& collider_base::friction(f32 value) noexcept { - friction_ = value; - return static_cast(*this); - } - - template < typename Collider > - f32 collider_base::friction() const noexcept { - return friction_; - } - - template < typename Collider > - Collider& collider_base::restitution(f32 value) noexcept { - restitution_ = value; - return static_cast(*this); - } - - template < typename Collider > - f32 collider_base::restitution() const noexcept { - return restitution_; - } } namespace e2d diff --git a/samples/bin/library/scripts/emmy/components/colliders.lua b/samples/bin/library/scripts/emmy/components/colliders.lua index 7a55c66d..1d2035fe 100644 --- a/samples/bin/library/scripts/emmy/components/colliders.lua +++ b/samples/bin/library/scripts/emmy/components/colliders.lua @@ -10,19 +10,7 @@ local rect_collider = { size = v2f.unit(), ---@type v2f - offset = v2f.zero(), - - ---@type boolean - sensor = false, - - ---@type number - density = 1.0, - - ---@type number - friction = 0.2, - - ---@type number - restitution = 0.0 + offset = v2f.zero() } ---@overload fun(self: rect_collider) @@ -48,19 +36,7 @@ local circle_collider = { radius = 1.0, ---@type v2f - offset = v2f.zero(), - - ---@type boolean - sensor = false, - - ---@type number - density = 1.0, - - ---@type number - friction = 0.2, - - ---@type number - restitution = 0.0 + offset = v2f.zero() } ---@overload fun(self: circle_collider) @@ -90,19 +66,7 @@ local polygon_collider = { v2f.new(-0.5, 0.5)}, ---@type v2f - offset = v2f.zero(), - - ---@type boolean - sensor = false, - - ---@type number - density = 1.0, - - ---@type number - friction = 0.2, - - ---@type number - restitution = 0.0 + offset = v2f.zero() } ---@overload fun(self: polygon_collider) diff --git a/samples/bin/library/scripts/sample_08/sample_08.lua b/samples/bin/library/scripts/sample_08/sample_08.lua index 77e7b474..e9927629 100644 --- a/samples/bin/library/scripts/sample_08/sample_08.lua +++ b/samples/bin/library/scripts/sample_08/sample_08.lua @@ -11,7 +11,7 @@ end ---@param go gobject ---@param type string ----@param event touchable_input_evt | touchable_mouse_evt +---@param event touchable_base_evt | touchable_mouse_evt function M:on_event(go, type, event) if type == "touchable.mouse_evt" then the_debug:trace(string.format( diff --git a/sources/enduro2d/high/bindings/high_binds/components/colliders_binds.cpp b/sources/enduro2d/high/bindings/high_binds/components/colliders_binds.cpp index 3c37c1e9..d53c94cf 100644 --- a/sources/enduro2d/high/bindings/high_binds/components/colliders_binds.cpp +++ b/sources/enduro2d/high/bindings/high_binds/components/colliders_binds.cpp @@ -66,38 +66,6 @@ namespace }, [](gcomponent& c, const v2f& v){ c->offset(v); - }), - - "sensor", sol::property( - [](const gcomponent& c) -> bool { - return c->sensor(); - }, - [](gcomponent& c, bool v){ - c->sensor(v); - }), - - "density", sol::property( - [](const gcomponent& c) -> f32 { - return c->density(); - }, - [](gcomponent& c, f32 v){ - c->density(v); - }), - - "friction", sol::property( - [](const gcomponent& c) -> f32 { - return c->friction(); - }, - [](gcomponent& c, f32 v){ - c->friction(v); - }), - - "restitution", sol::property( - [](const gcomponent& c) -> f32 { - return c->restitution(); - }, - [](gcomponent& c, f32 v){ - c->restitution(v); }) ); } @@ -154,38 +122,6 @@ namespace }, [](gcomponent& c, const v2f& v){ c->offset(v); - }), - - "sensor", sol::property( - [](const gcomponent& c) -> bool { - return c->sensor(); - }, - [](gcomponent& c, bool v){ - c->sensor(v); - }), - - "density", sol::property( - [](const gcomponent& c) -> f32 { - return c->density(); - }, - [](gcomponent& c, f32 v){ - c->density(v); - }), - - "friction", sol::property( - [](const gcomponent& c) -> f32 { - return c->friction(); - }, - [](gcomponent& c, f32 v){ - c->friction(v); - }), - - "restitution", sol::property( - [](const gcomponent& c) -> f32 { - return c->restitution(); - }, - [](gcomponent& c, f32 v){ - c->restitution(v); }) ); } @@ -242,38 +178,6 @@ namespace }, [](gcomponent& c, const v2f& v){ c->offset(v); - }), - - "sensor", sol::property( - [](const gcomponent& c) -> bool { - return c->sensor(); - }, - [](gcomponent& c, bool v){ - c->sensor(v); - }), - - "density", sol::property( - [](const gcomponent& c) -> f32 { - return c->density(); - }, - [](gcomponent& c, f32 v){ - c->density(v); - }), - - "friction", sol::property( - [](const gcomponent& c) -> f32 { - return c->friction(); - }, - [](gcomponent& c, f32 v){ - c->friction(v); - }), - - "restitution", sol::property( - [](const gcomponent& c) -> f32 { - return c->restitution(); - }, - [](gcomponent& c, f32 v){ - c->restitution(v); }) ); } diff --git a/sources/enduro2d/high/components/colliders.cpp b/sources/enduro2d/high/components/colliders.cpp index 3613e3fd..73678956 100644 --- a/sources/enduro2d/high/components/colliders.cpp +++ b/sources/enduro2d/high/components/colliders.cpp @@ -24,42 +24,6 @@ namespace component.offset(offset); } - if ( ctx.root.HasMember("sensor") ) { - bool sensor = component.sensor(); - if ( !json_utils::try_parse_value(ctx.root["sensor"], sensor) ) { - the().error("COLLIDER_BASE: Incorrect formatting of 'sensor' property"); - return false; - } - component.sensor(sensor); - } - - if ( ctx.root.HasMember("density") ) { - f32 density = component.density(); - if ( !json_utils::try_parse_value(ctx.root["density"], density) ) { - the().error("COLLIDER_BASE: Incorrect formatting of 'density' property"); - return false; - } - component.density(density); - } - - if ( ctx.root.HasMember("friction") ) { - f32 friction = component.friction(); - if ( !json_utils::try_parse_value(ctx.root["friction"], friction) ) { - the().error("COLLIDER_BASE: Incorrect formatting of 'friction' property"); - return false; - } - component.friction(friction); - } - - if ( ctx.root.HasMember("restitution") ) { - f32 restitution = component.restitution(); - if ( !json_utils::try_parse_value(ctx.root["restitution"], restitution) ) { - the().error("COLLIDER_BASE: Incorrect formatting of 'restitution' property"); - return false; - } - component.restitution(restitution); - } - return true; } @@ -70,30 +34,6 @@ namespace { c.offset(offset); } - - if ( bool sensor = c.sensor(); - ImGui::Checkbox("sensor", &sensor) ) - { - c.sensor(sensor); - } - - if ( f32 density = c.density(); - ImGui::DragFloat("density", &density, 0.01f) ) - { - c.density(density); - } - - if ( f32 friction = c.friction(); - ImGui::DragFloat("friction", &friction, 0.01f) ) - { - c.friction(friction); - } - - if ( f32 restitution = c.restitution(); - ImGui::DragFloat("restitution", &restitution, 0.01f) ) - { - c.restitution(restitution); - } } } @@ -105,11 +45,7 @@ namespace e2d "additionalProperties" : false, "properties" : { "size" : { "$ref": "#/common_definitions/v2" }, - "offset" : { "$ref": "#/common_definitions/v2" }, - "sensor" : { "type" : "boolean" }, - "density" : { "type" : "number" }, - "friction" : { "type" : "number" }, - "restitution" : { "type" : "number" } + "offset" : { "$ref": "#/common_definitions/v2" } } })json"; @@ -147,11 +83,7 @@ namespace e2d "additionalProperties" : false, "properties" : { "radius" : { "type" : "number" }, - "offset" : { "$ref": "#/common_definitions/v2" }, - "sensor" : { "type" : "boolean" }, - "density" : { "type" : "number" }, - "friction" : { "type" : "number" }, - "restitution" : { "type" : "number" } + "offset" : { "$ref": "#/common_definitions/v2" } } })json"; @@ -188,11 +120,7 @@ namespace e2d "additionalProperties" : false, "properties" : { "points" : { "$ref": "#/definitions/points" }, - "offset" : { "$ref": "#/common_definitions/v2" }, - "sensor" : { "type" : "boolean" }, - "density" : { "type" : "number" }, - "friction" : { "type" : "number" }, - "restitution" : { "type" : "number" } + "offset" : { "$ref": "#/common_definitions/v2" } }, "definitions" : { "points" : {