Add a ::Color -> cmod::Material::Color helper
parent
8cf30873fd
commit
deb23a7b80
|
@ -317,8 +317,8 @@ void renderGeometry_GLSL(Geometry* geometry,
|
||||||
if (texOverride != InvalidResource)
|
if (texOverride != InvalidResource)
|
||||||
{
|
{
|
||||||
Material m;
|
Material m;
|
||||||
m.diffuse = Material::Color(ri.color.red(), ri.color.green(), ri.color.blue());
|
m.diffuse = Material::Color(ri.color);
|
||||||
m.specular = Material::Color(ri.specularColor.red(), ri.specularColor.green(), ri.specularColor.blue());
|
m.specular = Material::Color(ri.specularColor);
|
||||||
m.specularPower = ri.specularPower;
|
m.specularPower = ri.specularPower;
|
||||||
|
|
||||||
CelestiaTextureResource textureResource(texOverride);
|
CelestiaTextureResource textureResource(texOverride);
|
||||||
|
@ -361,8 +361,8 @@ void renderGeometry_GLSL_Unlit(Geometry* geometry,
|
||||||
if (texOverride != InvalidResource)
|
if (texOverride != InvalidResource)
|
||||||
{
|
{
|
||||||
Material m;
|
Material m;
|
||||||
m.diffuse = Material::Color(ri.color.red(), ri.color.green(), ri.color.blue());
|
m.diffuse = Material::Color(ri.color);
|
||||||
m.specular = Material::Color(ri.specularColor.red(), ri.specularColor.green(), ri.specularColor.blue());
|
m.specular = Material::Color(ri.specularColor);
|
||||||
m.specularPower = ri.specularPower;
|
m.specularPower = ri.specularPower;
|
||||||
|
|
||||||
CelestiaTextureResource textureResource(texOverride);
|
CelestiaTextureResource textureResource(texOverride);
|
||||||
|
@ -478,8 +478,7 @@ void renderClouds_GLSL(const RenderInfo& ri,
|
||||||
|
|
||||||
prog->setLightParameters(ls, ri.color, ri.specularColor, Color::Black);
|
prog->setLightParameters(ls, ri.color, ri.specularColor, Color::Black);
|
||||||
prog->eyePosition = ls.eyePos_obj;
|
prog->eyePosition = ls.eyePos_obj;
|
||||||
prog->ambientColor = Vector3f(ri.ambientColor.red(), ri.ambientColor.green(),
|
prog->ambientColor = ri.ambientColor.toVector3();
|
||||||
ri.ambientColor.blue());
|
|
||||||
prog->textureOffset = texOffset;
|
prog->textureOffset = texOffset;
|
||||||
|
|
||||||
if (atmosphere != nullptr)
|
if (atmosphere != nullptr)
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
#include <Eigen/Core>
|
#include <Eigen/Core>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <array>
|
#include <array>
|
||||||
|
#include <celutil/color.h>
|
||||||
|
|
||||||
|
|
||||||
namespace cmod
|
namespace cmod
|
||||||
|
@ -42,6 +43,13 @@ public:
|
||||||
{
|
{
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Color(const ::Color& color) :
|
||||||
|
m_red(color.red()),
|
||||||
|
m_green(color.green()),
|
||||||
|
m_blue(color.blue())
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
float red() const
|
float red() const
|
||||||
{
|
{
|
||||||
return m_red;
|
return m_red;
|
||||||
|
|
Loading…
Reference in New Issue