-
Notifications
You must be signed in to change notification settings - Fork 2.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1935 from erwincoumans/master
fix fileIO issue with \r\n in lines
- Loading branch information
Showing
26 changed files
with
1,059 additions
and
75 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| <sdf version='1.6'> | ||
| <world name='default'> | ||
| <gravity>0 0 -9.8</gravity> | ||
| <model name='part0.obj'> | ||
| <static>1</static> | ||
| <pose frame=''>0 0 0 0 0 0</pose> | ||
| <link name='link_d0'> | ||
| <inertial> | ||
| <mass>0</mass> | ||
| <inertia> | ||
| <ixx>0.166667</ixx> | ||
| <ixy>0</ixy> | ||
| <ixz>0</ixz> | ||
| <iyy>0.166667</iyy> | ||
| <iyz>0</iyz> | ||
| <izz>0.166667</izz> | ||
| </inertia> | ||
| </inertial> | ||
| <collision name='collision_0'> | ||
| <geometry> | ||
| <mesh> | ||
| <scale>1 1 1</scale> | ||
| <uri>part0.obj</uri> | ||
| </mesh> | ||
| </geometry> | ||
| </collision> | ||
| <visual name='visual'> | ||
| <geometry> | ||
| <mesh> | ||
| <scale>1 1 1</scale> | ||
| <uri>part0.obj</uri> | ||
| </mesh> | ||
| </geometry> | ||
| <material> | ||
| <ambient>1 0 0 1</ambient> | ||
| <diffuse>0.000000 0.640000 0.000000 1.000000</diffuse> | ||
| <specular>0.1 0.1 0.1 1</specular> | ||
| <emissive>0 0 0 0</emissive> | ||
| </material> | ||
| </visual> | ||
| </link> | ||
| </model> | ||
| <model name='part1.obj'> | ||
| <static>1</static> | ||
| <pose frame=''>0 0 0 0 0 0</pose> | ||
| <link name='link_d1'> | ||
| <inertial> | ||
| <mass>0</mass> | ||
| <inertia> | ||
| <ixx>0.166667</ixx> | ||
| <ixy>0</ixy> | ||
| <ixz>0</ixz> | ||
| <iyy>0.166667</iyy> | ||
| <iyz>0</iyz> | ||
| <izz>0.166667</izz> | ||
| </inertia> | ||
| </inertial> | ||
| <collision name='collision_1'> | ||
| <geometry> | ||
| <mesh> | ||
| <scale>1 1 1</scale> | ||
| <uri>part1.obj</uri> | ||
| </mesh> | ||
| </geometry> | ||
| </collision> | ||
| <visual name='visual'> | ||
| <geometry> | ||
| <mesh> | ||
| <scale>1 1 1</scale> | ||
| <uri>part1.obj</uri> | ||
| </mesh> | ||
| </geometry> | ||
| <material> | ||
| <ambient>1 0 0 1</ambient> | ||
| <diffuse>0.000000 0.000000 0.640000 1.000000</diffuse> | ||
| <specular>0.1 0.1 0.1 1</specular> | ||
| <emissive>0 0 0 0</emissive> | ||
| </material> | ||
| </visual> | ||
| </link> | ||
| </model> | ||
| <model name='part2.obj'> | ||
| <static>1</static> | ||
| <pose frame=''>0 0 0 0 0 0</pose> | ||
| <link name='link_d2'> | ||
| <inertial> | ||
| <mass>0</mass> | ||
| <inertia> | ||
| <ixx>0.166667</ixx> | ||
| <ixy>0</ixy> | ||
| <ixz>0</ixz> | ||
| <iyy>0.166667</iyy> | ||
| <iyz>0</iyz> | ||
| <izz>0.166667</izz> | ||
| </inertia> | ||
| </inertial> | ||
| <collision name='collision_2'> | ||
| <geometry> | ||
| <mesh> | ||
| <scale>1 1 1</scale> | ||
| <uri>part2.obj</uri> | ||
| </mesh> | ||
| </geometry> | ||
| </collision> | ||
| <visual name='visual'> | ||
| <geometry> | ||
| <mesh> | ||
| <scale>1 1 1</scale> | ||
| <uri>part2.obj</uri> | ||
| </mesh> | ||
| </geometry> | ||
| <material> | ||
| <ambient>1 0 0 1</ambient> | ||
| <diffuse>0.640000 0.000000 0.000000 1.000000</diffuse> | ||
| <specular>0.1 0.1 0.1 1</specular> | ||
| <emissive>0 0 0 0</emissive> | ||
| </material> | ||
| </visual> | ||
| </link> | ||
| </model> | ||
| </world> | ||
| </sdf> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| # Exported using automatic converter by Erwin Coumans | ||
| mtllib three_cubes.mtl | ||
| #object Cube.001 | ||
|
|
||
| v -4.474365 4.513344 -0.488734 | ||
| v -4.474365 2.513344 -0.488735 | ||
| v -4.474365 2.513344 1.511265 | ||
| v -2.474365 4.513344 -0.488734 | ||
| v -2.474365 2.513344 -0.488735 | ||
| v -4.474365 2.513344 -0.488735 | ||
| v -2.474365 4.513343 1.511266 | ||
| v -2.474365 2.513344 1.511265 | ||
| v -2.474365 2.513344 -0.488735 | ||
| v -4.474365 4.513343 1.511266 | ||
| v -4.474365 2.513344 1.511265 | ||
| v -2.474365 2.513344 1.511265 | ||
| v -4.474365 2.513344 -0.488735 | ||
| v -2.474365 4.513343 1.511266 | ||
| v -2.474365 4.513344 -0.488734 | ||
| v -4.474365 4.513343 1.511266 | ||
| v -4.474365 4.513344 -0.488734 | ||
| v -2.474365 4.513344 -0.488734 | ||
| v -2.474365 4.513343 1.511266 | ||
| v -4.474365 2.513344 1.511265 | ||
| usemtl Material.001 | ||
|
|
||
|
|
||
| vt 1.000000 0.000000 | ||
| vt 1.000000 1.000000 | ||
| vt 0.000000 1.000000 | ||
| vt 1.000000 0.000000 | ||
| vt 1.000000 1.000000 | ||
| vt 0.000000 1.000000 | ||
| vt 1.000000 0.000000 | ||
| vt 1.000000 1.000000 | ||
| vt 0.000000 1.000000 | ||
| vt 1.000000 0.000000 | ||
| vt 1.000000 1.000000 | ||
| vt 0.000000 1.000000 | ||
| vt 1.000000 0.000000 | ||
| vt 1.000000 1.000000 | ||
| vt 0.000000 1.000000 | ||
| vt 0.000000 0.000000 | ||
| vt 0.000000 0.000000 | ||
| vt 0.000000 0.000000 | ||
| vt 0.000000 0.000000 | ||
| vt 0.000000 0.000000 | ||
| s off | ||
| f 1/1/1 2/2/2 3/3/3 | ||
| f 4/4/4 5/5/5 6/6/6 | ||
| f 7/7/7 8/8/8 9/9/9 | ||
| f 10/10/10 11/11/11 12/12/12 | ||
| f 13/13/13 5/5/5 12/12/12 | ||
| f 10/10/10 14/14/14 15/15/15 | ||
| f 16/16/16 1/1/1 3/3/3 | ||
| f 17/17/17 4/4/4 6/6/6 | ||
| f 18/18/18 7/7/7 9/9/9 | ||
| f 19/19/19 10/10/10 12/12/12 | ||
| f 20/20/20 13/13/13 12/12/12 | ||
| f 17/17/17 10/10/10 15/15/15 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| # Exported using automatic converter by Erwin Coumans | ||
| mtllib three_cubes.mtl | ||
| #object Cube.002 | ||
|
|
||
| v -4.474365 4.513344 -3.663786 | ||
| v -4.474365 2.513345 -3.663786 | ||
| v -4.474365 2.513344 -1.663787 | ||
| v -2.474365 4.513344 -3.663786 | ||
| v -2.474365 2.513345 -3.663786 | ||
| v -4.474365 2.513345 -3.663786 | ||
| v -2.474365 4.513344 -1.663786 | ||
| v -2.474365 2.513344 -1.663787 | ||
| v -2.474365 2.513345 -3.663786 | ||
| v -4.474365 4.513344 -1.663786 | ||
| v -4.474365 2.513344 -1.663787 | ||
| v -2.474365 2.513344 -1.663787 | ||
| v -4.474365 2.513345 -3.663786 | ||
| v -2.474365 4.513344 -1.663786 | ||
| v -2.474365 4.513344 -3.663786 | ||
| v -4.474365 4.513344 -1.663786 | ||
| v -4.474365 4.513344 -3.663786 | ||
| v -2.474365 4.513344 -3.663786 | ||
| v -2.474365 4.513344 -1.663786 | ||
| v -4.474365 2.513344 -1.663787 | ||
| usemtl Material.002 | ||
|
|
||
|
|
||
| vt 1.000000 0.000000 | ||
| vt 1.000000 1.000000 | ||
| vt 0.000000 1.000000 | ||
| vt 1.000000 0.000000 | ||
| vt 1.000000 1.000000 | ||
| vt 0.000000 1.000000 | ||
| vt 1.000000 0.000000 | ||
| vt 1.000000 1.000000 | ||
| vt 0.000000 1.000000 | ||
| vt 1.000000 0.000000 | ||
| vt 1.000000 1.000000 | ||
| vt 0.000000 1.000000 | ||
| vt 1.000000 0.000000 | ||
| vt 1.000000 1.000000 | ||
| vt 0.000000 1.000000 | ||
| vt 0.000000 0.000000 | ||
| vt 0.000000 0.000000 | ||
| vt 0.000000 0.000000 | ||
| vt 0.000000 0.000000 | ||
| vt 0.000000 0.000000 | ||
| s off | ||
| f 1/1/1 2/2/2 3/3/3 | ||
| f 4/4/4 5/5/5 6/6/6 | ||
| f 7/7/7 8/8/8 9/9/9 | ||
| f 10/10/10 11/11/11 12/12/12 | ||
| f 13/13/13 5/5/5 12/12/12 | ||
| f 10/10/10 14/14/14 15/15/15 | ||
| f 16/16/16 1/1/1 3/3/3 | ||
| f 17/17/17 4/4/4 6/6/6 | ||
| f 18/18/18 7/7/7 9/9/9 | ||
| f 19/19/19 10/10/10 12/12/12 | ||
| f 20/20/20 13/13/13 12/12/12 | ||
| f 17/17/17 10/10/10 15/15/15 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| # Exported using automatic converter by Erwin Coumans | ||
| mtllib three_cubes.mtl | ||
| #object Cube | ||
|
|
||
| v -4.474365 4.513343 2.535691 | ||
| v -4.474365 2.513344 2.535691 | ||
| v -4.474365 2.513343 4.535690 | ||
| v -2.474365 4.513343 2.535691 | ||
| v -2.474365 2.513344 2.535691 | ||
| v -4.474365 2.513344 2.535691 | ||
| v -2.474365 4.513343 4.535691 | ||
| v -2.474365 2.513343 4.535690 | ||
| v -2.474365 2.513344 2.535691 | ||
| v -4.474365 4.513343 4.535691 | ||
| v -4.474365 2.513343 4.535690 | ||
| v -2.474365 2.513343 4.535690 | ||
| v -4.474365 2.513344 2.535691 | ||
| v -2.474365 4.513343 4.535691 | ||
| v -2.474365 4.513343 2.535691 | ||
| v -4.474365 4.513343 4.535691 | ||
| v -4.474365 4.513343 2.535691 | ||
| v -2.474365 4.513343 2.535691 | ||
| v -2.474365 4.513343 4.535691 | ||
| v -4.474365 2.513343 4.535690 | ||
| usemtl Material | ||
|
|
||
|
|
||
| vt 1.000000 0.000000 | ||
| vt 1.000000 1.000000 | ||
| vt 0.000000 1.000000 | ||
| vt 1.000000 0.000000 | ||
| vt 1.000000 1.000000 | ||
| vt 0.000000 1.000000 | ||
| vt 1.000000 0.000000 | ||
| vt 1.000000 1.000000 | ||
| vt 0.000000 1.000000 | ||
| vt 1.000000 0.000000 | ||
| vt 1.000000 1.000000 | ||
| vt 0.000000 1.000000 | ||
| vt 1.000000 0.000000 | ||
| vt 1.000000 1.000000 | ||
| vt 0.000000 1.000000 | ||
| vt 0.000000 0.000000 | ||
| vt 0.000000 0.000000 | ||
| vt 0.000000 0.000000 | ||
| vt 0.000000 0.000000 | ||
| vt 0.000000 0.000000 | ||
| s off | ||
| f 1/1/1 2/2/2 3/3/3 | ||
| f 4/4/4 5/5/5 6/6/6 | ||
| f 7/7/7 8/8/8 9/9/9 | ||
| f 10/10/10 11/11/11 12/12/12 | ||
| f 13/13/13 5/5/5 12/12/12 | ||
| f 10/10/10 14/14/14 15/15/15 | ||
| f 16/16/16 1/1/1 3/3/3 | ||
| f 17/17/17 4/4/4 6/6/6 | ||
| f 18/18/18 7/7/7 9/9/9 | ||
| f 19/19/19 10/10/10 12/12/12 | ||
| f 20/20/20 13/13/13 12/12/12 | ||
| f 17/17/17 10/10/10 15/15/15 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,31 @@ | ||
| # Blender MTL File: 'None' | ||
| # Material Count: 3 | ||
|
|
||
| newmtl Material | ||
| Ns 92.156863 | ||
| Ka 0.000000 0.000000 0.000000 | ||
| Kd 0.640000 0.000000 0.000000 | ||
| Ks 0.500000 0.500000 0.500000 | ||
| Ni 1.000000 | ||
| d 1.000000 | ||
| illum 2 | ||
|
|
||
|
|
||
| newmtl Material.001 | ||
| Ns 92.156863 | ||
| Ka 0.000000 0.000000 0.000000 | ||
| Kd 0.000000 0.640000 0.000000 | ||
| Ks 0.500000 0.500000 0.500000 | ||
| Ni 1.000000 | ||
| d 1.000000 | ||
| illum 2 | ||
|
|
||
| newmtl Material.002 | ||
| Ns 92.156863 | ||
| Ka 0.000000 0.000000 0.000000 | ||
| Kd 0.000000 0.000000 0.640000 | ||
| Ks 0.500000 0.500000 0.500000 | ||
| Ni 1.000000 | ||
| d 1.000000 | ||
| illum 2 | ||
|
|
Oops, something went wrong.