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

Fixed bug with GetPointVec2 function that was renamed ...

Browse Source
This commit is contained in:
FlightControl
2016-07-21 08:53:56 +02:00
parent 5d88e449be
commit bee6e8d7c6
6 changed files with 61 additions and 57515 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Moose Development/Moose/Zone.lua
View File

@@ -477,8 +477,8 @@ ZONE_GROUP = {
-- @param DCSTypes#Distance Radius The radius of the zone.
-- @return #ZONE_GROUP self
function ZONE_GROUP:New( ZoneName, ZoneGROUP, Radius )
local self = BASE:Inherit( self, ZONE_RADIUS:New( ZoneName, ZoneGROUP:GetPointVec2(), Radius ) )
self:F( { ZoneName, ZoneGROUP:GetPointVec2(), Radius } )
local self = BASE:Inherit( self, ZONE_RADIUS:New( ZoneName, ZoneGROUP:GetVec2(), Radius ) )
self:F( { ZoneName, ZoneGROUP:GetVec2(), Radius } )
self.ZoneGROUP = ZoneGROUP
@@ -489,14 +489,14 @@ end
--- Returns the current location of the @{Group}.
-- @param #ZONE_GROUP self
-- @return DCSTypes#Vec2 The location of the zone based on the @{Group} location.
function ZONE_GROUP:GetPointVec2()
function ZONE_GROUP:GetVec2()
self:F( self.ZoneName )
local ZonePointVec2 = self.ZoneGROUP:GetPointVec2()
local ZoneVec2 = self.ZoneGROUP:GetVec2()
self:T( { ZonePointVec2 } )
self:T( { ZoneVec2 } )
return ZonePointVec2
return ZoneVec2
end
--- Returns a random location within the zone of the @{Group}.
@@ -506,11 +506,11 @@ function ZONE_GROUP:GetRandomVec2()
self:F( self.ZoneName )
local Point = {}
local PointVec2 = self.ZoneGROUP:GetPointVec2()
local Vec2 = self.ZoneGROUP:GetVec2()
local angle = math.random() * math.pi*2;
Point.x = PointVec2.x + math.cos( angle ) * math.random() * self:GetRadius();
Point.y = PointVec2.y + math.sin( angle ) * math.random() * self:GetRadius();
Point.x = Vec2.x + math.cos( angle ) * math.random() * self:GetRadius();
Point.y = Vec2.y + math.sin( angle ) * math.random() * self:GetRadius();
self:T( { Point } )