Commit d5a7f3ea authored by Dave Cooper's avatar Dave Cooper

update gdl.el, added new x3dom components

parent 28357ea8
......@@ -3,23 +3,10 @@
================================================
GDL1592 (release candidate)
GDL1592 (pre-release candidate)
================================================
Release Schedule
================
2017-01-31: GDL1592 release
2017-12-15: GDL1590 will be sunsetted.
2018-01-15: The next major GDL release will be made available (number
TBD).
----------------------------------------------------------------------
Welcome to the Genworks® GDL and Gendl® Environment
......
......@@ -53,14 +53,14 @@
;; 3.2. Set up color-theme and solarized color-themes
(setq calendar-latitude 42.58 calendar-longitude -83.3 calendar-location-name "Detroit")
(setq sunrise-sunset (sunrise-sunset))
;;(setq calendar-latitude 42.58 calendar-longitude -83.3 calendar-location-name "Detroit")
;;(setq sunrise-sunset (sunrise-sunset))
;; FLAG -- figure out how to use this information with (current-time) to pick a light or dark color-theme.
(add-to-list 'load-path (concat *gendl-home* "emacs/emacs-color-theme"))
(require 'color-theme)
(color-theme-initialize)
(color-theme-subtle-hacker)
;;(color-theme-high-contrast)
;;(color-theme-taming-mr-arneson)
;;(color-theme-sitaramv-solaris)
;;(color-theme-feng-shui)
......
/*
* X3DOM JavaScript Library
* http://www.x3dom.org
*
* (C)2009 Fraunhofer IGD, Darmstadt, Germany
* Dual licensed under the MIT and GPL
*
* Based on code originally provided by
* Philip Taylor: http://philip.html5.org
*/
body {
background-color: white;
font-family: Helvetica, sans-serif;
font-size: 12px;
}
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;
padding: 0;
border: 1px solid #000;
}
object {
margin: 0;
padding: 0;
border: none;
z-index: 0;
width:100%;
height:100%;
float:left;
}
X3D:hover,
x3d:hover,
.x3dom-canvas:hover {
-webkit-user-select: none;
-webkit-touch-callout: none;
}
.x3dom-canvas {
border:none;
cursor:pointer;
cursor:-webkit-grab;
cursor:grab;
width:100%;
height:100%;
float:left;
}
.x3dom-canvas-mousedown {
cursor:-webkit-grabbing;
cursor:grabbing;
}
.x3dom-canvas:focus {
outline:none;
}
.x3dom-progress {
margin: 0;
padding: 6px 8px 0px 26px;
left: 0px;
top: 0px;
position: absolute;
color: #0f0;
font-family: Helvetica, sans-serif;
line-height:10px;
font-size: 10px;
min-width: 45px;
min-height: 20px;
border: 0px;
background-position: 4px 4px;
background-repeat: no-repeat;
background-color: #333;
background-color: rgba(51, 51, 51, 0.9);
z-index: 100;
background-image: url('data:image/gif;base64,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');
}
.x3dom-progress.bar span {
position: absolute;
left: 0;
top: 0;
line-height: 20px;
background-color: red;
}
.x3dom-statdiv {
margin: 0;
padding: 0;
right: 10px;
top: 10px;
position: absolute;
color: #0f0;
font-family: Helvetica, sans-serif;
line-height:10px;
font-size: 10px;
width: 75px;
height: 70px;
border: 0px;
}
#x3dom-state-canvas {
margin: 2px;
padding: 0;
right: 0%;
top: 0%;
position: absolute;
}
#x3dom-state-viewer {
position: absolute;
margin: 2px;
padding: 5px;
width: 135px;
top: 0%;
right: 0%;
opacity: 0.9;
background-color: #323232;
z-index: 1000;
font-family: Arial, sans-serif;
color: #C8C8C8;
font-weight: bold;
text-transform: uppercase;
cursor: help;
}
.x3dom-states-head {
display: block;
font-size: 26px;
}
.x3dom-states-rendermode-software {
font-size: 10px;
margin: 0 0 2px 2px;
}
.x3dom-states-rendermode-hardware {
font-size: 10px;
margin: 0 0 2px 2px;
}
.x3dom-states-head2 {
font-size: 10px;
}
.x3dom-states-list {
float: left;
width: 100%;
border-top: 1px solid #C8C8C8;
list-style: none;
font-size: 9px;
line-height: 16px;
margin:0;
padding: 0;
padding-top: 2px;
}
.x3dom-states-item {
width: 100%;
float: left;
}
.x3dom-states-item-title {
float: left;
margin-left: 2px;
}
.x3dom-states-item-value {
float: right;
margin-right: 2px;
}
.x3dom-touch-marker {
display: inline;
padding: 5px;
border-radius: 10px;
position: absolute;
font-family: Helvetica, sans-serif;
line-height:10px;
font-size: 10px;
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 {
font-family: Helvetica, sans-serif;
font-size: 14px;
background-color: #eb7a7a;
padding: 1em;
opacity: 0.75;
}
.x3dom-nox3d p {
color: #fff;
font-size: 14px;
}
.x3dom-nox3d a {
color: #fff;
font-size: 14px;
}
/* self-clearing floats */
.group:after {
content: ".";
display: block;
height: 0;
clear: both;
visibility: hidden;
}
This diff is collapsed.
X3DOM has been developed by Fraunhofer IGD (VCST group).
Contributions to core X3DOM components:
* Johannes Behr
* Yvonne Jung
* Timo Sturm
* Andreas Aderhold
* Katarzyna Wilkosinska
* Max Limper
* Maik Thoener
* Christian Stein
* Tobias Franke
* Peter Eschler
* Timm Drevensek
* Sven Kluge
Contributions to shadow mapping:
* Nicolas Eicke
Contributions to BVHRefiner component:
* Michael Englert
Contributions to the CAD component:
* Don Brutzman <brutzman@nps.edu>
* Vincent Marchetti <vmarchetti@ameritech.net>
* "이효광 (Hyokwang Lee)" <adpc92@gmail.com>
* Joe D Williams <joedwil@earthlink.net>
Contributions to the Geo component:
* "Byounghyun Yoo (유병현)" <yoo@byoo.net>
* Andreas Plesch <andreasplesch@gmail.com>
Other much-appreciated contributors:
* x3domer
* James Sweet
* John Congote
* Ander Arbelaiz <aarbelaiz@vicomtech.org>
* Yurai Núñez-Rodríguez <yurai@weblakes.com>
* ...
* Your Name <couldbe@here.com>
A big thank you to Philip Taylor. X3DOM is originally based on his first prototypical implementation of a scene graph in HTML 5. http://philip.html5.org
Dual licensed under the MIT and GPL licenses.
==[MIT]====================================================================
Copyright (c) 2009 X3DOM
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
==[GPL]====================================================================
X3DOM - Declarative 3D for HTML
Copyright (C) 2009 X3DOM
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program 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 General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Welcome to X3DOM
================
X3DOM is a framework for integrating and manipulating (X)3D scenes as HTML5
DOM elements, which are rendered via an X3D plugin, Flash/Stage3D or WebGL.
The open-source system allows defining 3D scene description and runtime
behavior declaratively, without any low-level JavaScript or GLSL coding.
Getting started
---------------
Please have a look at the official documentation in order to get started:
http://doc.x3dom.org
Need help?
----------
If you want to use X3DOM and seek help and exchange of knowledge, please use
the x3dom-users mailing list or the forums. Beginner questions usually have
been asked already and in many cases the mailinglist or forum archives provide
quick answers to many questions.
If you decide to post to the mailing list or forum, please include as much
info as possible and describe your problem and what you tried already
succinctly.
Mailing List
-------------
Please use the mailinglists as much as you can. The
[x3dom-users][] list is the one you are most likely interested in
and the first address for help or questions.
Issue Tracker
-------------
Please report issues and attach patches here. For general help and questions
direct your inquiry to the x3dom-users mailing list or one of the forums.
https://github.com/x3dom/x3dom/issues
**Uploading Files to the Issue Tracker**
The GitHub issue tracker does not allow to upload files. However, there is a
service that helps you with sharing files: https://gist.github.com. Just copy
and paste your file contents there and then copy the Gist URL into the
issues form.
It immensely helps us if you can provide a live web page illustrating your
problem. So if you have webspace and can upload and post the URL with your
issue, the chances we will have a look at it increase.
Contributing
------------
We encourage you to contribute to X3DOM! If you would like to contribute to
X3DOM, you should subscribe to the developers mailing list ([x3dom-dev][]),
where the developers of X3DOM discuss the development of the library itself.
You can send pull requests via GitHub. Patches should:
1. Follow the style of the existing code.
2. One commit should do exactly one thing.
3. Commit messages should start with a summary line below 80 characters
followed by a blank line, and then the reasoning/analysis for why the
change was made (if appropriate).
4. Commits that fix a bug in a previous commit (which has already been
merged) should start with `fixup!` and then the summary line of the
commit it fixes.
5. Rebase your branch against the upstream’s master. We don’t want to pull
redundant merge commits.
6. **Be clear about what license applies to your patch:** The files within
this repository are under the GPL3 (or later) but, as the original
creators, we are still allowed to create non-free derivatives. However,
if patches are given to us under GPL then those cannot make it into any
non-free derivatives we may later wish to create. So to make it easier
for us (and avoid any legal issues) we prefer if patches are released as
public domain.
### GitHub Workflow
Developing patches should follow this workflow:
1. Fork on GitHub (click Fork button)
2. Clone to computer: `git clone git@github.com:«github account»/x3dom.git`
3. cd into your repo: `cd x3dom`
4. Set up remote upstream: `git remote add -f upstream git://github.com/x3dom/x3dom.git`
5. Create a branch for the new feature: `git checkout -b my_new_feature`
6. Work on your feature, add and commit as usual
Creating a branch is not strictly necessary, but it makes it easy to delete
your branch when the feature has been merged into upstream, diff your branch
with the version that actually ended in upstream, and to submit pull requests
for multiple features (branches).
7. Push branch to GitHub: `git push origin my_new_feature`
8. Issue pull request: Click Pull Request button on GitHub
#### Useful Commands
If a lot of changes have happened upstream you can replay your local changes
on top of these, this is done with `rebase`, e.g.:
git fetch upstream
git rebase upstream/master
This will fetch changes and re-apply your commits on top of these.
This is generally better than merge, as it will give a clear picture of which
commits are local to your branch. It will also “prune” any of your local
commits if the same changes have been applied upstream.
You can use `-i` with `rebase` for an “interactive” rebase. This allows you
to drop, re-arrange, merge, and reword commits, e.g.:
git rebase -i upstream/master
There's always the [x3dom-dev][] mailinglist.
[x3dom-users]: https://lists.sourceforge.net/lists/listinfo/x3dom-users
[x3dom-dev]: https://lists.sourceforge.net/lists/listinfo/x3dom-developers
[GPL 3]: http://www.gnu.org/copyleft/gpl.html
.. _releasenotes:
Release notes
=============
Version 1.7.2
-------------
* Secure X3DOM delivery over HTTPS.
* New RequestManager for all X3DOM related downloads.
* Stop Flash support and remove the Flash-backend.
* Added basic glTF Binary (GLB) support to the ExternalShape-Node.
* General Navigation and Turntable improvements.
* Exposed canvas event handlers.
* Added compatibility with python 3 and 2 for manage.py.
* New GeoLOD-Node.
* and many small other fixes and enhancements.
Version 1.7.1
-------------
* Maintenance release, with lot of bug fixes.
* Compressed Texture Support
* Integration of the Mapbox Earcut library for better polygon triangulation
* DepthMappedVolumeStyle Node + DepthMap Support
* Improved text quality
* Move the ammo.js from x3dom-full.js to the new x3dom-full-physics.js to reduce the download size.
* and many small other fixes and enhancements.
Version 1.7
-----------
* CommonSurfaceShader now also supports object-space normal maps (in addition to already available tangent-space normal maps)
* If a viewpoint gets transformed, its center of rotation now gets transformed accordingly (thanks to Andreas Plesch, Harvard University).
* Improvements in geospatial components (support for easting_first, thanks to Andreas Plesch, Harvard University).
* ExternalGeometry node now has a multi-field for the data URL (of type MFString), multiple URLs can be specified as fallback.
This is fully backwards compatible with old scenes that specify only a single string.
* alphaClipThreshold attribute to adapt the threshold for X3DOM's alpha test (for textures with transparency)
* Basic TriangleSet implementation (thanks to Yvonne Jung, Fulda University of Applied Sciences)
* Runtime documentation made available
* New tutorial about runtime configuration
* New tutorial about the experimental SSAO implementation
* Some smaller documentation updates
* Several fixes (thanks to Ander Arbelaiz, Andreas Plesch and Yvonne Jung)
Version 1.6
-----------
Most important Changes:
* A completely new documentation portal, available via the link from www.x3dom.org and directly via doc.x3dom.org
* Extensive node API documentation resources, including detailed information about all nodes and fields
* A lot of great, new tutorials, along with a brand-new "Getting Started" guide
* A first version of the new x3dom examples portal, available at examples.x3dom.org
* All former examples from the x3dom repository can now be found at this central example page
* A fresh re-design of the examples page will be available in the near future
* Automated nightly testing suite for improved stability and qualitiy assurance, available at testing.x3dom.org
* Testing for Chrome and Firefox (Windows 8)
* Regression test suite, based on script result evaluation and explicit screenshot comparisons
* Automation and documentation (timeline) for testing process
* New DOM field interface for more efficient field access, using getFieldValue / setFieldValue and requestFieldRef / releaseFieldRef (documentation: doc.x3dom.org/author/index.html)
* New onoutputchange event, for easy handling of ROUTE output in JavaScript
* can be installed on any node
* tutorial available at doc.x3dom.org/tutorials/animationInteraction/onoutputchange/index.html
* Gamma-correct lighting by default
* Example and tutorial at doc.x3dom.org/tutorials/lighting/gamma/index.html
* A new TURNTABLE mode for more intuitive user interaction
* Example and tutorial available at doc.x3dom.org/tutorials/animationInteraction/navigation/index.html
* First version of the pointingDeviceSensor component, including PlaneSensor, TouchSensor and CylinderSensor
* Example and tutorial available at doc.x3dom.org/tutorials/animationInteraction/navigation/index.html
* First version of a new, long-lasting Shape Resource Container and ExternalGeometry node
* documentation of progress available www.x3dom.org/src/
* will be enriched with new features for compression and streaming during development of X3DOM 2.0
* will replace ImageGeometry, BinaryGeometry and POPGeometry in X3DOM 2.0
* Instead of permanently linking to the dev version, from now on, we recommend to always use the latest stable release, which is available via the following links:
* www.x3dom.org/download/x3dom.js
* www.x3dom.org/x3dom/release/x3dom.js
* We have continued our efforts to support IE 11, rendering X3DOM content with WebGL.
While there are still some issues, some of them caused by non-IE conformant HTML pages in general (also including some of our examples), X3DOM’s IE 11 support is constantly improving.
New Components:
++++++++++++++++++++++
* H-Anim
* PointingDeviceSensors
* RigidBodyPhysics
New Nodes:
++++++++++++++++++++++
* LineSet
* MetadataBoolean
* MultiPart
* ExternalGeometry
Removed Nodes:
++++++++++++++++++++++
* BitLODGeometry
Fixes and Improvements:
++++++++++++++++++++++
* fixed projection matrix bugs
* added shootRay functionality
* added restriction for examine/turntable navigation mode behaviour
* fixed start/end angle bug for Arc2d
* improved debugging possibilities by defining getters
* fixed memory leaks
* fixed adding/removing of background nodes at runtime
* fixed transparency updates
* fixed broken field update for concave IndexedFaceSets
* fixed shader field update when no DOM node is available
* fix to allow lower case attributes in inlined files
* fixed lower case field name support
* added Extrusion node with texture mapping
* added (multiple) mpeg dash in x3dom movie texture
* updates of volume rendering component including composable styles
* fixed several bugs in flash backend
* extended fitObject/All functionality
* implemented gamma-correct rendering
* several shader fixes
* added geosystem UTM/GC support
* basic IE11 WebGL support
* added support for Geolocation node as a transform
* added param to force flash for all IE versions