Commit 11d58265 authored by Dave Cooper's avatar Dave Cooper

added docs for cardinal, fixed bug in global-filleted-polyine when given only 2 vertex points.

parent 330fa5ce
......@@ -102,7 +102,8 @@
(set-frame-font
(format
(case system-type
(darwin "-apple-Courier_New-medium-normal-normal-*-%s-*-*-*-m-0-iso10646-1")
(darwin "-*-Courier New-normal-normal-normal-*-%s-*-*-*-m-0-iso10646-1" ;; -apple-Courier_New-medium-normal-normal-*-%s-*-*-*-m-0-iso10646-1"
)
(windows-nt "-outline-Courier New-normal-normal-normal-mono-%s-*-*-*-c-*-iso8859-1")
(gnu/linux "-bitstream-Courier 10 Pitch-normal-normal-normal-*-%s-*-*-*-m-0-iso10646-1"))
font-size))))
......@@ -196,6 +197,7 @@
(defvar gdl-startup-string nil)
(setq gdl-startup-string
(format
"(progn (unless (find-package :gendl)
......
......@@ -79,23 +79,30 @@ filleted-polyline."
(%renderer-info% (list :vrml? t :view-default :top))
(path-info (append
(let ((first? t))
(mapcan
#'(lambda(straight curve-set)
(append (if first? (progn (setq first? nil)
(list :move (first straight)
:line (second straight)))
(list :line (second straight)))
(apply #'append
(mapcar #'(lambda(curve)
(cons :curve (rest (reverse curve))))
(reverse (the-object curve-set %curves-to-draw%))))))
(the straights) (list-elements (the fillets))))
(when (> (length (the straights)) (the fillets number-of-elements))
(list :line (second (lastcar (the straights)))))))
(path-info (cond
((null (rest (the vertex-list)))
(error "Vertex-list must contain at least two points."))
((null (rest (rest (the vertex-list))))
(list :move (first (the vertex-list)) :line (second (the vertex-list))))
(t (append
(let ((first? t))
(mapcan
#'(lambda(straight curve-set)
(append (if first? (progn (setq first? nil)
(list :move (first straight)
:line (second straight)))
(list :line (second straight)))
(apply #'append
(mapcar #'(lambda(curve)
(cons :curve (rest (reverse curve))))
(reverse (the-object curve-set %curves-to-draw%))))))
(the straights) (list-elements (the fillets))))
(when (> (length (the straights)) (the fillets number-of-elements))
(list :line (second (lastcar (the straights)))))))))
(fillet-types (mapcar #'(lambda(test)
(if (the-object test valid?) 'fillet 'null-part))
......
......@@ -22,10 +22,11 @@
(in-package :geom-base)
(define-object outline-specialization-mixin (base-object)
:input-slots
((outline-objects (the hidden-children)))
:computed-slots
((outline-objects (the hidden-children))
(local-box (bounding-box-from-list (the outline-objects)))
((local-box (bounding-box-from-list (the outline-objects)))
(outline-leaves (apply #'append
......
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -30,7 +30,7 @@ to a Catmull-Rom Spline for nil tension-params (which means they all
default to 0.0)."
:author "Dave Cooper, Genworks International")
:input-slots (through-points
:input-slots ("List of 3D Points. The points through which the curve will pass." through-points
(tension-params nil)
("Boolean. Indicates whether the curve should close back to its start point. Default is <tt>nil</tt>."
periodic? nil)
......
......@@ -69,10 +69,12 @@ into a single curve."
(if (< (the fillet-curves number-of-elements) (the straight-curves number-of-elements))
(cons (the straight-curves last) tail) tail)))
(fillet-curve-types (mapcar #'(lambda(fillet-index)
(if (typep (the (fillets fillet-index)) 'geom-base::fillet)
'arc-curve 'null-part))
(list-of-numbers 0 (1- (the fillets number-of-elements))))))
(fillet-curve-types (let ((number-of-fillets (the fillets number-of-elements)))
(unless (zerop number-of-fillets)
(mapcar #'(lambda(fillet-index)
(if (typep (the (fillets fillet-index)) 'geom-base::fillet)
'arc-curve 'null-part))
(list-of-numbers 0 (1- number-of-fillets)))))))
:hidden-objects
(("GDL Sequence of GDL NURBS curve objects. The arc-curves representing the fillets."
......
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