hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加BOM头，并统一换行符

Browse Source
This commit is contained in:
hyzboy 2019-03-01 21:34:21 +08:00
parent 7f68b4b420
commit 0329dc9558
2 changed files with 145 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

150
src/Base/Color3f.cpp
View File

@ -1,75 +1,75 @@
#include<hgl/type/Color3f.h>
namespace hgl
{
void Color3f::Use(COLOR_ENUM ce)
{
r=prv_color[ce].r;
g=prv_color[ce].g;
b=prv_color[ce].b;
}
void Color3f::Clamp()
{
if(r<0)r=0;if(r>1)r=1;
if(g<0)g=0;if(g>1)g=1;
if(b<0)b=0;if(b>1)b=1;
}
//--------------------------------------------------------------------------------------------------
/**
* 求当前颜色过渡到另一颜色时某一比例时的颜色
* @param nr,ng,nb 新的颜色
* @param pos 过渡比例,0时为当前的颜色,1时为nr,ng,nb
*/
void Color3f::To(float nr,float ng,float nb,float pos)
{
if(pos==0)return;
if(pos==1)
{
r=nr;
g=ng;
b=nb;
return;
}
r+=(nr-r)*pos;
g+=(ng-g)*pos;
b+=(nb-b)*pos;
}
//--------------------------------------------------------------------------------------------------
void Color3f::Grey(float v1,float v2,float v3)
{
float lum=v1*0.299+v2*0.587+v3*0.114;
r=lum;
g=lum;
b=lum;
}
//--------------------------------------------------------------------------------------------------
void Color3f::Grey()
{
float lum=r*0.299+g*0.587+b*0.114;
r=lum;
g=lum;
b=lum;
}
//--------------------------------------------------------------------------------------------------
bool Color3f::operator == (const Color3f &v)
{
if(r!=v.r)return(false);
if(g!=v.g)return(false);
if(b!=v.b)return(false);
return(true);
}
//--------------------------------------------------------------------------------------------------
bool Color3f::operator != (const Color3f &v)
{
if(r!=v.r)return(true);
if(g!=v.g)return(true);
if(b!=v.b)return(true);
return(false);
}
//--------------------------------------------------------------------------------------------------
}
#include<hgl/type/Color3f.h>
namespace hgl
{
void Color3f::Use(COLOR_ENUM ce)
{
r=prv_color[ce].r;
g=prv_color[ce].g;
b=prv_color[ce].b;
}
void Color3f::Clamp()
{
if(r<0)r=0;if(r>1)r=1;
if(g<0)g=0;if(g>1)g=1;
if(b<0)b=0;if(b>1)b=1;
}
//--------------------------------------------------------------------------------------------------
/**
* 求当前颜色过渡到另一颜色时某一比例时的颜色
* @param nr,ng,nb 新的颜色
* @param pos 过渡比例,0时为当前的颜色,1时为nr,ng,nb
*/
void Color3f::To(float nr,float ng,float nb,float pos)
{
if(pos==0)return;
if(pos==1)
{
r=nr;
g=ng;
b=nb;
return;
}
r+=(nr-r)*pos;
g+=(ng-g)*pos;
b+=(nb-b)*pos;
}
//--------------------------------------------------------------------------------------------------
void Color3f::Grey(float v1,float v2,float v3)
{
float lum=v1*0.299+v2*0.587+v3*0.114;
r=lum;
g=lum;
b=lum;
}
//--------------------------------------------------------------------------------------------------
void Color3f::Grey()
{
float lum=r*0.299+g*0.587+b*0.114;
r=lum;
g=lum;
b=lum;
}
//--------------------------------------------------------------------------------------------------
bool Color3f::operator == (const Color3f &v)
{
if(r!=v.r)return(false);
if(g!=v.g)return(false);
if(b!=v.b)return(false);
return(true);
}
//--------------------------------------------------------------------------------------------------
bool Color3f::operator != (const Color3f &v)
{
if(r!=v.r)return(true);
if(g!=v.g)return(true);
if(b!=v.b)return(true);
return(false);
}
//--------------------------------------------------------------------------------------------------
}

