X-Git-Url: https://code.consxy.com/gitweb/gitweb.cgi?p=clnl;a=blobdiff_plain;f=src%2Fmain%2Finterface.lisp;h=88dfac51c42b16b38a3120714a80435dc9a31076;hp=931cede5143f633bf5a66bca3e891658dc23fb2d;hb=v0.1.0;hpb=687ec5dde86dc5e9a46f1441051d2b1da13c4478 diff --git a/src/main/interface.lisp b/src/main/interface.lisp index 931cede..88dfac5 100644 --- a/src/main/interface.lisp +++ b/src/main/interface.lisp @@ -6,6 +6,8 @@ (defvar *glut-window-opened* nil) (defvar *dimensions* nil) +(defvar *default-shapes* nil) + ; For now, shapes can live in here ; header is ; * name @@ -182,6 +184,10 @@ (defun default-shapes () (with-open-file (str "resources/defaultshapes") (parse-shapes str))) +(eval-when (:load-toplevel) + (when (probe-file "resources/defaultshapes") + (setf *default-shapes* (default-shapes)))) + (defvar *colors* '((140 140 140) ; gray (5) (215 48 39) ; red (15) @@ -290,7 +296,7 @@ (gl:translate -150d0 -150d0 -0.0d0) (mapcar #'element->gl-list (getf shape :elements))) turtle-list)) - (default-shapes)))) + (or *default-shapes* (default-shapes))))) (defun set-patch-list () (setf *patch-list* (gl:gen-lists 1))