Chiebot-Mirror
/
opencv_contrib
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

reorganize assets

Browse Source
pull/3471/head
kallaballa 2 years ago
parent c9ee1106c3
commit 5af71ce1fa
3 changed files with 17 additions and 20 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      modules/v4d/CMakeLists.txt
  2. 2
      modules/v4d/samples/beauty-demo.cpp
  3. 12
      modules/v4d/src/detail/nanovgcontext.cpp

17
modules/v4d/CMakeLists.txt
Unescape View File

@ -67,7 +67,8 @@ macro(add_emscripten_sample sample source models)
"${CMAKE_CURRENT_LIST_DIR}/samples/${sample}.html"
"${CMAKE_CURRENT_BINARY_DIR}/../../bin/${sample}.html")
if(${models})
target_link_options(${sample} PRIVATE --preload-file "${CMAKE_BINARY_DIR}/assets/models/")
target_link_options(${sample} PRIVATE "SHELL:--preload-file ${CMAKE_CURRENT_BINARY_DIR}/assets/models/face_detection_yunet_2023mar.onnx")
target_link_options(${sample} PRIVATE "SHELL:--preload-file ${CMAKE_CURRENT_BINARY_DIR}/assets/models/lbfmodel.yaml")
endif()
endif()
endmacro()
@ -85,7 +86,7 @@ endmacro()
# Configure emscripten build flags
if(EMSCRIPTEN)
set(EM_LINKER_FLAGS "-sENVIRONMENT=web,worker -sWASM_BIGINT=1 -sOFFSCREENCANVAS_SUPPORT -sOFFSCREENCANVASES_TO_PTHREAD=#v4dOffscreenCanvas -sEXPORTED_FUNCTIONS=_main,_v4dInitCapture -sEXPORTED_RUNTIME_METHODS=ccall -sPROXY_TO_PTHREAD=1 --use-preload-plugins --preload-file \"${CMAKE_BINARY_DIR}/assets/fonts/\" --preload-file \"${CMAKE_CURRENT_BINARY_DIR}/doc/lena.png\" -sINITIAL_MEMORY=128MB -sALLOW_MEMORY_GROWTH=1 -sUSE_GLFW=3 -sMIN_WEBGL_VERSION=2 -sMAX_WEBGL_VERSION=2 --bind")
set(EM_LINKER_FLAGS "-sENVIRONMENT=web,worker -sWASM_BIGINT=1 -sOFFSCREENCANVAS_SUPPORT -sOFFSCREENCANVASES_TO_PTHREAD=#v4dOffscreenCanvas -sEXPORTED_FUNCTIONS=_main,_v4dInitCapture -sEXPORTED_RUNTIME_METHODS=ccall -sPROXY_TO_PTHREAD=1 --use-preload-plugins --preload-file \"${CMAKE_CURRENT_BINARY_DIR}/assets/fonts/entypo.ttf\" --preload-file \"${CMAKE_CURRENT_BINARY_DIR}/assets/fonts/Roboto-Regular.ttf\" --preload-file \"${CMAKE_CURRENT_BINARY_DIR}/assets/fonts/Roboto-Bold.ttf\" --preload-file \"${CMAKE_CURRENT_BINARY_DIR}/doc/lena.png\" -sINITIAL_MEMORY=128MB -sALLOW_MEMORY_GROWTH=1 -sUSE_GLFW=3 -sMIN_WEBGL_VERSION=2 -sMAX_WEBGL_VERSION=2 --bind")
set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${EM_LINKER_FLAGS}")
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${EM_LINKER_FLAGS}")
@ -160,20 +161,20 @@ if(NOT (TARGET ${the_module}))
add_custom_command(TARGET ${the_module} PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory
"${CMAKE_CURRENT_BINARY_DIR}/../../assets")
"${CMAKE_CURRENT_BINARY_DIR}/assets")
add_custom_command(TARGET ${the_module} PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory
"${CMAKE_CURRENT_BINARY_DIR}/../../assets/models")
"${CMAKE_CURRENT_BINARY_DIR}/assets/models")
add_custom_command(TARGET ${the_module} PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E make_directory
"${CMAKE_CURRENT_BINARY_DIR}/../../assets/fonts")
"${CMAKE_CURRENT_BINARY_DIR}/assets/fonts")
add_custom_command(TARGET ${the_module} PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E copy
"${CMAKE_CURRENT_SOURCE_DIR}/samples/fonts/*.ttf"
"${CMAKE_CURRENT_BINARY_DIR}/../../assets/fonts/")
"${CMAKE_CURRENT_BINARY_DIR}/assets/fonts/")
add_custom_command(TARGET ${the_module} PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E copy
@ -183,12 +184,12 @@ if(NOT (TARGET ${the_module}))
add_custom_command(TARGET ${the_module} PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E copy
"${lbfmodel_SOURCE_DIR}/lbfmodel.yaml"
"${CMAKE_CURRENT_BINARY_DIR}/../../assets/models/")
"${CMAKE_CURRENT_BINARY_DIR}/assets/models/")
add_custom_command(TARGET ${the_module} PRE_BUILD
COMMAND ${CMAKE_COMMAND} -E copy
"${yunet_SOURCE_DIR}/face_detection_yunet_2023mar.onnx"
"${CMAKE_CURRENT_BINARY_DIR}/../../assets/models/")
"${CMAKE_CURRENT_BINARY_DIR}/assets/models/")
#Add sample targets
if(BUILD_EXAMPLES)

2
modules/v4d/samples/beauty-demo.cpp
Unescape View File

@ -336,7 +336,7 @@ int main() {
cv::Ptr<V4D> window = V4D::make(WIDTH, HEIGHT, "Beautification Demo", false, false, 0);
window->printSystemInfo();
facemark->loadModel("assets/lbfmodel.yaml");
facemark->loadModel("assets/models/lbfmodel.yaml");
window->setScaling(scale);
if (!OFFSCREEN) {

12
modules/v4d/src/detail/nanovgcontext.cpp
Unescape View File

@ -18,10 +18,6 @@ NanoVGContext::NanoVGContext(FrameBufferContext& fbContext) :
run_sync_on_main<13>([this]() {
{
FrameBufferContext::GLScope glScope(fbCtx(), GL_FRAMEBUFFER);
//#ifdef __EMSCRIPTEN__
// glClearColor(0,1,0,0);
// glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
//#endif
#if defined(OPENCV_V4D_USE_ES3) || defined(EMSCRIPTEN)
context_ = nvgCreateGLES3(NVG_ANTIALIAS | NVG_STENCIL_STROKES | NVG_DEBUG);
#else
@ -29,13 +25,13 @@ NanoVGContext::NanoVGContext(FrameBufferContext& fbContext) :
#endif
if (!context_)
throw std::runtime_error("Could not initialize NanoVG!");
}
int font = nvgCreateFont(context_, "icons", "assets/fonts/entypo.ttf");
font = nvgCreateFont(context_, "sans", "assets/fonts/Roboto-Regular.ttf");
font = nvgCreateFont(context_, "sans-bold", "assets/fonts/Roboto-Bold.ttf");
nvgCreateFont(context_, "icons", "assets/fonts/entypo.ttf");
nvgCreateFont(context_, "sans", "assets/fonts/Roboto-Regular.ttf");
nvgCreateFont(context_, "sans-bold", "/assets/fonts/Roboto-Bold.ttf");
#ifdef __EMSCRIPTEN__
mainFbContext_.initWebGLCopy(fbCtx().getIndex());
#endif
}
});
}

Write Preview
Loading…
Cancel
Save