140
src/Base/Color4f.cpp
View File

@ -1,70 +1,70 @@
#include<hgl/type/Color4f.h>
namespace hgl
{
void Color4f::Use(COLOR_ENUM ce,float ta)
{
r=prv_color[ce].r;
g=prv_color[ce].g;
b=prv_color[ce].b;
a=ta;
}
void Color4f::Clamp()
{
if(r<0)r=0;if(r>1)r=1;
if(g<0)g=0;if(g>1)g=1;
if(b<0)b=0;if(b>1)b=1;
if(a<0)a=0;if(a>1)a=1;
}
//--------------------------------------------------------------------------------------------------
/**
* 求当前颜色过渡到另一颜色时某一比例时的颜色
* @param nr,ng,nb 新的颜色
* @param pos 过渡比例,0时为当前的颜色,1时为nr,ng,nb
*/
void Color4f::To(float nr,float ng,float nb,float pos)
{
if(pos==0)return;
if(pos==1)
{
r=nr;
g=ng;
b=nb;
return;
}
r+=(nr-r)*pos;
g+=(ng-g)*pos;
b+=(nb-b)*pos;
}
//--------------------------------------------------------------------------------------------------
void Color4f::Grey()
{
float lum=r*0.299+g*0.587+b*0.114;
r=lum;
g=lum;
b=lum;
}
//--------------------------------------------------------------------------------------------------
bool Color4f::operator == (const Color4f &v)
{
if(r!=v.r)return(false);
if(g!=v.g)return(false);
if(b!=v.b)return(false);
if(a!=v.a)return(false);
return(true);
}
//--------------------------------------------------------------------------------------------------
bool Color4f::operator != (const Color4f &v)
{
if(r!=v.r)return(true);
if(g!=v.g)return(true);
if(b!=v.b)return(true);
if(a!=v.a)return(true);
return(false);
}
//--------------------------------------------------------------------------------------------------
}
#include<hgl/type/Color4f.h>
namespace hgl
{
void Color4f::Use(COLOR_ENUM ce,float ta)
{
r=prv_color[ce].r;
g=prv_color[ce].g;
b=prv_color[ce].b;
a=ta;
}
void Color4f::Clamp()
{
if(r<0)r=0;if(r>1)r=1;
if(g<0)g=0;if(g>1)g=1;
if(b<0)b=0;if(b>1)b=1;
if(a<0)a=0;if(a>1)a=1;
}
//--------------------------------------------------------------------------------------------------
/**
* 求当前颜色过渡到另一颜色时某一比例时的颜色
* @param nr,ng,nb 新的颜色
* @param pos 过渡比例,0时为当前的颜色,1时为nr,ng,nb
*/
void Color4f::To(float nr,float ng,float nb,float pos)
{
if(pos==0)return;
if(pos==1)
{
r=nr;
g=ng;
b=nb;
return;
}
r+=(nr-r)*pos;
g+=(ng-g)*pos;
b+=(nb-b)*pos;
}
//--------------------------------------------------------------------------------------------------
void Color4f::Grey()
{
float lum=r*0.299+g*0.587+b*0.114;
r=lum;
g=lum;
b=lum;
}
//--------------------------------------------------------------------------------------------------
bool Color4f::operator == (const Color4f &v)
{
if(r!=v.r)return(false);
if(g!=v.g)return(false);
if(b!=v.b)return(false);
if(a!=v.a)return(false);
return(true);
}
//--------------------------------------------------------------------------------------------------
bool Color4f::operator != (const Color4f &v)
{
if(r!=v.r)return(true);
if(g!=v.g)return(true);
if(b!=v.b)return(true);
if(a!=v.a)return(true);
return(false);
}
//--------------------------------------------------------------------------------------------------
}