shuvit
/
joy_cam
Watch 1
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

cleanup

shuvit 6 years ago
parent
590ead8212
commit
c65dd60cf8
2 changed files with 13 additions and 181 deletions
Split View Show Diff Stats
  1. 4
    6
      initer.py
  2. 9
    175
      joy_cam.py

+ 4
- 6
initer.py View File 

@@ -10,6 +10,7 @@ def main():
10 10 
     cont = bge.logic.getCurrentController()
11 11 
     own = cont.owner
12 12 
     dict = bge.logic.globalDict
13 
+
13 14 
     own['lmLR'] = 0
14 15 
     own['lmUD'] = 0
15 16 
     own['rmLR'] = 0
 
@@ -30,7 +31,6 @@ def main():
30 31 
     own['bkBut'] = 0
31 32 
     own['ltsBut'] = 0
32 33 
     own['rtsBut'] = 0
33 
-    own['speed_mult'] = 1.00
34 34 
     own['menu_on'] = False
35 35 
     dict['menu_on'] = False
36 36 
     own['submenu_on'] = False
 
@@ -54,12 +54,12 @@ def main():
54 54 
     act = cont.actuators["dof_act"]
55 55 
     cont.activate(act)
56 56
57 
-
58 
-
59 57 
     dict['menuText'] = ''
60 58 
     dict['submenuText'] = ''
61 59 
     dict['optionText'] = ''
62 
-
60 
+
61 
+#user setable defaults
62 
+    own['speed_mult'] = 1.00
63 63 
     own['FXAA_SPAN_MAX'] = 16.0
64 64 
     own['bc'] = True
65 65 
     own['ao'] = True
 
@@ -67,10 +67,8 @@ def main():
67 67 
     own['BC_BRIGHTNESS'] = 1.15
68 68 
     own['aowidth'] = 64
69 69 
     own['aoradius'] = 64
70 
-
71 70 
     own['hdr'] = True
72 71 
     own['HDRamount'] = .05
73 72 
     own['avgL'] = 1.0
74 73
75 
-
76 74 
 main()

+ 9
- 175
joy_cam.py View File 

@@ -28,9 +28,7 @@ def main():
28 28 
     dict['last_ltsBut'] = own['ltsBut']
29 29 
     dict['last_rtsBut'] = own['rtsBut']
30 30
31 
-
32 
-#####
33 
-    #hard controller mappings
31 
+#hard controller mappings
34 32 
     lar_lts = 0
35 33 
     uad_lts = 1
36 34 
     lar_rts = 2 
@@ -56,8 +54,7 @@ def main():
56 54 
     reduction = 400000
57 55 
     axisTh = 0.03
58 56
59 
-#####
60 
-    #get value 0-100
57 
+#get controller axis value 0-100
61 58 
     lLR = aXis.axisValues[lar_lts] / reduction / .082 * 100
62 59 
     lUD = aXis.axisValues[uad_lts] / reduction / .082 * 100 - 20 / 80
63 60 
     rLR = aXis.axisValues[lar_rts] / reduction / .082 * 100 - 20 / 80
 
@@ -81,8 +78,7 @@ def main():
81 78 
     udPad = bUtt.getButtonStatus(u_dp)
82 79 
     ddPad = bUtt.getButtonStatus(d_dp)
83 80
84 
-#######
85 
-    #get own['idle']
81 
+#check if idle
86 82 
     idle_trig_list = [lLR, lUD, rLR, rUD, lTrig, rTrig]
87 83 
     idle_time = 240
88 84 
     idle_set = 1
 
@@ -102,8 +98,7 @@ def main():
102 98 
     if own['idle_timer'] > 1:
103 99 
         own['idle_timer'] -= 1
104 100
105 
-    #print(own['idle_timer'], own['idle'])
106 
-####
101 
+#idle cam movement
107 102 
     if own['idle']:
108 103 
         move_len = 1080
109 104 
         if own['idlecampos_x'] < move_len:
 
@@ -120,10 +115,7 @@ def main():
120 115 
             move = [-.0002, 0, 0]
121 116 
             own.applyMovement( move, True)
122 117 
             own.applyRotation([-.00004, 0, -.00005],True)
123 
-            #print('idle2')
124 
-        #print(own['idlecampos_x'])
125 118
126 
-
127 119 
 #####
128 120 
     #create modified axis values
129 121 
     if lLR < -20:
 
@@ -178,8 +170,7 @@ def main():
178 170 
         rot_x = own['last_rot_x'] * damping
179 171 
     if rot_y == 0 and own['last_rot_y'] != 0:
180 172 
         rot_y = own['last_rot_y'] * damping
181 
-
182 
-
173 
+
183 174 
     move = [move_y, 0, move_x]
