Commit a6b5a5f8 authored by Dave Cooper's avatar Dave Cooper

added assoc-list nested, fixed brep interference.

parent 28cc9855
......@@ -11,6 +11,9 @@
(in-package :geysr)
(define-object geysr-try (assembly)
:computed-slots ((root-object-type (read-from-string "gdl-user::try"))))
(define-object geysr-bus (assembly)
:computed-slots ((root-object-type (read-from-string "bus::assembly"))))
......@@ -31,6 +34,8 @@
(define-object geysr-primi-plane (assembly)
:computed-slots ((root-object-type (read-from-string "primi-plane"))))
(define-object geysr-tool-search (assembly)
:computed-slots ((root-object-type (read-from-string "gdl-user::tool-search"))))
(defun initialize ()
......@@ -52,6 +57,8 @@
(publish-gwl-app "/geysr-house" 'geysr-house)
(publish-gwl-app "/geysr-bus" 'geysr-bus)
(publish-gwl-app "/geysr-try" 'geysr-try)
(publish-gwl-app "/geysr-missile" 'geysr-missile)
(publish-gwl-app "/geysr-robot" 'geysr-robot)
......@@ -59,6 +66,8 @@
(publish-gwl-app "/geysr-cpacs" 'geysr-cpacs)
(publish-gwl-app "/geysr-pp" 'geysr-primi-plane)
(publish-gwl-app "/geysr-ts" 'geysr-tool-search)
)))
......
......@@ -84,6 +84,15 @@ by user application code.")
(rest cons)))
assoc-list))
(defun assoc-list-to-plist* (assoc-list &key case-sensitive?)
(if (and (consp assoc-list) (consp (first assoc-list)))
(mapcan #'(lambda(cons)
(list (if case-sensitive? (make-keyword-sensitive (first cons))
(make-keyword-sensitive (first cons)))
(assoc-list-to-plist* (rest cons))))
assoc-list)
assoc-list))
(defun merge-plist-duplicates (plist)
(let ((keys (remove-duplicates (plist-keys plist))))
......
......@@ -472,10 +472,9 @@ The function returns a NIL value if no intersection is found and T if a intersec
(other-brep &key
(tolerance (the adaptive-tolerance))
(angle-tolerance (radians-to-degrees *angle-tolerance-radians-default*)))
(or (box-intersection (the bounding-box) (the-object other-brep bounding-box))
(and (the (bbox-intersect? other-brep))
(brep-intersect? *geometry-kernel* (the %native-brep%) (the-object other-brep %native-brep%)
:tolerance tolerance :angle-tolerance angle-tolerance))))
(when (the (bbox-intersect? other-brep))
(brep-intersect? *geometry-kernel* (the %native-brep%) (the-object other-brep %native-brep%)
:tolerance tolerance :angle-tolerance angle-tolerance)))
(bbox-intersect?
(brep)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment