Subversion Repository Public Repository

Divide-Framework

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

Diff Revisions 330 vs 331 for /trunk/Source Code/Hardware/Video/Textures/Headers/TextureDescriptor.h

Diff revisions: vs.
  @@ -53,7 +53,7 @@
53 53 _borderColor.set(DefaultColors::BLACK());
54 54 }
55 55
56 - SamplerDescriptor* clone() const {return New SamplerDescriptor(*this);}
56 + SamplerDescriptor* clone() const { return MemoryManager_NEW SamplerDescriptor(*this); }
57 57
58 58 /*
59 59 * Sampler states (LOD, wrap modes, anisotropy levels, etc
  @@ -155,14 +155,22 @@
155 155
156 156 protected:
157 157 //Sampler states
158 - TextureFilter _minFilter, _magFilter; ///Texture filtering mode
159 - TextureWrap _wrapU, _wrapV, _wrapW; ///<Or S-R-T
160 - bool _generateMipMaps; ///<If it's set to true we create automatic MipMaps
161 - bool _srgb; //< Use SRGB color space
162 - U8 _anisotropyLevel; ///<The value must be in the range [0...255] and is automatically clamped by the max HW supported level
163 - F32 _minLOD,_maxLOD; ///<OpenGL eg: used by TEXTURE_MIN_LOD and TEXTURE_MAX_LOD
164 - F32 _biasLOD; ///<OpenGL eg: used by TEXTURE_LOD_BIAS
165 - vec4<F32> _borderColor; ///<Used with CLAMP_TO_BORDER as the background color outside of the texture border
158 + /// Texture filtering mode
159 + TextureFilter _minFilter, _magFilter;
160 + /// Texture wrap mode (Or S-R-T)
161 + TextureWrap _wrapU, _wrapV, _wrapW;
162 + /// If it's set to true we create automatic MipMaps
163 + bool _generateMipMaps;
164 + /// Use SRGB color space
165 + bool _srgb;
166 + /// The value must be in the range [0...255] and is automatically clamped by the max HW supported level
167 + U8 _anisotropyLevel;
168 + /// OpenGL eg: used by TEXTURE_MIN_LOD and TEXTURE_MAX_LOD
169 + F32 _minLOD,_maxLOD;
170 + /// OpenGL eg: used by TEXTURE_LOD_BIAS
171 + F32 _biasLOD;
172 + /// Used with CLAMP_TO_BORDER as the background color outside of the texture border
173 + vec4<F32> _borderColor;
166 174 };
167 175
168 176 ///Use to define a texture with details such as type, image formats, etc
  @@ -194,7 +202,7 @@
194 202 setDefaultValues();
195 203 }
196 204
197 - TextureDescriptor* clone() const {return New TextureDescriptor(*this);}
205 + TextureDescriptor* clone() const { return MemoryManager_NEW TextureDescriptor(*this); }
198 206
199 207 ///Pixel alignment and miplevels are set to match what the HW sets by default
200 208 inline void setDefaultValues(){