Rename all instances of the x11 platform to linuxbsd

Export template binaries haven't been renamed yet, so their names
were left as-is.
This commit is contained in:
Hugo Locurcio
2020-03-28 21:59:31 +01:00
parent 6837713558
commit 6fb8d9b5de
17 changed files with 68 additions and 67 deletions

View File

@@ -79,7 +79,7 @@ In ``process_input``, add the following code just before ``input_movement_vector
if OS.get_name() == "Windows":
joypad_vec = Vector2(Input.get_joy_axis(0, 0), -Input.get_joy_axis(0, 1))
elif OS.get_name() == "X11":
elif OS.get_name() == "Linux":
joypad_vec = Vector2(Input.get_joy_axis(0, 1), Input.get_joy_axis(0, 2))
elif OS.get_name() == "OSX":
joypad_vec = Vector2(Input.get_joy_axis(0, 1), Input.get_joy_axis(0, 2))
@@ -98,7 +98,7 @@ In ``process_input``, add the following code just before ``input_movement_vector
var joypad_vec = Vector2(0, 0)
if OS.get_name() == "Windows" or OS.get_name() == "X11":
if OS.get_name() == "Windows" or OS.get_name() == "Linux":
joypad_vec = Vector2(Input.get_joy_axis(0, 0), -Input.get_joy_axis(0, 1))
elif OS.get_name() == "OSX":
joypad_vec = Vector2(Input.get_joy_axis(0, 1), Input.get_joy_axis(0, 2))
@@ -159,7 +159,7 @@ Make a new function called ``process_view_input`` and add the following:
if OS.get_name() == "Windows":
joypad_vec = Vector2(Input.get_joy_axis(0, 2), Input.get_joy_axis(0, 3))
elif OS.get_name() == "X11":
elif OS.get_name() == "Linux":
joypad_vec = Vector2(Input.get_joy_axis(0, 3), Input.get_joy_axis(0, 4))
elif OS.get_name() == "OSX":
joypad_vec = Vector2(Input.get_joy_axis(0, 3), Input.get_joy_axis(0, 4))
@@ -194,7 +194,7 @@ Make a new function called ``process_view_input`` and add the following:
var joypad_vec = Vector2()
if Input.get_connected_joypads().size() > 0:
if OS.get_name() == "Windows" or OS.get_name() == "X11":
if OS.get_name() == "Windows" or OS.get_name() == "Linux":
joypad_vec = Vector2(Input.get_joy_axis(0, 2), Input.get_joy_axis(0, 3))
elif OS.get_name() == "OSX":
joypad_vec = Vector2(Input.get_joy_axis(0, 3), Input.get_joy_axis(0, 4))
@@ -787,4 +787,3 @@ add turrets!
.. warning:: If you ever get lost, be sure to read over the code again!
You can download the finished project for this part here: :download:`Godot_FPS_Part_4.zip <files/Godot_FPS_Part_4.zip>`

View File

@@ -268,7 +268,7 @@ ______
In ``_ready``, we set the ``OS_Label``'s text to the name provided by :ref:`OS <class_OS>` using the ``get_name`` function. This will return the
name of the OS (or Operating System) for which Godot was compiled. For example, when you are running Windows, it will return ``Windows``, while when you
are running Linux, it will return ``X11``.
are running Linux, it will return ``Linux``.
Then, we set the ``Engine_Label``'s text to the version info provided by ``Engine.get_version_info``. ``Engine.get_version_info`` returns a dictionary full
of useful information about the version of Godot which is currently running. We only care about the string version, for this label at least, so we get the string
@@ -1038,4 +1038,3 @@ The skybox was converted to a 360 equirectangular image using this tool: https:/
While no sounds are provided, you can find many game ready sounds at https://gamesounds.xyz/
.. warning:: **OpenGameArt.org, 360toolkit.co, the creator(s) of Titillium-Regular, StumpyStrust, and GameSounds.xyz are in no way involved in this tutorial.**