Skip to content

Commit c7fe889

Browse files
authored
Merge branch 'dev' into GGJGame
2 parents 6db74b3 + 180cc60 commit c7fe889

File tree

599 files changed

+12142
-1387
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

599 files changed

+12142
-1387
lines changed

assets.bat

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ IF "%1"=="assets-test" (
88
git submodule update --init --recursive --remote
99
cd game/assets
1010
git remote add upstream git@gitlab.com:sdslabs/rootex-assets.git
11+
cd ../..
1112
)
1213
IF "%1"=="assets-game" (
1314
git submodule deinit -f game/assets
@@ -18,6 +19,7 @@ IF "%1"=="assets-game" (
1819
git submodule update --init --recursive --remote
1920
cd game/assets
2021
git remote add upstream git@gitlab.com:sdslabs/rootex-game.git
22+
cd ../..
2123
)
2224

2325
IF "%1"=="assets-custom" (
@@ -27,4 +29,5 @@ IF "%1"=="assets-custom" (
2729
git config --file=.gitmodules submodule.assets.url %2
2830
git config --file=.gitmodules submodule.assets.branch main
2931
git submodule update --init --recursive --remote
30-
)
32+
cd ../..
33+
)
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
.. _exhale_class_class_animated_basic_material_resource_file:
2+
3+
Class AnimatedBasicMaterialResourceFile
4+
=======================================
5+
6+
- Defined in :ref:`file_rootex_core_resource_files_animated_basic_material_resource_file.h`
7+
8+
9+
Inheritance Relationships
10+
-------------------------
11+
12+
Base Type
13+
*********
14+
15+
- ``public BasicMaterialResourceFile`` (:ref:`exhale_class_class_basic_material_resource_file`)
16+
17+
18+
Class Documentation
19+
-------------------
20+
21+
22+
.. doxygenclass:: AnimatedBasicMaterialResourceFile
23+
:members:
24+
:protected-members:
25+
:undoc-members:

docs/api/class_animated_model_component.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Class AnimatedModelComponent
44
============================
55

6-
- Defined in :ref:`file_rootex_framework_components_visual_animated_model_component.h`
6+
- Defined in :ref:`file_rootex_framework_components_visual_model_animated_model_component.h`
77

88

99
Inheritance Relationships

docs/api/class_audio_component.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Class AudioComponent
44
====================
55

6-
- Defined in :ref:`file_rootex_framework_components_audio_component.h`
6+
- Defined in :ref:`file_rootex_framework_components_audio_audio_component.h`
77

88

99
Inheritance Relationships

docs/api/class_audio_listener_component.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Class AudioListenerComponent
44
============================
55

6-
- Defined in :ref:`file_rootex_framework_components_audio_listener_component.h`
6+
- Defined in :ref:`file_rootex_framework_components_audio_audio_listener_component.h`
77

88

99
Inheritance Relationships
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
.. _exhale_class_class_base_component_set:
2+
3+
Class BaseComponentSet
4+
======================
5+
6+
- Defined in :ref:`file_rootex_framework_ecs_factory.h`
7+
8+
9+
Inheritance Relationships
10+
-------------------------
11+
12+
Derived Type
13+
************
14+
15+
- ``public ComponentSet< T >`` (:ref:`exhale_class_class_component_set`)
16+
17+
18+
Class Documentation
19+
-------------------
20+
21+
22+
.. doxygenclass:: BaseComponentSet
23+
:members:
24+
:protected-members:
25+
:undoc-members:
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
.. _exhale_class_class_basic_material_resource_file:
2+
3+
Class BasicMaterialResourceFile
4+
===============================
5+
6+
- Defined in :ref:`file_rootex_core_resource_files_basic_material_resource_file.h`
7+
8+
9+
Inheritance Relationships
10+
-------------------------
11+
12+
Base Type
13+
*********
14+
15+
- ``public MaterialResourceFile`` (:ref:`exhale_class_class_material_resource_file`)
16+
17+
18+
Derived Types
19+
*************
20+
21+
- ``public AnimatedBasicMaterialResourceFile`` (:ref:`exhale_class_class_animated_basic_material_resource_file`)
22+
- ``public InstancingBasicMaterialResourceFile`` (:ref:`exhale_class_class_instancing_basic_material_resource_file`)
23+
24+
25+
Class Documentation
26+
-------------------
27+
28+
29+
.. doxygenclass:: BasicMaterialResourceFile
30+
:members:
31+
:protected-members:
32+
:undoc-members:

docs/api/class_box_collider_component.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Inheritance Relationships
1212
Base Type
1313
*********
1414

15-
- ``public PhysicsColliderComponent`` (:ref:`exhale_class_class_physics_collider_component`)
15+
- ``public RigidBodyComponent`` (:ref:`exhale_class_class_rigid_body_component`)
1616

1717

1818
Class Documentation

docs/api/class_c_p_u_particles_component.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
Class CPUParticlesComponent
44
===========================
55

6-
- Defined in :ref:`file_rootex_framework_components_visual_cpu_particles_component.h`
6+
- Defined in :ref:`file_rootex_framework_components_visual_effect_cpu_particles_component.h`
77

88

99
Nested Relationships

docs/api/class_c_p_u_texture.rst

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
.. _exhale_class_class_c_p_u_texture:
2+
3+
Class CPUTexture
4+
================
5+
6+
- Defined in :ref:`file_rootex_core_renderer_texture.h`
7+
8+
9+
Class Documentation
10+
-------------------
11+
12+
13+
.. doxygenclass:: CPUTexture
14+
:members:
15+
:protected-members:
16+
:undoc-members:

0 commit comments

Comments
 (0)