New MCode and other features for Gdip_ImageSearch

PixelAverage and the search directions for the needle have been removed. The 4 basic search directions work now for the haystack instead, and the 2 ImageSearch MCodes were unified into a single one. For the next update, I intend to implement 4 more search directions and fix the Trans problem, as it's currently working with characters instead of numeric color values.
MasterFocus · Mar 23, 2013 · cd7fa91 · cd7fa91
1 parent 53e2a30
commit cd7fa91
Show file tree

Hide file tree

Showing 12 changed files with 309 additions and 482 deletions.
diff --git a/Functions/Gdip_ImageSearch/Gdip_ImageSearch.ahk b/Functions/Gdip_ImageSearch/Gdip_ImageSearch.ahk
diff --git a/Functions/Gdip_ImageSearch/Gdip_ImageSearch.c b/Functions/Gdip_ImageSearch/Gdip_ImageSearch.c
diff --git a/Functions/Gdip_ImageSearch/bluesquare.png → ...ons/Gdip_ImageSearch/T_001_bluesquare.png b/Functions/Gdip_ImageSearch/bluesquare.png → ...ons/Gdip_ImageSearch/T_001_bluesquare.png
diff --git a/Functions/Gdip_ImageSearch/folder.png → Functions/Gdip_ImageSearch/T_001_folder.png b/Functions/Gdip_ImageSearch/folder.png → Functions/Gdip_ImageSearch/T_001_folder.png
diff --git a/Functions/Gdip_ImageSearch/T_001_folder02.png b/Functions/Gdip_ImageSearch/T_001_folder02.png
diff --git a/Functions/Gdip_ImageSearch/haystack.png → ...tions/Gdip_ImageSearch/T_001_haystack.png b/Functions/Gdip_ImageSearch/haystack.png → ...tions/Gdip_ImageSearch/T_001_haystack.png
diff --git a/Functions/Gdip_ImageSearch/T_002_haystack-novo.png b/Functions/Gdip_ImageSearch/T_002_haystack-novo.png
diff --git a/Functions/Gdip_ImageSearch/T_002_needle-novo.png b/Functions/Gdip_ImageSearch/T_002_needle-novo.png
diff --git a/Functions/Gdip_ImageSearch/T_002_needle-novo02.png b/Functions/Gdip_ImageSearch/T_002_needle-novo02.png
diff --git a/Functions/Gdip_ImageSearch/T_003_big.png b/Functions/Gdip_ImageSearch/T_003_big.png
diff --git a/Functions/Gdip_ImageSearch/T_003_small.png b/Functions/Gdip_ImageSearch/T_003_small.png
diff --git a/Functions/Gdip_ImageSearch/TestScript.ahk b/Functions/Gdip_ImageSearch/TestScript.ahk
@@ -1,11 +1,11 @@
 ;************************************************
 ; Test script for Gdip_ImageSearch()
 ; by MasterFocus
-; 09/March/2013 09:15 BRT
+; 23/March/2013 02:00 BRT
 ;************************************************
 
 #NoEnv
-ListLines, Off
+;ListLines, Off
 SetBatchLines, -1
 Process, Priority,, High
 
@@ -15,15 +15,17 @@ Process, Priority,, High
 OnExit, EXIT_LABEL
 
 gdipToken := Gdip_Startup()
+
+;;SLEEP, 2000
 ;;bmpHaystack := Gdip_BitmapFromScreen()
-bmpHaystack := Gdip_CreateBitmapFromFile("haystack.png")
-bmpNeedle := Gdip_CreateBitmapFromFile("folder.png")
-ERR := Gdip_ImageSearch(bmpHaystack,bmpNeedle,LIST,COUNT)
+
+bmpHaystack := Gdip_CreateBitmapFromFile("T_002_haystack-novo.png")
+bmpNeedle := Gdip_CreateBitmapFromFile("T_002_needle-novo.png")
+RET := Gdip_ImageSearch(bmpHaystack,bmpNeedle,LIST,COUNT,0,0,0,0,0,"ÿÿÿ",1,0)
 Gdip_DisposeImage(bmpHaystack)
 Gdip_DisposeImage(bmpNeedle)
 Gdip_Shutdown(gdipToken)
-
-MsgBox, % "Error: " ERR "`tCount: " COUNT "`n`n" LIST
+MsgBox, % "Returned: " RET "`tCount: " COUNT "`n`n" LIST
 
 ;; following loop used for pointing to each instance of
 ;; the needle when the haystack is the screen