diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-19 23:50:28 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-19 23:50:28 +0200 |
| commit | 7b6bbf79c4bb73013e2fe01f84f0025e7c06c00e (patch) | |
| tree | 18196404b7f9a7c000f006076030e1d568302e5d /src/graphics/core/material.h | |
| parent | 7479f486b671acb2a6aea2c84a56b383aaba00ca (diff) | |
| download | colobot-7b6bbf79c4bb73013e2fe01f84f0025e7c06c00e.tar.gz colobot-7b6bbf79c4bb73013e2fe01f84f0025e7c06c00e.tar.bz2 colobot-7b6bbf79c4bb73013e2fe01f84f0025e7c06c00e.zip | |
Namespace and styling fix
Diffstat (limited to 'src/graphics/core/material.h')
| -rw-r--r-- | src/graphics/core/material.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/graphics/core/material.h b/src/graphics/core/material.h index 156ff36..07782d5 100644 --- a/src/graphics/core/material.h +++ b/src/graphics/core/material.h @@ -25,6 +25,7 @@ #include "graphics/core/color.h" +// Graphics module namespace namespace Gfx { /** @@ -40,21 +41,22 @@ namespace Gfx { struct Material { //! Diffuse color - Gfx::Color diffuse; + Color diffuse; //! Ambient color - Gfx::Color ambient; + Color ambient; //! Specular color - Gfx::Color specular; + Color specular; - bool operator==(const Gfx::Material &mat) const + bool operator==(const Material &mat) const { return diffuse == mat.diffuse && ambient == mat.ambient && specular == mat.specular; } - bool operator!=(const Gfx::Material &mat) const + bool operator!=(const Material &mat) const { return ! operator==(mat); } }; -}; // namespace Gfx + +} // namespace Gfx |