diff --git a/Moose Development/Moose/Core/Point.lua b/Moose Development/Moose/Core/Point.lua index 3f6d7e995..3df7bdbfb 100644 --- a/Moose Development/Moose/Core/Point.lua +++ b/Moose Development/Moose/Core/Point.lua @@ -80,6 +80,7 @@ -- -- The current X, Altitude, Y axis can be retrieved with the methods @{#POINT_VEC2.GetX}(), @{#POINT_VEC2.GetAlt}(), @{#POINT_VEC2.GetY}() respectively. -- The methods @{#POINT_VEC2.SetX}(), @{#POINT_VEC2.SetAlt}(), @{#POINT_VEC2.SetY}() change the respective axis with a new value. +-- The current Lat(itude), Alt(itude), Lon(gitude) values can also be retrieved with the methods @{#POINT_VEC2.GetLat}(), @{#POINT_VEC2.GetAlt}(), @{#POINT_VEC2.GetLon}() respectively. -- The current axis values can be changed by using the methods @{#POINT_VEC2.AddX}(), @{#POINT_VEC2.AddAlt}(), @{#POINT_VEC2.AddY}() -- to add or substract a value from the current respective axis value. -- Note that the Set and Add methods return the current POINT_VEC2 object, so these manipulation methods can be chained... For example: @@ -363,7 +364,7 @@ function POINT_VEC3:GetRandomVec3InRadius( OuterRadius, InnerRadius ) local RandomVec2 = self:GetRandomVec2InRadius( OuterRadius, InnerRadius ) local y = self:GetY() + math.random( InnerRadius, OuterRadius ) - local RandomVec3 = { x = RandomVec2.x, y = y, z = RandomVec2.z } + local RandomVec3 = { x = RandomVec2.x, y = y, z = RandomVec2.y } return RandomVec3 end @@ -529,9 +530,9 @@ function POINT_VEC3:RoutePointAir( AltType, Type, Action, Speed, SpeedLocked ) self:F2( { AltType, Type, Action, Speed, SpeedLocked } ) local RoutePoint = {} - RoutePoint.x = self:GetX() - RoutePoint.y = self:GetZ() - RoutePoint.alt = self:GetY() + RoutePoint.x = self.x + RoutePoint.y = self.z + RoutePoint.alt = self.y RoutePoint.alt_type = AltType RoutePoint.type = Type @@ -570,8 +571,8 @@ function POINT_VEC3:RoutePointGround( Speed, Formation ) self:F2( { Formation, Speed } ) local RoutePoint = {} - RoutePoint.x = self:GetX() - RoutePoint.y = self:GetZ() + RoutePoint.x = self.x + RoutePoint.y = self.z RoutePoint.action = Formation or "" @@ -772,13 +773,27 @@ function POINT_VEC2:GetY() return self.z end ---- Return the altitude of the land at the POINT_VEC2. +--- Return the altitude (height) of the land at the POINT_VEC2. -- @param #POINT_VEC2 self -- @return #number The land altitude. function POINT_VEC2:GetAlt() return land.getHeight( { x = self.x, y = self.z } ) end +--- Return Return the Lat(itude) coordinate of the POINT_VEC2 (ie: (parent)POINT_VEC3.x). +-- @param #POINT_VEC2 self +-- @return #number The x coodinate. +function POINT_VEC2:GetLat() + return self.x +end + +--- Return the Lon(gitude) coordinate of the POINT_VEC2 (ie: (parent)POINT_VEC3.z). +-- @param #POINT_VEC2 self +-- @return #number The y coodinate. +function POINT_VEC2:GetLon() + return self.z +end + --- Set the x coordinate of the POINT_VEC2. -- @param #POINT_VEC2 self -- @param #number x The x coordinate. @@ -797,6 +812,15 @@ function POINT_VEC2:SetY( y ) return self end +--- Set the Lat(itude) coordinate of the POINT_VEC2 (ie: POINT_VEC3.x). +-- @param #POINT_VEC2 self +-- @param #number x The x coordinate. +-- @return #POINT_VEC2 +function POINT_VEC2:SetLat( x ) + self.x = x + return self +end + --- Set the altitude of the POINT_VEC2. -- @param #POINT_VEC2 self -- @param #number Altitude The land altitude. If nothing (nil) is given, then the current land altitude is set. @@ -806,6 +830,15 @@ function POINT_VEC2:SetAlt( Altitude ) return self end +--- Set the Lon(gitude) coordinate of the POINT_VEC2 (ie: POINT_VEC3.z). +-- @param #POINT_VEC2 self +-- @param #number y The y coordinate. +-- @return #POINT_VEC2 +function POINT_VEC2:SetLon( z ) + self.z = z + return self +end + --- Add to the x coordinate of the POINT_VEC2. -- @param #POINT_VEC2 self -- @param #number x The x coordinate. diff --git a/Moose Logo/MOOSE Brand Book 1.0.pdf b/Moose Logo/MOOSE Brand Book 1.0.pdf new file mode 100644 index 000000000..1a203d330 Binary files /dev/null and b/Moose Logo/MOOSE Brand Book 1.0.pdf differ diff --git a/Moose Logo/MOOSE_Logo_Primary_Black.eps b/Moose Logo/MOOSE_Logo_Primary_Black.eps new file mode 100644 index 000000000..ed72da324 Binary files /dev/null and b/Moose Logo/MOOSE_Logo_Primary_Black.eps differ diff --git a/Moose Logo/MOOSE_Logo_Primary_Black.png b/Moose Logo/MOOSE_Logo_Primary_Black.png new file mode 100644 index 000000000..f61cc767d Binary files /dev/null and b/Moose Logo/MOOSE_Logo_Primary_Black.png differ diff --git a/Moose Logo/MOOSE_Logo_Primary_Color.eps b/Moose Logo/MOOSE_Logo_Primary_Color.eps new file mode 100644 index 000000000..78f8266af Binary files /dev/null and b/Moose Logo/MOOSE_Logo_Primary_Color.eps differ diff --git a/Moose Logo/MOOSE_Logo_Primary_Color.png b/Moose Logo/MOOSE_Logo_Primary_Color.png new file mode 100644 index 000000000..7801dd4af Binary files /dev/null and b/Moose Logo/MOOSE_Logo_Primary_Color.png differ diff --git a/Moose Logo/MOOSE_Logo_Primary_White.eps b/Moose Logo/MOOSE_Logo_Primary_White.eps new file mode 100644 index 000000000..230579805 Binary files /dev/null and b/Moose Logo/MOOSE_Logo_Primary_White.eps differ diff --git a/Moose Logo/MOOSE_Logo_Primary_White.png b/Moose Logo/MOOSE_Logo_Primary_White.png new file mode 100644 index 000000000..0413d98d6 Binary files /dev/null and b/Moose Logo/MOOSE_Logo_Primary_White.png differ diff --git a/Moose Logo/MOOSE_Logo_Secondary_Black.eps b/Moose Logo/MOOSE_Logo_Secondary_Black.eps new file mode 100644 index 000000000..396d62af2 Binary files /dev/null and b/Moose Logo/MOOSE_Logo_Secondary_Black.eps differ diff --git a/Moose Logo/MOOSE_Logo_Secondary_Black.png b/Moose Logo/MOOSE_Logo_Secondary_Black.png new file mode 100644 index 000000000..749ca200f Binary files /dev/null and b/Moose Logo/MOOSE_Logo_Secondary_Black.png differ diff --git a/Moose Logo/MOOSE_Logo_Secondary_Color.eps b/Moose Logo/MOOSE_Logo_Secondary_Color.eps new file mode 100644 index 000000000..82090bd70 Binary files /dev/null and b/Moose Logo/MOOSE_Logo_Secondary_Color.eps differ diff --git a/Moose Logo/MOOSE_Logo_Secondary_Color.png b/Moose Logo/MOOSE_Logo_Secondary_Color.png new file mode 100644 index 000000000..f2a397caa Binary files /dev/null and b/Moose Logo/MOOSE_Logo_Secondary_Color.png differ diff --git a/Moose Logo/MOOSE_Logo_Secondary_White.eps b/Moose Logo/MOOSE_Logo_Secondary_White.eps new file mode 100644 index 000000000..44971970a Binary files /dev/null and b/Moose Logo/MOOSE_Logo_Secondary_White.eps differ diff --git a/Moose Logo/MOOSE_Logo_Secondary_White.png b/Moose Logo/MOOSE_Logo_Secondary_White.png new file mode 100644 index 000000000..3b50c2abf Binary files /dev/null and b/Moose Logo/MOOSE_Logo_Secondary_White.png differ diff --git a/Moose Logo/MOOSE_Symbol_Black.eps b/Moose Logo/MOOSE_Symbol_Black.eps new file mode 100644 index 000000000..f3bcdf259 Binary files /dev/null and b/Moose Logo/MOOSE_Symbol_Black.eps differ diff --git a/Moose Logo/MOOSE_Symbol_Black.png b/Moose Logo/MOOSE_Symbol_Black.png new file mode 100644 index 000000000..630369bdb Binary files /dev/null and b/Moose Logo/MOOSE_Symbol_Black.png differ diff --git a/Moose Logo/MOOSE_Symbol_Color.eps b/Moose Logo/MOOSE_Symbol_Color.eps new file mode 100644 index 000000000..471d62172 Binary files /dev/null and b/Moose Logo/MOOSE_Symbol_Color.eps differ diff --git a/Moose Logo/MOOSE_Symbol_Color.png b/Moose Logo/MOOSE_Symbol_Color.png new file mode 100644 index 000000000..62ad5fcd4 Binary files /dev/null and b/Moose Logo/MOOSE_Symbol_Color.png differ diff --git a/Moose Logo/MOOSE_Symbol_White.eps b/Moose Logo/MOOSE_Symbol_White.eps new file mode 100644 index 000000000..73a1cfe24 Binary files /dev/null and b/Moose Logo/MOOSE_Symbol_White.eps differ diff --git a/Moose Logo/MOOSE_Symbol_White.png b/Moose Logo/MOOSE_Symbol_White.png new file mode 100644 index 000000000..5492ff470 Binary files /dev/null and b/Moose Logo/MOOSE_Symbol_White.png differ diff --git a/Moose Logo/Moose_ED_Signature_Black.png b/Moose Logo/Moose_ED_Signature_Black.png new file mode 100644 index 000000000..12f3e789d Binary files /dev/null and b/Moose Logo/Moose_ED_Signature_Black.png differ diff --git a/Moose Logo/Moose_ED_Signature_Color.png b/Moose Logo/Moose_ED_Signature_Color.png new file mode 100644 index 000000000..371d7eca8 Binary files /dev/null and b/Moose Logo/Moose_ED_Signature_Color.png differ diff --git a/Moose Logo/logo.txt b/Moose Logo/logo.txt new file mode 100644 index 000000000..e69de29bb