sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/DigitalPulseSoftware/NazaraEngine

This commit is contained in:
Lynix 2019-01-19 02:17:21 +01:00
parent cd54cf641b c152d2b62b
commit bc625b5c8b
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
SDK/include/NDK/Components/VelocityComponent.hpp
View File

@ -19,10 +19,11 @@ namespace Ndk
class NDK_API VelocityComponent : public Component<VelocityComponent> class NDK_API VelocityComponent : public Component<VelocityComponent>
{ {
public: public:
VelocityComponent(const Nz::Vector3f& velocity = Nz::Vector3f::Zero()); VelocityComponent(const Nz::Vector3f& velocity = Nz::Vector3f::Zero(), Nz::CoordSys coordSystem = Nz::CoordSys_Global);
~VelocityComponent() = default; ~VelocityComponent() = default;
Nz::Vector3f linearVelocity; Nz::Vector3f linearVelocity;
Nz::CoordSys coordSys;
VelocityComponent& operator=(const Nz::Vector3f& vel); VelocityComponent& operator=(const Nz::Vector3f& vel);

5
SDK/include/NDK/Components/VelocityComponent.inl
View File

@ -16,8 +16,9 @@ namespace Ndk
* \param velocity Linear velocity * \param velocity Linear velocity
*/ */
inline VelocityComponent::VelocityComponent(const Nz::Vector3f& velocity) : inline VelocityComponent::VelocityComponent(const Nz::Vector3f& velocity, Nz::CoordSys coordSystem) :
linearVelocity(velocity) linearVelocity(velocity),
coordSys(coordSystem)
{ {
} }

2
SDK/src/NDK/Systems/VelocitySystem.cpp
View File

@ -43,7 +43,7 @@ namespace Ndk
NodeComponent& node = entity->GetComponent<NodeComponent>(); NodeComponent& node = entity->GetComponent<NodeComponent>();
const VelocityComponent& velocity = entity->GetComponent<VelocityComponent>(); const VelocityComponent& velocity = entity->GetComponent<VelocityComponent>();
node.Move(velocity.linearVelocity * elapsedTime, Nz::CoordSys_Global); node.Move(velocity.linearVelocity * elapsedTime, velocity.coordSys);
} }
} }

6
src/Nazara/Core/Unicode.cpp
View File

@ -37,13 +37,13 @@ namespace Nz
{ {
const UnicodeCharacter* GetCharacter(Nz::UInt32 codepoint) const UnicodeCharacter* GetCharacter(Nz::UInt32 codepoint)
{ {
auto it = std::lower_bound(std::begin(unicodeCharacters), std::end(unicodeCharacters), codepoint, [](const UnicodeCharacter& character, Nz::UInt32 codepoint) { return character.codepoint < codepoint; }); auto it = std::lower_bound(std::begin(unicodeCharacters), std::end(unicodeCharacters), codepoint, [](const UnicodeCharacter& character, Nz::UInt32 otherCodepoint) { return character.codepoint < otherCodepoint; });
if (it != std::end(unicodeCharacters) && it->codepoint == codepoint) if (it != std::end(unicodeCharacters) && it->codepoint == codepoint)
return &*it; return &*it;
else else
{ {
// Character is not part of the common character array, search in set // Character is not part of the common character array, search in set
auto itSet = std::lower_bound(std::begin(unicodeSets), std::end(unicodeSets), codepoint, [](const UnicodeSet& character, Nz::UInt32 codepoint) { return character.firstCodepoint < codepoint; }); auto itSet = std::lower_bound(std::begin(unicodeSets), std::end(unicodeSets), codepoint, [](const UnicodeSet& character, Nz::UInt32 otherCodepoint) { return character.firstCodepoint < otherCodepoint; });
if (itSet != std::begin(unicodeSets)) if (itSet != std::begin(unicodeSets))
{ {
--itSet; --itSet;
@ -58,7 +58,7 @@ namespace Nz
template<std::size_t N> template<std::size_t N>
const UnicodeCharacterSimpleMapping* GetCharacterMapping(Nz::UInt32 codepoint, const UnicodeCharacterSimpleMapping(&mapping)[N]) const UnicodeCharacterSimpleMapping* GetCharacterMapping(Nz::UInt32 codepoint, const UnicodeCharacterSimpleMapping(&mapping)[N])
{ {
auto it = std::lower_bound(std::begin(mapping), std::end(mapping), codepoint, [](const UnicodeCharacterSimpleMapping& character, Nz::UInt32 codepoint) { return character.codepoint < codepoint; }); auto it = std::lower_bound(std::begin(mapping), std::end(mapping), codepoint, [](const UnicodeCharacterSimpleMapping& character, Nz::UInt32 otherCodepoint) { return character.codepoint < otherCodepoint; });
if (it != std::end(mapping) && it->codepoint == codepoint) if (it != std::end(mapping) && it->codepoint == codepoint)
return &*it; return &*it;
else else