Skip to content

Commit

Permalink
updated pointer lock
Browse files Browse the repository at this point in the history
  • Loading branch information
BigTeri committed Dec 16, 2016
1 parent d52de41 commit 8f8df53
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 13 deletions.
10 changes: 5 additions & 5 deletions client/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,11 @@ System.config({
"core-js": "npm:core-js@1.2.7",
"events": "github:jspm/nodelibs-events@0.1.1",
"jquery": "npm:jquery@3.1.1",
"jspointerlock": "npm:jspointerlock@0.1.3",
"jspointerlock": "github:BigTeri/jspointerlock@0.2.0",
"github:BigTeri/jspointerlock@0.2.0": {
"events": "github:jspm/nodelibs-events@0.1.1",
"jquery": "npm:jquery@3.1.1"
},
"github:jspm/nodelibs-assert@0.1.0": {
"assert": "npm:assert@1.4.1"
},
Expand Down Expand Up @@ -67,10 +71,6 @@ System.config({
"npm:inherits@2.0.1": {
"util": "github:jspm/nodelibs-util@0.1.0"
},
"npm:jspointerlock@0.1.3": {
"events": "github:jspm/nodelibs-events@0.1.1",
"jquery": "npm:jquery@3.1.1"
},
"npm:path-browserify@0.0.0": {
"process": "github:jspm/nodelibs-process@0.1.2"
},
Expand Down
9 changes: 3 additions & 6 deletions client/src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@ import Connection from "./connection";
import hint from "./hint";
import keys from "./keymap";

const element = document.body;
const $element = $(element);

// TODO: pointerlock should accept jquery selector -> jspointerlock needs update
const pointerLock = new PointerLock(element);
const $element = $(".fullscreen");
const pointerLock = new PointerLock($element);
const connection = new Connection();
const socket = connection.socket;

Expand All @@ -18,7 +15,7 @@ connection
updateHint();
})
.on("disconnect", () => {
// TODO: cancelPointerLock -> jspointerlock needs update
pointerLock.exitPointerLock();
updateBindings();
updateHint();
});
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "jsremote",
"version": "0.2.0",
"version": "0.2.1",
"description": "NodeJS desktop remote using HTML5 Pointerlock",
"main": "server/index.js",
"scripts": {
Expand Down Expand Up @@ -36,7 +36,7 @@
"dependencies": {
"events": "github:jspm/nodelibs-events@^0.1.1",
"jquery": "npm:jquery@^3.1.1",
"jspointerlock": "npm:jspointerlock@^0.1.3"
"jspointerlock": "github:BigTeri/jspointerlock@^0.2.0"
},
"devDependencies": {
"babel": "npm:babel-core@^5.8.24",
Expand Down

0 comments on commit 8f8df53

Please sign in to comment.