Skip to content

Commit

Permalink
Merge pull request #236 from furushchev/update-models
Browse files Browse the repository at this point in the history
[models] update models
  • Loading branch information
k-okada authored Mar 1, 2017
2 parents fc97a23 + 5f7e7a6 commit 645bc78
Show file tree
Hide file tree
Showing 363 changed files with 18,254 additions and 51,463 deletions.
6 changes: 3 additions & 3 deletions models/akiba-door-object.l
Original file line number Diff line number Diff line change
Expand Up @@ -228,11 +228,11 @@


;; definition of :handle
(setq handle0 (make-cascoords :pos (float-vector 75.0 355.0 990.0) :rot #2f((-1.0 -1.224606e-16 1.232595e-32) (-1.232595e-32 2.220446e-16 1.0) (-1.224606e-16 1.0 -2.220446e-16)) :name "rear-knob"))
(setq handle0 (make-cascoords :pos (float-vector 75.0 355.0 990.0) :rot #2f((-1.0 -1.224647e-16 1.232595e-32) (-1.232595e-32 2.220446e-16 1.0) (-1.224647e-16 1.0 -2.220446e-16)) :name "rear-knob"))
(send blink2 :assoc handle0)
(setq handle1 (make-cascoords :pos (float-vector 75.0 355.0 930.0) :rot #2f((-1.0 -1.224606e-16 1.232595e-32) (-1.232595e-32 2.220446e-16 1.0) (-1.224606e-16 1.0 -2.220446e-16)) :name "front-knob"))
(setq handle1 (make-cascoords :pos (float-vector 75.0 355.0 930.0) :rot #2f((-1.0 -1.224647e-16 1.232595e-32) (-1.232595e-32 2.220446e-16 1.0) (-1.224647e-16 1.0 -2.220446e-16)) :name "front-knob"))
(send blink2 :assoc handle1)
(setq handle2 (make-cascoords :pos (float-vector 65.0 435.0 1060.0) :rot #2f((-1.0 -1.224606e-16 0.0) (1.224606e-16 -1.0 0.0) (0.0 0.0 1.0)) :name "lock"))
(setq handle2 (make-cascoords :pos (float-vector 65.0 435.0 1060.0) :rot #2f((-1.0 -1.224647e-16 0.0) (1.224647e-16 -1.0 0.0) (0.0 0.0 1.0)) :name "lock"))
(send blink3 :assoc handle2)

;; init-ending
Expand Down
6 changes: 3 additions & 3 deletions models/akiba-room-door-object.l
Original file line number Diff line number Diff line change
Expand Up @@ -248,11 +248,11 @@


;; definition of :handle
(setq handle0 (make-cascoords :pos (float-vector 75.0 250.0 990.0) :rot #2f((-1.0 -1.224606e-16 1.232595e-32) (-1.232595e-32 2.220446e-16 1.0) (-1.224606e-16 1.0 -2.220446e-16)) :name "rear-knob"))
(setq handle0 (make-cascoords :pos (float-vector 75.0 250.0 990.0) :rot #2f((-1.0 -1.224647e-16 1.232595e-32) (-1.232595e-32 2.220446e-16 1.0) (-1.224647e-16 1.0 -2.220446e-16)) :name "rear-knob"))
(send blink2 :assoc handle0)
(setq handle1 (make-cascoords :pos (float-vector 75.0 250.0 930.0) :rot #2f((-1.0 -1.224606e-16 1.232595e-32) (-1.232595e-32 2.220446e-16 1.0) (-1.224606e-16 1.0 -2.220446e-16)) :name "front-knob"))
(setq handle1 (make-cascoords :pos (float-vector 75.0 250.0 930.0) :rot #2f((-1.0 -1.224647e-16 1.232595e-32) (-1.232595e-32 2.220446e-16 1.0) (-1.224647e-16 1.0 -2.220446e-16)) :name "front-knob"))
(send blink2 :assoc handle1)
(setq handle2 (make-cascoords :pos (float-vector 65.0 330.0 1060.0) :rot #2f((-1.0 -1.224606e-16 0.0) (1.224606e-16 -1.0 0.0) (0.0 0.0 1.0)) :name "lock"))
(setq handle2 (make-cascoords :pos (float-vector 65.0 330.0 1060.0) :rot #2f((-1.0 -1.224647e-16 0.0) (1.224647e-16 -1.0 0.0) (0.0 0.0 1.0)) :name "lock"))
(send blink3 :assoc handle2)

;; init-ending
Expand Down
20 changes: 10 additions & 10 deletions models/akira-robot.l
Original file line number Diff line number Diff line change
Expand Up @@ -1149,11 +1149,11 @@
(instance face :init :vertices (list (float-vector -7.07107 -7.07107 25.0) (float-vector -10.0 0.0 25.0) (float-vector -10.0 0.0 24.0) (float-vector -7.07107 -7.07107 24.0)))
(instance face :init :vertices (list (float-vector -7.07107 -7.07107 -25.0) (float-vector -7.07107 -7.07107 -24.0) (float-vector -10.0 0.0 -24.0) (float-vector -10.0 0.0 -25.0)))
(instance face :init :vertices (list (float-vector -7.888609e-31 -10.0 25.0) (float-vector -7.07107 -7.07107 25.0) (float-vector -7.07107 -7.07107 24.0) (float-vector -7.888609e-31 -10.0 24.0)))
(instance face :init :vertices (list (float-vector -7.888609e-31 -10.0 -25.0) (float-vector -3.944305e-30 -10.0 -24.0) (float-vector -7.07107 -7.07107 -24.0) (float-vector -7.07107 -7.07107 -25.0)))
(instance face :init :vertices (list (float-vector 2.366583e-30 -10.0 -25.0) (float-vector -3.944305e-30 -10.0 -24.0) (float-vector -7.07107 -7.07107 -24.0) (float-vector -7.07107 -7.07107 -25.0)))
(instance face :init :vertices (list (float-vector 7.07107 -7.07107 25.0) (float-vector -7.888609e-31 -10.0 25.0) (float-vector -7.888609e-31 -10.0 24.0) (float-vector 7.07107 -7.07107 24.0)))
(instance face :init :vertices (list (float-vector 7.07107 -7.07107 -25.0) (float-vector 7.07107 -7.07107 -24.0) (float-vector -3.944305e-30 -10.0 -24.0) (float-vector -7.888609e-31 -10.0 -25.0)))
(instance face :init :vertices (list (float-vector 7.07107 -7.07107 -25.0) (float-vector 7.07107 -7.07107 -24.0) (float-vector -3.944305e-30 -10.0 -24.0) (float-vector 2.366583e-30 -10.0 -25.0)))
(instance face :init :vertices (list (float-vector 10.0 0.0 25.0) (float-vector 10.0 25.0 25.0) (float-vector -10.0 25.0 25.0) (float-vector -10.0 0.0 25.0) (float-vector -7.07107 -7.07107 25.0) (float-vector -7.888609e-31 -10.0 25.0) (float-vector 7.07107 -7.07107 25.0)))
(instance face :init :vertices (list (float-vector 7.07107 -7.07107 -25.0) (float-vector -7.888609e-31 -10.0 -25.0) (float-vector -7.07107 -7.07107 -25.0) (float-vector -10.0 0.0 -25.0) (float-vector -10.0 25.0 -25.0) (float-vector 10.0 25.0 -25.0) (float-vector 10.0 0.0 -25.0)))
(instance face :init :vertices (list (float-vector 7.07107 -7.07107 -25.0) (float-vector 2.366583e-30 -10.0 -25.0) (float-vector -7.07107 -7.07107 -25.0) (float-vector -10.0 0.0 -25.0) (float-vector -10.0 25.0 -25.0) (float-vector 10.0 25.0 -25.0) (float-vector 10.0 0.0 -25.0)))
(instance face :init :vertices (list (float-vector 7.07107 -7.07107 25.0) (float-vector 7.07107 -7.07107 24.0) (float-vector 10.0 0.0 24.0) (float-vector 10.0 0.0 25.0)))
(instance face :init :vertices (list (float-vector 10.0 0.0 -25.0) (float-vector 10.0 0.0 -24.0) (float-vector 7.07107 -7.07107 -24.0) (float-vector 7.07107 -7.07107 -25.0)))
(instance face :init :vertices (list (float-vector 10.0 24.0 24.0) (float-vector 10.0 0.0 24.0) (float-vector 7.07107 -7.07107 24.0) (float-vector -7.888609e-31 -10.0 24.0) (float-vector -7.07107 -7.07107 24.0) (float-vector -10.0 0.0 24.0) (float-vector -10.0 24.0 24.0)))
Expand Down Expand Up @@ -1227,20 +1227,20 @@
(instance face :init :vertices (list (float-vector -10.0 24.0 -24.0) (float-vector -10.0 0.0 -24.0) (float-vector -7.07107 -7.07107 -24.0) (float-vector 0.0 -10.0 -24.0) (float-vector 7.07107 -7.07107 -24.0) (float-vector 10.0 0.0 -24.0) (float-vector 10.0 24.0 -24.0)))
))
(instance faceset :init :faces (list
(instance face :init :vertices (list (float-vector -6.25 91.5 10.8253) (float-vector -6.086862e-15 91.5 12.5) (float-vector 6.25 91.5 10.8253) (float-vector 10.8253 91.5 6.25) (float-vector 12.5 91.5 -2.842171e-14) (float-vector 10.8253 91.5 -6.25) (float-vector 6.25 91.5 -10.8253) (float-vector 1.034810e-14 91.5 -12.5) (float-vector -6.25 91.5 -10.8253) (float-vector -10.8253 91.5 -6.25) (float-vector -12.5 91.5 -4.263256e-14) (float-vector -10.8253 91.5 6.25)))
(instance face :init :vertices (list (float-vector -6.25 91.5 10.8253) (float-vector -6.086731e-15 91.5 12.5) (float-vector 6.25 91.5 10.8253) (float-vector 10.8253 91.5 6.25) (float-vector 12.5 91.5 -2.842171e-14) (float-vector 10.8253 91.5 -6.25) (float-vector 6.25 91.5 -10.8253) (float-vector 1.034823e-14 91.5 -12.5) (float-vector -6.25 91.5 -10.8253) (float-vector -10.8253 91.5 -6.25) (float-vector -12.5 91.5 -4.263256e-14) (float-vector -10.8253 91.5 6.25)))
(instance face :init :vertices (list (float-vector -7.440327e-15 26.5 12.5) (float-vector -6.25 26.5 10.8253) (float-vector -10.8253 26.5 6.25) (float-vector -12.5 26.5 -2.842171e-14) (float-vector -10.8253 26.5 -6.25) (float-vector -6.25 26.5 -10.8253) (float-vector 8.994639e-15 26.5 -12.5) (float-vector 6.25 26.5 -10.8253) (float-vector 10.8253 26.5 -6.25) (float-vector 12.5 26.5 -1.421085e-14) (float-vector 10.8253 26.5 6.25) (float-vector 6.25 26.5 10.8253)))
(instance face :init :vertices (list (float-vector -6.25 91.5 10.8253) (float-vector -6.25 26.5 10.8253) (float-vector -7.440327e-15 26.5 12.5) (float-vector -6.086862e-15 91.5 12.5)))
(instance face :init :vertices (list (float-vector -6.25 91.5 10.8253) (float-vector -6.25 26.5 10.8253) (float-vector -7.440327e-15 26.5 12.5) (float-vector -6.086731e-15 91.5 12.5)))
(instance face :init :vertices (list (float-vector -10.8253 91.5 6.25) (float-vector -10.8253 26.5 6.25) (float-vector -6.25 26.5 10.8253) (float-vector -6.25 91.5 10.8253)))
(instance face :init :vertices (list (float-vector -12.5 91.5 -4.263256e-14) (float-vector -12.5 26.5 -2.842171e-14) (float-vector -10.8253 26.5 6.25) (float-vector -10.8253 91.5 6.25)))
(instance face :init :vertices (list (float-vector -10.8253 91.5 -6.25) (float-vector -10.8253 26.5 -6.25) (float-vector -12.5 26.5 -2.842171e-14) (float-vector -12.5 91.5 -4.263256e-14)))
(instance face :init :vertices (list (float-vector -6.25 91.5 -10.8253) (float-vector -6.25 26.5 -10.8253) (float-vector -10.8253 26.5 -6.25) (float-vector -10.8253 91.5 -6.25)))
(instance face :init :vertices (list (float-vector 1.034810e-14 91.5 -12.5) (float-vector 8.994639e-15 26.5 -12.5) (float-vector -6.25 26.5 -10.8253) (float-vector -6.25 91.5 -10.8253)))
(instance face :init :vertices (list (float-vector 6.25 91.5 -10.8253) (float-vector 6.25 26.5 -10.8253) (float-vector 8.994639e-15 26.5 -12.5) (float-vector 1.034810e-14 91.5 -12.5)))
(instance face :init :vertices (list (float-vector 1.034823e-14 91.5 -12.5) (float-vector 8.994639e-15 26.5 -12.5) (float-vector -6.25 26.5 -10.8253) (float-vector -6.25 91.5 -10.8253)))
(instance face :init :vertices (list (float-vector 6.25 91.5 -10.8253) (float-vector 6.25 26.5 -10.8253) (float-vector 8.994639e-15 26.5 -12.5) (float-vector 1.034823e-14 91.5 -12.5)))
(instance face :init :vertices (list (float-vector 10.8253 91.5 -6.25) (float-vector 10.8253 26.5 -6.25) (float-vector 6.25 26.5 -10.8253) (float-vector 6.25 91.5 -10.8253)))
(instance face :init :vertices (list (float-vector 12.5 91.5 -2.842171e-14) (float-vector 12.5 26.5 -1.421085e-14) (float-vector 10.8253 26.5 -6.25) (float-vector 10.8253 91.5 -6.25)))
(instance face :init :vertices (list (float-vector 10.8253 91.5 6.25) (float-vector 10.8253 26.5 6.25) (float-vector 12.5 26.5 -1.421085e-14) (float-vector 12.5 91.5 -2.842171e-14)))
(instance face :init :vertices (list (float-vector 6.25 91.5 10.8253) (float-vector 6.25 26.5 10.8253) (float-vector 10.8253 26.5 6.25) (float-vector 10.8253 91.5 6.25)))
(instance face :init :vertices (list (float-vector -6.086862e-15 91.5 12.5) (float-vector -7.440327e-15 26.5 12.5) (float-vector 6.25 26.5 10.8253) (float-vector 6.25 91.5 10.8253)))
(instance face :init :vertices (list (float-vector -6.086731e-15 91.5 12.5) (float-vector -7.440327e-15 26.5 12.5) (float-vector 6.25 26.5 10.8253) (float-vector 6.25 91.5 10.8253)))
))
))
(dolist (b (cdr bc)) (send (car bc) :assoc b))
Expand Down Expand Up @@ -1387,13 +1387,13 @@
(send blink5 :assoc blink4)
(send blink8 :newcoords (make-coords :pos (float-vector -4.662937e-14 70.0 0.0) :rot #2f((1.0 -6.661338e-16 3.330669e-16) (6.661338e-16 1.0 1.109336e-31) (-3.330669e-16 1.109336e-31 1.0))))
(send blink7 :assoc blink8)
(send blink7 :newcoords (make-coords :pos (float-vector -1.243450e-14 56.0 -14.0) :rot #2f((1.0 1.727431e-17 2.355139e-16) (2.355139e-16 -2.220446e-16 -1.0) (-1.727431e-17 1.0 -2.220446e-16))))
(send blink7 :newcoords (make-coords :pos (float-vector -1.243450e-14 56.0 -14.0) :rot #2f((1.0 1.727228e-17 2.355139e-16) (2.355139e-16 -2.220446e-16 -1.0) (-1.727228e-17 1.0 -2.220446e-16))))
(send blink6 :assoc blink7)
(send blink16 :newcoords (make-coords :pos (float-vector 0.0 0.0 29.0) :rot #2f((1.110223e-16 1.110223e-16 1.0) (1.0 1.110223e-16 -1.110223e-16) (-1.110223e-16 1.0 -1.110223e-16))))
(send blink1 :assoc blink16)
(send blink1 :newcoords (make-coords :pos (float-vector 0.0 0.0 29.0) :rot #2f((2.220446e-16 1.0 0.0) (-1.0 2.220446e-16 0.0) (0.0 0.0 1.0))))
(send blink0 :assoc blink1)
(send blink6 :newcoords (make-coords :pos (float-vector -1.243450e-14 56.0 26.5) :rot #2f((-1.0 -4.440892e-16 6.416958e-32) (-4.440892e-16 1.0 -1.224606e-16) (-9.786132e-33 -1.224606e-16 -1.0))))
(send blink6 :newcoords (make-coords :pos (float-vector -1.243450e-14 56.0 26.5) :rot #2f((-1.0 -4.440892e-16 6.417048e-32) (-4.440892e-16 1.0 -1.224647e-16) (-9.785233e-33 -1.224647e-16 -1.0))))
(send blink0 :assoc blink6)
(send blink5 :newcoords (make-coords :pos (float-vector -7.660539e-15 34.5 -38.0) :rot #2f((-1.0 0.0 0.0) (0.0 -2.220446e-16 -1.0) (0.0 -1.0 2.220446e-16))))
(send blink0 :assoc blink5)
Expand Down
Loading

0 comments on commit 645bc78

Please sign in to comment.