|
@@ -375,6 +375,26 @@ def endpoint(funct, motion, dict, cont):
|
375
|
375
|
cont.activate(cam.actuators["bloom_off"])
|
376
|
376
|
cam['bloom_on'] = 0
|
377
|
377
|
dict['bloom_on'] = 0
|
|
378
|
+
|
|
379
|
+#------------
|
|
380
|
+ if funct == 'fxaa on':
|
|
381
|
+ if motion == 'inc':
|
|
382
|
+ cont.activate(cam.actuators["fxaa"])
|
|
383
|
+ cam['fxaa'] = 1
|
|
384
|
+ dict['fxaa'] = 1
|
|
385
|
+ else:
|
|
386
|
+ cont.activate(cam.actuators["fxaa_off"])
|
|
387
|
+ cam['fxaa'] = 0
|
|
388
|
+ dict['fxaa'] = 0
|
|
389
|
+ if funct == 'fxaa span max':
|
|
390
|
+ b = cam['FXAA_SPAN_MAX']
|
|
391
|
+ if motion == 'inc':
|
|
392
|
+ b += 1
|
|
393
|
+ else:
|
|
394
|
+ b -= 1
|
|
395
|
+ cam['FXAA_SPAN_MAX'] = b
|
|
396
|
+ dict['FXAA_SPAN_MAX'] = b
|
|
397
|
+#---------
|
378
|
398
|
|
379
|
399
|
if funct == 'shadow on':
|
380
|
400
|
if motion == 'inc':
|
|
@@ -674,7 +694,7 @@ def get_c_list(dict):
|
674
|
694
|
if dict['mlevel'] == 2:
|
675
|
695
|
if dict['lv1_opt'] == 'graphics':
|
676
|
696
|
#if opt == 'settings':
|
677
|
|
- dict['current_list'] = ['brightness / contrast', 'ao', 'hdr', 'dof', 'bloom']
|
|
697
|
+ dict['current_list'] = ['brightness / contrast', 'ao', 'hdr', 'dof', 'bloom', 'fxaa']
|
678
|
698
|
if dict['mlevel'] == 2:
|
679
|
699
|
if dict['lv1_opt'] == 'player':
|
680
|
700
|
#if opt == 'settings':
|
|
@@ -702,7 +722,9 @@ def get_c_list(dict):
|
702
|
722
|
if dict['lv2_opt'] == 'dof':
|
703
|
723
|
dict['current_list'] = ['dof on']
|
704
|
724
|
if dict['lv2_opt'] == 'bloom':
|
705
|
|
- dict['current_list'] = ['bloom on']
|
|
725
|
+ dict['current_list'] = ['bloom on']
|
|
726
|
+ if dict['lv2_opt'] == 'fxaa':
|
|
727
|
+ dict['current_list'] = ['fxaa on', 'fxaa span max']
|
706
|
728
|
|
707
|
729
|
if dict['lv2_opt'] == 'character':
|
708
|
730
|
dict['current_list'] = player_list
|
|
@@ -832,7 +854,7 @@ def init(own, dict):
|
832
|
854
|
dict['mlevel'] = 0
|
833
|
855
|
dict['current_opt'] = ''
|
834
|
856
|
dict['pause_menu_text'] = ''
|
835
|
|
- dict['menu_end_points'] = ['exit', 'restart', 'shirt color r', 'shirt color g', 'shirt color b', 'shoe color r', 'shoe color g', 'shoe color b','deck color r', 'deck color g', 'deck color b', 'shirt logo', 'brightness / contrast on', 'brightness value', 'contrast value', 'hdr on', 'avgL', 'hdr strength', 'ao on', 'ao radius', 'ao width', 'ao only', 'dof on', 'sun strength', 'sun rot x', 'sun rot y', 'shadow on', 'ambient strength', 'Demo Scene', 'Empty Lot', 'Park A', 'Training', 'Spine', 'Warehouse', 'Shop', '1920x1080', '1280x720', '1024x768', '800x600', 'fullscreen', 'bloom on', 'cam height', 'focal length', 'min dist', 'max dist', 'enter replay', 'recorder on', 'record length', 'enter replay (press back button)', 'recorder on', 'record length (n/a)', 'physics',] + player_list
|
|
857
|
+ dict['menu_end_points'] = ['exit', 'restart', 'shirt color r', 'shirt color g', 'shirt color b', 'shoe color r', 'shoe color g', 'shoe color b','deck color r', 'deck color g', 'deck color b', 'shirt logo', 'brightness / contrast on', 'brightness value', 'contrast value', 'hdr on', 'avgL', 'hdr strength', 'ao on', 'ao radius', 'ao width', 'ao only', 'dof on', 'sun strength', 'sun rot x', 'sun rot y', 'shadow on', 'ambient strength', 'Demo Scene', 'Empty Lot', 'Park A', 'Training', 'Spine', 'Warehouse', 'Shop', '1920x1080', '1280x720', '1024x768', '800x600', 'fullscreen', 'bloom on', 'cam height', 'focal length', 'min dist', 'max dist', 'enter replay', 'recorder on', 'record length', 'enter replay (press back button)', 'recorder on', 'record length (n/a)', 'physics', 'fxaa on', 'fxaa span max',] + player_list
|
836
|
858
|
|
837
|
859
|
def output(dict):
|
838
|
860
|
try:
|
|
@@ -926,6 +948,11 @@ def output(dict):
|
926
|
948
|
outp = outp + ': ' + str(dict['fullscreen_on'])
|
927
|
949
|
if dict['current_opt'] == 'bloom on':
|
928
|
950
|
outp = outp + ': ' + str(dict['bloom_on'])
|
|
951
|
+ if dict['current_opt'] == 'fxaa on':
|
|
952
|
+ outp = outp + ': ' + str(dict['fxaa'])
|
|
953
|
+ if dict['current_opt'] == 'fxaa span max':
|
|
954
|
+ outp = outp + ': ' + str(dict['FXAA_SPAN_MAX'])
|
|
955
|
+
|
929
|
956
|
|
930
|
957
|
if dict['current_opt'] == 'cam height':
|
931
|
958
|
outp = outp + '(-0.4): ' + str(dict['cam_height'])
|