mirror of
https://github.com/overte-org/overte.git
synced 2025-04-23 15:13:41 +02:00
Fix merge accidental code delete
This commit is contained in:
parent
d8170516ff
commit
4429e144f4
2 changed files with 17 additions and 0 deletions
|
@ -950,6 +950,20 @@ void ApplicationOverlay::renderDomainConnectionStatusBorder() {
|
|||
if (nodeList && !nodeList->getDomainHandler().isConnected()) {
|
||||
auto glCanvas = DependencyManager::get<GLCanvas>();
|
||||
auto geometryCache = DependencyManager::get<GeometryCache>();
|
||||
int width = glCanvas->width();
|
||||
int height = glCanvas->height();
|
||||
|
||||
if (width != _previousBorderWidth || height != _previousBorderHeight) {
|
||||
QVector<glm::vec2> border;
|
||||
border << glm::vec2(0, 0);
|
||||
border << glm::vec2(0, height);
|
||||
border << glm::vec2(width, height);
|
||||
border << glm::vec2(width, 0);
|
||||
border << glm::vec2(0, 0);
|
||||
geometryCache->updateVertices(_domainStatusBorder, border);
|
||||
_previousBorderWidth = width;
|
||||
_previousBorderHeight = height;
|
||||
}
|
||||
|
||||
glColor3f(CONNECTION_STATUS_BORDER_COLOR[0],
|
||||
CONNECTION_STATUS_BORDER_COLOR[1],
|
||||
|
|
|
@ -116,6 +116,9 @@ private:
|
|||
int _domainStatusBorder;
|
||||
int _magnifierBorder;
|
||||
|
||||
int _previousBorderWidth;
|
||||
int _previousBorderHeight;
|
||||
|
||||
glm::vec3 _previousMagnifierBottomLeft;
|
||||
glm::vec3 _previousMagnifierBottomRight;
|
||||
glm::vec3 _previousMagnifierTopLeft;
|
||||
|
|
Loading…
Reference in a new issue