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

updated to x3dom 1.4, fixed typo in base/common/genworks.lisp for conditional...

updated to x3dom 1.4, fixed typo in base/common/genworks.lisp for conditional compile for CCL, converted character encoding of arcoid-mixin.lisp to simple ascii.
parent 42ecffd2
......@@ -240,7 +240,7 @@
#+allegro :values #+allegro :weak
#+lispworks :weak-kind #+lispworks t
#+sbcl :weakness #+sbcl :key-and-value
#+ccl :weak t #+ccl :test #'eq
#+ccl :weak #+ccl t #+ccl :test #+ccl #'eq
args))
(defun set-default-float-format ()
......
;;
;; Copyright 2002-2011 Genworks International
;;
;; This source file is part of the General-purpose Declarative
;; Language project (GDL).
;;
;; This source file contains free software: you can redistribute it
;; and/or modify it under the terms of the GNU Affero General Public
;; License as published by the Free Software Foundation, either
;; version 3 of the License, or (at your option) any later version.
;;
;; This source file is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
;; Affero General Public License for more details.
;;
;; You should have received a copy of the GNU Affero General Public
;; License along with this source file. If not, see
;; <http://www.gnu.org/licenses/>.
;;
(in-package :geom-base)
(define-object arcoid-mixin ()
:documentation (:description "This object is a low level object used to define
an arc like object. It is not recommended to be used directly by GDL common users.
For developers it should be used as a mixin."
:examples "<pre>
For exemplification contact Genworks® International.</pre>")
:input-slots
("Number. Distance from center to any point on the arc."
radius
(arc 2pi)
("Angle in radians. Start angle of the arc. Defaults to zero."
start-angle 0)
("Angle in radians. End angle of the arc. Defaults to twice pi."
end-angle (the arc)))
:computed-slots
((angles-normalized (the (normalize-start-end (the start-angle) (the end-angle))))
(start-angle-normalized (apply #'min (the angles-normalized)))
(end-angle-normalized (apply #'max (the angles-normalized)))
;;(start-angle-normalized (the start-angle))
;;(end-angle-normalized (the end-angle))
(start-to-end-angle (- (the end-angle-normalized) (the start-angle-normalized)))
(%arcs% (list self)))
:functions
((normalize-start-end
(start-angle end-angle)
(let* ((start-angle-normalized (when start-angle (mod start-angle 2pi)))
(end-angle-normalized (when end-angle
(let ((nominal (mod end-angle 2pi)))
(if (or (zerop nominal)
(< nominal start-angle-normalized))
(+ nominal 2pi) nominal)))))
(list start-angle-normalized end-angle-normalized)))))
;;
;; Copyright 2002-2011 Genworks International
;;
;; This source file is part of the General-purpose Declarative
;; Language project (GDL).
;;
;; This source file contains free software: you can redistribute it
;; and/or modify it under the terms of the GNU Affero General Public
;; License as published by the Free Software Foundation, either
;; version 3 of the License, or (at your option) any later version.
;;
;; This source file is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
;; Affero General Public License for more details.
;;
;; You should have received a copy of the GNU Affero General Public
;; License along with this source file. If not, see
;; <http://www.gnu.org/licenses/>.
;;
(in-package :geom-base)
(define-object arcoid-mixin ()
:documentation (:description "This object is a low level object used to define
an arc like object. It is not recommended to be used directly by GDL common users.
For developers it should be used as a mixin.")
:input-slots
("Number. Distance from center to any point on the arc."
radius
(arc 2pi)
("Angle in radians. Start angle of the arc. Defaults to zero."
start-angle 0)
("Angle in radians. End angle of the arc. Defaults to twice pi."
end-angle (the arc)))
:computed-slots
((angles-normalized (the (normalize-start-end (the start-angle) (the end-angle))))
(start-angle-normalized (apply #'min (the angles-normalized)))
(end-angle-normalized (apply #'max (the angles-normalized)))
(start-to-end-angle (- (the end-angle-normalized) (the start-angle-normalized)))
(%arcs% (list self)))
:functions
((normalize-start-end
(start-angle end-angle)
(let* ((start-angle-normalized (when start-angle (mod start-angle 2pi)))
(end-angle-normalized (when end-angle
(let ((nominal (mod end-angle 2pi)))
(if (or (zerop nominal)
(< nominal start-angle-normalized))
(+ nominal 2pi) nominal)))))
(list start-angle-normalized end-angle-normalized)))))
......@@ -20,7 +20,7 @@ X3D, x3d {
position:relative; /* in order to be able to position stat-div within X3D */
float:left; /* float the element so it has the same size like the canvas */
cursor:pointer;
margin:0;
margin: 0;
padding: 0;
border: 1px solid #000;
}
......@@ -52,7 +52,7 @@ x3d:hover,
}
.x3dom-progress {
margin: 0;
padding: 6px 8px 0 26px;
padding: 6px 8px 0px 26px;
left: 0px;
top: 0px;
position: absolute;
......@@ -96,16 +96,31 @@ x3d:hover,
}
.x3dom-touch-marker {
display:inline;
display: inline;
padding: 5px;
border-radius: 10px;
position: absolute;
font-family: Helvetica, sans-serif;
line-height:10px;
font-size: 10px;
border: 1px solid green;
z-index:100;
width:60px;
color: darkorange;
background: cornsilk;
opacity: 0.6;
border: 2px solid orange;
z-index: 200;
}
.x3dom-logContainer {
border: 2px solid olivedrab;
height: 200px;
padding: 4px;
overflow: auto;
white-space: pre-wrap;
font-family: sans-serif;
font-size: x-small;
color: #00ff00;
background-color: black;
margin-right: 10px;
}
.x3dom-nox3d {
......
This diff is collapsed.
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