Skip to content

An option to invert the dragging #17

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stuartathompson wants to merge 3 commits into
base: master
Choose a base branch
from
Open

An option to invert the dragging #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e8a915
added an option to invert the drag directions
Apr 25, 2015
157ac21
Update README with invertDrag option
Apr 25, 2015
146baae
Update README with invertDrag option
Apr 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ The aim of this project is to provide a free, minimalist 360 degree video WebGL

There is currently no mobile support, but as Chrome and Safari mobile editions enable WebGL, this should be forwards-compatible with them.

#### Usage
#### Usage

See the [demo folder](https://github.com/flimshaw/Valiant360/tree/master/demo) or the [example](http://flimshaw.github.io/Valiant360). Moving the mouse will pan the camera, and the scroll wheel will zoom in and out.

Expand All @@ -36,6 +36,7 @@ More detailed api documentation pending, for now the below explains about all yo
// initialize plugin, default options shown
$('.valiantContainer').Valiant360({
clickAndDrag: false, // use click-and-drag camera controls
invertDrag: false, // invert the directions of click-and-drag controls
flatProjection: false, // map image to appear flat (often more distorted)
fov: 35, // initial field of view
hideControls: false, // hide player controls
Expand Down Expand Up @@ -67,4 +68,4 @@ The following assets are used in this tool's creation.

+ [JQuery 1.7.2+](http://jquery.com) (MIT License)
+ [Three.js](http://threejs.org/) + Detector (MIT License)
+ [Font Awesome](http://fortawesome.github.io/Font-Awesome/) (MIT License)
+ [Font Awesome](http://fortawesome.github.io/Font-Awesome/) (MIT License)
2 changes: 1 addition & 1 deletion build/demo.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!--
<!--
Valiant360
Copyright (c) 2014 Charlie Hoey

Expand Down
16 changes: 11 additions & 5 deletions src/valiant.jquery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
* Released under the MIT license:
* http://www.opensource.org/licenses/mit-license.php
*
* Jquery plugin pattern based on https://github.com/jquery-boilerplate/jquery-patterns/blob/master/patterns/jquery.basic.plugin-boilerplate.js
* Jquery plugin pattern based on https://github.com/jquery-boilerplate/jquery-patterns/blob/master/patterns/jquery.basic.plugin-boilerplate.js
*/

/* REQUIREMENTS:
Expand Down Expand Up @@ -46,6 +46,7 @@ three.js r65 or higher
var pluginName = "Valiant360",
defaults = {
clickAndDrag: false,
invertDrag: false,
fov: 35,
hideControls: false,
lon: 0,
Expand Down Expand Up @@ -314,8 +315,13 @@ three.js r65 or higher

if(this.options.clickAndDrag) {
if(this._mouseDown) {
if(this.options.invertDrag){
x = this._dragStart.x - event.pageX;
y = this._dragStart.y - event.pageY;
} else {
x = event.pageX - this._dragStart.x;
y = event.pageY - this._dragStart.y;
}
this._dragStart.x = event.pageX;
this._dragStart.y = event.pageY;
this._lon += x;
Expand All @@ -327,7 +333,7 @@ three.js r65 or higher
this._lon = ( x / $(this.element).find('canvas').width() ) * 430 - 225;
this._lat = ( y / $(this.element).find('canvas').height() ) * -180 + 90;
}
},
},

onMouseWheel: function(event) {

Expand Down Expand Up @@ -370,7 +376,7 @@ three.js r65 or higher
animate: function() {
// set our animate function to fire next time a frame is ready
requestAnimationFrame( this.animate.bind(this) );

if( this._isVideo ) {
if ( this._video.readyState === this._video.HAVE_ENOUGH_DATA) {
if(typeof(this._texture) !== "undefined" ) {
Expand All @@ -380,9 +386,9 @@ three.js r65 or higher
this._time = ct;
}
}
}
}
}

this.render();
},

Expand Down