Aurailus
/
Zepha
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Optimize GUIText setText method. Reserve and don't temp construct.

master
Nicole Collings 2019-10-29 20:36:46 -07:00
parent ba3770aa21
commit d134eb089f
13 changed files with 49 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/CMakeLists.txt
View File

@ -204,7 +204,7 @@ set(ZEPHA_SRC
game/entity/AnimationState.h
game/entity/AnimationSegment.h
util/Pointer.h
lua/api/type/cEntity.h
lua/api/type/cLuaEntity.h
StartGame.h
game/graph/shader/SSAOShader.cpp
game/graph/shader/SSAOShader.h
@ -226,8 +226,8 @@ set(ZEPHA_SRC
lua/server/ServerRegisterItems.cpp
lua/server/ServerRegisterItems.h
lua/api/modules/cAddEntity.h
game/entity/world/LuaEntity.cpp
game/entity/world/LuaEntity.h
lua/api/type/LuaEntity.cpp
lua/api/type/LuaEntity.h
lua/api/modules/cRegisterEntity.h
def/model/SerializedModel.h
server/asset/AssetType.h

8
src/game/graph/meshtypes/GuiVertex.h
View File

@ -4,11 +4,17 @@
#pragma once
#include <glm/vec3.hpp>
#include <glm/vec2.hpp>
#include <glm/vec3.hpp>
#include <glm/vec4.hpp>
struct GuiVertex {
GuiVertex(glm::vec2 position, glm::vec4 colorData, glm::vec3 colorBlend, float useTexture) :
position(position),
colorData(colorData),
colorBlend(colorBlend),
useTexture(useTexture) {}
glm::vec2 position;
glm::vec4 colorData;
glm::vec3 colorBlend;

72
src/game/hud/components/basic/GUIText.cpp
View File

@ -25,10 +25,12 @@ void GUIText::create(glm::vec2 scale, glm::vec4 padding, glm::vec4 bgcolor, glm:
void GUIText::setText(std::string text) {
this->text = std::move(text);
uint indOffset = 0;
unsigned int indOffset = 0;
std::vector<GuiVertex> textVertices;
textVertices.reserve(text.length()*8 + 200);
std::vector<unsigned int> textIndices;
textIndices.reserve(text.length()*12 + 240);
//Create background rectangles
if (bgcolor.w != 0) {
@ -36,30 +38,24 @@ void GUIText::setText(std::string text) {
int yOffset = 0;
int h = Font::CHAR_HEIGHT;
for (uint i = 0; i < this->text.length() + 1; i++) {
for (unsigned int i = 0; i < this->text.length() + 1; i++) {
char c = this->text[i];
if (c == '\n' || i == this->text.length()) {
if (lineWidth > 0) {
lineWidth += 2;
std::vector<GuiVertex> vertices {
{{-1, yOffset - 1 }, bgcolor, {1, 1, 1}, false},
{{-1, yOffset + h + 1}, bgcolor, {1, 1, 1}, false},
{{lineWidth + 1, yOffset + h + 1}, bgcolor, {1, 1, 1}, false},
{{lineWidth + 1, yOffset - 1 }, bgcolor, {1, 1, 1}, false},
};
std::vector<uint> indices {
indOffset,
indOffset + 1,
indOffset + 2,
indOffset + 2,
indOffset + 3,
indOffset
};
textVertices.emplace_back(glm::vec2 {-1, yOffset - 1 }, bgcolor, glm::vec3 {1, 1, 1}, 0.f);
textVertices.emplace_back(glm::vec2 {-1, yOffset + h + 1}, bgcolor, glm::vec3 {1, 1, 1}, 0.f);
textVertices.emplace_back(glm::vec2 {lineWidth + 1, yOffset + h + 1}, bgcolor, glm::vec3 {1, 1, 1}, 0.f);
textVertices.emplace_back(glm::vec2 {lineWidth + 1, yOffset - 1 }, bgcolor, glm::vec3 {1, 1, 1}, 0.f);
textVertices.insert(textVertices.end(), vertices.begin(), vertices.end());
textIndices.insert(textIndices.end(), indices.begin(), indices.end());
textIndices.emplace_back(indOffset);
textIndices.emplace_back(indOffset + 1);
textIndices.emplace_back(indOffset + 2);
textIndices.emplace_back(indOffset + 2);
textIndices.emplace_back(indOffset + 3);
textIndices.emplace_back(indOffset);
indOffset += 4;
yOffset += h + 2;
@ -70,21 +66,19 @@ void GUIText::setText(std::string text) {
lineWidth = 0;
}
else {
lineWidth += font.getCharWidth(c) + 1;
}
else lineWidth += font.getCharWidth(c) + 1;
}
}
//Print the characters
uint xOffset = 0;
uint yOffset = 0;
unsigned int xOffset = 0;
unsigned int yOffset = 0;
bool emptyLine = true;
for (uint i = 0; i < this->text.length() + 1; i++) {
for (unsigned int i = 0; i < this->text.length() + 1; i++) {
char c = this->text[i];
uint h = Font::CHAR_HEIGHT;
unsigned int h = Font::CHAR_HEIGHT;
if (c == '\n' || i == this->text.length()) {
yOffset += (emptyLine) ? h / 2 : h + 2;
@ -99,7 +93,7 @@ void GUIText::setText(std::string text) {
auto charWidth = font.getCharWidth(c) + 1;
auto charUVs = font.getCharUVs(c);
for (uint j = 0; j <= 1; j++) {
for (unsigned int j = 0; j <= 1; j++) {
glm::vec3 color = {this->color.x, this->color.y, this->color.z};
if (j == 0) {
@ -112,23 +106,17 @@ void GUIText::setText(std::string text) {
yOffset -= 1;
}
std::vector<GuiVertex> vertices {
{{xOffset, yOffset }, {charUVs.x, charUVs.y, 0, 1}, color, true},
{{xOffset, yOffset + h}, {charUVs.x, charUVs.w, 0, 1}, color, true},
{{xOffset + charWidth, yOffset + h}, {charUVs.z, charUVs.w, 0, 1}, color, true},
{{xOffset + charWidth, yOffset }, {charUVs.z, charUVs.y, 0, 1}, color, true},
};
std::vector<uint> indices{
indOffset,
indOffset + 1,
indOffset + 2,
indOffset + 2,
indOffset + 3,
indOffset
};
textVertices.emplace_back(glm::vec2 {xOffset, yOffset }, glm::vec4 {charUVs.x, charUVs.y, 0, 1}, color, 1.f);
textVertices.emplace_back(glm::vec2 {xOffset, yOffset + h}, glm::vec4 {charUVs.x, charUVs.w, 0, 1}, color, 1.f);
textVertices.emplace_back(glm::vec2 {xOffset + charWidth, yOffset + h}, glm::vec4 {charUVs.z, charUVs.w, 0, 1}, color, 1.f);
textVertices.emplace_back(glm::vec2 {xOffset + charWidth, yOffset }, glm::vec4 {charUVs.z, charUVs.y, 0, 1}, color, 1.f);
textVertices.insert(textVertices.end(), vertices.begin(), vertices.end());
textIndices.insert(textIndices.end(), indices.begin(), indices.end());
textIndices.emplace_back(indOffset);
textIndices.emplace_back(indOffset + 1);
textIndices.emplace_back(indOffset + 2);
textIndices.emplace_back(indOffset + 2);
textIndices.emplace_back(indOffset + 3);
textIndices.emplace_back(indOffset);
indOffset += 4;
}

2
src/game/scene/world/LocalWorld.h
View File

@ -23,7 +23,7 @@
#include "../../../game/graph/drawable/DrawableGroup.h"
#include "../../entity/world/BlockCrackEntity.h"
#include "../../entity/world/ParticleEntity.h"
#include "../../entity/world/LuaEntity.h"
#include "../../../lua/api/type/LuaEntity.h"
#include "graph/MeshChunk.h"
#include "WorldInterpolationStream.h"
#include "MeshGenStream.h"

2
src/lua/api/functions/cUpdateEntities.h
View File

@ -5,7 +5,7 @@
#pragma once
#include <sol2/sol.hpp>
#include "../../../game/entity/world/LuaEntity.h"
#include "../type/LuaEntity.h"
#include "../../../game/scene/world/LocalWorld.h"
namespace ClientApi {

2
src/lua/api/modules/cAddEntity.h
View File

@ -5,7 +5,7 @@
#pragma once
#include <sol2/sol.hpp>
#include "../../../game/entity/world/LuaEntity.h"
#include "../type/LuaEntity.h"
#include "../../../game/scene/world/LocalWorld.h"
namespace ClientApi {

2
src/lua/api/modules/cRemoveEntity.h
View File

@ -5,7 +5,7 @@
#pragma once
#include <sol2/sol.hpp>
#include "../../../game/entity/world/LuaEntity.h"
#include "../type/LuaEntity.h"
#include "../../../game/scene/world/LocalWorld.h"
namespace ClientApi {

0
src/game/entity/world/LuaEntity.cpp → src/lua/api/type/LuaEntity.cpp
View File

2
src/game/entity/world/LuaEntity.h → src/lua/api/type/LuaEntity.h
View File

@ -5,7 +5,7 @@
#pragma once
#include <sol2/sol.hpp>
#include "../Entity.h"
#include "../../../game/entity/Entity.h"
#include "../../../def/LocalDefs.h"
class LuaEntity {

2
src/lua/api/type/cEntity.h → src/lua/api/type/cLuaEntity.h
View File

@ -4,7 +4,7 @@
#pragma once
#include "../../../game/entity/world/LuaEntity.h"
#include "LuaEntity.h"
#include "../../../game/scene/world/LocalWorld.h"
#include <sol2/sol.hpp>

2
src/lua/api/type/cLuaPlayer.h
View File

@ -4,7 +4,7 @@
#pragma once
#include "../../../game/entity/world/LuaEntity.h"
#include "LuaEntity.h"
#include "../../../game/scene/world/LocalWorld.h"
#include "LuaPlayer.h"
#include <sol2/sol.hpp>

2
src/lua/client/LocalLuaParser.cpp
View File

@ -11,7 +11,7 @@
#include "../api/type/LuaPlayer.h"
#include "../../game/scene/world/Player.h"
#include "../api/type/cEntity.h"
#include "../api/type/cLuaEntity.h"
#include "../api/type/cLuaPlayer.h"
#include "../api/modules/cDump.h"

2
src/world/LocalDimension.h
View File

@ -10,7 +10,7 @@
#include "../util/Vec.h"
#include "../game/scene/world/graph/MeshChunk.h"
#include "../game/scene/world/MeshGenStream.h"
#include "../game/entity/world/LuaEntity.h"
#include "../lua/api/type/LuaEntity.h"
#include "../game/entity/world/PlayerEntity.h"
class LocalDimension {