Skip to content

Commit 3275f7b

Browse files
aseth1aseth1
authored
Merge pull request #26 from opensim-org/update_bouncing_block_geometry
Update bouncing_block.osim geometry
2 parents 1482879 + a686c9d commit 3275f7b

File tree

2 files changed

+48
-16
lines changed

2 files changed

+48
-16
lines changed

‎Models/BouncingBlock/bouncing_block.osim

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -210,15 +210,15 @@
210210
<objects>
211211
<DisplayGeometry>
212212
<!--Name of geometry file .vtp, .stl, .obj-->
213-
<geometry_file>big_block_centered.vtp</geometry_file>
213+
<geometry_file>block.vtp</geometry_file>
214214
<!--Color used to display the geometry when visible-->
215215
<color> 0.862745 0.117647 0.117647</color>
216216
<!--Name of texture file .jpg, .bmp-->
217217
<texture_file />
218218
<!--in body transform specified as 3 rotations (rad) followed by 3 translations rX rY rZ tx ty tz-->
219219
<transform> -0 0 -0 0 0 0</transform>
220220
<!--Three scale factors for display purposes: scaleX scaleY scaleZ-->
221-
<scale_factors> 1 1 1</scale_factors>
221+
<scale_factors> 2 2 2</scale_factors>
222222
<!--Display Pref. 0:Hide 1:Wire 3:Flat 4:Shaded-->
223223
<display_preference>4</display_preference>
224224
<!--Display opacity between 0.0 and 1.0-->
@@ -297,15 +297,31 @@
297297
<objects>
298298
<DisplayGeometry>
299299
<!--Name of geometry file .vtp, .stl, .obj-->
300-
<geometry_file>linkage1.vtp</geometry_file>
300+
<geometry_file>block.vtp</geometry_file>
301301
<!--Color used to display the geometry when visible-->
302302
<color> 0.862745 0.117647 0.117647</color>
303303
<!--Name of texture file .jpg, .bmp-->
304304
<texture_file />
305305
<!--in body transform specified as 3 rotations (rad) followed by 3 translations rX rY rZ tx ty tz-->
306-
<transform> -0 0 -0 0 0 0</transform>
306+
<transform> -0 0 -0 0 0.25 0</transform>
307307
<!--Three scale factors for display purposes: scaleX scaleY scaleZ-->
308-
<scale_factors> 1 1 1</scale_factors>
308+
<scale_factors> 0.6 5 0.6</scale_factors>
309+
<!--Display Pref. 0:Hide 1:Wire 3:Flat 4:Shaded-->
310+
<display_preference>4</display_preference>
311+
<!--Display opacity between 0.0 and 1.0-->
312+
<opacity>1</opacity>
313+
</DisplayGeometry>
314+
<DisplayGeometry>
315+
<!--Name of geometry file .vtp, .stl, .obj-->
316+
<geometry_file>sphere.vtp</geometry_file>
317+
<!--Color used to display the geometry when visible-->
318+
<color> 0.862745 0.117647 0.117647</color>
319+
<!--Name of texture file .jpg, .bmp-->
320+
<texture_file />
321+
<!--in body transform specified as 3 rotations (rad) followed by 3 translations rX rY rZ tx ty tz-->
322+
<transform> 0 0 0 0 0 0</transform>
323+
<!--Three scale factors for display purposes: scaleX scaleY scaleZ-->
324+
<scale_factors> 0.1 0.1 0.1</scale_factors>
309325
<!--Display Pref. 0:Hide 1:Wire 3:Flat 4:Shaded-->
310326
<display_preference>4</display_preference>
311327
<!--Display opacity between 0.0 and 1.0-->
@@ -384,15 +400,15 @@
384400
<objects>
385401
<DisplayGeometry>
386402
<!--Name of geometry file .vtp, .stl, .obj-->
387-
<geometry_file>linkage1.vtp</geometry_file>
403+
<geometry_file>block.vtp</geometry_file>
388404
<!--Color used to display the geometry when visible-->
389405
<color> 0.862745 0.117647 0.117647</color>
390406
<!--Name of texture file .jpg, .bmp-->
391407
<texture_file />
392408
<!--in body transform specified as 3 rotations (rad) followed by 3 translations rX rY rZ tx ty tz-->
393-
<transform> -0 0 -0 0 0 0</transform>
409+
<transform> 0 0 0 0 0.25 0</transform>
394410
<!--Three scale factors for display purposes: scaleX scaleY scaleZ-->
395-
<scale_factors> 1 1 1</scale_factors>
411+
<scale_factors> 0.6 5 0.6</scale_factors>
396412
<!--Display Pref. 0:Hide 1:Wire 3:Flat 4:Shaded-->
397413
<display_preference>4</display_preference>
398414
<!--Display opacity between 0.0 and 1.0-->

