Commissions/Parking
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed EV spot border, file read sizes, priority size check

Browse Source
This commit is contained in:
Dawid Pietrykowski 2022-09-11 23:43:19 +02:00
parent 4a36800cde
commit c843a2b0fe
6 changed files with 407 additions and 175 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

162
Assets/Data/Tablica5_2022-09-09.csv Normal file
View File

@ -0,0 +1,162 @@
Ranga stanowiska ,wybrany sposób parkowania,Klasyfikacja gabarytu ,od planwane,do planowane,od rzeczywiste,do rzeczywiste,czas miedzy sprawdzaniem miejsca
1,,Du¿y,13,16,12:59,16:01,60
1,T,Du¿y,13,16,13:05,16:10,60
1,P,Du¿y,13:30,16:30,13:31,16:35,60
1,P,Du¿y,14,17,13:57,17:01,60
1,,Du¿y,13,16,13:08,16:15,60
1,P,Du¿y,12:30,16:30,12:25,16:38,60
1,T,Du¿y,12:30,15:30,12:31,15:29,60
1,,Du¿y,13,15,12:56,14:58,60
1,,Du¿y,13,16,12:54,16:02,60
1,T,Du¿y,13:30,15:30,13:30,15:35,60
1,,Du¿y,14,16,13:56,15:58,60
1,P,Du¿y,12:30,17,12:27,16:59,60
1,P,Du¿y,13,16,12:55,15:58,60
1,,Du¿y,12:30,16,12:01,16:02,60
1,,Du¿y,13,15:30,12:56,15:43,60
2,,Du¿y,13,16,12:58,16:03,15
2,T,Du¿y,13:30,16:30,13:28,16:35,15
2,,Du¿y,14,17,14:04,16:58,15
2,T,Du¿y,12:30,16,12:31,16:40,15
2,P,Du¿y,13:30,15:30,13:27,15:31,15
2,P,Du¿y,13:30,16:30,13:19,16:32,15
2,P,Du¿y,13,16,12:58,16:04,15
2,T,Du¿y,13,15,13:08,15:05,15
2,T,Du¿y,13:30,15:30,13:28,15:32,15
2,P,Du¿y,12:30,16:30,12:34,16:41,15
2,,Du¿y,13:30,16:30,13:24,16:29,15
2,,Du¿y,12:30,15:30,12:28,15:35,15
2,,Du¿y,13,16,12:55,16:01,15
2,T,Du¿y,13,15,12:58,15:19,15
2,,Du¿y,13,17,12:55,17:01,15
2,P,Du¿y,13:30,15:30,13:27,15:32,15
2,,Du¿y,13:30,16:30,12:25,16:37,15
2,T,Du¿y,14,17,14:02,17:05,15
2,P,Du¿y,14,16,14:06,15:40,15
2,,Du¿y,12:30,15:30,12:34,15:38,15
2,T,Du¿y,13:30,16:30,13:29,16:39,15
2,,Du¿y,13,16,13:10,16:13,15
2,P,Du¿y,13,17,12:49,16:51,15
2,P,Du¿y,14,17,14:04,17:11,15
2,T,Du¿y,13,16,13:02,16:03,15
2,,Du¿y,13:30,15:30,13:31,15:39,15
2,,Du¿y,13,17,12:55,16:59,15
2,,Du¿y,12:30,16:30,12:38,16:45,15
2,P,Du¿y,13,16,12:45,16:10,15
2,T,Du¿y,12:30,15:30,12:09,15:40,15
2,,Du¿y,13:30,16:30,13:15,16:32,15
2,,Du¿y,13:30,16:30,13:38,16:43,15
2,,Du¿y,14,17,14:02,17:11,15
2,P,Du¿y,12:30,16:30,12:35,16:47,15
2,P,Du¿y,13,17,12:54,16:40,15
2,,Du¿y,13:30,15:30,13:32,15:37,15
2,,Du¿y,12:30,16:30,12:35,16:31,15
2,P,Du¿y,12:30,15:30,12:43,15:47,15
2,,Du¿y,13:30,17:30,13:36,17:30,15
2,T,Du¿y,13,16,12:55,16:11,15
2,P,Du¿y,12:30,16:30,12:39,16:44,15
2,T,Du¿y,14,17,14:08,17:14,15
2,,Du¿y,13:30,16,13:31,15:55,15
2,,Du¿y,12:30,16,12:26,15:57,15
2,,Du¿y,13,17,12:50,16:59,15
2,P,Du¿y,14:00,17:30,13:57,17:34,15
2,,Du¿y,13,16,12:57,16:01,15
2,,Du¿y,13:30,16:30,13:32,16:30,15
2,T,Du¿y,13,15:30,12:54,15:31,15
2,T,Du¿y,14,17,13:49,16:58,15
2,,Du¿y,13:30,17:30,13:30,17:28,15
2,P,Du¿y,12:30,16:30,12:25,16:32,15
2,T,Du¿y,13,17,13:04,17:01,15
2,,Du¿y,14,17,13:58,17:03,15
2,,Du¿y,12:30,16:30,12:29,16:10,15
2,,Du¿y,13:30,17:30,13:28,17:33,15
2,P,Du¿y,14,17,13:57,17:04,15
2,P,Du¿y,13,16,13:04,15:52,15
2,P,Du¿y,13:30,17,13:34,16:59,15
2,,Du¿y,13:30,16,13:25,15:49,15
2,T,Du¿y,13,17,13:04,17:01,15
2,,Du¿y,14,17,13:58,17:03,15
2,,Du¿y,12:30,16:30,12:29,16:10,15
2,,Du¿y,13:30,17:30,13:28,17:33,15
2,P,Du¿y,14,17,13:57,17:04,15
2,P,Du¿y,13,16,13:04,15:52,15
2,P,Du¿y,13:30,17,13:34,16:59,15
2,,Du¿y,13:30,16,13:25,15:49,15
2,P,Du¿y,14,17,13:57,17:04,15
2,P,Du¿y,13,16,13:04,15:52,15
2,P,Du¿y,13:30,17,13:34,16:59,15
2,,Du¿y,13:30,16,13:25,15:49,15
2,,Du¿y,13:30,16,13:25,15:49,15
2,P,Ma³y,13,16,13:03,15:56,15
2,,Œredni,13:30,16:30,13:28,16:34,15
2,,Œredni,8,12,7:53,12:01,15
2,,Ma³y,12:30,16:30,12:28,16:35,15
2,,Œredni,13,17,12:56,16:59,15
2,,Ma³y,7:30,12,7:24,11:58,15
2,,Ma³y,8,13,8:01,13:07,15
2,T,Œredni,8,13,8:10,13:12,15
2,P,Œredni,8,11,8:45,11:02,15
3,P,Œredni,8,10,7:53,10:01,15
3,,Ma³y,9,11,8:53,10:45,15
3,,Œredni,8,11,7:45,11:01,15
3,T,Ma³y,9,11,9:30,10:59,15
3,T,Œredni,9,11,9,11:10,15
3,,Ma³y,10,11,9:50,11:04,15
3,,Œredni,9,11,9:20,10:40,15
3,P,Œredni,9,11,9,11:15,15
3,,Œredni,9,11,8:45,11:23,15
3,P,Ma³y,9,11,9,10:57,15
3,,Œredni,10,11,9:50,10:45,15
3,T,Œredni,9,11,9:30,11:06,15
3,,Œredni,8,11,7:56,10:34,15
3,T,Ma³y,9,11,09:04,11:03,15
3,T,Œredni,8,13,7:50,12:10,15
3,,Œredni,7,13,6:40,13:02,15
3,,Ma³y,7,12,7:05,12:03,15
3,P,Ma³y,10,13,9:49,12:58,15
3,,Œredni,8,12,7:45,12:04,15
3,P,Œredni,9,13,9:23,12:58,15
3,,Ma³y,8,13,7:49,13:01,15
3,,Œredni,7:30,12:30,7:27,12:36,15
3,,Ma³y,8,13,8:10,12:50,15
3,P,Ma³y,7:30,13,7:53,12:37,15
3,,Œredni,8,13,7:53,13:01,15
3,P,Œredni,7:30,13,7:35,13:00,15
3,T,Œredni,8,12:30,7:53,12:40,15
3,,Ma³y,8,13,7:57,13:01,15
3,P,Ma³y,8,13,7:45,13:10,15
3,P,Ma³y,8,12:30,7:49,12:25,15
3,,Œredni,10,13,10:05,13:08,15
3,T,Œredni,7,12,7,12:10,15
3,P,Ma³y,8,13,8:05,12:55,15
3,,Ma³y,8,13,7:45,13:10,15
3,,Ma³y,8,13,7:50,12:58,15
3,T,Œredni,8,12,8:03,12:49,15
3,,Œredni,8,10,8,9:58,15
3,P,Ma³y,7:30,12:30,7:25,12:32,15
3,,Ma³y,8,12,8:02,12:05,15
3,P,Œredni,7:30,13,7:28,12:40,15
3,T,Œredni,7:30,12:30,7:15,12:17,15
3,,Ma³y,8,12:30,7:45,12:10,15
3,P,Œredni,7,13,6:58,13:02,15
3,,Œredni,8,12,7:57,11:58,15
3,P,Ma³y,8,13,8:05,13:10,15
3,,Œredni,8,12:30,8:01,12:34,15
3,T,Ma³y,8,13,7:47,13:01,15
3,,Ma³y,7,12,6:57,12,15
3,T,Œredni,7:30,12:30,7:15,12:17,15
3,,Ma³y,8,12:30,7:45,12:10,15
3,P,Œredni,7,13,6:58,13:02,15
3,,Œredni,8,12,7:57,11:58,15
3,P,Ma³y,8,13,8:05,13:10,15
3,,Œredni,8,12:30,8:01,12:34,15
3,T,Ma³y,8,13,7:47,13:01,15
3,,Ma³y,7,12,6:57,12,15
3,T,Ma³y,8,13,7:45,12:59,15
3,P,Œredni,8,13,8:02,12:47,15
3,P,Œredni,8:30,13,8:21,12:48,15
3,,Ma³y,9,13,9:02,13:04,15
3,T,Œredni,9,12:30,8:57,12:35,15
3,T,Ma³y,8,13,8:04,13:12,15
3,T,Ma³y,8,13,7:52,12:57,15
3,,Ma³y,8,13,7:50,12:59,15
1 Ranga stanowiska wybrany sposób parkowania Klasyfikacja gabarytu od planwane do planowane od rzeczywiste do rzeczywiste czas miedzy sprawdzaniem miejsca
2 1 Du¿y 13 16 12:59 16:01 60
3 1 T Du¿y 13 16 13:05 16:10 60
4 1 P Du¿y 13:30 16:30 13:31 16:35 60
5 1 P Du¿y 14 17 13:57 17:01 60
6 1 Du¿y 13 16 13:08 16:15 60
7 1 P Du¿y 12:30 16:30 12:25 16:38 60
8 1 T Du¿y 12:30 15:30 12:31 15:29 60
9 1 Du¿y 13 15 12:56 14:58 60
10 1 Du¿y 13 16 12:54 16:02 60
11 1 T Du¿y 13:30 15:30 13:30 15:35 60
12 1 Du¿y 14 16 13:56 15:58 60
13 1 P Du¿y 12:30 17 12:27 16:59 60
14 1 P Du¿y 13 16 12:55 15:58 60
15 1 Du¿y 12:30 16 12:01 16:02 60
16 1 Du¿y 13 15:30 12:56 15:43 60
17 2 Du¿y 13 16 12:58 16:03 15
18 2 T Du¿y 13:30 16:30 13:28 16:35 15
19 2 Du¿y 14 17 14:04 16:58 15
20 2 T Du¿y 12:30 16 12:31 16:40 15
21 2 P Du¿y 13:30 15:30 13:27 15:31 15
22 2 P Du¿y 13:30 16:30 13:19 16:32 15
23 2 P Du¿y 13 16 12:58 16:04 15
24 2 T Du¿y 13 15 13:08 15:05 15
25 2 T Du¿y 13:30 15:30 13:28 15:32 15
26 2 P Du¿y 12:30 16:30 12:34 16:41 15
27 2 Du¿y 13:30 16:30 13:24 16:29 15
28 2 Du¿y 12:30 15:30 12:28 15:35 15
29 2 Du¿y 13 16 12:55 16:01 15
30 2 T Du¿y 13 15 12:58 15:19 15
31 2 Du¿y 13 17 12:55 17:01 15
32 2 P Du¿y 13:30 15:30 13:27 15:32 15
33 2 Du¿y 13:30 16:30 12:25 16:37 15
34 2 T Du¿y 14 17 14:02 17:05 15
35 2 P Du¿y 14 16 14:06 15:40 15
36 2 Du¿y 12:30 15:30 12:34 15:38 15
37 2 T Du¿y 13:30 16:30 13:29 16:39 15
38 2 Du¿y 13 16 13:10 16:13 15
39 2 P Du¿y 13 17 12:49 16:51 15
40 2 P Du¿y 14 17 14:04 17:11 15
41 2 T Du¿y 13 16 13:02 16:03 15
42 2 Du¿y 13:30 15:30 13:31 15:39 15
43 2 Du¿y 13 17 12:55 16:59 15
44 2 Du¿y 12:30 16:30 12:38 16:45 15
45 2 P Du¿y 13 16 12:45 16:10 15
46 2 T Du¿y 12:30 15:30 12:09 15:40 15
47 2 Du¿y 13:30 16:30 13:15 16:32 15
48 2 Du¿y 13:30 16:30 13:38 16:43 15
49 2 Du¿y 14 17 14:02 17:11 15
50 2 P Du¿y 12:30 16:30 12:35 16:47 15
51 2 P Du¿y 13 17 12:54 16:40 15
52 2 Du¿y 13:30 15:30 13:32 15:37 15
53 2 Du¿y 12:30 16:30 12:35 16:31 15
54 2 P Du¿y 12:30 15:30 12:43 15:47 15
55 2 Du¿y 13:30 17:30 13:36 17:30 15
56 2 T Du¿y 13 16 12:55 16:11 15
57 2 P Du¿y 12:30 16:30 12:39 16:44 15
58 2 T Du¿y 14 17 14:08 17:14 15
59 2 Du¿y 13:30 16 13:31 15:55 15
60 2 Du¿y 12:30 16 12:26 15:57 15
61 2 Du¿y 13 17 12:50 16:59 15
62 2 P Du¿y 14:00 17:30 13:57 17:34 15
63 2 Du¿y 13 16 12:57 16:01 15
64 2 Du¿y 13:30 16:30 13:32 16:30 15
65 2 T Du¿y 13 15:30 12:54 15:31 15
66 2 T Du¿y 14 17 13:49 16:58 15
67 2 Du¿y 13:30 17:30 13:30 17:28 15
68 2 P Du¿y 12:30 16:30 12:25 16:32 15
69 2 T Du¿y 13 17 13:04 17:01 15
70 2 Du¿y 14 17 13:58 17:03 15
71 2 Du¿y 12:30 16:30 12:29 16:10 15
72 2 Du¿y 13:30 17:30 13:28 17:33 15
73 2 P Du¿y 14 17 13:57 17:04 15
74 2 P Du¿y 13 16 13:04 15:52 15
75 2 P Du¿y 13:30 17 13:34 16:59 15
76 2 Du¿y 13:30 16 13:25 15:49 15
77 2 T Du¿y 13 17 13:04 17:01 15
78 2 Du¿y 14 17 13:58 17:03 15
79 2 Du¿y 12:30 16:30 12:29 16:10 15
80 2 Du¿y 13:30 17:30 13:28 17:33 15
81 2 P Du¿y 14 17 13:57 17:04 15
82 2 P Du¿y 13 16 13:04 15:52 15
83 2 P Du¿y 13:30 17 13:34 16:59 15
84 2 Du¿y 13:30 16 13:25 15:49 15
85 2 P Du¿y 14 17 13:57 17:04 15
86 2 P Du¿y 13 16 13:04 15:52 15
87 2 P Du¿y 13:30 17 13:34 16:59 15
88 2 Du¿y 13:30 16 13:25 15:49 15
89 2 Du¿y 13:30 16 13:25 15:49 15
90 2 P Ma³y 13 16 13:03 15:56 15
91 2 Œredni 13:30 16:30 13:28 16:34 15
92 2 Œredni 8 12 7:53 12:01 15
93 2 Ma³y 12:30 16:30 12:28 16:35 15
94 2 Œredni 13 17 12:56 16:59 15
95 2 Ma³y 7:30 12 7:24 11:58 15
96 2 Ma³y 8 13 8:01 13:07 15
97 2 T Œredni 8 13 8:10 13:12 15
98 2 P Œredni 8 11 8:45 11:02 15
99 3 P Œredni 8 10 7:53 10:01 15
100 3 Ma³y 9 11 8:53 10:45 15
101 3 Œredni 8 11 7:45 11:01 15
102 3 T Ma³y 9 11 9:30 10:59 15
103 3 T Œredni 9 11 9 11:10 15
104 3 Ma³y 10 11 9:50 11:04 15
105 3 Œredni 9 11 9:20 10:40 15
106 3 P Œredni 9 11 9 11:15 15
107 3 Œredni 9 11 8:45 11:23 15
108 3 P Ma³y 9 11 9 10:57 15
109 3 Œredni 10 11 9:50 10:45 15
110 3 T Œredni 9 11 9:30 11:06 15
111 3 Œredni 8 11 7:56 10:34 15
112 3 T Ma³y 9 11 09:04 11:03 15
113 3 T Œredni 8 13 7:50 12:10 15
114 3 Œredni 7 13 6:40 13:02 15
115 3 Ma³y 7 12 7:05 12:03 15
116 3 P Ma³y 10 13 9:49 12:58 15
117 3 Œredni 8 12 7:45 12:04 15
118 3 P Œredni 9 13 9:23 12:58 15
119 3 Ma³y 8 13 7:49 13:01 15
120 3 Œredni 7:30 12:30 7:27 12:36 15
121 3 Ma³y 8 13 8:10 12:50 15
122 3 P Ma³y 7:30 13 7:53 12:37 15
123 3 Œredni 8 13 7:53 13:01 15
124 3 P Œredni 7:30 13 7:35 13:00 15
125 3 T Œredni 8 12:30 7:53 12:40 15
126 3 Ma³y 8 13 7:57 13:01 15
127 3 P Ma³y 8 13 7:45 13:10 15
128 3 P Ma³y 8 12:30 7:49 12:25 15
129 3 Œredni 10 13 10:05 13:08 15
130 3 T Œredni 7 12 7 12:10 15
131 3 P Ma³y 8 13 8:05 12:55 15
132 3 Ma³y 8 13 7:45 13:10 15
133 3 Ma³y 8 13 7:50 12:58 15
134 3 T Œredni 8 12 8:03 12:49 15
135 3 Œredni 8 10 8 9:58 15
136 3 P Ma³y 7:30 12:30 7:25 12:32 15
137 3 Ma³y 8 12 8:02 12:05 15
138 3 P Œredni 7:30 13 7:28 12:40 15
139 3 T Œredni 7:30 12:30 7:15 12:17 15
140 3 Ma³y 8 12:30 7:45 12:10 15
141 3 P Œredni 7 13 6:58 13:02 15
142 3 Œredni 8 12 7:57 11:58 15
143 3 P Ma³y 8 13 8:05 13:10 15
144 3 Œredni 8 12:30 8:01 12:34 15
145 3 T Ma³y 8 13 7:47 13:01 15
146 3 Ma³y 7 12 6:57 12 15
147 3 T Œredni 7:30 12:30 7:15 12:17 15
148 3 Ma³y 8 12:30 7:45 12:10 15
149 3 P Œredni 7 13 6:58 13:02 15
150 3 Œredni 8 12 7:57 11:58 15
151 3 P Ma³y 8 13 8:05 13:10 15
152 3 Œredni 8 12:30 8:01 12:34 15
153 3 T Ma³y 8 13 7:47 13:01 15
154 3 Ma³y 7 12 6:57 12 15
155 3 T Ma³y 8 13 7:45 12:59 15
156 3 P Œredni 8 13 8:02 12:47 15
157 3 P Œredni 8:30 13 8:21 12:48 15
158 3 Ma³y 9 13 9:02 13:04 15
159 3 T Œredni 9 12:30 8:57 12:35 15
160 3 T Ma³y 8 13 8:04 13:12 15
161 3 T Ma³y 8 13 7:52 12:57 15
162 3 Ma³y 8 13 7:50 12:59 15

