Project::OSiRiON - Git repositories
Project::OSiRiON
News . About . Screenshots . Downloads . Forum . Wiki . Tracker . Git
summaryrefslogtreecommitdiff
path: root/src/math
diff options
context:
space:
mode:
Diffstat (limited to 'src/math')
-rw-r--r--src/math/color.cc2
-rw-r--r--src/math/color.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/math/color.cc b/src/math/color.cc
index 70a48e5..473d210 100644
--- a/src/math/color.cc
+++ b/src/math/color.cc
@@ -155,7 +155,7 @@ std::istream &operator>>(std::istream & is, Color & color)
}
//is >> color.a;
- color.a = 1.0;
+ color.a = 1.0f;
return (is);
}
diff --git a/src/math/color.h b/src/math/color.h
index 507402d..605e738 100644
--- a/src/math/color.h
+++ b/src/math/color.h
@@ -21,7 +21,7 @@ public:
/// create a color from float RGBA value
Color(float red, float green, float blue, float alpha = 1.0f);
/// create a greyscale color
- Color(const float grey, const float = 1.0f);
+ Color(const float grey, const float alpha = 1.0f);
/// create a copy from an existing color
Color(Color const & other);