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

new class system now draws world of random objects

This commit is contained in:
Dan Ballard 2011-08-02 00:12:46 -07:00
parent dd65cc83b0
commit bd0ef45971
3 changed files with 102 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

176
flight-sim.lisp
View File

@ -6,67 +6,70 @@
(defclass engine-object (game-object) ;(defclass engine-object (game-object)
((active :initarg :active :reader active :initform nil) ; ((active :initarg :active :reader active :initform nil)
(start-time :initarg :start-time :reader start-time :initform nil) ; (start-time :initarg :start-time :reader start-time :initform nil)
(forces :initarg :forces :accessor forces :initform '()))) ; (forces :initarg :forces :accessor forces :initform '())))
(defgeneric activate-engine (object engine-sym)) ;(defgeneric activate-engine (object engine-sym))
(defmethod activate-engine ((object powered-object) engine-sym) ;(defmethod activate-engine ((object powered-object) engine-sym)
(push :engine-sym (getf (engines object) :active)) ; (push :engine-sym (getf (engines object) :active))
(engine-start (getf (getf (engines object) :engines) engine-sym) (wall-time))) ; (engine-start (getf (getf (engines object) :engines) engine-sym) (wall-time)))
(defgeneric engine-start (engine time)) ;(defgeneric engine-start (engine time))
(defmethod engine-start ((engine engine-object) time) ;(defmethod engine-start ((engine engine-object) time)
(setf (slot-value engine 'active) t) ; (setf (slot-value engine 'active) t)
(setf (slot-value engine 'start-time) time)) ; (setf (slot-value engine 'start-time) time))
(defgeneric engine-stop (engine)) ;(defgeneric engine-stop (engine))
(defmethod engine-stop ((engine engine-object)) ;(defmethod engine-stop ((engine engine-object))
(setf (slot-value engine 'active) nil)) ; (setf (slot-value engine 'active) nil))
; take 2 seconds to fully fire ; take 2 seconds to fully fire
(defmethod engine-genmodel ((engine engine-object)) ;(defmethod engine-genmodel ((engine engine-object))
(let ((time (- (wall-time) (start-time engine)))) ; (let ((time (- (wall-time) (start-time engine))))
(setf (model engine) ; (setf (model engine)
(make-model-3pyramid (make-2d-array 4 3 ; (make-model-3pyramid (make-2d-array 4 3
`((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)
; z goes from 0 to 1 in 2 seconds ; ; z goes from 0 to 1 in 2 seconds
(0.0 0.0 ,(converge 0 1 2 time)))) ; (0.0 0.0 ,(converge 0 1 2 time))))
:point-colors (make-2d-array 4 3 `( ; :point-colors (make-2d-array 4 3 `(
(,(converge 16 64 2 time) ,(converge 0 132 2 time) ,(converge 32 164 2 time)) ; (,(converge 16 64 2 time) ,(converge 0 132 2 time) ,(converge 32 164 2 time))
(,(converge 16 64 2 time) ,(converge 0 132 2 time) ,(converge 32 164 2 time)) ; (,(converge 16 64 2 time) ,(converge 0 132 2 time) ,(converge 32 164 2 time))
(,(converge 16 64 2 time) ,(converge 0 132 2 time) ,(converge 32 164 2 time)) ; (,(converge 16 64 2 time) ,(converge 0 132 2 time) ,(converge 32 164 2 time))
(,(converge 0 255 2 time) ,(converge 0 255 2 time) ,(converge 64 255 2 time)))))))) ; (,(converge 0 255 2 time) ,(converge 0 255 2 time) ,(converge 64 255 2 time))))))))
(defclass powered-object (game-object) ;(defclass powered-object (game-object)
;; plist :: ( :objects (plist models) :active (list symbols)) ; ;; plist :: ( :objects (plist models) :active (list symbols))
((engines :initarg :engines :accessor engines :initform '(:engines () :active ())))) ; ((engines :initarg :engines :accessor engines :initform '(:engines () :active ()))))
; ((engine :initarg :engine :accessor engine :initform nil))) ;; ((engine :initarg :engine :accessor engine :initform nil)))
;
;
;(attachments :initarg :attachments :accessor attachments :initform nil))) ; ;(attachments :initarg :attachments :accessor attachments :initform nil)))
;; time is time elapsed in seconds (with decimal for sub seconds)
(defmethod time-step ((engine engine) object time)
; f = ma
(let ((accel (/ (force engine) (mass object))))
; x = x +v*t + 1/2 * a * t^2
(dotimes (i 3) (progn
(incf (aref (coords motion) i)
(+ (* (aref (velocity motion) i) time) (* .5 (aref (acceleration motion) i) (expt time 2))))
(incf (aref (velocity motion) i)
(* time (aref (acceleration motion) i))))))
(defmethod time-step ((object powered-object) time)
(loop for engine in (loop for engine-sym in (getf (engines object) :active) collecting (getf (engines engines) engine-sym)) do ; time is time elapsed in seconds (with decimal for sub seconds)
(time-step engine object time))) ;(defmethod time-step ((engine engine) object time)
; (motion-step (motion *self*) time)) ; ; f = ma
; (let ((accel (/ (force engine) (mass object))))
; ; x = x +v*t + 1/2 * a * t^2
; (dotimes (i 3) (progn
; (incf (aref (coords motion) i)
; (+ (* (aref (velocity motion) i) time) (* .5 (aref (acceleration motion) i) (expt time 2))))
; (incf (aref (velocity motion) i)
; (* time (aref (acceleration motion) i))))))
;(defmethod time-step ((object powered-object) time)
; (loop for engine in (loop for engine-sym in (getf (engines object) :active) collecting (getf (engines engines) engine-sym)) do
; (time-step engine object time)))
; ; (motion-step (motion *self*) time))
@ -100,28 +103,30 @@
(defmethod object-draw ((object powered-object)) ;(defmethod object-draw ((object powered-object))
(draw-entity object) ; (draw-entity object)
(if (eql (active (engine object)) t) ; (if (eql (active (engine object)) t)
(progn ; (progn
(setf (model (engine object)) (engine-genmodel (engine object))) ; (setf (model (engine object)) (engine-genmodel (engine object)))
(gl:translate 0 0 0) ; (gl:translate 0 0 0)
(object-draw (engine object))))) ; (object-draw (engine object)))))
(defun draw () (defun draw-world ()
;; clear the buffer ;; clear the buffer
(gl:clear :color-buffer-bit :depth-buffer-bit) (gl:clear :color-buffer-bit :depth-buffer-bit)
;; move to eye position ;; move to eye position
(object-draw (make-instance 'powered-object :motion (make-instance 'motion :coords (vector 0 0 -3)) :model *ship-model* :engine (engine *self*))) ;;(object-draw (make-instance 'powered-object :motion (make-instance 'motion :coords (vector 0 0 -3)) :model *ship-model* :engine (engine *self*)))
(format t "draw self~%")
(gl:translate (- (aref (coords (motion *self*)) 0)) (- (aref (coords (motion *self*)) 1)) (- (aref (coords (motion *self*)) 2))) ;; eye (draw *self*)
(format t "move to coords~%")
(gl:translate (- (aref (coords (body *self*)) 0)) (- (aref (coords (body *self*)) 1)) (- (aref (coords (body *self*)) 2))) ;; eye
(format t "draw all else~%")
(loop for entity across *world* do (loop for entity across *world* do
; only draw if its infront of me ; only draw if its infront of me
(if (< (aref (coords (motion entity)) 2) (+ 10 (aref (coords (motion *self*)) 2))) (if (< (aref (coords (body entity)) 2) (+ 10 (aref (coords (body *self*)) 2)))
(object-draw entity))) (draw entity)))
(format t "look at~%")
(gl:matrix-mode :modelview) (gl:matrix-mode :modelview)
(gl:load-identity) (gl:load-identity)
@ -134,17 +139,17 @@
(gl:flush) (gl:flush)
(sdl:update-display)) (sdl:update-display))
(defun phys-step (time) ;(defun phys-step (time)
(time-step *self* time)) ; (time-step *self* time))
(defun thruster-on (key) (defun thruster-on (key)
(case key (case key
((:sdl-key-w) ; + z ; ((:sdl-key-w) ; + z
(progn ; (progn
;(setf (aref (acceleration (motion *self*)) 2) (- *acceleration*)) ;(setf (aref (acceleration (motion *self*)) 2) (- *acceleration*))
;(engine-start (engine *self*) (wall-time)))) ;(engine-start (engine *self*) (wall-time))))
(activate-engine *self* :thrust))) ; (activate-engine *self* :thrust)))
((:sdl-key-s) ; - z ((:sdl-key-s) ; - z
(setf (aref (acceleration (motion *self*)) 2) *acceleration*)) (setf (aref (acceleration (motion *self*)) 2) *acceleration*))
@ -160,10 +165,10 @@
(defun thruster-off (key) (defun thruster-off (key)
(case key (case key
((:sdl-key-w) ; + z ;((:sdl-key-w) ; + z
(progn ; (progn
(setf (aref (acceleration (motion *self*)) 2) 0) ; (setf (aref (acceleration (motion *self*)) 2) 0)
(engine-stop (engine *self*)))) ; (engine-stop (engine *self*))))
((:sdl-key-s) ; - z ((:sdl-key-s) ; - z
(setf (aref (acceleration (motion *self*)) 2) 0)) (setf (aref (acceleration (motion *self*)) 2) 0))
@ -184,8 +189,8 @@
(time (- start-time *last-time*))) (time (- start-time *last-time*)))
(phys-step time) ; (phys-step time)
(draw) (draw-world)
(incf *num-frames*) (incf *num-frames*)
@ -228,9 +233,10 @@
:model (make-instance 'model :model (make-instance 'model
:vertices (vertices *diamond-model*) :vertices (vertices *diamond-model*)
:faces (faces *diamond-model*)) :faces (faces *diamond-model*))
:angles (vector (random 360) (random 360) (random 360))
:motion (make-instance 'motion :body (make-instance 'body
:coords (vector (- (random 75) 37) (- (random 75) 37) (- (random 200) )))))) :coords (vector (- (random 75) 37) (- (random 75) 37) (- (random 200) ))
:angles (vector (random 360) (random 360) (random 360))))))
(setf (colors (model e)) (make-2d-array 3 3 `((,(random 255) ,(random 255) ,(random 255)) (,(random 255) ,(random 255) ,(random 255)) (,(random 255) ,(random 255) ,(random 255))))) (setf (colors (model e)) (make-2d-array 3 3 `((,(random 255) ,(random 255) ,(random 255)) (,(random 255) ,(random 255) ,(random 255)) (,(random 255) ,(random 255) ,(random 255)))))
(setf (face-colors (model e)) (make-2d-array 8 3 '((0 1 1) (0 1 1) (0 1 1) (0 1 1) (1 2 1) (1 2 1) (1 2 1) (1 2 1)))) (setf (face-colors (model e)) (make-2d-array 8 3 '((0 1 1) (0 1 1) (0 1 1) (0 1 1) (1 2 1) (1 2 1) (1 2 1) (1 2 1))))
e))))) e)))))
@ -240,13 +246,13 @@
(setf *num-frames* 0) (setf *num-frames* 0)
(setf *last-time* *start-time*) (setf *last-time* *start-time*)
(setf *controls-active* '()) (setf *controls-active* '())
(setf *self* (make-instance 'powered-object (setf *self* (make-instance 'game-object
:motion (make-instance 'motion :coords (vector 0 0 11)) :body (make-instance 'body :coords (vector 0 0 11))
:model *ship-model* :model *ship-model*))
:engines (list :engines (list :thrust ;:engines (list :engines (list :thrust
(make-instance 'engine-object ; (make-instance 'engine-object
:motion (make-instance 'motion :coords (vector 0 0.5 3.0)) ; :motion (make-instance 'motion :coords (vector 0 0.5 3.0))
:forces (list (make-instance 'force :newtons 10 :direction '(0 0 1)))))))) ; :forces (list (make-instance 'force :newtons 10 :direction '(0 0 1))))))))
(populate-world) (populate-world)
) )

2
model.lisp
View File

@ -14,6 +14,8 @@
(defclass animated-model () (defclass animated-model ()
((start-time :initarg :start-time :accessor start-time :initform 0.0))) ((start-time :initarg :start-time :accessor start-time :initform 0.0)))
(defgeneric scale-colors (model))
(defmethod scale-colors ((model model)) (defmethod scale-colors ((model model))
(let ((colors (colors model))) (let ((colors (colors model)))
(loop for i from 0 to (1- (length colors)) do (loop for i from 0 to (1- (length colors)) do

10
objects.lisp
View File

@ -9,14 +9,16 @@
(active-attachments :initarg :active-attachments :accessor active-attachments :initform '()))) (active-attachments :initarg :active-attachments :accessor active-attachments :initform '())))
;(defmethod coords ((object game-object))
; (coords (body object)))
(defmethod draw :before ((object game-object)) (defmethod draw :before ((object game-object))
(gl:push-matrix) (gl:push-matrix)
(gl:translate (aref (coords (motion entity)) 0) (aref (coords (motion entity)) 1) (aref (coords (motion entity)) 2)) (gl:translate (aref (coords (body object)) 0) (aref (coords (body object)) 1) (aref (coords (body object)) 2))
(gl:rotate (aref (angles entity) 0) 1 0 0) (gl:rotate (aref (angles (body object)) 0) 1 0 0)
(gl:rotate (aref (angles entity) 1) 0 1 0) (gl:rotate (aref (angles (body object)) 1) 0 1 0)
(gl:rotate (aref (angles entity) 2) 0 0 1)) (gl:rotate (aref (angles (body object)) 2) 0 0 1))
(defmethod draw :after ((object game-object)) (defmethod draw :after ((object game-object))
(gl:pop-matrix)) (gl:pop-matrix))