scratchfoundation/scratch-vm
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-vm.git synced 2024-12-24 23:12:24 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Remove accidental double declarations

Browse source
This commit is contained in:
Valerie Young 2019-01-07 17:45:03 -05:00
parent fb0c6baeeb
commit 4529533aa8
1 changed files with 10 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
src/extensions/scratch3_gdx_for/index.js
View file

@ -83,8 +83,6 @@ class GdxFor {
this.disconnect = this.disconnect.bind(this); this.disconnect = this.disconnect.bind(this);
this._onConnect = this._onConnect.bind(this); this._onConnect = this._onConnect.bind(this);
this._connected = false;
} }
@ -116,38 +114,6 @@ class GdxFor {
} }
} }
/**
* Called by the runtime when a user exits the connection popup.
* Disconnect from the Gdx Force.
*/
disconnect () {
if (this._device) {
this._device.close();
}
}
/**
* Return true if connected to the goforce devie.
* @return {boolean} - whether the goforce is connected.
*/
isConnected () {
let connected = false;
if (this._device) {
connected = this._connected;
}
return connected;
}
/**
* Called by the runtime when user wants to connect to a certain peripheral.
* @param {number} id - the id of the peripheral to connect to.
*/
connect (id) {
if (this._scratchLinkSocket) {
this._scratchLinkSocket.connectPeripheral(id);
}
}
/** /**
* Called by the runtime when a use exits the connection popup. * Called by the runtime when a use exits the connection popup.
* Disconnect from the GDX FOR. * Disconnect from the GDX FOR.
@ -164,8 +130,8 @@ class GdxFor {
*/ */
isConnected () { isConnected () {
let connected = false; let connected = false;
if (this._device) { if (this._scratchLinkSocket) {
connected = this._connected; connected = this._scratchLinkSocket.isConnected();
} }
return connected; return connected;
} }
@ -175,7 +141,6 @@ class GdxFor {
* @private * @private
*/ */
_onConnect () { _onConnect () {
this._connected = true;
const adapter = new ScratchLinkDeviceAdapter(this._scratchLinkSocket); const adapter = new ScratchLinkDeviceAdapter(this._scratchLinkSocket);
createDevice(adapter, {open: true, startMeasurements: false}).then(device => { createDevice(adapter, {open: true, startMeasurements: false}).then(device => {
this._device = device; this._device = device;
@ -202,49 +167,49 @@ class GdxFor {
getForce () { getForce () {
if (this._device) { if (this.isConnected()) {
return this._device.getSensor(1).value; return this._device.getSensor(1).value;
} }
return 0; return 0;
} }
getAccelerationX () { getAccelerationX () {
if (this._device && this._connected) { if (this.isConnected()) {
return this._device.getSensor(2).value; return this._device.getSensor(2).value;
} }
return 0; return 0;
} }
getAccelerationY () { getAccelerationY () {
if (this._device && this._connected) { if (this.isConnected()) {
return this._device.getSensor(3).value; return this._device.getSensor(3).value;
} }
return 0; return 0;
} }
getAccelerationZ () { getAccelerationZ () {
if (this._device && this._connected) { if (this.isConnected()) {
return this._device.getSensor(4).value; return this._device.getSensor(4).value;
} }
return 0; return 0;
} }
getAngularSpeedX () { getAngularSpeedX () {
if (this._device && this._connected) { if (this.isConnected()) {
return this._device.getSensor(5).value; return this._device.getSensor(5).value;
} }
return 0; return 0;
} }
getAngularSpeedY () { getAngularSpeedY () {
if (this._device && this._connected) { if (this.isConnected()) {
return this._device.getSensor(6).value; return this._device.getSensor(6).value;
} }
return 0; return 0;
} }
getAngularSpeedZ () { getAngularSpeedZ () {
if (this._device && this._connected) { if (this.isConnected()) {
return this._device.getSensor(7).value; return this._device.getSensor(7).value;
} }
return 0; return 0;
@ -252,7 +217,7 @@ class GdxFor {
_onClose () { _onClose () {
this._connected = false; this._scratchLinkSocket.disconnect();
} }
} }