184 175 
     own.applyMovement( move, True)
185 176 
     own.applyMovement([0, 0, move_z], False)    
@@ -193,27 +184,12 @@ def main():
193 184 
     if rBump == True and own['rBump'] == False:
194 185 
         if own['speed_mult'] < 5.5:
195 186 
             own['speed_mult'] = round(own['speed_mult'] + mult, 2)
196 
-
197 187 
     if stBut == True and own['stBut'] != True:
198 188 
         if own['menu_on'] == False:
199 189 
             own['menu_on'] = True
200 
-
201 190 
         else:
202 191 
             own['menu_on'] = False
203 
-    #if own['menu_on'] == True:
204 
-        #empty = scene.objects["menuEmpty"]
205 
-        #bg = scene.objects['menu_background']
206 
-        #h1 = scene.objects['h1Text']
207 
-        #bg.worldPosition = empty.worldPosition
208 
-        #bg.orientation = empty.orientation
209 
-        #h1.worldPosition = empty.worldPosition
210 
-        #h1.orientation = empty.orientation
211 
-        #h1 = scene.objects['h1Text']
212 
-        #h1.text = str("user@shuvit.org~:\\")
213 
-
214 
-
215 192 
     menu_item = own['menu_item']
216 
-    #menu_list = ['Brightness/Contrast: ', 'Brightness Value: ', 'Contrast Value: ', 'FXAA: ', 'FXAA Span Max: ', 'SSAO: ', 'SSAO Only: ', 'SSAO Width: ', 'SSAO Radius: ', 'HDR: ', 'HDR Amount: ', 'HDR AvgL: ', 'Camera Focal Length: ',  'Restart  ', 'Exit  ']
217 193 
     menu_list = ['Brightness/Contrast: ', 'FXAA: ', 'SSAO: ', 'HDR: ', 'Camera: ',  'Restart: ', 'Exit: ']
218 194
219 195 
     brightnesscontrast_opt = ['On/Off: ', 'Brightness Value: ', 'Contrast Value: ', 'Back: ']
 
@@ -222,7 +198,6 @@ def main():
222 198 
     hdr_opt = ['On/Off: ', 'HDR Amount: ', 'HDR AvgL: ', 'Back: ']
223 199 
     camera_opt = ['Focal Length: ', 'Back: ']
224 200 
 ################
225 
-
226 201 
     submenu_on = own['submenu_on']
227 202 
     if aBut == False and own['aBut'] == True:
228 203 
         if submenu_on:
 
@@ -239,8 +214,6 @@ def main():
239 214 
     menu_item = own['menu_item']
240 215 
     submenu_item = own['submenu_item']
241 216 
     dict['menuText'] = menu_list[menu_item]
242 
-    #dict['submenuText'] = menu_list[submenu_item]
243 
-
244 217 
     if menu_list[menu_item] == 'Brightness/Contrast: ':
245 218 
         if submenu_on == True:
246 219 
             try:
 
@@ -262,7 +235,6 @@ def main():
262 235 
                 dict['optionText'] = '_'
263 236 
         else:
264 237 
             dict['optionText'] = ''
265 
-
266 238 
     if menu_list[menu_item] == 'FXAA: ':
267 239 
         if submenu_on == True:
268 240 
             try:
 
@@ -282,19 +254,7 @@ def main():
282 254 
                 dict['optionText'] = '_'
283 255 
         else:
284 256 
             dict['optionText'] = ''
285 
-
286 
-
287 
-
288 
-    #     if own['fxaa'] == False:
289 
-    #         dict['optionText'] = 'Off'
290 
-    #     if own['fxaa'] == True:
291 
-    #         dict['optionText'] = 'On'
292 
-    # if menu_list[menu_item] == 'FXAA Span Max: ':
293 
-    #     dict['optionText'] = round(own['FXAA_SPAN_MAX'], 2)
294 
-
295 257 
     if menu_list[menu_item] == 'HDR: ':
296 
-
297 
-
298 258 
         if submenu_on == True:
299 259 
             try:
300 260 
                 dict['submenuText'] = hdr_opt[submenu_item]
 
@@ -315,19 +275,6 @@ def main():
315 275 
                 dict['optionText'] = '_'
316 276 
         else:
317 277 
             dict['optionText'] = ''
318 
-
319 
-
320 
-        # if own['hdr'] == False:
321 
-        #     dict['optionText'] = 'Off'
322 
-        # if own['hdr'] == True:
323 
-        #     dict['optionText'] = 'On'
324 
-
325 
-    # if menu_list[menu_item] == 'HDR Amount: ':
326 
-    #     dict['optionText'] = round(own['HDRamount'], 2)
327 
-    # if menu_list[menu_item] == 'HDR AvgL: ':
328 
-    #     dict['optionText'] = round(own['avgL'], 2)
329 
-
330 
-
331 278 
     if menu_list[menu_item] == 'SSAO: ':
