mirror of
https://github.com/google/blockly.git
synced 2025-12-15 22:00:07 +01:00
a3458871db
* feat(generators): Pass this CodeGenerator to generator functions This implements option 1A of proposal 1 of #7086. This commit is not by itself a breaking change, except in the unlikely event that developers' custom generator functions take an (optional) second argument of a dfferent type. * feat(generators): Accept generator argument in block functions Accept a CodeGenerator instance as parameter two of every per-block-type generator function. * fix(generators): Pass generator when calling other generator functions Make sure to pass generator to any other block functions that are called recursively. * refactor(generators)!: Use generator argument in generator functions Refactor per-block-type generator functions to use the provided generator argument to make recursive calls, rather than depending on the closed-over <lang>Generator instance. This allows generator functions to be moved between CodeGenerator instances (of the same language, at least). This commit was created by search-and-replace and addresses most but not all recursive references; remaining uses will require manual attention and will be dealt with in a following commit. BREAKING CHANGE: This commit makes the generator functions we provide dependent on the new generator parameter. Although CodeGenerator.prototype.blockToCode has been modified to supply this, so this change will not affect most developers, this change will be a breaking change where developers make direct calls to these generator functions without supplying the generator parameter. See previous commit for an example of the update required. * refactor(generators): Manual fix for remaining uses of langGenerator Manually replace remaining uses of <lang>Generator in block generator functions. * fix(generators): Delete duplicate procedures_callnoreturn generator For some reason the generator function for procedures_callnoreturn appears twice in generators/javascript/procedures.js. Delete the first copy (since the second one overwrote it anyway). * chore(generators): Format
109 lines
3.8 KiB
JavaScript
109 lines
3.8 KiB
JavaScript
/**
|
|
* @license
|
|
* Copyright 2014 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
/**
|
|
* @fileoverview Generating Dart for colour blocks.
|
|
*/
|
|
|
|
import * as goog from '../../closure/goog/goog.js';
|
|
goog.declareModuleId('Blockly.Dart.colour');
|
|
|
|
import {dartGenerator, Order} from '../dart.js';
|
|
|
|
|
|
dartGenerator.addReservedWords('Math');
|
|
|
|
dartGenerator.forBlock['colour_picker'] = function(block, generator) {
|
|
// Colour picker.
|
|
const code = generator.quote_(block.getFieldValue('COLOUR'));
|
|
return [code, Order.ATOMIC];
|
|
};
|
|
|
|
dartGenerator.forBlock['colour_random'] = function(block, generator) {
|
|
// Generate a random colour.
|
|
generator.definitions_['import_dart_math'] =
|
|
"import 'dart:math' as Math;";
|
|
const functionName = generator.provideFunction_('colour_random', `
|
|
String ${generator.FUNCTION_NAME_PLACEHOLDER_}() {
|
|
String hex = '0123456789abcdef';
|
|
var rnd = new Math.Random();
|
|
return '#\${hex[rnd.nextInt(16)]}\${hex[rnd.nextInt(16)]}'
|
|
'\${hex[rnd.nextInt(16)]}\${hex[rnd.nextInt(16)]}'
|
|
'\${hex[rnd.nextInt(16)]}\${hex[rnd.nextInt(16)]}';
|
|
}
|
|
`);
|
|
const code = functionName + '()';
|
|
return [code, Order.UNARY_POSTFIX];
|
|
};
|
|
|
|
dartGenerator.forBlock['colour_rgb'] = function(block, generator) {
|
|
// Compose a colour from RGB components expressed as percentages.
|
|
const red = generator.valueToCode(block, 'RED', Order.NONE) || 0;
|
|
const green = generator.valueToCode(block, 'GREEN', Order.NONE) || 0;
|
|
const blue = generator.valueToCode(block, 'BLUE', Order.NONE) || 0;
|
|
|
|
generator.definitions_['import_dart_math'] =
|
|
"import 'dart:math' as Math;";
|
|
const functionName = generator.provideFunction_('colour_rgb', `
|
|
String ${generator.FUNCTION_NAME_PLACEHOLDER_}(num r, num g, num b) {
|
|
num rn = (Math.max(Math.min(r, 100), 0) * 2.55).round();
|
|
String rs = rn.toInt().toRadixString(16);
|
|
rs = '0$rs';
|
|
rs = rs.substring(rs.length - 2);
|
|
num gn = (Math.max(Math.min(g, 100), 0) * 2.55).round();
|
|
String gs = gn.toInt().toRadixString(16);
|
|
gs = '0$gs';
|
|
gs = gs.substring(gs.length - 2);
|
|
num bn = (Math.max(Math.min(b, 100), 0) * 2.55).round();
|
|
String bs = bn.toInt().toRadixString(16);
|
|
bs = '0$bs';
|
|
bs = bs.substring(bs.length - 2);
|
|
return '#$rs$gs$bs';
|
|
}
|
|
`);
|
|
const code = functionName + '(' + red + ', ' + green + ', ' + blue + ')';
|
|
return [code, Order.UNARY_POSTFIX];
|
|
};
|
|
|
|
dartGenerator.forBlock['colour_blend'] = function(block, generator) {
|
|
// Blend two colours together.
|
|
const c1 =
|
|
generator.valueToCode(block, 'COLOUR1', Order.NONE) || "'#000000'";
|
|
const c2 =
|
|
generator.valueToCode(block, 'COLOUR2', Order.NONE) || "'#000000'";
|
|
const ratio =
|
|
generator.valueToCode(block, 'RATIO', Order.NONE) || 0.5;
|
|
|
|
generator.definitions_['import_dart_math'] =
|
|
"import 'dart:math' as Math;";
|
|
const functionName = generator.provideFunction_('colour_blend', `
|
|
String ${generator.FUNCTION_NAME_PLACEHOLDER_}(String c1, String c2, num ratio) {
|
|
ratio = Math.max(Math.min(ratio, 1), 0);
|
|
int r1 = int.parse('0x\${c1.substring(1, 3)}');
|
|
int g1 = int.parse('0x\${c1.substring(3, 5)}');
|
|
int b1 = int.parse('0x\${c1.substring(5, 7)}');
|
|
int r2 = int.parse('0x\${c2.substring(1, 3)}');
|
|
int g2 = int.parse('0x\${c2.substring(3, 5)}');
|
|
int b2 = int.parse('0x\${c2.substring(5, 7)}');
|
|
num rn = (r1 * (1 - ratio) + r2 * ratio).round();
|
|
String rs = rn.toInt().toRadixString(16);
|
|
num gn = (g1 * (1 - ratio) + g2 * ratio).round();
|
|
String gs = gn.toInt().toRadixString(16);
|
|
num bn = (b1 * (1 - ratio) + b2 * ratio).round();
|
|
String bs = bn.toInt().toRadixString(16);
|
|
rs = '0$rs';
|
|
rs = rs.substring(rs.length - 2);
|
|
gs = '0$gs';
|
|
gs = gs.substring(gs.length - 2);
|
|
bs = '0$bs';
|
|
bs = bs.substring(bs.length - 2);
|
|
return '#$rs$gs$bs';
|
|
}
|
|
`);
|
|
const code = functionName + '(' + c1 + ', ' + c2 + ', ' + ratio + ')';
|
|
return [code, Order.UNARY_POSTFIX];
|
|
};
|