Skip to content

Revert "editor_main: Fix various issues" #406

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

Merged
merged 1 commit into from
Jan 17, 2023
Merged

Revert "editor_main: Fix various issues" #406

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
2 changes: 1 addition & 1 deletion [editor]/edf/edf.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,7 +581,7 @@ function edfCreateElement(elementType, creatorClient, fromResource, parametersTa
parametersTable = parametersTable or {}
parametersTable.position = parametersTable.position or {0,0,0}
parametersTable.rotation = parametersTable.rotation or {0,0,0}
parametersTable.interior = math.max(0, (parametersTable.interior or 0))
parametersTable.interior = parametersTable.interior or 0
parametersTable.dimension = parametersTable.dimension or 0
parametersTable.alpha = parametersTable.alpha or 255

Expand Down
23 changes: 5 additions & 18 deletions [editor]/editor_main/client/main.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,15 +214,11 @@ addEventHandler("onClientRender", root,
local camX2, camY2, camZ2 = getCameraMatrix()
local distance = math.sqrt( (targetX - camX2)^2 + (targetY - camY2)^2 + (targetZ - camZ2)^2 )
local roundedDistance = string.format("%." .. (DISTANCE_DECIMAL_PLACES) .. "f", distance)
local elementName = getElementID(g_targetedElement) or ""
local mapContainer = getElementByID("mapContainer")
if mapContainer then
if getElementParent(g_targetedElement) ~= mapContainer then
elementName = "Non-editable object " .. getElementModel(g_targetedElement)
end
end

createHighlighterText(labelCenterX, labelCenterY, elementName, "["..getElementType(g_targetedElement).."]", roundedDistance .. " m")
createHighlighterText ( labelCenterX,labelCenterY,
getElementID(g_targetedElement) or "",
"["..getElementType(g_targetedElement).."]",
roundedDistance .. " m"
)
else
if g_targetedElement then
g_targetedPart = nil
Expand Down Expand Up @@ -742,15 +738,6 @@ function selectElement(element, submode, shortcut, dropreleaseLock, dropclonedro

if isColPatchObject(element) then return end

-- Fixes error when try to edit static object created by script
local mapContainer = getElementByID("mapContainer")
if mapContainer then
if getElementParent(element) ~= mapContainer then
editor_gui.outputMessage("Cannot select element, it is created by a different script", 255,255,255)
return
end
end

if getElementType(element) == "vehicle" and getVehicleType(element) == "Train" then
setTrainDerailed(element, true)
end
Expand Down
2 changes: 1 addition & 1 deletion [editor]/editor_main/server/saveloadtest_server.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ addEventHandler ( "onResourceStart", resourceRoot,
setOcclusionsEnabled ( false )
restoreAllWorldModels ( )
destroyElement( root )
mapContainer = createElement("mapContainer", "mapContainer")
mapContainer = createElement("mapContainer")
setTimer(startUp, 1000, 1)
end
)
Expand Down