shuvit 4 months ago
parent
commit
55804b51e0

+ 1
- 1
assets/nav_points
File diff suppressed because it is too large
View File


+ 3
- 0
assets/rails.blend View File

@@ -0,0 +1,3 @@
1
+version https://git-lfs.github.com/spec/v1
2
+oid sha256:806f4e67b88bd33e31dd08e2c7a275a0330ea80a7965bf1ac5c64d8e4c735ed1
3
+size 482684

+ 2
- 2
assets/roads.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:e68401d580588c65500997a597bb2b23ad15b79b8fedf581fb7ae908f257f818
3
-size 19725140
2
+oid sha256:0e10dc0a2611d85faa40c6ec04a0476083b75a72c97bd84f2ab6f80afb9ab8b5
3
+size 19716272

+ 2
- 2
assets/roads_bak.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:784809674b518a6435240657168d882fc30d0dace8f4fdd643ecc4dc0189b4e4
3
-size 83642732
2
+oid sha256:e5df60228667279434f2bef1e456214c5176ae09b9125550757e1dda440311ab
3
+size 19733012

+ 3
- 0
assets/stairs.blend View File

@@ -0,0 +1,3 @@
1
+version https://git-lfs.github.com/spec/v1
2
+oid sha256:7021eaf0bf81aa197c2ddaf54b3e812cb829f31cc01e5429b3a3b7275ff72c72
3
+size 1301996

+ 2
- 2
assets/user2.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:667382ee31cee03d92857a5f1273494d2eefe2f963d6a440a936edc286538838
3
-size 6873936
2
+oid sha256:dc009564a91c8f497cac0c720a59789d4d699499224142aff31456f6266eac0c
3
+size 9294436

+ 2
- 2
assets/user2_working.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:bf72e339505d14e43eaf460f09fc7e73886c311cf4be7f24c158dd17a45e5e90
3
-size 4888408
2
+oid sha256:efa7cc116a67b09844712555de9d8cb5b613816dd753420aa0cdf0214755baa5
3
+size 4893180

+ 3
- 0
assets/user4_working.blend View File

@@ -0,0 +1,3 @@
1
+version https://git-lfs.github.com/spec/v1
2
+oid sha256:931b968b15ffbd1688c08ca12c4c48bde8f7fbd3d18dd6d677c6b6e914eec2b0
3
+size 5791864

+ 2
- 2
assets/utils/building_genV2_1.blend View File

@@ -1,3 +1,3 @@
1 1
 version https://git-lfs.github.com/spec/v1
2
-oid sha256:59cf027ebc611c312ef4c9397149f9ada3f7f3405dec308a67035010534ad26f
3
-size 8286596
2
+oid sha256:2c51ab0607fe13410b2222badd93fa6aff66376c4b2b5ad34656815a837956b1
3
+size 8193096

+ 1
- 1
assets/walker_nav_points
File diff suppressed because it is too large
View File


+ 35
- 35
config.ini View File

@@ -50,79 +50,79 @@ walk_focal_length = 14
50 50
 #character settings
51 51
 ###################
52 52
 
53
-character = annie
53
+character = ralph
54 54
 
55 55
 shirt_logo = 2
56 56
 
57
-shirt_color_r = 0.38
58
-shirt_color_g = 0.0
59
-shirt_color_b = 0
57
+shirt_color_r = 0.64
58
+shirt_color_g = 0.59
59
+shirt_color_b = 0.03
60 60
 
61
-shoe_color_r = 0.03
61
+shoe_color_r = 0.05
62 62
 shoe_color_g = 0.03
63 63
 shoe_color_b = 0.03
64 64
 #-----------------
65 65
 
66 66
 #deck settings
67 67
 ##############
