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 pull request #4 from FlightControl-Master/master

Browse Source 
Update from FlighControl-Master
This commit is contained in:
Delta-99 2017-02-02 22:55:20 -05:00 committed by GitHub
commit e41b72196b
3 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Moose Development/Moose/Core/Menu.lua
View File

@ -786,7 +786,7 @@ do
end end
end end
self:F( { MenuGroup:GetName(), MenuText, ParentMenu.MenuPath } ) --self:F( { MenuGroup:GetName(), MenuText, ParentMenu.MenuPath } )
return self return self
end end
@ -865,7 +865,7 @@ do
end end
end end
self:F( { MenuGroup:GetName(), MenuText, ParentMenu.MenuPath } ) --self:F( { MenuGroup:GetName(), MenuText, ParentMenu.MenuPath } )
return self return self
end end

14
Moose Development/Moose/Core/Zone.lua
View File

@ -449,16 +449,20 @@ end
--- Returns a random location within the zone. --- Returns a random location within the zone.
-- @param #ZONE_RADIUS self -- @param #ZONE_RADIUS self
-- @param #number inner minimal distance from the center of the zone
-- @param #number outer minimal distance from the outer edge of the zone
-- @return Dcs.DCSTypes#Vec2 The random location within the zone. -- @return Dcs.DCSTypes#Vec2 The random location within the zone.
function ZONE_RADIUS:GetRandomVec2() function ZONE_RADIUS:GetRandomVec2(inner, outer)
self:F( self.ZoneName ) self:F( self.ZoneName, inner, outer )
local Point = {} local Point = {}
local Vec2 = self:GetVec2() local Vec2 = self:GetVec2()
local _inner = inner or 0
local _outer = outer or self:GetRadius()
local angle = math.random() * math.pi*2; local angle = math.random() * math.pi * 2;
Point.x = Vec2.x + math.cos( angle ) * math.random() * self:GetRadius(); Point.x = Vec2.x + math.cos( angle ) * math.random(_inner, _outer);
Point.y = Vec2.y + math.sin( angle ) * math.random() * self:GetRadius(); Point.y = Vec2.y + math.sin( angle ) * math.random(_inner, _outer);
self:T( { Point } ) self:T( { Point } )

14
Moose Mission Setup/Moose.lua
View File

@ -6321,16 +6321,20 @@ end
--- Returns a random location within the zone. --- Returns a random location within the zone.
-- @param #ZONE_RADIUS self -- @param #ZONE_RADIUS self
-- @param #number inner minimal distance from the center of the zone
-- @param #number outer minimal distance from the outer edge of the zone
-- @return Dcs.DCSTypes#Vec2 The random location within the zone. -- @return Dcs.DCSTypes#Vec2 The random location within the zone.
function ZONE_RADIUS:GetRandomVec2() function ZONE_RADIUS:GetRandomVec2(inner, outer)
self:F( self.ZoneName ) self:F( self.ZoneName, inner, outer )
local Point = {} local Point = {}
local Vec2 = self:GetVec2() local Vec2 = self:GetVec2()
local _inner = inner or 0
local _outer = outer or self:GetRadius()
local angle = math.random() * math.pi*2; local angle = math.random() * math.pi * 2;
Point.x = Vec2.x + math.cos( angle ) * math.random() * self:GetRadius(); Point.x = Vec2.x + math.cos( angle ) * math.random(_inner, _outer);
Point.y = Vec2.y + math.sin( angle ) * math.random() * self:GetRadius(); Point.y = Vec2.y + math.sin( angle ) * math.random(_inner, _outer);
self:T( { Point } ) self:T( { Point } )