AliveTeam · mlgthatsme · Aug 24, 2021 · Aug 24, 2021 · Aug 24, 2021 · Sep 1, 2021
diff --git a/3rdParty/CMakeLists.txt b/3rdParty/CMakeLists.txt
@@ -72,8 +72,10 @@ add_library(imgui
     imgui/imgui_draw.cpp
     imgui/imgui_tables.cpp
     imgui/imgui_widgets.cpp
+	imgui/imgui_demo.cpp
     imgui/backends/imgui_impl_sdl.cpp
     imgui/backends/imgui_impl_opengl3.cpp
+	imgui/misc/cpp/imgui_stdlib.cpp
     )
 
 target_link_libraries(imgui

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -77,6 +77,7 @@ add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/Source/AliveLibAO)
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/Source/AliveLibAE)
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/Source/relive)
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/Source/Tools/vab_tool)
+add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/Source/Tools/asset_tool)
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/Source/Tools/relive_api)
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/Source/Tools/relive_api_integration_test)
 add_subdirectory(${CMAKE_CURRENT_LIST_DIR}/Source/Tools/relive_api_unit_test)

diff --git a/Source/AliveLibAE/Animation.cpp b/Source/AliveLibAE/Animation.cpp
@@ -20,6 +20,7 @@
 #include "Sys_common.hpp"
 #include "Renderer/IRenderer.hpp"
 #include <gmock/gmock.h>
+#include "ExternalAssets.hpp"
 
 // Frame call backs ??
 EXPORT s32 CC Animation_OnFrame_Common_Null_455F40(void*, s16*)
@@ -602,6 +603,24 @@ void Animation::vRender_40B820(s32 xpos, s32 ypos, PrimHeader** ppOt, s16 width,
         SetPrimExtraPointerHack(pPoly, nullptr);
     }
 
+    ////////////// 
+    // HD HAX
+    //////////////
+
+    CustomRenderSpriteFormat sprite;
+    sprite.x = PsxToPCX(xpos);
+    sprite.y = ypos;
+    sprite.frame = (this->field_92_current_frame == -1) ? 0 : this->field_92_current_frame;
+    sprite.frametable_offset = field_18_frame_table_offset;
+    sprite.resource_id = pResourceManager_5C1BB0->Get_Header_49C410(field_20_ppBlock)->field_C_id;
+    sprite.r = pPoly->mBase.header.rgb_code.r;
+    sprite.g = pPoly->mBase.header.rgb_code.g;
+    sprite.b = pPoly->mBase.header.rgb_code.b;
+    sprite.scale = (float)FP_GetDouble(this->field_14_scale);
+    sprite.flip = this->field_4_flags.Get(AnimFlags::eBit5_FlipX);
+
+    CustomRender_AddCommand(pPoly, sprite);
+
     OrderingTable_Add_4F8AA0(OtLayer(ppOt, field_C_render_layer), &pPoly->mBase.header);
 }
 

diff --git a/Source/AliveLibAE/BaseBomb.cpp b/Source/AliveLibAE/BaseBomb.cpp
@@ -30,7 +30,7 @@ BaseBomb* BaseBomb::ctor_423E70(FP x, FP y, s32 /*unused*/, FP scale)
     SetVTable(this, 0x544C54);
     SetType(AETypes::eBaseBomb_46);
 
-    const AnimRecord& rec = AnimRec(AnimId::Explosion_Mine);
+    const AnimRecord& rec = AnimRec(AnimId::GroundExplosion);
     Animation_Init_424E10(rec.mFrameTableOffset, rec.mMaxW, rec.mMaxH, BaseGameObject::Add_Resource_4DC130(ResourceManager::Resource_Animation, rec.mResourceId), 1, 1);
 
     field_20_animation.field_4_flags.Clear(AnimFlags::eBit18_IsLastFrame); // Double Check
