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.

Sign up for GitHub

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

Jump to bottom

Add foliage instancer #340

Merged
merged 3 commits into from
Jun 9, 2024
Merged

Add foliage instancer #340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7acb6c7
Add instancer
TokisanGames Mar 24, 2024
4f2200d
Update demo
TokisanGames Jun 1, 2024
6d243ae
Update docs w/ assets and foliage instancer classes
TokisanGames Apr 28, 2024
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
17 changes: 13 additions & 4 deletions Terrain3D.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -144,24 +144,29 @@
<ClInclude Include="src\geoclipmap.h" />
<ClInclude Include="src\register_types.h" />
<ClInclude Include="src\terrain_3d.h" />
<ClInclude Include="src\terrain_3d_asset_resource.h" />
<ClInclude Include="src\terrain_3d_editor.h" />
<ClInclude Include="src\logger.h" />
<ClInclude Include="src\terrain_3d_instancer.h" />
<ClInclude Include="src\terrain_3d_mesh_asset.h" />
<ClInclude Include="src\terrain_3d_texture_asset.h" />
<ClInclude Include="src\terrain_3d_util.h" />
<ClInclude Include="src\terrain_3d_material.h" />
<ClInclude Include="src\terrain_3d_storage.h" />
<ClInclude Include="src\terrain_3d_texture.h" />
<ClInclude Include="src\terrain_3d_texture_list.h" />
<ClInclude Include="src\terrain_3d_assets.h" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\generated_texture.cpp" />
<ClCompile Include="src\geoclipmap.cpp" />
<ClCompile Include="src\register_types.cpp" />
<ClCompile Include="src\terrain_3d.cpp" />
<ClCompile Include="src\terrain_3d_editor.cpp" />
<ClCompile Include="src\terrain_3d_instancer.cpp" />
<ClCompile Include="src\terrain_3d_material.cpp" />
<ClCompile Include="src\terrain_3d_mesh_asset.cpp" />
<ClCompile Include="src\terrain_3d_storage.cpp" />
<ClCompile Include="src\terrain_3d_texture.cpp" />
<ClCompile Include="src\terrain_3d_texture_list.cpp" />
<ClCompile Include="src\terrain_3d_texture_asset.cpp" />
<ClCompile Include="src\terrain_3d_assets.cpp" />
<ClCompile Include="src\terrain_3d_util.cpp" />
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -224,9 +229,13 @@
<ItemGroup>
<Xml Include="doc\classes\Terrain3D.xml" />
<Xml Include="doc\classes\Terrain3DEditor.xml" />
<Xml Include="doc\classes\Terrain3DInstancer.xml" />
<Xml Include="doc\classes\Terrain3DMaterial.xml" />
<Xml Include="doc\classes\Terrain3DMeshAsset.xml" />
<Xml Include="doc\classes\Terrain3DStorage.xml" />
<Xml Include="doc\classes\Terrain3DTexture.xml" />
<Xml Include="doc\classes\Terrain3DTextureAsset.xml" />
<Xml Include="doc\classes\Terrain3DAssets.xml" />
<Xml Include="doc\classes\Terrain3DTextureList.xml" />
<Xml Include="doc\classes\Terrain3DUtil.xml" />
</ItemGroup>
Expand Down
37 changes: 29 additions & 8 deletions Terrain3D.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
</Filter>
</ItemGroup>
<ItemGroup>
<ClInclude Include="src\terrain_3d_texture_list.h">
<ClInclude Include="src\terrain_3d_assets.h">
<Filter>4. Headers</Filter>
</ClInclude>
<ClInclude Include="src\geoclipmap.h">
Expand All @@ -42,9 +42,6 @@
<ClInclude Include="src\terrain_3d_storage.h">
<Filter>4. Headers</Filter>
</ClInclude>
<ClInclude Include="src\terrain_3d_texture.h">
<Filter>4. Headers</Filter>
</ClInclude>
<ClInclude Include="src\terrain_3d_material.h">
<Filter>4. Headers</Filter>
</ClInclude>
Expand All @@ -60,6 +57,18 @@
<ClInclude Include="src\terrain_3d_util.h">
<Filter>4. Headers</Filter>
</ClInclude>
<ClInclude Include="src\terrain_3d_instancer.h">
<Filter>4. Headers</Filter>
</ClInclude>
<ClInclude Include="src\terrain_3d_mesh_asset.h">
<Filter>4. Headers</Filter>
</ClInclude>
<ClInclude Include="src\terrain_3d_texture_asset.h">
<Filter>4. Headers</Filter>
</ClInclude>
<ClInclude Include="src\terrain_3d_asset_resource.h">
<Filter>4. Headers</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="src\geoclipmap.cpp">
Expand All @@ -77,10 +86,10 @@
<ClCompile Include="src\terrain_3d_storage.cpp">
<Filter>5. C++</Filter>
</ClCompile>
<ClCompile Include="src\terrain_3d_texture.cpp">
<ClCompile Include="src\terrain_3d_texture_asset.cpp">
<Filter>5. C++</Filter>
</ClCompile>
<ClCompile Include="src\terrain_3d_texture_list.cpp">
<ClCompile Include="src\terrain_3d_assets.cpp">
<Filter>5. C++</Filter>
</ClCompile>
<ClCompile Include="src\terrain_3d_material.cpp">
Expand All @@ -92,6 +101,12 @@
<ClCompile Include="src\terrain_3d_util.cpp">
<Filter>5. C++</Filter>
</ClCompile>
<ClCompile Include="src\terrain_3d_instancer.cpp">
<Filter>5. C++</Filter>
</ClCompile>
<ClCompile Include="src\terrain_3d_mesh_asset.cpp">
<Filter>5. C++</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<None Include=".github\actions\windows-deps\action.yml">
Expand Down Expand Up @@ -269,14 +284,20 @@
<Xml Include="doc\classes\Terrain3DStorage.xml">
<Filter>2. Docs\XML</Filter>
</Xml>
<Xml Include="doc\classes\Terrain3DTexture.xml">
<Xml Include="doc\classes\Terrain3DTextureAsset.xml">
<Filter>2. Docs\XML</Filter>
</Xml>
<Xml Include="doc\classes\Terrain3DTextureList.xml">
<Xml Include="doc\classes\Terrain3DAssets.xml">
<Filter>2. Docs\XML</Filter>
</Xml>
<Xml Include="doc\classes\Terrain3DUtil.xml">
<Filter>2. Docs\XML</Filter>
</Xml>
<Xml Include="doc\classes\Terrain3DInstancer.xml">
<Filter>2. Docs\XML</Filter>
</Xml>
<Xml Include="doc\classes\Terrain3DTextureList.xml">
<Filter>2. Docs\XML</Filter>
</Xml>
</ItemGroup>
</Project>
53 changes: 43 additions & 10 deletions doc/api/class_terrain3d.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ Properties
.. table::
:widths: auto

