Merge branch 'v1.0.1-rc' into prod

Default.htm

@@ -23,7 +23,8 @@
   <script src="js/lib/BufferGeometryUtils.js"></script>
 
   <script src="js/lib/TrackballControls.js"></script>
-
+  <script src="js/lib/OrbitControls.js"></script>
+
   <script src="js/lib/Projector.js"></script>
   <script src="js/lib/SVGRenderer.js"></script>
 
@@ -77,29 +78,34 @@
     <div class="row">
       <div class="col-lg-12 bordered black" id="toolbar">
         <div class="button-toolbar" role="toolbar">
-          <div class="btn-group" role="group">
+
+	  <div class="btn-group" role="group">
             <button type="button" class="btn btn-default" data-toggle="modal" data-target="#open-files" title="Open File">
               <i class="fa fa-folder-open"></i>
             </button>
           </div>
-          <div class="btn-group" role="group">
+
+	  <div class="btn-group" role="group">
             <button type="button" class="btn btn-default" onclick="ispy.reload();" title="Reload page">
               <i class="fa fa-redo"></i>
             </button>
           </div>
-          <div class="btn-group" role="group">
+
+	  <div class="btn-group" role="group">
             <button type="button" class="btn btn-default disabled" id="prev-event-button" onclick="ispy.prevEvent();" title="Previous Event [Left Arrow]">
               <i class="fa fa-step-backward"></i>
             </button>
             <button type="button" class="btn btn-default disabled" id="next-event-button" onclick="ispy.nextEvent();" title="Next Event [Right Arrow]">
               <i class="fa fa-step-forward"></i>
             </button>
           </div>
-          <div class="btn-group" role="group">
-            <button type="button" class="btn btn-default" onclick="ispy.resetControls();" title="Return to Start View">
+
+	  <div class="btn-group" role="group">
+            <button type="button" class="btn btn-default" onclick="ispy.resetView();" title="Return to Start View">
               <i class="fa fa-home"></i>
             </button>
           </div>
+
           <div class="btn-group" role="group">
             <button type="button" class="btn btn-default" onclick="ispy.zoomIn();" title="Zoom In [Shift + Up Arrow]">
               <i class="fa fa-search-plus"></i>
@@ -108,22 +114,31 @@
               <i class="fa fa-search-minus"></i>
             </button>
           </div>
+
 	  <div class="btn-group" role="group">
 	    <button type="button" id="autorotate" class="btn btn-default" onclick="ispy.autoRotate();" title="Autorotate about Y axis">
 	      <i class="fa fa-undo"></i>
 	      </button>
 	  </div>
+
+	  <div class="btn-group" role="group">
+	    <button type="button" id="3d" class="btn btn-default active" onclick="ispy.showView('3D');" title="3d view">3D</button>
+	    <button type="button" id="rphi" class="btn btn-default" onclick="ispy.showView('RPhi');" title="rphi view">r&phi;</button>
+	    <button type="button" id="rhoz" class="btn btn-default" onclick="ispy.showView('RhoZ');" title="rhoz view">&rho;z</button>
+	  </div>
+
           <div class="btn-group" role="group">
-            <button type="button" class="btn btn-default" onclick="ispy.setXY();" title="YX Plane">
+            <button type="button" id="xy" class="btn btn-default" onclick="ispy.setXY();" title="YX Plane">
               <img src="./graphics/yx_small.png" class="img-responsive"/>
             </button>
-            <button type="button" class="btn btn-default" onclick="ispy.setYZ();" title="YZ plane">
+            <button type="button" id="yz" class="btn btn-default" onclick="ispy.setYZ();" title="YZ plane">
               <img src="./graphics/yz_small.png" class="img-responsive"/>
             </button>
-            <button type="button" class="btn btn-default" onclick="ispy.setZX();" title="XZ plane">
+            <button type="button" id="xz" class="btn btn-default" onclick="ispy.setZX();" title="XZ plane">
               <img src="./graphics/xz_small.png" class="img-responsive" title=""/>
             </button>
           </div>
+
           <div class="btn-group" role="group">
             <button type="button" id="perspective" class="btn btn-default active" onclick="ispy.setPerspective();" title="Perspective Projection">
 	      <i class="fa fa-cube"></i>
@@ -132,13 +147,7 @@
 	      <i class="fa fa-dice-d6"></i>
             </button>
           </div>
-	  <!--
-	  <div class="btn-group" role="group">
-	    <button type="button" id="3d" class="btn btn-default active" onclick="ispy.showView('3d');" title="3d view">3D</button>
-	    <button type="button" id="rphi" class="btn btn-default" onclick="ispy.showView('rphi');" title="rphi view">r&phi;</button>
-	    <button type="button" id="rhoz" class="btn btn-default" onclick="ispy.showView('rhoz');" title="rhoz view">&rho;z</button>
-	  </div>
-	  -->
+
           <div class="btn-group" role="group">
             <button type="button" id="enterFullscreen" class="btn btn-default" onclick="ispy.enterFullscreen();" title="Expand to Fullscreen">
               <i class="fa fa-expand"></i>
