laipeng/robotgo
1
0
Fork 0
mirror of https://github.com/go-vgo/robotgo.git synced 2025-06-03 07:33:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #89 from wilon/master

Browse Source 
FindColorCS add param tolerance Fixed #84
This commit is contained in:
vz 2017-12-24 17:52:11 +08:00 committed by GitHub
commit c98cdf26dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
robotgo.go
View File

@ -886,8 +886,8 @@ func GetColor(bitmap C.MMBitmapRef, x, y int) C.MMRGBHex {
func FindColor(bitmap C.MMBitmapRef, color CHex, args ...float32) (int, int) { func FindColor(bitmap C.MMBitmapRef, color CHex, args ...float32) (int, int) {
var tolerance C.float var tolerance C.float
if len(args) > 2 { if len(args) > 0 {
tolerance = C.float(args[2]) tolerance = C.float(args[0])
} else { } else {
tolerance = 0.5 tolerance = 0.5
} }
@ -900,9 +900,17 @@ func FindColor(bitmap C.MMBitmapRef, color CHex, args ...float32) (int, int) {
} }
// FindColorCS findcolor by CaptureScreen // FindColorCS findcolor by CaptureScreen
func FindColorCS(x, y, w, h int, color CHex) (int, int) { func FindColorCS(x, y, w, h int, color CHex, args ...float32) (int, int) {
var tolerance float32
if len(args) > 0 {
tolerance = args[0]
} else {
tolerance = 0.5
}
bitmap := CaptureScreen(x, y, w, h) bitmap := CaptureScreen(x, y, w, h)
rx, ry := FindColor(bitmap, color) rx, ry := FindColor(bitmap, color, tolerance)
return rx, ry return rx, ry
} }