Skip to content

Commit a686c9d

Browse files
aseth1aseth1
committed
Revert model file format back to 20303 to keep older versions around for future conversion test coverage.
1 parent 256ed4e commit a686c9d

File tree

2 files changed

+39
-51
lines changed

2 files changed

+39
-51
lines changed

‎Models/BouncingBlock/bouncing_block.osim

Lines changed: 19 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
2-
<OpenSimDocument Version="30000">
2+
<OpenSimDocument Version="20303">
33
<Model name="toy_with_forces">
4-
<credits>Author: Matt DeMers License: Creative Commons (CCBY 3.0). You are free to distribute, remix, tweak, and build upon this work, even commercially, as long as you credit us for the original creation. http://creativecommons.org/licenses/by/3.0/</credits>
4+
<credits>
5+
Author: Matt DeMers
6+
License:
7+
Creative Commons (CCBY 3.0). You are free to distribute, remix, tweak, and build upon this work, even commercially,
8+
as long as you credit us for the original creation.
9+
http://creativecommons.org/licenses/by/3.0/
10+
</credits>
511
<publications>Unassigned</publications>
612
<length_units>m</length_units>
713
<force_units>N</force_units>
@@ -432,32 +438,20 @@
432438
<ConstraintSet>
433439
<objects>
434440
<PointOnLineConstraint name="lock_block_to_y_axis">
435-
<!--Flag indicating whether the constraint is disabled or not. Disabled means that the constraint is not active in subsequent dynamics realization-->
436441
<isDisabled>false</isDisabled>
437-
<!--Specify the body on which the line is defined-->
438442
<line_body>ground</line_body>
439-
<!--Direction of the line in line body specified in the line body frame.-->
440-
<line_direction_vec>0 1 0</line_direction_vec>
441-
<!--Specify the default point on the line in the line body frame.-->
442-
<point_on_line>0 0 0</point_on_line>
443-
<!--Specify the follower body constrained to the line.-->
443+
<line_direction_vec> 0 1 0</line_direction_vec>
444+
<point_on_line> 0 0 0</point_on_line>
444445
<follower_body>block</follower_body>
445-
<!--Specify the point on the follower bocy constrained to the line in the follower body reference frame.-->
446-
<point_on_follower>0 0 0</point_on_follower>
446+
<point_on_follower> 0 0 0</point_on_follower>
447447
</PointOnLineConstraint>
448448
<PointOnLineConstraint name="lock_foot_to_y_axis">
449-
<!--Flag indicating whether the constraint is disabled or not. Disabled means that the constraint is not active in subsequent dynamics realization-->
450449
<isDisabled>false</isDisabled>
451-
<!--Specify the body on which the line is defined-->
452450
<line_body>ground</line_body>
453-
<!--Direction of the line in line body specified in the line body frame.-->
454-
<line_direction_vec>0 1 0</line_direction_vec>
455-
<!--Specify the default point on the line in the line body frame.-->
456-
<point_on_line>0 0 0</point_on_line>
457-
<!--Specify the follower body constrained to the line.-->
451+
<line_direction_vec> 0 1 0</line_direction_vec>
452+
<point_on_line> 0 0 0</point_on_line>
458453
<follower_body>link2</follower_body>
459-
<!--Specify the point on the follower bocy constrained to the line in the follower body reference frame.-->
460-
<point_on_follower>0 0 0</point_on_follower>
454+
<point_on_follower> 0 0 0</point_on_follower>
461455
</PointOnLineConstraint>
462456
</objects>
463457
<groups />
@@ -497,7 +491,7 @@
497491
<point1>0 0 0</point1>
498492
<!--Force application point on body2.-->
499493
<point2>0 0 0</point2>
500-
<!--Spring stiffness (N/m).-->
494+
<!--Spring stiffness.-->
501495
<stiffness>2000</stiffness>
502496
<!--Spring resting length.-->
503497
<rest_length>0.8</rest_length>
@@ -535,13 +529,13 @@
535529
<location_body_2>0 0.5 0</location_body_2>
536530
<!--Orientation of bushing frame in body 2 as x-y-z, body fixed Euler rotations.-->
537531
<orientation_body_2>0 0 0</orientation_body_2>
538-
<!--Stiffness parameters resisting relative rotation (Nm/rad).-->
532+
<!--Stiffness parameters resisting relative rotation.-->
539533
<rotational_stiffness>10 10 10</rotational_stiffness>
540-
<!--Stiffness parameters resisting relative translation (N/m).-->
534+
<!--Stiffness parameters resisting relative translation.-->
541535
<translational_stiffness>0 0 0</translational_stiffness>
542-
<!--Damping parameters resisting relative angular velocity. (Nm/(rad/s))-->
536+
<!--Damping parameters resisting relative angular velocity.-->
543537
<rotational_damping>0.1 0.1 0.1</rotational_damping>
544-
<!--Damping parameters resisting relative translational velocity. (N/(m/s)-->
538+
<!--Damping parameters resisting relative translational velocity.-->
545539
<translational_damping>0 0 0</translational_damping>
546540
</BushingForce>
547541
</objects>

‎Models/BouncingBlock/bouncing_block_weak_spring.osim

Lines changed: 20 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
2-
<OpenSimDocument Version="30000">
2+
<OpenSimDocument Version="20303">
33
<Model name="toy_with_forces">
4-
<credits>Author: Matt DeMers License: Creative Commons (CCBY 3.0). You are free to distribute, remix, tweak, and build upon this work, even commercially, as long as you credit us for the original creation. http://creativecommons.org/licenses/by/3.0/</credits>
4+
<credits>
5+
Author: Matt DeMers
6+
License:
7+
Creative Commons (CCBY 3.0). You are free to distribute, remix, tweak, and build upon this work, even commercially,
8+
as long as you credit us for the original creation.
9+
http://creativecommons.org/licenses/by/3.0/
10+
</credits>
511
<publications>Unassigned</publications>
612
<length_units>m</length_units>
713
<force_units>N</force_units>
@@ -297,7 +303,7 @@
297303
<!--Name of texture file .jpg, .bmp-->
298304
<texture_file />
299305
<!--in body transform specified as 3 rotations (rad) followed by 3 translations rX rY rZ tx ty tz-->
300-
<transform> -0 0 -0 0 0.25 0</transform>
306+
<transform> 0 0 0 0 0.25 0</transform>
301307
<!--Three scale factors for display purposes: scaleX scaleY scaleZ-->
302308
<scale_factors> 0.6 5 0.6</scale_factors>
303309
<!--Display Pref. 0:Hide 1:Wire 3:Flat 4:Shaded-->
@@ -432,32 +438,20 @@
432438
<ConstraintSet>
433439
<objects>
434440
<PointOnLineConstraint name="lock_block_to_y_axis">
435-
<!--Flag indicating whether the constraint is disabled or not. Disabled means that the constraint is not active in subsequent dynamics realization-->
436441
<isDisabled>false</isDisabled>
437-
<!--Specify the body on which the line is defined-->
438442
<line_body>ground</line_body>
439-
<!--Direction of the line in line body specified in the line body frame.-->
440-
<line_direction_vec>0 1 0</line_direction_vec>
441-
<!--Specify the default point on the line in the line body frame.-->
442-
<point_on_line>0 0 0</point_on_line>
443-
<!--Specify the follower body constrained to the line.-->
443+
<line_direction_vec> 0 1 0</line_direction_vec>
444+
<point_on_line> 0 0 0</point_on_line>
444445
<follower_body>block</follower_body>
445-
<!--Specify the point on the follower bocy constrained to the line in the follower body reference frame.-->
446-
<point_on_follower>0 0 0</point_on_follower>
446+
<point_on_follower> 0 0 0</point_on_follower>
447447
</PointOnLineConstraint>
448448
<PointOnLineConstraint name="lock_foot_to_y_axis">
449-
<!--Flag indicating whether the constraint is disabled or not. Disabled means that the constraint is not active in subsequent dynamics realization-->
450449
<isDisabled>false</isDisabled>
451-
<!--Specify the body on which the line is defined-->
452450
<line_body>ground</line_body>
453-
<!--Direction of the line in line body specified in the line body frame.-->
454-
<line_direction_vec>0 1 0</line_direction_vec>
455-
<!--Specify the default point on the line in the line body frame.-->
456-
<point_on_line>0 0 0</point_on_line>
457-
<!--Specify the follower body constrained to the line.-->
451+
<line_direction_vec> 0 1 0</line_direction_vec>
452+
<point_on_line> 0 0 0</point_on_line>
458453
<follower_body>link2</follower_body>
459-
<!--Specify the point on the follower bocy constrained to the line in the follower body reference frame.-->
460-
<point_on_follower>0 0 0</point_on_follower>
454+
<point_on_follower> 0 0 0</point_on_follower>
461455
</PointOnLineConstraint>
462456
</objects>
463457
<groups />
@@ -497,7 +491,7 @@
497491
<point1>0 0 0</point1>
498492
<!--Force application point on body2.-->
499493
<point2>0 0 0</point2>
500-
<!--Spring stiffness (N/m).-->
494+
<!--Spring stiffness.-->
501495
<stiffness>20</stiffness>
502496
<!--Spring resting length.-->
503497
<rest_length>0.8</rest_length>
@@ -535,13 +529,13 @@
535529
<location_body_2>0 0.5 0</location_body_2>
536530
<!--Orientation of bushing frame in body 2 as x-y-z, body fixed Euler rotations.-->
537531
<orientation_body_2>0 0 0</orientation_body_2>
538-
<!--Stiffness parameters resisting relative rotation (Nm/rad).-->
532+
<!--Stiffness parameters resisting relative rotation.-->
539533
<rotational_stiffness>10 10 10</rotational_stiffness>
540-
<!--Stiffness parameters resisting relative translation (N/m).-->
534+
<!--Stiffness parameters resisting relative translation.-->
541535
<translational_stiffness>0 0 0</translational_stiffness>
542-
<!--Damping parameters resisting relative angular velocity. (Nm/(rad/s))-->
536+
<!--Damping parameters resisting relative angular velocity.-->
543537
<rotational_damping>0.1 0.1 0.1</rotational_damping>
544-
<!--Damping parameters resisting relative translational velocity. (N/(m/s)-->
538+
<!--Damping parameters resisting relative translational velocity.-->
545539
<translational_damping>0 0 0</translational_damping>
546540
</BushingForce>
547541
</objects>

0 commit comments

Comments
 (0)