Revert "#ZONE"

This reverts commit 1207417894a369fa4a353ca0a1f6120c2fc32666.

Moose Development/Moose/Core/Zone.lua

@@ -59,11 +59,7 @@
 -- @field #number ZoneProbability A value between 0 and 1. 0 = 0% and 1 = 100% probability.
 -- @field #number DrawID Unique ID of the drawn zone on the F10 map.
 -- @field #table Color Table with four entries, e.g. {1, 0, 0, 0.15}. First three are RGB color code. Fourth is the transparency Alpha value.
--- @field #table FillColor Table with four entries, e.g. {1, 0, 0, 0.15}. First three are RGB color code. Fourth is the transparency Alpha value.
--- @field #number drawCoalition Draw coalition.
 -- @field #number ZoneID ID of zone. Only zones defined in the ME have an ID!
--- @field #table Table of any trigger zone properties from the ME. The key is the Name of the property, and the value is the property's Value.
--- @field #number Surface Type of surface. Only determined at the center of the zone!
 -- @extends Core.Fsm#FSM
 
 
@@ -107,11 +103,6 @@
 --   * @{#ZONE_BASE.SmokeZone}(): Smokes the zone boundaries in a color.
 --   * @{#ZONE_BASE.FlareZone}(): Flares the zone boundaries in a color.
 --
--- ## A zone might have additional Properties created in the DCS Mission Editor, which can be accessed:
---
---   *@{#ZONE_BASE.GetProperty}(): Returns the Value of the zone with the given PropertyName, or nil if no matching property exists.
---   *@{#ZONE_BASE.GetAllProperties}(): Returns the zone Properties table.  
---
 -- @field #ZONE_BASE
 ZONE_BASE = {
   ClassName = "ZONE_BASE",
@@ -120,8 +111,6 @@ ZONE_BASE = {
   DrawID=nil,
   Color={},
   ZoneID=nil,
-  Properties={},
-  Surface=nil,
 }
 
 
@@ -347,41 +336,18 @@ end
 -- @param #ZONE_BASE self
 -- @return #nil The bounding square.
 function ZONE_BASE:GetBoundingSquare()
+  --return { x1 = 0, y1 = 0, x2 = 0, y2 = 0 }
   return nil
 end
 
---- Get surface type of the zone.
--- @param #ZONE_BASE self
--- @return DCS#SurfaceType Type of surface.
-function ZONE_BASE:GetSurfaceType()
-  local coord=self:GetCoordinate()
-  local surface=coord:GetSurfaceType()
-  return surface
-end
-
 --- Bound the zone boundaries with a tires.
 -- @param #ZONE_BASE self
 function ZONE_BASE:BoundZone()
   self:F2()
+
 end
 
 
---- Set draw coalition of zone.
--- @param #ZONE_BASE self
--- @param #number Coalition Coalition. Default -1.
--- @return #ZONE_BASE self
-function ZONE_BASE:SetDrawCoalition(Coalition)
-  self.drawCoalition=Coalition or -1
-  return self
-end
-
---- Get draw coalition of zone.
--- @param #ZONE_BASE self
--- @return #number Draw coaliton.
-function ZONE_BASE:GetDrawCoalition()
-  return self.drawCoalition or -1
-end
-
 --- Set color of zone.
 -- @param #ZONE_BASE self
 -- @param #table RGBcolor RGB color table. Default `{1, 0, 0}`.
@@ -405,7 +371,7 @@ end
 -- @param #ZONE_BASE self
 -- @return #table Table with four entries, e.g. {1, 0, 0, 0.15}. First three are RGB color code. Fourth is the transparency Alpha value.
 function ZONE_BASE:GetColor()
-  return self.Color or {1, 0, 0, 0.15}
+  return self.Color
 end
 
 --- Get RGB color of zone.
@@ -413,10 +379,9 @@ end
 -- @return #table Table with three entries, e.g. {1, 0, 0}, which is the RGB color code.
 function ZONE_BASE:GetColorRGB()
   local rgb={}
-  local Color=self:GetColor()
+  rgb[1]=self.Color[1]
-  rgb[1]=Color[1]
+  rgb[2]=self.Color[2]
-  rgb[2]=Color[2]
+  rgb[3]=self.Color[3]
-  rgb[3]=Color[3]
   return rgb
 end
 
@@ -424,55 +389,7 @@ end
 -- @param #ZONE_BASE self
 -- @return #number Alpha value.
 function ZONE_BASE:GetColorAlpha()
-  local Color=self:GetColor()
+  local alpha=self.Color[4]
-  local alpha=Color[4]
-  return alpha
-end
-
---- Set fill color of zone.
--- @param #ZONE_BASE self
--- @param #table RGBcolor RGB color table. Default `{1, 0, 0}`.
--- @param #number Alpha Transparacy between 0 and 1. Default 0.15.
--- @return #ZONE_BASE self
-function ZONE_BASE:SetFillColor(RGBcolor, Alpha)
-
-  RGBcolor=RGBcolor or {1, 0, 0}
-  Alpha=Alpha or 0.15
-
-  self.FillColor={}
-  self.FillColor[1]=RGBcolor[1]
-  self.FillColor[2]=RGBcolor[2]
-  self.FillColor[3]=RGBcolor[3]
-  self.FillColor[4]=Alpha
-
-  return self
-end
-
---- Get fill color table of the zone.
--- @param #ZONE_BASE self
--- @return #table Table with four entries, e.g. {1, 0, 0, 0.15}. First three are RGB color code. Fourth is the transparency Alpha value.
-function ZONE_BASE:GetFillColor()
-  return self.FillColor or {1, 0, 0, 0.15}
-end
-
---- Get RGB fill color of zone.
--- @param #ZONE_BASE self
--- @return #table Table with three entries, e.g. {1, 0, 0}, which is the RGB color code.
-function ZONE_BASE:GetFillColorRGB()
-  local rgb={}
-  local FillColor=self:GetFillColor()
-  rgb[1]=FillColor[1]
-  rgb[2]=FillColor[2]
-  rgb[3]=FillColor[3]
-  return rgb
-end
-
---- Get transperency Alpha fill value of zone.
--- @param #ZONE_BASE self
--- @return #number Alpha value.
-function ZONE_BASE:GetFillColorAlpha()
-  local FillColor=self:GetFillColor()
-  local alpha=FillColor[4]
   return alpha
 end
 
@@ -564,26 +481,6 @@ function ZONE_BASE:GetZoneMaybe()
   end
 end
 
--- Returns the Value of the zone with the given PropertyName, or nil if no matching property exists.
--- @param #ZONE_BASE self
--- @param #string PropertyName The name of a the TriggerZone Property to be retrieved.
--- @return #string The Value of the TriggerZone Property with the given PropertyName, or nil if absent.
--- @usage
--- 
--- local PropertiesZone = ZONE:FindByName("Properties Zone")
--- local Property = "ExampleProperty"
--- local PropertyValue = PropertiesZone:GetProperty(Property)
---
-function ZONE_BASE:GetProperty(PropertyName)
-  return self.Properties[PropertyName]
-end
-
--- Returns the zone Properties table.
--- @param #ZONE_BASE self
--- @return #table The Key:Value table of TriggerZone properties of the zone.
-function ZONE_BASE:GetAllProperties()
-  return self.Properties
-end
 
 --- The ZONE_RADIUS class, defined by a zone name, a location and a radius.
 -- @type ZONE_RADIUS
@@ -926,8 +823,8 @@ end
 -- @param ObjectCategories An array of categories of the objects to find in the zone. E.g. `{Object.Category.UNIT}`
 -- @param UnitCategories An array of unit categories of the objects to find in the zone. E.g. `{Unit.Category.GROUND_UNIT,Unit.Category.SHIP}`
 -- @usage
---    myzone:Scan({Object.Category.UNIT},{Unit.Category.GROUND_UNIT})
+--    self.Zone:Scan({Object.Category.UNIT},{Unit.Category.GROUND_UNIT})
---    local IsAttacked = myzone:IsSomeInZoneOfCoalition( self.Coalition )
+--    local IsAttacked = self.Zone:IsSomeInZoneOfCoalition( self.Coalition )
 function ZONE_RADIUS:Scan( ObjectCategories, UnitCategories )
 
   self.ScanData = {}
@@ -997,7 +894,7 @@ function ZONE_RADIUS:Scan( ObjectCategories, UnitCategories )
         local SceneryName = ZoneObject:getName()
         self.ScanData.Scenery[SceneryType] = self.ScanData.Scenery[SceneryType] or {}
         self.ScanData.Scenery[SceneryType][SceneryName] = SCENERY:Register( SceneryName, ZoneObject )
-        self:T( { SCENERY =  self.ScanData.Scenery[SceneryType][SceneryName] } )
+        self:F2( { SCENERY =  self.ScanData.Scenery[SceneryType][SceneryName] } )
       end
 
     end
@@ -1260,9 +1157,7 @@ end
 -- @return #boolean true if the location is within the zone.
 function ZONE_RADIUS:IsVec2InZone( Vec2 )
   self:F2( Vec2 )
-  
   if not Vec2 then return false end 
-  
   local ZoneVec2 = self:GetVec2()
 
   if ZoneVec2 then
@@ -1387,8 +1282,8 @@ end
 
 --- Returns a @{Core.Point#COORDINATE} object reflecting a random 3D location within the zone.
 -- @param #ZONE_RADIUS self
--- @param #number inner (Optional) Minimal distance from the center of the zone in meters. Default is 0 m.
+-- @param #number inner (Optional) Minimal distance from the center of the zone. Default is 0.
--- @param #number outer (Optional) Maximal distance from the outer edge of the zone in meters. Default is the radius of the zone.
+-- @param #number outer (Optional) Maximal distance from the outer edge of the zone. Default is the radius of the zone.
 -- @param #table surfacetypes (Optional) Table of surface types. Can also be a single surface type. We will try max 1000 times to find the right type!
 -- @return Core.Point#COORDINATE The random coordinate.
 function ZONE_RADIUS:GetRandomCoordinate(inner, outer, surfacetypes)
@@ -1555,9 +1450,9 @@ function ZONE:New( ZoneName )
 end
 
 --- Find a zone in the _DATABASE using the name of the zone.
--- @param #ZONE self
+-- @param #ZONE_BASE self
 -- @param #string ZoneName The name of the zone.
--- @return #ZONE self
+-- @return #ZONE_BASE self
 function ZONE:FindByName( ZoneName )
 
   local ZoneFound = _DATABASE:FindZone( ZoneName )
@@ -1793,7 +1688,7 @@ end
 
 
 --- @type ZONE_POLYGON_BASE
--- @field #ZONE_POLYGON_BASE.ListVec2 Polygon The polygon defined by an array of @{DCS#Vec2}.
+-- --@field #ZONE_POLYGON_BASE.ListVec2 Polygon The polygon defined by an array of @{DCS#Vec2}.
 -- @extends #ZONE_BASE
 
 
@@ -2031,7 +1926,7 @@ function ZONE_POLYGON_BASE:BoundZone( UnBound )
 end
 
 
---- Draw the zone on the F10 map.  **NOTE** Currently, only polygons **up to ten points** are supported!
+--- Draw the zone on the F10 map.  **NOTE** Currently, only polygons with **exactly four points** are supported!
 -- @param #ZONE_POLYGON_BASE self
 -- @param #number Coalition Coalition: All=-1, Neutral=0, Red=1, Blue=2. Default -1=All.
 -- @param #table Color RGB color table {r, g, b}, e.g. {1,0,0} for red.
@@ -2043,28 +1938,14 @@ end
 -- @return #ZONE_POLYGON_BASE self
 function ZONE_POLYGON_BASE:DrawZone(Coalition, Color, Alpha, FillColor, FillAlpha, LineType, ReadOnly)
 
-  if self._.Polygon and #self._.Polygon>=3 then
-
   local coordinate=COORDINATE:NewFromVec2(self._.Polygon[1])
 
-    Coalition=Coalition or self:GetDrawCoalition()
-    
-    -- Set draw coalition.
-    self:SetDrawCoalition(Coalition)  
-  
   Color=Color or self:GetColorRGB()
   Alpha=Alpha or 1
   
-    -- Set color.
+  FillColor=FillColor or UTILS.DeepCopy(Color)
-    self:SetColor(Color, Alpha)
+  FillAlpha=FillAlpha or self:GetColorAlpha()
 
-    FillColor=FillColor or self:GetFillColorRGB()
-    if not FillColor then UTILS.DeepCopy(Color) end
-    FillAlpha=FillAlpha or self:GetFillColorAlpha()
-    if not FillAlpha then FillAlpha=0.15 end
-    
-    -- Set fill color.
-    self:SetFillColor(FillColor, FillAlpha)
 
   if #self._.Polygon==4 then
 
@@ -2083,7 +1964,6 @@ function ZONE_POLYGON_BASE:DrawZone(Coalition, Color, Alpha, FillColor, FillAlph
 
   end
 
-  end
 
   return self
 end
@@ -2417,206 +2297,6 @@ function ZONE_POLYGON:FindByName( ZoneName )
   return ZoneFound
 end
 
-do -- ZONE_ELASTIC
-
-  --- @type ZONE_ELASTIC
-  -- @field #table points Points in 2D.
-  -- @field #table setGroups Set of GROUPs.
-  -- @field #table setOpsGroups Set of OPSGROUPS.
-  -- @field #table setUnits Set of UNITs.
-  -- @field #number updateID Scheduler ID for updating.
-  -- @extends #ZONE_POLYGON_BASE
-
-  --- The ZONE_ELASTIC class defines a dynamic polygon zone, where only the convex hull is used.
-  --
-  -- @field #ZONE_ELASTIC
-  ZONE_ELASTIC = {
-    ClassName="ZONE_ELASTIC",
-    points={},
-    setGroups={}
-    }
-
-  --- Constructor to create a ZONE_ELASTIC instance.
-  -- @param #ZONE_ELASTIC self
-  -- @param #string ZoneName Name of the zone.
-  -- @param DCS#Vec2 Points (Optional) Fixed points.
-  -- @return #ZONE_ELASTIC self
-  function ZONE_ELASTIC:New(ZoneName, Points)
-
-    local self=BASE:Inherit(self, ZONE_POLYGON_BASE:New(ZoneName, Points)) --#ZONE_ELASTIC
-  
-    -- Zone objects are added to the _DATABASE and SET_ZONE objects.
-    _EVENTDISPATCHER:CreateEventNewZone( self )
-  
-    if Points then
-      self.points=Points
-    end
-  
-    return self
-  end
-
-  --- Add a vertex (point) to the polygon.
-  -- @param #ZONE_ELASTIC self
-  -- @param DCS#Vec2 Vec2 Point in 2D (with x and y coordinates).
-  -- @return #ZONE_ELASTIC self
-  function ZONE_ELASTIC:AddVertex2D(Vec2)
-  
-    -- Add vec2 to points.
-    table.insert(self.points, Vec2)
-  
-    return self
-  end
-
-
-  --- Add a vertex (point) to the polygon.
-  -- @param #ZONE_ELASTIC self
-  -- @param DCS#Vec3 Vec3 Point in 3D (with x, y and z coordinates). Only the x and z coordinates are used.
-  -- @return #ZONE_ELASTIC self
-  function ZONE_ELASTIC:AddVertex3D(Vec3)
-    
-    -- Add vec2 from vec3 to points.
-    table.insert(self.points, {x=Vec3.x, y=Vec3.z})
-  
-    return self
-  end
-
-
-  --- Add a set of groups. Positions of the group will be considered as polygon vertices when contructing the convex hull.
-  -- @param #ZONE_ELASTIC self
-  -- @param Core.Set#SET_GROUP SetGroup Set of groups.
-  -- @return #ZONE_ELASTIC self
-  function ZONE_ELASTIC:AddSetGroup(GroupSet)
-  
-    -- Add set to table.
-    table.insert(self.setGroups, GroupSet)
-    
-    return self
-  end
-
-
-  --- Update the convex hull of the polygon.
-  -- This uses the [Graham scan](https://en.wikipedia.org/wiki/Graham_scan).
-  -- @param #ZONE_ELASTIC self
-  -- @param #number Delay Delay in seconds before the zone is updated. Default 0.
-  -- @param #boolean Draw Draw the zone. Default `nil`.
-  -- @return #ZONE_ELASTIC self
-  function ZONE_ELASTIC:Update(Delay, Draw)
-    
-    -- Debug info.
-    self:T(string.format("Updating ZONE_ELASTIC %s", tostring(self.ZoneName)))
-  
-    -- Copy all points.
-    local points=UTILS.DeepCopy(self.points or {})
-    
-    if self.setGroups then
-      for _,_setGroup in pairs(self.setGroups) do
-        local setGroup=_setGroup --Core.Set#SET_GROUP
-        for _,_group in pairs(setGroup.Set) do
-          local group=_group --Wrapper.Group#GROUP
-          if group and group:IsAlive() then
-            table.insert(points, group:GetVec2())
-          end
-        end
-      end
-    end
-
-    -- Update polygon verticies from points.
-    self._.Polygon=self:_ConvexHull(points)
-    
-    if Draw~=false then
-      if self.DrawID or Draw==true then
-        self:UndrawZone()
-        self:DrawZone()
-      end
-    end
-
-    return self
-  end
-  
-  --- Start the updating scheduler.
-  -- @param #ZONE_ELASTIC self
-  -- @param #number Tstart Time in seconds before the updating starts.
-  -- @param #number dT Time interval in seconds between updates. Default 60 sec.
-  -- @param #number Tstop Time in seconds after which the updating stops. Default `nil`.
-  -- @param #boolean Draw Draw the zone. Default `nil`.
-  -- @return #ZONE_ELASTIC self
-  function ZONE_ELASTIC:StartUpdate(Tstart, dT, Tstop, Draw)
-  
-    self.updateID=self:ScheduleRepeat(Tstart, dT, 0, Tstop, ZONE_ELASTIC.Update, self, 0, Draw)
-  
-    return self
-  end
-
-  --- Stop the updating scheduler.
-  -- @param #ZONE_ELASTIC self
-  -- @param #number Delay Delay in seconds before the scheduler will be stopped. Default 0.
-  -- @return #ZONE_ELASTIC self
-  function ZONE_ELASTIC:StopUpdate(Delay)
-  
-    if Delay and Delay>0 then
-      self:ScheduleOnce(Delay, ZONE_ELASTIC.StopUpdate, self)
-    else
-  
-      if self.updateID then
-      
-        self:ScheduleStop(self.updateID)
-        
-        self.updateID=nil
-        
-      end
-      
-    end
-  
-    return self
-  end
-  
-
-  --- Create a convec hull.
-  -- @param #ZONE_ELASTIC self
-  -- @param #table pl Points
-  -- @return #table Points
-  function ZONE_ELASTIC:_ConvexHull(pl)
-  
-    if #pl == 0 then
-      return {}
-    end
-    
-    table.sort(pl, function(left,right)
-      return left.x < right.x
-    end)
- 
-    local h = {}
-    
-    -- Function: ccw > 0 if three points make a counter-clockwise turn, clockwise if ccw < 0, and collinear if ccw = 0.
-    local function ccw(a,b,c)
-      return (b.x - a.x) * (c.y - a.y) > (b.y - a.y) * (c.x - a.x)
-    end
- 
-    -- lower hull
-    for i,pt in pairs(pl) do
-      while #h >= 2 and not ccw(h[#h-1], h[#h], pt) do
-        table.remove(h,#h)
-      end
-      table.insert(h,pt)
-    end
- 
-    -- upper hull
-    local t = #h + 1
-    for i=#pl, 1, -1 do
-      local pt = pl[i]
-      while #h >= t and not ccw(h[#h-1], h[#h], pt) do
-        table.remove(h, #h)
-      end
-      table.insert(h, pt)
-    end
- 
-    table.remove(h, #h)
-    
-    return h
-  end  
-  
-end
-
 do -- ZONE_AIRBASE
 
   --- @type ZONE_AIRBASE