Skip to content

Commit

Permalink
Merge branch 'dev' into GGJGame
Browse files Browse the repository at this point in the history
  • Loading branch information
Bashar-Ahmed authored Mar 7, 2022
2 parents 6db74b3 + 180cc60 commit c7fe889
Show file tree
Hide file tree
Showing 599 changed files with 12,142 additions and 1,387 deletions.
5 changes: 4 additions & 1 deletion assets.bat
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ IF "%1"=="assets-test" (
git submodule update --init --recursive --remote
cd game/assets
git remote add upstream git@gitlab.com:sdslabs/rootex-assets.git
cd ../..
)
IF "%1"=="assets-game" (
git submodule deinit -f game/assets
Expand All @@ -18,6 +19,7 @@ IF "%1"=="assets-game" (
git submodule update --init --recursive --remote
cd game/assets
git remote add upstream git@gitlab.com:sdslabs/rootex-game.git
cd ../..
)

IF "%1"=="assets-custom" (
Expand All @@ -27,4 +29,5 @@ IF "%1"=="assets-custom" (
git config --file=.gitmodules submodule.assets.url %2
git config --file=.gitmodules submodule.assets.branch main
git submodule update --init --recursive --remote
)
cd ../..
)
25 changes: 25 additions & 0 deletions docs/api/class_animated_basic_material_resource_file.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
.. _exhale_class_class_animated_basic_material_resource_file:

Class AnimatedBasicMaterialResourceFile
=======================================

- Defined in :ref:`file_rootex_core_resource_files_animated_basic_material_resource_file.h`


Inheritance Relationships
-------------------------

Base Type
*********

- ``public BasicMaterialResourceFile`` (:ref:`exhale_class_class_basic_material_resource_file`)


Class Documentation
-------------------


.. doxygenclass:: AnimatedBasicMaterialResourceFile
:members:
:protected-members:
:undoc-members:
2 changes: 1 addition & 1 deletion docs/api/class_animated_model_component.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Class AnimatedModelComponent
============================

- Defined in :ref:`file_rootex_framework_components_visual_animated_model_component.h`
- Defined in :ref:`file_rootex_framework_components_visual_model_animated_model_component.h`


Inheritance Relationships
Expand Down
2 changes: 1 addition & 1 deletion docs/api/class_audio_component.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Class AudioComponent
====================

- Defined in :ref:`file_rootex_framework_components_audio_component.h`
- Defined in :ref:`file_rootex_framework_components_audio_audio_component.h`


Inheritance Relationships
Expand Down
2 changes: 1 addition & 1 deletion docs/api/class_audio_listener_component.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Class AudioListenerComponent
============================

- Defined in :ref:`file_rootex_framework_components_audio_listener_component.h`
- Defined in :ref:`file_rootex_framework_components_audio_audio_listener_component.h`


Inheritance Relationships
Expand Down
25 changes: 25 additions & 0 deletions docs/api/class_base_component_set.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
.. _exhale_class_class_base_component_set:

Class BaseComponentSet
======================

- Defined in :ref:`file_rootex_framework_ecs_factory.h`


Inheritance Relationships
-------------------------

Derived Type
************

- ``public ComponentSet< T >`` (:ref:`exhale_class_class_component_set`)


Class Documentation
-------------------


.. doxygenclass:: BaseComponentSet
:members:
:protected-members:
:undoc-members:
32 changes: 32 additions & 0 deletions docs/api/class_basic_material_resource_file.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
.. _exhale_class_class_basic_material_resource_file:

Class BasicMaterialResourceFile
===============================

- Defined in :ref:`file_rootex_core_resource_files_basic_material_resource_file.h`


Inheritance Relationships
-------------------------

Base Type
*********

- ``public MaterialResourceFile`` (:ref:`exhale_class_class_material_resource_file`)


Derived Types
*************

- ``public AnimatedBasicMaterialResourceFile`` (:ref:`exhale_class_class_animated_basic_material_resource_file`)
- ``public InstancingBasicMaterialResourceFile`` (:ref:`exhale_class_class_instancing_basic_material_resource_file`)


Class Documentation
-------------------


.. doxygenclass:: BasicMaterialResourceFile
:members:
:protected-members:
:undoc-members:
2 changes: 1 addition & 1 deletion docs/api/class_box_collider_component.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Inheritance Relationships
Base Type
*********

- ``public PhysicsColliderComponent`` (:ref:`exhale_class_class_physics_collider_component`)
- ``public RigidBodyComponent`` (:ref:`exhale_class_class_rigid_body_component`)


Class Documentation
Expand Down
2 changes: 1 addition & 1 deletion docs/api/class_c_p_u_particles_component.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
Class CPUParticlesComponent
===========================

- Defined in :ref:`file_rootex_framework_components_visual_cpu_particles_component.h`
- Defined in :ref:`file_rootex_framework_components_visual_effect_cpu_particles_component.h`


Nested Relationships
Expand Down
16 changes: 16 additions & 0 deletions docs/api/class_c_p_u_texture.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
.. _exhale_class_class_c_p_u_texture:

Class CPUTexture
================

- Defined in :ref:`file_rootex_core_renderer_texture.h`


Class Documentation
-------------------


.. doxygenclass:: CPUTexture
:members:
:protected-members:
:undoc-members:
2 changes: 1 addition & 1 deletion docs/api/class_capsule_collider_component.rst
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Inheritance Relationships
Base Type
*********

- ``public PhysicsColliderComponent`` (:ref:`exhale_class_class_physics_collider_component`)
- ``public RigidBodyComponent`` (:ref:`exhale_class_class_rigid_body_component`)


Class Documentation
Expand Down
32 changes: 32 additions & 0 deletions docs/api/class_collision_component.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
.. _exhale_class_class_collision_component:

Class CollisionComponent
========================

- Defined in :ref:`file_rootex_framework_components_physics_collision_component.h`


Inheritance Relationships
-------------------------

Base Type
*********

- ``public Component`` (:ref:`exhale_class_class_component`)


Derived Types
*************

- ``public RigidBodyComponent`` (:ref:`exhale_class_class_rigid_body_component`)
- ``public TriggerComponent`` (:ref:`exhale_class_class_trigger_component`)


Class Documentation
-------------------


.. doxygenclass:: CollisionComponent
:members:
:protected-members:
:undoc-members:
16 changes: 13 additions & 3 deletions docs/api/class_component.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,16 @@ Class Component
- Defined in :ref:`file_rootex_framework_component.h`


Nested Relationships
--------------------


Nested Types
************

- :ref:`exhale_struct_struct_component_1_1_category`


Inheritance Relationships
-------------------------

Expand All @@ -15,16 +25,16 @@ Derived Types
- ``public AudioComponent`` (:ref:`exhale_class_class_audio_component`)
- ``public AudioListenerComponent`` (:ref:`exhale_class_class_audio_listener_component`)
- ``public CameraComponent`` (:ref:`exhale_class_class_camera_component`)
- ``public DebugComponent`` (:ref:`exhale_class_class_debug_component`)
- ``public CollisionComponent`` (:ref:`exhale_class_class_collision_component`)
- ``public DirectionalLightComponent`` (:ref:`exhale_class_class_directional_light_component`)
- ``public FogComponent`` (:ref:`exhale_class_class_fog_component`)
- ``public PhysicsColliderComponent`` (:ref:`exhale_class_class_physics_collider_component`)
- ``public ParticleEffectComponent`` (:ref:`exhale_class_class_particle_effect_component`)
- ``public PlayerController`` (:ref:`exhale_class_class_player_controller`)
- ``public PointLightComponent`` (:ref:`exhale_class_class_point_light_component`)
- ``public RenderUIComponent`` (:ref:`exhale_class_class_render_u_i_component`)
- ``public RenderableComponent`` (:ref:`exhale_class_class_renderable_component`)
- ``public SkyComponent`` (:ref:`exhale_class_class_sky_component`)
- ``public SpotLightComponent`` (:ref:`exhale_class_class_spot_light_component`)
- ``public TestComponent`` (:ref:`exhale_class_class_test_component`)
- ``public TransformAnimationComponent`` (:ref:`exhale_class_class_transform_animation_component`)
- ``public TransformComponent`` (:ref:`exhale_class_class_transform_component`)
- ``public UIComponent`` (:ref:`exhale_class_class_u_i_component`)
Expand Down
25 changes: 25 additions & 0 deletions docs/api/class_component_set.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
.. _exhale_class_class_component_set:

Template Class ComponentSet
===========================

- Defined in :ref:`file_rootex_framework_ecs_factory.h`


Inheritance Relationships
-------------------------

Base Type
*********

- ``public BaseComponentSet`` (:ref:`exhale_class_class_base_component_set`)


Class Documentation
-------------------


.. doxygenclass:: ComponentSet
:members:
:protected-members:
:undoc-members:
26 changes: 26 additions & 0 deletions docs/api/class_content_browser.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
.. _exhale_class_class_content_browser:

Class ContentBrowser
====================

- Defined in :ref:`file_editor_gui_content_browser.h`


Nested Relationships
--------------------


Nested Types
************

- :ref:`exhale_struct_struct_content_browser_1_1_content_browser_settings`


Class Documentation
-------------------


.. doxygenclass:: ContentBrowser
:members:
:protected-members:
:undoc-members:
25 changes: 25 additions & 0 deletions docs/api/class_custom_material_resource_file.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
.. _exhale_class_class_custom_material_resource_file:

Class CustomMaterialResourceFile
================================

- Defined in :ref:`file_rootex_core_resource_files_custom_material_resource_file.h`


Inheritance Relationships
-------------------------

Base Type
*********

- ``public MaterialResourceFile`` (:ref:`exhale_class_class_material_resource_file`)


Class Documentation
-------------------


.. doxygenclass:: CustomMaterialResourceFile
:members:
:protected-members:
:undoc-members:
25 changes: 25 additions & 0 deletions docs/api/class_custom_post_process.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
.. _exhale_class_class_custom_post_process:

Class CustomPostProcess
=======================

- Defined in :ref:`file_rootex_core_renderer_post_processor.h`


Inheritance Relationships
-------------------------

Base Type
*********

- ``public PostProcess`` (:ref:`exhale_class_class_post_process`)


Class Documentation
-------------------


.. doxygenclass:: CustomPostProcess
:members:
:protected-members:
:undoc-members:
10 changes: 10 additions & 0 deletions docs/api/class_custom_render_interface.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,16 @@ Class CustomRenderInterface
- Defined in :ref:`file_rootex_core_ui_custom_render_interface.h`


Nested Relationships
--------------------


Nested Types
************

- :ref:`exhale_struct_struct_custom_render_interface_1_1_geometry_data`


Inheritance Relationships
-------------------------

Expand Down
Loading

0 comments on commit c7fe889

Please sign in to comment.