332 279 
         if submenu_on == True:
333 280 
             try:
 
@@ -346,7 +293,6 @@ def main():
346 293 
                     dict['optionText'] = 'Off'
347 294 
                 if own['onlyAO'] == True:
348 295 
                     dict['optionText'] = 'On'
349 
-
350 296 
             if ssao_opt[submenu_item] == 'SSAO Width: ':
351 297 
                 dict['optionText'] = round(own['aowidth'], 2)
352 298 
             if ssao_opt[submenu_item] == 'SSAO Radius: ': 
@@ -355,26 +301,7 @@ def main():
355 301 
                 dict['optionText'] = '_'
356 302 
         else:
357 303 
             dict['optionText'] = ''
358 
-
359 
-
360 
-    #     if own['ao'] == False:
361 
-    #         dict['optionText'] = 'Off'
362 
-    #     if own['ao'] == True:
363 
-    #         dict['optionText'] = 'On'
364 
-    # if menu_list[menu_item] == 'SSAO Only: ':
365 
-    #     print('ssao menu', own['onlyAO'])
366 
-    #     if own['onlyAO'] == False:
367 
-    #         dict['optionText'] = 'Off'
368 
-    #     if own['onlyAO'] == True:
369 
-    #         dict['optionText'] = 'On'
370 
-    # if menu_list[menu_item] == 'SSAO Width: ':
371 
-    #     dict['optionText'] = round(own['aowidth'], 2)
372 
-    # if menu_list[menu_item] == 'SSAO Radius: ':
373 
-    #     dict['optionText'] = round(own['aoradius'], 2)
374 
-
375 304 
     if menu_list[menu_item] == 'Camera: ':
376 
-
377 
-
378 305 
         if submenu_on == True:
379 306 
             try:
380 307 
                 dict['submenuText'] = camera_opt[submenu_item]
 
@@ -388,17 +315,12 @@ def main():
388 315 
                 dict['optionText'] = '_'
389 316 
         else:
390 317 
             dict['optionText'] = ''
391 
-
392 
-
393 
-
394 
-
395 318 
     if menu_list[menu_item] == 'Restart: ':
396 319 
         dict['optionText'] = ''
397 320 
     if menu_list[menu_item] == 'Exit: ':
398 321 
         dict['optionText'] = ''
399 322
400 
-
401 
-
323 
+#b button pressed
402 324 
     if bBut == False and own['bBut'] == True:
403 325 
         if menu_list[menu_item] == 'Brightness/Contrast: ':
404 326 
             if submenu_on == False:
 
@@ -419,13 +341,10 @@ def main():
419 341 
                     own['submenu_on'] = False
420 342 
                     dict['optionText'] = '_'
421 343 
                     own['submenu_item'] = 0
422 
-
423 
-
424 344 
         if menu_list[menu_item] == 'FXAA: ':
425 345 
             if submenu_on == False:
426 346 
                 submenu_on = True
427 347 
                 own['submenu_on'] = True
428 
-
429 348 
             elif submenu_on:
430 349 
                 if fxaa_opt[submenu_item] == 'On/Off: ':
431 350 
                     if own['bc'] == False:
 
@@ -439,13 +358,7 @@ def main():
439 358 
                     own['submenu_on'] = False
440 359 
                     dict['optionText'] = '_'
441 360 
                     own['submenu_item'] = 0
442 
-
443 
-
444 
-
445 
-
446 361 
         if menu_list[menu_item] == 'SSAO: ':
447 
-
448 
-
449 362 
             if submenu_on == False:
450 363 
                 submenu_on = True
451 364 
                 own['submenu_on'] = True
 
@@ -467,18 +380,7 @@ def main():
467 380 
                     own['submenu_on'] = False
468 381 
                     dict['optionText'] = '_'
469 382 
                     own['submenu_item'] = 0
470 
-
471 
-
472 
-
473 
-
474 
-
475 
-
476 
-
477 
-
478 
-
479 383 
         if menu_list[menu_item] == 'HDR: ':
480 
-
481 
-
482 384 
             if submenu_on == False:
483 385 
                 submenu_on = True
484 386 
                 own['submenu_on'] = True
 
@@ -497,9 +399,6 @@ def main():
497 399 
                     own['submenu_on'] = False
498 400 
                     dict['optionText'] = '_'
499 401 
                     own['submenu_item'] = 0
500 
-
501 
-
502 
-
503 402 
         if menu_list[menu_item] == 'Camera: ':