+---------------------------------------------------------------------------+----------------------------------------------------------------------------+-----------------+
| :ref:`Terrain3DAssets<class_Terrain3DAssets>` | :ref:`assets<class_Terrain3D_property_assets>` | |
+---------------------------------------------------------------------------+----------------------------------------------------------------------------+-----------------+
| :ref:`bool<class_bool>` | :ref:`collision_enabled<class_Terrain3D_property_collision_enabled>` | ``true`` |
+---------------------------------------------------------------------------+----------------------------------------------------------------------------+-----------------+
Expand Down Expand Up @@ -80,6 +82,8 @@ Methods
+-----------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| :ref:`Camera3D<class_Camera3D>` | :ref:`get_camera<class_Terrain3D_method_get_camera>`\ (\ ) |
+-----------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| :ref:`Terrain3DInstancer<class_Terrain3DInstancer>` | :ref:`get_instancer<class_Terrain3D_method_get_instancer>`\ (\ ) |
+-----------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| :ref:`Vector3<class_Vector3>` | :ref:`get_intersection<class_Terrain3D_method_get_intersection>`\ (\ src_pos\: :ref:`Vector3<class_Vector3>`, direction\: :ref:`Vector3<class_Vector3>`\ ) |
+-----------------------------------------------------+-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+
| :ref:`EditorPlugin<class_EditorPlugin>` | :ref:`get_plugin<class_Terrain3D_method_get_plugin>`\ (\ ) |
Expand All @@ -98,37 +102,37 @@ Methods
Signals
-------

