Skip to content
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
4 changes: 2 additions & 2 deletions backwall/backwall_asset.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
<compiler inertiafromgeom="auto" inertiagrouprange="4 4" angle="radian"/>

<asset>
<texture name="T_wall_marble" type="cube" height="1" width="1" file="../furniture_sim/common/textures/stone0.png"/>
<texture name="T_wall_metal" type="cube" height="1" width="1" file="../furniture_sim/common/textures/metal0.png"/>
<texture name="T_wall_marble" type="cube" height="1" width="1" file="../common/textures/stone0.png"/>
<texture name="T_wall_metal" type="cube" height="1" width="1" file="../common/textures/metal0.png"/>

<material name="wall_white" rgba="1 1 1 1" reflectance="0" shininess="0"/>
<material name="wall_blue" rgba=".66 .7 .8 1" reflectance="0" shininess="0"/>
Expand Down
8 changes: 4 additions & 4 deletions bin.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,17 @@
====================================================== -©vk©-->

<compiler angle="radian" meshdir="" texturedir=""/>
<include file="../furniture_sim/bin/bin_asset.xml"/>
<include file="bin/bin_asset.xml"/>

<worldbody>
<body>
<include file="../furniture_sim/bin/bin_body.xml" />
<include file="bin/bin_body.xml" />
</body>
<body pos=".5 0 0">
<include file="../furniture_sim/bin/busbin1_body.xml" />
<include file="bin/busbin1_body.xml" />
</body>
<body pos="-.5 0 0">
<include file="../furniture_sim/bin/busbin2_body.xml" />
<include file="bin/busbin2_body.xml" />
</body>
</worldbody>

Expand Down
6 changes: 3 additions & 3 deletions bin/bin_asset.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
License :: Under Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
====================================================== -©vk©-->
<asset>
<mesh name="bin" file="../furniture_sim/bin/meshes/bin.stl" scale="0.01 0.01 0.01" />
<mesh name="busbin" file="../furniture_sim/bin/meshes/busbin.stl"/>
<texture name="T_Metal_bin" type="cube" height="1" width="1" file="../furniture_sim/common/textures/metal0.png" />
<mesh name="bin" file="../bin/meshes/bin.stl" scale="0.01 0.01 0.01" />
<mesh name="busbin" file="../bin/meshes/busbin.stl"/>
<texture name="T_Metal_bin" type="cube" height="1" width="1" file="../common/textures/metal0.png" />
<material name="M_Metal_bin" texture="T_Metal_bin" texrepeat="3 3" reflectance="0.7" texuniform="false" />
</asset>

Expand Down
4 changes: 2 additions & 2 deletions boxcabinet.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
License :: Under Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
====================================================== -©vk©-->
<compiler angle="radian"/>
<include file="../furniture_sim/boxcabinet/boxcabinet_assets.xml"/>
<include file="boxcabinet/boxcabinet_assets.xml"/>

<worldbody>

<body pos="0 0 .25">
<include file="../furniture_sim/boxcabinet/boxcabinet_body.xml"/>
<include file="boxcabinet/boxcabinet_body.xml"/>
</body>

</worldbody>
Expand Down
4 changes: 2 additions & 2 deletions boxcabinet/boxcabinet_assets.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<compiler inertiafromgeom="auto" inertiagrouprange="4 4" angle="radian"/>

<asset>
<texture name="T_hinge_wood" type="cube" height="1" width="1" file="../furniture_sim/common/textures/wood1.png"/>
<texture name="T_hinge_metal" type="cube" height="1" width="1" file="../furniture_sim/common/textures/metal0.png"/>
<texture name="T_hinge_wood" type="cube" height="1" width="1" file="../common/textures/wood1.png"/>
<texture name="T_hinge_metal" type="cube" height="1" width="1" file="../common/textures/metal0.png"/>

