Commit c89780cc authored by Dave Cooper's avatar Dave Cooper
Browse files

fixed colorizing issue in emacs Franz ELI, added properties function for brep

parent 12530406
......@@ -28,7 +28,7 @@
(staging-directory #+mswindows "e:/staging/" #-mswindows "~/share/staging/")
(release-directory #+mswindows "e:/release/" #-mswindows "~/share/staging/")
(release-directory #+mswindows "e:/release/" #-mswindows "~/share/release/")
(release-name-mapping '(("acl-8.2m-linux-x86" . "gdl1581-linux")
("acl-8.2m-win-x86" . "gdl1581-windows")))
......@@ -128,7 +128,7 @@
;; smlib shared library
(let ((smlib-version "8.45"))
(let ((smlib-version "8.51"))
(ensure-directories-exist (merge-pathnames (format nil "SMLib~a/" smlib-version) (the target-parent)))
(let ((smlib-name (if (find-package :smlib) (funcall (read-from-string "glisp:smlib-name"))
(error "smlib-name not known (smlib module probably not loaded)."))))
......@@ -102,8 +102,9 @@
":size" ":parameters" ":pass-down" ":inputs" ":optional-inputs"
":modifiable-optional-inputs" ":descendant-attributes" ":attributes"
":parts" ":pseudo-parts" ":methods") t)))
(pushnew (list definition-keywords 0 font-lock-keyword-face) lisp-font-lock-keywords)
(pushnew (list keyword-keywords 0 font-lock-type-face) lisp-font-lock-keywords)))
(pushnew (list definition-keywords 0 font-lock-keyword-face) fi:lisp-font-lock-keywords)
(pushnew (list keyword-keywords 0 font-lock-type-face) fi:lisp-font-lock-keywords)))
......@@ -122,6 +123,17 @@
(defindent defwriter (like define-object))
(defindent defcompanion (like define-object)))
(setq fi:lisp-mode-hook
(lambda ()
(let ((map (current-local-map)))
(define-key map "\C-c." 'find-tag)
(define-key map "\C-c," 'tags-loop-continue)
(define-key map "\e." 'fi:lisp-find-definition)
(define-key map "\e," 'fi:lisp-find-next-definition)))))
;; From EvW
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
......@@ -519,6 +519,17 @@ and moments for the brep. The moments are labeled as: :area-static-moments, :are
(&key (tolerance (the adaptive-tolerance)))
(brep-compute-precise-properties *geometry-kernel* self tolerance))
("Plist with keys: :area, :volume, :barycenter. Returns the approximate area, volume,
and barycenter (center of mass) for the brep. These are computed with tessellation techniques,
which may be less precise than the analytic techniques used in precise-properties, but should
be faster to compute and exhibit more stability.
:&key ((tolerance (the adaptive-tolerance)) \"Controls how precisely the properties are computed\")"
(&key (edge-tess-tolerance (the adaptive-tolerance))
(face-tess-tolerance (the adaptive-tolerance)))
(brep-compute-properties *geometry-kernel* self edge-tess-tolerance face-tess-tolerance))
("Number. Area covered by the faces of the brep.
:&key ((tolerance (the adaptive-tolerance)) \"Controls how precisely the properties are computed\")"
......@@ -566,6 +566,7 @@
(declare (ignore brep tolerance))
(error "Don't know how to compute precise properties from brep with ~s.~%" geometry-kernel))
(define-smlib-wrapper brep-compute-properties (brep &key edge-tess-tolerance face-tess-tolerance))
(defmethod make-blended-brep ((geometry-kernel vanilla-geometry-kernel) brep &key default-radius specs)
(declare (ignore brep default-radius specs))
......@@ -743,4 +744,4 @@
(define-smlib-wrapper make-extend-curve (curve &key distance distance-type extending-from continuity))
(define-smlib-wrapper approximated-compatible-curves (curve-list &key length tolerance))
\ No newline at end of file
(define-smlib-wrapper approximated-compatible-curves (curve-list &key length tolerance))
Supports Markdown
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