Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #10564 from birarda/bug/content-loading-always

Browse source 
fix progress bar / stats reference to pending transfer count
This commit is contained in:
Chris Collins 2017-05-26 15:29:06 -07:00 committed by GitHub
commit fd3b6cdf1a
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
scripts/developer/utilities/render/stats.qml
View file

@ -20,9 +20,9 @@ Item {
id: stats
spacing: 8
anchors.fill:parent
property var config: Render.getConfig("Stats")
function evalEvenHeight() {
// Why do we have to do that manually ? cannot seem to find a qml / anchor / layout mode that does that ?
return (height - spacing * (children.length - 1)) / children.length
@ -81,7 +81,7 @@ Item {
color: "#1AC567"
},
{
prop: "textureGPUTransferCount",
prop: "texturePendingGPUTransferCount",
label: "Transfer",
color: "#9495FF"
}
@ -158,7 +158,7 @@ Item {
}
]
}
PlotPerf {
title: "State Changes"
height: parent.evalEvenHeight()
@ -180,7 +180,7 @@ Item {
color: "#1AC567"
}
]
}
}
property var drawOpaqueConfig: Render.getConfig("DrawOpaqueDeferred")
property var drawTransparentConfig: Render.getConfig("DrawTransparentDeferred")
@ -211,7 +211,7 @@ Item {
color: "#FED959"
}
]
}
}
PlotPerf {
title: "Timing"
@ -250,4 +250,3 @@ Item {
}
}

4
scripts/system/progress.js
View file

@ -261,7 +261,7 @@
}
}
gpuTextures = Render.getConfig("Stats").textureGPUTransferCount;
gpuTextures = Render.getConfig("Stats").texturePendingGPUTransferCount;
// Update state
if (!visible) { // Not visible because no recent downloads
@ -290,7 +290,7 @@
}, FADE_OUT_WAIT);
}
} else {
if (displayProgress < 100 || gpuTextures > 0) { // Was finished and waiting to fade out but have resumed so
if (displayProgress < 100 || gpuTextures > 0) { // Was finished and waiting to fade out but have resumed so
// don't fade out
Script.clearInterval(fadeWaitTimer);
fadeWaitTimer = null;