Merge branch 'Sprites'
This commit is contained in:
@@ -28,15 +28,15 @@ void LightClass::SetAmbientColor(float red, float green, float blue, float alpha
|
||||
|
||||
void LightClass::SetDiffuseColor(float red, float green, float blue, float alpha)
|
||||
{
|
||||
m_diffuseColor = XMFLOAT4(red, green, blue, alpha);
|
||||
return;
|
||||
m_diffuseColor = XMFLOAT4(red, green, blue, alpha);
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
void LightClass::SetDirection(float x, float y, float z)
|
||||
{
|
||||
m_direction = XMFLOAT3(x, y, z);
|
||||
return;
|
||||
m_direction = XMFLOAT3(x, y, z);
|
||||
return;
|
||||
}
|
||||
|
||||
XMFLOAT4 LightClass::GetAmbientColor()
|
||||
@@ -47,11 +47,11 @@ XMFLOAT4 LightClass::GetAmbientColor()
|
||||
|
||||
XMFLOAT4 LightClass::GetDiffuseColor()
|
||||
{
|
||||
return m_diffuseColor;
|
||||
return m_diffuseColor;
|
||||
}
|
||||
|
||||
|
||||
XMFLOAT3 LightClass::GetDirection()
|
||||
{
|
||||
return m_direction;
|
||||
return m_direction;
|
||||
}
|
||||
Reference in New Issue
Block a user