Skip to content

Commit f9ffcc6

Browse files
CodingJellyfishCodingJellyfish
authored
Add smooth strength adjustion & Unlock modifying default camera & Fix supertuxkart#5270 (supertuxkart#5365)
* Revert recent camera change & fix supertuxkart#5270 * I tried my best * Now the bug is properly fixed * Pull from master * add back files * Revert separate camera tab, and move it to display * Add smooth strength * Tune
1 parent f3d369d commit f9ffcc6

30 files changed

+619
-649
lines changed

‎data/gui/dialogs/custom_camera_settings.stkgui

+89
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,89 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<stkgui>
3+
<div x="2%" y="2%" width="96%" height="96%" layout="vertical-row" >
4+
<header id="title" width="100%" height="fit" text_align="center" word_wrap="true" text="Camera Settings" />
5+
<spacer width="100%" height="3%"/>
6+
<div width="100%" height="91%" layout="vertical-row" >
7+
8+
<label id="camera_name" width="100%" I18N="In the ui/camera settings" text="Player camera"/>
9+
<spacer width="5" height="1%"/>
10+
11+
<div width="100%" height="fit" layout="horizontal-row">
12+
<spacer width="3%" height="100%" />
13+
<div proportion="1" height="fit" layout="horizontal-row" >
14+
<label width="35%" height="100%" text_align="left" I18N="In the ui/camera screen" text="FOV"/>
15+
<gauge id="fov" proportion="1"/>
16+
</div>
17+
</div>
18+
19+
<spacer height="2%" width="100%" />
20+
21+
<div width="100%" height="fit" layout="horizontal-row">
22+
<spacer width="3%" height="100%" />
23+
<div proportion="1" height="fit" layout="horizontal-row" >
24+
<label width="35%" height="100%" text_align="left" I18N="In the ui/camera screen" text="Distance"/>
25+
<gauge id="camera_distance" proportion="1"/>
26+
</div>
27+
</div>
28+
29+
<spacer height="2%" width="100%" />
30+
31+
32+
<div width="100%" height="fit" layout="horizontal-row">
33+
<spacer width="3%" height="100%" />
34+
<div proportion="1" height="fit" layout="horizontal-row" >
35+
<label width="35%" height="100%" text_align="left" I18N="In the ui/camera screen" text="Angle"/>
36+
<gauge id="camera_angle" proportion="1"/>
37+
</div>
38+
</div>
39+
40+
<spacer height="2%" width="100%" />
41+
42+
<label width="100%" I18N="In the ui/camera settings" text="Smooth camera"/>
43+
<spacer height="1%" width="100%" />
44+
<div width="100%" height="fit" layout="horizontal-row">
45+
<spacer width="3%" height="100%" />
46+
<label width="fit" height="100%" text_align="left" I18N="In the ui/camera screen" text="Distance"/>
47+
<gauge id="smooth_position" width="35%"/>
48+
<spacer width="2%" height="100%" />
49+
<label width="fit" height="100%" text_align="left" I18N="In the ui/camera screen" text="Angle"/>
50+
<gauge id="smooth_rotation" width="35%"/>
51+
</div>
52+
53+
<spacer width="5" height="2%"/>
54+
55+
<label width="100%" I18N="In the ui/camera settings" text="Backward camera"/>
56+
<spacer height="1%" width="100%" />
57+
<div width="100%" height="fit" layout="horizontal-row">
58+
<spacer width="3%" height="100%" />
59+
<label width="fit" height="100%" text_align="left" I18N="In the ui/camera screen" text="Distance"/>
60+
<gauge id="backward_camera_distance" width="35%"/>
61+
<spacer width="2%" height="100%" />
62+
<label width="fit" height="100%" text_align="left" I18N="In the ui/camera screen" text="Angle"/>
63+
<gauge id="backward_camera_angle" width="35%"/>
64+
</div>
65+
66+
<spacer height="2%" width="100%" />
67+
68+
<div width="100%" height="fit" layout="horizontal-row">
69+
<spacer width="3%" height="100%" />
70+
<div proportion="1" height="fit" layout="horizontal-row" >
71+
<checkbox id="use_soccer_camera"/>
72+
<spacer width="1%" height="100%" />
73+
<label height="100%" text_align="left" I18N="In the ui/camera screen" text="Follow ball in soccer mode"/>
74+
</div>
75+
</div>
76+
77+
<spacer proportion="1" width="100%" />
78+
79+
<buttonbar id="buttons" height="20%" width="90%" align="center">
80+
<icon-button id="reset" width="128" height="128" icon="gui/icons/restart.png"
81+
I18N="In the ui/camera screen" text="Reset" align="center"/>
82+
<icon-button id="cancel" width="128" height="128" icon="gui/icons/red_x.png"
83+
I18N="In the ui/camera screen" text="Cancel" align="center"/>
84+
<icon-button id="apply" width="128" height="128" icon="gui/icons/green_check.png"
85+
I18N="In the ui/camera screen" text="Apply" align="center"/>
86+
</buttonbar>
87+
</div>
88+
</div>
89+
</stkgui>

