Mercurial > hg > orthanc-stone

comparison Framework/Scene2D/Internals/OpenGLTextProgram.cpp @ 860:238693c3bc51 am-dev

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge default -> am-dev
author Alain Mazy <alain@mazy.be>
date Mon, 24 Jun 2019 14:35:00 +0200
parents 61ba4b504e9a
children 1091b2adeb5a
comparison
equal deleted inserted replaced
856:a6e17a5a39e7 860:238693c3bc51
73 73
74 OpenGLTextProgram::Data::Data(OpenGL::IOpenGLContext& context, 74 OpenGLTextProgram::Data::Data(OpenGL::IOpenGLContext& context,
75 const GlyphTextureAlphabet& alphabet, 75 const GlyphTextureAlphabet& alphabet,
76 const TextSceneLayer& layer) : 76 const TextSceneLayer& layer) :
77 context_(context), 77 context_(context),
78 red_(layer.GetRedAsFloat()), 78 red_(layer.GetColor().GetRedAsFloat()),
79 green_(layer.GetGreenAsFloat()), 79 green_(layer.GetColor().GetGreenAsFloat()),
80 blue_(layer.GetBlueAsFloat()), 80 blue_(layer.GetColor().GetBlueAsFloat()),
81 x_(layer.GetX()), 81 x_(layer.GetX()),
82 y_(layer.GetY()), 82 y_(layer.GetY()),
83 border_(layer.GetBorder()), 83 border_(layer.GetBorder()),
84 anchor_(layer.GetAnchor()) 84 anchor_(layer.GetAnchor())
85 { 85 {