Commit 1f67928d authored by Dave Cooper's avatar Dave Cooper
Browse files

Merge branch 'training'

parents 15a6cc91 38e412dd
...@@ -40,7 +40,7 @@ to the src/ directory distributed with GDL. ...@@ -40,7 +40,7 @@ to the src/ directory distributed with GDL.
:sequence (:size 50) :sequence (:size 50)
:center (translate (the center) :right (* 10 (the-child index)))))) :center (translate (the center) :right (* 10 (the-child index))))))
(define-object assembly (application-mixin) (define-object assembly (application-mixin)
:input-slots :input-slots
((width 5 :settable) ((width 5 :settable)
...@@ -76,7 +76,8 @@ to the src/ directory distributed with GDL. ...@@ -76,7 +76,8 @@ to the src/ directory distributed with GDL.
) )
:objects :objects
((robot :type 'robot (
(robot :type 'robot
:pass-down (torso-type :pass-down (torso-type
head-angle width length height transparency shininess head-angle width length height transparency shininess
body-angle arm-angle-right arm-angle-left body-angle arm-angle-right arm-angle-left
......
("ch2-examples" (;;"ch2-examples"
"ch2-solutions" "ch3-examples" "primi-plane-1" "ch2-solutions"
"primi-plane-2" "primi-plane-3" "primi-plane-4" ;;"ch3-examples"
"primi-plane-5" "primi-plane-6") "primi-plane-1"
"primi-plane-2"
"primi-plane-3"
"primi-plane-4"
"primi-plane-5"
"primi-plane-6")
\ No newline at end of file
("examples") ()
\ No newline at end of file \ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment