From f8b4cafdb8550079fd850a71f4c637e646ba0c20 Mon Sep 17 00:00:00 2001
From: John Connors <johnc@yagc.ndo.co.uk>
Date: Thu, 21 Aug 2008 01:15:03 +0100
Subject: [PATCH] Implementing make-mesh

---
 mesh-expander.lisp | 16 +++++++++++++---
 package.lisp       |  1 +
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/mesh-expander.lisp b/mesh-expander.lisp
index a7d452f..13f6658 100644
--- a/mesh-expander.lisp
+++ b/mesh-expander.lisp
@@ -3,10 +3,10 @@
 
 ;; -- keep track of every mesh instance ----------------------------------
 
-(defparameter *meshes* (make-hash-table :test 'equalp)
+(defparameter *meshes* (make-hash-table :test 'eq)
   "A table of meshes.")
 
-(defparameter *textures* (make-hash-table :test 'equalp)
+(defparameter *textures* (make-hash-table :test 'eq)
   "A table of textures.")
 
 
@@ -16,7 +16,7 @@
   ((face-array :accessor faces-of :initform (make-triangle-array 0 :adjustable t :fill-pointer 0) :type (vector (unsigned-byte 16) *))
    (current-face-index :accessor current-face-index-of :initform 0 :type fixnum)
    (current-vertex-index :accessor current-vertex-index-of :initform 0 :type fixnum)
-   (id :reader id-of :initform (get-universal-time)))
+   (id :allocation :class :accessor id-of :initform (get-universal-time)))
   (:metaclass closer-mop:funcallable-standard-class)
   (:documentation "Base class for all meshes"))
 
@@ -37,10 +37,20 @@
 (defmethod initialize-instance :after ((self base-mesh) &rest args)
   (declare (ignore args))
   ;; treat the object as a function
+  (setf (gethash (id-of self) *meshes*) self)
   (closer-mop:set-funcallable-instance-function 
    self
    #'(lambda (op &optional data) (mesh-builder self op data))))
 
+(defun make-mesh (mesh-type)
+  "Create a mesh instance and return the handle to it"
+  (let* ((mesh
+         (make-instance mesh-type))
+        (result
+         (id-of mesh)))
+    (incf (id-of mesh))
+    result))
+
 ;; expanders for individual aspects of a mesh --------------------
 
 (defun expand-mesh-class-attributes (attributes)
diff --git a/package.lisp b/package.lisp
index 1c4e974..ecaadd8 100644
--- a/package.lisp
+++ b/package.lisp
@@ -7,6 +7,7 @@
             #:face-array
             #:base-mesh
             #:simple-mesh
+            #:make-mesh
             #:mesh
             #:textured-mesh
             #:coloured-mesh            
-- 
2.11.4.GIT