CodingPirates/blockly
1
0
Fork 0
mirror of https://github.com/google/blockly.git synced 2026-01-08 17:40:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor(generators): Introduce LuaGenerator class, Order enum (#7161)

Browse Source 
* refactor(generators): Introduce LuaGenerator class, Order enum

* refactor(generators): Use Order.* instead of .ORDER_*

* refactor(generators): Don't rename luaGenerator
This commit is contained in:
Christopher Allen
2023-06-14 17:11:37 +01:00
committed by GitHub
parent eeb89194c4
commit a11419d6b7
10 changed files with 579 additions and 533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
generators/lua/colour.js
View File

@@ -11,42 +11,42 @@
import * as goog from '../../closure/goog/goog.js';
goog.declareModuleId('Blockly.Lua.colour');
import {luaGenerator as Lua} from '../lua.js';
import {luaGenerator, Order} from '../lua.js';
Lua.forBlock['colour_picker'] = function(block) {
luaGenerator.forBlock['colour_picker'] = function(block) {
// Colour picker.
const code = Lua.quote_(block.getFieldValue('COLOUR'));
return [code, Lua.ORDER_ATOMIC];
const code = luaGenerator.quote_(block.getFieldValue('COLOUR'));
return [code, Order.ATOMIC];
};
Lua.forBlock['colour_random'] = function(block) {
luaGenerator.forBlock['colour_random'] = function(block) {
// Generate a random colour.
const code = 'string.format("#%06x", math.random(0, 2^24 - 1))';
return [code, Lua.ORDER_HIGH];
return [code, Order.HIGH];
};
Lua.forBlock['colour_rgb'] = function(block) {
luaGenerator.forBlock['colour_rgb'] = function(block) {
// Compose a colour from RGB components expressed as percentages.
const functionName = Lua.provideFunction_('colour_rgb', `
function ${Lua.FUNCTION_NAME_PLACEHOLDER_}(r, g, b)
const functionName = luaGenerator.provideFunction_('colour_rgb', `
function ${luaGenerator.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 = Lua.valueToCode(block, 'RED', Lua.ORDER_NONE) || 0;
const g = Lua.valueToCode(block, 'GREEN', Lua.ORDER_NONE) || 0;
const b = Lua.valueToCode(block, 'BLUE', Lua.ORDER_NONE) || 0;
const r = luaGenerator.valueToCode(block, 'RED', Order.NONE) || 0;
const g = luaGenerator.valueToCode(block, 'GREEN', Order.NONE) || 0;
const b = luaGenerator.valueToCode(block, 'BLUE', Order.NONE) || 0;
const code = functionName + '(' + r + ', ' + g + ', ' + b + ')';
return [code, Lua.ORDER_HIGH];
return [code, Order.HIGH];
};
Lua.forBlock['colour_blend'] = function(block) {
luaGenerator.forBlock['colour_blend'] = function(block) {
// Blend two colours together.
const functionName = Lua.provideFunction_('colour_blend', `
function ${Lua.FUNCTION_NAME_PLACEHOLDER_}(colour1, colour2, ratio)
const functionName = luaGenerator.provideFunction_('colour_blend', `
function ${luaGenerator.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)
@@ -61,11 +61,11 @@ function ${Lua.FUNCTION_NAME_PLACEHOLDER_}(colour1, colour2, ratio)
end
`);
const colour1 =
Lua.valueToCode(block, 'COLOUR1', Lua.ORDER_NONE) || "'#000000'";
luaGenerator.valueToCode(block, 'COLOUR1', Order.NONE) || "'#000000'";
const colour2 =
Lua.valueToCode(block, 'COLOUR2', Lua.ORDER_NONE) || "'#000000'";
const ratio = Lua.valueToCode(block, 'RATIO', Lua.ORDER_NONE) || 0;
luaGenerator.valueToCode(block, 'COLOUR2', Order.NONE) || "'#000000'";
const ratio = luaGenerator.valueToCode(block, 'RATIO', Order.NONE) || 0;
const code =
functionName + '(' + colour1 + ', ' + colour2 + ', ' + ratio + ')';
return [code, Lua.ORDER_HIGH];
return [code, Order.HIGH];
};