cleanup, tweaks

Author: Astral-C

CMakeLists.txt

@@ -1,6 +1,7 @@
 cmake_minimum_required(VERSION 3.8)
 project(booldozer)
 set(CMAKE_CXX_STANDARD 23)
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 add_compile_definitions(-DGLM_ENABLE_EXPERIMENTAL -DIMGUI_DEFINE_MATH_OPERATORS)
@@ -29,14 +30,15 @@ file(GLOB BOOLDOZER_SRC
     "lib/bsdifflib/bsdifflib.c"
     "lib/bsdifflib/bspatchlib.c"
 
+    "lib/ImGuiFileDialog/ImGuiFileDialog.cpp"
+
     # glad
     "lib/glad/src/*.c"
 )
 
-
 add_executable(booldozer ${BOOLDOZER_SRC})
-target_include_directories(booldozer PUBLIC include lib/libflipper/include lib/libflipper/include/geometry lib/imgui lib/imgui/backends lib/glfw/include lib/glad/include lib/glm lib/J3DUltra/include lib/gctoolsplusplus/include lib/TriStripper/include)
+target_include_directories(booldozer PUBLIC include lib/bStream lib/libflipper/include lib/libflipper/include/geometry lib/imgui lib/imgui/backends lib/ImGuiFileDialog lib/glfw/include lib/glad/include lib/glm lib/J3DUltra/include lib/gctoolsplusplus/include lib/TriStripper/include)
 
 find_package(ICU 61.0 COMPONENTS uc i18n REQUIRED)
 find_package(BZip2 REQUIRED)
-target_link_libraries(booldozer PUBLIC imgui glfw gctools++ ICU::uc ICU::i18n BZip2::BZip2 j3dultra TriStripper)
+target_link_libraries(booldozer PUBLIC X11 glfw imgui gctools++ ICU::uc ICU::i18n BZip2::BZip2 j3dultra TriStripper)

include/DOL.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "../lib/bStream/bstream.h"
+#include "bstream.h"
 #include <filesystem>
 
 constexpr size_t DOL_SECTION_COUNT = 18;

include/DOM/CameraAnimationDOMNode.hpp

@@ -14,25 +14,35 @@ namespace CameraAnimation {
     bool GetPreviewActive();
 }
 
-class LCameraAnimationDOMNode : public LBGRenderDOMNode 
+class LCameraAnimationDOMNode : public LBGRenderDOMNode
 {
 private:
 
     bool mPlaying;
-    int32_t mCurrentFrame;
-    
-    int32_t mStartFrame;
-    int32_t mFrameCount;
+    float mTime { 0.0f };
+    int32_t mCurrentFrame { 0 };
 
-    uint32_t mNextPosKeyX;
-    uint32_t mNextPosKeyY;
-    uint32_t mNextPosKeyZ;
+    int32_t mStartFrame { 0 };
+    int32_t mFrameCount { 0 };
 
-    uint32_t mNextTargetKeyX;
-    uint32_t mNextTargetKeyY;
-    uint32_t mNextTargetKeyZ;
+    uint32_t mPrevPosKeyX { 0 };
+    uint32_t mPrevPosKeyY { 0 };
+    uint32_t mPrevPosKeyZ { 0 };
 
-    uint32_t mNextFovKey;
+    uint32_t mNextPosKeyX { 1 };
+    uint32_t mNextPosKeyY { 1 };
+    uint32_t mNextPosKeyZ { 1 };
+
+    uint32_t mPrevTargetKeyX { 0 };
+    uint32_t mPrevTargetKeyY { 0 };
+    uint32_t mPrevTargetKeyZ { 0 };
+
+    uint32_t mNextTargetKeyX { 1 };
+    uint32_t mNextTargetKeyY { 1 };
+    uint32_t mNextTargetKeyZ { 1 };
+
+    uint32_t mPrevFovKey { 0 };
+    uint32_t mNextFovKey { 1 };
 
     LTrackCommon mPosFramesX;
     LTrackCommon mPosFramesY;
@@ -72,4 +82,4 @@ class LCameraAnimationDOMNode : public LBGRenderDOMNode
 
 		return Super::IsNodeType(type);
 	}
-};
+};

include/DOM/EntityDOMNode.hpp

@@ -2,7 +2,7 @@
 
 #include "BGRenderDOMNode.hpp"
 #include "io/JmpIO.hpp"
-#include "../lib/bStream/bstream.h"
+#include "bstream.h"
 
 enum LEntityType
 {