Merge pull request #709 from cx20/update_x3dom_to_latest

Update X3DOM v1.8.2 to v1.8.3
cx20 · Aug 1, 2023 · 9edc815 · 9edc815
2 parents eb7ebbe + 8d4271d
commit 9edc815
Show file tree

Hide file tree

Showing 3 changed files with 222 additions and 2 deletions.
diff --git a/examples/x3dom/index.html b/examples/x3dom/index.html
@@ -17,8 +17,8 @@
 <!-- jquery.js v2.2.4 -->
 <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/2.2.4/jquery.js"></script>
 
-<!-- x3dom.js 1.8.2 -->
-<script src="../../libs/x3dom/1.8.2/x3dom.js"></script>
+<!-- x3dom.js 1.8.3 -->
+<script src="../../libs/x3dom/1.8.3/x3dom.js"></script>
 <!--
 <x3d id="x3d" width="100%" height="100%"> 
     <scene>

diff --git a/libs/x3dom/1.8.3/x3dom.css b/libs/x3dom/1.8.3/x3dom.css
@@ -0,0 +1,213 @@
+/*
+ * 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
+ */
+
+X3D, x3d {
+    position:relative;
+    cursor:pointer;
+    margin: 0;
+    padding: 0;
+    outline: none;
+    display: block;
+}
+
+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%;
+}
+
+.x3dom-canvas-mousedown {
+  cursor:-webkit-grabbing;
+  cursor:grabbing;
+}
+
+.x3dom-canvas:focus {
+    outline:none; 
+}
+
+.x3dom-progress {
+    left: 16px;
+    top: 16px;
+    position: absolute;
+    color: #646464;
+    font-family: Helvetica, sans-serif;
+    font-size: 14px;
+    font-weight: bold;
+    z-index: 100;
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    background: rgba(255, 255, 255, 0.1);
+    padding: 12px;
+    border-radius: 5px;
+    pointer-events: none;
+    transition: opacity 0.2s ease-in-out;
+}
+
+.x3dom-progress-spinner {
+    border: 2px solid #f3f3f3; /* Light grey */
+    border-top: 2px solid #646464; /* Blue */
+    border-radius: 50%;
+    width: 16px;
+    height: 16px;
+    animation: spin 1s linear infinite;
+    margin-right: 12px;
+}
+
+@keyframes spin {
+    0% { transform: rotate(0deg); }
+    100% { transform: rotate(360deg); }
+}
+
+.x3dom-vr {
+    position: absolute;
+    display: none;
+    bottom: 5px;
+    right: 15px;
+    width: 48px;
+    height: 48px;
+    background-color: #ccc;
+    opacity: 0.9;
+    -webkit-mask-image: url("data:image/svg+xml,%3Csvg version='1.1' id='Layer_1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' x='0px' y='0px' viewBox='0 0 24 24' style='enable-background:new 0 0 24 24;' xml:space='preserve'%3E%3Cpath id='XMLID_9_' style='fill:%23FFFFFF;' d='M20.2,6.1c-2.7,0-5.4,0-8.2,0c-2.8,0-5.5,0-8.3,0c-1,0-1.5,0.6-1.5,1.5 c0,2.8,0,5.6,0,8.5c0,0.9,0.6,1.5,1.5,1.5c1.7,0,3.3,0,5,0c0.6,0,0.9-0.2,1.1-0.8c0.3-0.8,0.7-1.7,1-2.5c0.2-0.6,0.6-0.9,1.2-0.9 c0.6,0,1,0.4,1.2,1c0.3,0.8,0.5,1.5,0.8,2.3c0.3,0.8,0.5,0.9,1.3,0.9c1.6,0,3.2,0,4.7,0c1.2,0,1.7-0.5,1.7-1.8c0-2.7,0-5.4,0-8 C21.8,6.6,21.4,6.1,20.2,6.1z M7.8,14.3c-1.2,0-2.2-0.9-2.2-2.1c0-1.2,1-2.2,2.2-2.2c1.2,0,2.2,1,2.2,2.2C10,13.3,9,14.3,7.8,14.3z M16.2,14.3c-1.2,0-2.2-1-2.2-2.2c0-1.2,1-2.2,2.2-2.2c1.2,0,2.2,1,2.2,2.2C18.4,13.4,17.4,14.3,16.2,14.3z'/%3E%3C/svg%3E");
+    mask-image: url("data:image/svg+xml,%3Csvg version='1.1' id='Layer_1' xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' x='0px' y='0px' viewBox='0 0 24 24' style='enable-background:new 0 0 24 24;' xml:space='preserve'%3E%3Cpath id='XMLID_9_' style='fill:%23FFFFFF;' d='M20.2,6.1c-2.7,0-5.4,0-8.2,0c-2.8,0-5.5,0-8.3,0c-1,0-1.5,0.6-1.5,1.5 c0,2.8,0,5.6,0,8.5c0,0.9,0.6,1.5,1.5,1.5c1.7,0,3.3,0,5,0c0.6,0,0.9-0.2,1.1-0.8c0.3-0.8,0.7-1.7,1-2.5c0.2-0.6,0.6-0.9,1.2-0.9 c0.6,0,1,0.4,1.2,1c0.3,0.8,0.5,1.5,0.8,2.3c0.3,0.8,0.5,0.9,1.3,0.9c1.6,0,3.2,0,4.7,0c1.2,0,1.7-0.5,1.7-1.8c0-2.7,0-5.4,0-8 C21.8,6.6,21.4,6.1,20.2,6.1z M7.8,14.3c-1.2,0-2.2-0.9-2.2-2.1c0-1.2,1-2.2,2.2-2.2c1.2,0,2.2,1,2.2,2.2C10,13.3,9,14.3,7.8,14.3z M16.2,14.3c-1.2,0-2.2-1-2.2-2.2c0-1.2,1-2.2,2.2-2.2c1.2,0,2.2,1,2.2,2.2C18.4,13.4,17.4,14.3,16.2,14.3z'/%3E%3C/svg%3E");
+}
+
+.x3dom-vr:hover {
+    background-color: #999;
+}
+
+#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-log {
+    position: absolute;
+    bottom: 16px;
+    left: 50%;
+    transform: translateX(-50%);
+    width: 90%;
+    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;
+    opacity: 0.8;
+    -webkit-user-select: text;
+       -moz-user-select: text;
+        -ms-user-select: text;
+            user-select: text;
+}
+
+.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;
+}
diff --git a/libs/x3dom/1.8.3/x3dom.js b/libs/x3dom/1.8.3/x3dom.js