Skip to content

[WIP] Feature multi marker #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 12 commits into
base: dev
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"image":"mcr.microsoft.com/devcontainers/universal:2",
"postCreateCommand": "git submodule update --init --recursive"
}
13 changes: 13 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ set(COMPRESSION_RELEASE_FLAG " -Oz ")
set(DEBUG_FLAGS " -g -sASSERTIONS=1 --profiling -s DEMANGLE_SUPPORT=1 ")
set(ES6_BUILD " -s EXPORT_ES6=1 -s USE_ES6_IMPORT_META=0 -sEXPORT_NAME=ARtoolKitPlus -s MODULARIZE=1 ")
set(ES6_BUILD_SM " -s EXPORT_ES6=1 -s USE_ES6_IMPORT_META=0 -sEXPORT_NAME=TrackerSingleMarker -s MODULARIZE=1 ")
set(ES6_BUILD_TM " -s EXPORT_ES6=1 -s USE_ES6_IMPORT_META=0 -sEXPORT_NAME=TrackerMultiMarker -s MODULARIZE=1 ")
set(MEMORY_OPTION " -s TOTAL_MEMORY=268435456 -s ALLOW_MEMORY_GROWTH=1 ")
set(FLAGS " -sFORCE_FILESYSTEM -s EXPORTED_RUNTIME_METHODS=['FS'] ")
set(INCLUDES " -I../emscripten/artoolkitplus ")
Expand Down Expand Up @@ -36,6 +37,12 @@ if(CMAKE_BUILD_TYPE STREQUAL Release)
target_link_libraries(trackerSM_ES6 ${ARToolKitPlus} )
endif()
set_target_properties(trackerSM_ES6 PROPERTIES LINK_FLAGS " ${COMPRESSION_RELEASE_FLAG} ${MEMORY_OPTION} ${INCLUDES} ${SRC} ${LINK_LIBS} --bind ${ES6_BUILD_SM} ${SINGLE_FILE} ${FLAGS} ")
add_executable(trackerMM_ES6 emscripten/trackerMM.cpp)
if(!LINK_LIBS)
add_dependencies(trackerMM_ES6 ARToolKitPlus)
target_link_libraries(trackerMM_ES6 ${ARToolKitPlus} )
endif()
set_target_properties(trackerMM_ES6 PROPERTIES LINK_FLAGS " ${COMPRESSION_RELEASE_FLAG} ${MEMORY_OPTION} ${INCLUDES} ${SRC} ${LINK_LIBS} --bind ${ES6_BUILD_TM} ${SINGLE_FILE} ${FLAGS} ")
elseif(CMAKE_BUILD_TYPE STREQUAL Debug)
add_executable(artoolkitplus_em_ES6_debug emscripten/artoolkitplus_em.cpp )
if(!LINK_LIBS)
Expand All @@ -49,6 +56,12 @@ if(CMAKE_BUILD_TYPE STREQUAL Release)
target_link_libraries(trackerSM_ES6_debug ${ARToolKitPlus} )
endif()
set_target_properties(trackerSM_ES6_debug PROPERTIES LINK_FLAGS " ${COMPRESSION_DEBUG_FLAG} ${MEMORY_OPTION} ${DEBUG_FLAGS} ${INCLUDES} ${SRC} ${LINK_LIBS} --bind ${ES6_BUILD_SM} ${SINGLE_FILE} ${FLAGS} ")
add_executable(trackerMM_ES6_debug emscripten/trackerMM.cpp)
if(!LINK_LIBS)
add_dependencies(trackerMM_ES6_debug ARToolKitPlus)
target_link_libraries(trackerMM_ES6_debug ${ARToolKitPlus} )
endif()
set_target_properties(trackerMM_ES6_debug PROPERTIES LINK_FLAGS " ${COMPRESSION_DEBUG_FLAG} ${MEMORY_OPTION} ${INCLUDES} ${SRC} ${LINK_LIBS} --bind ${ES6_BUILD_TM} ${SINGLE_FILE} ${FLAGS} ")
else()
message("Unsupported build type")
endif()
16 changes: 16 additions & 0 deletions build/trackerMM_ES6.js

Large diffs are not rendered by default.

Loading