mirror of
https://github.com/google/blockly.git
synced 2026-01-04 15:40:08 +01:00
130989763c
* refactor(generators): Move lang.js -> lang/lang_gernator.js
Move the LangGenerator definitions into their respective
subdirectories and add a _generator suffix to their filenames,
i.e. generators/javascript.js becomes
generators/javascript/javascript_generator.js.
This is to keep related code together and allow the `lang/all.js`
entrypoints to be moved to the top level generators/ directory.
No goog module IDs were changed, so playground and test code
that accesses this modules by filename does not need to be modified.
* refactor(generators) Move lang/all.js -> lang.js
- Move the entrypoints in generators/*/all.js to correspondingly-named
files in generators/ instead—i.e., generators/javascript/all.js
becomes generators/javascript.js.
- Update build_tasks.js accordingly.
* fix(generators): Add missing exports for LuaGenerator, PhpGenerator
These were inadvertently omitted from #7161 and #7162, respectively.
* refactor(generators): Make block generator modules side-effect free
- Move declaration of <lang>Generator instance from
generators/<lang>/<lang>_generator.js to generators/<lang>.js.
- Move .addReservedWords() calls from generators/<lang>/*.js to
generators/<lang>.js
- Modify generators/<lang>/*.js to export block generator functions
individually, rather than installing on <lang>Generator instance.
- Modify generators/<lang>.js to import and install block generator
functions on <lang>Generator instance.
* fix(tests): Fix tests broken by restructuring of generators
Where these tests needed block generator functions preinstalled
they should have been importing the Blockly.<Lang>.all module.
Where they do not need the provided block generator functions
they can now create their own empty <Lang>Generator instances.
* chore: Update renamings file
- Fix a malformation in previous entries that was not detected by
the renaming file validator test.
- Add entries describing the work done in this and related recent
PRs.
* fix: Correct minor errors in PR #7173
- Fix a search-and-replace error in renamings.json5
- Fix an incorrect-but-usable import in generator_test.js
72 lines
2.6 KiB
JavaScript
72 lines
2.6 KiB
JavaScript
/**
|
|
* @license
|
|
* Copyright 2016 Google LLC
|
|
* SPDX-License-Identifier: Apache-2.0
|
|
*/
|
|
|
|
/**
|
|
* @fileoverview Generating Lua for colour blocks.
|
|
*/
|
|
|
|
import * as goog from '../../closure/goog/goog.js';
|
|
goog.declareModuleId('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];
|
|
};
|