typo

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2096d685d40b33f2549a147e57d0507f2b77a9c1..08eb4026d9285e32ab4fbc0416b87240e7c9414c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -51,19 +51,19 @@ IF (VKVG_TILING_OPTIMAL)
        ADD_DEFINITIONS (-DVKVG_TILING_OPTIMAL)
 ENDIF ()
 
-set(VULKAN_SDK "$ENV{VULKAN_SDK}" CACHE STRING "LunarG Vulkan SDK path")
-if (VULKAN_SDK)
-       set(ENV{VULKAN_SDK} ${VULKAN_SDK})
+SET(VULKAN_SDK "$ENV{VULKAN_SDK}" CACHE STRING "LunarG Vulkan SDK path")
+IF (VULKAN_SDK)
+       SET(ENV{VULKAN_SDK} ${VULKAN_SDK})
        SET(vulkanSdkLayerPath "${VULKAN_SDK}/etc/vulkan/explicit_layer.d")
        IF (NOT EXISTS "${vulkanSdkLayerPath}")
                SET(vulkanSdkLayerPath "${VULKAN_SDK}/etc/explicit_layer.d")
-       endif ()
+       ENDIF ()
        SET(ENV{VK_LAYER_PATH} "${vulkanSdkLayerPath}")
-endif ()
+ENDIF ()
 
-if (NOT TARGET vkh_static)
-       add_subdirectory (vkh)
-endif()
+IF (NOT TARGET vkh_static)
+       ADD_SUBDIRECTORY (vkh)
+ENDIF()
 
 #SET(ENABLE_VALIDATION OFF CACHE BOOL "Enable vulkan validation layer")
 
