- gamelib-cvs@common-lisp.net - mailman3.common-lisp.net

[gamelib-cvs] games-2d.asd
by Ingvar Mattsson 31 Dec '06

31 Dec '06

Update of /project/gamelib/cvsroot/source In directory clnet:/tmp/cvs-serv2923 Modified Files: games-2d.asd Log Message: IM Noticed taht one needed file wasn't being included. Index: games-2d.asd =================================================================== RCS file: /project/gamelib/cvsroot/source/games-2d.asd,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** games-2d.asd 10 Oct 2006 06:18:24 -0000 1.7 --- games-2d.asd 31 Dec 2006 12:39:02 -0000 1.8 *************** *** 7,12 **** (:file "globals-2d" :depends-on ("packages-2d")) (:file "xpm-lib" :depends-on ("packages-2d")) (:file "generics" :depends-on ("packages-2d")) ! (:file "graphics" :depends-on ("packages-2d" "xpm-lib" "globals-2d" "generics")) (:file "gameplay" :depends-on ("packages-2d" "globals-2d")) --- 7,13 ---- (:file "globals-2d" :depends-on ("packages-2d")) (:file "xpm-lib" :depends-on ("packages-2d")) + (:file "images" :depends-on ("packages-2d")) (:file "generics" :depends-on ("packages-2d")) ! (:file "graphics" :depends-on ("packages-2d" "xpm-lib" "images" "globals-2d" "generics")) (:file "gameplay" :depends-on ("packages-2d" "globals-2d"))

1 0

[gamelib-cvs] graphics.lisp
by Ingvar Mattsson 31 Dec '06

31 Dec '06