@@ -192,7 +192,7 @@ void BaseBomb::vUpdate_424180()
 
     if (field_20_animation.field_92_current_frame == 3)
     {
-        const AnimRecord& rec = AnimRec(AnimId::Explosion_Mine);
+        const AnimRecord& rec = AnimRec(AnimId::GroundExplosion);
         u8** ppRes = Add_Resource_4DC130(ResourceManager::Resource_Animation, rec.mResourceId);
         if (ppRes)
         {

diff --git a/Source/AliveLibAE/CMakeLists.txt b/Source/AliveLibAE/CMakeLists.txt
@@ -433,6 +433,7 @@ endif()
 
 target_link_libraries(AliveLibAE
     AliveLibCommon
+	jsonxx_reliveapi
     EasyLogging++
     googletest
     Cinder

diff --git a/Source/AliveLibAE/DoorFlame.cpp b/Source/AliveLibAE/DoorFlame.cpp
@@ -170,7 +170,7 @@ class FlameSparks final : public ::BaseAnimatedWithPhysicsGameObject
         SetVTable(this, 0x545974);
         SetType(AETypes::eNone_0);
 
-        const AnimRecord& rec = AnimRec(AnimId::Zap_Sparks);
+        const AnimRecord& rec = AnimRec(AnimId::ChantOrb_Particle_Small);
         u8** ppRes = Add_Resource_4DC130(ResourceManager::Resource_Animation, rec.mResourceId);
         Animation_Init_424E10(rec.mFrameTableOffset, rec.mMaxW, rec.mMaxH, ppRes, 1, 1);
 

diff --git a/Source/AliveLibAE/Explosion.cpp b/Source/AliveLibAE/Explosion.cpp
@@ -23,13 +23,13 @@ Explosion* Explosion::ctor_4A1200(FP xpos, FP ypos, FP scale, s16 bSmall)
     field_F4_bSmall = bSmall;
     if (field_F4_bSmall)
     {
-        const AnimRecord& rec = AnimRec(AnimId::Explosion_Small);
+        const AnimRecord& rec = AnimRec(AnimId::AirExplosion_Small);
         u8** ppRes = Add_Resource_4DC130(ResourceManager::Resource_Animation, rec.mResourceId);
         Animation_Init_424E10(rec.mFrameTableOffset, rec.mMaxW, rec.mMaxH, ppRes, 1, 1);
     }
     else
     {
-        const AnimRecord& rec = AnimRec(AnimId::Explosion);
+        const AnimRecord& rec = AnimRec(AnimId::AirExplosion);
         u8** ppRes = Add_Resource_4DC130(ResourceManager::Resource_Animation, rec.mResourceId);
         Animation_Init_424E10(rec.mFrameTableOffset, rec.mMaxW, rec.mMaxH, ppRes, 1, 1);
     }
@@ -179,7 +179,7 @@ void Explosion::vUpdate_4A1510()
             auto pParticle = ae_new<Particle>();
             if (pParticle)
             {
-                const AnimRecord& rec = field_F4_bSmall ? AnimRec(AnimId::Explosion_Small) : AnimRec(AnimId::Explosion);
+                const AnimRecord& rec = field_F4_bSmall ? AnimRec(AnimId::AirExplosion_Small) : AnimRec(AnimId::AirExplosion);
                 pParticle->ctor_4CC4C0(field_B8_xpos, field_BC_ypos, rec.mFrameTableOffset,
                                        202, // Same size for both explosions for some reason
                                        91,  // ^^^

diff --git a/Source/AliveLibAE/FallingItem.cpp b/Source/AliveLibAE/FallingItem.cpp
@@ -377,7 +377,7 @@ EXPORT void FallingItem::vUpdate_427780()
                 auto pParticle = ae_new<Particle>();
                 if (pParticle)
                 {
-                    const AnimRecord& rec = AnimRec(AnimId::Explosion);
+                    const AnimRecord& rec = AnimRec(AnimId::AirExplosion);
                     u8** ppRes = ResourceManager::GetLoadedResource_49C2A0(ResourceManager::Resource_Animation, rec.mResourceId, 0, 0);
                     pParticle->ctor_4CC4C0(
                         field_B8_xpos,

diff --git a/Source/AliveLibAE/FlyingSlig.cpp b/Source/AliveLibAE/FlyingSlig.cpp
@@ -138,7 +138,7 @@ FlyingSlig* FlyingSlig::ctor_4342B0(Path_FlyingSlig* pTlv, s32 tlvInfo)
     field_10_resources_array.SetAt(7, ResourceManager::GetLoadedResource_49C2A0(ResourceManager::Resource_Animation, AEResourceID::kVaporResID, TRUE, FALSE));
     field_10_resources_array.SetAt(8, ResourceManager::GetLoadedResource_49C2A0(ResourceManager::Resource_Animation, AEResourceID::kSlogBlowResID, TRUE, FALSE));
 
-    const AnimRecord& rec = AnimRec(AnimId::Flying_Slig_Idle);
+    const AnimRecord& rec = AnimRec(AnimId::FlyingSlig_Idle);
     u8** ppRes = Add_Resource_4DC130(ResourceManager::Resource_Animation, rec.mResourceId);
     Animation_Init_424E10(rec.mFrameTableOffset, rec.mMaxW, rec.mMaxH, ppRes, 1, 1);
     //Animation_Init_424E10(116888, 107, 48u, field_10_resources_array.ItemAt(0), 1, 1u);
@@ -261,23 +261,23 @@ FlyingSlig* FlyingSlig::ctor_4342B0(Path_FlyingSlig* pTlv, s32 tlvInfo)
 }
 
 const AnimId sFlyingSligFrameTables_552408[28] = {
-    AnimId::Flying_Slig_Idle,
-    AnimId::Flying_Slig_Move_Horizontal,
-    AnimId::Flying_Slig_Idle_Turn_Around,
-    AnimId::Flying_Slig_Move_Down,
-    AnimId::Flying_Slig_Move_Down_Turn_Around,
-    AnimId::Flying_Slig_Move_Up,
-    AnimId::Flying_Slig_Move_Up_Turn_Around,
-    AnimId::Flying_Slig_Pull_Lever,
-    AnimId::Flying_Slig_Speak,
-    AnimId::Flying_Slig_Possession,
-    AnimId::Flying_Slig_Move_Horizontal_End,
-    AnimId::Flying_Slig_Move_Up_Start,
-    AnimId::Flying_Slig_Move_Horizontal_To_Down,
-    AnimId::Flying_Slig_Move_Up_To_Horizontal,
-    AnimId::Flying_Slig_Move_Down_To_Horizontal,
-    AnimId::Flying_Slig_Turn_Quick,
-    AnimId::Flying_Slig_Idle_To_Horizontal,
+    AnimId::FlyingSlig_Idle,
+    AnimId::FlyingSlig_MoveHorizontal,
+    AnimId::FlyingSlig_IdleTurnAround,
+    AnimId::FlyingSlig_MoveDown,
+    AnimId::FlyingSlig_MoveDownTurnAround,
+    AnimId::FlyingSlig_MoveUp,
+    AnimId::FlyingSlig_MoveUpTurnAround,
+    AnimId::FlyingSlig_PullLever,
+    AnimId::FlyingSlig_Speak,
+    AnimId::FlyingSlig_Possession,
+    AnimId::FlyingSlig_MoveHorizontalEnd,
+    AnimId::FlyingSlig_MoveUpStart,
+    AnimId::FlyingSlig_MoveHorizontalToDown,
+    AnimId::FlyingSlig_MoveUpToHorizontal,
+    AnimId::FlyingSlig_MoveDownToHorizontal,
+    AnimId::FlyingSlig_TurnQuick,
+    AnimId::FlyingSlig_IdleToHorizontal,
     AnimId::FlyingSlig_BeginDownMovement,
     AnimId::FlyingSlig_EndDownMovement,
     AnimId::FlyingSlig_DownKnockback,

diff --git a/Source/AliveLibAE/Game.cpp b/Source/AliveLibAE/Game.cpp
@@ -212,7 +212,7 @@ EXPORT void CC DrawFps_4952F0(Bitmap* pBmp, s32 x, s32 y, f32 fps)
 
 EXPORT void CC sub_4FBA20()
 {
-    NOT_IMPLEMENTED();
+    //NOT_IMPLEMENTED();
 }
 
 EXPORT void CC CheckShiftCapslock_4953B0()

diff --git a/Source/AliveLibAE/Movie.cpp b/Source/AliveLibAE/Movie.cpp
@@ -673,14 +673,18 @@ void Movie::Init_4DFF60(s32 id, CdlLOC* pCdPos, s16 bUnknown, s16 flags, s16 vol
     ResourceManager::Reclaim_Memory_49C470(0);
 }
 
-Movie* Movie::ctor_4DFDE0(s32 id, u32 pos, s16 bUnknown, s16 flags, s16 volume)
+Movie* Movie::ctor_4DFDE0(s32 /*id*/, u32 /*pos*/, s16 /*bUnknown*/, s16 /*flags*/, s16 /*volume*/)
 {
+    /*
     BaseGameObject_ctor_4DBFA0(TRUE, 0);
     SetVTable(this, 0x547EF4); // vTbl_Movie_547EF4
 
     CdlLOC cdLoc = {};
     PSX_Pos_To_CdLoc_4FADD0(pos, &cdLoc);
     Init_4DFF60(id, &cdLoc, bUnknown, flags, volume);
+    */
+
+    field_6_flags.Set(BaseGameObject::Options::eDead_Bit3);
     return this;
 }
 

diff --git a/Source/AliveLibAE/Paramite.cpp b/Source/AliveLibAE/Paramite.cpp
@@ -279,7 +279,7 @@ const AnimId sParamiteAnimIdTable_55D660[44] = {
     AnimId::Paramite_WebLeaveUp,
     AnimId::Paramite_Eating,
     AnimId::Paramite_Death,
-    AnimId::Paramite_Squawk,
+    AnimId::Paramite_Struggle,
     AnimId::Paramite_Attack};
 
 s32 CC Paramite::CreateFromSaveState_4855A0(const u8* pBuffer)

diff --git a/Source/AliveLibAE/PsxRender.cpp b/Source/AliveLibAE/PsxRender.cpp
@@ -3432,6 +3432,8 @@ static bool DrawOTagImpl(PrimHeader** ppOt, s16 drawEnv_of0, s16 drawEnv_of1)
         pOtItem = any.mPrimHeader->tag; // offset 0
     }
 
+    renderer.EndFrame();
+
     return false;
 }
 

diff --git a/Source/AliveLibAE/Renderer/DirectX9Renderer.cpp b/Source/AliveLibAE/Renderer/DirectX9Renderer.cpp
@@ -83,6 +83,10 @@ void DirectX9Renderer::StartFrame(s32 /*xOff*/, s32 /*yOff*/)
 }
 
 void DirectX9Renderer::EndFrame()
+{
+}
+
+void DirectX9Renderer::Present()
 {
     SDL_RenderPresent(mRenderer);
 }
@@ -180,4 +184,9 @@ void DirectX9Renderer::Upload(BitDepth /*bitDepth*/, const PSX_RECT& /*rect*/, c
 {
 }
 
+void DirectX9Renderer::LoadExternalCam(const char* /*path*/, const unsigned char* /*key*/, int /*keyLength*/)
+{
+    LOG_WARNING("LoadExternalCam not implemented for DirectX9 - external cam not loaded.");
+}
+
 #endif
diff --git a/Source/AliveLibAE/Renderer/DirectX9Renderer.hpp b/Source/AliveLibAE/Renderer/DirectX9Renderer.hpp
@@ -12,6 +12,7 @@ class DirectX9Renderer final : public IRenderer
     void Clear(u8 r, u8 g, u8 b) override;
     void StartFrame(s32 xOff, s32 yOff) override;
     void EndFrame() override;
+    void Present() override;
     void BltBackBuffer(const SDL_Rect* pCopyRect, const SDL_Rect* pDst) override;
     void OutputSize(s32* w, s32* h) override;
     bool UpdateBackBuffer(const void* pPixels, s32 pitch) override;
@@ -36,6 +37,8 @@ class DirectX9Renderer final : public IRenderer
 
     void Upload(BitDepth bitDepth, const PSX_RECT& rect, const u8* pPixels) override;
 
+    void LoadExternalCam(const char* path, const unsigned char* key, int keyLength) override;
+
 private:
     SDL_Renderer* mRenderer = nullptr;
     IDirect3DDevice9* mDevice = nullptr;

diff --git a/Source/AliveLibAE/Renderer/IRenderer.cpp b/Source/AliveLibAE/Renderer/IRenderer.cpp
@@ -3,12 +3,12 @@
 #include "SoftwareRenderer.hpp"
 #include "DirectX9Renderer.hpp"
 
+static IRenderer* gRenderer = nullptr;
+
 #if RENDERER_OPENGL
 #include "OpenGLRenderer.hpp"
 #endif
 
-static IRenderer* gRenderer = nullptr;
-
 IRenderer* IRenderer::GetRenderer()
 {
     return gRenderer;

diff --git a/Source/AliveLibAE/Renderer/IRenderer.hpp b/Source/AliveLibAE/Renderer/IRenderer.hpp
@@ -12,6 +12,7 @@ class IRenderer
 public:
     enum class Renderers
     {
+        None = 0,
         Software,
         DirectX9,
         OpenGL,
@@ -43,6 +44,7 @@ class IRenderer
     virtual void Clear(u8 r, u8 g, u8 b) = 0;
     virtual void StartFrame(s32 xOff, s32 yOff) = 0;
     virtual void EndFrame() = 0;
+    virtual void Present() = 0;
     virtual void BltBackBuffer(const SDL_Rect* pCopyRect, const SDL_Rect* pDst) = 0;
     virtual void OutputSize(s32* w, s32* h) = 0;
     virtual bool UpdateBackBuffer(const void* pPixels, s32 pitch) = 0;
@@ -59,6 +61,8 @@ class IRenderer
 
     virtual void Upload(BitDepth bitDepth, const PSX_RECT& rect, const u8* pPixels) = 0;
 
+    virtual void LoadExternalCam(const char* path, const unsigned char* key, int keyLength) = 0;
+
     // FG1/zaplines/blood/hintfly
     virtual void Draw(Prim_Sprt& sprt) = 0;
     virtual void Draw(Prim_GasEffect& gasEffect) = 0;
-Original file line number
+Diff line change
@@ Expand Up @@
             pOtItem = any.mPrimHeader->tag; // offset 0
         }
+        renderer.EndFrame();
         return false;
     }
@@ Expand Down @@