68
-deck_index = 5
69
-deck_color_r = 0.8
70
-deck_color_g = 0.8
71
-deck_color_b = 0.8
72
-trucks_r = 0
73
-trucks_g = 0
74
-trucks_b = 0
75
-
76
-wheel1_r = 0.21
77
-wheel1_g = 0.21
78
-wheel1_b = 0.21
79
-wheel2_r = 0.21
80
-wheel2_g = 0.21
81
-wheel2_b = 0.21
82
-wheel3_r = 0.21
83
-wheel3_g = 0.21
84
-wheel3_b = 0.21
85
-wheel4_r = 0.21
86
-wheel4_g = 0.21
87
-wheel4_b = 0.21
68
+deck_index = 6
69
+deck_color_r = 0.1
70
+deck_color_g = 0.05
71
+deck_color_b = 0.08
72
+trucks_r = 0.92
73
+trucks_g = 0.85
74
+trucks_b = 1
75
+
76
+wheel1_r = 0.03
77
+wheel1_g = 0
78
+wheel1_b = 0
79
+wheel2_r = 0.03
80
+wheel2_g = 0
81
+wheel2_b = 0
82
+wheel3_r = 0.03
83
+wheel3_g = 0
84
+wheel3_b = 0
85
+wheel4_r = 0.03
86
+wheel4_g = 0
87
+wheel4_b = 0
88 88
 #-------------------
89 89
 
90 90
 #2d filter settings
91 91
 ###################
92 92
 
93 93
 #brightness / contrast
94
-bc = 1
95
-BC_BRIGHTNESS = 1.12
94
+bc = 0
95
+BC_BRIGHTNESS = 1.05
96 96
 BC_CONTRAST = 1.06
97 97
 
98 98
 #HDR
99
-hdr = 1
99
+hdr = 0
100 100
 avgL = 0.72
101 101
 HDRamount = 0.3
102 102
 
103 103
 #Ambient Occlusion
104
-ao = 1
104
+ao = 0
105 105
 onlyAO = 0
106 106
 aowidth = 0.2
107 107
 aoradius = 2.4
108 108
 
109 109
 #Depth of Field
110
-dof_on = 1
110
+dof_on = 0
111 111
 
112 112
 #Bloom
113
-bloom_on = 1
113
+bloom_on = 0
114 114
 
115 115
 #FXAA
116
-fxaa = 1
116
+fxaa = 0
117 117
 FXAA_SPAN_MAX = 8.0
118 118
 #-------------------
119 119
 
120 120
 #sun settings
121 121
 #############
122 122
 sun_strength = 1.85
123
-ambient_strength = 0.23
124
-sun_rot_x = 0.05
125
-sun_rot_y = 0.05
123
+ambient_strength = 0.35
124
+sun_rot_x = -0.05
125
+sun_rot_y = -0.05
126 126
 shadow_on = 0
127 127
 #------------
128 128
 

+ 10
- 6
scripts/StatesCar.py View File

@@ -165,18 +165,22 @@ class ExitParallelPark(State):
165 165
         self.FSM.owner.obj.restoreDynamics()
166 166
         self.FSM.owner.obj.linearVelocity = [0,0,0]
167 167
         self.FSM.owner.path_index = 0
168
-        self.FSM.owner.point = self.FSM.owner.path[self.FSM.owner.path_index]
168
+        try:
169
+            self.FSM.owner.point = self.FSM.owner.path[self.FSM.owner.path_index]
170
+        except:
171
+            print('no path')    
169 172
         self.FSM.owner.target.status = 'targetted'
170 173
         self.FSM.owner.start_empty.status = 'available'
171 174
         super(ExitParallelPark, self).Enter()        
172 175
         
173 176
     def Execute(self):
174 177
         self.FSM.stateLife += 1
175
-        v = self.FSM.owner.obj.getVectTo(self.FSM.owner.path[0])
176
-        self.FSM.owner.obj.alignAxisToVect(v[1], 0, .01)
177
-        self.FSM.owner.obj.alignAxisToVect([0,0,1], 2, 1)
178
-        if self.FSM.stateLife > 220:
179
-            self.FSM.ToTransition('toNavigateToTarget')
178
+        if self.FSM.owner.path != []:
179
+            v = self.FSM.owner.obj.getVectTo(self.FSM.owner.path[0])
180
+            self.FSM.owner.obj.alignAxisToVect(v[1], 0, .01)
181
+            self.FSM.owner.obj.alignAxisToVect([0,0,1], 2, 1)
182
+            if self.FSM.stateLife > 220:
183
+                self.FSM.ToTransition('toNavigateToTarget')
180 184
 
181 185
     def Exit(self):
182 186
         pass        

+ 29
- 14
scripts/actionsFSMlist.py View File

