Commit 46bc6c63 authored by Dave Cooper's avatar Dave Cooper
Browse files

added wire-world demo and cleaned up SBCL compile warnings

parent d506336b
......@@ -58,7 +58,7 @@ Defaults to the assembly-import produced from the file-name. " imported-assembly
:hidden-objects
((assembly-import :type (if (the file-name) 'smlib::assembly-import 'null-object)
((assembly-import :type (if (the file-name) (read-from-string "smlib::assembly-import") 'null-object)
:pass-down (file-name))))
......@@ -97,3 +97,30 @@ Defaults to the assembly-import produced from the file-name. " imported-assembly
#-mswindows (probe-file "~/share/tmp/CURSUS0104.stp"))))
(define-object tobie-big-1 (cad-assembly)
:computed-slots ((file-name #+mswindows (or (probe-file "e:/tmp/cadin/cpbbd.stp")
(probe-file "z:/tmp/cadin/cpbbd.stp"))
#-mswindows (probe-file "~/share/tmp/cpbbd.stp"))))
(defun tobie-big-1 ()
(let ((self (make-object 'tobie-big-1)))
(maptree self #'(lambda(object)(the-object object %curves-to-draw%)
(when (typep object 'outline-specialization-mixin)
(the-object object outline-objects))))
self))
(define-object tobie-big-1-flat (step-reader)
:computed-slots ((file-name #+mswindows (or (probe-file "e:/tmp/cadin/cpbbd.stp")
(probe-file "z:/tmp/cadin/cpbbd.stp"))
#-mswindows (probe-file "~/share/tmp/cpbbd.stp"))))
(define-object tobie-big-2 (cad-assembly)
:computed-slots ((file-name #+mswindows (or (probe-file "e:/tmp/cadin/cprta.stp")
(probe-file "z:/tmp/cadin/cprta.stp"))
#-mswindows (probe-file "~/share/tmp/cprta.stp"))))
(define-object tobie-big-2-flat (step-reader)
:computed-slots ((file-name #+mswindows (or (probe-file "e:/tmp/cadin/cprta.stp")
(probe-file "z:/tmp/cadin/cprta.stp"))
#-mswindows (probe-file "~/share/tmp/cprta.stp"))))
\ No newline at end of file
......@@ -200,10 +200,7 @@
(write-env (newline-out)))))
;;
;; FLAG -- have to get rid of conditionalized code.
;;
#+nil
(define-format native (nurbs)
:slots ((file-type :ascii) (objects nil))
......@@ -236,7 +233,7 @@
(let ((buffer-file (namestring (glisp:temporary-file))))
(apply #'write-native-file *geometry-kernel* buffer-file :quiet? t :file-type file-type entity-plist)
(if (and (glisp:featurep :excl)
(typep *stream* 'string-output-simple-stream))
(typep *stream* (read-from-string "excl:string-output-simple-stream")))
(with-open-file (in buffer-file)
(do ((line (read-line in nil nil) (read-line in nil nil)))
((null line))
......
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