little cleanup
This commit is contained in:
parent
53ba177225
commit
24c52521e4
1 changed files with 0 additions and 24 deletions
|
@ -119,21 +119,6 @@ void GPUFontAtlasLayerCombo::abandonChild(shared_ptr <Layer> layer){
|
||||||
}), layers.end());
|
}), layers.end());
|
||||||
|
|
||||||
isDirty = true;
|
isDirty = true;
|
||||||
// update the text
|
|
||||||
// this doesn't happen very often, so let's just
|
|
||||||
// iterate over all layers and calculate fresh
|
|
||||||
//std::string text = "";
|
|
||||||
//totalCharacters = 0;
|
|
||||||
//for(const auto & layer : layers){
|
|
||||||
// std::string layerText = layer->getProps().text;
|
|
||||||
// totalCharacters += layerText.length();
|
|
||||||
// text += layerText;
|
|
||||||
//}
|
|
||||||
//removeDuplicateCharacters(text);
|
|
||||||
//mainText = text;
|
|
||||||
// NOTE: we do not want to update buffers now,
|
|
||||||
// as it's probably more costly than just keeping
|
|
||||||
// the old glyphs around...
|
|
||||||
}
|
}
|
||||||
const ComboIdentifier & GPUFontAtlasLayerCombo::getIdentifier() const {
|
const ComboIdentifier & GPUFontAtlasLayerCombo::getIdentifier() const {
|
||||||
return identifier;
|
return identifier;
|
||||||
|
@ -162,15 +147,6 @@ void GPUFontAtlasLayerCombo::draw(){
|
||||||
glm::mat4 view = transform.getViewMatrix();
|
glm::mat4 view = transform.getViewMatrix();
|
||||||
glm::mat4 model = glm::mat4(1.0f);
|
glm::mat4 model = glm::mat4(1.0f);
|
||||||
|
|
||||||
//{ // Draw background.
|
|
||||||
//GLuint program = backgroundShader->program;
|
|
||||||
//glUseProgram(program);
|
|
||||||
//glBindVertexArray(emptyVAO);
|
|
||||||
//glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
|
|
||||||
//glBindVertexArray(0);
|
|
||||||
//glUseProgram(0);
|
|
||||||
//}
|
|
||||||
|
|
||||||
// Uses premultiplied-alpha.
|
// Uses premultiplied-alpha.
|
||||||
glEnable(GL_BLEND);
|
glEnable(GL_BLEND);
|
||||||
glBlendEquation(GL_FUNC_ADD);
|
glBlendEquation(GL_FUNC_ADD);
|
||||||
|
|
Loading…
Reference in a new issue