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

Update with correction of angle

Browse Source
This commit is contained in:
FlightControl
2017-05-11 21:48:16 +02:00
parent f8454daf9f
commit ea1b204145
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
Moose Development/Moose/AI/AI_Formation.lua
View File

@@ -631,6 +631,9 @@ function AI_FORMATION:onenterFollowing( FollowGroupSet )
local CS = ( 3600 / CT ) * ( CD / 1000 ) local CS = ( 3600 / CT ) * ( CD / 1000 )
local CDV = { x = CV2.x - CV1.x, y = CV2.y - CV1.y, z = CV2.z - CV1.z }
local Ca = math.atan2( CDV.z, CDV.x )
self:T2( { "Client:", CS, CD, CT, CV2, CV1, CT2, CT1 } ) self:T2( { "Client:", CS, CD, CT, CV2, CV1, CT2, CT1 } )
local GT1 = GroupUnit:GetState( self, "GT1" ) local GT1 = GroupUnit:GetState( self, "GT1" )
@@ -647,8 +650,11 @@ function AI_FORMATION:onenterFollowing( FollowGroupSet )
--self:E( { "Group:", GS = GS,GD = GD, GT = GT, GV2 = GV2, GV1 = GV1, GT2 = GT2, GT1 = GT1 } ) --self:E( { "Group:", GS = GS,GD = GD, GT = GT, GV2 = GV2, GV1 = GV1, GT2 = GT2, GT1 = GT1 } )
local GVx = FollowFormation.x * math.cos(Ca) - FollowFormation.z * math.sin(Ca)
local GVz = FollowFormation.z * math.cos(Ca) + FollowFormation.x * math.sin(Ca)
-- Calculate the group direction vector -- Calculate the group direction vector
local GV = { x = GV2.x - CV2.x + FollowFormation.x, y = GV2.y - CV2.y, z = GV2.z - CV2.z + FollowFormation.z } local GV = { x = GV2.x - CV2.x + GVx, y = GV2.y - CV2.y, z = GV2.z - CV2.z + GVz }
-- Calculate GH2, GH2 with the same height as CV2. -- Calculate GH2, GH2 with the same height as CV2.
local GH2 = { x = GV2.x, y = CV2.y, z = GV2.z } local GH2 = { x = GV2.x, y = CV2.y, z = GV2.z }
@@ -672,7 +678,7 @@ function AI_FORMATION:onenterFollowing( FollowGroupSet )
local DVu = { x = DV.x / FollowDistance, y = DV.y, z = DV.z / FollowDistance } local DVu = { x = DV.x / FollowDistance, y = DV.y, z = DV.z / FollowDistance }
-- Now we can calculate the group destination vector GDV. -- Now we can calculate the group destination vector GDV.
local GDV = { x = DVu.x * CS * 10 + CVI.x, y = CVI.y, z = DVu.z * CS * 10 + CVI.z } local GDV = { x = DVu.x * CS + CVI.x, y = CVI.y, z = DVu.z * CS + CVI.z }
local ADDx = FollowFormation.x * math.cos(alpha) - FollowFormation.z * math.sin(alpha) local ADDx = FollowFormation.x * math.cos(alpha) - FollowFormation.z * math.sin(alpha)
local ADDz = FollowFormation.z * math.cos(alpha) + FollowFormation.x * math.sin(alpha) local ADDz = FollowFormation.z * math.cos(alpha) + FollowFormation.x * math.sin(alpha)
@@ -681,9 +687,9 @@ function AI_FORMATION:onenterFollowing( FollowGroupSet )
-- local GDV_Formation = GDV -- local GDV_Formation = GDV
local GDV_Formation = { local GDV_Formation = {
x = GDV.x + ADDx, x = GDV.x + GVx,
y = GDV.y, y = GDV.y,
z = GDV.z + ADDz z = GDV.z + GVz
} }
if self.SmokeDirectionVector == true then if self.SmokeDirectionVector == true then