Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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: 2 additions & 0 deletions [editor]/edf/edf.edf
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@
<data name="position" type="coord3d" description="XYZ position" default="0,0,0" />
<data name="type" type="markerType" description="Marker type" default="cylinder" />
<data name="target" type="string" description="Point to face: X,Y,Z (ring rotation or checkpoint arrow). Leave empty for no target." default="" required="false" persistDefault="false" />
<data name="targetcolor" type="color" description="Checkpoint target arrow color (#RRGGBBAA hex string)" default="#FF4040FF" required="false" persistDefault="false" />
<data name="targetsize" type="number" description="Checkpoint target arrow size (0 hides it; leave empty for the default)" default="-1" required="false" persistDefault="false" />
<data name="size" type="number" description="Marker size" default="1" />
<data name="color" type="color" description="Color (#RRGGBBAA hex string)" default="#00F9" />
<data name="interior" type="integer" description="GTA interior world" default="0" />
Expand Down
24 changes: 21 additions & 3 deletions [editor]/edf/edf.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 3 additions & 1 deletion [editor]/edf/meta.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<meta>
<info author="jbeta" description="Element Definition Format" edf:definition="edf.edf" version="1.0.0" />

<min_mta_version server="1.6.0-9.21765" />
<min_mta_version client="1.6.0-9.22620" server="1.6.0-9.22620" />

<script src="sharedutil.lua" type="shared" />
<script src="interface.lua" />
Expand Down Expand Up @@ -42,6 +42,7 @@
<export function="edfGetElementPosition" /> <!-- number, number, number -->
<export function="edfSetElementPosition" /> <!-- bool -->
<export function="isRotatableMarker" /> <!-- bool -->
<export function="edfApplyMarkerTargetArrowProperties" /> <!-- bool -->
<export function="edfGetElementRotation" /> <!-- number, number, number -->
<export function="edfSetElementRotation" /> <!-- bool -->
<export function="edfGetElementScale" /> <!-- number -->
Expand All @@ -63,6 +64,7 @@
<export function="edfGetElementPosition" type="client" /> <!-- number, number, number -->
<export function="edfSetElementPosition" type="client" /> <!-- bool -->
<export function="isRotatableMarker" type="client" /> <!-- bool -->
<export function="edfApplyMarkerTargetArrowProperties" type="client" /> <!-- bool -->
<export function="edfGetElementRotation" type="client" /> <!-- number, number, number -->
<export function="edfSetElementRotation" type="client" /> <!-- bool -->
<export function="edfGetElementScale" type="client" /> <!-- number -->
Expand Down
35 changes: 32 additions & 3 deletions [editor]/edf/properties.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
31 changes: 28 additions & 3 deletions [editor]/edf/properties_client.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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)
Expand Down
33 changes: 33 additions & 0 deletions [editor]/edf/sharedutil.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions [editor]/editor_gui/client/editingControls.lua
Original file line number Diff line number Diff line change
Expand Up @@ -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 )
Expand Down
4 changes: 2 additions & 2 deletions [editor]/editor_gui/client/elementproperties.lua
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ layout.margin = {
bottom = 5, --px
}
layout.label = {
width = 55, --px
width = 80, --px
height = 23, --px
R = 255,
G = 255,
Expand All @@ -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 = {
Expand Down
2 changes: 2 additions & 0 deletions [editor]/editor_main/editor_main.edf
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,8 @@
<data name="position" type="coord3d" description="XYZ position" default="0,0,0" />
<data name="type" type="markerType" description="Marker type" default="cylinder" />
<data name="target" type="string" description="Point to face: X,Y,Z (ring rotation or checkpoint arrow). Leave empty for no target." default="" required="false" persistDefault="false" />
<data name="targetcolor" type="color" description="Checkpoint target arrow color (#RRGGBBAA hex string)" default="#FF4040FF" required="false" persistDefault="false" />
<data name="targetsize" type="number" description="Checkpoint target arrow size (0 hides it; leave empty for the default)" default="-1" required="false" persistDefault="false" />
<data name="size" type="number" description="Marker size" default="1" />
<data name="color" type="color" description="Color (#RRGGBBAA hex string)" default="#00F9" />
<data name="interior" type="integer" description="GTA interior world" default="0" />
Expand Down
16 changes: 16 additions & 0 deletions [gamemodes]/[race]/race/edf/edf.lua
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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" )
Expand Down Expand Up @@ -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" )
Expand All @@ -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
Expand Down
14 changes: 14 additions & 0 deletions [gamemodes]/[race]/race/edf/edf_client.lua
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion [gamemodes]/[race]/race/edf/race.edf
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,11 @@
<data name="type" type="selection:checkpoint,ring,corona,cylinder,arrow" default="checkpoint" />
<data name="color" type="color" description="color (#RRGGBBAA hex string)" default="#00F9" />
<data name="size" type="number" description="marker size" default="2.25" />
<data name="targetcolor" type="color" description="Checkpoint target arrow color (#RRGGBBAA hex string)" default="#FF4040FF" required="false" persistDefault="false" />
<data name="targetsize" type="number" description="Checkpoint target arrow size (0 hides it; leave empty for the default)" default="-1" required="false" persistDefault="false" />
<data name="nextid" type="element:checkpoint" description="The next checkpoint after this one" required="false" default="" />
<data name="vehicle" type="vehicleID" required="false"/>
<marker color="!color!" type="!type!" size="!size!"/>
<marker color="!color!" type="!type!" size="!size!" targetcolor="!targetcolor!" targetsize="!targetsize!"/>
</element>
<element name="racepickup" friendlyname="Race pickup" icon="edf/pickup.png">
<data name="position" type="coord3d" default="0,0,0" />
Expand Down
Loading