Subversion Repository Public Repository

Divide-Framework

This repository has no backups
This repository's network speed is throttled to 100KB/sec

Diff Revisions 839 vs 840 for /trunk/Source Code/Platform/File/FileManagementPaths.cpp

Diff revisions: vs.
  @@ -20,6 +20,7 @@
20 20 stringImpl g_saveLocation;
21 21 stringImpl g_GUILocation;
22 22 stringImpl g_FontsPath;
23 + stringImpl g_LocalisationPath;
23 24
24 25 namespace Shaders {
25 26 stringImpl g_CacheLocation;
  @@ -54,15 +55,13 @@
54 55 };
55 56 std::regex g_includePattern;
56 57
57 - void updatePaths(const PlatformContext& context) {
58 - const Configuration& config = context.config();
59 - const XMLEntryData& entryData = context.entryData();
60 -
61 - g_assetsLocation = entryData.assetsLocation + "/";
62 - g_shadersLocation = config.defaultShadersLocation + "/";
63 - g_texturesLocation = config.defaultTextureLocation + "/";
64 - g_xmlDataLocation = entryData.scriptLocation + "/";
65 - g_scenesLocation = entryData.scenesLocation + "/";
58 + void initPaths() {
59 + g_assetsLocation = "assets/";
60 + g_shadersLocation = "shaders/";
61 + g_texturesLocation = "textures/";
62 + g_xmlDataLocation = "XML/";
63 + g_scenesLocation = "Scenes/";
64 +
66 65 g_saveLocation = "SaveData/";
67 66 g_imagesLocation = "misc_images/";
68 67 g_materialsLocation = "materials/";
  @@ -70,6 +69,7 @@
70 69 g_GUILocation = "GUI/";
71 70 g_FontsPath = "fonts/";
72 71 g_soundsLocation = "sounds/";
72 + g_LocalisationPath = "localisation/";
73 73
74 74 Shaders::g_CacheLocation = "shaderCache/";
75 75 Shaders::g_CacheLocationText = Shaders::g_CacheLocation + "Text/";
  @@ -97,6 +97,17 @@
97 97 g_includePattern = std::regex("^[ ]*#[ ]*include[ ]+[\"<](.*)[\">].*");
98 98 }
99 99
100 + void updatePaths(const PlatformContext& context) {
101 + const Configuration& config = context.config();
102 + const XMLEntryData& entryData = context.entryData();
103 +
104 + g_assetsLocation = entryData.assetsLocation + "/";
105 + g_shadersLocation = config.defaultShadersLocation + "/";
106 + g_texturesLocation = config.defaultTextureLocation + "/";
107 + g_xmlDataLocation = entryData.scriptLocation + "/";
108 + g_scenesLocation = entryData.scenesLocation + "/";
109 + }
110 +
100 111 }; //namespace Paths
101 112
102 113 }; //namespace Divide