Egalware/essetre-90480023_xs-mw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Corrette origini

Browse Source
This commit is contained in:
andrea.villa
2026-04-07 10:33:05 +02:00
parent 912dd11c64
commit 5734560db2
3 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Essetre-90480023_XS-MW.mlde
+3 -3
View File
@@ -5,10 +5,10 @@
-- Aggiunta controllo collisione con nuovi oggetti
require( 'EmtGenerator')
EgtEnableDebug( true)
EgtEnableDebug( false)
if not EmtModifyHeadAuxDirection then error( 'A newer version of the program is required (minimum 2.3j5)') end
PP_VER = '3.1d1_DEV5'
PP_VER = '3.1d1_DEV6'
PP_NVER = '2.7.4.1'
-- Parametri macchina
@@ -264,7 +264,7 @@ EmtHead {
Parent = 'B1',
HSet = 'H1',
Type = MCH_HT.STD,
Pos = Point3d( SawOffsX, SawOffsY, SawOffsZ),
Pos = Point3d( -SawOffsX, SawOffsY, SawOffsZ),
TDir = Vector3d( 0, sin( SawB1Offs), cos( SawB1Offs)),
ADir = X_AX(),
Rot1W = 0.1,
Essetre-WALL.NUM.mlpe
+6 -12
View File
@@ -77,12 +77,6 @@ function OnProgramStart()
'L169='..EgtNumToString( Orig4DeltaY, 2)..'\n'..
'L170='..EgtNumToString( -Orig4DeltaX, 2)..'\n'..
'L171='..EgtNumToString( Orig4DeltaZ, 2)..'\n'..
'L172='..EgtNumToString( Orig5DeltaY, 2)..'\n'..
'L173='..EgtNumToString( -Orig5DeltaX, 2)..'\n'..
'L174='..EgtNumToString( Orig5DeltaZ, 2)..'\n'..
'L175='..EgtNumToString( Orig6DeltaY, 2)..'\n'..
'L176='..EgtNumToString( -Orig6DeltaX, 2)..'\n'..
'L177='..EgtNumToString( Orig6DeltaZ, 2)..'\n'..
'G114'..' EA'..EgtNumToString( DeltaTabY + DimTabY - SawDeltaY, 2)..' EB'..EgtNumToString( -DeltaTabX + SawDeltaX, 2)..
' EC'..EgtNumToString( DeltaTabZ - SawDeltaZ, 2)..' ED'..EgtNumToString( 0, 2)..' EE'..EgtNumToString( SawOffs, 2)..
' EF'..EgtNumToString( DeltaTabY + DimTabY, 2)..' EG'..EgtNumToString( -DeltaTabX, 2)..
@@ -667,14 +661,14 @@ function CalcInterpPlane()
local ptS = Point3d( xS, yS, zS)
-- calcolo per piano generico
local vtE
if EMT.HEAD == 'H1' then
if EMT.HEAD == 'H1' or EMT.HEAD == 'H12' then
vtE = EgtGetCalcToolDirFromAngles( EMT.R1, EMT.R2, EMT.R3)
elseif EMT.HEAD == 'H3' then
vtE = EgtGetCalcAuxDirFromAngles( EMT.R1, EMT.R2, EMT.R3)
else
vtE = Z_AX()
end
if EMT.HEAD == 'H1' or EMT.HEAD == 'H3' then
if EMT.HEAD == 'H1' or EMT.HEAD == 'H12' or EMT.HEAD == 'H3' then
EMT.IPLGLFR = Frame3d( ptS, vtE)
else
EMT.IPLGLFR = Frame3d( ptS, Y_AX(), -X_AX(), Z_AX())
@@ -694,17 +688,17 @@ function CalcInterpPlane()
end
dAngO = 0
end
local xOut = yS - DeltaTabY - DimTabY
local yOut = - ( xS - DeltaTabX)
local xOut = yS - DeltaTabY
local yOut = - ( xS - DeltaTabX - DimTabX)
local zOut = zS
if EMT.ORIG == 2 then
xOut = yS - DeltaTabY
yOut = - ( xS - DeltaTabX)
elseif EMT.ORIG == 3 then
xOut = yS - DeltaTabY - DimTabY
xOut = yS - DeltaTabY
yOut = - ( xS - DeltaTabX - DimTabX)
elseif EMT.ORIG == 4 then
xOut = yS - DeltaTabY
xOut = yS - DeltaTabY - DimTabY
yOut = - ( xS - DeltaTabX - DimTabX)
elseif EMT.ORIG == 5 then
xOut = yS - DeltaTabY - DimTabY
Wall/WallData.lua
+8 -12
View File
@@ -32,7 +32,7 @@ local WallData = {
T14_T12_DOUBLE = true, -- abilita chiodatura in doppio con teste T14 e T12
RAWCOL = { 255, 160, 32, 30}, -- colore del grezzo
SIMUL_VIEW_DIR = 3, -- direzione di vista predefinita per la simulazione (1=NW, 2=SW, 3=NE, 4=SE)
ORIG_CORNER = 'TL', -- posizione origine (TL,BL,TR,BR,TM,BM)
ORIG_CORNER = 'BL', -- posizione origine (TL,BL,TR,BR,TM,BM)
MID_REF = 27000, -- posizione X dell'origine intermedia
USE_POSY = true -- utilizzare POSY di BTL (spostamento sullo spessore per pareti a layer)
}
@@ -63,19 +63,15 @@ end
-------------------------------------------------------------------------------------------------------------
local function GetOrigCorner( RefPos)
if RefPos == 1 then
return 'TL'
elseif RefPos == 2 then
return 'BL'
elseif RefPos == 3 then
return 'TR'
elseif RefPos == 4 then
return 'BR'
elseif RefPos == 5 then
return 'TM'
elseif RefPos == 6 then
return 'BM'
else
elseif RefPos == 2 then
return 'TR'
elseif RefPos == 3 then
return 'BL'
elseif RefPos == 4 then
return 'TL'
else
return 'BL'
end
end
WallData.GetOrigCorner = GetOrigCorner