mirror of
https://github.com/google/blockly.git
synced 2026-01-06 16:40:07 +01:00
refactor: convert some block generators to goog.module (#5770)
* refactor: convert generators/lua.js to goog.module * refactor: convert generator/lua.js to named requires * chore: run clang-format * refactor: convert generators/php/colour.js to goog.module * refactor: convert generators/php/colour.js to named requires * chore: run clang-format * refactor: convert generators/php/lists.js to goog.module * refactor: convert generators/php/lists.js to named requires * chore: run clang-format * refactor: convert generators/php/logic.js to goog.module * refactor: convert generators/php/logic.js to named requires * chore: run clang-format * refactor: convert generators/php/loops.js to goog.module * refactor: convert generators/php/loops.js to named requires * chore: run clang-format * refactor: convert generators/php/math.js to goog.module * refactor: convert generators/php/math.js to named requires * chore: run clang-format * refactor: convert generators/php/procedures.js to goog.module * refactor: convert generators/php/procedures.js to named requires * chore: run clang-format * refactor: convert generators/php/text.js to goog.module * refactor: convert generators/php/text.js to named requires * chore: run clang-format * refactor: convert generators/php/variables.js to goog.module * refactor: convert generators/php/variables.js to named requires * chore: run clang-format * refactor: convert generators/php/variables_dynamic.js to goog.module * refactor: convert generators/php/variables_dynamic.js to named requires * refactor: convert generators/php.js to goog.module * refactor: convert generators/php.js to named requires * chore: run clang-format * chore: rebuild deps.js
This commit is contained in:
Rachel Fenichel
GitHub
@@ -9,82 +9,67 @@
|
||||
*/
|
||||
'use strict';
|
||||
|
||||
goog.provide('Blockly.PHP.colour');
|
||||
goog.module('Blockly.PHP.colour');
|
||||
|
||||
goog.require('Blockly.PHP');
|
||||
const PHP = goog.require('Blockly.PHP');
|
||||
|
||||
|
||||
Blockly.PHP['colour_picker'] = function(block) {
|
||||
PHP['colour_picker'] = function(block) {
|
||||
// Colour picker.
|
||||
const code = Blockly.PHP.quote_(block.getFieldValue('COLOUR'));
|
||||
return [code, Blockly.PHP.ORDER_ATOMIC];
|
||||
const code = PHP.quote_(block.getFieldValue('COLOUR'));
|
||||
return [code, PHP.ORDER_ATOMIC];
|
||||
};
|
||||
|
||||
Blockly.PHP['colour_random'] = function(block) {
|
||||
PHP['colour_random'] = function(block) {
|
||||
// Generate a random colour.
|
||||
const functionName = Blockly.PHP.provideFunction_(
|
||||
'colour_random',
|
||||
['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ + '() {',
|
||||
' return \'#\' . str_pad(dechex(mt_rand(0, 0xFFFFFF)), ' +
|
||||
'6, \'0\', STR_PAD_LEFT);',
|
||||
'}']);
|
||||
const functionName = PHP.provideFunction_('colour_random', [
|
||||
'function ' + PHP.FUNCTION_NAME_PLACEHOLDER_ + '() {',
|
||||
' return \'#\' . str_pad(dechex(mt_rand(0, 0xFFFFFF)), ' +
|
||||
'6, \'0\', STR_PAD_LEFT);',
|
||||
'}'
|
||||
]);
|
||||
const code = functionName + '()';
|
||||
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
|
||||
return [code, PHP.ORDER_FUNCTION_CALL];
|
||||
};
|
||||
|
||||
Blockly.PHP['colour_rgb'] = function(block) {
|
||||
PHP['colour_rgb'] = function(block) {
|
||||
// Compose a colour from RGB components expressed as percentages.
|
||||
const red = Blockly.PHP.valueToCode(block, 'RED',
|
||||
Blockly.PHP.ORDER_NONE) || 0;
|
||||
const green = Blockly.PHP.valueToCode(block, 'GREEN',
|
||||
Blockly.PHP.ORDER_NONE) || 0;
|
||||
const blue = Blockly.PHP.valueToCode(block, 'BLUE',
|
||||
Blockly.PHP.ORDER_NONE) || 0;
|
||||
const functionName = Blockly.PHP.provideFunction_(
|
||||
'colour_rgb',
|
||||
['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
|
||||
'($r, $g, $b) {',
|
||||
' $r = round(max(min($r, 100), 0) * 2.55);',
|
||||
' $g = round(max(min($g, 100), 0) * 2.55);',
|
||||
' $b = round(max(min($b, 100), 0) * 2.55);',
|
||||
' $hex = \'#\';',
|
||||
' $hex .= str_pad(dechex($r), 2, \'0\', STR_PAD_LEFT);',
|
||||
' $hex .= str_pad(dechex($g), 2, \'0\', STR_PAD_LEFT);',
|
||||
' $hex .= str_pad(dechex($b), 2, \'0\', STR_PAD_LEFT);',
|
||||
' return $hex;',
|
||||
'}']);
|
||||
const red = PHP.valueToCode(block, 'RED', PHP.ORDER_NONE) || 0;
|
||||
const green = PHP.valueToCode(block, 'GREEN', PHP.ORDER_NONE) || 0;
|
||||
const blue = PHP.valueToCode(block, 'BLUE', PHP.ORDER_NONE) || 0;
|
||||
const functionName = PHP.provideFunction_('colour_rgb', [
|
||||
'function ' + PHP.FUNCTION_NAME_PLACEHOLDER_ + '($r, $g, $b) {',
|
||||
' $r = round(max(min($r, 100), 0) * 2.55);',
|
||||
' $g = round(max(min($g, 100), 0) * 2.55);',
|
||||
' $b = round(max(min($b, 100), 0) * 2.55);', ' $hex = \'#\';',
|
||||
' $hex .= str_pad(dechex($r), 2, \'0\', STR_PAD_LEFT);',
|
||||
' $hex .= str_pad(dechex($g), 2, \'0\', STR_PAD_LEFT);',
|
||||
' $hex .= str_pad(dechex($b), 2, \'0\', STR_PAD_LEFT);', ' return $hex;',
|
||||
'}'
|
||||
]);
|
||||
const code = functionName + '(' + red + ', ' + green + ', ' + blue + ')';
|
||||
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
|
||||
return [code, PHP.ORDER_FUNCTION_CALL];
|
||||
};
|
||||
|
||||
Blockly.PHP['colour_blend'] = function(block) {
|
||||
PHP['colour_blend'] = function(block) {
|
||||
// Blend two colours together.
|
||||
const c1 = Blockly.PHP.valueToCode(block, 'COLOUR1',
|
||||
Blockly.PHP.ORDER_NONE) || '\'#000000\'';
|
||||
const c2 = Blockly.PHP.valueToCode(block, 'COLOUR2',
|
||||
Blockly.PHP.ORDER_NONE) || '\'#000000\'';
|
||||
const ratio = Blockly.PHP.valueToCode(block, 'RATIO',
|
||||
Blockly.PHP.ORDER_NONE) || 0.5;
|
||||
const functionName = Blockly.PHP.provideFunction_(
|
||||
'colour_blend',
|
||||
['function ' + Blockly.PHP.FUNCTION_NAME_PLACEHOLDER_ +
|
||||
'($c1, $c2, $ratio) {',
|
||||
' $ratio = max(min($ratio, 1), 0);',
|
||||
' $r1 = hexdec(substr($c1, 1, 2));',
|
||||
' $g1 = hexdec(substr($c1, 3, 2));',
|
||||
' $b1 = hexdec(substr($c1, 5, 2));',
|
||||
' $r2 = hexdec(substr($c2, 1, 2));',
|
||||
' $g2 = hexdec(substr($c2, 3, 2));',
|
||||
' $b2 = hexdec(substr($c2, 5, 2));',
|
||||
' $r = round($r1 * (1 - $ratio) + $r2 * $ratio);',
|
||||
' $g = round($g1 * (1 - $ratio) + $g2 * $ratio);',
|
||||
' $b = round($b1 * (1 - $ratio) + $b2 * $ratio);',
|
||||
' $hex = \'#\';',
|
||||
' $hex .= str_pad(dechex($r), 2, \'0\', STR_PAD_LEFT);',
|
||||
' $hex .= str_pad(dechex($g), 2, \'0\', STR_PAD_LEFT);',
|
||||
' $hex .= str_pad(dechex($b), 2, \'0\', STR_PAD_LEFT);',
|
||||
' return $hex;',
|
||||
'}']);
|
||||
const c1 = PHP.valueToCode(block, 'COLOUR1', PHP.ORDER_NONE) || '\'#000000\'';
|
||||
const c2 = PHP.valueToCode(block, 'COLOUR2', PHP.ORDER_NONE) || '\'#000000\'';
|
||||
const ratio = PHP.valueToCode(block, 'RATIO', PHP.ORDER_NONE) || 0.5;
|
||||
const functionName = PHP.provideFunction_('colour_blend', [
|
||||
'function ' + PHP.FUNCTION_NAME_PLACEHOLDER_ + '($c1, $c2, $ratio) {',
|
||||
' $ratio = max(min($ratio, 1), 0);', ' $r1 = hexdec(substr($c1, 1, 2));',
|
||||
' $g1 = hexdec(substr($c1, 3, 2));', ' $b1 = hexdec(substr($c1, 5, 2));',
|
||||
' $r2 = hexdec(substr($c2, 1, 2));', ' $g2 = hexdec(substr($c2, 3, 2));',
|
||||
' $b2 = hexdec(substr($c2, 5, 2));',
|
||||
' $r = round($r1 * (1 - $ratio) + $r2 * $ratio);',
|
||||
' $g = round($g1 * (1 - $ratio) + $g2 * $ratio);',
|
||||
' $b = round($b1 * (1 - $ratio) + $b2 * $ratio);', ' $hex = \'#\';',
|
||||
' $hex .= str_pad(dechex($r), 2, \'0\', STR_PAD_LEFT);',
|
||||
' $hex .= str_pad(dechex($g), 2, \'0\', STR_PAD_LEFT);',
|
||||
' $hex .= str_pad(dechex($b), 2, \'0\', STR_PAD_LEFT);', ' return $hex;',
|
||||
'}'
|
||||
]);
|
||||
const code = functionName + '(' + c1 + ', ' + c2 + ', ' + ratio + ')';
|
||||
return [code, Blockly.PHP.ORDER_FUNCTION_CALL];
|
||||
return [code, PHP.ORDER_FUNCTION_CALL];
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user