@@ -12,6 +12,8 @@ reg_grindlist = ['reg_5050', 'reg_fsboard', 'reg_tailg', 'reg_tailgr', 'reg_tail
12 12
 
13 13
 fak_grindlist = ['fak_5050', 'fak_fsboard', 'fak_tailg', 'fak_tailgr', 'fak_tailgl', 'fak_noseg', 'fak_nosegr', 'fak_nosegl', 'fak_noseslide', 'fak_tailslide', 'fak_bsboard']
14 14
 
15
+walk_exits = ['reg_walk', 'reg_walkFast', 'reg_idle', 'reg_jump', 'reg_onboard', 'reg_idle2', 'reg_idle3', 'reg_idle4', 'reg_idle6', 'reg_idle7', 'reg_walk_air', 'reg_walk_air_out', 'reg_sit', 'reg_air', 'fak_walk', 'fak_walkFast', 'fak_idle', 'fak_jump', 'fak_onboard', 'fak_idle2', 'fak_idle3', 'fak_idle4', 'fak_idle6', 'fak_idle7', 'fak_walk_air', 'fak_walk_air_out', 'fak_sit', 'fak_air']
16
+
15 17
 class a_class:
16 18
 	def __init__(self, name, start, end, dname, dstart, dend, layer, speed, mode, blendin, intro, intro_frames, exits, fe, fef, opposite):
17 19
 		self.name = name
@@ -41,7 +43,8 @@ reg_walk = a_class(
41 43
 	#intro, length
42 44
 	None, 0,
43 45
 	#exits
44
-	['reg_walkFast', 'reg_idle', 'reg_jump', 'reg_onboard', 'reg_idle2', 'reg_idle3', 'reg_idle4', 'reg_idle6', 'reg_idle7', 'reg_walk_air', 'reg_walk_air_out'],
46
+	#['reg_walkFast', 'reg_idle', 'reg_jump', 'reg_onboard', 'reg_idle2', 'reg_idle3', 'reg_idle4', 'reg_idle6', 'reg_idle7', 'reg_walk_air', 'reg_walk_air_out']
47
+	walk_exits,
45 48
 	#force exit, frame
46 49
 	None, 0,
47 50
 	#opposite
@@ -57,7 +60,8 @@ reg_walkFast = a_class(
57 60
 	#intro, length
58 61
 	None, 0,
59 62
 	#exits
60
-	['reg_walk', 'reg_idle', 'reg_jump', 'reg_onboard'],
63
+	#['reg_walk', 'reg_idle', 'reg_jump', 'reg_onboard']
64
+	walk_exits,
61 65
 	#force exit, frame
62 66
 	None, 0,
63 67
 	#opposite
@@ -73,7 +77,8 @@ reg_idle = a_class(
73 77
 	#intro, length
74 78
 	None, 0,
75 79
 	#exits
76
-	['reg_walk', 'reg_walkFast', 'reg_idle2', 'reg_idle3', 'reg_idle4', 'reg_idle5', 'reg_idle6', 'reg_idle7', 'reg_jump', 'reg_sit', 'reg_onboard'],
80
+	#['reg_walk', 'reg_walkFast', 'reg_idle2', 'reg_idle3', 'reg_idle4', 'reg_idle5', 'reg_idle6', 'reg_idle7', 'reg_jump', 'reg_sit', 'reg_onboard'],
81
+	walk_exits,
77 82
 	#force exit, frame
78 83
 	None, 0,
79 84
 	#opposite
@@ -89,7 +94,8 @@ reg_idle2 = a_class(
89 94
 	#intro, length
90 95
 	None, 0,
91 96
 	#exits
92
-	['reg_walk', 'reg_idle', 'reg_idle3', 'reg_idle4', 'reg_idle5', 'reg_idle6', 'reg_idle7', 'reg_jump', 'reg_onboard'],
97
+	#['reg_walk', 'reg_idle', 'reg_idle3', 'reg_idle4', 'reg_idle5', 'reg_idle6', 'reg_idle7', 'reg_jump', 'reg_onboard'],
98
+	walk_exits,
93 99
 	#force exit, frame
94 100
 	None, 0,
95 101
 	#opposite
@@ -105,7 +111,8 @@ reg_idle3 = a_class(
105 111
 	#intro, length
106 112
 	None, 0,
107 113
 	#exits
108
-	['reg_walk', 'reg_idle2', 'reg_idle', 'reg_idle4', 'reg_idle5', 'reg_idle6', 'reg_idle7', 'reg_jump', 'reg_onboard'],
114
+	#['reg_walk', 'reg_idle2', 'reg_idle', 'reg_idle4', 'reg_idle5', 'reg_idle6', 'reg_idle7', 'reg_jump', 'reg_onboard'],
115
+	walk_exits,
109 116
 	#force exit, frame
110 117
 	None, 0,
111 118
 	#opposite
@@ -121,7 +128,8 @@ reg_idle4 = a_class(
121 128
 	#intro, length
122 129
 	None, 0,
123 130
 	#exits
124
-	['reg_walk', 'reg_idle2', 'reg_idle3', 'reg_idle', 'reg_idle5', 'reg_idle6', 'reg_idle7', 'reg_jump', 'reg_onboard'],
131
+	#['reg_walk', 'reg_idle2', 'reg_idle3', 'reg_idle', 'reg_idle5', 'reg_idle6', 'reg_idle7', 'reg_jump', 'reg_onboard'],
132
+	walk_exits,
125 133
 	#force exit, frame
126 134
 	None, 0,
127 135
 	#opposite
@@ -137,7 +145,8 @@ reg_idle5 = a_class(
137 145
 	#intro, length
138 146
 	None, 0,
139 147
 	#exits
140
-	['reg_walk', 'reg_idle2', 'reg_idle3', 'reg_idle4', 'reg_idle', 'reg_idle6', 'reg_idle7', 'reg_jump', 'reg_onboard'],
148
+	#['reg_walk', 'reg_idle2', 'reg_idle3', 'reg_idle4', 'reg_idle', 'reg_idle6', 'reg_idle7', 'reg_jump', 'reg_onboard'],
149
+	walk_exits,
141 150
 	#force exit, frame
142 151
 	None, 0,
143 152
 	#opposite
@@ -153,7 +162,8 @@ reg_idle6 = a_class(
153 162
 	#intro, length
154 163
 	None, 0,
155 164
 	#exits
156
-	['reg_walk', 'reg_idle2', 'reg_idle3', 'reg_idle', 'reg_idle5', 'reg_idle4', 'reg_idle7', 'reg_jump', 'reg_onboard'],
165
+	#['reg_walk', 'reg_idle2', 'reg_idle3', 'reg_idle', 'reg_idle5', 'reg_idle4', 'reg_idle7', 'reg_jump', 'reg_onboard'],
166
+	walk_exits,
157 167
 	#force exit, frame
158 168
 	None, 0,
159 169
 	#opposite
@@ -169,7 +179,8 @@ reg_idle7 = a_class(
169 179
 	#intro, length
170 180
 	None, 0,
171 181
 	#exits
172
-	['reg_walk', 'reg_idle2', 'reg_idle3', 'reg_idle4', 'reg_idle5', 'reg_idle6', 'reg_idle', 'reg_jump', 'reg_onboard'],
182
+	#['reg_walk', 'reg_idle2', 'reg_idle3', 'reg_idle4', 'reg_idle5', 'reg_idle6', 'reg_idle', 'reg_jump', 'reg_onboard'],
183
+	walk_exits,
173 184
 	#force exit, frame
174 185
 	None, 0,
175 186
 	#opposite
@@ -201,7 +212,9 @@ reg_walk_air = a_class(
201 212
 	#intro, length
202 213
 	None, 0,
203 214
 	#exits
204
-	['reg_walk_air_out', 'reg_onboard', 'reg_walk', 'reg_walkFast'],
215
+	#['reg_walk_air_out', 'reg_onboard', 'reg_walk', 'reg_walkFast'],
216
+	#walk_exits,
217
+	'reg_walk_air_out',
205 218
 	#force exit, frame
206 219
 	None, 0,
207 220
 	#opposite
@@ -217,7 +230,8 @@ reg_walk_air_out = a_class(
217 230
 	#intro, length
218 231
 	None, 0,
219 232
 	#exits
220
-	['reg_idle', 'reg_walk', 'reg_walkFast', 'reg_onboard'],
233
+	#['reg_idle', 'reg_walk', 'reg_walkFast', 'reg_onboard'],
234
+	walk_exits,
221 235
 	#force exit, frame
222 236
 	'reg_idle', 10,
223 237
 	#opposite
@@ -283,7 +297,8 @@ reg_offboard = a_class(
283 297
 	#intro, length
284 298
 	None, 0,
285 299
 	#exits
286
-	['reg_idle', 'reg_walkFast', 'reg_walk', 'reg_onboard'],
300
+	#['reg_idle', 'reg_walkFast', 'reg_walk', 'reg_onboard'],
301
+	walk_exits,
287 302
 	#force exit, frame
288 303
 	'reg_idle', 39,
289 304
 	#opposite
@@ -2638,9 +2653,9 @@ fak_manual_right = a_class(
2638 2653
 
2639 2654
 fak_nmanual = a_class(
2640 2655
 	#player armature action name, start, end frames
2641
-	'fak_nmanual', 10, 90,
2656
+	'fak_nmanual', 10, 80,
2642 2657
 	#deck action name, start, end frames  
2643
-	'b_reg_manual', 10, 90,
2658
+	'b_reg_manual', 10, 80,
2644 2659
 	#layer, speed, mode (0 = play, 1 = loop), blendin
2645 2660
 	1, 1, 1, 10,
2646 2661
 	#intro, length

+ 6
- 2
scripts/cars.py View File

@@ -81,7 +81,11 @@ class Car:
81 81
 	def ReceiveMessage(self, message):
82 82
 		if self == message[1]:
83 83
 			self.path = message[2]
84
-			self.FSM.FSM.ToTransition('toExitParallelPark')
84
+			if self.path != []:
85
+				self.FSM.FSM.ToTransition('toExitParallelPark')
86
+			else:
87
+				print('path failed for', self)
88
+				self.FSM.FSM.ToTransition('toEnterParallelPark')	
85 89
 		
86 90
 class CarManager:
87 91
 	def __init__(self, own):
@@ -91,7 +95,7 @@ class CarManager:
91 95
 		self.navmesh2 =  astar.Astar('nav_points', self.pub)
92 96
 		self.cars = []
93 97
 		self.max_cars = 14
94
-		self.max_active = 12
98
+		self.max_active = 9
95 99
 		self.targets = []
96 100
 		self.target_loc = None
97 101
 		self.parking_spots = get_parking_spots()

+ 5
- 2
scripts/walk.py View File

@@ -396,6 +396,7 @@ def main(cont):
396 396
              
397 397
             if STANCE == 0:
398 398
                 own['requestAction'] = 'reg_offboard'             
399
+                print('requesting off board')
399 400
                 
400 401
             if STANCE == 1:
401 402
                 own['requestAction'] = 'fak_offboard'                          
@@ -1274,14 +1275,14 @@ def main(cont):
1274 1275
                 own.worldPosition.z = own.worldPosition.z - move    
1275 1276
             own.linearVelocity.z = 0        
1276 1277
 
1277
-    onboard() 
1278
+    
1278 1279
     jump()
1279 1280
     #dropin()
1280 1281
     throwdeck_trigger()
1281 1282
 
1282 1283
     nextframe()
1283 1284
     checkidle()
1284
-    getonboard(dict, cont)
1285
+    
1285 1286
     reset_pos()
1286 1287
     switchcam()
1287 1288
     move_flycam()
@@ -1290,6 +1291,8 @@ def main(cont):
1290 1291
     idle_anim()
1291 1292
     sit()
1292 1293
     onground()
1294
+    getonboard(dict, cont)
1295
+    onboard() 
1293 1296
     focus_deck()
1294 1297
     get_in_car()
1295 1298
     get_on_bike(dict, own)

+ 2
- 2
scripts/walkers.py View File

@@ -89,8 +89,8 @@ class WalkerManager:
89 89
 		self.pub = observer.Publisher(['path found', 'working'])
90 90
 		self.navmesh2 =  astar.Astar('walker_nav_points', self.pub)
91 91
 		self.walkers = []
92
-		self.max_walkers = 12
93
-		self.max_active = 10
92
+		self.max_walkers = 7
93
+		self.max_active = 6
94 94
 		self.targets = []
95 95
 		self.target_loc = None
96 96
 		self.idle_spots = get_idle_spots()

Loading…
Cancel
Save