Merged in scale_houses (pull request #300)

Scale houses to reasonable size

Approved-by: Nathan Koenig <natekoenig@gmail.com>
This commit is contained in:
Louise Poubel 2017-10-19 18:39:37 +00:00
commit 81571626e0
3 changed files with 12 additions and 3 deletions

View File

@ -7,6 +7,7 @@
<geometry>
<mesh>
<uri>model://house_1/meshes/house_1.dae</uri>
<scale>1.5 1.5 1.5</scale>
</mesh>
</geometry>
</collision>
@ -14,6 +15,7 @@
<geometry>
<mesh>
<uri>model://house_1/meshes/house_1.dae</uri>
<scale>1.5 1.5 1.5</scale>
</mesh>
</geometry>
<material>
@ -22,9 +24,10 @@
<uri>model://house_1/materials/textures</uri>
<name>House_1/Diffuse</name>
</script>
<!-- Re-enable when normal maps work again
<shader type="normal_map_object_space">
<normal_map>House_1_Normal.png</normal_map>
</shader>
</shader-->
</material>
</visual>
</link>

View File

@ -7,6 +7,7 @@
<geometry>
<mesh>
<uri>model://house_2/meshes/house_2.dae</uri>
<scale>1.5 1.5 1.5</scale>
</mesh>
</geometry>
</collision>
@ -14,6 +15,7 @@
<geometry>
<mesh>
<uri>model://house_2/meshes/house_2.dae</uri>
<scale>1.5 1.5 1.5</scale>
</mesh>
</geometry>
<material>
@ -23,9 +25,10 @@
<uri>model://house_1/materials/textures</uri>
<name>House_2/Diffuse</name>
</script>
<!-- Re-enable when normal maps work again
<shader type="normal_map_object_space">
<normal_map>model://house_1/materials/textures/House_1_Normal.png</normal_map>
</shader>
</shader-->
</material>
</visual>
</link>

View File

@ -7,6 +7,7 @@
<geometry>
<mesh>
<uri>model://house_3/meshes/house_3.dae</uri>
<scale>1.5 1.5 1.5</scale>
</mesh>
</geometry>
</collision>
@ -14,6 +15,7 @@
<geometry>
<mesh>
<uri>model://house_3/meshes/house_3.dae</uri>
<scale>1.5 1.5 1.5</scale>
</mesh>
</geometry>
<material>
@ -23,9 +25,10 @@
<uri>model://house_1/materials/textures</uri>
<name>House_3/Diffuse</name>
</script>
<!-- Re-enable when normal maps work again
<shader type="normal_map_object_space">
<normal_map>model://house_1/materials/textures/House_1_Normal.png</normal_map>
</shader>
</shader-->
</material>
</visual>
</link>