Skip to content

Commit

Permalink
Merge pull request #96 from snozawa/revert_euscollada_collision_making
Browse files Browse the repository at this point in the history
Merged.
  • Loading branch information
snozawa committed Jun 10, 2014
2 parents 910fcd7 + 425c9d1 commit 41f5a23
Showing 1 changed file with 0 additions and 20 deletions.
20 changes: 0 additions & 20 deletions irteus/irtrobot.l
Original file line number Diff line number Diff line change
Expand Up @@ -786,26 +786,6 @@
(setq dx (+ dx ddx) dy (+ dy ddy) dth (+ dth ddth)))))
(push (funcall gen-go-pos-step-node-func mc leg leg-translate-pos) ret)
(reverse ret))))
;; make collision model from faces or gl-vertices
(:make-collision-model-for-links
(&key (fat 0) (collision-func 'pqp-collision-check) ((:links ls) (send self :links)))
(dolist (ll ls)
(unless (send ll :get (read-from-string (format nil ":~Amodel"
(string-right-trim "-COLLISION-CHECK" (string collision-func)))))
(send ll
(read-from-string
(format nil ":make-~Amodel"
(string-right-trim "-COLLISION-CHECK" (string collision-func))))
:fat fat
:faces (flatten (mapcar #'(lambda (x)
(cond
((find-method x :def-gl-vertices)
(send (x . glvertices) :convert-to-faces :wrt :world))
(t
(send x :faces))))
(send ll :bodies)))))
)
)
)
(in-package "GEOMETRY")

Expand Down

0 comments on commit 41f5a23

Please sign in to comment.