Skip to content

editor: Fix editor breaking on old race maps with legacy rotation #738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
q8X wants to merge 1 commit into
base: master
Choose a base branch
from
Open

editor: Fix editor breaking on old race maps with legacy rotation #738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 4 additions & 7 deletions [editor]/edf/edf.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -858,7 +858,7 @@ function edfGetElementPosition(element)
end
end

--Returns an element's rotation, or its rotX/Y/Z element data, or false
--Returns an element's rotation, or its rotX/Y/Z element data, or 0,0,0
function edfGetElementRotation(element)
local etype = getElementType(element)
local rx, ry, rz
Expand All @@ -871,15 +871,12 @@ function edfGetElementRotation(element)
else
rx = tonumber(getElementData(element,"rotX"))
ry = tonumber(getElementData(element,"rotY"))
rz = tonumber(getElementData(element,"rotZ"))
-- old race maps use rotation="360" instead of rotX/Y/Z
rz = tonumber(getElementData(element,"rotZ")) or tonumber(getElementData(element,"rotation"))
end
end

if rx and ry and rz then
return rx, ry, rz
else
return false
end
return rx or 0, ry or 0, rz or 0
end

--Returns an element's scale, or its scale element data, or false
Expand Down
9 changes: 3 additions & 6 deletions [editor]/edf/edf_client.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,12 @@ function edfGetElementRotation(element)
else
rx = tonumber(getElementData(element,"rotX"))
ry = tonumber(getElementData(element,"rotY"))
rz = tonumber(getElementData(element,"rotZ"))
-- old race maps use rotation="360" instead of rotX/Y/Z
rz = tonumber(getElementData(element,"rotZ")) or tonumber(getElementData(element,"rotation"))
end
end

if rx and ry and rz then
return rx, ry, rz
else
return false
end
return rx or 0, ry or 0, rz or 0
end

--Returns an element's scale, or its scale element data, or 1
Expand Down
4 changes: 4 additions & 0 deletions [editor]/editor_main/server/saveloadtest_server.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,10 @@ function createElementAttributesForSaving(xmlNode, element)
xmlNodeSetAttribute(elementNode, "posZ", toAttribute(round(dataValue[3], 5)))
posSetX, posSetY, posSetZ = true, true, true
elseif ( dataName == "rotation" ) then
-- old race maps rotation isn't a table, so we need to convert it to a table
if type(dataValue) ~= "table" then
dataValue = { 0, 0, tonumber(dataValue) or 0 }
end
if dataValue[4] == "ZYX" then
local skipConversion = getElementType(element) == "vehicle"
if not skipConversion then
Expand Down