@@ -102,16 +102,15 @@ CMAKE_DEPENDENT_OPTION(VKVG_BUILD_TESTS "build tests with glfw" ON "GLFW3_FOUND"
 
 # Find glslc shader compiler.
 # On Android, the NDK includes the binary, so no external dependency.
-if(ANDROID)
-       file(GLOB glslc-folders ${ANDROID_NDK}/shader-tools/*)
-else()
-       file(GLOB glslc-folders ${VULKAN_SDK}/bin)
-endif()
+IF(ANDROID)
+       FILE(GLOB glslc-folders ${ANDROID_NDK}/shader-tools/*)
+ELSE()
+       FILE(GLOB glslc-folders ${VULKAN_SDK}/bin)
+ENDIF()
 FIND_PROGRAM(GLSLC glslc HINTS ${glslc-folders})
 FIND_PROGRAM(XXD xxd)
 
-if(GLSLC AND XXD)
-
+IF(GLSLC AND XXD)
        SET(SHADERS_H "${CMAKE_CURRENT_SOURCE_DIR}/src/shaders.h")
        SET(SHADER_DIR "shaders")
        SET(SHADER_FILES ${SHADER_DIR}/*.frag ${SHADER_DIR}/*.vert ${SHADER_DIR}/*.geom  ${SHADER_DIR}/*.comp)
@@ -149,11 +148,11 @@ if(GLSLC AND XXD)
        ENDFOREACH()
        SET_SOURCE_FILES_PROPERTIES(${SHADERS_H} PROPERTIES GENERATED 1)
        #add_definitions( -DDEBUG_VK_PERF=true )
-endif()
+ENDIF()
 
-if (BuildShaderHeader)
-       add_dependencies(${PROJECT_NAME} BuildShaderHeader)
-endif ()
+IF (BuildShaderHeader)
+       ADD_DEPENDENCIES(${PROJECT_NAME} BuildShaderHeader)
+ENDIF ()
 
 FILE(GLOB VKVG_SRC src/*.c)
 
@@ -199,7 +198,7 @@ SET_PROPERTY(TARGET "${PROJECT_NAME}_static" PROPERTY POSITION_INDEPENDENT_CODE
 setup_lib ("${PROJECT_NAME}_shared")
 
 IF (VKVG_BUILD_TESTS)
-       add_subdirectory(tests)
+       ADD_SUBDIRECTORY(tests)
 ENDIF (VKVG_BUILD_TESTS)
 
 MESSAGE(STATUS "HarfBuzz_INCLUDE_DIRS = ${HarfBuzz_INCLUDE_DIRS}")
@@ -209,12 +208,12 @@ MESSAGE(STATUS "Build type\t\t= ${CMAKE_BUILD_TYPE}")
 MESSAGE(STATUS "VULKAN_SDK\t\t= $ENV{VULKAN_SDK}")
 MESSAGE(STATUS "VK_LAYER_PATH\t= $ENV{VK_LAYER_PATH}")
 IF (VKVG_BUILD_TESTS)
-MESSAGE(STATUS "Build tests\t\t= true.")
+       MESSAGE(STATUS "Build tests\t\t= true.")
 ELSE ()
-MESSAGE(STATUS "Build tests\t\t= false.")
+       MESSAGE(STATUS "Build tests\t\t= false.")
 ENDIF ()
 IF (VKVG_TEST_OFFSCREEN)
-MESSAGE(STATUS "Offscreen\t\t= true.")
+       MESSAGE(STATUS "Offscreen\t\t= true.")
 ENDIF ()
 IF (ENABLE_VALIDATION)
        MESSAGE(STATUS "Validation\t\t= enabled.")
@@ -227,44 +226,43 @@ ELSE ()
        MESSAGE(STATUS "Renderdoc\t\t= disabled.")
 ENDIF ()
 IF (VKVG_PREMULT_ALPHA)
-MESSAGE(STATUS "Premult Alpha\t= enabled.")
+       MESSAGE(STATUS "Premult Alpha\t= enabled.")
 ELSE ()
-MESSAGE(STATUS "Premult Alpha\t= disabled.")
+       MESSAGE(STATUS "Premult Alpha\t= disabled.")
 ENDIF ()
 IF (VKVG_LCD_FONT_FILTER)
-MESSAGE(STATUS "Font filtering\t= LCD.")
+       MESSAGE(STATUS "Font filtering\t= LCD.")
 ELSE ()
-MESSAGE(STATUS "Font filtering\t= Grayscale.")
+       MESSAGE(STATUS "Font filtering\t= Grayscale.")
 ENDIF ()
 MESSAGE(STATUS "---------------------------------------------------------------------------\n\n")
 
 IF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")
-INCLUDE(InstallRequiredSystemLibraries)
-
-SET(CPACK_SET_DESTDIR "on")
-SET(CPACK_PACKAGING_INSTALL_PREFIX "/tmp")
-SET(CPACK_GENERATOR "DEB")
+       INCLUDE(InstallRequiredSystemLibraries)
 
-SET(CPACK_PACKAGE_DESCRIPTION "Vulkan vector graphic library")
-SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "2d vector drawing library using vulkan")
-SET(CPACK_PACKAGE_VENDOR "jp Bruyere")
-SET(CPACK_PACKAGE_CONTACT "jp_bruyere@hotmail.com")
+       SET(CPACK_SET_DESTDIR "on")
+       SET(CPACK_PACKAGING_INSTALL_PREFIX "/tmp")
+       SET(CPACK_GENERATOR "DEB")
 
-SET(CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}")
-SET(CPACK_PACKAGE_VERSION_MINOR "${PROJECT_VERSION_MINOR}")
-SET(CPACK_PACKAGE_VERSION_PATCH "${PROJECT_VERSION_PATCH}")
-SET(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}_${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}_${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+       SET(CPACK_PACKAGE_DESCRIPTION "Vulkan vector graphic library")
+       SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "2d vector drawing library using vulkan")
+       SET(CPACK_PACKAGE_VENDOR "jp Bruyere")
+       SET(CPACK_PACKAGE_CONTACT "jp_bruyere@hotmail.com")
 
-#dependencies for this service menu
-SET(CPACK_DEBIAN_PACKAGE_DEPENDS " libharfbuzz-gobject0 , libfontconfig1 , libfreetype6 ")
+       SET(CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}")
+       SET(CPACK_PACKAGE_VERSION_MINOR "${PROJECT_VERSION_MINOR}")
+       SET(CPACK_PACKAGE_VERSION_PATCH "${PROJECT_VERSION_PATCH}")
+       SET(CPACK_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}_${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+       SET(CPACK_SOURCE_PACKAGE_FILE_NAME "${CMAKE_PROJECT_NAME}_${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
 
-SET(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
-SET(CPACK_DEBIAN_PACKAGE_SECTION "libraries")
-SET(CPACK_DEBIAN_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR})
+       #dependencies for this service menu
+       SET(CPACK_DEBIAN_PACKAGE_DEPENDS " libharfbuzz-gobject0 , libfontconfig1 , libfreetype6 ")
 
-SET(CPACK_COMPONENTS_ALL Libraries ApplicationData)
+       SET(CPACK_DEBIAN_PACKAGE_PRIORITY "optional")
+       SET(CPACK_DEBIAN_PACKAGE_SECTION "libraries")
+       SET(CPACK_DEBIAN_ARCHITECTURE ${CMAKE_SYSTEM_PROCESSOR})
 
-INCLUDE(CPack)
+       SET(CPACK_COMPONENTS_ALL Libraries ApplicationData)
 
+       INCLUDE(CPack)
 ENDIF(EXISTS "${CMAKE_ROOT}/Modules/CPack.cmake")

diff --git a/tests/text.c b/tests/text.c
index c39db43063482f4eaf5a2f5185eaa95ee70a005c..65165bcaf38d1d9e13cd5ab340084514f2b07e3f 100644 (file)
--- a/tests/text.c
+++ b/tests/text.c
@@ -140,12 +140,12 @@ void test(){
        vkvg_move_to(ctx, 80,400);
        vkvg_show_text (ctx,"Ленивый рыжий кот");
 
-       /*vkvg_move_to(ctx, 150,250);
+       vkvg_move_to(ctx, 150,250);
        vkvg_show_text (ctx,"test string é€");
        vkvg_move_to(ctx, 150,300);
        vkvg_show_text (ctx,"كسول الزنجبيل القط");
        vkvg_move_to(ctx, 150,350);
-       vkvg_show_text (ctx,"懶惰的姜貓");*/
+       vkvg_show_text (ctx,"懶惰的姜貓");
 
        //vkvg_show_text (ctx,"ABCDABCD");
        //vkvg_show_text (ctx,"j");
@@ -153,11 +153,22 @@ void test(){
        vkvg_destroy(ctx);
 }
 
+void test_mono () {
+       VkvgContext ctx = vkvg_create(surf);
+       vkvg_set_source_rgb(ctx,1,1,1);
+       vkvg_select_font_face(ctx,"mono");
+       vkvg_set_font_size(ctx, 20);
+       vkvg_move_to(ctx,100,100);
+       vkvg_show_text(ctx,"This is a test string!");
+       vkvg_destroy(ctx);
+}
+
 int main(int argc, char *argv[]) {
 
-       PERFORM_TEST (test, argc, argv);
+       PERFORM_TEST (test_mono, argc, argv);
+       /*PERFORM_TEST (test, argc, argv);
        PERFORM_TEST (test1, argc, argv);
-       PERFORM_TEST (test2, argc, argv);
+       PERFORM_TEST (test2, argc, argv);*/
 
        return 0;
 }