Merge pull request #2 from REDxEYE/WIP

Merge of latest works

.gitmodules

@@ -1,3 +1,9 @@
 [submodule "libs/LGLE"]
 	path = libs/LGLE
 	url = https://github.com/REDxEYE/LGLE
+[submodule "libs/glfw"]
+	path = libs/glfw
+	url = https://github.com/glfw/glfw
+[submodule "libs/imgui"]
+	path = libs/imgui
+	url = https://github.com/ocornut/imgui

ArchiveTest.cmake

@@ -0,0 +1,19 @@
+add_executable(ArchiveTest
+        src/archive_test.cpp
+        src/decima/archive/archive.cpp
+        src/decima/file_types/prefetch.cpp
+        src/decima/archive/archive_array.cpp
+        src/utils.cpp
+        src/decima/file_types/prefetch.cpp
+        src/decima/file_types/core.cpp
+        src/decima/archive/archive_file.cpp)
+
+target_include_directories(ArchiveTest PUBLIC include ${HASHLIB_INC} ${OOZLIB_INC})
+
+
+target_link_libraries(ArchiveTest PUBLIC
+        HashLib oozLib
+        -static-libgcc -static-libstdc++ -static
+        -Wl,-Bstatic -lstdc++ -lpthread
+        -Wl,-Bdynamic
+        -fuse-ld=lld)

CMakeLists.txt

@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.15)
 project(ProjectDS)
+set(CMAKE_CXX_STANDARD 17)
 
 if (DEBUG_MODE)
     set(GCC_COVERAGE_COMPILE_FLAGS "-g -fno-omit-frame-pointer -gdwarf-2")
@@ -15,28 +16,14 @@ endif (DEBUG_MODE)
 
 add_subdirectory(libs/hash)
 add_subdirectory(libs/ooz)
-add_subdirectory(libs/LGLE)
-
-set(CMAKE_CXX_STANDARD 17)
-
-add_executable(ProjectDS
-        src/main.cpp
-        src/decima_archive.cpp
-        src/file_types/prefetch.cpp
-        src/archive_array.cpp
-        src/utils.cpp
-        src/file_types/prefetch.cpp
-        src/memory_stream.cpp
-        src/file_tree.cpp src/file_types/core.cpp)
-
-target_include_directories(ProjectDS PUBLIC include ${HASHLIB_INC} ${OOZLIB_INC} ${LGLE_INCLUDE} ${LGLE_LIB_INCLUDE})
-
-
-target_link_libraries(ProjectDS PUBLIC
-        HashLib oozLib LGLE
-        -static-libgcc -static-libstdc++ -static
-        -Wl,-Bstatic -lstdc++ -lpthread
-        -Wl,-Bdynamic
-        -fuse-ld=lld)
+add_subdirectory(libs/glfw)
+add_subdirectory(cmake_subprojects/glad)
+add_subdirectory(cmake_subprojects/stb)
+add_subdirectory(cmake_subprojects/imgui)
+
+include(QuickHash.cmake)
+include(ArchiveTest.cmake)
+include(ProjectDS.cmake)
+include(TestField.cmake)
 
 

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020 REDxEYE & ShadelessFox
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

ProjectDS.cmake

@@ -0,0 +1,32 @@
+add_executable(ProjectDS
+        src/main.cpp
+        src/decima/archive/archive.cpp
+        src/decima/file_types/prefetch.cpp
+        src/decima/archive/archive_array.cpp
+        src/utils.cpp
+        src/decima/file_types/prefetch.cpp
+        src/decima/archive/archive_tree.cpp
+        src/decima/file_types/translation.cpp
+        src/decima/file_types/core.cpp
+        src/decima/archive/archive_file.cpp
+        src/imgui_backend_impl.cpp
+        src/app.cpp src/projectds_app.cpp
+        src/projectds_app_draw.cpp
+        src/decima/file_types/dummy.cpp
+        src/decima/file_types/core_draw.cpp
+        src/projectds_app_utils.cpp
+        src/decima/file_types/translation_draw.cpp src/decima/file_types/texture.cpp src/decima/file_types/texture_draw.cpp)
+
+target_include_directories(ProjectDS PUBLIC include ${HASHLIB_INC} ${OOZLIB_INC})
+
+target_include_directories(ProjectDS PUBLIC
+        libs/glad/include
+        libs/glfw/include
+        )
+
+target_link_libraries(ProjectDS PUBLIC
+        HashLib oozLib glfw glad imgui
+        -static-libgcc -static-libstdc++ -static
+        -Wl,-Bstatic -lstdc++ -lpthread
+        -Wl,-Bdynamic
+        -fuse-ld=lld)

QuickHash.cmake

@@ -0,0 +1,14 @@
+add_executable(QuickHash
+        src/quick_hasher.cpp
+        src/utils.cpp
+        )
+
+
+target_include_directories(QuickHash PUBLIC include ${HASHLIB_INC} ${OOZLIB_INC})
+
+target_link_libraries(QuickHash PUBLIC
+        HashLib oozLib
+        -static-libgcc -static-libstdc++ -static
+        -Wl,-Bstatic -lstdc++ -lpthread
+        -Wl,-Bdynamic
+        -fuse-ld=lld)

