Major issues fixed!

autowrap.lisp

@@ -3,20 +3,14 @@
 
 (c-include "/usr/local/include/chipmunk/chipmunk.h"
  :spec-path '(cl-chipmunk spec)
- :definition-package :%chipmunk
+ :definition-package :%chip
  ;;:exclude-sources (".*.h")
  :include-sources ("chipmunk/cpVect.h"
  		   "chipmunk/cpBB.h"
                    "chipmunk/cpSpace.h"
 		   "chipmunk/cpSpatialIndex.h"
 		   "chipmunk/cpBody.h"
-                   ;; "chipmunk/cpShape.h"
- 		   ;; "chipmunk/cpPolyShape.h"
- 		   ;; "chipmunk/cpArbiter.h"
- 		   ;; "chipmunk/constraints/cpConstraint.h"
- 		   )
- )
- ;;:exclude-definitions ("dWorldSetStepThreadingImplementation")
- ;; :symbol-regex (("cp?[A-Z]\\w*" () (lambda (name matches regex)
- ;;                                   (declare (ignore matches regex))
- ;;                                   (subseq name 2)))))
+                   "chipmunk/cpShape.h"
+ 		   "chipmunk/cpPolyShape.h"
+ 		   "chipmunk/cpArbiter.h"
+ 		   "chipmunk/constraints/cpConstraint.h"))

cl-chipmunk.asd

@@ -12,12 +12,12 @@
   :author "Pavel Korolev"
   :mailto "[email protected]"
   :license "MIT"
-  :depends-on (alexandria cl-autowrap/libffi cl-plus-c )
+  :depends-on (alexandria cl-autowrap/libffi cl-plus-c rtg-math)
   :serial t
   :components ((:file "packages")
                (:file "libchipmunk")
                (:file "autowrap")
-
-               ;;(:file "ode")
-                (:module spec
-                         :components ((:static-file "chipmunk.h")))))
+	       (:module spec
+			:components ((:static-file "chipmunk.h")))
+	       (:file "utils")
+	       (:file "space")))

libchipmunk.lisp

@@ -1,10 +1,9 @@
 (cl:in-package :%chipmunk)
 
-
 (cffi:define-foreign-library libchipmunk
-  (:darwin (:or "libchipmunk.6.dylib" "libchipmunk.dylib"))
-  (:unix (:or "libchipmunk.so.0d3.0.0" ; debian/ubuntu convention for 0.14 version
-              "libchipmunk.so.0d3" "libchipmunk.so.0d3"))
+  (:darwin (:or "libchipmunk.7.dylib" "libchipmunk.dylib"))
+  (:unix (:or "libchipmunk.so.7" ; debian/ubuntu convention for 0.14 version
+              "libchipmunk.so.7.0.1" "libchipmunk.so"))
   (:windows "chipmunk.dll")
   (t (:default "chipmunk")))
 

packages.lisp

@@ -2,10 +2,15 @@
 
 
 (defpackage :%chipmunk
+  (:nicknames :%chip)
   (:use))
 
 
 (defpackage :cl-chipmunk
   (:nicknames :chipmunk :chip)
   (:use :cl :alexandria :autowrap :plus-c)
-  (:export ))
+  (:export 
+
+   #:cp-space-init
+   #:cp-space-new
+   #:cp-space-get-gravity))

space.lisp

@@ -0,0 +1,20 @@
+(in-package :cl-chipmunk)
+
+
+(defun cp-space-new ()
+  (with-float-traps-masked
+    (%chip:cp-space-new)))
+
+
+
+(defun cp-space-get-gravity (space)
+  (with-returned-vect (ret) 
+    (%chipmunk:cp-space-get-gravity ret space)))
+
+
+;; (plus-c:c-with ((ret %chip:cp-vect))
+;;   	   (%chipmunk:cp-space-get-gravity g space)
+;; 	   (print (plus-c:c-ref g %chipmunk:cp-vect :x)))
+
+;; (plus-c:c-with ((g %chipmunk:cp-vect))
+

utils.lisp

@@ -0,0 +1,24 @@
+(in-package :cl-chipmunk)
+
+
+(defmacro with-float-traps-masked (&body body)
+  (let ((masking #+sbcl '(sb-int:with-float-traps-masked (:overflow
+							  :underflow
+							  :inexact
+							  :invalid
+							  :divide-by-zero))
+		 #-sbcl '(progn)))
+    `(,@masking
+      ,@body)))
+
+
+(defmacro cp-vect->lisp (x)
+  (let ((var (gensym)))
+    `(let ((,var ,x))
+       (rtg-math:v! (plus-c:c-ref ,var %chipmunk:cp-vect :x)
+	   (plus-c:c-ref ,var %chipmunk:cp-vect :y)))))
+
+(defmacro with-returned-vect ((name) &body body)
+  `(plus-c:c-with ((,name %chipmunk:cp-vect))
+     ,@body
+     (cp-vect->lisp ,name)))