<material name="M_hinge_wood" texture="T_hinge_wood" texrepeat="3 3" reflectance="0.7" shininess=".4" texuniform="false"/>
<material name="M_hinge_metal" texture="T_hinge_metal" texrepeat="3 3" reflectance="0.7" shininess=".4" texuniform="false"/>
Expand Down
6 changes: 3 additions & 3 deletions counters.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,13 +7,13 @@
License :: Under Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
====================================================== -©vk©-->
<compiler angle="radian" meshdir="" texturedir=""/>
<include file="../furniture_sim/counters/counters_asset.xml"/>
<include file="counters/counters_asset.xml"/>

<worldbody>

<body>
<include file="../furniture_sim/counters/sink_counter_body.xml"/>
<include file="../furniture_sim/counters/box_counter_body.xml"/>
<include file="counters/sink_counter_body.xml"/>
<include file="counters/box_counter_body.xml"/>
</body>

</worldbody>
Expand Down
16 changes: 8 additions & 8 deletions counters/counters_asset.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,15 +9,15 @@
<compiler inertiafromgeom="auto" inertiagrouprange="4 4" angle="radian"/>

<asset>
<mesh file="../furniture_sim/counters/meshes/cabinetdrawer.stl" name="cabinetdrawer"/>
<mesh file="../furniture_sim/counters/meshes/cabinethandle.stl" name="cabinethandle"/>
<mesh file="../furniture_sim/counters/meshes/cabinetbase.stl" name="cabinetbase"/>
<mesh file="../furniture_sim/counters/meshes/countertop.stl" name="countertop"/>
<mesh file="../furniture_sim/counters/meshes/faucet.stl" name="faucet"/>
<mesh file="../counters/meshes/cabinetdrawer.stl" name="cabinetdrawer"/>
<mesh file="../counters/meshes/cabinethandle.stl" name="cabinethandle"/>
<mesh file="../counters/meshes/cabinetbase.stl" name="cabinetbase"/>
<mesh file="../counters/meshes/countertop.stl" name="countertop"/>
<mesh file="../counters/meshes/faucet.stl" name="faucet"/>

<texture name="T_counter_metal" type="cube" height="1" width="1" file="../furniture_sim/common/textures/metal0.png" />
<texture name="T_counter_marble" type="cube" height="1" width="1" file="../furniture_sim/common/textures/stone2.png" />
<texture name="T_counter_wood" type="cube" height="2" width="2" file="../furniture_sim/common/textures/wood1.png"/>
<texture name="T_counter_metal" type="cube" height="1" width="1" file="../common/textures/metal0.png" />
<texture name="T_counter_marble" type="cube" height="1" width="1" file="../common/textures/stone2.png" />
<texture name="T_counter_wood" type="cube" height="2" width="2" file="../common/textures/wood1.png"/>

<material name="counter_metal" rgba="1 1 1 1" texture="T_counter_metal" texrepeat="3 3" reflectance=".5" shininess="1" texuniform="false" />
<material name="counter_marble" texture="T_counter_marble" texrepeat="1 1" reflectance=".2" shininess="1" texuniform="false" />
Expand Down
4 changes: 2 additions & 2 deletions dishwasher.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@
License :: Under Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
====================================================== -©vk©-->
<compiler angle="radian" meshdir="" texturedir=""/>
<include file="../furniture_sim/dishwasher/dishwasher_asset.xml"/>
<include file="dishwasher/dishwasher_asset.xml"/>

<worldbody>
<body>
<include file="../furniture_sim/dishwasher/dishwasher_body.xml"/>
<include file="dishwasher/dishwasher_body.xml"/>
</body>
</worldbody>

Expand Down
8 changes: 4 additions & 4 deletions dishwasher/dishwasher_asset.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@
License :: Under Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
====================================================== -©vk©-->
<asset>
<mesh name="ktc_dishwasher" file="../furniture_sim/dishwasher/meshes/ktc_dishwasher.stl" />
<mesh name="ktc_dishwasher_rack" file="../furniture_sim/dishwasher/meshes/ktc_dishwasher_rack.stl" />
<mesh name="ktc_dishwasher_door" file="../furniture_sim/dishwasher/meshes/ktc_dishwasher_door.stl" />
<texture name="T_Metal_bin" type="cube" height="1" width="1" file="../furniture_sim/common/textures/metal0.png" />
<mesh name="ktc_dishwasher" file="../dishwasher/meshes/ktc_dishwasher.stl" />
<mesh name="ktc_dishwasher_rack" file="../dishwasher/meshes/ktc_dishwasher_rack.stl" />
<mesh name="ktc_dishwasher_door" file="../dishwasher/meshes/ktc_dishwasher_door.stl" />
<texture name="T_Metal_bin" type="cube" height="1" width="1" file="../common/textures/metal0.png" />
<material name="M_Metal_bin" texture="T_Metal_bin" texrepeat="3 3" reflectance="0.7" texuniform="false" />
</asset>

