Merge pull request #77 from pchen66/dev

r7
pchen66 · Jun 16, 2017 · 82b8c81 · 82b8c81
2 parents 157b63d + d9ec8bb
commit 82b8c81
Show file tree

Hide file tree

Showing 60 changed files with 584 additions and 267 deletions.
diff --git a/README.md b/README.md
@@ -34,18 +34,21 @@ All attributes are optional
 ```html
 <script>
 	viewer = new PANOLENS.Viewer({
-		container: document.body,	// A DOM Element container
-		controlBar: true, 			// Vsibility of bottom control bar
-		controlButtons: [],			// Buttons array in the control bar. Default to ['fullscreen', 'setting', 'video']
-		autoHideControlBar: false,	// Auto hide control bar
-		autoHideInfospot: true,		// Auto hide infospots
-		horizontalView: false,		// Allow only horizontal camera control
-		cameraFov: 60,				// Camera field of view in degree
-		reverseDragging: false,		// Reverse orbit control direction
-		enableReticle: false,		// Enable reticle for mouseless interaction
-		dwellTime: 1500,			// Dwell time for reticle selection in millisecond
-		autoReticleSelect: true,	// Auto select a clickable target after dwellTime
-		passiveRendering: false,	// Render only when control triggered by user input 
+		container: document.body,		// A DOM Element container
+		controlBar: true, 				// Vsibility of bottom control bar
+		controlButtons: [],				// Buttons array in the control bar. Default to ['fullscreen', 'setting', 'video']
+		autoHideControlBar: false,		// Auto hide control bar
+		autoHideInfospot: true,			// Auto hide infospots
+		horizontalView: false,			// Allow only horizontal camera control
+		cameraFov: 60,					// Camera field of view in degree
+		reverseDragging: false,			// Reverse orbit control direction
+		enableReticle: false,			// Enable reticle for mouseless interaction
+		dwellTime: 1500,				// Dwell time for reticle selection in millisecond
+		autoReticleSelect: true,		// Auto select a clickable target after dwellTime
+		passiveRendering: false,		// Render only when control triggered by user input 
+		viewIndicator: false,			// Adds an angle view indicator in upper left corner
+		indicatorSize: 30,				// Size of View Indicator
+		outputInfospotPosition: false	// Whether and where to output infospot position. Could be 'console' or 'overlay'
 	});
 </script>
 ```
@@ -67,7 +70,7 @@ Check Panolens [example page](http://pchen66.github.io/Panolens/#Example)
 
 ### How to add an infospot (hotspot)
 
-Move cursor on a specific point in a panorama and press `Ctrl` with mouse clicking or hovering, which will generate position (x, y, z) in the console. See [Panorama Infospot](http://pchen66.github.io/Panolens/examples/panorama_infospot.html) example for creating and attaching infospots.
+Move cursor on a specific point in a panorama and press `Ctrl` with clicking or hovering, which will generate position (x, y, z) in the console or on the overlay element based on parameter `outputInfospotPosition='console' or 'overlay'`. See [Panorama Infospot](http://pchen66.github.io/Panolens/examples/panorama_infospot.html) example for creating and attaching infospots.
 
 ![Panorama Finding Infospot Position](https://github.com/pchen66/pchen66.github.io/blob/master/Panolens/images/panolens_add_infospot_480p.gif?raw=true)
 

diff --git a/build/panolens.js b/build/panolens.js
diff --git a/build/panolens.min.js b/build/panolens.min.js
diff --git a/docs/Constants.js.html b/docs/Constants.js.html
@@ -164,7 +164,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a>
 
-		on 2017-06-01T17:40:20-07:00
+		on 2017-06-15T23:43:58-07:00
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/docs/DataImage.js.html b/docs/DataImage.js.html
@@ -152,7 +152,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a>
 
-		on 2017-06-01T17:40:20-07:00
+		on 2017-06-15T23:43:58-07:00
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/docs/PANOLENS.BasicPanorama.html b/docs/PANOLENS.BasicPanorama.html
@@ -317,7 +317,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a>
 
-		on 2017-06-01T17:40:20-07:00
+		on 2017-06-15T23:43:58-07:00
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>

diff --git a/docs/PANOLENS.CubePanorama.html b/docs/PANOLENS.CubePanorama.html
@@ -581,7 +581,7 @@ <h4 class="modal-title">Search results</h4>
 <span class="jsdoc-message">
 	Documentation generated by <a href="https://github.com/jsdoc3/jsdoc">JSDoc 3.4.3</a>
 
-		on 2017-06-01T17:40:20-07:00
+		on 2017-06-15T23:43:58-07:00
 
 	using the <a href="https://github.com/docstrap/docstrap">DocStrap template</a>.
 </span>