Update of /project/gamelib/cvsroot/source In directory clnet:/tmp/cvs-serv2849 Modified Files: graphics.lisp Log Message: IM Sliht changes (essentially ripping out some code taht should've been dead already). Index: graphics.lisp =================================================================== RCS file: /project/gamelib/cvsroot/source/graphics.lisp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** graphics.lisp 5 Sep 2006 06:04:32 -0000 1.3 --- graphics.lisp 31 Dec 2006 12:38:40 -0000 1.4 *************** *** 232,235 **** --- 232,238 ---- )) + ;;; The following function has Gatlopp-specific code (namely the calls to + ;;; (keys *player*). IThat's why it's being discarded. + #-(and) (defun update-status-window () (when *player* *************** *** 241,244 **** --- 244,248 ---- *controls* (x *player*) (y *player*))))) + (defmethod draw ((obj xlib:window)) (cond ((xlib:drawable-equal obj *game-window*)

1 0

[gamelib-cvs] generics.lisp
by Ingvar Mattsson 30 Dec '06

30 Dec '06

Update of /project/gamelib/cvsroot/source In directory clnet:/tmp/cvs-serv16209 Modified Files: generics.lisp Log Message: IM Now with doc strings! Index: generics.lisp =================================================================== RCS file: /project/gamelib/cvsroot/source/generics.lisp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** generics.lisp 30 Dec 2006 19:12:36 -0000 1.1 --- generics.lisp 30 Dec 2006 19:19:29 -0000 1.2 *************** *** 1,5 **** (in-package #:net.hexapodia.games-2d) ! (defgeneric draw (object)) ! (defgeneric movement (object)) ! (defgeneric (setf movement) (object)) --- 1,14 ---- (in-package #:net.hexapodia.games-2d) ! (defgeneric draw (object) ! (:documentation "Draw a graphics object into the relevant window ! (objects that move will have their associated window tied from the object)")) ! ! (defgeneric move (object) ! (:documentation "Make an object move, if it is an animated object, also switch ! to the next animation")) ! ! (defgeneric movement (object) ! (:documentation "Returns movement (dx / dy) for a movable object.")) ! (defgeneric (setf movement) (value object) ! (:documentation "Sets movement (dx / dy) for a movable object."))

1 0

[gamelib-cvs] generics.lisp
by Ingvar Mattsson 30 Dec '06

30 Dec '06

Update of /project/gamelib/cvsroot/source In directory clnet:/tmp/cvs-serv15369 Added Files: generics.lisp Log Message: IM First check-in after re-creation. --- NEW FILE: generics.lisp --- (in-package #:net.hexapodia.games-2d) (defgeneric draw (object)) (defgeneric movement (object)) (defgeneric (setf movement) (object))

1 0

[gamelib-cvs] demo-stick.lisp
by Ingvar Mattsson 28 Dec '06

28 Dec '06

Update of /project/gamelib/cvsroot/source/doc In directory clnet:/tmp/cvs-serv30770 Modified Files: demo-stick.lisp Log Message: IM Minor update for the joystick demo. Index: demo-stick.lisp =================================================================== RCS file: /project/gamelib/cvsroot/source/doc/demo-stick.lisp,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** demo-stick.lisp 27 Dec 2006 21:27:10 -0000 1.1 --- demo-stick.lisp 28 Dec 2006 06:15:47 -0000 1.2 *************** *** 33,34 **** --- 33,41 ---- ) (xlib:display-force-output *display*)) + + (continous-poll *js*) + (loop for n below 1000 do (progn + (update) + (sleep 0.1))) + + \ No newline at end of file

1 0

[gamelib-cvs] gamelib.asd
by Ingvar Mattsson 27 Dec '06

27 Dec '06

Update of /project/gamelib/cvsroot/source In directory clnet:/tmp/cvs-serv13995 Modified Files: gamelib.asd Log Message: IM Version update, preparing for release. Index: gamelib.asd =================================================================== RCS file: /project/gamelib/cvsroot/source/gamelib.asd,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** gamelib.asd 10 Oct 2006 06:18:24 -0000 1.4 --- gamelib.asd 27 Dec 2006 21:28:15 -0000 1.5 *************** *** 1,4 **** (asdf:defsystem "gamelib" ! :version "0.3" :author "Ingvar Mattsson <ingvar(a)hexapodia.net>" ! :depends-on ("games-ai" "games-2d" "games-3d")) --- 1,5 ---- (asdf:defsystem "gamelib" ! :version "0.4" :author "Ingvar Mattsson <ingvar(a)hexapodia.net>" ! :depends-on ("games-ai" "games-2d" "games-3d" ! #+linux "games-stick"))

1 0

[gamelib-cvs] demo-stick.lisp
by Ingvar Mattsson 27 Dec '06

27 Dec '06

Update of /project/gamelib/cvsroot/source/doc In directory clnet:/tmp/cvs-serv13888/doc Added Files: demo-stick.lisp Log Message: IM Initial check-in. --- NEW FILE: demo-stick.lisp --- (in-package :net.hexapodia.games-stick) (defvar *display* (xlib:open-default-display)) (defvar *screen* (car (xlib:display-roots *display*))) (defvar *win* (xlib:create-window :parent (xlib:screen-root *screen*) :width 200 :x 10 :y 10 :height 150)) (defvar *black* (xlib:screen-black-pixel *screen*)) (defvar *white* (xlib:screen-white-pixel *screen*)) (defvar *js* (net.hexapodia.games-stick:make-stick "/dev/input/js0")) (defun update () (update-stick *js*) (xlib:draw-rectangle *win* *white* 0 0 200 150 t) (xlib:display-force-output *display*) (xlib:draw-rectangle *win* *black* 10 10 100 100) (let ((x-offset (round (+ 60 (* 50 (aref (axes *js*) 0))))) (y-offset (round (+ 60 (* 50 (aref (axes *js*) 1))))) (twist (+ 60 (round (* 50 (aref (axes *js*) 3))))) (throttle (+ 60 (round (* 50 (aref (axes *js*) 2)))))) (xlib:draw-line *win* *black* x-offset (- y-offset 5) x-offset (+ y-offset 5)) (xlib:draw-line *win* *black* (- x-offset 5) y-offset (+ x-offset 5) y-offset) (xlib:draw-line *win* *black* twist 120 twist 130) (xlib:draw-line *win* *black* 120 throttle 130 throttle) (loop for n from 0 for bitt across (buttons *js*) do (multiple-value-bind (y x) ( truncate n 4) (let ((x (+ 135 (* 10 x))) (y (+ 10 (* 10 y)))) (xlib:draw-arc *win* *black* x y 6 6 0 (* 2 pi) (not (zerop bitt)))))) ) (xlib:display-force-output *display*))

1 0

[gamelib-cvs] stick.html
by Ingvar Mattsson 27 Dec '06

27 Dec '06

Update of /project/gamelib/cvsroot/source/doc In directory clnet:/tmp/cvs-serv13839 Modified Files: stick.html Log Message: IM Linked in some demo code. Index: stick.html =================================================================== RCS file: /project/gamelib/cvsroot/source/doc/stick.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** stick.html 27 Dec 2006 20:26:59 -0000 1.3 --- stick.html 27 Dec 2006 21:26:45 -0000 1.4 *************** *** 59,62 **** --- 59,64 ---- </p> + <p>A quick example using the stick library can be found <a href="demo-stick.lisp">here</a>.</p> + <h3>Full STICK package exported symbol list</h3> <dl>

1 0

[gamelib-cvs] stick.html
by Ingvar Mattsson 27 Dec '06

27 Dec '06

Update of /project/gamelib/cvsroot/source/doc In directory clnet:/tmp/cvs-serv5728 Modified Files: stick.html Log Message: IM Ooops, title still said "3d library", now changed. Index: stick.html =================================================================== RCS file: /project/gamelib/cvsroot/source/doc/stick.html,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** stick.html 27 Dec 2006 19:27:24 -0000 1.2 --- stick.html 27 Dec 2006 20:26:59 -0000 1.3 *************** *** 4,8 **** <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> ! <title>Gamelib - games-3d library</title> <link rel="stylesheet" type="text/css" href="../style.css"/> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> --- 4,8 ---- <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> ! <title>Gamelib - games-stick library</title> <link rel="stylesheet" type="text/css" href="../style.css"/> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>

1 0

[gamelib-cvs] index.html
by Ingvar Mattsson 27 Dec '06

27 Dec '06

Update of /project/gamelib/cvsroot/source/doc In directory clnet:/tmp/cvs-serv3639 Modified Files: index.html Log Message: IM Added the joystick docs to the main page. Index: index.html =================================================================== RCS file: /project/gamelib/cvsroot/source/doc/index.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** index.html 23 Sep 2006 07:46:28 -0000 1.4 --- index.html 27 Dec 2006 20:18:34 -0000 1.5 *************** *** 27,32 **** <h2>Components</h2> ! <p>Gamelib has three components, <a href="ai.html">the AI component</a>, the <a href="games-2d.html">games-2D</a> component and the ! <a href="3d.html">games-3d</a> component.</p> <h2>Intended use</h2> --- 27,32 ---- <h2>Components</h2> ! <p>Gamelib has four components, <a href="ai.html">the AI component</a>, the <a href="games-2d.html">games-2D</a> component, the ! <a href="3d.html">games-3d</a> component and the <a href="stick.html">joystick</a> component.</p> <h2>Intended use</h2>

1 0

[gamelib-cvs] stick.html
by Ingvar Mattsson 27 Dec '06

27 Dec '06

Update of /project/gamelib/cvsroot/source/doc In directory clnet:/tmp/cvs-serv30530 Modified Files: stick.html Log Message: IM Better documentation and some explanatory graphs. Index: stick.html =================================================================== RCS file: /project/gamelib/cvsroot/source/doc/stick.html,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** stick.html 27 Dec 2006 16:29:57 -0000 1.1 --- stick.html 27 Dec 2006 19:27:24 -0000 1.2 *************** *** 37,41 **** terminate the polling thread, call TERMINATE-POLL with the object as argument). All relevant locking is done, keyed on if a joystick is ! polled or not</p> <p>There are two arrays that are of interest in a joystick object --- 37,42 ---- terminate the polling thread, call TERMINATE-POLL with the object as argument). All relevant locking is done, keyed on if a joystick is ! polled or not. Still, the publicly available information will only be ! done after a call to UPDATE-STICK.</p> <p>There are two arrays that are of interest in a joystick object *************** *** 44,45 **** --- 45,95 ---- supports up to 8 analog axes and up to 24 buttons (and will most likely crash in amusing ways, should these limits be too strict).</p> + + <p>As part of the update and transformation from signed 16-bit integers + to SINGLE-FLOAT, some transformations of the data can be done. The + (currently) available library functions are SIMPLE-TRANSFER (the + default), a simple division by 32768.0s0 and SQUARE-TRANSFER (the + result of a SIMPLE-TRANSFER, squared and multiplied by the + signum).</p> + + <p>A graph displaying these two transfer functions (X axis is raw + joystick data, Y axis is the displacement along the axis available + from GAMES-STICK):<br> + <img src="stick-transfers.png" alt="Transfer function graph"> + </p> + + <h3>Full STICK package exported symbol list</h3> + <dl> + <dt> (axes <i>joystick</i>) + <dd> Returns an array, with axis 0 at index 0, axis 1 at index 1 and + so on. + <dt> (buttons <i>joystick</i>) + <dd> Returns a bit-vector, with button 0 at index 0, button 1 at + index 1 and so forth. A value of 0 means "not pressed", a value of 1 + means "pressed". + <dt> (make-stick <i>device-file</i>) + <dd> Create a joystick object for the named device. + <dt> (set-transfer <i>joystick</i> <i>axis</i> <i>transfer-fn</i>) + <dd> Set the transfer function for axis to the desired transfer + function. A transfer function should map from [ -32768, 32767 ] to [ + -1.0s0, 1.0s0 ]. + <dt> (simple-transfer <i>value</i>) + <dd> A simple transfer function (linear mapping from the integer + range to the single-float range). + <dt> (square-transfer <i>value</i>) + <dd> A slightly more complex transfer function, causing less + sensitivity in the "close to centred" region and slightly higher + sensitivity in the more extreme regions. + <dt> (update-stick <i>joystick</i>) + <dd> Copy current (hidden) data to teh publicly available data. Also + applies the relevant transfer functions. + <dt> (continous-poll <i>joystick</i>) + <dd> Only available if build with :SB-THREAD available on + *FEATURES*.<br>Start a separate thread reading from the device. Still + requires UPDATE-STICK to copy from private to pubic data. + <dt> (terminate-poll <i>joystick</i>) + <dd> Only available if build with :SB-THREAD available on + *FEATURES*.<br>Terminate continous polling for a specific joystick. + </dl> + </body> + </html>

1 0

[gamelib-cvs] stick-transfers.png
by Ingvar Mattsson 27 Dec '06

27 Dec '06

Update of /project/gamelib/cvsroot/source/doc In directory clnet:/tmp/cvs-serv28371 Added Files: stick-transfers.png Log Message: IM Initial check-in. --- NEW FILE: stick-transfers.png --- (This appears to be a binary file; contents omitted.)

1 0

[gamelib-cvs] stick.html
by Ingvar Mattsson 27 Dec '06

27 Dec '06

Update of /project/gamelib/cvsroot/source/doc In directory clnet:/tmp/cvs-serv968/doc Added Files: stick.html Log Message: IM Initial check-in --- NEW FILE: stick.html --- <?xml version="1.0"?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> <head> <title>Gamelib - games-3d library</title> <link rel="stylesheet" type="text/css" href="../style.css"/> <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/> </head> <body> <div class="header"> <h1>Gamelib</h1> <h2>The joystick library</h2> </div> <h3>Introduction</h3> <p>Having the use of a joystick enhances the sensation of presence in a game. Under linux, the available joystick API is based around periodic reading of events from a device driver file (usually /dev/js<i>X</i> or /dev/input/js<i>X</i>).</p> <p>Gamelib now offers an interface to handle joysticks on the linux platform (code for joystick handling on other platforms is welcome). The joystick is somewhat abstracted from the raw data that the device driver offers.</p> <h3>API</h3> <p>The interface is centred around a JOYSTICK object (created by calling MAKE-STICK with a suitable device name as argument). To read an event from the device driver, call UPDATE-STICK with the joystick object as argument.</p> <p>Under SBCL (with thread support) there is a "continous poll" support (simply call CONTINOUS-POLL with the joystick object as argument, to terminate the polling thread, call TERMINATE-POLL with the object as argument). All relevant locking is done, keyed on if a joystick is polled or not</p> <p>There are two arrays that are of interest in a joystick object <i>js</i>. The first is the analog axes, (axes <i>js</i>) and the second is the buttons (buttons <i>js</i>). The library currently supports up to 8 analog axes and up to 24 buttons (and will most likely crash in amusing ways, should these limits be too strict).</p>

1 0

[gamelib-cvs] 3d.html
by Ingvar Mattsson 10 Oct '06

10 Oct '06

Update of /project/gamelib/cvsroot/source/doc In directory clnet:/tmp/cvs-serv18554 Modified Files: 3d.html Log Message: Documentation changes (mostly concerning the 3d camera). Index: 3d.html =================================================================== RCS file: /project/gamelib/cvsroot/source/doc/3d.html,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** 3d.html 4 Sep 2006 06:27:16 -0000 1.3 --- 3d.html 10 Oct 2006 06:24:30 -0000 1.4 *************** *** 23,29 **** as up/down.</p> ! <p>The built-in camera class is geared towards a camera that slides ! around and doesn't turn other than around the Z axis, but that might ! be changed in future releases.</p> <h3><a name="defvol">Defining volumes</a></h3> --- 23,29 ---- as up/down.</p> ! <p>Starting with version 0.3, there are two cameras available. The "old" ! camera, capable of moving in X, Y and Z, always turning in the XY ! plane and the "new" (or 3D) camera, having 6 degrees of freedom.</p> <h3><a name="defvol">Defining volumes</a></h3> *************** *** 50,53 **** --- 50,66 ---- count or what-have-you).</p> + <h3>Base and transform designators</h3> + + <p>Starting from version 0.3, there is a "fully 3D" camera available, + necessitating some new concepts and accessors (hopefully seamlessly + integrated into the whole). The most developer-visible of these are + "base designators" and "transform designators".</p> + + <p>A "base designator" is either 3-element vector, array or list.</p> + + <i>A "transform designator" is a 3-element sequence of "base + designators", specifying the (world coordinate) vectors from the + camera origo to [ 1, 0, 0 ], [ 0, 1, 0 ] and [ 0, 0, 1 ].</i> + <h3>What will be shown and how?</h3> *************** *** 98,101 **** --- 111,120 ---- 3d-rendering is made on. Also guides the size of the X window it will be displayed in. + <dt>3d-camera + <dd>(3d-camera <i>x</i> <i>y</i> <i>z</i> <b><i>&optional</i></b> + <i>transform</i>)<br> + Return a newly constructed 3d-camera object, at position [ X, Y, Z ]. + If an optional transform designator is passed it, the camera will + use this as its transform, otherwise it will use a unit transform. <dt>box <dd>Shape class. 8 corners, 6 sides. *************** *** 137,140 **** --- 156,165 ---- <dt>flat <dd>Shape class, superclass for all flat surfaces. + <dt>full-move + <dd>(full-move <i>camera</i> <i>displacement</i>)<br> + Displace the camera by <i>displacement</i>, a 3D coordinate (using the + camera's position as origo, expressed in the camera coordinate + system). The displacement will be transformed into world coordinates + before being applied. <dt>get-centre <dd>(get-centre <i>shape</i> <i><i><b>&optional</b></i> *************** *** 161,166 **** <dd>Shape class (flat) <dt>turn ! <dd>(turn <i>object</i> <i>angle</i>)<br> ! Generic function. Turn <i>object</i> through <i>angle</i> around the Z axis. <dt>volume <dd>Shape class, superclass for all volumes. --- 186,195 ---- <dd>Shape class (flat) <dt>turn ! <dd>(turn <i>object</i> <i>angle</i> <b><i>&optional</i></b> <i>angle</i>)<br> ! Generic function. Turn <i>object</i> through <i>angle</i>. If the ! object is "the standard camera" it will be turned around the Z axis. A ! 3D camera will default to turn around teh Z axis unless otherwise ! specified. Axes are designated by the :x :y or :z keywords. The angle ! is specified in radians. <dt>volume <dd>Shape class, superclass for all volumes.

1 0

[gamelib-cvs] shapes.lisp
by Ingvar Mattsson 10 Oct '06

10 Oct '06

Update of /project/gamelib/cvsroot/source In directory clnet:/tmp/cvs-serv18473 Modified Files: shapes.lisp Log Message: Minor bugfixes. Index: shapes.lisp =================================================================== RCS file: /project/gamelib/cvsroot/source/shapes.lisp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** shapes.lisp 10 Oct 2006 06:19:33 -0000 1.7 --- shapes.lisp 10 Oct 2006 06:24:06 -0000 1.8 *************** *** 84,88 **** (yb2 (base-transform xbase invert ybase)) (zb2 (base-transform xbase invert zbase))) ! (setf (transform cam (build-transform (list xbase ybase zbase)))))))) (defmethod get-centre ((shape sphere) &optional camera) --- 84,88 ---- (yb2 (base-transform xbase invert ybase)) (zb2 (base-transform xbase invert zbase))) ! (setf (transform cam) (build-transform (list xb2 yb2 zb2))))))) (defmethod get-centre ((shape sphere) &optional camera)

1 0

[gamelib-cvs] coords.lisp
by Ingvar Mattsson 10 Oct '06

10 Oct '06

Update of /project/gamelib/cvsroot/source In directory clnet:/tmp/cvs-serv16563 Modified Files: coords.lisp packages-3d.lisp shapes.lisp Log Message: Added 3D camera (with movement and turning). Index: packages-3d.lisp =================================================================== RCS file: /project/gamelib/cvsroot/source/packages-3d.lisp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** packages-3d.lisp 5 Sep 2006 06:04:32 -0000 1.4 --- packages-3d.lisp 10 Oct 2006 06:19:33 -0000 1.5 *************** *** 5,9 **** #:*score-table* #:+screen-side+ #:box #:camera #:camera-to-screen #:collide-p #:collide-action #:coord #:draw-all-shapes #:draw-grid ! #:draw-shape #:defvolume #:flat #:get-centre #:move #:octaeder #:score-from-object #:shape #:tetraeder #:tetragon --- 5,9 ---- #:*score-table* #:+screen-side+ #:box #:camera #:camera-to-screen #:collide-p #:collide-action #:coord #:draw-all-shapes #:draw-grid ! #:draw-shape #:defvolume #:flat #:full-move #:3d-camera #:get-centre #:move #:octaeder #:score-from-object #:shape #:tetraeder #:tetragon Index: shapes.lisp =================================================================== RCS file: /project/gamelib/cvsroot/source/shapes.lisp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** shapes.lisp 29 Sep 2006 06:30:38 -0000 1.6 --- shapes.lisp 10 Oct 2006 06:19:33 -0000 1.7 *************** *** 11,15 **** (defgeneric get-centre (shape &optional camera )) (defgeneric move (object &optional distance)) ! (defgeneric turn (object angle)) (defvar *skip-zapping-cam-state* nil) --- 11,16 ---- (defgeneric get-centre (shape &optional camera )) (defgeneric move (object &optional distance)) ! (defgeneric full-move (object displacement)) ! (defgeneric turn (object angle &optional axis)) (defvar *skip-zapping-cam-state* nil) *************** *** 50,60 **** (incf (y cam) (y move-to)) (incf (z cam) (z move-to))))) - ! (defmethod turn ((cam camera) angle) (let ((tmp (angle cam))) (declare (double-float tmp angle)) (setf (angle cam) (mod (+ angle tmp) (* pi 2.0d0))))) (defmethod get-centre ((shape sphere) &optional camera) (update-cam-vertexes shape) --- 51,89 ---- (incf (y cam) (y move-to)) (incf (z cam) (z move-to))))) ! (defmethod full-move ((cam 3d-camera) displacement) ! (let ((move-to (vector (the-x displacement) ! (the-y displacement) ! (the-z displacement)))) ! (let ((move-to (base-transform move-to (transform cam) move-to))) ! (incf (x cam) (x move-to)) ! (incf (y cam) (y move-to)) ! (incf (z cam) (z move-to))))) ! ! (defmethod turn ((cam camera) angle &optional axis) ! (declare (ignore axis)) (let ((tmp (angle cam))) (declare (double-float tmp angle)) (setf (angle cam) (mod (+ angle tmp) (* pi 2.0d0))))) + (defmethod turn ((cam 3d-camera) angle &optional (axis :z)) + (multiple-value-bind (xbase ybase zbase) + (let ((angle-2 (+ angle (* 2.0d0 pi)))) + (case axis + (:z (values (vector (cos angle) (sin angle) 0.0d0) + (vector (cos angle-2) (sin angle-2) 0.0d0) + (vector 0.0d0 0.0d0 1.0d0))) + (:y (values (vector (cos angle-2) (sin angle-2) 0.0d0) + (vector 0.0d0 0.0d0 1.0d0) + (vector (cos angle) (sin angle) 0.0d0))) + (:x (values (vector 0.0d0 0.0d0 1.0d0) + (vector (cos angle) (sin angle) 0.0d0) + (vector (cos angle-2) (sin angle-2) 0.0d0))))) + (let ((invert (invert-transform (transform cam)))) + (let ((xb2 (base-transform xbase invert xbase)) + (yb2 (base-transform xbase invert ybase)) + (zb2 (base-transform xbase invert zbase))) + (setf (transform cam (build-transform (list xbase ybase zbase)))))))) + (defmethod get-centre ((shape sphere) &optional camera) (update-cam-vertexes shape) Index: coords.lisp =================================================================== RCS file: /project/gamelib/cvsroot/source/coords.lisp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** coords.lisp 29 Sep 2006 06:30:38 -0000 1.4 --- coords.lisp 10 Oct 2006 06:19:33 -0000 1.5 *************** *** 25,32 **** (defmethod x ((ar array)) (aref ar 0)) - (defmethod y ((ar array)) (aref ar 1)) - (defmethod z ((ar array)) (aref ar 2)) --- 25,30 ---- *************** *** 35,42 **** (defmethod (setf x) (new (ar array)) (setf (aref ar 0) new)) - (defmethod (setf y) (new (ar array)) (setf (aref ar 1) new)) - (defmethod (setf z) (new (ar array)) (setf (aref ar 2) new)) --- 33,38 ---- *************** *** 97,102 **** (setf ybase (base-transform (vector 0.0d0 1.0d0 0.0d0) transform ybase)) (setf zbase (base-transform (vector 0.0d0 0.0d0 1.0d0) transform zbase)) ! (build-transform (list xbase ybase zbase)))) ! (defmethod world-to-camera (w c &optional result) --- 93,97 ---- (setf ybase (base-transform (vector 0.0d0 1.0d0 0.0d0) transform ybase)) (setf zbase (base-transform (vector 0.0d0 0.0d0 1.0d0) transform zbase)) ! (build-transform (list xbase ybase zbase)))) (defmethod world-to-camera (w c &optional result)

1 0