From 7b8f1b9a61dc39ad9cef766f01afe29f454fe870 Mon Sep 17 00:00:00 2001 From: Jan Boon Date: Sun, 29 Mar 2020 10:00:30 +0800 Subject: [PATCH 1/7] Update azure-pipelines.yml --- azure-pipelines.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 0e8396061..8108a1917 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -33,10 +33,10 @@ jobs: mkdir build cmake --version cd build - cmake -DWITH_STATIC=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL_SAMPLES=ON -DWITH_LUA51=ON -DWITH_RYZOM=ON -DWITH_RYZOM_SERVER=ON -DWITH_RYZOM_CLIENT=ON -DWITH_RYZOM_TOOLS=ON -DWITH_NEL_TOOLS=ON -DWITH_NELNS=ON -DWITH_NELNS_LOGIN_SYSTEM=ON -DWITH_NELNS_SERVER=ON -DWITH_QT5=ON -DWITH_LIBGSF=ON ../code + cmake -DWITH_STATIC=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL_SAMPLES=ON -DWITH_LUA51=ON -DWITH_RYZOM=ON -DWITH_RYZOM_SERVER=ON -DWITH_RYZOM_CLIENT=ON -DWITH_RYZOM_TOOLS=ON -DWITH_NEL_TOOLS=ON -DWITH_NELNS=ON -DWITH_NELNS_LOGIN_SYSTEM=ON -DWITH_NELNS_SERVER=ON -DWITH_QT5=ON -DWITH_LIBGSF=ON .. cat CMakeCache.txt displayName: 'CMake' - script: | cd build make -j`nproc` - displayName: 'Make' \ No newline at end of file + displayName: 'Make' From d036b616b5a546d1ae9bb9d0e89fa3c6c14b1621 Mon Sep 17 00:00:00 2001 From: Jan Boon Date: Sun, 29 Mar 2020 11:11:56 +0800 Subject: [PATCH 2/7] Update azure-pipelines.yml --- azure-pipelines.yml | 41 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 8108a1917..10d0b1e63 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -40,3 +40,44 @@ jobs: cd build make -j`nproc` displayName: 'Make' + - job: ubuntu18 + timeoutInMinutes: 120 + pool: + vmImage: 'ubuntu-18.04' + steps: + - script: | + sudo apt update + sudo apt install -y software-properties-common + # sudo add-apt-repository ppa:ubuntu-toolchain-r/test + sudo apt update + sudo apt install cmake build-essential -y + sudo apt install gcc-8 g++-8 -y + sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 60 + sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 60 + sudo apt install bison autoconf automake -y + sudo apt install libpng-dev -y + sudo apt install libjpeg-dev -y + sudo apt install libgif-dev libfreetype6-dev -y + sudo apt install freeglut3-dev -y + sudo apt install liblua5.2-dev libluabind-dev libcpptest-dev -y + sudo apt install libogg-dev libvorbis-dev libopenal-dev -y + sudo apt install libavcodec-dev libavformat-dev libavdevice-dev libswscale-dev libpostproc-dev -y + sudo apt install libmysqlclient-dev -y + sudo apt install libxml2-dev -y + sudo apt install libcurl4-openssl-dev libssl-dev -y + sudo apt install libsquish-dev -y + sudo apt install liblzma-dev -y + sudo apt install libgsf-1-dev -y + sudo apt install qtbase5-dev qttools5-dev qttools5-dev-tools + displayName: 'Dependencies' + - script: | + mkdir build + cmake --version + cd build + cmake -DWITH_STATIC=ON -DWITH_NEL_TESTS=OFF -DWITH_NEL_SAMPLES=ON -DWITH_LUA51=OFF -DWITH_LUA52=ON -DWITH_RYZOM=ON -DWITH_RYZOM_SERVER=ON -DWITH_RYZOM_CLIENT=ON -DWITH_RYZOM_TOOLS=ON -DWITH_NEL_TOOLS=ON -DWITH_NELNS=ON -DWITH_NELNS_LOGIN_SYSTEM=ON -DWITH_NELNS_SERVER=ON -DWITH_QT5=ON -DWITH_LIBGSF=ON .. + cat CMakeCache.txt + displayName: 'CMake' + - script: | + cd build + make -j`nproc` + displayName: 'Make' From d2d89ac44fd76d57838339e98b711f24eaa86160 Mon Sep 17 00:00:00 2001 From: Jan Boon Date: Sun, 29 Mar 2020 14:02:39 +0800 Subject: [PATCH 3/7] Simplified default folder structure --- nel/tools/build_gamedata/0_setup.py | 48 ++++++++++++++--------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/nel/tools/build_gamedata/0_setup.py b/nel/tools/build_gamedata/0_setup.py index 00d19cbe6..115962b8f 100755 --- a/nel/tools/build_gamedata/0_setup.py +++ b/nel/tools/build_gamedata/0_setup.py @@ -78,63 +78,63 @@ if not args.noconf: try: WorkspaceDirectory except NameError: - WorkspaceDirectory = "L:/workspace" + WorkspaceDirectory = "R:/workspace" try: DatabaseDirectory except NameError: - DatabaseDirectory = "W:/database" + DatabaseDirectory = "R:/graphics" try: SoundDirectory except NameError: - SoundDirectory = "V:" + SoundDirectory = "R:/sound" try: SoundDfnDirectory except NameError: - SoundDfnDirectory = "V:/DFN" + SoundDfnDirectory = "R:/sound/DFN" try: ExportBuildDirectory except NameError: - ExportBuildDirectory = "T:/export" + ExportBuildDirectory = "R:/pipeline/export" try: InstallDirectory except NameError: - InstallDirectory = "T:/install" + InstallDirectory = "R:/pipeline/install" try: ClientDevDirectory except NameError: - ClientDevDirectory = "T:/client_dev" + ClientDevDirectory = "R:/pipeline/client_dev" try: ClientPatchDirectory except NameError: - ClientPatchDirectory = "T:/client_patch" + ClientPatchDirectory = "R:/pipeline/client_patch" try: ClientInstallDirectory except NameError: - ClientInstallDirectory = "T:/client_install" + ClientInstallDirectory = "R:/pipeline/client_install" try: ShardInstallDirectory except NameError: - ShardInstallDirectory = "T:/shard" + ShardInstallDirectory = "R:/pipeline/shard" try: WorldEditInstallDirectory except NameError: - WorldEditInstallDirectory = "T:/worldedit" + WorldEditInstallDirectory = "R:/pipeline/worldedit" try: LeveldesignDirectory except NameError: - LeveldesignDirectory = "L:/leveldesign" + LeveldesignDirectory = "R:/leveldesign" try: LeveldesignDfnDirectory except NameError: - LeveldesignDfnDirectory = "L:/leveldesign/DFN" + LeveldesignDfnDirectory = "R:/leveldesign/DFN" try: LeveldesignWorldDirectory except NameError: - LeveldesignWorldDirectory = "L:/leveldesign/world" + LeveldesignWorldDirectory = "R:/leveldesign/world" try: PrimitivesDirectory except NameError: - PrimitivesDirectory = "L:/primitives" + PrimitivesDirectory = "R:/leveldesign/primitives" try: GamedevDirectory except NameError: @@ -150,15 +150,15 @@ if not args.noconf: try: LeveldesignDataShardDirectory except NameError: - LeveldesignDataShardDirectory = "L:/shard" + LeveldesignDataShardDirectory = "R:/leveldesign/shard" try: LeveldesignDataCommonDirectory except NameError: - LeveldesignDataCommonDirectory = "L:/common" + LeveldesignDataCommonDirectory = "R:/leveldesign/common" try: TranslationDirectory except NameError: - TranslationDirectory = "L:/translation" + TranslationDirectory = "R:/leveldesign/translation" try: WorldEditorFilesDirectory except NameError: @@ -166,27 +166,27 @@ if not args.noconf: try: WindowsExeDllCfgDirectories except NameError: - WindowsExeDllCfgDirectories = [ 'C:/Program Files (x86)/Microsoft Visual Studio 9.0/VC/redist/x86', 'D:/libraries/external/bin', 'R:/build/dev/bin/Release', 'R:/code/ryzom/client', 'R:/code/nel/lib', 'R:/code/ryzom/bin', 'R:/code/ryzom/tools/client/client_config/bin' ] + WindowsExeDllCfgDirectories = [ 'C:/Program Files (x86)/Microsoft Visual Studio 9.0/VC/redist/x86', 'R:/external/bin', 'R:/build/dev/bin/Release', 'R:/code/ryzom/client', 'R:/code/nel/lib', 'R:/code/ryzom/bin', 'R:/code/ryzom/tools/client/client_config/bin' ] try: LinuxServiceExecutableDirectory except NameError: - LinuxServiceExecutableDirectory = "S:/devls_x64/bin" + LinuxServiceExecutableDirectory = "R:/build/gcc_server/bin" try: LinuxClientExecutableDirectory except NameError: - LinuxClientExecutableDirectory = "S:/devl_x64/bin" + LinuxClientExecutableDirectory = "R:/build/gcc_client/bin" try: PatchmanCfgAdminDirectory except NameError: - PatchmanCfgAdminDirectory = "R:/code/ryzom/server/patchman_cfg/admin_install" + PatchmanCfgAdminDirectory = "R:/patchman/admin_install" try: PatchmanCfgDefaultDirectory except NameError: - PatchmanCfgDefaultDirectory = "R:/code/ryzom/server/patchman_cfg/default" + PatchmanCfgDefaultDirectory = "R:/patchman/default" try: PatchmanBridgeServerDirectory except NameError: - PatchmanBridgeServerDirectory = "T:/bridge_server" + PatchmanBridgeServerDirectory = "R:/pipeline/bridge_server" try: SignToolExecutable except NameError: From c9163412ade7ac204bbd704370c2e02e8359fdfb Mon Sep 17 00:00:00 2001 From: Jan Boon Date: Sun, 29 Mar 2020 14:05:07 +0800 Subject: [PATCH 4/7] Simplified default folder structure --- nel/tools/build_gamedata/0_setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nel/tools/build_gamedata/0_setup.py b/nel/tools/build_gamedata/0_setup.py index 115962b8f..de868d8eb 100755 --- a/nel/tools/build_gamedata/0_setup.py +++ b/nel/tools/build_gamedata/0_setup.py @@ -66,7 +66,7 @@ if not args.noconf: try: ToolDirectories except NameError: - ToolDirectories = [ 'R:/build/dev/bin/Release', 'D:/libraries/external/bin' ] + ToolDirectories = [ 'R:/build/dev/bin/Release', 'R:/external/bin' ] try: ToolSuffix except NameError: @@ -78,7 +78,7 @@ if not args.noconf: try: WorkspaceDirectory except NameError: - WorkspaceDirectory = "R:/workspace" + WorkspaceDirectory = "R:/leveldesign/workspace" try: DatabaseDirectory except NameError: From b713dccdc95b03a120dc5f393ef6c78beca2b757 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Sun, 29 Mar 2020 17:01:39 +0800 Subject: [PATCH 5/7] Retarget to R:\leveldesign and R:\graphics --- .../data/world_editor_classes.xml | 4 +- .../stream_file/data/world_editor_classes.xml | 4 +- nel/tools/3d/build_gamedata/cfg/site.cfg | 2 +- .../processes/rbank/cfg/template_draft.cfg | 2 +- .../processes/rbank/cfg/template_final.cfg | 2 +- nel/tools/3d/ig_elevation/main.cpp | 4 +- nel/tools/3d/object_viewer/object_viewer.cfg | 46 +-- .../3d/pipeline_max_rewrite_assets/main.cpp | 2 +- .../scripts/nel_assets_dump_timings.ms | 4 +- .../scripts/nel_assets_png_batched.ms | 4 +- .../scripts/nel_assets_ps_batched.ms | 4 +- .../plugin_max/scripts/nel_assets_resave.ms | 4 +- .../scripts/nel_assets_resave_hard.ms | 4 +- .../scripts/nel_old_zone_to_ligo.ms | 8 +- .../plugin_max/scripts/nel_zone_snapshot.ms | 4 +- nel/tools/misc/data_mirror/config.cfg | 4 +- nel/tools/pacs/build_rbank/prim_checker.cpp | 2 +- .../sound/build_sound/build_sound_readme.txt | 4 +- .../sound/build_sound/build_sound_script.bat | 2 +- .../build_soundbank_readme.txt | 4 +- .../build_soundbank_script.bat | 2 +- .../world_editor_classes.xml | 344 +++++++++--------- .../leveldesign/georges_dll/georges_edit.html | 4 +- .../icon_search/icon_search_default.cfg | 8 +- ryzom/tools/leveldesign/install/georges.cfg | 8 +- .../leveldesign/install/mission_compiler.cfg | 8 +- .../install/world_editor_plugin.cfg | 8 +- .../install/world_editor_script.xml | 12 +- .../leveldesign/mission_compiler_lib/main.cpp | 2 +- .../mp_generator/raw_material_generation.cfg | 4 +- .../primitive_id_assignator.cfg | 4 +- .../sheets_packer_shard.cpp | 2 +- .../bnp_manager/bnp_manager_window.cpp | 2 +- .../plugins/core/general_settings_page.cpp | 8 +- .../georges_editor/georges_editor_form.cpp | 6 +- .../georges_treeview_dialog.cpp | 2 +- 36 files changed, 269 insertions(+), 269 deletions(-) diff --git a/nel/samples/sound/sound_sources/data/world_editor_classes.xml b/nel/samples/sound/sound_sources/data/world_editor_classes.xml index 0a26dc5f0..031fc6e86 100644 --- a/nel/samples/sound/sound_sources/data/world_editor_classes.xml +++ b/nel/samples/sound/sound_sources/data/world_editor_classes.xml @@ -323,7 +323,7 @@ --> - + @@ -343,7 +343,7 @@ - + diff --git a/nel/samples/sound/stream_file/data/world_editor_classes.xml b/nel/samples/sound/stream_file/data/world_editor_classes.xml index 0a26dc5f0..031fc6e86 100644 --- a/nel/samples/sound/stream_file/data/world_editor_classes.xml +++ b/nel/samples/sound/stream_file/data/world_editor_classes.xml @@ -323,7 +323,7 @@ --> - + @@ -343,7 +343,7 @@ - + diff --git a/nel/tools/3d/build_gamedata/cfg/site.cfg b/nel/tools/3d/build_gamedata/cfg/site.cfg index 7314415cd..6c5614d73 100644 --- a/nel/tools/3d/build_gamedata/cfg/site.cfg +++ b/nel/tools/3d/build_gamedata/cfg/site.cfg @@ -22,4 +22,4 @@ database_server = client_directory = R:/code/snowballs2/client/data/3d # DFN directories -dfn_directory = L:\leveldesign\DFN +dfn_directory = R:\leveldesign\DFN diff --git a/nel/tools/3d/build_gamedata/processes/rbank/cfg/template_draft.cfg b/nel/tools/3d/build_gamedata/processes/rbank/cfg/template_draft.cfg index 78d66d0d8..83f58a4bf 100644 --- a/nel/tools/3d/build_gamedata/processes/rbank/cfg/template_draft.cfg +++ b/nel/tools/3d/build_gamedata/processes/rbank/cfg/template_draft.cfg @@ -7,7 +7,7 @@ BanksPath = "../smallbank/smallbank/"; Bank = "rbank_bank_name"; ZoneExt = ".zonew"; IGBoxes = "bbox/temp.bbox"; -LevelDesignWorldPath = "l:/leveldesign/World"; +LevelDesignWorldPath = "R:/leveldesign/world"; IgLandPath = "../ig/ig_land"; IgVillagePath = "../ig/ig_other"; diff --git a/nel/tools/3d/build_gamedata/processes/rbank/cfg/template_final.cfg b/nel/tools/3d/build_gamedata/processes/rbank/cfg/template_final.cfg index c8ee2e7b7..be54b55a1 100644 --- a/nel/tools/3d/build_gamedata/processes/rbank/cfg/template_final.cfg +++ b/nel/tools/3d/build_gamedata/processes/rbank/cfg/template_final.cfg @@ -7,7 +7,7 @@ BanksPath = "../smallbank/smallbank/"; Bank = "rbank_bank_name"; ZoneExt = ".zonew"; IGBoxes = "bbox/temp.bbox"; -LevelDesignWorldPath = "l:/leveldesign/World"; +LevelDesignWorldPath = "R:/leveldesign/world"; IgLandPath = "../ig/ig_land"; IgVillagePath = "../ig/ig_other"; diff --git a/nel/tools/3d/ig_elevation/main.cpp b/nel/tools/3d/ig_elevation/main.cpp index 0d43b5acc..126c66c62 100644 --- a/nel/tools/3d/ig_elevation/main.cpp +++ b/nel/tools/3d/ig_elevation/main.cpp @@ -256,9 +256,9 @@ int main(int nNbArg, char**ppArgs) printf ("InputIGDir = \"ig_land_max\";\n"); printf ("OutputIGDir = \"ig_land_max_elev\";\n"); printf ("CellSize = 160.0;\n"); - printf ("HeightMapFile1 = \"w:/database/landscape/ligo/jungle/big.tga\";\n"); + printf ("HeightMapFile1 = \"R:/graphics/landscape/ligo/jungle/big.tga\";\n"); printf ("ZFactor1 = 1.0;\n"); - printf ("HeightMapFile2 = \"w:/database/landscape/ligo/jungle/noise.tga\";\n"); + printf ("HeightMapFile2 = \"R:/graphics/landscape/ligo/jungle/noise.tga\";\n"); printf ("ZFactor2 = 0.5;\n"); printf ("LandFile = \"w:/matis.land\";\n"); diff --git a/nel/tools/3d/object_viewer/object_viewer.cfg b/nel/tools/3d/object_viewer/object_viewer.cfg index 25e48d7fc..712731d27 100644 --- a/nel/tools/3d/object_viewer/object_viewer.cfg +++ b/nel/tools/3d/object_viewer/object_viewer.cfg @@ -3,29 +3,29 @@ // your searhc pathes, (where to find textures, shapes, tiles, zones ...) search_pathes = { - "w:\database\stuff\fyros\agents\_textures\actors", - "w:\database\stuff\tryker\agents\_textures\actors", - "w:\database\stuff\matis\agents\_textures\actors", - "w:\database\stuff\zorai\agents\_textures\actors", - "w:\database\stuff\fyros\agents\_textures\monster", - "w:\database\stuff\tryker\agents\_textures\monster", - "w:\database\stuff\matis\agents\_textures\monster", - "w:\database\stuff\zorai\agents\_textures\monster", - "w:\database\stuff\fyros\agents\_textures\accessories", - "w:\database\stuff\tryker\agents\_textures\accessories", - "w:\database\stuff\matis\agents\_textures\accessories", - "w:\database\stuff\zorai\agents\_textures\accessories", - "W:\Database\Stuff\Matis\Decors\_textures\batiments", - "W:\Database\Stuff\zorai\Decors\_textures\batiments", - "W:\Database\Stuff\tryker\Decors\_textures\batiments", - "W:\Database\Stuff\fyros\Decors\_textures\batiments", - "W:\Database\Stuff\fyros\Decors\_textures", - "W:\Database\SFX\maps", - "W:\Database\SFX\old_shapes", - "W:\Database\Stuff\Primes_Racines\Agents\_textures\Monster", - "W:\Database\Stuff\Jungle\Agents\_textures\Monster", - "W:\Database\Stuff\Goo\Agents\_textures\monster", - "W:\Database\Stuff\caravan\Agents\_textures\Actors", + "R:\graphics\stuff\fyros\agents\_textures\actors", + "R:\graphics\stuff\tryker\agents\_textures\actors", + "R:\graphics\stuff\matis\agents\_textures\actors", + "R:\graphics\stuff\zorai\agents\_textures\actors", + "R:\graphics\stuff\fyros\agents\_textures\monster", + "R:\graphics\stuff\tryker\agents\_textures\monster", + "R:\graphics\stuff\matis\agents\_textures\monster", + "R:\graphics\stuff\zorai\agents\_textures\monster", + "R:\graphics\stuff\fyros\agents\_textures\accessories", + "R:\graphics\stuff\tryker\agents\_textures\accessories", + "R:\graphics\stuff\matis\agents\_textures\accessories", + "R:\graphics\stuff\zorai\agents\_textures\accessories", + "R:\graphics\Stuff\Matis\Decors\_textures\batiments", + "R:\graphics\Stuff\zorai\Decors\_textures\batiments", + "R:\graphics\Stuff\tryker\Decors\_textures\batiments", + "R:\graphics\Stuff\fyros\Decors\_textures\batiments", + "R:\graphics\Stuff\fyros\Decors\_textures", + "R:\graphics\SFX\maps", + "R:\graphics\SFX\old_shapes", + "R:\graphics\Stuff\Primes_Racines\Agents\_textures\Monster", + "R:\graphics\Stuff\Jungle\Agents\_textures\Monster", + "R:\graphics\Stuff\Goo\Agents\_textures\monster", + "R:\graphics\Stuff\caravan\Agents\_textures\Actors", }; recursive_search_pathes= diff --git a/nel/tools/3d/pipeline_max_rewrite_assets/main.cpp b/nel/tools/3d/pipeline_max_rewrite_assets/main.cpp index e28d87627..1fdae49ee 100644 --- a/nel/tools/3d/pipeline_max_rewrite_assets/main.cpp +++ b/nel/tools/3d/pipeline_max_rewrite_assets/main.cpp @@ -427,7 +427,7 @@ void doFileInitialize(const std::string &filePath) KnownFileCache[NLMISC::CFile::getFilename(filePath)] = standardizePath(filePath, false); } -// maxRewritePaths W:/database/interfaces/anims_max +// maxRewritePaths R:/graphics/interfaces/anims_max void doDirectoryInitialize(const std::string &directoryPath) { diff --git a/nel/tools/3d/plugin_max/scripts/nel_assets_dump_timings.ms b/nel/tools/3d/plugin_max/scripts/nel_assets_dump_timings.ms index 2730ce345..13a14a36a 100644 --- a/nel/tools/3d/plugin_max/scripts/nel_assets_dump_timings.ms +++ b/nel/tools/3d/plugin_max/scripts/nel_assets_dump_timings.ms @@ -4,7 +4,7 @@ NEL3D_APPDATA_INTERFACE_FILE = 1423062700 -- Allocate 20 Me for the script heapSize += 30000000 -nlErrorFilename = "W:/database/timings.log" +nlErrorFilename = "R:/graphics/timings.log" nlErrorStream = openFile nlErrorFilename mode:"w" if nlErrorStream == undefined then nlErrorStream = createFile nlErrorFilename @@ -171,7 +171,7 @@ rollout assets_resave_rollout "Properties" ProgressText.text = "In directory "+currentDirectory+", compute file \"" + (getFilenameFile file) + "\"" Progress.value = i*100/files.count - if (UseTag.checked == false) or ((NeLTestFileDate file "W:/database/conversion.tag") == true) then + if (UseTag.checked == false) or ((NeLTestFileDate file "R:/graphics/conversion.tag") == true) then ( resetMAXFile #noprompt diff --git a/nel/tools/3d/plugin_max/scripts/nel_assets_png_batched.ms b/nel/tools/3d/plugin_max/scripts/nel_assets_png_batched.ms index cb6c339c8..11210371d 100644 --- a/nel/tools/3d/plugin_max/scripts/nel_assets_png_batched.ms +++ b/nel/tools/3d/plugin_max/scripts/nel_assets_png_batched.ms @@ -4,7 +4,7 @@ NEL3D_APPDATA_INTERFACE_FILE = 1423062700 -- Allocate 20 Me for the script heapSize += 15000000 -nlErrorFilename = "W:/database/conversion.log" +nlErrorFilename = "R:/graphics/conversion.log" nlErrorStream = openFile nlErrorFilename mode:"w" if nlErrorStream == undefined then nlErrorStream = createFile nlErrorFilename @@ -447,7 +447,7 @@ rollout assets_png_rollout "Properties" ProgressText.text = "In directory "+currentDirectory+", compute file \"" + (getFilenameFile file) + "\"" Progress.value = i*100/files.count - if (UseTag.checked == false) or ((NeLTestFileDate file "W:/database/conversion.tag") == true) then + if (UseTag.checked == false) or ((NeLTestFileDate file "R:/graphics/conversion.tag") == true) then ( resetMAXFile #noprompt diff --git a/nel/tools/3d/plugin_max/scripts/nel_assets_ps_batched.ms b/nel/tools/3d/plugin_max/scripts/nel_assets_ps_batched.ms index c4bc56800..4d373d2f3 100644 --- a/nel/tools/3d/plugin_max/scripts/nel_assets_ps_batched.ms +++ b/nel/tools/3d/plugin_max/scripts/nel_assets_ps_batched.ms @@ -4,7 +4,7 @@ NEL3D_APPDATA_INTERFACE_FILE = 1423062700 -- Allocate 20 Me for the script heapSize += 15000000 -nlErrorFilename = "W:/database/conversion.log" +nlErrorFilename = "R:/graphics/conversion.log" nlErrorStream = openFile nlErrorFilename mode:"w" if nlErrorStream == undefined then nlErrorStream = createFile nlErrorFilename @@ -230,7 +230,7 @@ rollout assets_ps_rollout "Properties" ProgressText.text = "In directory "+currentDirectory+", compute file \"" + (getFilenameFile file) + "\"" Progress.value = i*100/files.count - if (UseTag.checked == false) or ((NeLTestFileDate file "W:/database/conversion.tag") == true) then + if (UseTag.checked == false) or ((NeLTestFileDate file "R:/graphics/conversion.tag") == true) then ( resetMAXFile #noprompt diff --git a/nel/tools/3d/plugin_max/scripts/nel_assets_resave.ms b/nel/tools/3d/plugin_max/scripts/nel_assets_resave.ms index dcd8fde63..6ca4ef334 100644 --- a/nel/tools/3d/plugin_max/scripts/nel_assets_resave.ms +++ b/nel/tools/3d/plugin_max/scripts/nel_assets_resave.ms @@ -4,7 +4,7 @@ NEL3D_APPDATA_INTERFACE_FILE = 1423062700 -- Allocate 20 Me for the script heapSize += 15000000 -nlErrorFilename = "W:/database/conversion.log" +nlErrorFilename = "R:/graphics/conversion.log" nlErrorStream = openFile nlErrorFilename mode:"w" if nlErrorStream == undefined then nlErrorStream = createFile nlErrorFilename @@ -171,7 +171,7 @@ rollout assets_resave_rollout "Properties" ProgressText.text = "In directory "+currentDirectory+", compute file \"" + (getFilenameFile file) + "\"" Progress.value = i*100/files.count - if (UseTag.checked == false) or ((NeLTestFileDate file "W:/database/conversion.tag") == true) then + if (UseTag.checked == false) or ((NeLTestFileDate file "R:/graphics/conversion.tag") == true) then ( resetMAXFile #noprompt diff --git a/nel/tools/3d/plugin_max/scripts/nel_assets_resave_hard.ms b/nel/tools/3d/plugin_max/scripts/nel_assets_resave_hard.ms index 50bd4efe9..95ea26f45 100644 --- a/nel/tools/3d/plugin_max/scripts/nel_assets_resave_hard.ms +++ b/nel/tools/3d/plugin_max/scripts/nel_assets_resave_hard.ms @@ -4,7 +4,7 @@ NEL3D_APPDATA_INTERFACE_FILE = 1423062700 -- Allocate 20 Me for the script heapSize += 15000000 -nlErrorFilename = "W:/database/conversion.log" +nlErrorFilename = "R:/graphics/conversion.log" nlErrorStream = openFile nlErrorFilename mode:"w" if nlErrorStream == undefined then nlErrorStream = createFile nlErrorFilename @@ -171,7 +171,7 @@ rollout assets_resave_rollout "Properties" ProgressText.text = "In directory "+currentDirectory+", compute file \"" + (getFilenameFile file) + "\"" Progress.value = i*100/files.count - if (UseTag.checked == false) or ((NeLTestFileDate file "W:/database/conversion.tag") == true) then + if (UseTag.checked == false) or ((NeLTestFileDate file "R:/graphics/conversion.tag") == true) then ( resetMAXFile #noprompt diff --git a/nel/tools/3d/plugin_max/scripts/nel_old_zone_to_ligo.ms b/nel/tools/3d/plugin_max/scripts/nel_old_zone_to_ligo.ms index bb065cfef..4dbd67e40 100644 --- a/nel/tools/3d/plugin_max/scripts/nel_old_zone_to_ligo.ms +++ b/nel/tools/3d/plugin_max/scripts/nel_old_zone_to_ligo.ms @@ -34,12 +34,12 @@ struct metazone (name, posMin, posMax) -- Trykers : X: [194 - 215] Y: [DV - EW] Generate : X: [96 - 115] Y: [-215 - -215+22] -- Parameters, uppercase for cell position -old_zone_directory_fyros = "w:/database/landscape/zones/fyros" -ligo_directory_fyros = "w:/database/landscape/ligo/desert" +old_zone_directory_fyros = "R:/graphics/landscape/zones/fyros" +ligo_directory_fyros = "R:/graphics/landscape/ligo/desert" metazones_fyros = #(metazone "1_MZ_city" "152_EK" "155_EO", metazone "bridge_a" "158_EM" "158_EO", metazone "brandon" "164_ES" "165_ET", metazone "ecorce_A" "155_EI" "157_EJ") -old_zone_directory_tryker = "w:/database/landscape/zones/tryker" -ligo_directory_tryker = "r:/database/landscape/ligo/lacustre" +old_zone_directory_tryker = "R:/graphics/landscape/zones/tryker" +ligo_directory_tryker = "R:/graphics/landscape/ligo/lacustre" metazones_tryker = #(metazone "village_a" "205_EC" "208_EE", metazone "village_b" "199_EH" "200_EI", metazone "village_c" "206_EH" "208_EJ", metazone "village_d" "206_DS" "208_DU") cell_size = 160.0 diff --git a/nel/tools/3d/plugin_max/scripts/nel_zone_snapshot.ms b/nel/tools/3d/plugin_max/scripts/nel_zone_snapshot.ms index edab4f35d..b964498a1 100644 --- a/nel/tools/3d/plugin_max/scripts/nel_zone_snapshot.ms +++ b/nel/tools/3d/plugin_max/scripts/nel_zone_snapshot.ms @@ -5,8 +5,8 @@ size_x = 7680-320 from_y = -25600+160 size_y = 5120-320 -targetdir = "W:/database/landscape/ligo/asteroids/max" -snapshotdir = "W:/database/landscape/ligo/asteroids/zonebitmaps" +targetdir = "R:/graphics/landscape/ligo/asteroids/max" +snapshotdir = "R:/graphics/landscape/ligo/asteroids/zonebitmaps" zonename = "anne" resumeonly = true diff --git a/nel/tools/misc/data_mirror/config.cfg b/nel/tools/misc/data_mirror/config.cfg index b4a970025..2e33d2328 100644 --- a/nel/tools/misc/data_mirror/config.cfg +++ b/nel/tools/misc/data_mirror/config.cfg @@ -1,5 +1,5 @@ -MainDirectory = "w:\database"; -MirrorDirectory = "q:\database"; +MainDirectory = "R:\graphics"; +MirrorDirectory = "Q:\graphics"; LogDirectory = ""; BinaryCompare = "false"; IgnoreDirectory = ""; \ No newline at end of file diff --git a/nel/tools/pacs/build_rbank/prim_checker.cpp b/nel/tools/pacs/build_rbank/prim_checker.cpp index cef6b36ae..3b8c11bf9 100644 --- a/nel/tools/pacs/build_rbank/prim_checker.cpp +++ b/nel/tools/pacs/build_rbank/prim_checker.cpp @@ -72,7 +72,7 @@ bool CPrimChecker::build(const string &primitivesPath, const string &igLandPath, // Init ligo if (!LigoConfig.readPrimitiveClass ("world_editor_classes.xml", false)) { - // Should be in l:\leveldesign\world_edit_files + // Should be in R:\leveldesign\world_edit_files nlwarning ("Can't load ligo primitive config file world_editor_classes.xml"); return false; } diff --git a/nel/tools/sound/build_sound/build_sound_readme.txt b/nel/tools/sound/build_sound/build_sound_readme.txt index c94157884..436996051 100644 --- a/nel/tools/sound/build_sound/build_sound_readme.txt +++ b/nel/tools/sound/build_sound/build_sound_readme.txt @@ -3,8 +3,8 @@ build_sound -leveldesign = L:\leveldesign\ -dfn = L:\leveldesign\dfn\ +leveldesign = R:\leveldesign\ +dfn = R:\leveldesign\dfn\ source_samplebanks = L:\assets\sound\samplebanks\ build_packed_sheets = L:\build\sound_sheets\ build_samplebanks = L:\build\sound_samplebanks\ diff --git a/nel/tools/sound/build_sound/build_sound_script.bat b/nel/tools/sound/build_sound/build_sound_script.bat index 343a02bbc..ce4a388c5 100644 --- a/nel/tools/sound/build_sound/build_sound_script.bat +++ b/nel/tools/sound/build_sound/build_sound_script.bat @@ -1 +1 @@ -build_sound_r L:\leveldesign\ L:\leveldesign\dfn\ L:\assets\sound\samplebanks\ L:\build\sound_sheets\ L:\build\sound_samplebanks +build_sound_r R:\leveldesign\ R:\leveldesign\dfn\ L:\assets\sound\samplebanks\ L:\build\sound_sheets\ L:\build\sound_samplebanks diff --git a/nel/tools/sound/build_soundbank/build_soundbank_readme.txt b/nel/tools/sound/build_soundbank/build_soundbank_readme.txt index ad22f55a0..126086855 100644 --- a/nel/tools/sound/build_soundbank/build_soundbank_readme.txt +++ b/nel/tools/sound/build_soundbank/build_soundbank_readme.txt @@ -3,8 +3,8 @@ build_soundbank -leveldesign = L:\leveldesign\ -dfn = L:\leveldesign\dfn\ +leveldesign = R:\leveldesign\ +dfn = R:\leveldesign\dfn\ build_packed_sheets = L:\build\sound_sheets\ Where L:\ is your game content database. diff --git a/nel/tools/sound/build_soundbank/build_soundbank_script.bat b/nel/tools/sound/build_soundbank/build_soundbank_script.bat index 9f1d3c8b3..c6d2d4ee6 100644 --- a/nel/tools/sound/build_soundbank/build_soundbank_script.bat +++ b/nel/tools/sound/build_soundbank/build_soundbank_script.bat @@ -1 +1 @@ -build_soundbank_r L:\leveldesign\ L:\leveldesign\dfn\ L:\build\sound_sheets\ +build_soundbank_r R:\leveldesign\ R:\leveldesign\dfn\ L:\build\sound_sheets\ diff --git a/ryzom/common/data_leveldesign/leveldesign/world_editor_files/world_editor_classes.xml b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/world_editor_classes.xml index fb12350e3..b1d559365 100644 --- a/ryzom/common/data_leveldesign/leveldesign/world_editor_files/world_editor_classes.xml +++ b/ryzom/common/data_leveldesign/leveldesign/world_editor_files/world_editor_classes.xml @@ -98,7 +98,7 @@ - + @@ -128,7 +128,7 @@ @@ -147,7 +147,7 @@ - + @@ -159,7 +159,7 @@ - + @@ -175,7 +175,7 @@ - + @@ -1566,15 +1566,15 @@ --> - + - + - + @@ -1596,13 +1596,13 @@ @@ -1704,7 +1704,7 @@ --> - + @@ -1865,7 +1865,7 @@ - + @@ -1888,7 +1888,7 @@ - + @@ -1997,11 +1997,11 @@ - - - - - + + + + + @@ -2014,11 +2014,11 @@ - - - - - + + + + + @@ -2033,11 +2033,11 @@ - - - - - + + + + + @@ -2111,7 +2111,7 @@ - + @@ -2131,7 +2131,7 @@ @@ -2151,7 +2151,7 @@ - + @@ -2166,7 +2166,7 @@ - + @@ -2180,7 +2180,7 @@ - + @@ -2196,7 +2196,7 @@ - + @@ -2470,22 +2470,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -2524,10 +2524,10 @@ --> - + - + @@ -2584,7 +2584,7 @@ --> - + @@ -2603,7 +2603,7 @@ --> - + @@ -2625,21 +2625,21 @@ - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -2731,10 +2731,10 @@ --> - + - + @@ -2772,10 +2772,10 @@ --> - + - + @@ -2813,10 +2813,10 @@ --> - + - + @@ -2839,10 +2839,10 @@ - + - + @@ -2880,7 +2880,7 @@ - + @@ -2899,7 +2899,7 @@ - + @@ -2918,7 +2918,7 @@ - + @@ -2935,7 +2935,7 @@ - + @@ -2964,17 +2964,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -3026,17 +3026,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -3071,11 +3071,11 @@ - + @@ -3119,17 +3119,17 @@ - - - - - - - - - - - + + + + + + + + + + + @@ -3242,7 +3242,7 @@ - + - + @@ -4002,12 +4002,12 @@ --> - + @@ -4030,10 +4030,10 @@ --> - + - + @@ -4063,7 +4063,7 @@ --> - + @@ -4109,7 +4109,7 @@ - + @@ -4129,18 +4129,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -4200,7 +4200,7 @@ - + @@ -4225,18 +4225,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -4318,18 +4318,18 @@ - - - - - - - - - - - - + + + + + + + + + + + + @@ -4504,7 +4504,7 @@ --> - + @@ -4646,7 +4646,7 @@ - + @@ -4681,7 +4681,7 @@ - + @@ -4715,7 +4715,7 @@ --> - + @@ -4749,7 +4749,7 @@ --> - + diff --git a/ryzom/tools/leveldesign/georges_dll/georges_edit.html b/ryzom/tools/leveldesign/georges_dll/georges_edit.html index fefd3e9d5..79da0501f 100644 --- a/ryzom/tools/leveldesign/georges_dll/georges_edit.html +++ b/ryzom/tools/leveldesign/georges_dll/georges_edit.html @@ -16,8 +16,8 @@ Config file Your "georges.cfg" config file MUST have the following entries:
    -
  • root_search_directory = "l:\"; // (Root search path for georges files)
    • -
  • typ_dfn_sub_folder = "dfn"; // (Sub directory for types and dfn files)
    • +
  • root_search_directory = "R:\leveldesign\"; // (Root search path for georges files)
    • +
  • typ_dfn_sub_folder = "DFN"; // (Sub directory for types and dfn files)
  • remember_list_size = 11; // (Size of remember list in combobox)
  • max_undo = 20; // (Size of the undo buffer)
  • default_type = "default.typ"; // (Default type used when insert a new element in a DFN)
    • diff --git a/ryzom/tools/leveldesign/icon_search/icon_search_default.cfg b/ryzom/tools/leveldesign/icon_search/icon_search_default.cfg index b343d9e7d..88fe51b5d 100644 --- a/ryzom/tools/leveldesign/icon_search/icon_search_default.cfg +++ b/ryzom/tools/leveldesign/icon_search/icon_search_default.cfg @@ -7,11 +7,11 @@ SearchGUI = 0; GUIPath = "R:\code\ryzom\data\gamedev\interfaces_v3\"; SearchLevelDesign = 1; -LevelDesignPath = "L:\"; +LevelDesignPath = "R:\leveldesign\"; -IconPath = { "\\amiga\3d\Database\Interfaces\v3_bricks", - "\\amiga\3d\Database\Interfaces\v3_dxtc_misc", - "\\amiga\3d\Database\Interfaces\v3_items" +IconPath = { "R:\graphics\interfaces\v3_bricks", + "R:\graphics\interfaces\v3_dxtc_misc", + "R:\graphics\interfaces\v3_items" }; SizeLimit = 10; diff --git a/ryzom/tools/leveldesign/install/georges.cfg b/ryzom/tools/leveldesign/install/georges.cfg index c7d975479..d108f3100 100644 --- a/ryzom/tools/leveldesign/install/georges.cfg +++ b/ryzom/tools/leveldesign/install/georges.cfg @@ -1,5 +1,5 @@ -RootSearchDirectory = "l:\leveldesign"; -TypDfnSubFolder = "dfn\"; +RootSearchDirectory = "R:\leveldesign"; +TypDfnSubFolder = "DFN\"; RememberListSize = 11; MaxUndo = 20; DefaultType = "default.typ"; @@ -11,5 +11,5 @@ SuperUser = 1; UserType = { }; StartExpanded = 1; -SamplePath = "L:\sound_files\samplebanks"; -PackedSheetPath = "L:\sound_files\"; +SamplePath = "R:\sound\samplebanks"; +PackedSheetPath = "R:\sound\"; diff --git a/ryzom/tools/leveldesign/install/mission_compiler.cfg b/ryzom/tools/leveldesign/install/mission_compiler.cfg index b95c51bdb..c0ee33d1b 100644 --- a/ryzom/tools/leveldesign/install/mission_compiler.cfg +++ b/ryzom/tools/leveldesign/install/mission_compiler.cfg @@ -1,10 +1,10 @@ // A list of recursive search path to build the primitive list -SearchPath = { "L:\primitives\" }; +SearchPath = { "R:\leveldesign\primitives\" }; // Ligo primitive configuration file path -LigoConfig = "L:\leveldesign\world_editor_files\world_editor_classes.xml"; +LigoConfig = "R:\leveldesign\world_editor_files\world_editor_classes.xml"; // Default filter DefaultFilter = ""; @@ -24,7 +24,7 @@ ServerPathPrim = { // Directory containing txt files ServerPathText = { -"R:\code\ryzom\tools\translation\work\phrases\rites", +"R:\leveldesign\translation\work\phrases\rites", // "\\linuxshard10\ryzom\cvs\code\ryzom\translation\work\phrases\rites", }; @@ -35,4 +35,4 @@ ServerName = { }; // Local path for text files -LocalTextPath = "R:\code\ryzom\tools\translation\work\phrases\rites"; +LocalTextPath = "R:\leveldesign\translation\work\phrases\rites"; diff --git a/ryzom/tools/leveldesign/install/world_editor_plugin.cfg b/ryzom/tools/leveldesign/install/world_editor_plugin.cfg index 1fb7d40c6..afeebd355 100644 --- a/ryzom/tools/leveldesign/install/world_editor_plugin.cfg +++ b/ryzom/tools/leveldesign/install/world_editor_plugin.cfg @@ -40,12 +40,12 @@ MOSHost = "devl1.ryzom.com"; ///////////////////////////////////////////////////////// PrimitivePluginPath = { - "L:/leveldesign/DFN", - "L:/leveldesign/Game_elem/Creature/objects", + "R:/leveldesign/DFN", + "R:/leveldesign/game_elem/creature/objects", }; -PrimitivePluginSheetId = "l:/leveldesign/Game_elem/sheet_id.bin"; +PrimitivePluginSheetId = "R:/leveldesign/game_elem/sheet_id.bin"; ///////////////////////////////////////////////////////// // Var related to shard monitor @@ -53,7 +53,7 @@ PrimitivePluginSheetId = "l:/leveldesign/Game_elem/sheet_id.bin"; // WARNING : the following path are not recursive ShardMonitorPath = { - "L:/leveldesign/Game_elem" // path where to find sheet_id.bin. + "R:/leveldesign/game_elem" // path where to find sheet_id.bin. }; // if you want to use a specific external editor, uncomment TextEditor and set the fullpath to the exe, by default, it's notepad diff --git a/ryzom/tools/leveldesign/install/world_editor_script.xml b/ryzom/tools/leveldesign/install/world_editor_script.xml index 32ff503ba..a12a1c39b 100644 --- a/ryzom/tools/leveldesign/install/world_editor_script.xml +++ b/ryzom/tools/leveldesign/install/world_editor_script.xml @@ -4,12 +4,12 @@ - - - - - - + + + + + + diff --git a/ryzom/tools/leveldesign/mission_compiler_lib/main.cpp b/ryzom/tools/leveldesign/mission_compiler_lib/main.cpp index b4bb6d77c..6c4285d46 100644 --- a/ryzom/tools/leveldesign/mission_compiler_lib/main.cpp +++ b/ryzom/tools/leveldesign/mission_compiler_lib/main.cpp @@ -35,7 +35,7 @@ int main(int argc, char *argv[]) if (leveldesignPath == NULL) { - printf("Error: You need to define RYZOM_LEVELDESIGN environment variable that points to previous L:\\ equivalent under Windows\n"); + printf("Error: You need to define RYZOM_LEVELDESIGN environment variable that points to previous R:\\leveldesign\\ equivalent under Windows\n"); return -1; } diff --git a/ryzom/tools/leveldesign/mp_generator/raw_material_generation.cfg b/ryzom/tools/leveldesign/mp_generator/raw_material_generation.cfg index 1df73f8ee..9e04bbd9f 100644 --- a/ryzom/tools/leveldesign/mp_generator/raw_material_generation.cfg +++ b/ryzom/tools/leveldesign/mp_generator/raw_material_generation.cfg @@ -1,5 +1,5 @@ -LevelDesignPath = "L:\" -TranslationPath = "R:\code\ryzom\translation\" +LevelDesignPath = "R:\leveldesign\" +TranslationPath = "R:\leveldesign\translation\" // Format: "sheetFilename", "PropertyName", "Value" CustomizedProperties = diff --git a/ryzom/tools/leveldesign/primitive_id_assignator/primitive_id_assignator.cfg b/ryzom/tools/leveldesign/primitive_id_assignator/primitive_id_assignator.cfg index a9c9b444e..35381c9f5 100644 --- a/ryzom/tools/leveldesign/primitive_id_assignator/primitive_id_assignator.cfg +++ b/ryzom/tools/leveldesign/primitive_id_assignator/primitive_id_assignator.cfg @@ -15,9 +15,9 @@ Filters = // the path (recursive) where the primitives are SearchPath = { - "l:/primitives", + "R:/leveldesign/primitives", }; // the index file that contains the indexed file database -IndexFile = "l:/primitives/file_index.cfg"; +IndexFile = "R:/leveldesign/primitives/file_index.cfg"; diff --git a/ryzom/tools/sheets_packer_shard/sheets_packer_shard.cpp b/ryzom/tools/sheets_packer_shard/sheets_packer_shard.cpp index 14ce53f4a..3062878ed 100644 --- a/ryzom/tools/sheets_packer_shard/sheets_packer_shard.cpp +++ b/ryzom/tools/sheets_packer_shard/sheets_packer_shard.cpp @@ -71,7 +71,7 @@ int main(int nNbArg, char **ppArgs) // verify all params if (nNbArg < 6) { - // sheets_packer_shard.exe L:\leveldesign L:\leveldesign\DFN R:\code\ryzom\server\data_shard\mirror_sheets T:\export\common\leveldesign\visual_slot_tab T:\test_shard + // sheets_packer_shard.exe R:\leveldesign R:\leveldesign\DFN R:\code\ryzom\server\data_shard\mirror_sheets T:\export\common\leveldesign\visual_slot_tab T:\test_shard nlinfo("ERROR : Wrong number of arguments\n"); nlinfo("USAGE : sheets_packer_shard \n"); nlinfo(" : Directory containing visual_slots.tab"); diff --git a/studio/src/plugins/bnp_manager/bnp_manager_window.cpp b/studio/src/plugins/bnp_manager/bnp_manager_window.cpp index c9e1a1894..9a4af0cd5 100644 --- a/studio/src/plugins/bnp_manager/bnp_manager_window.cpp +++ b/studio/src/plugins/bnp_manager/bnp_manager_window.cpp @@ -368,7 +368,7 @@ void BNPManagerWindow::readSettings() QSettings *settings = Core::ICore::instance()->settings(); settings->beginGroup(Core::Constants::DATA_PATH_SECTION); - m_DataPath = settings->value(Core::Constants::ASSETS_PATH, "w:/database").toString(); + m_DataPath = settings->value(Core::Constants::ASSETS_PATH, "R:/graphics").toString(); settings->endGroup(); } // *************************************************************************** diff --git a/studio/src/plugins/core/general_settings_page.cpp b/studio/src/plugins/core/general_settings_page.cpp index 79e1288a4..6fb51b128 100644 --- a/studio/src/plugins/core/general_settings_page.cpp +++ b/studio/src/plugins/core/general_settings_page.cpp @@ -211,10 +211,10 @@ void GeneralSettingsPage::readSettings() QStringList paths; settings->beginGroup(Core::Constants::DATA_PATH_SECTION); - m_ui.leveldesignPathLineEdit->setText(settings->value(Core::Constants::LEVELDESIGN_PATH, "l:/leveldesign").toString()); - m_ui.assetsPathLineEdit->setText(settings->value(Core::Constants::ASSETS_PATH, "w:/database").toString()); - m_ui.primitivesPathLineEdit->setText(settings->value(Core::Constants::PRIMITIVES_PATH, "l:/primitives").toString()); - m_ui.ligoConfigFileLineEdit->setText(settings->value(Core::Constants::LIGOCONFIG_FILE, "l:/leveldesign/world_editor_files/world_editor_classes.xml").toString()); + m_ui.leveldesignPathLineEdit->setText(settings->value(Core::Constants::LEVELDESIGN_PATH, "R:/leveldesign").toString()); + m_ui.assetsPathLineEdit->setText(settings->value(Core::Constants::ASSETS_PATH, "R:/graphics").toString()); + m_ui.primitivesPathLineEdit->setText(settings->value(Core::Constants::PRIMITIVES_PATH, "R:/leveldesign/primitives").toString()); + m_ui.ligoConfigFileLineEdit->setText(settings->value(Core::Constants::LIGOCONFIG_FILE, "R:/leveldesign/world_editor_files/world_editor_classes.xml").toString()); settings->endGroup(); } diff --git a/studio/src/plugins/georges_editor/georges_editor_form.cpp b/studio/src/plugins/georges_editor/georges_editor_form.cpp index 231a0efc3..009d2a6f0 100644 --- a/studio/src/plugins/georges_editor/georges_editor_form.cpp +++ b/studio/src/plugins/georges_editor/georges_editor_form.cpp @@ -116,7 +116,7 @@ namespace GeorgesQt m_lastSheetDir = "."; QSettings *settings = Core::ICore::instance()->settings(); settings->beginGroup(Core::Constants::DATA_PATH_SECTION); - m_lastSheetDir = settings->value(Core::Constants::LEVELDESIGN_PATH, "l:/leveldesign").toString(); + m_lastSheetDir = settings->value(Core::Constants::LEVELDESIGN_PATH, "R:/leveldesign").toString(); settings->endGroup(); connect(Core::ICore::instance(), SIGNAL(changeSettings()), @@ -234,7 +234,7 @@ namespace GeorgesQt settings->endGroup(); settings->beginGroup(Core::Constants::DATA_PATH_SECTION); - m_leveldesignPath = settings->value(Core::Constants::LEVELDESIGN_PATH, "l:/leveldesign").toString(); + m_leveldesignPath = settings->value(Core::Constants::LEVELDESIGN_PATH, "R:/leveldesign").toString(); settings->endGroup(); } @@ -279,7 +279,7 @@ namespace GeorgesQt settings->beginGroup(Core::Constants::DATA_PATH_SECTION); QString oldLDPath = m_leveldesignPath; - m_leveldesignPath = settings->value(Core::Constants::LEVELDESIGN_PATH, "l:/leveldesign").toString(); + m_leveldesignPath = settings->value(Core::Constants::LEVELDESIGN_PATH, "R:/leveldesign").toString(); settings->endGroup(); if (oldLDPath != m_leveldesignPath) diff --git a/studio/src/plugins/georges_editor/georges_treeview_dialog.cpp b/studio/src/plugins/georges_editor/georges_treeview_dialog.cpp index 48b444945..014b6c6ba 100644 --- a/studio/src/plugins/georges_editor/georges_treeview_dialog.cpp +++ b/studio/src/plugins/georges_editor/georges_treeview_dialog.cpp @@ -67,7 +67,7 @@ namespace GeorgesQt m_lastSheetDir = "."; QSettings *settings = Core::ICore::instance()->settings(); settings->beginGroup(Core::Constants::DATA_PATH_SECTION); - m_lastSheetDir = settings->value(Core::Constants::LEVELDESIGN_PATH, "l:/leveldesign").toString(); + m_lastSheetDir = settings->value(Core::Constants::LEVELDESIGN_PATH, "R:/leveldesign").toString(); settings->endGroup(); m_ui.setupUi(this); From 50be04111624b5443bafbc4c1b80c3cfaa623fc4 Mon Sep 17 00:00:00 2001 From: kaetemi Date: Mon, 30 Mar 2020 02:43:28 +0800 Subject: [PATCH 6/7] Fix plugin build for 3ds Max 9 --- .../nel_3dsmax_shared/string_common.h | 22 ++++--------------- .../plugin_max/nel_patch_converter/script.cpp | 2 +- 2 files changed, 5 insertions(+), 19 deletions(-) diff --git a/nel/tools/3d/plugin_max/nel_3dsmax_shared/string_common.h b/nel/tools/3d/plugin_max/nel_3dsmax_shared/string_common.h index 737b1a5dd..4a331a78a 100644 --- a/nel/tools/3d/plugin_max/nel_3dsmax_shared/string_common.h +++ b/nel/tools/3d/plugin_max/nel_3dsmax_shared/string_common.h @@ -21,6 +21,7 @@ #define NLMAX_STRING_COMMON_H #include +#include #if (MAX_VERSION_MAJOR < 15) #define GET_OBJECT_NAME_CONST @@ -37,9 +38,7 @@ static TSTR MaxTStrFromUtf8(const std::string &src) { TSTR dst; #if (MAX_VERSION_MAJOR < 15) - ucstring uc; - uc.fromUtf8(src); - dst = (const mwchar_t *)uc.c_str(); + dst = nlUtf8ToTStr(src); #else dst.FromUTF8(src.c_str()); #endif @@ -49,14 +48,7 @@ static TSTR MaxTStrFromUtf8(const std::string &src) static std::string MaxTStrToUtf8(const TSTR& src) { #if (MAX_VERSION_MAJOR < 15) -#ifdef _UNICODE - ucstring uc(src.data()); - return uc.toUtf8(); -#else - WStr ws = src; - ucstring uc((const ucchar *)ws.data()); - return uc.toUtf8(); -#endif + return NLMISC::tStrToUtf8(src.data()); #else return src.ToUTF8().data(); #endif @@ -64,13 +56,7 @@ static std::string MaxTStrToUtf8(const TSTR& src) static std::string MCharStrToUtf8(const MCHAR *src) { -#ifdef _UNICODE - ucstring uc((const ucchar *)src); - return uc.toUtf8(); -#else - ucstring uc((const ucchar *)WStr(src).data()); - return uc.toUtf8(); -#endif + return NLMISC::tStrToUtf8(src); } #endif /* #ifndef NLMAX_STRING_COMMON_H */ diff --git a/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp b/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp index 2c2f100f7..48bf1d921 100644 --- a/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp +++ b/nel/tools/3d/plugin_max/nel_patch_converter/script.cpp @@ -1271,7 +1271,7 @@ Value* get_patch_vertex_cf (Value** arg_list, int count) // Check to see if the arguments match up to what we expect // We want to use 'TurnAllTexturesOn ' - const MCHAR *message= _M("NeLGetPatchVertex [NeLPatchMesh] [PatchId] [VertexId]"); + MCHAR *message= _M("NeLGetPatchVertex [NeLPatchMesh] [PatchId] [VertexId]"); type_check(arg_list[0], MAXNode, message); type_check(arg_list[1], Integer, message); type_check(arg_list[2], Integer, message); From 4f0bbbad69b6df008e4ae0096669070ff8b82c0e Mon Sep 17 00:00:00 2001 From: kaetemi Date: Mon, 30 Mar 2020 08:38:17 +0800 Subject: [PATCH 7/7] String fixes --- nel/include/nel/misc/string_common.h | 8 ++++++++ nel/src/misc/i_xml.cpp | 5 +++-- .../world_editor/world_editor/world_editor.cpp | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/nel/include/nel/misc/string_common.h b/nel/include/nel/misc/string_common.h index 3fd46b835..9f6d59aae 100644 --- a/nel/include/nel/misc/string_common.h +++ b/nel/include/nel/misc/string_common.h @@ -290,6 +290,14 @@ inline bool endsWith(const char *str, const char *suffix) { return endsWith(str, inline bool endsWith(const std::string &str, const char *suffix) { return endsWith(str.c_str(), str.size(), suffix, strlen(suffix)); } inline bool endsWith(const std::string &str, const std::string &suffix) { return endsWith(str.c_str(), str.size(), suffix.c_str(), suffix.size()); } +// **************************************************************************** +// Conversion of strings between +// - UTF-8 +// - Local codepage (UTF-8 on Linux) +// - TString (Local codepage or wide on Windows) +// - Wide (wchar_t *, UTF-16 on Windows, UTF-32 on Linux) +// **************************************************************************** + // Convert local codepage to UTF-8 // On Windows, the local codepage is undetermined // On Linux, the local codepage is always UTF-8 (no-op) diff --git a/nel/src/misc/i_xml.cpp b/nel/src/misc/i_xml.cpp index 87f848ab9..24a2b7910 100644 --- a/nel/src/misc/i_xml.cpp +++ b/nel/src/misc/i_xml.cpp @@ -171,15 +171,16 @@ bool CIXml::init (IStream &stream) // Try binary mode if (_TryBinaryMode) { - char header[4]; + char header[5]; header[0] = buffer[0]; header[1] = buffer[1]; header[2] = buffer[2]; header[3] = buffer[3]; + header[4] = '\0'; toLower(header); // Does it a xml stream ? - if (!strcmp(header, "