‎Models/BouncingBlock/bouncing_block_weak_spring.osim

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -210,15 +210,15 @@
210210
<objects>
211211
<DisplayGeometry>
212212
<!--Name of geometry file .vtp, .stl, .obj-->
213-
<geometry_file>big_block_centered.vtp</geometry_file>
213+
<geometry_file>block.vtp</geometry_file>
214214
<!--Color used to display the geometry when visible-->
215215
<color> 0.862745 0.117647 0.117647</color>
216216
<!--Name of texture file .jpg, .bmp-->
217217
<texture_file />
218218
<!--in body transform specified as 3 rotations (rad) followed by 3 translations rX rY rZ tx ty tz-->
219219
<transform> -0 0 -0 0 0 0</transform>
220220
<!--Three scale factors for display purposes: scaleX scaleY scaleZ-->
221-
<scale_factors> 1 1 1</scale_factors>
221+
<scale_factors> 2 2 2</scale_factors>
222222
<!--Display Pref. 0:Hide 1:Wire 3:Flat 4:Shaded-->
223223
<display_preference>4</display_preference>
224224
<!--Display opacity between 0.0 and 1.0-->
@@ -297,15 +297,31 @@
297297
<objects>
298298
<DisplayGeometry>
299299
<!--Name of geometry file .vtp, .stl, .obj-->
300-
<geometry_file>linkage1.vtp</geometry_file>
300+
<geometry_file>block.vtp</geometry_file>
301301
<!--Color used to display the geometry when visible-->
302302
<color> 0.862745 0.117647 0.117647</color>
303303
<!--Name of texture file .jpg, .bmp-->
304304
<texture_file />
305305
<!--in body transform specified as 3 rotations (rad) followed by 3 translations rX rY rZ tx ty tz-->
306-
<transform> -0 0 -0 0 0 0</transform>
306+
<transform> 0 0 0 0 0.25 0</transform>
307307
<!--Three scale factors for display purposes: scaleX scaleY scaleZ-->
308-
<scale_factors> 1 1 1</scale_factors>
308+
<scale_factors> 0.6 5 0.6</scale_factors>
309+
<!--Display Pref. 0:Hide 1:Wire 3:Flat 4:Shaded-->
310+
<display_preference>4</display_preference>
311+
<!--Display opacity between 0.0 and 1.0-->
312+
<opacity>1</opacity>
313+
</DisplayGeometry>
314+
<DisplayGeometry>
315+
<!--Name of geometry file .vtp, .stl, .obj-->
316+
<geometry_file>sphere.vtp</geometry_file>
317+
<!--Color used to display the geometry when visible-->
318+
<color> 0.862745 0.117647 0.117647</color>
319+
<!--Name of texture file .jpg, .bmp-->
320+
<texture_file />
321+
<!--in body transform specified as 3 rotations (rad) followed by 3 translations rX rY rZ tx ty tz-->
322+
<transform> 0 0 0 0 0 0</transform>
323+
<!--Three scale factors for display purposes: scaleX scaleY scaleZ-->
324+
<scale_factors> 0.1 0.1 0.1</scale_factors>
309325
<!--Display Pref. 0:Hide 1:Wire 3:Flat 4:Shaded-->
310326
<display_preference>4</display_preference>
311327
<!--Display opacity between 0.0 and 1.0-->
@@ -384,15 +400,15 @@
384400
<objects>
385401
<DisplayGeometry>
386402
<!--Name of geometry file .vtp, .stl, .obj-->
387-
<geometry_file>linkage1.vtp</geometry_file>
403+
<geometry_file>block.vtp</geometry_file>
388404
<!--Color used to display the geometry when visible-->
389405
<color> 0.862745 0.117647 0.117647</color>
390406
<!--Name of texture file .jpg, .bmp-->
391407
<texture_file />
392408
<!--in body transform specified as 3 rotations (rad) followed by 3 translations rX rY rZ tx ty tz-->
393-
<transform> -0 0 -0 0 0 0</transform>
409+
<transform> 0 0 0 0 0.25 0</transform>
394410
<!--Three scale factors for display purposes: scaleX scaleY scaleZ-->
395-
<scale_factors> 1 1 1</scale_factors>
411+
<scale_factors> 0.6 5 0.6</scale_factors>
396412
<!--Display Pref. 0:Hide 1:Wire 3:Flat 4:Shaded-->
397413
<display_preference>4</display_preference>
398414
<!--Display opacity between 0.0 and 1.0-->

0 commit comments

Comments
 (0)