dan
/
flight-sim
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

tweeked points to be more uniform

This commit is contained in:
Dan Ballard 2012-07-01 10:46:42 -07:00
parent 527182c71b
commit 90d0e65c8e
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
engine.lisp
View File

@ -66,7 +66,10 @@
(defmethod draw ((object engine-object) time) (defmethod draw ((object engine-object) time)
(if (< (- time (start-time object)) (activation-time object)) ;; hack since times are in templates!!! (if (< (- time (start-time object)) (activation-time object)) ;; hack since times are in templates!!!
(regen-model (model object) (- time (start-time object)))) ;(progn ;debug model transform
(regen-model (model object) (- time (start-time object)))
;(format t "~a~%" (vertices (model object))) )
)
(call-next-method)) (call-next-method))
@ -78,10 +81,9 @@
(defparameter *rear-thruster-vertices* (defparameter *rear-thruster-vertices*
(make-thruster-vertices (make-thruster-vertices (transform-points *3pyramid-points* (vector 4 1 0.1))
(transform-points (translate-points *3pyramid-points* (vector 0 0 0.5)) (vector 4 1 1.01)) ;'( (0.0 0.5 0.0) (-2.0 -0.5 0.0) (2.0 -0.5 0.0) (o0.0 0.0 0.0))
;'( (0.0 0.5 0.0) (-2.0 -0.5 0.0) (2.0 -0.5 0.0) (0.0 0.0 0.0)) (transform-points *3pyramid-points* (vector 4 1 1.5))
(transform-points (translate-points (rotate-points *3pyramid-points* (vector 0 0 0)) (vector 0 0 0.5)) (vector 4 1 1.5))
; '( (0.0 0.5 0.0) (-2.0 -0.5 0.0) (2.0 -0.5 0.0) (0.0 0.0 1.5)) ; '( (0.0 0.5 0.0) (-2.0 -0.5 0.0) (2.0 -0.5 0.0) (0.0 0.0 1.5))
2)) 2))
; '((0.0 0.5 0.0) (-2.0 -0.5 0.0) (2.0 -0.5 0.0) ; '((0.0 0.5 0.0) (-2.0 -0.5 0.0) (2.0 -0.5 0.0)

12
model.lisp
View File

@ -55,11 +55,14 @@
(3 5 1) (2 5 4) (1 5 2) (4 5 3))))) (3 5 1) (2 5 4) (1 5 2) (4 5 3)))))
; point up along +z ; point up along +z
(defparameter *3pyramid-points* (defparameter *3pyramid-points*
(make-2d-array 4 3 '((0.0 0.5 -0.5) (-0.5 -0.5 -0.5) (0.5 -0.5 -0.5) (0.0 0.0 0.5)))) (make-2d-array 4 3 '((0.0 0.5 0) (-0.5 -0.5 0) (0.5 -0.5 0) (0.0 0.0 1))))
; point up along +z, flat facing +y (into) ; point up along +z, flat facing +y (into)
(defparameter *3pyramid-flat-points* (defparameter *3pyramid-flat-points*
(make-2d-array 4 3 '((0.0 -0.5 -0.5) (0.0 0.5 0.5) (-0.5 -0.5 0.5) (0.5 -0.5 0.5)))) (make-2d-array 4 3 '((0.0 0.5 0) (-0.5 -0.5 0) (0.5 -0.5 0) (0.0 -0.5 1))))
; back top tip
; (make-2d-array 4 3 '((0.0 -0.5 -1) (0.0 0.5 0) (-0.5 -0.5 0) (0.5 -0.5 0))))
; tip backtop
(defparameter *colors* (make-hash-table :test 'equal)) (defparameter *colors* (make-hash-table :test 'equal))
(setf (gethash "red" *colors*) '(255 0 0)) (setf (gethash "red" *colors*) '(255 0 0))
@ -94,7 +97,8 @@
(defun make-model-3pyramid (points &key (face-colors nil) (point-colors nil)) (defun make-model-3pyramid (points &key (face-colors nil) (point-colors nil))
(make-instance 'model (make-instance 'model
:vertices (if (listp points) (make-2d-array 4 3 points) points) :vertices (if (listp points) (make-2d-array 4 3 points) points)
:faces (make-2d-array 4 3 '((0 1 3) (0 2 1) (0 3 2) (1 2 3))) :faces (make-2d-array 4 3 '((0 1 3) (1 2 3) (0 3 2) (0 2 1)))
;'((0 1 3) (0 2 1) (0 3 2) (1 2 3)))
:colors (if face-colors :colors (if face-colors
(if (listp face-colors) (make-2d-array 4 3 face-colors) face-colors) (if (listp face-colors) (make-2d-array 4 3 face-colors) face-colors)
(if (listp point-colors) (make-2d-array 4 3 point-colors) point-colors)) (if (listp point-colors) (make-2d-array 4 3 point-colors) point-colors))
@ -110,7 +114,7 @@
(make-model-3pyramid ;*3pyramid-flat-points* (make-model-3pyramid ;*3pyramid-flat-points*
(transform-points (transform-points
;(rotate-points *3pyramid-flat-points* (make-rotation-matrix (vector 0 0 0))) ;(rotate-points *3pyramid-flat-points* (make-rotation-matrix (vector 0 0 0)))
(rotate-points *3pyramid-flat-points* (vector 0 0 0)) (translate-points (rotate-points *3pyramid-flat-points* (vector 0 pi 0)) (vector 0 0 0.5))
(vector 4 1 3)) (vector 4 1 3))
:face-colors '((196 196 196) (196 196 196) (196 196 196) (32 32 32)))) :face-colors '((196 196 196) (196 196 196) (196 196 196) (32 32 32))))