From f08dc815536b1b3183d46de7d96840f6fdd9f459 Mon Sep 17 00:00:00 2001
From: panlei <2799247126@qq.com>
Date: 星期四, 21 十一月 2019 16:35:44 +0800
Subject: [PATCH] 车辆不再扩充
---
util/image.go | 24 ++++++++----------------
1 files changed, 8 insertions(+), 16 deletions(-)
diff --git a/util/image.go b/util/image.go
index 5485c92..6616bf7 100644
--- a/util/image.go
+++ b/util/image.go
@@ -59,23 +59,15 @@
// 姣忚竟鍚勬墿鐧惧垎涔�20
func EnlargeSizeForCar(x0, y0, x1, y1 int, i protomsg.Image) (x0_new, y0_new, x1_new, y1_new int) {
- // 鍐嶆妸姣忚竟鍚勬墿澶х櫨鍒嗕箣20
- enlarge := float32(0.2)
- x0_new = int((1+enlarge)*float32(x0) - enlarge*float32(x1))
- if x0_new < 0 {
- x0_new = 0
+ // 鍏堟妸闀垮鍙樹负涓�姣斾竴
+ chazhi := (y1 - y0) - (x1 - x0)
+ x0 = x0 - chazhi/2
+ if x0 < 0 {
+ x0 = 0
}
- x1_new = int((1+enlarge)*float32(x1) - enlarge*float32(x0))
- if x1_new > int(i.Width) {
- x1_new = int(i.Width)
- }
- y0_new = int((1+enlarge)*float32(y0) - enlarge*float32(y1))
- if y0_new < 0 {
- y0_new = 0
- }
- y1_new = int((1+enlarge)*float32(y1) - enlarge*float32(y0))
- if y1_new > int(i.Height) {
- y1_new = int(i.Height)
+ x1 = x1 + chazhi/2
+ if x1 > int(i.Width) {
+ x1 = int(i.Width)
}
return
}
--
Gitblit v1.8.0