merge from main

This commit is contained in:
greerdv
2021-05-19 12:14:25 +01:00
11816 changed files with 189923 additions and 1002401 deletions
@@ -45,4 +45,4 @@ namespace Camera
AZ::Vector3 m_positionalOffset = AZ::Vector3::CreateZero();
bool m_isRelativeOffset = false;
};
} // namespace Camera
} // namespace Camera
@@ -51,4 +51,4 @@ namespace Camera
float m_maximumPositiveSlideDistance = 0.0f;
float m_maximumNegativeSlideDistance = 0.0f;
};
} // namespace Camera
} // namespace Camera
@@ -49,4 +49,4 @@ namespace Camera
bool m_shouldUseTargetRotation = true;
bool m_shouldUseTargetPosition = true;
};
} //namespace Camera
} //namespace Camera
@@ -59,4 +59,4 @@ namespace Camera
// Private Data
AZStd::vector<AZ::EntityId> m_targets;
};
} //namespace Camera
} //namespace Camera
@@ -42,4 +42,4 @@ namespace Camera
private:
};
}
}
@@ -44,4 +44,4 @@ namespace Camera
EulerAngleType m_rotationType = EulerAngleType::Pitch;
float m_distanceFromTarget = 1.0f;
};
} //namespace Camera
} //namespace Camera
@@ -41,4 +41,4 @@ namespace Camera
AZ::Vector3 m_offset = AZ::Vector3::CreateZero();
bool m_isRelativeOffset = false;
};
} // namespace Camera
} // namespace Camera
@@ -42,4 +42,4 @@ namespace Camera
float m_angleInDegrees = 0.f;
AxisOfRotation m_axisType = X_Axis;
};
} // namespace Camera
} // namespace Camera
@@ -9,4 +9,4 @@
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
*
*/
#include "StartingPointCamera_precompiled.h"
#include "StartingPointCamera_precompiled.h"