diff --git a/[editor]/edf/edf.edf b/[editor]/edf/edf.edf
index 9ea99d718..275850328 100644
--- a/[editor]/edf/edf.edf
+++ b/[editor]/edf/edf.edf
@@ -16,6 +16,8 @@
+
+
diff --git a/[editor]/edf/edf.lua b/[editor]/edf/edf.lua
index 6e7600083..99efdc3ad 100644
--- a/[editor]/edf/edf.lua
+++ b/[editor]/edf/edf.lua
@@ -51,9 +51,18 @@ local edfCreateBasic = {
local r,g,b,a = getColorFromString(cdata.color)
if r then cdata.colorR = r; cdata.colorG = g; cdata.colorB = b; cdata.colorA = a end
local marker = createMarker(cdata.position[1], cdata.position[2], cdata.position[3], cdata.type, cdata.size, cdata.colorR, cdata.colorG, cdata.colorB, cdata.colorA)
- if marker and cdata.target and cdata.target ~= "" then
- setElementData(marker, "target", cdata.target)
- edfSetMarkerTarget(marker, cdata.target)
+ if marker then
+ if cdata.targetcolor then
+ setElementData(marker, "targetcolor", cdata.targetcolor)
+ end
+ if cdata.targetsize then
+ setElementData(marker, "targetsize", cdata.targetsize)
+ end
+ if cdata.target and cdata.target ~= "" then
+ setElementData(marker, "target", cdata.target)
+ edfSetMarkerTarget(marker, cdata.target)
+ end
+ edfApplyMarkerTargetArrowProperties(marker, cdata.targetcolor, cdata.targetsize)
end
return marker
end,
@@ -423,6 +432,7 @@ function edfRepresentElement(theElement, resource, parentData, editorMode, restr
if elementType == "marker" then
edfSetMarkerTarget(theElement, parentData.target)
+ edfApplyMarkerTargetArrowProperties(theElement, parentData.targetcolor, parentData.targetsize)
end
-- get basic element properties
@@ -711,7 +721,15 @@ function edfCloneElement(theElement, editorMode )
-- For things that cloneElement doesn't actually clone
if elementType == "marker" then
+ for _, property in ipairs({"targetcolor", "targetsize"}) do
+ local value = getElementData(oldElement, property)
+ if value ~= nil then
+ setElementData(theElement, property, value)
+ end
+ end
edfSetMarkerTarget(theElement, getElementData(oldElement, "target"))
+ edfApplyMarkerTargetArrowProperties(theElement,
+ getElementData(theElement, "targetcolor"), getElementData(theElement, "targetsize"))
end
if (getElementType(theElement) == "vehicle" and getVehicleType(theElement) == "Train") then
setTrainDerailed(theElement, true)
diff --git a/[editor]/edf/meta.xml b/[editor]/edf/meta.xml
index 33079752f..e5ed5ea3d 100644
--- a/[editor]/edf/meta.xml
+++ b/[editor]/edf/meta.xml
@@ -1,7 +1,7 @@
-
+
@@ -42,6 +42,7 @@
+
@@ -63,6 +64,7 @@
+
diff --git a/[editor]/edf/properties.lua b/[editor]/edf/properties.lua
index a480dc7b4..c747e4660 100644
--- a/[editor]/edf/properties.lua
+++ b/[editor]/edf/properties.lua
@@ -131,12 +131,24 @@ propertyGetters = {
marker = {
type = getMarkerType,
target = function(element) return getElementData(element, "target") or "" end,
+ targetsize = function(element)
+ local targetSize = getElementData(element, "targetsize")
+ if targetSize == -1 then return nil end
+ return targetSize
+ end,
size = getMarkerSize,
color = function(element)
local r, g, b, a = getMarkerColor(element)
return getStringFromColor(r,g,b,a)
end,
},
+ checkpoint = {
+ targetsize = function(element)
+ local targetSize = getElementData(element, "targetsize")
+ if targetSize == -1 then return nil end
+ return targetSize
+ end,
+ },
pickup = {
type = function(element)
local pType = getPickupType(element)
@@ -306,13 +318,30 @@ propertySetters = {
marker = {
type = function(element, markerType)
if not setMarkerType(element, markerType) then return false end
- return edfSetMarkerTarget(element, getElementData(element, "target"))
+ if not edfSetMarkerTarget(element, getElementData(element, "target")) then return false end
+ return edfApplyMarkerTargetArrowProperties(element,
+ getElementData(element, "targetcolor"), getElementData(element, "targetsize"))
+ end,
+ target = function(element, target)
+ if not edfSetMarkerTarget(element, target) then return false end
+ return edfApplyMarkerTargetArrowProperties(element,
+ getElementData(element, "targetcolor"), getElementData(element, "targetsize"))
+ end,
+ size = function(element, markerSize)
+ markerSize = markerSize or 1
+ if not setMarkerSize(element, markerSize) then return false end
+ return edfApplyMarkerTargetArrowProperties(element,
+ getElementData(element, "targetcolor"), getElementData(element, "targetsize"))
end,
- target = edfSetMarkerTarget,
- size = setMarkerSize,
color = function(element, color)
return setMarkerColor(element, getColorFromString(color))
end,
+ targetcolor = function(element, targetColor)
+ return edfApplyMarkerTargetArrowProperties(element, targetColor, getElementData(element, "targetsize"))
+ end,
+ targetsize = function(element, targetSize)
+ return edfApplyMarkerTargetArrowProperties(element, getElementData(element, "targetcolor"), targetSize)
+ end,
},
pickup = {
type = function(element, pType)
diff --git a/[editor]/edf/properties_client.lua b/[editor]/edf/properties_client.lua
index 8b979622c..599c9ab8c 100644
--- a/[editor]/edf/properties_client.lua
+++ b/[editor]/edf/properties_client.lua
@@ -111,11 +111,23 @@ propertyGetters = {
marker = {
type = getMarkerType,
target = function(element) return getElementData(element, "target") or "" end,
+ targetsize = function(element)
+ local targetSize = getElementData(element, "targetsize")
+ if targetSize == -1 then return nil end
+ return targetSize
+ end,
size = getMarkerSize,
color = function(element)
return {getMarkerColor(element)}
end,
},
+ checkpoint = {
+ targetsize = function(element)
+ local targetSize = getElementData(element, "targetsize")
+ if targetSize == -1 then return nil end
+ return targetSize
+ end,
+ },
pickup = {
type = function(element)
local pType = getPickupType(element)
@@ -283,20 +295,33 @@ propertySetters = {
marker = {
type = function(element, markerType)
if not markerType or not setMarkerType(element, markerType) then return false end
- return edfSetMarkerTarget(element, getElementData(element, "target"))
+ if not edfSetMarkerTarget(element, getElementData(element, "target")) then return false end
+ return edfApplyMarkerTargetArrowProperties(element,
+ getElementData(element, "targetcolor"), getElementData(element, "targetsize"))
end,
target = function(element, target)
exports.editor_main:clearElementQuat(element)
- return edfSetMarkerTarget(element, target)
+ if not edfSetMarkerTarget(element, target) then return false end
+ return edfApplyMarkerTargetArrowProperties(element,
+ getElementData(element, "targetcolor"), getElementData(element, "targetsize"))
end,
size = function(element, markerSize)
- if markerSize then return setMarkerSize(element, markerSize)
+ markerSize = markerSize or 1
+ if setMarkerSize(element, markerSize) then
+ return edfApplyMarkerTargetArrowProperties(element,
+ getElementData(element, "targetcolor"), getElementData(element, "targetsize"))
else return false end
end,
color = function(element, color)
if color then return setMarkerColor(element, getColorFromString(color))
else return false end
end,
+ targetcolor = function(element, targetColor)
+ return edfApplyMarkerTargetArrowProperties(element, targetColor, getElementData(element, "targetsize"))
+ end,
+ targetsize = function(element, targetSize)
+ return edfApplyMarkerTargetArrowProperties(element, getElementData(element, "targetcolor"), targetSize)
+ end,
},
pickup = {
type = function(element, pType)
diff --git a/[editor]/edf/sharedutil.lua b/[editor]/edf/sharedutil.lua
index 6241db155..80466f8ad 100644
--- a/[editor]/edf/sharedutil.lua
+++ b/[editor]/edf/sharedutil.lua
@@ -26,6 +26,39 @@ local function getMarkerTargetPosition(element)
return getMarkerTarget(element)
end
+function edfApplyMarkerTargetArrowProperties(element, targetColor, targetSize, targetIsSet)
+ if not isRotatableMarker(element) or getMarkerType(element) ~= "checkpoint" then
+ return true
+ end
+ if targetColor == nil and targetSize == nil then
+ return true
+ end
+ local target = getElementData(element, "target")
+ if targetIsSet == nil then
+ targetIsSet = target and target ~= ""
+ end
+ if not targetIsSet then
+ return true
+ end
+
+ local red, green, blue, alpha = getMarkerTargetArrowProperties(element)
+ if not red then return false end
+ if targetColor == "" then
+ red, green, blue, alpha = 255, 64, 64, 255
+ elseif targetColor then
+ red, green, blue, alpha = getColorFromString(targetColor)
+ if not red then return false end
+ end
+
+ local requestedSize = tonumber(targetSize)
+ if targetSize ~= nil and targetSize ~= false and targetSize ~= "" and not requestedSize then return false end
+ if requestedSize and requestedSize < -1 then return false end
+ if requestedSize and requestedSize >= 0 then
+ return setMarkerTargetArrowProperties(element, red, green, blue, alpha, requestedSize)
+ end
+ return setMarkerTargetArrowProperties(element, red, green, blue, alpha)
+end
+
-- Keep targets on unsupported marker types so switching back restores the direction.
function edfSetMarkerTarget(element, target)
if not isRotatableMarker(element) then
diff --git a/[editor]/editor_gui/client/editingControls.lua b/[editor]/editor_gui/client/editingControls.lua
index 9b37e1586..f4619e66e 100644
--- a/[editor]/editor_gui/client/editingControls.lua
+++ b/[editor]/editor_gui/client/editingControls.lua
@@ -117,14 +117,14 @@ eC.string = {
value = "",
},
constructor = function( self, info )
- self.GUI.editField = guiCreateEdit( info.x, info.y, info.width, info.height, tostring(info.value), info.relative, info.parent )
+ self.GUI.editField = guiCreateEdit( info.x, info.y, info.width, info.height, tostring(info.value or ""), info.relative, info.parent )
self:addHandler( "onClientGUIChanged", self.GUI.editField, self.callChangeHandlers )
return self
end,
setValue = function( self, value )
- return guiSetText( self.GUI.editField, tostring(value) )
+ return guiSetText( self.GUI.editField, tostring(value or "") )
end,
getValue = function( self )
return guiGetText( self.GUI.editField )
diff --git a/[editor]/editor_gui/client/elementproperties.lua b/[editor]/editor_gui/client/elementproperties.lua
index 5914ffef4..f39ec5e55 100644
--- a/[editor]/editor_gui/client/elementproperties.lua
+++ b/[editor]/editor_gui/client/elementproperties.lua
@@ -14,7 +14,7 @@ layout.margin = {
bottom = 5, --px
}
layout.label = {
- width = 55, --px
+ width = 80, --px
height = 23, --px
R = 255,
G = 255,
@@ -23,7 +23,7 @@ layout.label = {
layout.window = {
x = 50, --px
y = 100, --px
- width = 290, --px
+ width = 330, --px
height = 450, --px
}
layout.button = {
diff --git a/[editor]/editor_main/editor_main.edf b/[editor]/editor_main/editor_main.edf
index 3bf24420d..f0e8e41cd 100644
--- a/[editor]/editor_main/editor_main.edf
+++ b/[editor]/editor_main/editor_main.edf
@@ -60,6 +60,8 @@
+
+
diff --git a/[gamemodes]/[race]/race/edf/edf.lua b/[gamemodes]/[race]/race/edf/edf.lua
index 89d59951c..b329eef1d 100644
--- a/[gamemodes]/[race]/race/edf/edf.lua
+++ b/[gamemodes]/[race]/race/edf/edf.lua
@@ -1,5 +1,13 @@
g_ModelForPickupType = { nitro = 2221, repair = 2222, vehiclechange = 2223 }
+local function applyCheckpointTargetArrowProperties(checkpoint, marker)
+ return exports.edf:edfApplyMarkerTargetArrowProperties(marker,
+ exports.edf:edfGetElementProperty(checkpoint, "targetcolor"),
+ exports.edf:edfGetElementProperty(checkpoint, "targetsize"),
+ true
+ )
+end
+
addEventHandler ( "onMapOpened", root,
function()
for i,pickup in ipairs(getElementsByType"racepickup") do
@@ -17,6 +25,7 @@ addEventHandler ( "onMapOpened", root,
setMarkerIcon ( marker, "arrow" )
end
setMarkerTarget ( marker, exports.edf:edfGetElementPosition(nextID) )
+ applyCheckpointTargetArrowProperties(checkpoint, marker)
else
if getMarkerType(marker) == "checkpoint" then
setMarkerIcon ( marker, "finish" )
@@ -79,6 +88,7 @@ addEventHandler ( "onElementPropertyChanged", root,
setMarkerIcon ( marker, "arrow" )
end
setMarkerTarget ( marker, exports.edf:edfGetElementPosition(nextID) )
+ applyCheckpointTargetArrowProperties(source, marker)
else
if getMarkerType(marker) == "checkpoint" then
setMarkerIcon ( marker, "finish" )
@@ -90,8 +100,14 @@ addEventHandler ( "onElementPropertyChanged", root,
if exports.edf:edfGetElementProperty ( checkpoint, "nextid" ) == source then
local marker = getRepresentation(checkpoint,"marker")
setMarkerTarget ( marker, exports.edf:edfGetElementPosition(source) )
+ applyCheckpointTargetArrowProperties(checkpoint, marker)
end
end
+ elseif propertyName == "targetcolor" or propertyName == "targetsize" then
+ local nextID = exports.edf:edfGetElementProperty ( source, "nextid" )
+ if nextID then
+ applyCheckpointTargetArrowProperties(source, getRepresentation(source, "marker"))
+ end
end
end
end
diff --git a/[gamemodes]/[race]/race/edf/edf_client.lua b/[gamemodes]/[race]/race/edf/edf_client.lua
index bfe948853..6c4d2c11e 100644
--- a/[gamemodes]/[race]/race/edf/edf_client.lua
+++ b/[gamemodes]/[race]/race/edf/edf_client.lua
@@ -1,6 +1,14 @@
g_ModelForPickupType = { nitro = 2221, repair = 2222, vehiclechange = 2223 }
models = {}
+local function applyCheckpointTargetArrowProperties(checkpoint, marker)
+ return exports.edf:edfApplyMarkerTargetArrowProperties(marker,
+ exports.edf:edfGetElementProperty(checkpoint, "targetcolor"),
+ exports.edf:edfGetElementProperty(checkpoint, "targetsize"),
+ true
+ )
+end
+
startTick = getTickCount()
function onStart() --Callback triggered by edf
@@ -43,11 +51,17 @@ addEventHandler ( "onClientElementPropertyChanged", root,
setMarkerIcon ( marker, "arrow" )
end
setMarkerTarget ( marker, exports.edf:edfGetElementPosition(nextID) )
+ applyCheckpointTargetArrowProperties(source, marker)
else
if getMarkerType(marker) == "checkpoint" then
setMarkerIcon ( marker, "finish" )
end
end
+ elseif propertyName == "targetcolor" or propertyName == "targetsize" then
+ local nextID = exports.edf:edfGetElementProperty ( source, "nextid" )
+ if nextID then
+ applyCheckpointTargetArrowProperties(source, getRepresentation(source, "marker"))
+ end
end
end
end
diff --git a/[gamemodes]/[race]/race/edf/race.edf b/[gamemodes]/[race]/race/edf/race.edf
index 765530ba9..85716fd23 100644
--- a/[gamemodes]/[race]/race/edf/race.edf
+++ b/[gamemodes]/[race]/race/edf/race.edf
@@ -22,9 +22,11 @@
+
+
-
+