‎data/gui/icons/options_camera.png

-3.88 KB
Binary file not shown.

‎data/gui/screens/options/options_audio.stkgui

-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
I18N="Section in the settings menu" text="Audio"/>
1919
<icon-button id="tab_ui" width="128" height="128" icon="gui/icons/options_ui.png"
2020
I18N="Section in the settings menu" text="Interface"/>
21-
<icon-button id="tab_camera" width="128" height="128" icon="gui/icons/options_camera.png"
22-
I18N="Section in the settings menu" text="Camera"/>
2321
<icon-button id="tab_players" width="128" height="128" icon="gui/icons/options_players.png"
2422
I18N="Section in the settings menu" text="Players"/>
2523
<icon-button id="tab_controls" width="128" height="128" icon="gui/icons/options_input.png"

‎data/gui/screens/options/options_camera.stkgui

-111
This file was deleted.

‎data/gui/screens/options/options_device.stkgui

-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
I18N="Section in the settings menu" text="Audio"/>
1919
<icon-button id="tab_ui" width="128" height="128" icon="gui/icons/options_ui.png"
2020
I18N="Section in the settings menu" text="Interface"/>
21-
<icon-button id="tab_camera" width="128" height="128" icon="gui/icons/options_camera.png"
22-
I18N="Section in the settings menu" text="Camera"/>
2321
<icon-button id="tab_players" width="128" height="128" icon="gui/icons/options_players.png"
2422
I18N="Section in the settings menu" text="Players"/>
2523
<icon-button id="tab_controls" width="128" height="128" icon="gui/icons/options_input.png"

‎data/gui/screens/options/options_display.stkgui

+17-4
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
I18N="Section in the settings menu" text="Audio"/>
1919
<icon-button id="tab_ui" width="128" height="128" icon="gui/icons/options_ui.png"
2020
I18N="Section in the settings menu" text="Interface"/>
21-
<icon-button id="tab_camera" width="128" height="128" icon="gui/icons/options_camera.png"
22-
I18N="Section in the settings menu" text="Camera"/>
2321
<icon-button id="tab_players" width="128" height="128" icon="gui/icons/options_players.png"
2422
I18N="Section in the settings menu" text="Players"/>
2523
<icon-button id="tab_controls" width="128" height="128" icon="gui/icons/options_input.png"
@@ -38,6 +36,8 @@
3836
<spacer width="5" height="1%"/>
3937

4038
<div layout="horizontal-row" width="100%" height="fit">
39+
<spacer width="3%" height="100%" />
40+
4141
<div proportion="2" height="fit" layout="horizontal-row" >
4242
<spacer width="5%" height="100%" />
4343
<checkbox id="fullscreen"/>
@@ -67,15 +67,28 @@
6767
I18N="In the display settings" text="Apply new resolution" />
6868
</div>
6969

70-
<!-- ************ SPLITSCREEN METHOD ************ -->
70+
<!-- ************ CAMERA SETTINGS ************ -->
7171
<spacer width="5" height="3%"/>
7272

73-
<label width="100%" I18N="In the display settings" text="Splitscreen Multiplayer layout"/>
73+
<label width="100%" I18N="In the display settings" text="Camera Settings"/>
74+
75+
<spacer width="5" height="2%"/>
76+
77+
<!-- ************ EXTRA UI ELEMENTS SETTINGS ************ -->
78+
<div width="100%" height="fit" layout="horizontal-row">
79+
<spacer width="3%" height="100%" />
80+
<spinner id="camera_preset" width="10f" align="center" />
81+
<label height="100%" x="0" y="0" I18N="In the ui settings" text="Camera"/>
82+
<spacer width="2%" height="100%" />
83+
<button id="custom_camera" text="Custom..." I18N="In the ui settings" align="center"/>
84+
</div>
7485

7586
<spacer width="5" height="2%"/>
7687

7788
<div layout="horizontal-row" width="100%" height="fit">
89+
<spacer width="3%" height="100%" />
7890
<spinner id="splitscreen_method" width="10f" align="center" />
91+
<label height="100%" x="0" y="0" I18N="In the ui settings" text="Splitscreen Multiplayer layout"/>
7992
</div>
8093
</box>
8194
</div>

‎data/gui/screens/options/options_general.stkgui