@@ -147,32 +156,38 @@
               <i class="fa fa-compress"></i>
             </button>
           </div>
-          <div class="btn-group" role="group">
+
+	  <div class="btn-group" role="group">
             <button type="button" class="btn btn-default" data-toggle="modal" data-target="#settings" title="Settings">
               <i class="fa fa-sliders-h"></i>
             </button>
           </div>
-          <div class="btn-group" role="group">
+
+	  <div class="btn-group" role="group">
               <button type="button" class="btn btn-default" data-toggle="modal" data-target="#statistics" onclick="ispy.updateRendererInfo();" title="Stats">
                 <i class="fa fa-chart-bar"></i>
               </button>
           </div>
-          <div class="btn-group" role="group">
+
+	  <div class="btn-group" role="group">
             <button type="button" class="btn btn-default" data-toggle="modal" data-target="#about" title="About">
               <i class="fa fa-info"></i>
             </button>
           </div>
-          <div class="btn-group" role="group">
+
+	  <div class="btn-group" role="group">
             <button type="button" class="btn btn-default" onclick="ispy.printImage();" title="Print Image to File">
               <i class="fa fa-camera"></i>
             </button>
           </div>
-          <div class="btn-group" role="group">
+
+	  <div class="btn-group" role="group">
             <button type="button" id="animate" class="btn btn-default" onclick="ispy.toggleAnimation();" title="Start/Stop Animation [Shift + A]">
               <i class="fa fa-film"></i>
             </button>
           </div>
-          <!--
+
+	  <!--
           <div class="btn-group" role="group">
             <button type="button" id="record" class="btn btn-default" onclick="ispy.toggleRecording();" title="Start/Stop Recording">
               <i class="fa fa-video-camera"></i>
@@ -184,16 +199,16 @@
             </button>
           </div>
 	  -->
-          <div class="btn-group" role="group">
-            
+
+	  <div class="btn-group" role="group">  
             <button type="button" class="btn btn-default" data-toggle="modal" data-target="#export-model" title="Export 3D Model">
               <i class="fa fa-upload"></i>
             </button>
-
             <button type="button" class="btn btn-default" data-toggle="modal" data-target="#import-model" title="Import 3D Model (obj format)">
               <i class="fa fa-download"></i>
             </button>
           </div>
+
         </div>
       </div>
     </div>
@@ -335,6 +350,9 @@ <h4 class="modal-title black">Settings</h4>
         <p>
           Invert colors: <input id='invert-colors' type='checkbox' onchange='ispy.invertColors();'>
         </p>
+	<p>
+	  Show clipping plane controls: <input id='clipping' type='checkbox'>
+	</p>
         <p>
           Hide axes: <input id='show-axes' type='checkbox'>
         </p>
@@ -412,7 +430,8 @@ <h4>iSpy-WebGL <span id="version"></span></h4>
           <a href="mailto:[email protected]">Questions/comments/problems</a>
 	</p>
 	<p>
-	  <a target="_blank" href="https://github.com/cms-outreach/ispy-webgl/tree/prod#readme">Documentation and FAQ</a>
+	  <a target="_blank" href="https://github.com/cms-outreach/ispy-webgl/tree/master#readme">Documentation and FAQ</a>
+	</p>
         <p>
           <a target="_blank" href="https://github.com/cms-outreach/ispy-webgl">Code</a> and
           <a target="_blank" href="https://github.com/cms-outreach/ispy-webgl/issues">Issues</a>

LICENSE

@@ -1,6 +1,6 @@
 The MIT License
 
-Copyright © 2014-2022 iSpy WebGL authors.
+Copyright © 2014-2023 iSpy WebGL authors.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

css/ispy.css

@@ -97,6 +97,18 @@ canvas.hover {
 }
 
 #treegui {
+    position: absolute;
+    top: 0;
+    right: 0;
+    z-index: 1002;
+    padding-top: 0px;
+    padding-right: 0px;
+    display: block;
+    font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+    font-size: 14px;
+}
+
+#rphigui {
   position: absolute;
   top:0;
   right:0;
@@ -108,6 +120,30 @@ canvas.hover {
   font-size: 14px;
 }
 
+#rhozgui {
+  position: absolute;
+  top:0;
+  right:0;
+  z-index: 1002;
+  padding-top: 0px;
+  padding-right: 0px;
+  display: block;
+  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+  font-size: 14px;
+}
+
+#clipgui {
+  position: absolute;
+  top:0;
+  left:65%;
+  z-index: 1002;
+  padding-top: 0px;
+  padding-right: 0px;
+  display: block;
+  font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+  font-size: 14px;
+}   
+
 #toolbar {
   float: left;
 }