spacecruft
/
CelestiaContent
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add a ::Color -> cmod::Material::Color helper

pull/3/head
Hleb Valoshka 2019-03-28 14:20:02 +03:00
parent 8cf30873fd
commit deb23a7b80
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/celengine/renderglsl.cpp
View File

@ -317,8 +317,8 @@ void renderGeometry_GLSL(Geometry* geometry,
if (texOverride != InvalidResource)
{
Material m;
m.diffuse = Material::Color(ri.color.red(), ri.color.green(), ri.color.blue());
m.specular = Material::Color(ri.specularColor.red(), ri.specularColor.green(), ri.specularColor.blue());
m.diffuse = Material::Color(ri.color);
m.specular = Material::Color(ri.specularColor);
m.specularPower = ri.specularPower;
CelestiaTextureResource textureResource(texOverride);
@ -361,8 +361,8 @@ void renderGeometry_GLSL_Unlit(Geometry* geometry,
if (texOverride != InvalidResource)
{
Material m;
m.diffuse = Material::Color(ri.color.red(), ri.color.green(), ri.color.blue());
m.specular = Material::Color(ri.specularColor.red(), ri.specularColor.green(), ri.specularColor.blue());
m.diffuse = Material::Color(ri.color);
m.specular = Material::Color(ri.specularColor);
m.specularPower = ri.specularPower;
CelestiaTextureResource textureResource(texOverride);
@ -478,8 +478,7 @@ void renderClouds_GLSL(const RenderInfo& ri,
prog->setLightParameters(ls, ri.color, ri.specularColor, Color::Black);
prog->eyePosition = ls.eyePos_obj;
prog->ambientColor = Vector3f(ri.ambientColor.red(), ri.ambientColor.green(),
ri.ambientColor.blue());
prog->ambientColor = ri.ambientColor.toVector3();
prog->textureOffset = texOffset;
if (atmosphere != nullptr)

8
src/celmodel/material.h
View File

@ -14,6 +14,7 @@
#include <Eigen/Core>
#include <string>
#include <array>
#include <celutil/color.h>
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
{
return m_red;