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

Merge (#80) into demo/linear-wave-body #81

Merged
merged 2 commits into from
Oct 12, 2022
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
20 changes: 20 additions & 0 deletions gz-waves-models/world_models/regular_waves/model.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@

<?xml version='1.0'?>
<model>
<name>Regular Waves</name>
<version>1.0</version>
<sdf version='1.6'>model.sdf</sdf>

<author>
<name>Rhys Mainwaring</name>
<email>[email protected]</email>
</author>

<description>
Regular surface waves. i.e. plane progressive waves of a single frequency.

This model uses the materials from the `waves`
model to prevent duplicating the large mesh files.
</description>
</model>

61 changes: 61 additions & 0 deletions gz-waves-models/world_models/regular_waves/model.sdf
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
<?xml version='1.0' ?>
<sdf version="1.6">
<model name="regular_waves">
<static>true</static>
<plugin
filename="gz-waves1-waves-model-system"
name="gz::sim::systems::WavesModel">
<static>0</static>
<update_rate>30</update_rate>
<wave>
<algorithm>sinusoid</algorithm>
<number>1</number>
<amplitude>2.0</amplitude>
<period>6.0</period>
<direction>1 0</direction>
</wave>
</plugin>
<link name="base_link">
<visual name="visual">
<geometry>
<mesh>
<uri>models://waves/materials/mesh_L256m_N256.dae</uri>
</mesh>
</geometry>
<material>
<ambient>0.0 0.05 0.8 0.92</ambient>
<diffuse>0.0 0.1 0.7 0.92</diffuse>
<specular>0.7 0.7 0.7 0.92</specular>
<pbr>
<metal>
<albedo_map>models://waves/materials/water.jpg</albedo_map>
<normal_map>models://waves/materials/wave_normals.dds</normal_map>
<environment_map>models://waves/materials/skybox_lowres.dds</environment_map>
<roughness>0.3</roughness>
<metalness>0.1</metalness>
</metal>
</pbr>
</material>
<plugin
filename="gz-waves1-waves-visual-system"
name="gz::sim::systems::WavesVisual">
<static>0</static>
<mesh_deformation_method>DYNAMIC_GEOMETRY</mesh_deformation_method>
<tiles_x>0 0</tiles_x>
<tiles_y>0 0</tiles_y>
<wave>
<algorithm>sinusoid</algorithm>
<number>1</number>
<amplitude>2.0</amplitude>
<period>6.0</period>
<direction>1 0</direction>
</wave>
<shader language="metal">
<vertex>models://waves/materials/waves_vs.metal</vertex>
<fragment>models://waves/materials/waves_fs.metal</fragment>
</shader>
</plugin>
</visual>
</link>
</model>
</sdf>
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
</author>

<description>
Monochromatic surface waves T=15s, H=2m.
Regular surface waves T=15s, H=2m.

This model uses the materials from the `waves`
model to prevent duplicating the large mesh files.
</description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
</author>

<description>
Monochromatic surface waves T=15s, H=4m.
Regular surface waves T=15s, H=4m.

This model uses the materials from the `waves`
model to prevent duplicating the large mesh files.
</description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
</author>

<description>
Monochromatic surface waves T=15s, H=6m.
Regular surface waves T=15s, H=6m.

This model uses the materials from the `waves`
model to prevent duplicating the large mesh files.
</description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
</author>

<description>
Monochromatic surface waves T=1s, H=0.5m.
Regular surface waves T=1s, H=0.5m.

This model uses the materials from the `waves`
model to prevent duplicating the large mesh files.
</description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
</author>

<description>
Monochromatic surface waves T=20s, H=0m.
Regular surface waves T=20s, H=0m.

This model uses the materials from the `waves`
model to prevent duplicating the large mesh files.
</description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
</author>

<description>
Monochromatic surface waves T=3s, H=1m.
Regular surface waves T=3s, H=1m.

This model uses the materials from the `waves`
model to prevent duplicating the large mesh files.
</description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
</author>

<description>
Monochromatic surface waves T=6s, H=2m.
Regular surface waves T=6s, H=2m.

This model uses the materials from the `waves`
model to prevent duplicating the large mesh files.
</description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
</author>

<description>
Monochromatic surface waves T=6s, H=4m.
Regular surface waves T=6s, H=4m.

This model uses the materials from the `waves`
model to prevent duplicating the large mesh files.
</description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
</author>

<description>
Monochromatic surface waves T=8s, H=2m.
Regular surface waves T=8s, H=2m.

This model uses the materials from the `waves`
model to prevent duplicating the large mesh files.
</description>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@
</author>

<description>
Monochromatic surface waves T=8s, H=4m.
Regular surface waves T=8s, H=4m.

This model uses the materials from the `waves`
model to prevent duplicating the large mesh files.
</description>
Expand Down
Loading