FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/master' into TASKING

Browse Source
This commit is contained in:
FlightControl 2017-05-04 09:00:29 +02:00
commit 4fcb7be9fc
3 changed files with 103 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
Moose Development/Moose/Functional/Detection.lua
View File

@ -190,7 +190,7 @@ do -- DETECTION_BASE
-- local SetGroup = SET_GROUP:New():FilterPrefixes( "FAC" ):FilterStart() -- Build a SetGroup of Forward Air Controllers. -- local SetGroup = SET_GROUP:New():FilterPrefixes( "FAC" ):FilterStart() -- Build a SetGroup of Forward Air Controllers.
-- --
-- -- Build a detect object. -- -- Build a detect object.
-- local Detection = DETECTION_BASE:New( SetGroup ) -- local Detection = DETECTION_UNITS:New( SetGroup )
-- --
-- -- This will accept detected units if the range is below 5000 meters. -- -- This will accept detected units if the range is below 5000 meters.
-- Detection:SetAcceptRange( 5000 ) -- Detection:SetAcceptRange( 5000 )
@ -211,7 +211,7 @@ do -- DETECTION_BASE
-- local ZoneAccept2 = ZONE:New( "AcceptZone2" ) -- local ZoneAccept2 = ZONE:New( "AcceptZone2" )
-- --
-- -- Build a detect object. -- -- Build a detect object.
-- local Detection = DETECTION_BASE:New( SetGroup ) -- local Detection = DETECTION_UNITS:New( SetGroup )
-- --
-- -- This will accept detected units by Detection when the unit is within ZoneAccept1 OR ZoneAccept2. -- -- This will accept detected units by Detection when the unit is within ZoneAccept1 OR ZoneAccept2.
-- Detection:SetAcceptZones( { ZoneAccept1, ZoneAccept2 } ) -- Detection:SetAcceptZones( { ZoneAccept1, ZoneAccept2 } )
@ -232,7 +232,7 @@ do -- DETECTION_BASE
-- local ZoneReject2 = ZONE:New( "RejectZone2" ) -- local ZoneReject2 = ZONE:New( "RejectZone2" )
-- --
-- -- Build a detect object. -- -- Build a detect object.
-- local Detection = DETECTION_BASE:New( SetGroup ) -- local Detection = DETECTION_UNITS:New( SetGroup )
-- --
-- -- This will reject detected units by Detection when the unit is within ZoneReject1 OR ZoneReject2. -- -- This will reject detected units by Detection when the unit is within ZoneReject1 OR ZoneReject2.
-- Detection:SetRejectZones( { ZoneReject1, ZoneReject2 } ) -- Detection:SetRejectZones( { ZoneReject1, ZoneReject2 } )
@ -273,10 +273,16 @@ do -- DETECTION_BASE
--- @type DETECTION_BASE.DetectedObject --- @type DETECTION_BASE.DetectedObject
-- @field #string Name -- @field #string Name
-- @field #boolean Visible -- @field #boolean IsVisible
-- @field #boolean KnowType
-- @field #boolean KnowDistance
-- @field #string Type -- @field #string Type
-- @field #number Distance -- @field #number Distance
-- @field #boolean Identified -- @field #boolean Identified
-- @field #number LastTime
-- @field #boolean LastPos
-- @field #number LastVelocity
--- @type DETECTION_BASE.DetectedItems --- @type DETECTION_BASE.DetectedItems
-- @list <#DETECTION_BASE.DetectedItem> -- @list <#DETECTION_BASE.DetectedItem>
@ -309,12 +315,12 @@ do -- DETECTION_BASE
self.DetectionInterval = 30 self.DetectionInterval = 30
self:InitDetectVisual( false ) self:InitDetectVisual( nil )
self:InitDetectOptical( false ) self:InitDetectOptical( nil )
self:InitDetectRadar( false ) self:InitDetectRadar( nil )
self:InitDetectRWR( false ) self:InitDetectRWR( nil )
self:InitDetectIRST( false ) self:InitDetectIRST( nil )
self:InitDetectDLINK( false ) self:InitDetectDLINK( nil )
self:FilterCategories( { self:FilterCategories( {
Unit.Category.AIRPLANE, Unit.Category.AIRPLANE,
@ -531,6 +537,7 @@ do -- DETECTION_BASE
self:T( { "DetectionGroup is Alive", DetectionGroup:GetName() } ) self:T( { "DetectionGroup is Alive", DetectionGroup:GetName() } )
local DetectionGroupName = DetectionGroup:GetName() local DetectionGroupName = DetectionGroup:GetName()
local DetectionUnit = DetectionGroup:GetUnit(1)
local DetectedUnits = {} local DetectedUnits = {}
@ -550,6 +557,18 @@ do -- DETECTION_BASE
if DetectedObject and DetectedObject:isExist() and DetectedObject.id_ < 50000000 then -- and ( DetectedObject:getCategory() == Object.Category.UNIT or DetectedObject:getCategory() == Object.Category.STATIC ) then if DetectedObject and DetectedObject:isExist() and DetectedObject.id_ < 50000000 then -- and ( DetectedObject:getCategory() == Object.Category.UNIT or DetectedObject:getCategory() == Object.Category.STATIC ) then
local TargetIsDetected, TargetIsVisible, TargetLastTime, TargetKnowType, TargetKnowDistance, TargetLastPos, TargetLastVelocity = DetectionUnit:IsTargetDetected(
DetectedObject,
self.DetectVisual,
self.DetectOptical,
self.DetectRadar,
self.DetectIRST,
self.DetectRWR,
self.DetectDLINK
)
self:T( { TargetIsDetected = TargetIsDetected, TargetIsVisible = TargetIsVisible, TargetLastTime = TargetLastTime, TargetKnowType = TargetKnowType, TargetKnowDistance = TargetKnowDistance, TargetLastPos = TargetLastPos, TargetLastVelocity = TargetLastVelocity } )
local DetectionAccepted = true local DetectionAccepted = true
local DetectedObjectName = DetectedObject:getName() local DetectedObjectName = DetectedObject:getName()
@ -648,12 +667,14 @@ do -- DETECTION_BASE
HasDetectedObjects = true HasDetectedObjects = true
if not self.DetectedObjects[DetectedObjectName] then self.DetectedObjects[DetectedObjectName] = self.DetectedObjects[DetectedObjectName] or {}
self.DetectedObjects[DetectedObjectName] = {}
end
self.DetectedObjects[DetectedObjectName].Name = DetectedObjectName self.DetectedObjects[DetectedObjectName].Name = DetectedObjectName
self.DetectedObjects[DetectedObjectName].Visible = Detection.visible self.DetectedObjects[DetectedObjectName].IsVisible = TargetIsVisible
self.DetectedObjects[DetectedObjectName].Type = Detection.type self.DetectedObjects[DetectedObjectName].LastTime = TargetLastTime
self.DetectedObjects[DetectedObjectName].LastPos = TargetLastPos
self.DetectedObjects[DetectedObjectName].LastVelocity = TargetLastVelocity
self.DetectedObjects[DetectedObjectName].KnowType = TargetKnowType
self.DetectedObjects[DetectedObjectName].KnowDistance = Detection.distance -- TargetKnowDistance
self.DetectedObjects[DetectedObjectName].Distance = Distance self.DetectedObjects[DetectedObjectName].Distance = Distance
local DetectedUnit = UNIT:FindByName( DetectedObjectName ) local DetectedUnit = UNIT:FindByName( DetectedObjectName )
@ -707,7 +728,7 @@ do -- DETECTION_BASE
local DetectedSet = DetectedItem.Set local DetectedSet = DetectedItem.Set
if DetectedSet:Count() == 0 then if DetectedSet:Count() == 0 then
self.DetectedItems[DetectedItemID] = nil self:RemoveDetectedItem(DetectedItemID)
end end
end end
@ -1200,8 +1221,10 @@ do -- DETECTION_BASE
-- @param #number DetectedItemIndex The index or position in the DetectedItems list where the item needs to be removed. -- @param #number DetectedItemIndex The index or position in the DetectedItems list where the item needs to be removed.
function DETECTION_BASE:RemoveDetectedItem( DetectedItemIndex ) function DETECTION_BASE:RemoveDetectedItem( DetectedItemIndex )
self.DetectedItemCount = self.DetectedItemCount - 1 if self.DetectedItems[DetectedItemIndex] then
self.DetectedItems[DetectedItemIndex] = nil self.DetectedItemCount = self.DetectedItemCount - 1
self.DetectedItems[DetectedItemIndex] = nil
end
end end
@ -1215,7 +1238,7 @@ do -- DETECTION_BASE
--- Get the amount of SETs with detected objects. --- Get the amount of SETs with detected objects.
-- @param #DETECTION_BASE self -- @param #DETECTION_BASE self
-- @return #number Count -- @return #number The amount of detected items. Note that the amount of detected items can differ with the reality, because detections are not real-time but doen in intervals!
function DETECTION_BASE:GetDetectedItemsCount() function DETECTION_BASE:GetDetectedItemsCount()
local DetectedCount = self.DetectedItemCount local DetectedCount = self.DetectedItemCount
@ -1435,7 +1458,6 @@ do -- DETECTION_UNITS
for DetectedItemID, DetectedItem in pairs( self.DetectedItems ) do for DetectedItemID, DetectedItem in pairs( self.DetectedItems ) do
local DetectedItemSet = DetectedItem.Set -- Core.Set#SET_UNIT local DetectedItemSet = DetectedItem.Set -- Core.Set#SET_UNIT
local DetectedTypeName = DetectedItem.Type
for DetectedUnitName, DetectedUnitData in pairs( DetectedItemSet:GetSet() ) do for DetectedUnitName, DetectedUnitData in pairs( DetectedItemSet:GetSet() ) do
local DetectedUnit = DetectedUnitData -- Wrapper.Unit#UNIT local DetectedUnit = DetectedUnitData -- Wrapper.Unit#UNIT
@ -1450,6 +1472,17 @@ do -- DETECTION_UNITS
-- Yes, the DetectedUnit is still detected or exists. Flag as identified. -- Yes, the DetectedUnit is still detected or exists. Flag as identified.
self:IdentifyDetectedObject( DetectedObject ) self:IdentifyDetectedObject( DetectedObject )
-- Update the detection with the new data provided.
DetectedItem.TypeName = DetectedUnit:GetTypeName()
DetectedItem.Name = DetectedObject.Name
DetectedItem.IsVisible = DetectedObject.IsVisible
DetectedItem.LastTime = DetectedObject.LastTime
DetectedItem.LastPos = DetectedObject.LastPos
DetectedItem.LastVelocity = DetectedObject.LastVelocity
DetectedItem.KnowType = DetectedObject.KnowType
DetectedItem.KnowDistance = DetectedObject.KnowDistance
DetectedItem.Distance = DetectedObject.Distance
else else
-- There was no DetectedObject, remove DetectedUnit from the Set. -- There was no DetectedObject, remove DetectedUnit from the Set.
self:AddChangeUnit( DetectedItem, "RU", DetectedUnitName ) self:AddChangeUnit( DetectedItem, "RU", DetectedUnitName )
@ -1474,10 +1507,15 @@ do -- DETECTION_UNITS
if not DetectedItem then if not DetectedItem then
self:T( "Added new DetectedItem" ) self:T( "Added new DetectedItem" )
DetectedItem = self:AddDetectedItem( "UNIT", DetectedUnitName ) DetectedItem = self:AddDetectedItem( "UNIT", DetectedUnitName )
DetectedItem.Type = DetectedUnit:GetTypeName() DetectedItem.TypeName = DetectedUnit:GetTypeName()
DetectedItem.Name = DetectedObjectData.Name DetectedItem.Name = DetectedObject.Name
DetectedItem.Visible = DetectedObjectData.Visible DetectedItem.IsVisible = DetectedObject.IsVisible
DetectedItem.Distance = DetectedObjectData.Distance DetectedItem.LastTime = DetectedObject.LastTime
DetectedItem.LastPos = DetectedObject.LastPos
DetectedItem.LastVelocity = DetectedObject.LastVelocity
DetectedItem.KnowType = DetectedObject.KnowType
DetectedItem.KnowDistance = DetectedObject.KnowDistance
DetectedItem.Distance = DetectedObject.Distance
end end
DetectedItem.Set:AddUnit( DetectedUnit ) DetectedItem.Set:AddUnit( DetectedUnit )
@ -1557,19 +1595,27 @@ do -- DETECTION_UNITS
if DetectedItemUnit and DetectedItemUnit:IsAlive() then if DetectedItemUnit and DetectedItemUnit:IsAlive() then
self:T(DetectedItemUnit) self:T(DetectedItemUnit)
local UnitCategoryName = DetectedItemUnit:GetCategoryName() or ""
local UnitCategoryType = DetectedItemUnit:GetTypeName() or ""
if DetectedItem.Type and UnitCategoryName and UnitCategoryType then if DetectedItem.KnowType then
UnitCategoryText = UnitCategoryName .. " (" .. UnitCategoryType .. ") at " local UnitCategoryName = DetectedItemUnit:GetCategoryName()
if UnitCategoryName then
UnitCategoryText = UnitCategoryName
end
if DetectedItem.TypeName then
UnitCategoryText = UnitCategoryText .. " (" .. DetectedItem.TypeName .. ")"
end
else else
UnitCategoryText = "Unknown target at " UnitCategoryText = "Unknown"
end end
if DetectedItem.Visible == false then if DetectedItem.KnowDistance then
UnitDistanceText = string.format( "%.2f", DetectedItem.Distance ) .. " km, estimated" if DetectedItem.IsVisible then
UnitDistanceText = " at " .. string.format( "%.2f", DetectedItem.Distance ) .. " km"
end
else else
UnitDistanceText = string.format( "%.2f", DetectedItem.Distance ) .. " km, visual" if DetectedItem.IsVisible then
UnitDistanceText = " at +/- " .. string.format( "%.0f", DetectedItem.Distance ) .. " km"
end
end end
local DetectedItemCoordinate = DetectedItemUnit:GetCoordinate() local DetectedItemCoordinate = DetectedItemUnit:GetCoordinate()
@ -1699,7 +1745,7 @@ do -- DETECTION_TYPES
for DetectedItemID, DetectedItem in pairs( self.DetectedItems ) do for DetectedItemID, DetectedItem in pairs( self.DetectedItems ) do
local DetectedItemSet = DetectedItem.Set -- Core.Set#SET_UNIT local DetectedItemSet = DetectedItem.Set -- Core.Set#SET_UNIT
local DetectedTypeName = DetectedItem.Type local DetectedTypeName = DetectedItem.TypeName
for DetectedUnitName, DetectedUnitData in pairs( DetectedItemSet:GetSet() ) do for DetectedUnitName, DetectedUnitData in pairs( DetectedItemSet:GetSet() ) do
local DetectedUnit = DetectedUnitData -- Wrapper.Unit#UNIT local DetectedUnit = DetectedUnitData -- Wrapper.Unit#UNIT
@ -1736,7 +1782,7 @@ do -- DETECTION_TYPES
local DetectedItem = self:GetDetectedItem( DetectedTypeName ) local DetectedItem = self:GetDetectedItem( DetectedTypeName )
if not DetectedItem then if not DetectedItem then
DetectedItem = self:AddDetectedItem( "TYPE", DetectedTypeName ) DetectedItem = self:AddDetectedItem( "TYPE", DetectedTypeName )
DetectedItem.Type = DetectedUnit:GetTypeName() DetectedItem.TypeName = DetectedUnit:GetTypeName()
end end
DetectedItem.Set:AddUnit( DetectedUnit ) DetectedItem.Set:AddUnit( DetectedUnit )
@ -1808,7 +1854,7 @@ do -- DETECTION_TYPES
local ThreatLevelA2G = DetectedSet:CalculateThreatLevelA2G() local ThreatLevelA2G = DetectedSet:CalculateThreatLevelA2G()
local DetectedItemsCount = DetectedSet:Count() local DetectedItemsCount = DetectedSet:Count()
local DetectedItemType = DetectedItem.Type local DetectedItemType = DetectedItem.TypeName
local DetectedItemUnit = DetectedSet:GetFirst() local DetectedItemUnit = DetectedSet:GetFirst()
@ -1984,6 +2030,25 @@ do -- DETECTION_AREAS
return nil return nil
end end
--- Report detailed of a detection result.
-- @param #DETECTION_AREAS self
-- @return #string
function DETECTION_AREAS:DetectedReportDetailed() --R2.1 Fixed missing report
self:F()
local Report = REPORT:New( "Detected areas:" )
for DetectedItemIndex, DetectedItem in pairs( self.DetectedItems ) do
local DetectedItem = DetectedItem -- #DETECTION_BASE.DetectedItem
local ReportSummary = self:DetectedItemReportSummary( DetectedItemIndex )
Report:Add( ReportSummary )
end
local ReportText = Report:Text()
return ReportText
end
--- Returns if there are friendlies nearby the FAC units ... --- Returns if there are friendlies nearby the FAC units ...
-- @param #DETECTION_AREAS self -- @param #DETECTION_AREAS self

1
Moose Development/Moose/Tasking/Mission.lua
View File

@ -295,6 +295,7 @@ function MISSION:AbortUnit( PlayerUnit )
local PlayerUnitRemoved = false local PlayerUnitRemoved = false
for TaskID, Task in pairs( self:GetTasks() ) do for TaskID, Task in pairs( self:GetTasks() ) do
local Task = Task -- Tasking.Task#TASK
if Task:AbortUnit( PlayerUnit ) then if Task:AbortUnit( PlayerUnit ) then
PlayerUnitRemoved = true PlayerUnitRemoved = true
end end

2
Moose Development/Moose/Wrapper/Controllable.lua
View File

@ -1782,7 +1782,7 @@ function CONTROLLABLE:GetDetectedTargets( DetectVisual, DetectOptical, DetectRad
return nil return nil
end end
function CONTROLLABLE:IsTargetDetected( DCSObject ) function CONTROLLABLE:IsTargetDetected( DCSObject, DetectVisual, DetectOptical, DetectRadar, DetectIRST, DetectRWR, DetectDLINK )
self:F2( self.ControllableName ) self:F2( self.ControllableName )
local DCSControllable = self:GetDCSObject() local DCSControllable = self:GetDCSObject()