Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 831 vs 832 for /trunk/Source Code/Core/Resources/ConcreteLoaders/TextureLoaderImpl.cpp

Diff revisions: vs.
  @@ -13,9 +13,6 @@
13 13
14 14 namespace Divide {
15 15
16 - namespace {
17 - stringImpl s_defaultTexturePath;
18 - };
19 16
20 17 template<>
21 18 Resource_ptr ImplResourceLoader<Texture>::operator()() {
  @@ -25,13 +22,8 @@
25 22 assert((!_descriptor.getResourceLocation().empty() && !_descriptor.getResourceName().empty()) ||
26 23 _descriptor.getResourceLocation().empty());
27 24
28 - if (s_defaultTexturePath.empty()) {
29 - s_defaultTexturePath = Paths::g_assetsLocation + Paths::g_texturesLocation;
30 - }
31 -
32 - if (Texture::s_defaultTextureFilePath == nullptr) {
25 + if (Texture::s_missingTextureFileName == nullptr) {
33 26 Texture::s_missingTextureFileName = "missing_texture.jpg";
34 - Texture::s_defaultTextureFilePath = s_defaultTexturePath.c_str();
35 27 }
36 28
37 29 bool threadedLoad = _descriptor.getThreaded();
  @@ -59,11 +51,11 @@
59 51 stringstreamImpl textureLocationList(resourceLocation);
60 52 while (std::getline(textureLocationList, resourceLocation, ',')) {}
61 53 } else {
62 - resourceLocation = s_defaultTexturePath;
54 + resourceLocation = Paths::g_assetsLocation + Paths::g_texturesLocation;
63 55 }
64 56
65 57 for (size_t i = crtNumCommas; i < numCommas; ++i) {
66 - resourceLocation.append("," + s_defaultTexturePath);
58 + resourceLocation.append("," + resourceLocation);
67 59 }
68 60
69 61 _descriptor.setResourceLocation(resourceLocation);