mirror of
https://github.com/google/blockly.git
synced 2025-12-16 06:10:12 +01:00
feat!: delete angle, colour, and multiline input fields and blocks (#7932)
* chore: delete mocha tests for angle field * feat! : delete angle field * chore(tests): delete colour tests from generator tests and golden files * chore: delete colour blocks and associated generators * chore: remove colour blocks from playgrounds * chore: delete mocha tests for colour fields * chore: fix incorrect comment * chore: delete colour field from core * chore: delete multiline input tests from generators tests and golden files * chore: delete multiline text block and associated generators * chore: remove multiline text block from playgrounds * chore: delete mocha tests for multiline input field * chore: delete multiline input field from core
This commit is contained in:
@@ -1,102 +0,0 @@
|
||||
/**
|
||||
* @license
|
||||
* Copyright 2015 Google LLC
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*/
|
||||
|
||||
/**
|
||||
* @file Generating PHP for colour blocks.
|
||||
*/
|
||||
|
||||
// Former goog.module ID: Blockly.PHP.colour
|
||||
|
||||
import type {Block} from '../../core/block.js';
|
||||
import {Order} from './php_generator.js';
|
||||
import type {PhpGenerator} from './php_generator.js';
|
||||
|
||||
export function colour_picker(
|
||||
block: Block,
|
||||
generator: PhpGenerator,
|
||||
): [string, Order] {
|
||||
// Colour picker.
|
||||
const code = generator.quote_(block.getFieldValue('COLOUR'));
|
||||
return [code, Order.ATOMIC];
|
||||
}
|
||||
|
||||
export function colour_random(
|
||||
block: Block,
|
||||
generator: PhpGenerator,
|
||||
): [string, Order] {
|
||||
// Generate a random colour.
|
||||
const functionName = generator.provideFunction_(
|
||||
'colour_random',
|
||||
`
|
||||
function ${generator.FUNCTION_NAME_PLACEHOLDER_}() {
|
||||
return '#' . str_pad(dechex(mt_rand(0, 0xFFFFFF)), 6, '0', STR_PAD_LEFT);
|
||||
}
|
||||
`,
|
||||
);
|
||||
const code = functionName + '()';
|
||||
return [code, Order.FUNCTION_CALL];
|
||||
}
|
||||
|
||||
export function colour_rgb(
|
||||
block: Block,
|
||||
generator: PhpGenerator,
|
||||
): [string, Order] {
|
||||
// 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;
|
||||
const functionName = generator.provideFunction_(
|
||||
'colour_rgb',
|
||||
`
|
||||
function ${generator.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, Order.FUNCTION_CALL];
|
||||
}
|
||||
|
||||
export function colour_blend(
|
||||
block: Block,
|
||||
generator: PhpGenerator,
|
||||
): [string, Order] {
|
||||
// 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;
|
||||
const functionName = generator.provideFunction_(
|
||||
'colour_blend',
|
||||
`
|
||||
function ${generator.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, Order.FUNCTION_CALL];
|
||||
}
|
||||
@@ -21,16 +21,6 @@ export function text(block: Block, generator: PhpGenerator): [string, Order] {
|
||||
return [code, Order.ATOMIC];
|
||||
}
|
||||
|
||||
export function text_multiline(
|
||||
block: Block,
|
||||
generator: PhpGenerator,
|
||||
): [string, Order] {
|
||||
// Text value.
|
||||
const code = generator.multiline_quote_(block.getFieldValue('TEXT'));
|
||||
const order = code.indexOf('.') !== -1 ? Order.STRING_CONCAT : Order.ATOMIC;
|
||||
return [code, order];
|
||||
}
|
||||
|
||||
export function text_join(
|
||||
block: Block,
|
||||
generator: PhpGenerator,
|
||||
|
||||
Reference in New Issue
Block a user