mirror of
https://github.com/amyinspace/MagicSetEditor2.git
synced 2026-06-11 05:07:00 -04:00
A working configure&makefile; now in the process of getting it to build on gcc
git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@182 0fc631ac-6414-0410-93d0-97cfa31319b6
This commit is contained in:
+6
-6
@@ -11,9 +11,9 @@
|
||||
// ----------------------------------------------------------------------------- : Color utility functions
|
||||
|
||||
Color lerp(const Color& a, const Color& b, double t) {
|
||||
return Color(a.Red() + (b.Red() - a.Red() ) * t,
|
||||
a.Green() + (b.Green() - a.Green()) * t,
|
||||
a.Blue() + (b.Blue() - a.Blue() ) * t);
|
||||
return Color(static_cast<int>( a.Red() + (b.Red() - a.Red() ) * t ),
|
||||
static_cast<int>( a.Green() + (b.Green() - a.Green()) * t ),
|
||||
static_cast<int>( a.Blue() + (b.Blue() - a.Blue() ) * t ));
|
||||
}
|
||||
|
||||
|
||||
@@ -51,8 +51,8 @@ Color saturate(const Color& c, double amount) {
|
||||
int r = c.Red(), g = c.Green(), b = c.Blue();
|
||||
double l = (r + g + b) / 3;
|
||||
return Color(
|
||||
col((r - amount * l) / (1 - amount)),
|
||||
col((g - amount * l) / (1 - amount)),
|
||||
col((b - amount * l) / (1 - amount))
|
||||
col(static_cast<int>( (r - amount * l) / (1 - amount) )),
|
||||
col(static_cast<int>( (g - amount * l) / (1 - amount) )),
|
||||
col(static_cast<int>( (b - amount * l) / (1 - amount) ))
|
||||
);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user