Commit 0354654d authored by Dave Cooper's avatar Dave Cooper

working to 1588 build

parent fd872cb6
......@@ -4,7 +4,7 @@
"The Gendl\" (legacy) Testing and Tracking Utility, version 2 (using Ajax but pre-gdlAjax, and no JQuery or CSS)"
:author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20141215" :depends-on (:gwl-graphics)
:version "20141227" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -4,7 +4,7 @@
"The Gendl\" Web-based Development Environment (tasty)" :author
"John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20141215" :depends-on (:tree :gwl-graphics)
:version "20141227" :depends-on (:tree :gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -4,7 +4,7 @@
"The Gendl\" Translators to/from XML and potentially other high-level KBE and Knowledge formats"
:author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20141215" :depends-on (:gwl)
:version "20141227" :depends-on (:gwl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -4,7 +4,7 @@
"The Gendl\" Tree component used by Tasty and potentially as a UI component on its own"
:author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20141215" :depends-on (:gwl-graphics)
:version "20141227" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -4,7 +4,7 @@
"The Gendl\" Yet Another Definition Documenter (yadd)" :author
"John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20141215" :depends-on
:version "20141227" :depends-on
(:gwl-graphics #-allegro :cl-html-parse)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:base :description
"The Gendl\" Base Core Kernel Engine" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20141215" :depends-on nil
:serial t :version "20141227" :depends-on nil
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:cl-lite :description
"The Gendl\" Compile-and-Load Lite Utility" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20141215" :depends-on (:glisp)
:serial t :version "20141227" :depends-on (:glisp)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:bus :description
"The Gendl\" Wireframe School Bus Demo" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20141215" :depends-on (:gwl-graphics)
:serial t :version "20141227" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:ledger :description
"The Gendl\" Ledger Bookkeeping Demo" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20141215" :depends-on
:serial t :version "20141227" :depends-on
(#-gwl :gwl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
......
......@@ -4,7 +4,7 @@
"The Gendl\" Simplified Android Robot example " :author
"John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20141215" :depends-on (:gwl-graphics)
:version "20141227" :depends-on (:gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -4,7 +4,7 @@
"The Gendl\" Wire-World demo and test-case for wireframe tessellation and X3D output"
:author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20141215" :depends-on
:version "20141227" :depends-on
(#-gwl-graphics :gwl-graphics)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:examples :description
"The Gendl\" examples Subsystem" :author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20141215" :depends-on (:gwl-graphics :surf)
:version "20141227" :depends-on (:gwl-graphics :surf)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
(in-package :gwl-user)
(define-object x3dom-basic (base-ajax-sheet)
:computed-slots
((use-raphael? t)
(use-x3dom? t)
(main-sheet-body
(with-cl-who-string ()
(:p (when *developing?* (str (the development-links))))
(:p (str (the inputs-section main-div)))
(:table
(:tr
(dolist (viewport (list (the (viewport-sections 1))))
(htm (:td (:td (str (the-object viewport main-div)))))))))))
:objects
((box :type 'box
:display-controls (list :color :blue :transparency 0.2)
:height (the inputs-section box-height value)
:width (the inputs-section box-width value)
:length (the inputs-section box-length value))
(inputs-section :type 'inputs-section)
(viewport-sections
:type 'base-ajax-graphics-sheet
:sequence (:size 2)
:view-direction-default (ecase (the-child index)
(0 :top) (1 :trimetric))
:image-format-default :raphael
:display-list-objects (list (the box))
:length 500 :width 500)))
(define-object inputs-section (sheet-section)
:computed-slots
((inner-html (with-cl-who-string ()
(:p (str (the box-length html-string)))
(:p (str (the box-width html-string)))
(:p (str (the box-height html-string))))))
:objects
((box-length :type 'text-form-control
:default 25
:ajax-submit-on-change? t)
(box-width :type 'text-form-control
:default 35
:ajax-submit-on-change? t)
(box-height :type 'text-form-control
:default 45
:ajax-submit-on-change? t)))
(publish-gwl-app "/x3dom-basic"
"gwl-user::box-one-viewport")
;;
;; Access the above example with
;; http://localhost:9000/make?object=gwl-user::box-with-inputs
;;
......@@ -4,6 +4,7 @@
:computed-slots
((use-raphael? t)
(use-x3dom? t)
(main-sheet-body
(with-cl-who-string ()
......
(in-package :gwl-user)
(define-object x3dom-basic (base-ajax-sheet)
:computed-slots
((use-raphael? t)
(use-x3dom? t)
(main-sheet-body
(with-cl-who-string ()
(:p (when *developing?* (str (the development-links))))
(:p (str (the inputs-section main-div)))
(:table
(:tr
(dolist (viewport (list (the (viewport-sections 1))))
(htm (:td (:td (str (the-object viewport main-div)))))))))))
:objects
((box :type 'box
:display-controls (list :color :blue :transparency 0.2)
:height (the inputs-section box-height value)
:width (the inputs-section box-width value)
:length (the inputs-section box-length value))
(inputs-section :type 'inputs-section)
(viewport-sections
:type 'base-ajax-graphics-sheet
:sequence (:size 2)
:view-direction-default (ecase (the-child index)
(0 :top) (1 :trimetric))
:image-format-default :raphael
:display-list-objects (list (the box))
:length 500 :width 500)))
(define-object inputs-section (sheet-section)
:computed-slots
((inner-html (with-cl-who-string ()
(:p (str (the box-length html-string)))
(:p (str (the box-width html-string)))
(:p (str (the box-height html-string))))))
:objects
((box-length :type 'text-form-control
:default 25
:ajax-submit-on-change? t)
(box-width :type 'text-form-control
:default 35
:ajax-submit-on-change? t)
(box-height :type 'text-form-control
:default 45
:ajax-submit-on-change? t)))
(publish-gwl-app "/x3dom-basic"
"gwl-user::x3dom-basic")
;;
;; Access the above example with
;; http://localhost:9000/make?object=gwl-user::box-with-inputs
;;
......@@ -3,7 +3,7 @@
(asdf:defsystem #:geom-base :description
"The Gendl\" Wireframe Geometry" :author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20141215" :depends-on (:glisp)
:version "20141227" :depends-on (:glisp)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:glisp :description
"The Gendl\" Common Lisp Portability" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20141215" :depends-on
:serial t :version "20141227" :depends-on
(:base :uiop :cl-typesetting :cl-ppcre :cl-who #-allegro :cl-base64 #-allegro :babel #-allegro :acl-compat)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:gwl-graphics :description
"The Gendl\" GWL embedded graphics support" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20141215" :depends-on (:geom-base :gwl)
:serial t :version "20141227" :depends-on (:geom-base :gwl)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -48,7 +48,8 @@ Default is 1." viewport-border-default 1)
</pre>"
image-format-plist (list :png "PNG image"
:jpeg "jpeg image"
:web3d "VRML/X3D"
:x3dom "X3DOM"
;;:web3d "VRML/X3D"
:raphael "SVG/VML"))
......@@ -166,6 +167,12 @@ include the VRML or X3D graphics of the geometry."
web3d-graphics
(with-cl-who-string () (write-the web3d-graphics)))
("String of valid HTML. This can be used to
include the x3dom tag content for the geometry."
x3dom-graphics
(with-cl-who-string ()
(write-the embedded-x3dom-world)))
("String of valid HTML. This includes the image-format-selector, the reset-zoom-button,
and the view-selector, in a simple table layout. You can override this to make the view-controls
......@@ -186,13 +193,14 @@ bottom of the graphics inside a table."
(with-cl-who-string ()
(:table (:tr ((:td :align :center)
(str (ecase (the image-format-selector value)
((:web3d :vrml) (the web3d-graphics))
;;((:web3d :vrml) (the web3d-graphics))
(:x3dom (the x3dom-graphics))
((:png :jpeg :jpg) (the raster-graphics))
(:raphael (the vector-graphics))))))
(when (and (member (the image-format) (list :jpeg :jpg :png :raphael))
(when (and (member (the image-format) (list :jpeg :jpg :png :raphael ))
(the include-view-controls?))
(htm (:tr (:td (str (the view-controls))))))
(when (and (member (the image-format) (list :vrml :web3d))
(when (and (member (the image-format) (list :vrml :web3d :x3dom))
(the include-view-controls?))
(htm (:tr (:td (str (the image-format-selector html-string))))))
......@@ -368,73 +376,73 @@ The <tt>view-object</tt> child should exist and be of type <tt>web-drawing</tt>.
(cl-who:with-html-output (*stream*)
(when (typep (the :view-object) 'null-part)
(error "A valid :view-object of type web-drawing is required in the sheet
(when (typep (the :view-object) 'null-part)
(error "A valid :view-object of type web-drawing is required in the sheet
to call the :write-embedded-x3d-world function."))
(cond ((the no-graphics?)
#+nil
(and (null (the :view-object :object-roots))
(null (the :view-object :objects)))
(html-stream *stream*
((:table :cellspacing 0 :cellpadding 0 :bgcolor :white)
(:tr
((:td :width (the :view-object :width) :height
(the :view-object :height) :align :center :valign :center)
(:big (:b "No Graphics Object Specified")))))))
(t
(let ((*display-controls* (the display-controls-hash)))
(with-cl-who ()
(:p
((:span :style "cursor: pointer;")
((:|X3D| :id "the_element"
:swfpath "/static/3rdpty/x3dom/x3dom.swf"
;;:width "100%"
;;:height "100%"
:width (the view-object page-width)
:height (the view-object page-length)
)
(:|Scene|
(with-format (x3d *stream*)
(let ((*onclick-function* (the onclick-function)))
(write-the view-object cad-output)))))))
(cond ((the no-graphics?)
#+nil
(and (null (the :view-object :object-roots))
(null (the :view-object :objects)))
(html-stream *stream*
((:table :cellspacing 0 :cellpadding 0 :bgcolor :white)
(:tr
((:td :width (the :view-object :width) :height
(the :view-object :height) :align :center :valign :center)
(:big (:b "No Graphics Object Specified")))))))
(t
(let ((*display-controls* (the display-controls-hash)))
(with-cl-who ()
(:p
((:span :style "cursor: pointer;")
((:|X3D| :id "the_element"
:swfpath "/static/3rdpty/x3dom/x3dom.swf"
;;:width "100%"
;;:height "100%"
:width (the view-object page-width)
:height (the view-object page-length)
)
(:|Scene|
(with-format (x3d *stream*)
(let ((*onclick-function* (the onclick-function)))
(write-the view-object cad-output)))))))
((:script :type "text/javascript")
"x3dom.reload();")
((:script :type "text/javascript")
"x3dom.reload();")
#+nil
(when (the x3dom-view-controls?)
(htm (:tr (:td ((:span :style "color: blue; cursor: pointer;"
:onclick "document.getElementById('the_element').runtime.showAll();")
"Show All"))))))))
#+nil
(when (the x3dom-view-controls?)
(htm (:tr (:td ((:span :style "color: blue; cursor: pointer;"
:onclick "document.getElementById('the_element').runtime.showAll();")
"Show All"))))))))
#+nil
(with-cl-who ()
((:table :cellspacing 0 :cellpadding 0)
(:tr
(:td
(:p
((:|X3D| :id "the_element"
:swfpath "/static/3rdpty/x3dom/x3dom.swf"
:width (the view-object page-width)
:height (the view-object page-length))
#+nil
(with-cl-who ()
((:table :cellspacing 0 :cellpadding 0)
(:tr
(:td
(:p
((:|X3D| :id "the_element"
:swfpath "/static/3rdpty/x3dom/x3dom.swf"
:width (the view-object page-width)
:height (the view-object page-length))
(:|Scene|
(with-format (x3d *stream*) (write-the view-object cad-output)))))
(:|Scene|
(with-format (x3d *stream*) (write-the view-object cad-output)))))
((:script :type "text/javascript"
:src "/static/3rdpty/x3dom/x3dom.js" :id "xdom_script"))))
((:script :type "text/javascript"
:src "/static/3rdpty/x3dom/x3dom.js" :id "xdom_script"))))
(when (the x3dom-view-controls?)
(htm (:tr (:td ((:span :style "color: blue; cursor: pointer;"
:onclick "document.getElementById('the_element').runtime.showAll();")
"Show All")))))))
(when (the x3dom-view-controls?)
(htm (:tr (:td ((:span :style "color: blue; cursor: pointer;"
:onclick "document.getElementById('the_element').runtime.showAll();")
"Show All")))))))
)))
)))
(web3d-graphics
()
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:gwl :description
"The Gendl\" Generative Web Language (GWL)" :author "John McCarthy"
:license "Affero Gnu Public License (http://www.gnu.org/licenses/)"
:serial t :version "20141215" :depends-on
:serial t :version "20141227" :depends-on
(:bordeaux-threads :glisp :aserve)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
......
......@@ -3,7 +3,7 @@
(asdf:defsystem #:regression :description
"The Gendl\" regression Subsystem" :author "John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20141215" :depends-on (:lift :surf :tasty)
:version "20141227" :depends-on (:lift :surf :tasty)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
......@@ -4,7 +4,7 @@
"The Gendl\" NURBS Surface and Solids Geometry Primitives" :author
"John McCarthy" :license
"Affero Gnu Public License (http://www.gnu.org/licenses/)" :serial t
:version "20141215" :depends-on (:geom-base)
:version "20141227" :depends-on (:geom-base)
#-asdf-unicode :defsystem-depends-on #-asdf-unicode (:asdf-encodings)
#+asdf-encodings :encoding #+asdf-encodings :utf-8
:components
......
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