AOI use distance from InitAOI

xiaonanln · xiaonanln · commit c2f5e42ba06b · 2018-07-19T08:51:57.000+08:00
diff --git a/XZListAOIManager.go b/XZListAOIManager.go
@@ -1,7 +1,5 @@
 package aoi
 
-const _DEFAULT_AOI_DISTANCE = 100
-
 type xzaoi struct {
 	aoi          *AOI
 	neighbors    map[*xzaoi]struct{}
diff --git a/aoi.go b/aoi.go
@@ -10,12 +10,6 @@ type AOI struct {
 
 	callback AOICallback
 	implData interface{}
-
-	//// Fields for XZListAOIManager
-	//neighbors    AOISet
-	//xPrev, xNext *AOI
-	//yPrev, yNext *AOI
-	//markVal      int
 }
 
 func InitAOI(aoi *AOI, dist Coord, data interface{}, callback AOICallback) {
diff --git a/aoi_test.go b/aoi_test.go
@@ -80,7 +80,7 @@ func testAOI(t *testing.T, manname string, aoiman AOIManager, numAOI int) {
 	objs := []*TestObj{}
 	for i := 0; i < numAOI; i++ {
 		obj := &TestObj{Id: i + 1, neighbors: map[*TestObj]struct{}{}}
-		InitAOI(&obj.aoi, _DEFAULT_AOI_DISTANCE, obj, obj)
+		InitAOI(&obj.aoi, 100, obj, obj)
 		objs = append(objs, obj)
 		aoiman.Enter(&obj.aoi, randCoord(MIN_X, MAX_X), randCoord(MIN_Y, MAX_Y))
 	}
diff --git a/xAOIList.go b/xAOIList.go
@@ -129,14 +129,14 @@ func (sl *xAOIList) Mark(aoi *xzaoi) {
 	prev := aoi.xPrev
 	coord := aoi.aoi.x
 
-	minCoord := coord - _DEFAULT_AOI_DISTANCE
+	minCoord := coord - aoi.aoi.dist
 	for prev != nil && prev.aoi.x >= minCoord {
 		prev.markVal += 1
 		prev = prev.xPrev
 	}
 
 	next := aoi.xNext
-	maxCoord := coord + _DEFAULT_AOI_DISTANCE
+	maxCoord := coord + aoi.aoi.dist
 	for next != nil && next.aoi.x <= maxCoord {
 		next.markVal += 1
 		next = next.xNext
@@ -146,7 +146,7 @@ func (sl *xAOIList) Mark(aoi *xzaoi) {
 func (sl *xAOIList) GetClearMarkedNeighbors(aoi *xzaoi) {
 	prev := aoi.xPrev
 	coord := aoi.aoi.x
-	minCoord := coord - _DEFAULT_AOI_DISTANCE
+	minCoord := coord - aoi.aoi.dist
 	for prev != nil && prev.aoi.x >= minCoord {
 		if prev.markVal == 2 {
 			aoi.neighbors[prev] = struct{}{}
@@ -159,7 +159,7 @@ func (sl *xAOIList) GetClearMarkedNeighbors(aoi *xzaoi) {
 	}
 
 	next := aoi.xNext
-	maxCoord := coord + _DEFAULT_AOI_DISTANCE
+	maxCoord := coord + aoi.aoi.dist
 	for next != nil && next.aoi.x <= maxCoord {
 		if next.markVal == 2 {
 			aoi.neighbors[next] = struct{}{}
diff --git a/zAOIList.go b/zAOIList.go
@@ -129,14 +129,14 @@ func (sl *yAOIList) Mark(aoi *xzaoi) {
 	prev := aoi.yPrev
 	coord := aoi.aoi.y
 
-	minCoord := coord - _DEFAULT_AOI_DISTANCE
+	minCoord := coord - aoi.aoi.dist
 	for prev != nil && prev.aoi.y >= minCoord {
 		prev.markVal += 1
 		prev = prev.yPrev
 	}
 
 	next := aoi.yNext
-	maxCoord := coord + _DEFAULT_AOI_DISTANCE
+	maxCoord := coord + aoi.aoi.dist
 	for next != nil && next.aoi.y <= maxCoord {
 		next.markVal += 1
 		next = next.yNext
@@ -147,14 +147,14 @@ func (sl *yAOIList) ClearMark(aoi *xzaoi) {
 	prev := aoi.yPrev
 	coord := aoi.aoi.y
 
-	minCoord := coord - _DEFAULT_AOI_DISTANCE
+	minCoord := coord - aoi.aoi.dist
 	for prev != nil && prev.aoi.y >= minCoord {
 		prev.markVal = 0
 		prev = prev.yPrev
 	}
 
 	next := aoi.yNext
-	maxCoord := coord + _DEFAULT_AOI_DISTANCE
+	maxCoord := coord + aoi.aoi.dist
 	for next != nil && next.aoi.y <= maxCoord {
 		next.markVal = 0
 		next = next.yNext

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ func testAOI(t *testing.T, manname string, aoiman AOIManager, numAOI int) {`
`80`	`80`	`objs := []*TestObj{}`
`81`	`81`	`for i := 0; i < numAOI; i++ {`
`82`	`82`	`obj := &TestObj{Id: i + 1, neighbors: map[*TestObj]struct{}{}}`
`83`		`- InitAOI(&obj.aoi, _DEFAULT_AOI_DISTANCE, obj, obj)`
	`83`	`+ InitAOI(&obj.aoi, 100, obj, obj)`
`84`	`84`	`objs = append(objs, obj)`
`85`	`85`	`aoiman.Enter(&obj.aoi, randCoord(MIN_X, MAX_X), randCoord(MIN_Y, MAX_Y))`
`86`	`86`	`}`