From e4e9bfca751de8960151faa182f070238ebaea5c Mon Sep 17 00:00:00 2001 From: Yusuke Tomoto Date: Mon, 7 May 2018 14:12:31 -0700 Subject: [PATCH 1/3] Fix order of quaternion multiplication in ofNode --- libs/openFrameworks/3d/ofNode.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/openFrameworks/3d/ofNode.cpp b/libs/openFrameworks/3d/ofNode.cpp index 0c2f5246590..69f09cc2b90 100644 --- a/libs/openFrameworks/3d/ofNode.cpp +++ b/libs/openFrameworks/3d/ofNode.cpp @@ -235,7 +235,7 @@ void ofNode::setGlobalOrientation(const glm::quat& q) { setOrientation(q); } else { auto invParent = glm::inverse(parent->getGlobalTransformMatrix()); - auto m44 = q * glm::toQuat(invParent); + auto m44 = glm::toQuat(invParent) * q; setOrientation(m44); } } From 608d7b86695904259275e4ebed7c5fdf6d8ff38d Mon Sep 17 00:00:00 2001 From: arturo castro Date: Tue, 8 May 2018 09:49:00 +0200 Subject: [PATCH 2/3] ofConstants: 0.10.1 --- libs/openFrameworks/utils/ofConstants.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/openFrameworks/utils/ofConstants.h b/libs/openFrameworks/utils/ofConstants.h index 00892a815e5..828629e697a 100644 --- a/libs/openFrameworks/utils/ofConstants.h +++ b/libs/openFrameworks/utils/ofConstants.h @@ -4,8 +4,8 @@ //------------------------------- #define OF_VERSION_MAJOR 0 #define OF_VERSION_MINOR 10 -#define OF_VERSION_PATCH 0 -#define OF_VERSION_PRE_RELEASE "stable" +#define OF_VERSION_PATCH 1 +#define OF_VERSION_PRE_RELEASE "master" // Set to 1 for compatibility with old projects using ofVec instead of glm #ifndef OF_USE_LEGACY_VECTOR_MATH From 707541894ac1437cf73a4f4b5dc943a1e5beac59 Mon Sep 17 00:00:00 2001 From: arturo castro Date: Tue, 8 May 2018 09:52:02 +0200 Subject: [PATCH 3/3] ofTTF: add latin and latinA ranges to latin alphabet --- libs/openFrameworks/graphics/ofTrueTypeFont.cpp | 5 ++++- libs/openFrameworks/graphics/ofTrueTypeFont.h | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/openFrameworks/graphics/ofTrueTypeFont.cpp b/libs/openFrameworks/graphics/ofTrueTypeFont.cpp index 922c9cca8dc..cd9bf8f6fa9 100644 --- a/libs/openFrameworks/graphics/ofTrueTypeFont.cpp +++ b/libs/openFrameworks/graphics/ofTrueTypeFont.cpp @@ -24,6 +24,7 @@ const ofUnicode::range ofUnicode::Space {32, 32}; const ofUnicode::range ofUnicode::IdeographicSpace {0x3000, 0x3000}; const ofUnicode::range ofUnicode::Latin {32, 0x007F}; const ofUnicode::range ofUnicode::Latin1Supplement {32,0x00FF}; +const ofUnicode::range ofUnicode::LatinA {0x0100,0x017F}; const ofUnicode::range ofUnicode::Greek {0x0370, 0x03FF}; const ofUnicode::range ofUnicode::Cyrillic {0x0400, 0x04FF}; const ofUnicode::range ofUnicode::Arabic {0x0600, 0x077F}; @@ -128,7 +129,9 @@ const std::initializer_list ofAlphabet::Devanagari { const std::initializer_list ofAlphabet::Latin { ofUnicode::Latin1Supplement, - ofUnicode::LatinExtendedAdditional + ofUnicode::LatinExtendedAdditional, + ofUnicode::Latin, + ofUnicode::LatinA, }; const std::initializer_list ofAlphabet::Greek { diff --git a/libs/openFrameworks/graphics/ofTrueTypeFont.h b/libs/openFrameworks/graphics/ofTrueTypeFont.h index 484847946bc..d15b615288c 100644 --- a/libs/openFrameworks/graphics/ofTrueTypeFont.h +++ b/libs/openFrameworks/graphics/ofTrueTypeFont.h @@ -54,6 +54,7 @@ class ofUnicode{ static const range IdeographicSpace; static const range Latin; static const range Latin1Supplement; + static const range LatinA; static const range Greek; static const range Cyrillic; static const range Arabic;