Commit 24cea6fd authored by Lázár Bence Kis's avatar Lázár Bence Kis
Browse files

Merge inside submodule 'libraries': merge 'main' into 'xkis/refactor2.0' 

...and corresponding updates inside the application
parent b6e3196e

src/CMakeLists.txt

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ set(AGE_LIBRARIES_TO_USE 
    lfs

    math

    osi

    phx

    script

    utils

    )

age @ cfbaa182

Compare 38a95fa1 to cfbaa182
Original line number Diff line number Diff line 
Subproject commit 38a95fa1e4593de79adf7bc6ac6a62d2885b0f04
 
Subproject commit cfbaa18221444d8180c13503ffdb21f0b37f0a29

src/maker/src/presenter.cpp

+3 −2
Original line number Diff line number Diff line
@@ -346,7 +346,8 @@ void main() { 
    auto v = com::as<com::Reflection::ValueVEC3>(ptr);

    v->value.x = -1.5f;

    v->value.z = 1.5f;

    frame2->reflection()->functions().at("set_origin").code({ v });

    std::vector<com::Reflection::ValuePtr> args{ { v } };

    frame2->reflection()->functions().at("set_origin").code(args);

    

    gfx::object_system()->push_frame_back(test_box, frame2);
@@ -368,7 +369,7 @@ void main() { 
    auto& capsule = *gfx::object_system()->insert_object(

        { "game", "capsule_obj" },

        gfx::material_system()->insert_default_lit_material("capsule_material", { "maker" }, vec3{ 1.f, 0, 0 } ),

        gfx::buffer_generators()->insert_procedural_capsule_solid(1, 0.3f, 2, "capsule_buffer", { "game" })

        gfx::buffer_generators()->insert_procedural_capsule_solid(0.3f, 2, 2, "capsule_buffer", { "game" })

    );

    com::Frame* const caps_frame = root()->push_back<com::Folder>("capsule_folder")->push_back<com::Frame>();

    caps_frame->folder()->push_back<com::Link>(com::Frame::parent_link_file_name(), frame);