mirror of
https://github.com/google/blockly.git
synced 2026-01-08 17:40:09 +01:00
b0a7c004a9
* fix(build): Restore erroneously-deleted filter function This was deleted in PR #7406 as it was mainly being used to filter core/ vs. test/mocha/ deps into separate deps files - but it turns out also to be used for filtering error messages too. Oops. * refactor(tests): Migrate advanced compilation test to ES Modules * refactor(build): Migrate main.js to TypeScript This turns out to be pretty straight forward, even if it would cause crashing if one actually tried to import this module instead of just feeding it to Closure Compiler. * chore(build): Remove goog.declareModuleId calls Replace goog.declareModuleId calls with a comment recording the former module ID for posterity (or at least until we decide how to reformat the renamings file. * chore(tests): Delete closure/goog/* For the moment we still need something to serve as base.js for the benefit of closure-make-deps, so we keep a vestigial base.js around, containing only the @provideGoog declaration. * refactor(build): Remove vestigial base.js By changing slightly the command line arguments to closure-make-deps and closure-calculate-chunks the need to have any base.js is eliminated. * chore: Typo fix for PR #7415
71 lines
2.5 KiB
JavaScript
71 lines
2.5 KiB
JavaScript
/**
|
|
* @license
|
|
* Copyright 2016 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
/**
|
|
* @fileoverview Generating Lua for colour blocks.
|
|
*/
|
|
|
|
// Former goog.module ID: Blockly.Lua.colour
|
|
|
|
import {Order} from './lua_generator.js';
|
|
|
|
|
|
export function colour_picker(block, generator) {
|
|
// Colour picker.
|
|
const code = generator.quote_(block.getFieldValue('COLOUR'));
|
|
return [code, Order.ATOMIC];
|
|
};
|
|
|
|
export function colour_random(block, generator) {
|
|
// Generate a random colour.
|
|
const code = 'string.format("#%06x", math.random(0, 2^24 - 1))';
|
|
return [code, Order.HIGH];
|
|
};
|
|
|
|
export function colour_rgb(block, generator) {
|
|
// Compose a colour from RGB components expressed as percentages.
|
|
const functionName = generator.provideFunction_('colour_rgb', `
|
|
function ${generator.FUNCTION_NAME_PLACEHOLDER_}(r, g, b)
|
|
r = math.floor(math.min(100, math.max(0, r)) * 2.55 + .5)
|
|
g = math.floor(math.min(100, math.max(0, g)) * 2.55 + .5)
|
|
b = math.floor(math.min(100, math.max(0, b)) * 2.55 + .5)
|
|
return string.format("#%02x%02x%02x", r, g, b)
|
|
end
|
|
`);
|
|
const r = generator.valueToCode(block, 'RED', Order.NONE) || 0;
|
|
const g = generator.valueToCode(block, 'GREEN', Order.NONE) || 0;
|
|
const b = generator.valueToCode(block, 'BLUE', Order.NONE) || 0;
|
|
const code = functionName + '(' + r + ', ' + g + ', ' + b + ')';
|
|
return [code, Order.HIGH];
|
|
};
|
|
|
|
export function colour_blend(block, generator) {
|
|
// Blend two colours together.
|
|
const functionName = generator.provideFunction_('colour_blend', `
|
|
function ${generator.FUNCTION_NAME_PLACEHOLDER_}(colour1, colour2, ratio)
|
|
local r1 = tonumber(string.sub(colour1, 2, 3), 16)
|
|
local r2 = tonumber(string.sub(colour2, 2, 3), 16)
|
|
local g1 = tonumber(string.sub(colour1, 4, 5), 16)
|
|
local g2 = tonumber(string.sub(colour2, 4, 5), 16)
|
|
local b1 = tonumber(string.sub(colour1, 6, 7), 16)
|
|
local b2 = tonumber(string.sub(colour2, 6, 7), 16)
|
|
local ratio = math.min(1, math.max(0, ratio))
|
|
local r = math.floor(r1 * (1 - ratio) + r2 * ratio + .5)
|
|
local g = math.floor(g1 * (1 - ratio) + g2 * ratio + .5)
|
|
local b = math.floor(b1 * (1 - ratio) + b2 * ratio + .5)
|
|
return string.format("#%02x%02x%02x", r, g, b)
|
|
end
|
|
`);
|
|
const colour1 =
|
|
generator.valueToCode(block, 'COLOUR1', Order.NONE) || "'#000000'";
|
|
const colour2 =
|
|
generator.valueToCode(block, 'COLOUR2', Order.NONE) || "'#000000'";
|
|
const ratio = generator.valueToCode(block, 'RATIO', Order.NONE) || 0;
|
|
const code =
|
|
functionName + '(' + colour1 + ', ' + colour2 + ', ' + ratio + ')';
|
|
return [code, Order.HIGH];
|
|
};
|