Skip to content

Commit

Permalink
version v7.0.1
Browse files Browse the repository at this point in the history
  • Loading branch information
willmi committed Jul 24, 2020
1 parent 4db3761 commit 0e5e210
Show file tree
Hide file tree
Showing 24 changed files with 664 additions and 262 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,6 @@ Icon
Network Trash Folder
Temporary Items
.apdisk
.pdb
.dll

#!! ERROR: oc is undefined. Use list command to see defined gitignore types !!#

Expand Down
17 changes: 4 additions & 13 deletions FULivePC/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -195,26 +195,17 @@ if(WIN32)

STRING(FIND $ENV{CMAKE_GENERATOR} "Win64" IsFinded)
if(${IsFinded} EQUAL -1)
set(SrcNamaDLLFolder ${CMAKE_CURRENT_LIST_DIR}/../ThridParty/Windows/FaceUnity-SDK-PC/lib/win32)
set(SrcFreeImageDLLFolder ${CMAKE_CURRENT_LIST_DIR}/../ThridParty/Windows/FreeImage/lib/win32)
set(SrcOpenCVDLLFolder ${CMAKE_CURRENT_LIST_DIR}/../ThridParty/Windows/opencv400/lib/win32)
set(SrcNamaDLLFolder ${CMAKE_CURRENT_LIST_DIR}/../ThridParty/Windows/FaceUnity-SDK-PC/lib/win32)
else()
set(SrcNamaDLLFolder ${CMAKE_CURRENT_LIST_DIR}/../ThridParty/Windows/FaceUnity-SDK-PC/lib/win64)
set(SrcFreeImageDLLFolder ${CMAKE_CURRENT_LIST_DIR}/../ThridParty/Windows/FreeImage/lib/win64)
set(SrcOpenCVDLLFolder ${CMAKE_CURRENT_LIST_DIR}/../ThridParty/Windows/opencv400/lib/win64)
set(SrcNamaDLLFolder ${CMAKE_CURRENT_LIST_DIR}/../ThridParty/Windows/FaceUnity-SDK-PC/lib/win64)
endif()

add_custom_command(TARGET ${target}
POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SrcNamaDLLFolder}/fuai.dll $ENV{CMAKE_DEBUG_OUTPUT}
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SrcNamaDLLFolder}/CNamaSDK.dll $ENV{CMAKE_DEBUG_OUTPUT}
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SrcFreeImageDLLFolder}/FreeImage.dll $ENV{CMAKE_DEBUG_OUTPUT}
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SrcOpenCVDLLFolder}/opencv_world400.dll $ENV{CMAKE_DEBUG_OUTPUT}

COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SrcNamaDLLFolder}/CNamaSDK.dll $ENV{CMAKE_DEBUG_OUTPUT}
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SrcNamaDLLFolder}/fuai.dll $ENV{CMAKE_RUNTIME_OUTPUT}
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SrcNamaDLLFolder}/CNamaSDK.dll $ENV{CMAKE_RUNTIME_OUTPUT}
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SrcFreeImageDLLFolder}/FreeImage.dll $ENV{CMAKE_RUNTIME_OUTPUT}
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SrcOpenCVDLLFolder}/opencv_world400.dll $ENV{CMAKE_RUNTIME_OUTPUT}
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${SrcNamaDLLFolder}/CNamaSDK.dll $ENV{CMAKE_RUNTIME_OUTPUT}
COMMENT "copy nama")

elseif(APPLE)
Expand Down
31 changes: 31 additions & 0 deletions ThridParty/Windows/FaceUnity-SDK-PC/include/CNamaSDK.h
Original file line number Diff line number Diff line change
Expand Up @@ -1278,15 +1278,40 @@ FUNAMA_API const float* fuHumanProcessorGetResultRect(int index);
/**
\brief get ai model HumanProcessor's tracking 2d joint with index.
\param index, index of fuHumanProcessorGetNumResults
\param size, size of return data.
*/
FUNAMA_API const float* fuHumanProcessorGetResultJoint2ds(int index, int* size);

/**
\brief get ai model HumanProcessor's tracking 3d joint with index.
\param index, index of fuHumanProcessorGetNumResults
\param size, size of return data.
*/
FUNAMA_API const float* fuHumanProcessorGetResultJoint3ds(int index, int* size);

/**
\brief set ai model HumanProcessor's 3d skeleton hierarchy.
\param data, json file description of skeleton hierarchy. ref to boneMap.json.
\param size, size of data in bytes.
*/
FUNAMA_API void fuHumanProcessorSetBonemap(const char* data, const int size);

/**
\brief get ai model HumanProcessor's 3d joint transform, rotation only.
\param index, index of fuHumanProcessorGetNumResults
\param size, size of return data.
*/
FUNAMA_API const float* fuHumanProcessorGetResultTransformArray(int index,
int* size);

/**
\brief get ai model HumanProcessor's 3d root joint's transform.
\param index, index of fuHumanProcessorGetNumResults
\param size, size of return data.
*/
FUNAMA_API const float* fuHumanProcessorGetResultModelMatrix(int index,
int* size);

/**
\brief get ai model HumanProcessor's tracking full body mask with index.
\param index, index of fuHumanProcessorGetNumResults.
Expand Down Expand Up @@ -1376,6 +1401,12 @@ FUNAMA_API float fuHandDetectorGetResultHandScore(int index);
\param use,set use or not use.
*/
FUNAMA_API int fuSetUsePbo(bool use);

/**
\brief set Set texture loading quality
\param quality, 0:high 1:medium 2.low
*/
FUNAMA_API int fuSetLoadQuality(int quality);
#ifdef __cplusplus
}
#endif
Expand Down
Binary file modified ThridParty/Windows/FaceUnity-SDK-PC/lib/win32/CNamaSDK.dll
Binary file not shown.
Binary file modified ThridParty/Windows/FaceUnity-SDK-PC/lib/win32/CNamaSDK.lib
Binary file not shown.
Binary file modified ThridParty/Windows/FaceUnity-SDK-PC/lib/win32/fuai.dll
Binary file not shown.
Binary file modified ThridParty/Windows/FaceUnity-SDK-PC/lib/win64/CNamaSDK.dll
Binary file not shown.
Binary file modified ThridParty/Windows/FaceUnity-SDK-PC/lib/win64/CNamaSDK.lib
Binary file not shown.
Binary file modified ThridParty/Windows/FaceUnity-SDK-PC/lib/win64/fuai.dll
Binary file not shown.
Binary file modified assets/AI_model/ai_bgseg.bundle
Binary file not shown.
Binary file modified assets/AI_model/ai_bgseg_green.bundle
Binary file not shown.
Binary file modified assets/AI_model/ai_face_processor.bundle
Binary file not shown.
Binary file modified assets/AI_model/ai_hairseg.bundle
Binary file not shown.
Binary file modified assets/body_slim.bundle
Binary file not shown.
Binary file modified assets/face_beautification.bundle
Binary file not shown.
Binary file modified assets/face_makeup.bundle
Binary file not shown.
Binary file modified assets/fxaa.bundle
Binary file not shown.
Binary file modified assets/items/Animoji/qgirl.bundle
Binary file not shown.
Loading

0 comments on commit 0e5e210

Please sign in to comment.