Commit 79720d55 authored by Lázár Bence Kis's avatar Lázár Bence Kis
Browse files

Uniform scaling renamed to avoid problems with overloaded functions in reflection

parent 8a984baf

com/include/com/frame.hpp

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ struct Frame final : public com::File 


    void set_frame(frame3 const& new_frame);

    void set_scale(vec3 const& scale);

    void set_scale(scalar uniform_scale) { set_scale(vec3{ uniform_scale }); }

    void set_uniform_scale(scalar const uniform_scale) { set_scale(vec3{ uniform_scale }); }

    void set_origin(vec3 const& p) { set_frame({ p, m_frame.rotation() }); }

    void set_rotation(quat const& q) { set_frame({ m_frame.origin(), q }); }

    void move_origin(vec3 const& u) { set_frame({ m_frame.origin() + u, m_frame.rotation() }); }

com/src/frame.cpp

+2 −2
Original line number Diff line number Diff line
@@ -162,9 +162,9 @@ void Frame::register_functions() 
        }});



    // void set_scale(scalar uniform_scale)

    com::Reflection::register_function(this, { "set_scale", {TypeID::FLOAT}, false,

    com::Reflection::register_function(this, { "set_uniform_scale", {TypeID::FLOAT}, false,

        [this](std::vector<ValuePtr>& params) -> void {

            set_scale(as<ValueFLOAT>(params.front())->value);

            set_uniform_scale(as<ValueFLOAT>(params.front())->value);

        }});



    // void set_origin(vec3 const& p)