-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
I18N="Section in the settings menu" text="Audio"/>
1919
<icon-button id="tab_ui" width="128" height="128" icon="gui/icons/options_ui.png"
2020
I18N="Section in the settings menu" text="Interface"/>
21-
<icon-button id="tab_camera" width="128" height="128" icon="gui/icons/options_camera.png"
22-
I18N="Section in the settings menu" text="Camera"/>
2321
<icon-button id="tab_players" width="128" height="128" icon="gui/icons/options_players.png"
2422
I18N="Section in the settings menu" text="Players"/>
2523
<icon-button id="tab_controls" width="128" height="128" icon="gui/icons/options_input.png"

‎data/gui/screens/options/options_input.stkgui

-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
I18N="Section in the settings menu" text="Audio"/>
1919
<icon-button id="tab_ui" width="128" height="128" icon="gui/icons/options_ui.png"
2020
I18N="Section in the settings menu" text="Interface"/>
21-
<icon-button id="tab_camera" width="128" height="128" icon="gui/icons/options_camera.png"
22-
I18N="Section in the settings menu" text="Camera"/>
2321
<icon-button id="tab_players" width="128" height="128" icon="gui/icons/options_players.png"
2422
I18N="Section in the settings menu" text="Players"/>
2523
<icon-button id="tab_controls" width="128" height="128" icon="gui/icons/options_input.png"

‎data/gui/screens/options/options_language.stkgui

-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
I18N="Section in the settings menu" text="Audio"/>
1919
<icon-button id="tab_ui" width="128" height="128" icon="gui/icons/options_ui.png"
2020
I18N="Section in the settings menu" text="Interface"/>
21-
<icon-button id="tab_camera" width="128" height="128" icon="gui/icons/options_camera.png"
22-
I18N="Section in the settings menu" text="Camera"/>
2321
<icon-button id="tab_players" width="128" height="128" icon="gui/icons/options_players.png"
2422
I18N="Section in the settings menu" text="Players"/>
2523
<icon-button id="tab_controls" width="128" height="128" icon="gui/icons/options_input.png"

‎data/gui/screens/options/options_ui.stkgui

-4
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
I18N="Section in the settings menu" text="Audio"/>
1919
<icon-button id="tab_ui" width="128" height="128" icon="gui/icons/options_ui.png"
2020
I18N="Section in the settings menu" text="Interface"/>
21-
<icon-button id="tab_camera" width="128" height="128" icon="gui/icons/options_camera.png"
22-
I18N="Section in the settings menu" text="Camera"/>
2321
<icon-button id="tab_players" width="128" height="128" icon="gui/icons/options_players.png"
2422
I18N="Section in the settings menu" text="Players"/>
2523
<icon-button id="tab_controls" width="128" height="128" icon="gui/icons/options_input.png"
@@ -64,8 +62,6 @@
6462

6563
<spacer width="5" height="2%"/>
6664

67-
<!-- ************ EXTRA UI ELEMENTS SETTINGS ************ -->
68-
6965
<div layout="horizontal-row" width="100%" height="fit">
7066
<checkbox id="showfps"/>
7167
<spacer width="1%" height="100%" />

‎data/gui/screens/options/options_video.stkgui

-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
I18N="Section in the settings menu" text="Audio"/>
1919
<icon-button id="tab_ui" width="128" height="128" icon="gui/icons/options_ui.png"
2020
I18N="Section in the settings menu" text="Interface"/>
21-
<icon-button id="tab_camera" width="128" height="128" icon="gui/icons/options_camera.png"
22-
I18N="Section in the settings menu" text="Camera"/>
2321
<icon-button id="tab_players" width="128" height="128" icon="gui/icons/options_players.png"
2422
I18N="Section in the settings menu" text="Players"/>
2523
<icon-button id="tab_controls" width="128" height="128" icon="gui/icons/options_input.png"

‎data/gui/screens/options/user_screen_tab.stkgui

-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
I18N="Section in the settings menu" text="Audio"/>
1919
<icon-button id="tab_ui" width="128" height="128" icon="gui/icons/options_ui.png"
2020
I18N="Section in the settings menu" text="Interface"/>
21-
<icon-button id="tab_camera" width="128" height="128" icon="gui/icons/options_camera.png"
22-
I18N="Section in the settings menu" text="Camera"/>
2321
<icon-button id="tab_players" width="128" height="128" icon="gui/icons/options_players.png"
2422
I18N="Section in the settings menu" text="Players"/>
2523
<icon-button id="tab_controls" width="128" height="128" icon="gui/icons/options_input.png"

‎data/skins/cartoon/data/gui/icons/options_camera.png

-3.38 KB
Binary file not shown.

‎data/skins/cartoon/data/gui/icons/options_video.png

-5.87 KB
Loading

0 commit comments

Comments
 (0)