7
Assets/Data/Tablica5_2022-09-09.csv.meta Normal file
View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: d898f1b97a383b664ab5c34cd5f983ad
TextScriptImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

2
Assets/Scenes/SampleScene.unity
View File

@ -2932,7 +2932,7 @@ MonoBehaviour:
mainPlanContainer: {fileID: 557435656}
emergencyPlanContainer: {fileID: 632826360}
reconfigurationToggle: {fileID: 441283505}
defaultPath: Assets/Data/Tablica3.csv
defaultPath: Assets/Data/Tablica5_2022-09-09.csv
--- !u!1 &1347097428
GameObject:
m_ObjectHideFlags: 0

12
Assets/Scripts/DataImporter.cs
View File

@ -15,7 +15,7 @@ namespace Parking
{
if (!File.Exists(path))
return false;
string fileData = File.ReadAllText(path);
string fileData = File.ReadAllText(path);//Encoding.GetEncoding(28605));
string[] lines = fileData.Split("\n"[0]);
int counter = 0;
char separator = ',';
@ -38,11 +38,15 @@ namespace Parking
: ParkingPreference.Back;
Size size;
string sizeString = lineData[2];
if (sizeString == "Mały" || sizeString == "Ma" + (char)0xB3 + "y") {
List<int> chars = new();
foreach (char c in sizeString) {
chars.Add((int)c);
}
if (sizeString == "Mały" || sizeString == "Ma" + (char)0xB3 + "y" || (sizeString.Contains("Ma") && sizeString.Contains("y"))) {
size = Size.A;
}else if (sizeString == "Średni" || sizeString == (char)0xD7 + "redni") {
}else if (sizeString == "Średni" || sizeString == (char)0xD7 + "redni" || sizeString.Contains("redni")) {
size = Size.B;
}else if (sizeString == "Duży" || sizeString == "Du" + (char)0xBF + "y") {
}else if (sizeString == "Duży" || sizeString == "Du" + (char)0xBF + "y" || sizeString.Contains("Du")) {
size = Size.C;
}else if (sizeString == "Max") {
size = Size.D;

339
Assets/Scripts/ParkingManager.cs
View File

@ -237,7 +237,8 @@ namespace Parking
{
foreach (List<Spot> list in _spotMap)
foreach (Spot spot1 in list)
if (spot1.Reserved && spot1.ReservedPriority == driver.Priority) {
if (spot1.Reserved && spot1.ReservedPriority == driver.Priority && driver.Size == spot1.Size)
{
spot = spot1;
return true;
}
@ -338,186 +339,186 @@ namespace Parking
private bool TryReconfigureSpotForSize(Size newSize)
{
foreach (List<Spot> currentLaneSpots in _spotMap)
for (int i = 0; i < currentLaneSpots.Count; i++) {
Spot spot = currentLaneSpots[i];
if (!(spot.Free && spot.Size != Size.D)) // && !spot.Reserved))
continue;
if (GetSpotCountOfSize(Size.A) <= 2 && spot.Size == Size.A)
continue;
if (GetSpotCountOfSize(Size.B) <= 2 && spot.Size == Size.B)
continue;
if (spot.LastReconfiguration == _currentTime)
continue;
for (int i = 0; i < currentLaneSpots.Count; i++) {
Spot spot = currentLaneSpots[i];
if (!(spot.Free && spot.Size != Size.D)) // && !spot.Reserved))
continue;
if (GetSpotCountOfSize(Size.A) <= 2 && spot.Size == Size.A)
continue;
if (GetSpotCountOfSize(Size.B) <= 2 && spot.Size == Size.B)
continue;
if (spot.LastReconfiguration == _currentTime)
continue;
int size = (int) newSize;
Vector3 position = spot.GameObject.transform.position;
Quaternion rotation = spot.GameObject.transform.rotation;
int size = (int) newSize;
Vector3 position = spot.GameObject.transform.position;
Quaternion rotation = spot.GameObject.transform.rotation;
float diff = (_spotHeights[(int) spot.Size] - _spotHeights[size]) / 2.0f;
if (!spot.AlignToTop)
diff *= -1;
Vector3 offset = spot.Perpendicular ? new Vector3(0, diff, 0) : new Vector3(-diff, 0, 0);
Vector3 newPosition = position + offset;
float diff = (_spotHeights[(int) spot.Size] - _spotHeights[size]) / 2.0f;
if (!spot.AlignToTop)
diff *= -1;
Vector3 offset = spot.Perpendicular ? new Vector3(0, diff, 0) : new Vector3(-diff, 0, 0);
Vector3 newPosition = position + offset;
if (spot.Size > newSize) {
if (!spot.Perpendicular) {
float newX = GetNextBorderHorizontal(position, spot.Lane, spot.Perpendicular, newSize, true) -
_spotHeights[(int) spot.Size] / 2.0f - 0.5f;
newPosition = new Vector3(newX,
newPosition.y, newPosition.z);
}
else {
float newX = GetNextBorderHorizontal(position, spot.Lane, spot.Perpendicular, newSize, true) -
2.25f / 2.0f;
if (spot.Lane == 0) {
float xRelativeToRight = newX - Width / 2.0f - 2.25f / 2.0f;
xRelativeToRight -= (xRelativeToRight + 2.25f / 2.0f) % 2.25f;
newX = xRelativeToRight + Width / 2.0f;
if (spot.Size > newSize) {
if (!spot.Perpendicular) {
float newX = GetNextBorderHorizontal(position, spot.Lane, spot.Perpendicular, newSize, true) -
_spotHeights[(int) spot.Size] / 2.0f - 0.5f;
newPosition = new Vector3(newX,
newPosition.y, newPosition.z);
}
else {
float xRelativeToLeft = newX + Width / 2.0f;
xRelativeToLeft -= (xRelativeToLeft + 2.25f / 2.0f) % 2.25f;
newX = xRelativeToLeft - Width / 2.0f;
}
float newX = GetNextBorderHorizontal(position, spot.Lane, spot.Perpendicular, newSize, true) -
2.25f / 2.0f;
if (spot.Lane == 0) {
float xRelativeToRight = newX - Width / 2.0f - 2.25f / 2.0f;
xRelativeToRight -= (xRelativeToRight + 2.25f / 2.0f) % 2.25f;
newX = xRelativeToRight + Width / 2.0f;
}
else {
float xRelativeToLeft = newX + Width / 2.0f;
xRelativeToLeft -= (xRelativeToLeft + 2.25f / 2.0f) % 2.25f;
newX = xRelativeToLeft - Width / 2.0f;
}
newPosition = new Vector3(newX,
newPosition.y, newPosition.z);
newPosition = new Vector3(newX,
newPosition.y, newPosition.z);
}
}
}
else if (spot.Size < newSize) {
float spotBorder;
float thisSizeOffset;
if (spot.Perpendicular)
thisSizeOffset = _spotHeights[size] / 2.0f;
else
thisSizeOffset = 2.25f / 2.0f;
if (!spot.AlignToTop)
spotBorder = newPosition.y + thisSizeOffset;
else
spotBorder = newPosition.y - thisSizeOffset;
if (spot.Perpendicular) {
float nextBorder = GetNextBorderVectical(newPosition, spot.Lane, spot.Perpendicular, newSize,
!spot.AlignToTop);
if (Math.Abs(spotBorder - nextBorder) < 5.5f)
continue;
}
else {
float nextBorderLeft = GetNextBorderHorizontal(position, spot.Lane, spot.Perpendicular,
spot.Size,
false);
float nextBorderRight = GetNextBorderHorizontal(position, spot.Lane, spot.Perpendicular,
spot.Size,
true);
if (nextBorderRight - nextBorderLeft < _spotHeights[(int) newSize] + 1f) {
// Try perpendicular
float bottomBorder = newPosition.y - 2.25f / 2.0f;
float topBorder = newPosition.y + 2.25f / 2.0f;
bool foundByRemoval = false;
if (spot.AlignToTop) {
float newBottomBorder = topBorder - _spotHeights[size];
float newTopBorder = topBorder;
float nextBorder = GetNextBorderVectical(newPosition, spot.Lane, spot.Perpendicular,
newSize,
!spot.AlignToTop);
if (Math.Abs(nextBorder - newBottomBorder) < 5.5f) {
if (i < currentLaneSpots.Count - 1) {
Spot nextSpot = currentLaneSpots[i + 1];
if (nextSpot.Free && !nextSpot.Reserved) {
Destroy(nextSpot.GameObject);
currentLaneSpots.RemoveAt(i + 1);
i--;
newPosition.x = nextBorderRight - _spotHeights[(int) newSize] - 0.5f;
newPosition.y = position.y;
foundByRemoval = true;
}else
continue;
else if (spot.Size < newSize) {
float spotBorder;
float thisSizeOffset;
if (spot.Perpendicular)
thisSizeOffset = _spotHeights[size] / 2.0f;
else
thisSizeOffset = 2.25f / 2.0f;
if (!spot.AlignToTop)
spotBorder = newPosition.y + thisSizeOffset;
else
spotBorder = newPosition.y - thisSizeOffset;
if (spot.Perpendicular) {
float nextBorder = GetNextBorderVectical(newPosition, spot.Lane, spot.Perpendicular, newSize,
!spot.AlignToTop);
if (Math.Abs(spotBorder - nextBorder) < 5.5f)
continue;
}
else {
float nextBorderLeft = GetNextBorderHorizontal(position, spot.Lane, spot.Perpendicular,
spot.Size,
false);
float nextBorderRight = GetNextBorderHorizontal(position, spot.Lane, spot.Perpendicular,
spot.Size,
true);
if (nextBorderRight - nextBorderLeft < _spotHeights[(int) newSize] + 1f) {
// Try perpendicular
float bottomBorder = newPosition.y - 2.25f / 2.0f;
float topBorder = newPosition.y + 2.25f / 2.0f;
bool foundByRemoval = false;
if (spot.AlignToTop) {
float newBottomBorder = topBorder - _spotHeights[size];
float newTopBorder = topBorder;
float nextBorder = GetNextBorderVectical(newPosition, spot.Lane, spot.Perpendicular,
newSize,
!spot.AlignToTop);
if (Math.Abs(nextBorder - newBottomBorder) < 5.5f) {
if (i < currentLaneSpots.Count - 1) {
Spot nextSpot = currentLaneSpots[i + 1];
if (nextSpot.Free && !nextSpot.Reserved) {
Destroy(nextSpot.GameObject);
currentLaneSpots.RemoveAt(i + 1);
i--;
newPosition.x = nextBorderRight - _spotHeights[(int) newSize] - 0.5f;
newPosition.y = position.y;
foundByRemoval = true;
}else
continue;
}
}
}
else {
float newBottomBorder = bottomBorder;
float newTopBorder = bottomBorder + _spotHeights[size];
float nextBorder = GetNextBorderVectical(newPosition, spot.Lane, spot.Perpendicular,
newSize,
!spot.AlignToTop);
if (Math.Abs(newTopBorder - nextBorder) < 5.5f) {
if (i < currentLaneSpots.Count - 1) {
Spot nextSpot = currentLaneSpots[i + 1];
if (nextSpot.Free && !nextSpot.Reserved) {
Destroy(nextSpot.GameObject);
currentLaneSpots.RemoveAt(i + 1);
i--;
newPosition.x = nextBorderRight - _spotHeights[(int) newSize] - 0.5f;
newPosition.y = position.y;
foundByRemoval = true;
}else
continue;
}
}
}
if (!foundByRemoval) {
newPosition.y = bottomBorder + _spotHeights[(int) newSize] / 2.0f;
float newX = nextBorderRight;
if (spot.Lane == 0) {
float xRelativeToRight = -(newX - Width / 2.0f);
xRelativeToRight -= (xRelativeToRight + 2.25f / 2.0f) % 2.25f;
xRelativeToRight += 2.25f;
xRelativeToRight = Math.Max(xRelativeToRight, 2.25f / 2.0f);
newX = -xRelativeToRight + Width / 2.0f;
}
else {
float xRelativeToLeft = newX + Width / 2.0f;
xRelativeToLeft -= (xRelativeToLeft + 2.25f / 2.0f) % 2.25f;
newX = xRelativeToLeft - Width / 2.0f;
}
if (spot.Lane == 0 && Width / 2.0f - newX < 5.5f + 0.5f + 2.25f) {
// Try to remove one spot next
continue;
}
else {
newPosition.x = newX;
spot.Flipped = currentLaneSpots.FindIndex(spotPredicate => spotPredicate == spot) %
2 == 0;
rotation *= Quaternion.Euler(0, 0, spot.Flipped ? 90 : -90);
spot.Perpendicular = true;
}
}
}
else {
float newBottomBorder = bottomBorder;
float newTopBorder = bottomBorder + _spotHeights[size];
float nextBorder = GetNextBorderVectical(newPosition, spot.Lane, spot.Perpendicular,
newSize,
!spot.AlignToTop);
if (Math.Abs(newTopBorder - nextBorder) < 5.5f) {
if (i < currentLaneSpots.Count - 1) {
Spot nextSpot = currentLaneSpots[i + 1];
if (nextSpot.Free && !nextSpot.Reserved) {
Destroy(nextSpot.GameObject);
currentLaneSpots.RemoveAt(i + 1);
i--;
newPosition.x = nextBorderRight - _spotHeights[(int) newSize] - 0.5f;
newPosition.y = position.y;
foundByRemoval = true;
}else
continue;
}
}
newPosition.x = nextBorderRight - _spotHeights[(int) newSize] / 2.0f - 0.5f;
if (i == 0)
newPosition.x += 0.5f;
newPosition.y = position.y;
// if (i < currentLaneSpots.Count - 1) {
// Spot nextSpot = currentLaneSpots[i + 1];
// if (nextSpot.Free && !nextSpot.Reserved) {
// Destroy(nextSpot.GameObject);
// currentLaneSpots.RemoveAt(i + 1);
// i--;
// newPosition.x = nextBorderRight - _spotHeights[(int) newSize] - 0.5f;
// newPosition.y = position.y;
// continue;
// }
// }
// newPosition.x = nextBorderRight - _spotHeights[(int) newSize] - 0.5f;
}
if (!foundByRemoval) {
newPosition.y = bottomBorder + _spotHeights[(int) newSize] / 2.0f;
float newX = nextBorderRight;
if (spot.Lane == 0) {
float xRelativeToRight = -(newX - Width / 2.0f);
xRelativeToRight -= (xRelativeToRight + 2.25f / 2.0f) % 2.25f;
xRelativeToRight += 2.25f;
xRelativeToRight = Math.Max(xRelativeToRight, 2.25f / 2.0f);
newX = -xRelativeToRight + Width / 2.0f;
}
else {
float xRelativeToLeft = newX + Width / 2.0f;
xRelativeToLeft -= (xRelativeToLeft + 2.25f / 2.0f) % 2.25f;
newX = xRelativeToLeft - Width / 2.0f;
}
if (spot.Lane == 0 && Width / 2.0f - newX < 5.5f + 0.5f + 2.25f) {
// Try to remove one spot next
continue;
}
else {
newPosition.x = newX;
spot.Flipped = currentLaneSpots.FindIndex(spotPredicate => spotPredicate == spot) %
2 == 0;
rotation *= Quaternion.Euler(0, 0, spot.Flipped ? 90 : -90);
spot.Perpendicular = true;
}
}
}
else {
newPosition.x = nextBorderRight - _spotHeights[(int) newSize] / 2.0f - 0.5f;
if (i == 0)
newPosition.x += 0.5f;
newPosition.y = position.y;
// if (i < currentLaneSpots.Count - 1) {
// Spot nextSpot = currentLaneSpots[i + 1];
// if (nextSpot.Free && !nextSpot.Reserved) {
// Destroy(nextSpot.GameObject);
// currentLaneSpots.RemoveAt(i + 1);
// i--;
// newPosition.x = nextBorderRight - _spotHeights[(int) newSize] - 0.5f;
// newPosition.y = position.y;
// continue;
// }
// }
// newPosition.x = nextBorderRight - _spotHeights[(int) newSize] - 0.5f;
}
}
}
Destroy(spot.GameObject);
spot.Size = (Size) size;
spot.Reserved = false;
spot.GameObject = Instantiate(_spotPrefabs[size],
newPosition, rotation, mainPlanContainer);
spot.LastReconfiguration = _currentTime;
return true;
}
Destroy(spot.GameObject);
spot.Size = (Size) size;
spot.Reserved = false;
spot.GameObject = Instantiate(_spotPrefabs[size],
newPosition, rotation, mainPlanContainer);
spot.LastReconfiguration = _currentTime;
return true;
}
return false;
}
@ -546,6 +547,9 @@ namespace Parking
allBorders.Add(targetSpotPosition.y + sizeOffset);
}
if(12.85 - 2.5/2.0f <= maxX && lane == 2 && up)
allBorders.Add(Height / 2.0f - 5);
if (allBorders.Count == 0)
return up ? Height / 2.0f : -Height / 2.0f;
float nextBorder = up ? allBorders.Min() : allBorders.Max();
@ -717,9 +721,12 @@ namespace Parking
Quaternion.Euler(new Vector3(0, 0, (spotMap[i][j].Flipped ? 180 : 0) + 90));
}
bool frontalParking = !parkingFromTop ^ flipped;
bool frontalParking = !(!parkingFromTop ^ flipped);
spotMap[i][j].ParkingDirection = frontalParking ? ParkingPreference.Front : ParkingPreference.Back;
if(frontalParking)
spotMap[i][j].GameObject.transform.localScale *= 0.5f;
spotMap[i][j].Lane = i;
if(spotMap[i][j].Size != Size.D)

58
Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF - Fallback.asset
View File

File diff suppressed because one or more lines are too long