From 8f897a2027784037cac8ef57ebcc92469ff4fa5e Mon Sep 17 00:00:00 2001 From: FileEX Date: Thu, 13 Jun 2019 17:08:59 +0200 Subject: [PATCH 1/7] Fix save dimension --- [editor]/editor_gui/client/elementproperties.lua | 7 +------ [editor]/editor_main/server/dumpxml.lua | 2 +- [editor]/editor_main/server/saveloadtest_server.lua | 2 +- [editor]/editor_main/server/synchronization.lua | 2 +- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/[editor]/editor_gui/client/elementproperties.lua b/[editor]/editor_gui/client/elementproperties.lua index ccfb2aba2..bb4da1b11 100644 --- a/[editor]/editor_gui/client/elementproperties.lua +++ b/[editor]/editor_gui/client/elementproperties.lua @@ -117,12 +117,7 @@ local commonApplier = { return edf.edfSetElementRotation(selectedElement, unpack(control:getValue())) end, dimension = function(control) - local dimension = control:getValue() - if dimension then - return setElementData(selectedElement, "me:dimension", dimension) - else - return false - end + return edf.edfSetElementDimension(selectedElement, control:getValue()) end, interior = function(control) return edf.edfSetElementInterior(selectedElement, control:getValue()) diff --git a/[editor]/editor_main/server/dumpxml.lua b/[editor]/editor_main/server/dumpxml.lua index 66ea6842a..f332b2e94 100644 --- a/[editor]/editor_main/server/dumpxml.lua +++ b/[editor]/editor_main/server/dumpxml.lua @@ -16,7 +16,7 @@ end local specialSyncers = { position = function() end, rotation = function() end, - dimension = function(element) return 0 end, + dimension = function(element) return edf.edfGetElementDimension(element) end, interior = function(element) return edf.edfGetElementInterior(element) end, alpha = function(element) return edf.edfGetElementAlpha(element) end, parent = function(element) return getElementData(element, "me:parent") end, diff --git a/[editor]/editor_main/server/saveloadtest_server.lua b/[editor]/editor_main/server/saveloadtest_server.lua index 6a69e0b05..6fc2e81a0 100644 --- a/[editor]/editor_main/server/saveloadtest_server.lua +++ b/[editor]/editor_main/server/saveloadtest_server.lua @@ -299,7 +299,7 @@ addEventHandler ( "saveResource", rootElement, saveResource ) local specialSyncers = { position = function() end, rotation = function() end, - dimension = function(element) return 0 end, + dimension = function(element) return edf.edfGetElementDimension(element) end, interior = function(element) return edf.edfGetElementInterior(element) end, alpha = function(element) return edf.edfGetElementAlpha(element) end, parent = function(element) return getElementData(element, "me:parent") end, diff --git a/[editor]/editor_main/server/synchronization.lua b/[editor]/editor_main/server/synchronization.lua index b58f3a3a1..8221934c6 100644 --- a/[editor]/editor_main/server/synchronization.lua +++ b/[editor]/editor_main/server/synchronization.lua @@ -14,7 +14,7 @@ local function syncElementRotation(element, value) end local function syncElementDimension(element, dim) - setElementData(element, "me:dimension", dim) + edf.edfSetElementDimension(element, dim) end local function syncElementInterior(element, int) From b23aabbd5056c0858d3081742c332d890411ab30 Mon Sep 17 00:00:00 2001 From: FileEX Date: Mon, 1 Jun 2020 10:30:34 +0200 Subject: [PATCH 2/7] Update elementproperties.lua --- [editor]/editor_gui/client/elementproperties.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/[editor]/editor_gui/client/elementproperties.lua b/[editor]/editor_gui/client/elementproperties.lua index bb4da1b11..ccfb2aba2 100644 --- a/[editor]/editor_gui/client/elementproperties.lua +++ b/[editor]/editor_gui/client/elementproperties.lua @@ -117,7 +117,12 @@ local commonApplier = { return edf.edfSetElementRotation(selectedElement, unpack(control:getValue())) end, dimension = function(control) - return edf.edfSetElementDimension(selectedElement, control:getValue()) + local dimension = control:getValue() + if dimension then + return setElementData(selectedElement, "me:dimension", dimension) + else + return false + end end, interior = function(control) return edf.edfSetElementInterior(selectedElement, control:getValue()) From b57baad4418dc4da1fb360271c186e78e9b6771e Mon Sep 17 00:00:00 2001 From: FileEX Date: Mon, 1 Jun 2020 10:31:35 +0200 Subject: [PATCH 3/7] Update dumpxml.lua --- [editor]/editor_main/server/dumpxml.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[editor]/editor_main/server/dumpxml.lua b/[editor]/editor_main/server/dumpxml.lua index 6004cbd6a..29bf1bcb7 100644 --- a/[editor]/editor_main/server/dumpxml.lua +++ b/[editor]/editor_main/server/dumpxml.lua @@ -16,7 +16,7 @@ end local specialSyncers = { position = function() end, rotation = function() end, - dimension = function(element) return edf.edfGetElementDimension(element) end, + dimension = function(element) return getElementData(element, "me:dimension") end, interior = function(element) return edf.edfGetElementInterior(element) end, alpha = function(element) return edf.edfGetElementAlpha(element) end, parent = function(element) return getElementData(element, "me:parent") end, From 9100c6602d57404f70288124a8dd659806905d54 Mon Sep 17 00:00:00 2001 From: FileEX Date: Mon, 1 Jun 2020 10:32:19 +0200 Subject: [PATCH 4/7] Update saveloadtest_server.lua --- [editor]/editor_main/server/saveloadtest_server.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[editor]/editor_main/server/saveloadtest_server.lua b/[editor]/editor_main/server/saveloadtest_server.lua index 6fc2e81a0..43167dc53 100644 --- a/[editor]/editor_main/server/saveloadtest_server.lua +++ b/[editor]/editor_main/server/saveloadtest_server.lua @@ -299,7 +299,7 @@ addEventHandler ( "saveResource", rootElement, saveResource ) local specialSyncers = { position = function() end, rotation = function() end, - dimension = function(element) return edf.edfGetElementDimension(element) end, + dimension = function(element) return getElementData(element, "me:dimension") end, interior = function(element) return edf.edfGetElementInterior(element) end, alpha = function(element) return edf.edfGetElementAlpha(element) end, parent = function(element) return getElementData(element, "me:parent") end, From 594a05d2fb10edb548e9c58d84b15b2d6751c1e6 Mon Sep 17 00:00:00 2001 From: FileEX Date: Mon, 1 Jun 2020 10:33:00 +0200 Subject: [PATCH 5/7] Update synchronization.lua --- [editor]/editor_main/server/synchronization.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[editor]/editor_main/server/synchronization.lua b/[editor]/editor_main/server/synchronization.lua index 8221934c6..b58f3a3a1 100644 --- a/[editor]/editor_main/server/synchronization.lua +++ b/[editor]/editor_main/server/synchronization.lua @@ -14,7 +14,7 @@ local function syncElementRotation(element, value) end local function syncElementDimension(element, dim) - edf.edfSetElementDimension(element, dim) + setElementData(element, "me:dimension", dim) end local function syncElementInterior(element, int) From b3c895a964a9a48f534caa8fe525bdccaa02c570 Mon Sep 17 00:00:00 2001 From: FileEX Date: Tue, 2 Jun 2020 10:45:50 +0200 Subject: [PATCH 6/7] Fix pottential error --- [editor]/editor_main/server/dumpxml.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[editor]/editor_main/server/dumpxml.lua b/[editor]/editor_main/server/dumpxml.lua index 29bf1bcb7..b041da407 100644 --- a/[editor]/editor_main/server/dumpxml.lua +++ b/[editor]/editor_main/server/dumpxml.lua @@ -16,7 +16,7 @@ end local specialSyncers = { position = function() end, rotation = function() end, - dimension = function(element) return getElementData(element, "me:dimension") end, + dimension = function(element) return getElementData(element, "me:dimension") or 0 end, interior = function(element) return edf.edfGetElementInterior(element) end, alpha = function(element) return edf.edfGetElementAlpha(element) end, parent = function(element) return getElementData(element, "me:parent") end, From 38929be70dd98383d27425028bad5a467049c70f Mon Sep 17 00:00:00 2001 From: FileEX Date: Tue, 2 Jun 2020 10:46:37 +0200 Subject: [PATCH 7/7] Fix pottential error --- [editor]/editor_main/server/saveloadtest_server.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[editor]/editor_main/server/saveloadtest_server.lua b/[editor]/editor_main/server/saveloadtest_server.lua index 43167dc53..06c8f6fc1 100644 --- a/[editor]/editor_main/server/saveloadtest_server.lua +++ b/[editor]/editor_main/server/saveloadtest_server.lua @@ -299,7 +299,7 @@ addEventHandler ( "saveResource", rootElement, saveResource ) local specialSyncers = { position = function() end, rotation = function() end, - dimension = function(element) return getElementData(element, "me:dimension") end, + dimension = function(element) return getElementData(element, "me:dimension") or 0 end, interior = function(element) return edf.edfGetElementInterior(element) end, alpha = function(element) return edf.edfGetElementAlpha(element) end, parent = function(element) return getElementData(element, "me:parent") end,