.. _class_Terrain3D_signal_material_changed:
.. _class_Terrain3D_signal_assets_changed:

.. rst-class:: classref-signal

**material_changed**\ (\ )
**assets_changed**\ (\ )

Emitted when :ref:`material<class_Terrain3D_property_material>` is changed.
Emitted when :ref:`assets<class_Terrain3D_property_assets>` is changed.

.. rst-class:: classref-item-separator

----

.. _class_Terrain3D_signal_storage_changed:
.. _class_Terrain3D_signal_material_changed:

.. rst-class:: classref-signal

**storage_changed**\ (\ )
**material_changed**\ (\ )

Emitted when :ref:`storage<class_Terrain3D_property_storage>` is changed.
Emitted when :ref:`material<class_Terrain3D_property_material>` is changed.

.. rst-class:: classref-item-separator

----

.. _class_Terrain3D_signal_texture_list_changed:
.. _class_Terrain3D_signal_storage_changed:

.. rst-class:: classref-signal

**texture_list_changed**\ (\ )
**storage_changed**\ (\ )

Emitted when :ref:`texture_list<class_Terrain3D_property_texture_list>` is changed.
Emitted when :ref:`storage<class_Terrain3D_property_storage>` is changed.

.. rst-class:: classref-section-separator

Expand All @@ -139,6 +143,23 @@ Emitted when :ref:`texture_list<class_Terrain3D_property_texture_list>` is chang
Property Descriptions
---------------------

.. _class_Terrain3D_property_assets:

.. rst-class:: classref-property

:ref:`Terrain3DAssets<class_Terrain3DAssets>` **assets**

.. rst-class:: classref-property-setget

- |void| **set_assets**\ (\ value\: :ref:`Terrain3DAssets<class_Terrain3DAssets>`\ )
- :ref:`Terrain3DAssets<class_Terrain3DAssets>` **get_assets**\ (\ )

The list of texture files used by Terrain3D. You can optionally save this as an external ``.tres`` text file if you wish to share it with instances of Terrain3D in other scenes.

.. rst-class:: classref-item-separator

----

.. _class_Terrain3D_property_collision_enabled:

.. rst-class:: classref-property
Expand Down Expand Up @@ -417,7 +438,7 @@ The object that houses all Terrain3D region, height, control, and color maps. Ma
- |void| **set_texture_list**\ (\ value\: :ref:`Terrain3DTextureList<class_Terrain3DTextureList>`\ )
- :ref:`Terrain3DTextureList<class_Terrain3DTextureList>` **get_texture_list**\ (\ )

The list of texture files used by Terrain3D. You can optionally save this as an external ``.tres`` text file if you wish to share it with instances of Terrain3D in other scenes.
Deprecated. See :ref:`assets<class_Terrain3D_property_assets>`.

.. rst-class:: classref-item-separator

Expand Down Expand Up @@ -488,6 +509,18 @@ Returns the camera the terrain is currently snapping to.

----

.. _class_Terrain3D_method_get_instancer:

.. rst-class:: classref-method

:ref:`Terrain3DInstancer<class_Terrain3DInstancer>` **get_instancer**\ (\ )

Returns the active :ref:`Terrain3DInstancer<class_Terrain3DInstancer>` object.

.. rst-class:: classref-item-separator

----

.. _class_Terrain3D_method_get_intersection:

.. rst-class:: classref-method
Expand Down
Loading