Skip to content

Commit b923073

Browse files
committed
Update some rsons to use DAE instead of obj.
1 parent b5b08fa commit b923073

File tree

3 files changed

+23
-16
lines changed

3 files changed

+23
-16
lines changed

RSONs/rsons/franka_panda/pandaDrill.rson

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -372,49 +372,49 @@
372372
"type": "mesh",
373373
"frame": "root_frame",
374374
"material": "panda_white",
375-
"filename": "./meshes/visual/link0.obj"
375+
"filename": "./meshes/visual/link0.dae"
376376
},
377377
"L1_mesh": {
378378
"type": "mesh",
379379
"frame": "L1_frame",
380380
"material": "panda_white",
381-
"filename": "./meshes/visual/link1.obj"
381+
"filename": "./meshes/visual/link1.dae"
382382
},
383383
"L2_mesh": {
384384
"type": "mesh",
385385
"frame": "L2_frame",
386386
"material": "panda_white",
387-
"filename": "./meshes/visual/link2.obj"
387+
"filename": "./meshes/visual/link2.dae"
388388
},
389389
"L3_mesh": {
390390
"type": "mesh",
391391
"frame": "L3_frame",
392392
"material": "panda_white",
393-
"filename": "./meshes/visual/link3.obj"
393+
"filename": "./meshes/visual/link3.dae"
394394
},
395395
"L4_mesh": {
396396
"type": "mesh",
397397
"frame": "L4_frame",
398398
"material": "panda_white",
399-
"filename": "./meshes/visual/link4.obj"
399+
"filename": "./meshes/visual/link4.dae"
400400
},
401401
"L5_mesh": {
402402
"type": "mesh",
403403
"frame": "L5_frame",
404404
"material": "panda_white",
405-
"filename": "./meshes/visual/link5.obj"
405+
"filename": "./meshes/visual/link5.dae"
406406
},
407407
"L6_mesh": {
408408
"type": "mesh",
409409
"frame": "L6_frame",
410410
"material": "panda_white",
411-
"filename": "./meshes/visual/link6.obj"
411+
"filename": "./meshes/visual/link6.dae"
412412
},
413413
"L7_mesh": {
414414
"type": "mesh",
415415
"frame": "L7_frame",
416416
"material": "panda_white",
417-
"filename": "./meshes/visual/link7.obj"
417+
"filename": "./meshes/visual/link7.dae"
418418
},
419419
"drill_mount": {
420420
"type": "cylinder",

RSONs/rsons/franka_panda/pandaVeterinarian.rson

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -328,49 +328,49 @@
328328
"type": "mesh",
329329
"frame": "root_frame",
330330
"material": "panda_white",
331-
"filename": "./meshes/visual/link0.obj"
331+
"filename": "./meshes/visual/link0.dae"
332332
},
333333
"L1_mesh": {
334334
"type": "mesh",
335335
"frame": "L1_frame",
336336
"material": "panda_white",
337-
"filename": "./meshes/visual/link1.obj"
337+
"filename": "./meshes/visual/link1.dae"
338338
},
339339
"L2_mesh": {
340340
"type": "mesh",
341341
"frame": "L2_frame",
342342
"material": "panda_white",
343-
"filename": "./meshes/visual/link2.obj"
343+
"filename": "./meshes/visual/link2.dae"
344344
},
345345
"L3_mesh": {
346346
"type": "mesh",
347347
"frame": "L3_frame",
348348
"material": "panda_white",
349-
"filename": "./meshes/visual/link3.obj"
349+
"filename": "./meshes/visual/link3.dae"
350350
},
351351
"L4_mesh": {
352352
"type": "mesh",
353353
"frame": "L4_frame",
354354
"material": "panda_white",
355-
"filename": "./meshes/visual/link4.obj"
355+
"filename": "./meshes/visual/link4.dae"
356356
},
357357
"L5_mesh": {
358358
"type": "mesh",
359359
"frame": "L5_frame",
360360
"material": "panda_white",
361-
"filename": "./meshes/visual/link5.obj"
361+
"filename": "./meshes/visual/link5.dae"
362362
},
363363
"L6_mesh": {
364364
"type": "mesh",
365365
"frame": "L6_frame",
366366
"material": "panda_white",
367-
"filename": "./meshes/visual/link6.obj"
367+
"filename": "./meshes/visual/link6.dae"
368368
},
369369
"L7_mesh": {
370370
"type": "mesh",
371371
"frame": "L7_frame",
372372
"material": "panda_white",
373-
"filename": "./meshes/visual/link7.obj"
373+
"filename": "./meshes/visual/link7.dae"
374374
},
375375
"frame": {
376376
"type": "mesh",

ext/VMRobotControlMakieExt.jl

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -298,6 +298,13 @@ function _sketchjoint!(ax, joint::RailData, cache::Observable;
298298
(s,)
299299
end
300300

301+
function _sketchjoint!(ax, joint::ReferenceJoint, cache::Observable;
302+
scale, meshcolor, linecolor, linewidth, shading)
303+
# TODO implement
304+
()
305+
end
306+
307+
301308
################################################################################
302309
# Component Sketch
303310
################################################################################

0 commit comments

Comments
 (0)