diff --git a/client.lua b/client.lua index ce3868d..1605914 100644 --- a/client.lua +++ b/client.lua @@ -14,24 +14,29 @@ end ---@return table|nil Entity information or nil if entity doesn't exist local function GetEntityInfo(entity) if not DoesEntityExist(entity) then return nil end - + local coords = GetEntityCoords(entity) local rotation = GetEntityRotation(entity, 2) local heading = GetEntityHeading(entity) local hash = GetEntityModel(entity) local hashStr = tostring(hash) local entityType = GetEntityType(entity) - + local distance = #(coords - GetEntityCoords(PlayerPedId())) + local entityTypeStr = "Unknown" - if entityType == 1 then entityTypeStr = "Ped" - elseif entityType == 2 then entityTypeStr = "Vehicle" - elseif entityType == 3 then entityTypeStr = "Object" end - + if entityType == 1 then + entityTypeStr = "Ped" + elseif entityType == 2 then + entityTypeStr = "Vehicle" + elseif entityType == 3 then + entityTypeStr = "Object" + end + local networkId = 'N/A' if NetworkGetEntityIsNetworked(entity) then networkId = NetworkGetNetworkIdFromEntity(entity) end - + return { entity = entity, hash = hash, @@ -39,6 +44,7 @@ local function GetEntityInfo(entity) coords = coords, rotation = rotation, heading = heading, + distance = distance, type = entityTypeStr, networkId = networkId } @@ -47,9 +53,9 @@ end ---@param entity number The entity handle local function UpdateEntityInfo(entity) if not entity or not DoesEntityExist(entity) then return end - + lastEntityInfo = GetEntityInfo(entity) - + SendNUIMessage({ type = 'updateInfo', info = lastEntityInfo @@ -58,11 +64,11 @@ end ---@param format string Format to copy ('model', 'coords', 'rotation', 'heading', 'all') local function CopyInfo(format) - if not lastEntityInfo then + if not lastEntityInfo then Notify("No entity information available", "error", 3000) - return + return end - + SendNUIMessage({ type = 'copyFormat', format = format, @@ -101,13 +107,13 @@ local function RotationToDirection(rotation) y = (math.pi / 180) * rotation.y, z = (math.pi / 180) * rotation.z } - + local direction = { x = -math.sin(adjustedRotation.z) * math.abs(math.cos(adjustedRotation.x)), y = math.cos(adjustedRotation.z) * math.abs(math.cos(adjustedRotation.x)), z = math.sin(adjustedRotation.x) } - + return vector3(direction.x, direction.y, direction.z) end @@ -122,7 +128,7 @@ local function RaycastCamera(distance) y = cameraCoord.y + direction.y * distance, z = cameraCoord.z + direction.z * distance } - + local _, hit, endCoords, _, entityHit = GetShapeTestResult( StartShapeTestRay( cameraCoord.x, cameraCoord.y, cameraCoord.z, @@ -130,7 +136,7 @@ local function RaycastCamera(distance) -1, PlayerPedId(), 0 ) ) - + return hit, endCoords, entityHit end @@ -139,22 +145,22 @@ local function StopPropInfoMode() isActive = false displayInfo = false targetEntity = nil - + SendNUIMessage({ type = 'showUI', show = false }) - + SendNUIMessage({ type = 'showNoEntity', show = false }) - + SendNUIMessage({ type = 'updateInfo', info = nil }) - + Notify("Entity Info Mode deactivated", "error", Config.Notifications.duration.standard) end @@ -162,45 +168,45 @@ end local function StartPropInfoMode() isActive = true displayInfo = true - + SendNUIMessage({ type = 'showUI', show = true }) - + Notify("Entity Info Mode activated", "success", Config.Notifications.duration.standard) - + CreateThread(function() while isActive do Wait(0) - + local playerPed = PlayerPedId() - + local hit, endCoords, entityHit = RaycastCamera(Config.Raycast.maxDistance) - + if hit == 1 and DoesEntityExist(entityHit) then targetEntity = entityHit - + local playerPos = GetEntityCoords(playerPed) - + if Config.Raycast.drawLine then DrawLine( playerPos.x, playerPos.y, playerPos.z, endCoords.x, endCoords.y, endCoords.z, - Config.Raycast.lineColor[1], Config.Raycast.lineColor[2], + Config.Raycast.lineColor[1], Config.Raycast.lineColor[2], Config.Raycast.lineColor[3], Config.Raycast.lineColor[4] ) end - + if Config.Raycast.drawMarker then - DrawMarker(0x50638AB9, endCoords.x, endCoords.y, endCoords.z, - 0.0, 0.0, 0.0, 0.0, 180.0, 0.0, - Config.Raycast.markerSize, Config.Raycast.markerSize, Config.Raycast.markerSize, - Config.Raycast.markerColor[1], Config.Raycast.markerColor[2], - Config.Raycast.markerColor[3], Config.Raycast.markerColor[4], - false, false, 2, false, nil, nil, false) + DrawMarker(0x50638AB9, endCoords.x, endCoords.y, endCoords.z, + 0.0, 0.0, 0.0, 0.0, 180.0, 0.0, + Config.Raycast.markerSize, Config.Raycast.markerSize, Config.Raycast.markerSize, + Config.Raycast.markerColor[1], Config.Raycast.markerColor[2], + Config.Raycast.markerColor[3], Config.Raycast.markerColor[4], + false, false, 2, false, nil, nil, false) end - + if displayInfo then UpdateEntityInfo(entityHit) SendNUIMessage({ @@ -208,12 +214,12 @@ local function StartPropInfoMode() show = true }) end - + SendNUIMessage({ type = 'showNoEntity', show = false }) - + if IsControlJustReleased(0, Config.Keys.copyModel) then CopyInfo('model') elseif IsControlJustReleased(0, Config.Keys.copyCoords) then @@ -230,14 +236,15 @@ local function StartPropInfoMode() type = 'showUI', show = displayInfo }) - Notify("Info display: " .. (displayInfo and "ON" or "OFF"), "primary", Config.Notifications.duration.short) + Notify("Info display: " .. (displayInfo and "ON" or "OFF"), "primary", + Config.Notifications.duration.short) end else SendNUIMessage({ type = 'showNoEntity', show = true }) - + if targetEntity then targetEntity = nil SendNUIMessage({ @@ -256,5 +263,5 @@ RegisterCommand(Config.Commands.main, function() else StartPropInfoMode() end -end, true) -TriggerEvent("chat:addSuggestion", "/"..Config.Commands.main, "Toggle display of entity information", {}) +end, false) +TriggerEvent("chat:addSuggestion", "/" .. Config.Commands.main, "Toggle display of entity information", {}) diff --git a/config.lua b/config.lua index db77673..eb71924 100644 --- a/config.lua +++ b/config.lua @@ -7,21 +7,21 @@ Config.Commands = { -- Key bindings Config.Keys = { - toggle = 0xD9D0E1C0, -- Space key - copyModel = 0x760A9C6F, -- G key - copyCoords = 0xCEFD9220, -- E key + toggle = 0xD9D0E1C0, -- Space key + copyModel = 0x760A9C6F, -- G key + copyCoords = 0xCEFD9220, -- E key copyRotation = 0xE30CD707, -- R key - copyHeading = 0xF3830D8E, -- J key - copyAll = 0x26E9DC00, -- Z key + copyHeading = 0xF3830D8E, -- J key + copyAll = 0x26E9DC00, -- Z key } -- Raycast settings Config.Raycast = { - maxDistance = 25.0, + maxDistance = 50, drawLine = true, - lineColor = {255, 0, 0, 180}, -- RGBA + lineColor = { 255, 0, 0, 180 }, -- RGBA drawMarker = true, - markerColor = {255, 0, 0, 255}, -- RGBA + markerColor = { 255, 0, 0, 255 }, -- RGBA markerSize = 0.03 } @@ -50,7 +50,7 @@ function Notify(message, type, duration) }) return end - + -- VORP if GetResourceState('vorp_core') ~= 'missing' then TriggerEvent('vorp:TipBottom', message, duration) @@ -59,4 +59,4 @@ function Notify(message, type, duration) -- Fallback F8 Console print("^3[ENTITY INFO]^0 " .. message) -end \ No newline at end of file +end diff --git a/html/index.html b/html/index.html index 13a54e9..5ffb454 100644 --- a/html/index.html +++ b/html/index.html @@ -49,6 +49,10 @@

