Skip to content

updates & fixes for mobile platforms DO NOT MERGE #33

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
kaosat-dev wants to merge 3 commits into
base: master
Choose a base branch
from
Open

updates & fixes for mobile platforms DO NOT MERGE #33

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
ad3e185
fix(touchDrags): added throtling (as a test) to reduce too sensitive …
kaosat-dev Aug 26, 2016
c36e620
chore(build): added build with interaction changes, for easier testing
kaosat-dev Aug 26, 2016
87360a7
feat(ios-interactions): tweaks and adjustements to get better user in…
kaosat-dev Aug 26, 2016
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
10 changes: 5 additions & 5 deletions dist/jam.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/components/webgl/GlView.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ function GLView ({drivers, props$}) {
let controls = makeControls(config.controls[0]) // create 'orbit' controls
let transformControls = new TransformControls(camera)

let grid = new LabeledGrid(200, 200, 10, config.cameras[0].up)
let grid = new LabeledGrid(215, 215, 10, config.cameras[0].up)
let shadowPlane = new ShadowPlane(2000, 2000, null, config.cameras[0].up)

const actions = intent({DOM, events: drivers.events}, {camera, scene, transformControls, props$, settings$})
Expand Down
2 changes: 1 addition & 1 deletion src/components/webgl/deps/OrbitControls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ var OrbitControls = function ( object, domElement, upVector ) {
//fireDeActivated()
}

camState.thetaDelta /= 1.5
camState.thetaDelta /= 1.9
camState.phiDelta /= 1.5
camState.scale = 1
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/webgl/presets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export const presets = {
controls: [
{
up: [0, 0, 1],
rotateSpeed: 2.0,
rotateSpeed: 0.7,
panSpeed: 2.0,
zoomSpeed: 2.0,
autoRotate: {
Expand Down
2 changes: 1 addition & 1 deletion src/interactions/pointers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -349,7 +349,7 @@ export function pointerInteractions (baseInteractions) {
// drag move interactions (continuously firing)
const dragMoves$ = merge(
drags3(mouseDowns$, mouseUps$, mouseMoves$, longPressDelay, deltaSqr),
touchDrags(touchStart$, touchEnd$, touchMoves$)
touchDrags(touchStart$, touchEnd$, touchMoves$).throttle(40).tap(e=>console.log('foo'))
)
.takeUntil(longTaps$).repeat() // no drag moves if there is a context action already taking place

Expand Down