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

This commit is contained in:
FlightControl 2017-01-22 06:56:26 +01:00
commit 93bea9528d
3 changed files with 6 additions and 3 deletions

View File

@ -6,7 +6,8 @@
local GroupInside = GROUP:FindByName( "Test Inside Polygon" )
local GroupOutside = GROUP:FindByName( "Test Outside Polygon" )
local ZoneA = ZONE:New( "Zone A" ):SmokeZone( SMOKECOLOR.White, 90 )
local ZoneA = ZONE:New( "Zone A" )
ZoneA:SmokeZone( SMOKECOLOR.White, 90 )
Messager = SCHEDULER:New( nil,
function()

View File

@ -7,7 +7,8 @@ local GroupInside = GROUP:FindByName( "Test Inside Polygon" )
local GroupOutside = GROUP:FindByName( "Test Outside Polygon" )
local House = STATIC:FindByName( "House" )
local ZoneA = ZONE_RADIUS:New( "Zone A", House:GetPointVec2(), 300 ):SmokeZone( SMOKECOLOR.White, 90 )
local ZoneA = ZONE_RADIUS:New( "Zone A", House:GetVec2(), 300 )
ZoneA:SmokeZone( SMOKECOLOR.White, 90 )
Messager = SCHEDULER:New( nil,
function()

View File

@ -8,7 +8,8 @@ local GroupOutside = GROUP:FindByName( "Test Outside Polygon" )
local GroupPolygon = GROUP:FindByName( "Polygon A" )
local PolygonZone = ZONE_POLYGON:New( "Polygon A", GroupPolygon ):SmokeZone( SMOKECOLOR.White, 20 )
local PolygonZone = ZONE_POLYGON:New( "Polygon A", GroupPolygon )
PolygonZone:SmokeZone( SMOKECOLOR.White, 20 )
Messager = SCHEDULER:New( nil,
function()