Leahnaya/SceneSwitcher
1
0
Fork 0
mirror of https://github.com/WarmUpTill/SceneSwitcher.git synced 2026-08-20 00:05:41 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Adjust video condition temp vars
Some checks are pending
debian-build / build (push) Waiting to run
Details
Check locale / ubuntu64 (push) Waiting to run
Details
Push to master / Check Formatting 🔍 (push) Waiting to run
Details
Push to master / Build Project 🧱 (push) Waiting to run
Details
Push to master / Create Release 🛫 (push) Blocked by required conditions
Details

Browse Source
This commit is contained in:
WarmUpTill
2026-03-21 23:14:10 +01:00
committed by WarmUpTill
parent 6309100cc4
commit 29e1ff0754
3 changed files with 35 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
plugins/video/macro-condition-video.cpp
View File

@@ -377,13 +377,19 @@ bool MacroConditionVideo::CheckColor()
_screenshotData.GetImage(), _colorParameters.color,
_colorParameters.colorThreshold,
_colorParameters.matchThreshold);
// Way too slow for now
//SetTempVarValue("dominantColor", GetDominantColor(_screenshotData.image, 3)
// .name(QColor::HexArgb)
// .toStdString());
SetTempVarValue("color", GetAverageColor(_screenshotData.GetImage())
.name(QColor::HexArgb)
.toStdString());
SetTempVarValue("color", [&]() {
return GetAverageColor(_screenshotData.GetImage())
.name(QColor::HexArgb)
.toStdString();
});
SetTempVarValue("dominantColor", [&]() {
return GetDominantColor(_screenshotData.GetImage(), 3)
.name(QColor::HexArgb)
.toStdString();
});
return ret;
}
@@ -479,6 +485,12 @@ void MacroConditionVideo::SetupTempVars()
obs_module_text("AdvSceneSwitcher.tempVar.video.color"),
obs_module_text(
"AdvSceneSwitcher.tempVar.video.color.description"));
AddTempvar(
"dominantColor",
obs_module_text(
"AdvSceneSwitcher.tempVar.video.dominantColor"),
obs_module_text(
"AdvSceneSwitcher.tempVar.video.dominantColor.description"));
break;
case VideoCondition::MATCH:
case VideoCondition::DIFFER: