Skip to content

Commit 90616e6

Browse files
committed
Work on arachnoth
Fix imgui mouse inputs
1 parent d05dc93 commit 90616e6

File tree

10 files changed

+425
-32
lines changed

10 files changed

+425
-32
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,3 +19,6 @@
1919
[submodule "ThirdParty/bgfx.cmake"]
2020
path = ThirdParty/bgfx.cmake
2121
url = [email protected]:widberg/bgfx.cmake.git
22+
[submodule "ThirdParty/ImGuizmo"]
23+
path = ThirdParty/ImGuizmo
24+
url = [email protected]:CedricGuillemet/ImGuizmo.git

AzelLib/CMakeLists.txt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ include_directories(
1111
"${THIRD_PARTY}/glm"
1212
"${THIRD_PARTY}/tracy"
1313
"${THIRD_PARTY}/bgfx.cmake/bgfx/include"
14-
"${THIRD_PARTY}/bgfx.cmake/bx/include"
14+
"${THIRD_PARTY}/bgfx.cmake/bx/include"
15+
#"${THIRD_PARTY}/bgfx.cmake/bx/include/compat/msvc"
1516
"${THIRD_PARTY}/bgfx.cmake/bgfx/3rdparty"
1617
"${THIRD_PARTY}/bgfx.cmake/bimg/include"
1718
"${THIRD_PARTY}/aosdk"
@@ -121,6 +122,10 @@ set(SOURCES
121122
${THIRD_PARTY}/imgui/imgui_draw.cpp
122123
${THIRD_PARTY}/imgui/imgui_internal.h
123124
${THIRD_PARTY}/imgui/imgui_widgets.cpp
125+
${THIRD_PARTY}/imgui/examples/imgui_impl_sdl.cpp
126+
127+
${THIRD_PARTY}/ImGuizmo/ImGuizmo.cpp
128+
${THIRD_PARTY}/ImGuizmo/ImGuizmo.h
124129

125130
${THIRD_PARTY}/aosdk/eng_ssf/m68kcpu.c
126131
${THIRD_PARTY}/aosdk/eng_ssf/m68kopac.c

AzelLib/battle/BTL_A3/baldor.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -393,7 +393,7 @@ void Baldor_updateSub0Sub1(sBaldor* pThis)
393393
}
394394
}
395395

396-
void Baldor_updateSub0Sub2Sub2(sVec3_FP* param1, sVec3_FP* param2, s32 param3, s8 param4)
396+
void CreateDamageSpriteForCurrentBattleOverlay(sVec3_FP* param1, sVec3_FP* param2, s32 param3, s8 param4)
397397
{
398398
int iVar2;
399399

@@ -455,7 +455,7 @@ void Baldor_updateSub0Sub2(sBaldor* pThis, std::vector<sBattleTargetable>& param
455455
value.m50_flags &= ~0x80000;
456456
value.m50_flags &= ~0x20000;
457457

458-
Baldor_updateSub0Sub2Sub2(getBattleTargetablePosition(value), nullptr, 0x30000, 1);
458+
CreateDamageSpriteForCurrentBattleOverlay(getBattleTargetablePosition(value), nullptr, 0x30000, 1);
459459
}
460460
}
461461

0 commit comments

Comments
 (0)