diff --git a/Re-Abyss/app/components/Actor/Enemy/RollingTako/Builder.cpp b/Re-Abyss/app/components/Actor/Enemy/RollingTako/Builder.cpp index cac3ad42a..35003fd46 100644 --- a/Re-Abyss/app/components/Actor/Enemy/RollingTako/Builder.cpp +++ b/Re-Abyss/app/components/Actor/Enemy/RollingTako/Builder.cpp @@ -24,10 +24,10 @@ namespace abyss::Actor::Enemy::RollingTako { // 共通ビルド CommonBuilder::Build(pActor, BuildOption{} - .setInitPos(entity.pos) + .setInitPos(entity.footPos) .setForward(entity.forward) .setBodySize(Param::Base::Size) - .setBodyOffset(Param::Base::Pivot) + .setBodyAnchor(BodyAnchor::BottomCenter) .setInitHp(Param::Base::Hp) .setIsEnableRoomHit(true) .setVModelPresenter(pActor) diff --git a/Re-Abyss/app/params/Actor/Enemy/RollingTako/Param.hpp b/Re-Abyss/app/params/Actor/Enemy/RollingTako/Param.hpp index c4a4ebbb2..15f4bd4d5 100644 --- a/Re-Abyss/app/params/Actor/Enemy/RollingTako/Param.hpp +++ b/Re-Abyss/app/params/Actor/Enemy/RollingTako/Param.hpp @@ -1,4 +1,4 @@ -#pragma once +#pragma once #include #include @@ -8,12 +8,10 @@ namespace abyss::Actor::Enemy::RollingTako { [[TOML_BIND(Base::Hp, "Base.hp")]] [[TOML_BIND(Base::Size, "Base.size")]] - [[TOML_BIND(Base::Pivot, "Base.pivot")]] struct Base { inline static s3d::int32 Hp{ 6 }; inline static s3d::Vec2 Size{ 45, 45 }; - inline static s3d::Vec2 Pivot{ 0, 7.5 }; }; [[TOML_BIND(Wait::SearchRange, "Wait.searchRange")]] @@ -38,4 +36,4 @@ namespace abyss::Actor::Enemy::RollingTako inline static double RunAnimeTimeSec{ 0.2 }; }; }; -} \ No newline at end of file +} diff --git a/Re-Abyss/app/views/Actor/Enemy/RollingTako/RollingTakoVM.cpp b/Re-Abyss/app/views/Actor/Enemy/RollingTako/RollingTakoVM.cpp index 339fc4aa7..40f885c17 100644 --- a/Re-Abyss/app/views/Actor/Enemy/RollingTako/RollingTakoVM.cpp +++ b/Re-Abyss/app/views/Actor/Enemy/RollingTako/RollingTakoVM.cpp @@ -1,4 +1,4 @@ -#include +#include #include #include #include @@ -46,13 +46,13 @@ namespace abyss::Actor::Enemy::RollingTako bool isRight = m_forward.isRight(); int32 time = static_cast(Periodic::Square0_1(Param::View::WaitAnimeTimeSec, m_time)); auto tex = m_texture(60 * time, 0, 60, 60); - tex.mirrored(isRight).drawAt(m_pos, m_colorMul); + tex.mirrored(isRight).draw(Arg::bottomCenter = m_pos, m_colorMul); } void RollingTakoVM::drawRun() const { bool isRight = m_forward.isRight(); int32 time = static_cast(Periodic::Square0_1(Param::View::RunAnimeTimeSec, m_time)); auto tex = m_texture(60 * time, 60, 60, 60); - tex.mirrored(isRight).drawAt(m_pos, m_colorMul); + tex.mirrored(isRight).draw(Arg::bottomCenter = m_pos, m_colorMul); } } diff --git a/Re-Abyss/build/resources/params/Actor/Enemy/RollingTako/Param.toml b/Re-Abyss/build/resources/params/Actor/Enemy/RollingTako/Param.toml index 6f133838e..f7743b0e0 100644 --- a/Re-Abyss/build/resources/params/Actor/Enemy/RollingTako/Param.toml +++ b/Re-Abyss/build/resources/params/Actor/Enemy/RollingTako/Param.toml @@ -1,7 +1,6 @@ [Base] hp = 6 size = "(45, 45)" -pivot = "(0, 7.5)" [Wait] searchRange = 500.0