Merge remote-tracking branch 'riversunlight/gdx_for' into develop

Author: takaokouji

src/lib/ruby-generator/gdx_for.js

@@ -0,0 +1,78 @@
+/**
+ * Define Ruby code generator for Go Direct Force & Acceleration Blocks
+ * @param {RubyGenerator} Generator The RubyGenerator
+ * @return {RubyGenerator} same as param.
+ */
+export default function (Generator) {
+    Generator.gdxfor_menu_gestureOptions = function (block) {
+        const gesture = Generator.quote_(Generator.getFieldValue(block, 'gestureOptions') || 'shaken');
+        return [gesture, Generator.ORDER_ATOMIC];
+    };
+
+    Generator.gdxfor_whenGesture = function (block) {
+        block.isStatement = true;
+        const gesture = Generator.valueToCode(block, 'GESTURE', Generator.ORDER_NONE) || null;
+        return `${Generator.spriteName()}.when(:gdx_for_gesture, ${gesture}) do\n`;
+    };
+
+    Generator.gdxfor_menu_pushPullOptions = function (block) {
+        const pushPull = Generator.quote_(Generator.getFieldValue(block, 'pushPullOptions') || 'pushed');
+        return [pushPull, Generator.ORDER_ATOMIC];
+    };
+
+    Generator.gdxfor_whenForcePushedOrPulled = function (block) {
+        block.isStatement = true;
+        const pushPull = Generator.valueToCode(block, 'PUSH_PULL', Generator.ORDER_NONE) || null;
+        return `${Generator.spriteName()}.when(:gdx_force_sensor, ${pushPull}) do\n`;
+    };
+
+    Generator.gdxfor_getForce = function () {
+        return [`gdx_for_force`, Generator.ORDER_ATOMIC];
+    };
+
+    Generator.gdxfor_menu_tiltAnyOptions = function (block) {
+        const tiltAny = Generator.quote_(Generator.getFieldValue(block, 'tiltAnyOptions') || 'any');
+        return [tiltAny, Generator.ORDER_ATOMIC];
+    };
+
+    Generator.gdxfor_whenTilted = function (block) {
+        block.isStatement = true;
+        const tilt = Generator.valueToCode(block, 'TILT', Generator.ORDER_NONE) || null;
+        return `${Generator.spriteName()}.when(:gdx_for_tilted, ${tilt}) do\n`;
+    };
+
+    Generator.gdxfor_isTilted = function (block) {
+        const tilt = Generator.valueToCode(block, 'TILT', Generator.ORDER_NONE) || null;
+        return [`gdx_for_tilted?(${tilt})`, Generator.ORDER_ATOMIC];
+    };
+
+    Generator.gdxfor_menu_tiltOptions = function (block) {
+        const tilt = Generator.quote_(Generator.getFieldValue(block, 'tiltOptions') || 'front');
+        return [tilt, Generator.ORDER_ATOMIC];
+    };
+
+    Generator.gdxfor_getTilt = function (block) {
+        const tilt = Generator.valueToCode(block, 'TILT', Generator.ORDER_NONE) || null;
+        return [`gdx_for_tilt_angle(${tilt})`, Generator.ORDER_ATOMIC];
+    };
+
+    Generator.gdxfor_menu_axisOptions = function (block) {
+        const pushPull = Generator.quote_(Generator.getFieldValue(block, 'axisOptions') || 'z');
+        return [pushPull, Generator.ORDER_ATOMIC];
+    };
+
+    Generator.gdxfor_getSpinSpeed = function (block) {
+        const direction = Generator.valueToCode(block, 'DIRECTION', Generator.ORDER_NONE) || null;
+        return [`gdx_for_spin_speed(${direction})`, Generator.ORDER_ATOMIC];
+    };
+
+    Generator.gdxfor_getAcceleration = function (block) {
+        const direction = Generator.valueToCode(block, 'DIRECTION', Generator.ORDER_NONE) || null;
+        return [`gdx_for_acceleration(${direction})`, Generator.ORDER_ATOMIC];
+    };
+
+    Generator.gdxfor_isFreeFalling = function () {
+        return [`gdx_for_falling?`, Generator.ORDER_ATOMIC];
+    };
+    return Generator;
+}

src/lib/ruby-generator/index.js

@@ -26,6 +26,7 @@ import MicrobitBlocks from './microbit.js';
 import BoostBlocks from './boost.js';
 import EV3Blocks from './ev3.js';
 import WeDo2Blocks from './wedo2.js';
+import GdxForBlocks from './gdx_for.js';
 
 const SCALAR_TYPE = '';
 const LIST_TYPE = 'list';
@@ -454,5 +455,6 @@ MicrobitBlocks(RubyGenerator);
 BoostBlocks(RubyGenerator);
 EV3Blocks(RubyGenerator);
 WeDo2Blocks(RubyGenerator);
+GdxForBlocks(RubyGenerator);
 
 export default RubyGenerator;

src/lib/ruby-to-blocks-converter/gdx_for.js

@@ -0,0 +1,29 @@
+/* global Opal */
+import _ from 'lodash';
+
+/**
+ * GdxFor converter
+ */
+const GdxForConverter = {
+    // eslint-disable-next-line no-unused-vars
+    onSend: function (receiver, name, args, rubyBlockArgs, rubyBlock) {
+        let block;
+        if ((this._isSelf(receiver) || receiver === Opal.nil) && !rubyBlock) {
+            switch (name) {
+            case 'gdx_for_acceleration':
+                if (args.length === 1) {
+                    block = this._createBlock('gdxfor_getAcceleration', 'value');
+                    this._addInput(
+                        block,
+                        'DIRECTION',
+                        this._createFieldBlock('gdxfor_menu_axisOptions', 'axisOptions', args[0])
+                    );
+                }
+                break;
+            }
+        }
+        return block;
+    }
+};
+
+export default GdxForConverter;

src/lib/ruby-to-blocks-converter/index.js

@@ -22,6 +22,7 @@ import PenConverter from './pen';
 import MicroBitConverter from './microbit';
 import EV3Converter from './ev3';
 import Wedo2Converter from './wedo2';
+import GdxForConverter from './gdx_for';
 
 /* eslint-disable no-invalid-this */
 const ColorRegexp = /^#[0-9a-fA-F]{6}$/;
@@ -38,6 +39,7 @@ class RubyToBlocksConverter {
             MicroBitConverter,
             EV3Converter,
             Wedo2Converter,
+            GdxForConverter,
 
             MotionConverter,
             LooksConverter,