diff --git a/Editor/CMakeLists.txt b/Editor/CMakeLists.txt index 097b05598..9dbd78107 100644 --- a/Editor/CMakeLists.txt +++ b/Editor/CMakeLists.txt @@ -15,10 +15,10 @@ else() endif() if(RUDE_BINARY_CONFIGS) - add_definitions("-DRUDE_BINARY_CONFIGS=1") + add_definitions("-DURDE_BINARY_CONFIGS=1") endif() -add_executable(rude WIN32 +add_executable(urde WIN32 main.cpp Space.hpp Space.cpp atdna_Space.cpp SplashScreen.hpp SplashScreen.cpp @@ -26,8 +26,8 @@ add_executable(rude WIN32 ProjectManager.hpp ProjectManager.cpp ViewManager.hpp ViewManager.cpp) -target_link_libraries(rude - RudeLocales +target_link_libraries(urde + UrdeLocales RuntimeCommonCharacter RuntimeCommonInput RuntimeCommon diff --git a/Editor/ProjectManager.cpp b/Editor/ProjectManager.cpp index ccbf40339..0d03745bf 100644 --- a/Editor/ProjectManager.cpp +++ b/Editor/ProjectManager.cpp @@ -2,9 +2,9 @@ #include "ViewManager.hpp" #include "../DataSpecRegistry.hpp" -namespace RUDE +namespace URDE { -static LogVisor::LogModule Log("RUDE::ProjectManager"); +static LogVisor::LogModule Log("URDE::ProjectManager"); bool ProjectManager::m_registeredSpecs = false; ProjectManager::ProjectManager(ViewManager &vm) @@ -59,24 +59,24 @@ bool ProjectManager::openProject(const HECL::SystemString& path) return false; } -#ifdef RUDE_BINARY_CONFIGS - HECL::ProjectPath rudeSpacesPath(*m_proj, _S(".hecl/rude_spaces.bin")); - Athena::io::FileReader r(rudeSpacesPath.getAbsolutePath(), 32 * 1024, false); +#ifdef URDE_BINARY_CONFIGS + HECL::ProjectPath urdeSpacesPath(*m_proj, _S(".hecl/urde_spaces.bin")); + Athena::io::FileReader r(urdeSpacesPath.getAbsolutePath(), 32 * 1024, false); if (r.hasError()) goto makeDefault; m_vm.SetupEditorView(r); #else - HECL::ProjectPath rudeSpacesPath(*m_proj, _S(".hecl/rude_spaces.yaml")); - FILE* fp = HECL::Fopen(rudeSpacesPath.getAbsolutePath().c_str(), _S("r")); + HECL::ProjectPath urdeSpacesPath(*m_proj, _S(".hecl/urde_spaces.yaml")); + FILE* fp = HECL::Fopen(urdeSpacesPath.getAbsolutePath().c_str(), _S("r")); Athena::io::YAMLDocReader r; if (!fp) goto makeDefault; yaml_parser_set_input_file(r.getParser(), fp); - if (!r.ValidateClassType(r.getParser(), "RudeSpacesState")) + if (!r.ValidateClassType(r.getParser(), "UrdeSpacesState")) { fclose(fp); goto makeDefault; @@ -121,8 +121,8 @@ bool ProjectManager::saveProject() if (!m_proj) return false; -#ifdef RUDE_BINARY_CONFIGS - HECL::ProjectPath oldSpacesPath(*m_proj, _S(".hecl/~rude_spaces.bin")); +#ifdef urde_BINARY_CONFIGS + HECL::ProjectPath oldSpacesPath(*m_proj, _S(".hecl/~urde_spaces.bin")); Athena::io::FileWriter w(oldSpacesPath.getAbsolutePath(), true, false); if (w.hasError()) return false; @@ -130,15 +130,15 @@ bool ProjectManager::saveProject() m_vm.SaveEditorView(w); w.close(); - HECL::ProjectPath newSpacesPath(*m_proj, _S(".hecl/rude_spaces.bin")); + HECL::ProjectPath newSpacesPath(*m_proj, _S(".hecl/urde_spaces.bin")); #else - HECL::ProjectPath oldSpacesPath(*m_proj, _S(".hecl/~rude_spaces.yaml")); + HECL::ProjectPath oldSpacesPath(*m_proj, _S(".hecl/~urde_spaces.yaml")); FILE* fp = HECL::Fopen(oldSpacesPath.getAbsolutePath().c_str(), _S("w")); if (!fp) return false; - Athena::io::YAMLDocWriter w("RudeSpacesState"); + Athena::io::YAMLDocWriter w("UrdeSpacesState"); yaml_emitter_set_output_file(w.getEmitter(), fp); if (!w.open()) { @@ -156,7 +156,7 @@ bool ProjectManager::saveProject() w.close(); fclose(fp); - HECL::ProjectPath newSpacesPath(*m_proj, _S(".hecl/rude_spaces.yaml")); + HECL::ProjectPath newSpacesPath(*m_proj, _S(".hecl/urde_spaces.yaml")); #endif diff --git a/Editor/ProjectManager.hpp b/Editor/ProjectManager.hpp index 08759ff16..062f8ad85 100644 --- a/Editor/ProjectManager.hpp +++ b/Editor/ProjectManager.hpp @@ -1,14 +1,14 @@ -#ifndef RUDE_PROJECT_MANAGER_HPP -#define RUDE_PROJECT_MANAGER_HPP +#ifndef URDE_PROJECT_MANAGER_HPP +#define URDE_PROJECT_MANAGER_HPP #include #include -namespace RUDE +namespace URDE { class ViewManager; -#ifdef RUDE_BINARY_CONFIGS +#ifdef URDE_BINARY_CONFIGS using ConfigReader = Athena::io::IStreamReader; using ConfigWriter = Athena::io::IStreamWriter; #else @@ -35,4 +35,4 @@ public: } -#endif // RUDE_PROJECT_MANAGER_HPP +#endif // URDE_PROJECT_MANAGER_HPP diff --git a/Editor/ResourceOutliner.cpp b/Editor/ResourceOutliner.cpp index 31d498d10..6f9f7cb2c 100644 --- a/Editor/ResourceOutliner.cpp +++ b/Editor/ResourceOutliner.cpp @@ -1,6 +1,6 @@ #include "ResourceOutliner.hpp" -namespace RUDE +namespace URDE { } diff --git a/Editor/ResourceOutliner.hpp b/Editor/ResourceOutliner.hpp index 8f5a72ea2..f7a2972c9 100644 --- a/Editor/ResourceOutliner.hpp +++ b/Editor/ResourceOutliner.hpp @@ -1,10 +1,10 @@ -#ifndef RUDE_RESOURCE_OUTLINER_HPP -#define RUDE_RESOURCE_OUTLINER_HPP +#ifndef URDE_RESOURCE_OUTLINER_HPP +#define URDE_RESOURCE_OUTLINER_HPP #include "Space.hpp" #include "ViewManager.hpp" -namespace RUDE +namespace URDE { class ResourceOutliner : public Space @@ -44,4 +44,4 @@ public: } -#endif // RUDE_RESOURCE_OUTLINER_HPP +#endif // URDE_RESOURCE_OUTLINER_HPP diff --git a/Editor/Space.cpp b/Editor/Space.cpp index 2b8b73246..8be9d43c8 100644 --- a/Editor/Space.cpp +++ b/Editor/Space.cpp @@ -2,9 +2,9 @@ #include "ViewManager.hpp" #include "ResourceOutliner.hpp" -namespace RUDE +namespace URDE { -static LogVisor::LogModule Log("RUDE::Space"); +static LogVisor::LogModule Log("URDE::Space"); Specter::View* Space::buildSpaceView(Specter::ViewResources& res) { @@ -50,7 +50,7 @@ static Space* BuildNewSpace(ViewManager& vm, Space::Class cls, Reader& r) Space* Space::NewSpaceFromConfigStream(ViewManager& vm, ConfigReader& r) { -#ifdef RUDE_BINARY_CONFIGS +#ifdef URDE_BINARY_CONFIGS Class cls = Class(r.readUint32Big()); return BuildNewSpace(vm, cls, r); #else diff --git a/Editor/Space.hpp b/Editor/Space.hpp index fe5d17400..8fa33778d 100644 --- a/Editor/Space.hpp +++ b/Editor/Space.hpp @@ -1,5 +1,5 @@ -#ifndef RUDE_SPACE_HPP -#define RUDE_SPACE_HPP +#ifndef URDE_SPACE_HPP +#define URDE_SPACE_HPP #include #include @@ -12,7 +12,7 @@ class SplitView; class ViewResources; class Toolbar; } -namespace RUDE +namespace URDE { class ViewManager; @@ -84,7 +84,7 @@ public: : SplitSpace(vm) { m_state.read(r); -#ifdef RUDE_BINARY_CONFIGS +#ifdef URDE_BINARY_CONFIGS m_slots[0].reset(NewSpaceFromConfigStream(vm, r)); m_slots[1].reset(NewSpaceFromConfigStream(vm, r)); #else @@ -180,4 +180,4 @@ public: } -#endif // RUDE_SPACE_HPP +#endif // URDE_SPACE_HPP diff --git a/Editor/SplashScreen.cpp b/Editor/SplashScreen.cpp index 36b384c74..f0f78291b 100644 --- a/Editor/SplashScreen.cpp +++ b/Editor/SplashScreen.cpp @@ -1,7 +1,7 @@ #include "SplashScreen.hpp" #include "version.h" -namespace RUDE +namespace URDE { #define SPLASH_WIDTH 555 @@ -55,7 +55,7 @@ void SplashScreen::updateContentOpacity(float opacity) m_title.reset(new Specter::TextView(res, *this, res.m_titleFont)); Zeus::CColor clearColor = res.themeData().uiText(); clearColor[3] = 0.0; - m_title->typesetGlyphs("RUDE", clearColor); + m_title->typesetGlyphs("URDE", clearColor); m_buildInfo.reset(new Specter::MultiLineTextView(res, *this, res.m_mainFont, Specter::TextView::Alignment::Right)); m_buildInfo->typesetGlyphs(m_buildInfoStr, clearColor); diff --git a/Editor/SplashScreen.hpp b/Editor/SplashScreen.hpp index 47bdd5b9d..501df430b 100644 --- a/Editor/SplashScreen.hpp +++ b/Editor/SplashScreen.hpp @@ -1,5 +1,5 @@ -#ifndef RUDE_SPLASH_SCREEN_HPP -#define RUDE_SPLASH_SCREEN_HPP +#ifndef URDE_SPLASH_SCREEN_HPP +#define URDE_SPLASH_SCREEN_HPP #include #include @@ -7,7 +7,7 @@ #include #include "ViewManager.hpp" -namespace RUDE +namespace URDE { static LogVisor::LogModule Log("Specter::SplashScreen"); @@ -130,4 +130,4 @@ public: } -#endif // RUDE_SPLASH_SCREEN_HPP +#endif // URDE_SPLASH_SCREEN_HPP diff --git a/Editor/ViewManager.cpp b/Editor/ViewManager.cpp index 36548074e..bf57ae290 100644 --- a/Editor/ViewManager.cpp +++ b/Editor/ViewManager.cpp @@ -7,10 +7,10 @@ using YAMLNode = Athena::io::YAMLNode; -namespace RUDE +namespace URDE { -Specter::View* ViewManager::BuildSpaceViews(RUDE::Space* space) +Specter::View* ViewManager::BuildSpaceViews(URDE::Space* space) { m_rootSpaceView = space->buildSpaceView(m_viewResources); return m_rootSpaceView; @@ -72,7 +72,7 @@ void ViewManager::DismissSplash() ViewManager::ViewManager(HECL::Runtime::FileStoreManager& fileMgr, HECL::CVarManager& cvarMgr) : m_fileStoreManager(fileMgr), m_cvarManager(cvarMgr), m_projManager(*this), - m_fontCache(fileMgr), m_translator(RUDE::SystemLocaleOrEnglish()) + m_fontCache(fileMgr), m_translator(URDE::SystemLocaleOrEnglish()) {} ViewManager::~ViewManager() {} @@ -89,7 +89,7 @@ void ViewManager::pushRecentFile(const HECL::SystemString& path) void ViewManager::init(boo::IApplication* app) { - m_mainWindow = std::unique_ptr(app->newWindow(_S("RUDE"))); + m_mainWindow = std::unique_ptr(app->newWindow(_S("URDE"))); m_mainWindow->showWindow(); m_mainWindow->setWaitCursor(true); diff --git a/Editor/ViewManager.hpp b/Editor/ViewManager.hpp index 8ca62c9e6..d1ab9d76b 100644 --- a/Editor/ViewManager.hpp +++ b/Editor/ViewManager.hpp @@ -1,11 +1,11 @@ -#ifndef RUDE_VIEW_MANAGER_HPP -#define RUDE_VIEW_MANAGER_HPP +#ifndef URDE_VIEW_MANAGER_HPP +#define URDE_VIEW_MANAGER_HPP #include #include "ProjectManager.hpp" #include "Space.hpp" -namespace RUDE +namespace URDE { class SplashScreen; @@ -32,7 +32,7 @@ class ViewManager : public Specter::IViewManager bool m_updatePf = false; float m_reqPf; - Specter::View* BuildSpaceViews(RUDE::Space* space); + Specter::View* BuildSpaceViews(URDE::Space* space); Specter::RootView* SetupRootView(); SplashScreen* SetupSplashView(); void SetupEditorView(); @@ -72,4 +72,4 @@ public: } -#endif // RUDE_VIEW_MANAGER_HPP +#endif // URDE_VIEW_MANAGER_HPP diff --git a/Editor/locale/CMakeLists.txt b/Editor/locale/CMakeLists.txt index 3bb3b776b..5a3e37272 100644 --- a/Editor/locale/CMakeLists.txt +++ b/Editor/locale/CMakeLists.txt @@ -1,7 +1,7 @@ bintoc(en_US.c en_US.yaml L_en_US) bintoc(en_GB.c en_GB.yaml L_en_GB) bintoc(ja_JP.c ja_JP.yaml L_ja_JP) -add_library(RudeLocales +add_library(UrdeLocales en_US.yaml en_US.c en_GB.yaml en_GB.c ja_JP.yaml ja_JP.c diff --git a/Editor/locale/locale.cpp b/Editor/locale/locale.cpp index 9c323484f..c4cbe4ecf 100644 --- a/Editor/locale/locale.cpp +++ b/Editor/locale/locale.cpp @@ -12,7 +12,7 @@ extern "C" size_t L_en_GB_SZ; extern "C" const uint8_t L_ja_JP[]; extern "C" size_t L_ja_JP_SZ; -namespace RUDE +namespace URDE { static const Specter::Locale Locales[] = diff --git a/Editor/locale/locale.hpp b/Editor/locale/locale.hpp index fe7c2bda3..7d7e9b94f 100644 --- a/Editor/locale/locale.hpp +++ b/Editor/locale/locale.hpp @@ -1,9 +1,9 @@ -#ifndef RUDE_LOCALE_HPP -#define RUDE_LOCALE_HPP +#ifndef URDE_LOCALE_HPP +#define URDE_LOCALE_HPP #include -namespace RUDE +namespace URDE { std::vector> ListLocales(); @@ -12,4 +12,4 @@ const Specter::Locale* SystemLocaleOrEnglish(); } -#endif // RUDE_LOCALE_HPP +#endif // URDE_LOCALE_HPP diff --git a/Editor/main.cpp b/Editor/main.cpp index bf22749cc..b5e80404c 100644 --- a/Editor/main.cpp +++ b/Editor/main.cpp @@ -6,7 +6,7 @@ #include #include "ViewManager.hpp" -namespace RUDE +namespace URDE { struct Application : boo::IApplicationCallback { @@ -17,7 +17,7 @@ struct Application : boo::IApplicationCallback bool m_running = true; Application() : - m_fileMgr(_S("rude")), + m_fileMgr(_S("urde")), m_cvarManager(m_fileMgr), m_viewManager(m_fileMgr, m_cvarManager) {} @@ -52,9 +52,9 @@ int main(int argc, const boo::SystemChar** argv) #endif { LogVisor::RegisterConsoleLogger(); - RUDE::Application appCb; + URDE::Application appCb; int ret = boo::ApplicationRun(boo::IApplication::EPlatformType::Auto, - appCb, _S("rude"), _S("RUDE"), argc, argv, false); + appCb, _S("urde"), _S("URDE"), argc, argv, false); printf("IM DYING!!\n"); return ret; } diff --git a/hecl b/hecl index 8c25ff6ab..56396769e 160000 --- a/hecl +++ b/hecl @@ -1 +1 @@ -Subproject commit 8c25ff6ab6428cb37977987b3e8f46d120d508c4 +Subproject commit 56396769ec2f309e6931a65cd0727eaa1d0f4596