redo/Brick_LuaLogic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add optional colorfx to text brick

Browse Source
This commit is contained in:
Redo 2022-11-10 11:02:25 -06:00
parent d8e794f394
commit 4d8af9f4cb
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bricks/outputs/TextBrick2.cs
View File

@ -31,11 +31,11 @@ datablock fxDTSBrickData(LogicGate_TextBrick2_Data){
lualogic_registergatedefinition("LogicGate_TextBrick2_Data"); lualogic_registergatedefinition("LogicGate_TextBrick2_Data");
function LogicGate_TextBrick2_Data::LuaLogic_Callback(%data, %brick, %arg) { function LogicGate_TextBrick2_Data::LuaLogic_Callback(%data, %brick, %arg) {
%colorId = getWord(%arg, 0); %colorId = getWord(%arg, 0); if(%colorId != -1) %brick.setColor (%colorId);
if(%colorId != -1) %brick.setColor(%colorId); //%colorFx = getWord(%arg, 3); if(%colorFx != -1) %brick.setColorFx(%colorFx);
%domain = getWord(%arg, 1); %domain = getWord(%arg, 1);
%print = getWord(%arg, 2); %print = getWord(%arg, 2);
if(%domain !$= "_" && %print !$= "") %brick.setPrint(lualogic_getprint(%print, %domain)); if(%domain !$= "_" && %print !$= "_") %brick.setPrint(lualogic_getprint(%print, %domain));
} }

4
bricks/outputs/text2-update.lua
View File

@ -20,15 +20,17 @@ local function getBit(gate, val)
local iscolor = math.floor(v/256)==1 -- first bit local iscolor = math.floor(v/256)==1 -- first bit
if iscolor then if iscolor then
local printdomain = (math.floor(v/128)%2)==1 and "terminalInv" or "terminal" -- 8th lowest bit local printdomain = (math.floor(v/128)%2)==1 and "terminalInv" or "terminal" -- 8th lowest bit
local colorfx = (math.floor(v/64)%2)==1 and 3 or 0 -- 7th lowest bit
local colorid = v % 64 -- last 6 bits local colorid = v % 64 -- last 6 bits
gatedata.printdomain = printdomain gatedata.printdomain = printdomain
gatedata.colorid = colorid gatedata.colorid = colorid
gatedata.colorfx = colorfx
else else
local printid = v % 256 -- last 8 bits local printid = v % 256 -- last 8 bits
local printname = textbrick2_idxToPrint[printid] or "space" local printname = textbrick2_idxToPrint[printid] or "space"
gatedata.printname = printname gatedata.printname = printname
end end
Gate.cb(gate, (gatedata.colorid or -1).." "..(gatedata.printdomain or "terminal").." "..(gatedata.printname or "_")) Gate.cb(gate, (gatedata.colorid or -1).." "..(gatedata.printdomain or "terminal").." "..(gatedata.printname or "_")).." "..(gatedata.colorfx or -1)
end end
gatedata.listenState = "wait" gatedata.listenState = "wait"