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/Geometry/Material/Headers/Material.h

Diff revisions: vs.
  @@ -37,8 +37,8 @@
37 37 class RenderStateBlock;
38 38 class ResourceDescriptor;
39 39 class RenderStateBlockDescriptor;
40 - enum RenderStage;
41 - enum BlendProperty;
40 + enum RenderStage : I32;
41 + enum BlendProperty : I32;
42 42
43 43 class Material : public Resource {
44 44 public:
  @@ -232,7 +232,7 @@
232 232 _shaderInfo[renderStage]._shaderDefines.push_back(shaderDefines);
233 233 }
234 234
235 - inline void addShaderDefines(const stringImpl& shaderDefines) {
235 + inline void addShaderDefines(const stringImpl& shaderDefines) {
236 236 addShaderDefines(FINAL_STAGE, shaderDefines);
237 237 addShaderDefines(Z_PRE_PASS_STAGE, shaderDefines);
238 238 addShaderDefines(SHADOW_STAGE, shaderDefines);
  @@ -270,7 +270,7 @@
270 270 inline U8 getTextureCount() const { return _shaderData._textureCount;}
271 271
272 272 size_t getRenderStateBlock(RenderStage currentStage);
273 - inline Texture* const getTexture(ShaderProgram::TextureUsage textureUsage) {return _textures[textureUsage];}
273 + inline Texture* const getTexture(ShaderProgram::TextureUsage textureUsage) {return _textures[textureUsage];}
274 274 ShaderInfo& getShaderInfo(RenderStage renderStage = FINAL_STAGE);
275 275
276 276 inline const TextureOperation& getTextureOperation() const { return _operation; }