Expand Down
4 changes: 2 additions & 2 deletions hingecabinet.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
License :: Under Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
====================================================== -©vk©-->
<compiler angle="radian"/>
<include file="../furniture_sim/hingecabinet/hingecabinet_asset.xml"/>
<include file="hingecabinet/hingecabinet_asset.xml"/>

<worldbody>

<body pos="0 0 .25">
<include file="../furniture_sim/hingecabinet/hingecabinet_body.xml"/>
<include file="hingecabinet/hingecabinet_body.xml"/>
</body>

</worldbody>
Expand Down
4 changes: 2 additions & 2 deletions hingecabinet/hingecabinet_asset.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<compiler inertiafromgeom="auto" inertiagrouprange="4 4" angle="radian"/>

<asset>
<texture name="T_hinge_wood" type="cube" height="1" width="1" file="../furniture_sim/common/textures/wood1.png"/>
<texture name="T_hinge_metal" type="cube" height="1" width="1" file="../furniture_sim/common/textures/metal0.png"/>
<texture name="T_hinge_wood" type="cube" height="1" width="1" file="../common/textures/wood1.png"/>
<texture name="T_hinge_metal" type="cube" height="1" width="1" file="../common/textures/metal0.png"/>

<material name="M_hinge_wood" texture="T_hinge_wood" texrepeat="3 3" reflectance="0.7" shininess=".4" texuniform="false"/>
<material name="M_hinge_metal" texture="T_hinge_metal" texrepeat="3 3" reflectance="0.7" shininess=".4" texuniform="false"/>
Expand Down
18 changes: 9 additions & 9 deletions kettle.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,48 +7,48 @@
License :: Under Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
====================================================== -©vk©-->
<compiler angle="radian" meshdir="" texturedir=""/>
<include file="../furniture_sim/kettle/kettle_asset.xml"/>
<include file="kettle/kettle_asset.xml"/>

<worldbody>

<body pos="0 0 0">
<freejoint/>
<include file="../furniture_sim/kettle/kettle_body0.xml"/>
<include file="kettle/kettle_body0.xml"/>
</body>

<body pos=".4 0 0">
<freejoint/>
<include file="../furniture_sim/kettle/kettle_body1.xml"/>
<include file="kettle/kettle_body1.xml"/>
</body>

<body pos="-.4 0 0">
<freejoint/>
<include file="../furniture_sim/kettle/kettle_body2.xml"/>
<include file="kettle/kettle_body2.xml"/>
</body>

<body pos="-.8 0 0">
<freejoint/>
<include file="../furniture_sim/kettle/kettle_body3.xml"/>
<include file="kettle/kettle_body3.xml"/>
</body>

<body pos="-.8 1 0">
<freejoint/>
<include file="../furniture_sim/kettle/kettle_body4.xml"/>
<include file="kettle/kettle_body4.xml"/>
</body>

<body pos="-.4 1 0">
<freejoint/>
<include file="../furniture_sim/kettle/kettle_body5.xml"/>
<include file="kettle/kettle_body5.xml"/>
</body>

<body pos="0 1 0">
<freejoint/>
<include file="../furniture_sim/kettle/kettle_body6.xml"/>
<include file="kettle/kettle_body6.xml"/>
</body>

<body pos="0.4 1 0">
<freejoint/>
<include file="../furniture_sim/kettle/kettle_body7.xml"/>
<include file="kettle/kettle_body7.xml"/>
</body>


Expand Down
8 changes: 4 additions & 4 deletions kettle/kettle_asset.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
<compiler inertiafromgeom="auto" inertiagrouprange="4 4" angle="radian"/>