README.MD

@@ -0,0 +1,6 @@
+ProjectDecima is aimed to provide GUI for export/preview files inside Decima engine archives.
+
+Project is heavily inspired by:
+* [DecimaExplorer](https://github.com/Jayveer/Decima-Explorer) by [Jayveer](https://github.com/Jayveer)
+* [DecimaTools](https://github.com/Wunkolo/DecimaTools) by [Wunkolo](https://github.com/Wunkolo)
+* [ProjectZeroDawn](https://github.com/yretenai/ProjectZeroDawn) by [yretenai](https://github.com/yretenai)

TestField.cmake

@@ -0,0 +1,17 @@
+add_executable(TestField
+        src/test_field.cpp
+        src/decima/file_types/core.cpp
+        src/decima/file_types/translation.cpp
+        src/decima/file_types/dummy.cpp
+        src/utils.cpp
+        )
+
+
+target_include_directories(TestField PUBLIC include ${HASHLIB_INC} ${OOZLIB_INC})
+
+target_link_libraries(TestField PUBLIC
+        HashLib oozLib
+        -static-libgcc -static-libstdc++ -static
+        -Wl,-Bstatic -lstdc++ -lpthread
+        -Wl,-Bdynamic
+        -fuse-ld=lld)

cmake_subprojects/glad/CMakeLists.txt

@@ -0,0 +1,10 @@
+cmake_minimum_required(VERSION 3.15)
+project(glad)
+set(CMAKE_CXX_STANDARD 17)
+
+file(GLOB_RECURSE GLAD_SOURCES ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/glad/src/*.c)
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+add_library(glad SHARED ${GLAD_SOURCES})
+set_target_properties(glad PROPERTIES PREFIX "")
+
+target_include_directories(glad PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/glad/include)

cmake_subprojects/imgui/CMakeLists.txt

@@ -0,0 +1,37 @@
+cmake_minimum_required(VERSION 3.15)
+project(imgui)
+set(CMAKE_CXX_STANDARD 17)
+
+set(IMGUI_SRC_DIR
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/imgui
+        CACHE INTERNAL ""
+        )
+
+set(IMGUI_INCLUDE_DIR
+        ${IMGUI_SRC_DIR}
+        ${IMGUI_SRC_DIR}/examples
+
+        CACHE INTERNAL ""
+        )
+
+set(IMGUI_SOURCES
+        ${IMGUI_SRC_DIR}/imgui.cpp
+        ${IMGUI_SRC_DIR}/imgui_draw.cpp
+        ${IMGUI_SRC_DIR}/imgui_widgets.cpp
+        CACHE INTERNAL ""
+        )
+
+
+
+set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
+add_library(imgui SHARED ${IMGUI_SOURCES})
+
+set_target_properties(imgui PROPERTIES PREFIX "")
+
+set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,-Bstatic,--whole-archive -lwinpthread -Wl,--no-whole-archive")
+
+target_link_libraries(imgui
+        -static-libgcc -static-libstdc++ -static
+        )
+target_include_directories(imgui PUBLIC ${IMGUI_INCLUDE_DIR} lib/glfw/include lib/glad/include)
+

cmake_subprojects/stb/CMakeLists.txt

@@ -0,0 +1,8 @@
+cmake_minimum_required(VERSION 3.15)
+project(stb)
+set(CMAKE_CXX_STANDARD 17)
+
+set(STB_INCLUDE
+        ${CMAKE_CURRENT_SOURCE_DIR}/../../libs/stb
+        CACHE INTERNAL ""
+        )

include/app.hpp

@@ -0,0 +1,60 @@
+//
+// Created by i.getsman on 06.08.2020.
+//
+
+#ifndef PROJECTDS_APP_HPP
+#define PROJECTDS_APP_HPP
+
+#include <string>
+#include <vector>
+#include <stdexcept>
+
+#include <glad/glad.h>
+#include <GLFW/glfw3.h>
+
+struct WindowInfo {
+    uint32_t m_win_width;
+    uint32_t m_win_height;
+    std::string m_title;
+};
+
+class App {
+public:
+    App(std::pair<uint32_t, uint32_t> window_size, std::string title);
+
+    void init();
+
+    void run();
+
+private:
+    uint64_t m_prev_time = glfwGetTime();
+
+    void init_glfw();
+
+    void init_opengl();
+
+    void update(double ts);
+
+    void begin_frame();
+
+    void end_frame();
+
+    void glfw_error_handler(int error, const char* message);
+
+protected:
+    virtual void init_user();
+
+    virtual void update_user(double ts);
+
+    virtual void begin_frame_user();
+
+    virtual void end_frame_user();
+
+    inline void clear_window(float r = 0, float g = 0, float b = 0, float a = 1,
+        uint32_t flags = GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
+
+    WindowInfo m_win_info;
+    GLFWwindow* m_window;
+};
+
+#endif //PROJECTDS_APP_HPP