Merge pull request #31 from hcrlab/#11-decrease-manipulation-burden

Arm Reach Visualization and THREE.js setup
hcrlab · Jul 9, 2021 · 40b6a34 · 40b6a34
2 parents aaa01ce + 22e3eda
commit 40b6a34
Show file tree

Hide file tree

Showing 8 changed files with 516 additions and 211 deletions.
diff --git a/app.js b/app.js
@@ -56,34 +56,37 @@ var app = express();
 console.log('use helmet');
 app.use(helmet());
 
-var use_content_security_policy = true
-
+var use_content_security_policy = true;
+// NOTE: operator.html has its own CSP rules that override what is set here
 if (use_content_security_policy) {
     console.log('using a content security policy');
     app.use(helmet.contentSecurityPolicy({
-	directives:{
-	    defaultSrc:["'self'"],
-	    scriptSrc:["'self'", "'unsafe-inline'", 
-            'static.robotwebtools.org', 
-            'robotwebtools.org', 
-            'webrtc.github.io',
-            'www.gstatic.com',
-            'code.jquery.com',
-            'cdnjs.cloudflare.com',
-            'stackpath.bootstrapcdn.com'],
-	    connectSrc:["'self'", 'ws://localhost:9090'],
-	    imgSrc: ["'self'", 'data:'],
-	    styleSrc:["'self'", 
-            'stackpath.bootstrapcdn.com'],
-	    fontSrc:["'self'"]}}));
+        directives: {
+            defaultSrc:["'self'"],
+            scriptSrc:["'self'", "'unsafe-inline'", 
+                'static.robotwebtools.org', 
+                'robotwebtools.org', 
+                'webrtc.github.io',
+                'www.gstatic.com',
+                'code.jquery.com',
+                'cdnjs.cloudflare.com',
+                'stackpath.bootstrapcdn.com',
+                'cdn.jsdelivr.net'],
+            connectSrc:["'self'", 'ws://localhost:9090'],
+            imgSrc: ["'self'", 'data:'],
+            styleSrc:["'self'", 
+                'stackpath.bootstrapcdn.com'],
+            fontSrc:["'self'"]}
+        })
+    );
 } else {
     // Disable the content security policy. This is helpful during
     // development, but risky when deployed.
     console.log('WARNING: Not using a content security policy. This risky when deployed!');
     app.use(
-	helmet({
-	    contentSecurityPolicy: false,
-	})
+        helmet({
+            contentSecurityPolicy: false,
+        })
     );
 }
 

diff --git a/operator/operator.css b/operator/operator.css
@@ -63,6 +63,15 @@ video {
 .foreground {
   z-index:2;
   cursor: pointer;
+  position: relative;
+}
+
+/* Three.js canvas positioning */
+.foreground > canvas {
+  position: absolute;
+  top: 0;
+  left: 0;
+  pointer-events: none;
 }
 
 
@@ -343,7 +352,7 @@ video {
   background: transparent;
   border: solid 3px #000000;
   border-radius: 3px;
-  /*background-image: linear-gradient(to bottom, #4fc9ee, #0000ff); /*#3aa2d0);*/*/
+  /*background-image: linear-gradient(to bottom, #4fc9ee, #0000ff); /*#3aa2d0);*/
   /*box-shadow: inset 0 1px rgba(255, 255, 255, 0.5), 0 0 2px rgba(0, 0, 0, 0.2);*/
   /*transition: left 0.15s ease-out;*/
   transition: left 0.1s ease-out;

diff --git a/operator/operator.html b/operator/operator.html
@@ -5,13 +5,17 @@
     <!-- This can improve the appearance of web pages on mobile devices. -->
 
     <!-- CSP exceptions -->
+	<!-- 
+		NOTE: It is a bit unintuitive for debugging that this document follows different CSP
+		rules than the rest of the site. Would it be possible to combine these rules with the ones in app.js?
+	-->
 	<meta http-equiv="content-type" content="text/html; charset=utf-8 ;">
-	<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' 'unsafe-eval' https://www.gstatic.com https://code.jquery.com https://cdnjs.cloudflare.com https://stackpath.bootstrapcdn.com https://webrtc.github.io/adapter/; style-src 'self' https://stackpath.bootstrapcdn.com">
+	<meta http-equiv="Content-Security-Policy" content="script-src 'self' 'unsafe-inline' 'unsafe-eval' https://www.gstatic.com https://code.jquery.com https://cdnjs.cloudflare.com https://stackpath.bootstrapcdn.com https://webrtc.github.io/adapter/ https://cdn.jsdelivr.net/; style-src 'self' https://stackpath.bootstrapcdn.com">
 
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <!--<meta name="viewport" content="height=device-height, initial-scale=1.0">-->
 
- 		<!-- Bootstrap CSS -->
+	<!-- Bootstrap CSS -->
     <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
 
 <!--   	<link rel="stylesheet" href="styles/style.processed.css"> -->
@@ -232,7 +236,10 @@ <h5 class="modal-title" id="settingsTitle">Settings</h5>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
 <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
 
-
+<!-- THREE.js core and extensions -->
+<script src="https://cdnjs.cloudflare.com/ajax/libs/three.js/r128/three.min.js" integrity="sha512-dLxUelApnYxpLt6K2iomGngnHO83iUvZytA3YjDUCjT0HDOHKXnVYdf3hU4JjM8uEhxf9nD1/ey98U3t2vZ0qQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+<!-- <script src="https://cdn.jsdelivr.net/npm/[email protected]/build/postprocessing.min.js" integrity="sha256-pyGwxSnoRHKgrnFqpxGf22nsl+CEKp1/vaD9NH+6a1Q=" crossorigin="anonymous" referrerpolicy="no-referrer"></script> -->
+<script src="https://cdn.jsdelivr.net/npm/[email protected]/build/postprocessing.js"></script>
 <script src="../shared/video_dimensions.js"></script>
 <script src="operator.js"></script>
 <script src="operator_ui_regions.js"></script>