Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 336 vs 337 for /trunk/Source Code/Platform/Video/Textures/Texture.cpp

Diff revisions: vs.
  @@ -88,8 +88,8 @@
88 88 ParamHandler& par = ParamHandler::getInstance();
89 89 img.flip(false);
90 90 // missing_texture.jpg must be something that really stands out
91 - img.create(par.getParam<stringImpl>("assetsLocation", "assets") + "/" +
92 - par.getParam<stringImpl>("defaultTextureLocation", "textures") + "/" +
91 + img.create(par.getParam<stringImpl>("assetsLocation", "assets") + "/" +
92 + par.getParam<stringImpl>("defaultTextureLocation", "textures") + "/" +
93 93 "missing_texture.jpg");
94 94 }
95 95
  @@ -125,15 +125,15 @@
125 125
126 126 // Create a new Rendering API-dependent texture object
127 127 GFXImageFormat internalFormat = RGB8;
128 - // Select the proper color space internal format
128 + // Select the proper color space internal format
129 129 bool srgb = _samplerDescriptor.srgb();
130 - // We only support 8 bit per pixel, 1/2/3/4 channel textures
131 - switch (img.format()) {
132 - case RED : internalFormat = RED8; break;
133 - case RG : internalFormat = RG8; break;
134 - case RGB : internalFormat = srgb ? SRGB8 : RGB8; break;
135 - case RGBA: internalFormat = srgb ? SRGBA8 : RGBA8; break;
136 - }
130 + // We only support 8 bit per pixel, 1/2/3/4 channel textures
131 + switch (img.format()) {
132 + case RED : internalFormat = RED8; break;
133 + case RG : internalFormat = RG8; break;
134 + case RGB : internalFormat = srgb ? SRGB8 : RGB8; break;
135 + case RGBA: internalFormat = srgb ? SRGBA8 : RGBA8; break;
136 + }
137 137
138 138 // Uploading to the GPU dependents on the rendering API
139 139 loadData(target, img.data(), img.dimensions(),