Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix glTF capitalization in manual #9754

Merged
merged 1 commit into from
Aug 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions getting_started/first_3d_game/02.player_input.rst
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ You can rename it to ``Character``.

.. note::

The ``.glb`` files contain 3D scene data based on the open source GLTF 2.0
The ``.glb`` files contain 3D scene data based on the open source glTF 2.0
specification. They're a modern and powerful alternative to a proprietary format
like FBX, which Godot also supports. To produce these files, we designed the
model in `Blender 3D <https://www.blender.org/>`__ and exported it to GLTF.
model in `Blender 3D <https://www.blender.org/>`__ and exported it to glTF.

As with all kinds of physics nodes, we need a collision shape for our character
to collide with the environment. Select the ``Player`` node again and add a child node
Expand Down
10 changes: 5 additions & 5 deletions tutorials/platform/android/android_library.rst
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,11 @@ These APIs can also be used to provide bidirectional communication between the h
Godot instance allowing for greater control over the desired experience.

We showcase how this is done using a sample Android app that embeds the Godot Engine as an Android view,
and uses it to render 3D GLTF models.
and uses it to render 3D glTF models.

The `GLTF Viewer <https://github.com/m4gr3d/Godot-Android-Samples/tree/master/apps/gltf_viewer>`_ sample app uses an `Android RecyclerView component <https://developer.android.com/develop/ui/views/layout/recyclerview>`_ to create
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I left the references to GLTF Viewer alone because it's the name of an external project.

a list of GLTF items, populated from `Kenney's Food Kit pack <https://kenney.nl/assets/food-kit>`_.
When an item on the list is selected, the app's logic interacts with the embedded Godot Engine to render the selected GLTF item as a 3D model.
a list of glTF items, populated from `Kenney's Food Kit pack <https://kenney.nl/assets/food-kit>`_.
When an item on the list is selected, the app's logic interacts with the embedded Godot Engine to render the selected glTF item as a 3D model.

.. image:: img/gltf_viewer_sample_app_screenshot.webp

Expand Down Expand Up @@ -146,7 +146,7 @@ Below we break-down the steps used to create the GLTF Viewer app.

- Add any additional logic that will be used by your application

- For the sample app, this includes adding the `ItemsSelectionFragment fragment <https://github.com/m4gr3d/Godot-Android-Samples/blob/master/apps/gltf_viewer/src/main/java/fhuyakou/godot/app/android/gltfviewer/ItemsSelectionFragment.kt>`_ (and related classes), a fragment used to build and show the list of GLTF items
- For the sample app, this includes adding the `ItemsSelectionFragment fragment <https://github.com/m4gr3d/Godot-Android-Samples/blob/master/apps/gltf_viewer/src/main/java/fhuyakou/godot/app/android/gltfviewer/ItemsSelectionFragment.kt>`_ (and related classes), a fragment used to build and show the list of glTF items

- Open the ``AndroidManifest.xml`` file, and configure the orientation if needed using the `android:screenOrientation attribute <https://developer.android.com/guide/topics/manifest/activity-element#screen>`_

Expand Down Expand Up @@ -191,7 +191,7 @@ Below we break-down the steps used to create the GLTF Viewer app.
- Update the Godot project script logic as needed

- For the sample app, the `script logic <https://github.com/m4gr3d/Godot-Android-Samples/blob/master/apps/gltf_viewer/src/main/assets/main.gd>`_ queries for the runtime ``GodotPlugin`` instance and uses it to register for signals fired by the app logic
- The app logic fires a signal every time an item is selected in the list. The signal contains the filepath of the GLTF model, which is used by the ``gdscript`` logic to render the model.
- The app logic fires a signal every time an item is selected in the list. The signal contains the filepath of the glTF model, which is used by the ``gdscript`` logic to render the model.

.. code-block:: gdscript

Expand Down
2 changes: 1 addition & 1 deletion tutorials/xr/openxr_hand_tracking.rst
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ For this Godot uses the hand bone structure as defined for the :ref:`Godot Human
but optionally supporting an extra tip bone for each finger.

The `OpenXR hand tracking demo <https://github.com/godotengine/godot-demo-projects/tree/master/xr/openxr_hand_tracking_demo>`_
contains example GLTF files of properly rigged hands.
contains example glTF files of properly rigged hands.

We will be using those here and add them as a child to our ``XRNode3D`` node.
We also need to enable editable children to gain access to our :ref:`Skeleton3D <class_skeleton3d>` node.
Expand Down