Browse Source

Merge pull request #1634 from rokups/fix/for-last-PR

Bump CMake version and initialize new variables in Text3DFreeType
JoshEngebretson 8 years ago
parent
commit
2fe589e34f
2 changed files with 4 additions and 2 deletions
  1. 1 1
      CMakeLists.txt
  2. 3 1
      Source/Atomic/Graphics/Text3D/Text3DFreeType.cpp

+ 1 - 1
CMakeLists.txt

@@ -1,7 +1,7 @@
 
 project(Atomic)
 
-cmake_minimum_required(VERSION 2.8.12.1)
+cmake_minimum_required(VERSION 3.3)
 
 set(ATOMIC_SOURCE_DIR ${Atomic_SOURCE_DIR})
 set(CMAKE_MODULE_PATH ${ATOMIC_SOURCE_DIR}/Build/CMake/Modules)

+ 3 - 1
Source/Atomic/Graphics/Text3D/Text3DFreeType.cpp

@@ -83,7 +83,9 @@ Text3DFreeType::Text3DFreeType(Text3DFont* font) :
     hasMutableGlyph_(false),
     forceAutoHint_(false),
     subpixelGlyphPositions_(false),
-    fontHintLevel_(FONT_HINT_LEVEL_NORMAL)
+    fontHintLevel_(FONT_HINT_LEVEL_NORMAL),
+    fontSubpixelThreshold_(12),
+    fontOversampling_(2)
 {
 }