504 403 
             if submenu_on == False:
505 404 
                 submenu_on = True
 
@@ -511,22 +410,14 @@ def main():
511 410 
                 if camera_opt[submenu_item] == 'Back: ':
512 411 
                     own['submenu_on'] = False
513 412 
                     dict['optionText'] = '_'
514 
-                    own['submenu_item'] = 0
515 
-
516 
-
413 
+                    own['submenu_item'] = 0
517 414 
         if menu_list[menu_item] == 'Restart: ':
518 415 
             scene.restart()
519 416 
         if menu_list[menu_item] == 'Exit: ':
520 417 
             bge.logic.endGame()
521 418
522 
-
523 
-#333333333333333333333333333333
524 
-
419 
+#x button up
525 420 
     if xBut == False and own['xBut'] == True:
526 
-
527 
-
528 
-
529 
-
530 421 
         if menu_list[menu_item] == 'Brightness/Contrast: ':
531 422 
             if submenu_on == False:
532 423 
                 submenu_on = True
 
@@ -546,26 +437,7 @@ def main():
546 437 
                     own['submenu_on'] = False
547 438 
                     dict['optionText'] = '_'
548 439 
                     own['submenu_item'] = 0
549 
-
550 
-
551 
-
552 
-
553 
-
554 
-
555 
-#
556 
-#        if menu_list[menu_item] == 'Brightness/Contrast: ':
557 
-#            if own['bc'] == True:
558 
-#                own['bc'] = False
559 
-#                act = cont.actuators['bc_off']
560 
-#                cont.activate(act)
561 
-#                dict['optionText'] = 'Off'
562 
-#        if menu_list[menu_item] == 'Brightness Value: ':
563 
-#            own['BC_BRIGHTNESS'] -= .025
564 
-#        if menu_list[menu_item] == 'Contrast Value: ':
565 
-#            own['BC_CONTRAST'] -= .025
566 
-
567 440 
         if menu_list[menu_item] == 'FXAA: ':
568 
-
569 441 
             if submenu_on == False:
570 442 
                 submenu_on = True
571 443 
                 own['submenu_on'] = True
 
@@ -582,16 +454,7 @@ def main():
582 454 
                     own['submenu_on'] = False
583 455 
                     dict['optionText'] = '_'
584 456 
                     own['submenu_item'] = 0
585 
-
586 
-
587 
-
588 
-
589 
-
590 
-
591 457 
         if menu_list[menu_item] == 'SSAO: ' :
592 
-
593 
-
594 
-
595 458 
             if submenu_on == False:
596 459 
                 submenu_on = True
597 460 
                 own['submenu_on'] = True
 
@@ -604,8 +467,7 @@ def main():
604 467 
                         dict['optionText'] = 'Off'
605 468 
                 if ssao_opt[submenu_item] == 'SSAO Only: ':
606 469 
                     if own['onlyAO'] == True:
607 
-                        own['onlyAO'] = False
608 
-
470 
+                        own['onlyAO'] = False
609 471 
                 if ssao_opt[submenu_item] == 'SSAO Width: ':
610 472 
                     own['aowidth'] -= 1
611 473 
                 if ssao_opt[submenu_item] == 'SSAO Radius: ': 
@@ -614,23 +476,7 @@ def main():
614 476 
                     own['submenu_on'] = False
615 477 
                     dict['optionText'] = '_'
616 478 
                     own['submenu_item'] = 0
617 
-
618 
-
619 
-
620 
-
621 
-
622 
-
623 
-
624 
-
625 
-
626 
-
627 
-
628 
-
629 
-
630 479 
         if menu_list[menu_item] == 'HDR: ':
631 
-
632 
-
633 
-
634 480 
             if submenu_on == False:
635 481 
                 submenu_on = True
636 482 
                 own['submenu_on'] = True
 
@@ -649,10 +495,6 @@ def main():
649 495 
                     own['submenu_on'] = False
650 496 
                     dict['optionText'] = '_'
651 497 
                     own['submenu_item'] = 0
652 
-
653 
-
654 
-
655 
-
656 498 
         if menu_list[menu_item] == 'Camera: ':
657 499 
             if submenu_on == False:
658 500 
                 submenu_on = True
 
@@ -703,14 +545,6 @@ def main():
703 545 
     dict['menu_item'] = own['menu_item']
704 546 
     dict['submenu_item'] = own['submenu_item']
705 547 
     dict['fxaa'] = own['fxaa']
706 
-
707 
-
708 
-
709 
-
710 
-
711 
-    print(own['submenu_on'])
712 
-    #print(own['menu_item'])
713 
-    #print(rot_x)
714 548
715 549 
 main()
716 550

Write Preview
Loading…
Cancel
Save