From: jsancho Date: Tue, 21 Dec 2010 20:39:47 +0000 (+0000) Subject: (no commit message) X-Git-Url: https://git.jsancho.org/?a=commitdiff_plain;h=0678570f5ab17948ac2c1c23821abbcbc0a8bbb6;p=gacela.git --- diff --git a/Makefile b/Makefile index 23c1979..ec24457 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ INC = -I/usr/include/FTGL -I/usr/include/freetype2 LIBS = -lSDL -lSDL_image -lSDL_mixer -lSDL_gfx -lGL -lGLU -lftgl OBJ = gacela.o gacela_misc.o gacela_SDL.o gacela_GL.o gacela_FTGL.o \ - gacela_draw.o gacela_ttf.o gacela_events.o gacela_mobs.o gacela_boxes.o \ + gacela_draw.o gacela_ttf.o gacela_events.o gacela_mobs.o gacela_entities.o \ gacela_widgets.o gacela_sound.o GCL_OBJ = $(OBJ:%.o=\"%.o\") diff --git a/gacela_boxes.lisp b/gacela_boxes.lisp deleted file mode 100755 index 61ab0a4..0000000 --- a/gacela_boxes.lisp +++ /dev/null @@ -1,67 +0,0 @@ -;;; Gacela, a GNU Common Lisp extension for fast games development -;;; Copyright (C) 2009 by Javier Sancho Fernandez -;;; -;;; This program is free software: you can redistribute it and/or modify -;;; it under the terms of the GNU General Public License as published by -;;; the Free Software Foundation, either version 3 of the License, or -;;; (at your option) any later version. -;;; -;;; This program is distributed in the hope that it will be useful, -;;; but WITHOUT ANY WARRANTY; without even the implied warranty of -;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -;;; GNU General Public License for more details. -;;; -;;; You should have received a copy of the GNU General Public License -;;; along with this program. If not, see . - - -(eval-when (compile load eval) - (when (not (find-package 'gacela)) (make-package 'gacela :nicknames '(gg) :use '(lisp))) - (in-package 'gacela :nicknames '(gg) :use '(lisp))) - - -;;; Boxes Factory - -(let (visible-boxes boxes-to-add boxes-to-quit) - (defun add-box (box) - (push box boxes-to-add)) - - (defun quit-box (box) - (push box boxes-to-quit)) - - (defun quit-all-boxes () - (setq visible-boxes nil boxes-to-add nil boxes-to-quit nil)) - - (defun refresh-visible-boxes () - (cond (boxes-to-add - (setq visible-boxes (union visible-boxes boxes-to-add)) - (setq boxes-to-add nil))) - (cond (boxes-to-quit - (setq visible-boxes (reverse (set-difference visible-boxes boxes-to-quit))) - (setq boxes-to-quit nil)))) - - (defun render-boxes () - (labels ((render (l) - (cond (l (funcall (render-fun-name (car l))) - (render (cdr l)))))) - (render visible-boxes)))) - - -(defun render-fun-name (name) - (intern (concatenate 'string "RENDER-BOX-" (string name)) 'gacela)) - -(defun get-props-fun-name (name) - (intern (concatenate 'string "GET-PROPERTIES-BOX-" (string name)) 'gacela)) - -(defmacro make-box (name properties &rest code) - `(progn - (let ,(union '((rx 0) (ry 0) (rz 0)) properties) - (defun ,(render-fun-name name) () ,@code) - (defun ,(get-props-fun-name name) () (list :rx rx :ry ry :rz rz))) - (add-box ',name))) - - -;;; Translations and rotations - -(defun rotate-box (&rest rot) - ) \ No newline at end of file diff --git a/gacela_entities.lisp b/gacela_entities.lisp new file mode 100755 index 0000000..c4ac79b --- /dev/null +++ b/gacela_entities.lisp @@ -0,0 +1,90 @@ +;;; Gacela, a GNU Common Lisp extension for fast games development +;;; Copyright (C) 2009 by Javier Sancho Fernandez +;;; +;;; This program is free software: you can redistribute it and/or modify +;;; it under the terms of the GNU General Public License as published by +;;; the Free Software Foundation, either version 3 of the License, or +;;; (at your option) any later version. +;;; +;;; This program is distributed in the hope that it will be useful, +;;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;;; GNU General Public License for more details. +;;; +;;; You should have received a copy of the GNU General Public License +;;; along with this program. If not, see . + + +(eval-when (compile load eval) + (when (not (find-package 'gacela)) (make-package 'gacela :nicknames '(gg) :use '(lisp))) + (in-package 'gacela :nicknames '(gg) :use '(lisp))) + + +;;; Behaviours of entities + +(defmacro make-behaviour (name properties &rest code) + `(defun ,name (entity) + (let ,(mapcar #'property-definition properties) + ,@code + ,(cons 'progn (mapcar #'property-save properties)) + entity))) + +(defun property-name (property) + (intern (string property) 'keyword)) + +(defun property-definition (property) + (let* ((name (cond ((listp property) (car property)) + (t property))) + (pname (property-name name)) + (value (cond ((listp property) (cadr property))))) + `(,name (getf entity ,pname ,value)))) + +(defun property-save (property) + (let* ((name (cond ((listp property) (car property)) + (t property))) + (pname (property-name name))) + `(setf (getf entity ,pname) ,name))) + + + +;;; Constructor + +;;; Boxes Factory + +(let (visible-boxes boxes-to-add boxes-to-quit) + (defun add-box (box) + (push box boxes-to-add)) + + (defun quit-box (box) + (push box boxes-to-quit)) + + (defun quit-all-boxes () + (setq visible-boxes nil boxes-to-add nil boxes-to-quit nil)) + + (defun refresh-visible-boxes () + (cond (boxes-to-add + (setq visible-boxes (union visible-boxes boxes-to-add)) + (setq boxes-to-add nil))) + (cond (boxes-to-quit + (setq visible-boxes (reverse (set-difference visible-boxes boxes-to-quit))) + (setq boxes-to-quit nil)))) + + (defun render-boxes () + (labels ((render (l) + (cond (l (funcall (render-fun-name (car l))) + (render (cdr l)))))) + (render visible-boxes)))) + + +(defun render-fun-name (name) + (intern (concatenate 'string "RENDER-BOX-" (string name)) 'gacela)) + +(defun get-props-fun-name (name) + (intern (concatenate 'string "GET-PROPERTIES-BOX-" (string name)) 'gacela)) + +(defmacro make-box (name properties &rest code) + `(progn + (let ,(union '((rx 0) (ry 0) (rz 0)) properties) + (defun ,(render-fun-name name) () ,@code) + (defun ,(get-props-fun-name name) () (list :rx rx :ry ry :rz rz))) + (add-box ',name)))