Skip to content

Commit

Permalink
Some UI multi tasking stuffs
Browse files Browse the repository at this point in the history
  • Loading branch information
diegomrno committed Aug 28, 2024
1 parent 9a315cf commit fd2adc8
Show file tree
Hide file tree
Showing 56 changed files with 1,576 additions and 547 deletions.
Binary file removed .cache/icon_home.png
Binary file not shown.
25 changes: 2 additions & 23 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# CMakeLists.txt pour le projet principal
cmake_minimum_required(VERSION 3.16)
project(vortex)

Expand All @@ -8,74 +7,54 @@ set(CMAKE_CXX_EXTENSIONS OFF)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g -fPIC")
set(VORTEX_VERSION "1.1")

# Liste des fichiers sources pour la bibliothèque partagée
file(GLOB_RECURSE VORTEX_SHARED_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/main/src/*.cpp")

# Création de la bibliothèque partagée
add_library(vortex_shared SHARED ${VORTEX_SHARED_SOURCES})

# Définir les chemins d'inclusion pour la bibliothèque partagée
target_include_directories(vortex_shared PUBLIC
${CMAKE_CURRENT_SOURCE_DIR}/main/include
${CMAKE_CURRENT_SOURCE_DIR}/main/src
)

# Ajouter des dépendances supplémentaires à la bibliothèque partagée si nécessaire

# Add editor
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tools/editor editor_build)
target_link_libraries(vortex_shared PUBLIC editor)

# Add crash_handler
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tools/crash_handler crash_handler_build)
target_link_libraries(vortex_shared PUBLIC crash_handler)

# Add launcher
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tools/launcher launcher_build)
target_link_libraries(vortex_shared PUBLIC launcher)

# Liste des fichiers sources pour l'exécutable principal
file(GLOB_RECURSE VORTEX_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/main/src/*.cpp")

# Création de l'exécutable principal
add_executable(vortex ${VORTEX_SOURCES} main.cpp)
target_link_libraries(vortex PRIVATE vortex_shared)

add_executable(vx ${VORTEX_SOURCES} bootstrapp.cpp)
target_link_libraries(vx PRIVATE vortex_shared)

# Ajouter d'autres dépendances ou configurations pour l'exécutable principal

# Définir le répertoire d'installation pour les fichiers d'en-tête
set(INSTALL_INCLUDE_DIR /usr/local/include/Vortex/${VORTEX_VERSION}/)

# Définir le répertoire d'installation pour les fichiers d'en-tête
set(INSTALL_BIN_DIR /usr/local/bin/Vortex/${VORTEX_VERSION}/)

# Installation de l'exécutable dans /bin
install(TARGETS vortex DESTINATION ${INSTALL_BIN_DIR})
install(TARGETS vx DESTINATION /bin)

# Installation de la bibliothèque partagée dans /lib
install(TARGETS vortex_shared LIBRARY DESTINATION /lib)

# Installation des fichiers d'en-tête de /main/include
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/main/include/
DESTINATION ${INSTALL_INCLUDE_DIR}/main/include/
PATTERN "*.h"
PATTERN "*.hpp"
PATTERN "*.inl"
)

# Installation des fichiers d'en-tête de /tools/editor/app/include
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tools/editor/app/
DESTINATION ${INSTALL_INCLUDE_DIR}/tools/editor/app/
PATTERN "*.h"
PATTERN "*.hpp"
PATTERN "*.inl"
)

# Installation des fichiers d'en-tête de /lib
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib/
DESTINATION ${INSTALL_INCLUDE_DIR}/lib
FILES_MATCHING
Expand All @@ -84,10 +63,10 @@ install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/lib/
PATTERN "*.inl"
)

install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/.cache/
install(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/assets/images/
DESTINATION ${INSTALL_INCLUDE_DIR}/imgs/)

install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/vortex_desktop.desktop
install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/assets/desktop/vortex_desktop.desktop
DESTINATION /usr/share/applications/)

install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/build/handle_crash.sh
Expand Down
File renamed without changes.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added assets/images/icon_add.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added assets/images/icon_collection.png
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added assets/images/icon_home.png
Binary file added assets/images/icon_import.png
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
Binary file added assets/images/icon_return.png
File renamed without changes
Binary file added assets/images/icon_save.png
Binary file added assets/images/icon_settings.png
Binary file added assets/images/icon_star.png
File renamed without changes
File renamed without changes
File renamed without changes
File renamed without changes
22 changes: 20 additions & 2 deletions main/include/vortex_internals.h
Original file line number Diff line number Diff line change
Expand Up @@ -236,8 +236,12 @@ struct VxIO
// Content browser items
std::vector<std::shared_ptr<ContenBrowserItem>> contentbrowser_items;
std::vector<std::shared_ptr<ContentBrowserCustomFolder>> contentbrowser_customfolders;
std::string contentbrowser_basepath;
std::string contentbrowser_mainpool;
std::string contentbrowser_absolute_mainpool;
std::vector<std::string> contentbrowser_pools;
std::vector<std::string> copy_selection;
std::vector<std::string> cut_selection;
float past_state; // from 0.0f (0%) to 1.0f (100%)

// Main utilities
std::vector<std::shared_ptr<ModuleInterfaceUtility>> em_utilities;
Expand Down Expand Up @@ -313,8 +317,9 @@ namespace VortexMaker

// Publish to ROM
VORTEX_API void PublishContentBrowserCustomFolder(const std::string& path, const std::string &hex_color, const bool& isFav);
VORTEX_API void PublishPool(const std::string& absolute_pool_path);
VORTEX_API void PostCustomFolderToJson();
VORTEX_API void AddNewFolderPool(const std::string& path);
VORTEX_API void PostPoolsToJson();

// Fetch from ROM
VORTEX_API void FetchCustomFolders();
Expand All @@ -325,6 +330,19 @@ namespace VortexMaker
VORTEX_API bool GetContentBrowserFolderColor(const std::string& path, ImU32* color);


VORTEX_API void Copy(std::vector<std::string> selection, bool in_addition);
VORTEX_API void Cut(std::vector<std::string> selection, bool in_addition);
VORTEX_API void ClearCopySelection();
VORTEX_API void ClearCutSelection();
VORTEX_API void PasteAllSelections(const std::string& target_path);

VORTEX_API void DeleteFolder(const std::string& target_path);
VORTEX_API void DeleteFile(const std::string& target_path);
VORTEX_API void DeletePath(const std::string& target_path);

VORTEX_API void RenameFolder(const std::string& target_path, const std::string& new_name);
VORTEX_API void RenameFile(const std::string& target_path, const std::string& new_name);

VORTEX_API ImU32 HexToImU32(const std::string& hex);
VORTEX_API std::string ImU32ToHex(ImU32 color);
}
Expand Down
Loading

0 comments on commit fd2adc8

Please sign in to comment.