Commit f9f8b4d9 authored by Dave Cooper's avatar Dave Cooper

first phase of dynamic x3dom interaction.

parent 11013d8a
......@@ -64,7 +64,10 @@ o filter inspector slots to local slots
(the tree update!)))
(use-jquery? (the have-valid-instance?))
(use-raphael? (the have-valid-instance?)))
(use-raphael? (the have-valid-instance?))
(use-x3dom? (the have-valid-instance?))
)
:computed-slots
(
......
......@@ -112,7 +112,8 @@
,setter))))))
#-:lispworks
(glisp:without-redefinition-warnings
(#-clozure glisp:without-redefinition-warnings
#+clozure progn
(defmacro when-let (binding &body body)
(destructuring-bind (var val) binding
`(let ((,var ,val))
......
......@@ -365,10 +365,10 @@ to call the :write-embedded-x3d-world function."))
(with-format (x3d *stream*)
(let ((*onclick-function* (the onclick-function)))
(write-the view-object cad-output)))))))
((:script :type "text/javascript"
:src "/static/3rdpty/x3dom/x3dom.js" :id "xdom_script"))
((:script :type "text/javascript")
"x3dom.reload();")
(when (the x3dom-view-controls?)
(htm (:tr (:td ((:span :style "color: blue; cursor: pointer;"
:onclick "document.getElementById('the_element').runtime.showAll();")
......
......@@ -21,6 +21,7 @@
(in-package :gwl)
(defmacro w-c-w-s ((&rest args) &rest body) `(with-cl-who-string ,args ,@body))
......@@ -455,7 +456,10 @@ from a saved snapshot file."
(when (the use-x3dom?)
(htm ((:script :type "text/javascript"
:src
"/static/3rdpty/x3dom/x3dom.js" :id "x3dom_script"))))
(if *x3dom-dev?*
"/static/3rdpty/x3dom/x3dom-dev.js"
"/static/3rdpty/x3dom/x3dom.js")
:id "x3dom_script"))))
(when (the use-raphael?)
(htm ((:script :type "text/javascript"
......
......@@ -26,3 +26,4 @@
(defparameter *ajax-timeout* 60)
(defparameter *x3dom-dev?* nil)
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