Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 19:59:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #8036 from ctrlaltdavid/20955

Browse source 
Fix image2d overlay color property
This commit is contained in:
Brad Hefta-Gaub 2016-06-13 19:21:59 -07:00 committed by GitHub
commit 7da29daf9d
1 changed files with 8 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/resources/qml/hifi/overlays/ImageOverlay.qml
View file

@ -1,5 +1,6 @@
import QtQuick 2.3 import QtQuick 2.3
import QtQuick.Controls 1.2 import QtQuick.Controls 1.2
import QtGraphicalEffects 1.0
import "." import "."
@ -44,6 +45,12 @@ Overlay {
} }
} }
ColorOverlay {
id: color
anchors.fill: image
source: image
}
function updateSubImage(subImage) { function updateSubImage(subImage) {
var keys = Object.keys(subImage); var keys = Object.keys(subImage);
for (var i = 0; i < keys.length; ++i) { for (var i = 0; i < keys.length; ++i) {
@ -70,6 +77,7 @@ Overlay {
case "alpha": root.opacity = value; break; case "alpha": root.opacity = value; break;
case "imageURL": image.source = value; break; case "imageURL": image.source = value; break;
case "subImage": updateSubImage(value); break; case "subImage": updateSubImage(value); break;
case "color": color.color = Qt.rgba(value.red / 255, value.green / 255, value.blue / 255, root.opacity); break;
default: console.log("OVERLAY Unhandled image property " + key); default: console.log("OVERLAY Unhandled image property " + key);
} }
} }