<asset>
<mesh file="../furniture_sim/kettle/meshes/kettle.stl" name="kettle"/>
<mesh file="../furniture_sim/kettle/meshes/kettlehandle.stl" name="kettlehandle"/>
<mesh file="../kettle/meshes/kettle.stl" name="kettle"/>
<mesh file="../kettle/meshes/kettlehandle.stl" name="kettlehandle"/>

<texture name="T_kettle_metal" type="cube" height="1" width="1" file="../furniture_sim/common/textures/metal0.png" />
<texture name="T_kettle_wood" type="cube" height="1" width="1" file="../furniture_sim/common/textures/wood1.png" />
<texture name="T_kettle_metal" type="cube" height="1" width="1" file="../common/textures/metal0.png" />
<texture name="T_kettle_wood" type="cube" height="1" width="1" file="../common/textures/wood1.png" />

<material name="kettle_wood" rgba="1 1 1 1" texture="T_kettle_wood" texrepeat="3 3" reflectance="1" shininess="1" texuniform="false" />
<material name="kettle_metal" rgba="1 1 1 1" texture="T_kettle_metal" texrepeat="3 3" reflectance="1" shininess="1" texuniform="false" />
Expand Down
30 changes: 15 additions & 15 deletions kitchen/kitchen1.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,40 +10,40 @@
<visual>
<headlight diffuse=".9 .9 .9"/>
</visual>
<include file="../../furniture_sim/oven/oven_asset.xml"/>
<include file="../../furniture_sim/counters/counters_asset.xml"/>
<include file="../../furniture_sim/backwall/backwall_asset.xml"/>
<include file="../../furniture_sim/slidecabinet/slidecabinet_asset.xml"/>
<include file="../../furniture_sim/hingecabinet/hingecabinet_asset.xml"/>
<include file="../../furniture_sim/microwave/microwave_asset.xml"/>
<include file="../../furniture_sim/kettle/kettle_asset.xml"/>
<include file="../oven/oven_asset.xml"/>
<include file="../counters/counters_asset.xml"/>
<include file="../backwall/backwall_asset.xml"/>
<include file="../slidecabinet/slidecabinet_asset.xml"/>
<include file="../hingecabinet/hingecabinet_asset.xml"/>
<include file="../microwave/microwave_asset.xml"/>
<include file="../kettle/kettle_asset.xml"/>
<worldbody>
<body name="kitchen" pos="0 0 0">
<body name="sink" pos="0 0 0">
<include file="../../furniture_sim/counters/sink_counter_body.xml"/>
<include file="../counters/sink_counter_body.xml"/>
</body>
<body name="island" pos="0 0 0">
<include file="../../furniture_sim/counters/box_counter_body.xml"/>
<include file="../counters/box_counter_body.xml"/>
</body>
<body name="oven" pos="0 0 0">
<include file="../../furniture_sim/oven/oven_body.xml"/>
<include file="../oven/oven_body.xml"/>
</body>
<body name="backwall" pos="0 0 0">
<include file="../../furniture_sim/backwall/backwall_body.xml"/>
<include file="../backwall/backwall_body.xml"/>
</body>
<body name="slidecabinet" pos="0.4 0.3 2.6" >
<include file="../../furniture_sim/slidecabinet/slidecabinet_body.xml"/>
<include file="../slidecabinet/slidecabinet_body.xml"/>
</body>
<body name="hingecabinet" pos="-0.504 0.3 2.6" >
<include file="../../furniture_sim/hingecabinet/hingecabinet_body.xml"/>
<include file="../hingecabinet/hingecabinet_body.xml"/>
</body>
<body name="microwave" pos="-0.750 -0.025 1.6" euler="0 0 0.3">
<include file="../../furniture_sim/microwave/microwave_body0.xml"/>
<include file="../microwave/microwave_body0.xml"/>
</body>
</body>
<body name="kettle" pos="-0.169 -0.4 1.626">
<freejoint/>
<include file="../../furniture_sim/kettle/kettle_body0.xml"/>
<include file="../kettle/kettle_body0.xml"/>
</body>
</worldbody>

Expand Down
Loading
Loading