Skip to content
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

Jump to bottom

Implement simple touches #1

Merged
merged 1 commit into from
Feb 21, 2017
Merged

Implement simple touches #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
33 changes: 26 additions & 7 deletions camera.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ var now = require('right-now')
var createView = require('3d-view')
var mouseChange = require('mouse-change')
var mouseWheel = require('mouse-wheel')
var mouseOffset = require('mouse-event-offset')

function createCamera(element, options) {
element = element || document.body
Expand Down Expand Up @@ -59,8 +60,8 @@ function createCamera(element, options) {
allEqual = allEqual && (pmatrix[i] === matrix[i])
pmatrix[i] = matrix[i]
}
var sizeChanged =
element.clientWidth === width &&
var sizeChanged =
element.clientWidth === width &&
element.clientHeight === height
width = element.clientWidth
height = element.clientHeight
Expand Down Expand Up @@ -156,14 +157,31 @@ function createCamera(element, options) {
enumerable: true
}
})

element.addEventListener('contextmenu', function(ev) {
ev.preventDefault()
return false
})

var lastX = 0, lastY = 0
mouseChange(element, function(buttons, x, y, mods) {
var lastX = 0, lastY = 0, lastMods = {shift: false, control: false, alt: false, meta: false}
mouseChange(element, handleInteraction)

//enable simple touch interactions
element.addEventListener('touchstart', function (ev) {
var xy = mouseOffset(ev.changedTouches[0], element)
handleInteraction(0, xy[0], xy[1], lastMods)
handleInteraction(1, xy[0], xy[1], lastMods)
})
element.addEventListener('touchmove', function (ev) {
var xy = mouseOffset(ev.changedTouches[0], element)
handleInteraction(1, xy[0], xy[1], lastMods)
})
element.addEventListener('touchend', function (ev) {
var xy = mouseOffset(ev.changedTouches[0], element)
handleInteraction(0, lastX, lastY, lastMods)
})

function handleInteraction (buttons, x, y, mods) {
var scale = 1.0 / element.clientHeight
var dx = scale * (x - lastX)
var dy = scale * (y - lastY)
Expand All @@ -190,7 +208,8 @@ function createCamera(element, options) {

lastX = x
lastY = y
})
lastMods = mods
}

mouseWheel(element, function(dx, dy, dz) {
var flipX = camera.flipX ? 1 : -1
Expand All @@ -205,4 +224,4 @@ function createCamera(element, options) {
}, true)

return camera
}
}
4 changes: 2 additions & 2 deletions example/simple.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
var createCamera = require('../camera')
var bunny = require('bunny')
var perspective = require('gl-mat4/perspective')
var createMesh = require('gl-simplicial-complex')
var createMesh = require('gl-mesh3d')

var canvas = document.createElement('canvas')
document.body.appendChild(canvas)
Expand Down Expand Up @@ -33,4 +33,4 @@ function render() {
})
}
}
render()
render()
7 changes: 4 additions & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@
},
"dependencies": {
"3d-view": "^2.0.0",
"mouse-change": "^1.1.1",
"mouse-event-offset": "^3.0.2",
"mouse-wheel": "^1.0.2",
"right-now": "^1.0.0",
"mouse-change": "^1.1.1"
"right-now": "^1.0.0"
},
"devDependencies": {
"bunny": "^1.0.1",
"canvas-fit": "^1.2.0",
"gl-simplicial-complex": "^3.0.2",
"gl-mesh3d": "^1.2.0",
"gl-mat4": "^1.1.2"
},
"scripts": {
Expand Down