Entity Information

HEADING
{{ formatHeading(entityInfo.heading) }}
+
+
DISTANCE
+
{{ formatDistance(entityInfo.distance) }}
+
G Copy model hash
diff --git a/html/script.js b/html/script.js index 9642774..c6ee917 100644 --- a/html/script.js +++ b/html/script.js @@ -15,7 +15,8 @@ const app = createApp({ rotation: { x: 0, y: 0, z: 0 }, type: '', networkId: 'N/A', - heading: 0 + heading: 0, + distance: 0, }); const formatCoords = (coords) => { @@ -28,11 +29,17 @@ const app = createApp({ return heading.toFixed(2); }; + const formatDistance = (distance) => { + if (distance === undefined || distance === null) return '-'; + return distance.toFixed(2) + ' units'; + }; + + const copyFormattedInfo = (format) => { if (!entityInfo) return; - + let text = ''; - switch(format) { + switch (format) { case 'model': text = entityInfo.hashStr; break; @@ -45,13 +52,16 @@ const app = createApp({ case 'heading': text = formatHeading(entityInfo.heading); break; + case 'distance': + text = formatDistance(entityInfo.distance); + break; case 'all': text = `Entity: ${entityInfo.entity}\nType: ${entityInfo.type}\nModel Hash: ${entityInfo.hashStr}\nNetwork ID: ${entityInfo.networkId}\nCoords: ${formatCoords(entityInfo.coords)}\nRotation: ${formatCoords(entityInfo.rotation)}\nHeading: ${formatHeading(entityInfo.heading)}`; break; default: return; } - + fetch(`https://${GetParentResourceName()}/copyToClipboard`, { method: 'POST', headers: { 'Content-Type': 'application/json; charset=UTF-8' }, @@ -63,31 +73,31 @@ const app = createApp({ const tempInput = document.createElement('textarea'); tempInput.value = text; document.body.appendChild(tempInput); - + tempInput.select(); let success = false; - + try { success = document.execCommand('copy'); } catch (err) { console.error('Failed to copy: ', err); } - + document.body.removeChild(tempInput); - + fetch(`https://${GetParentResourceName()}/clipboardResult`, { method: 'POST', headers: { 'Content-Type': 'application/json; charset=UTF-8' }, body: JSON.stringify({ success: success }) }); - + return success; }; const showCopyFeedback = (format) => { copyMessage.value = `Copied: ${format}`; showCopyFlash.value = true; - + setTimeout(() => { showCopyFlash.value = false; }, 1500); @@ -98,29 +108,30 @@ const app = createApp({ onMounted(() => { window.addEventListener('message', (event) => { const data = event.data; - + if (data.type === 'updateInfo' && data.info) { Object.assign(entityInfo, data.info); showNoEntity.value = false; - } + } else if (data.type === 'showUI') { isVisible.value = data.show; - } + } else if (data.type === 'showNoEntity') { showNoEntity.value = data.show; - } + } else if (data.type === 'copyFormat') { copyFormattedInfo(data.format); - } + } else if (data.type === 'execCopy') { execCopyToClipboard(data.text); - + let formatLabel; - switch(data.format) { + switch (data.format) { case 'model': formatLabel = 'Model Hash'; break; case 'coords': formatLabel = 'Coordinates'; break; case 'rotation': formatLabel = 'Rotation'; break; case 'heading': formatLabel = 'Heading'; break; + case 'distance': formatLabel = 'Distance'; break; case 'all': formatLabel = 'All Info'; break; default: formatLabel = 'Text'; } @@ -137,6 +148,7 @@ const app = createApp({ entityInfo, formatCoords, formatHeading, + formatDistance, copyFormattedInfo }; }