Skip to content

Commit

Permalink
Merge 1.10.x to main (#93)
Browse files Browse the repository at this point in the history
* Update SDK to v1.10.8

* Update API doc to v1.10.8

* Update Sample and Sample README

* Fixed udev rules pid lower case

* Update Sample

* Add readme images

* Update scripts

* Remove usued docs

* Update version and remove used link

* Fixed cmake install

---------

Co-authored-by: Joe Dong <jian.dong@pobox.com>
  • Loading branch information
zhonghong322 and jian-dong authored Jun 4, 2024
1 parent cde2404 commit 1842cc7
Show file tree
Hide file tree
Showing 838 changed files with 55,810 additions and 41,495 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
cmake_minimum_required(VERSION 3.1.15)
project(OrbbecSDK VERSION 1.10.5 LANGUAGES C CXX)
project(OrbbecSDK VERSION 1.10.8 LANGUAGES C CXX)

# Determine host platform
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/DetermineHostPlatform.cmake)
Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Orbbec SDK

![stability](https://img.shields.io/badge/stability-stable-green) ![version](https://img.shields.io/badge/version-1.10.5-green)
![stability](https://img.shields.io/badge/stability-stable-green) ![version](https://img.shields.io/badge/version-1.10.8-green)

The Orbbec 3D camera product software development kit fully supports UVC, enabling driver-free plug-and-play. It provides both low-level and high-level APIs that are simple and easy to use, allowing developers to use it flexibly in different scenarios.

Expand Down Expand Up @@ -157,7 +157,6 @@ target_link_libraries(${PROJECT_NAME} OrbbecSDK::OrbbecSDK)
* OrbbecSDK C++ API user guide:[doc/tutorial/English/OrbbecSDK_C++_API_user_guide-v1.0.pdf](https://orbbec.github.io/OrbbecSDK/doc/tutorial/English/OrbbecSDK_C++_API_user_guide-v1.0.pdf)
* Environment Configuration:[doc/tutorial/English/Environment_Configuration.md](doc/tutorial/English/Environment_Configuration.md)
* examples: [examples/README.md](examples/README.md)
* example description: [doc/tutorial/English/Code_Sample_Description/Sample_Description(C_C++).md](doc/tutorial/English/Code_Sample_Description/Sample_Description(C_C++).md)

## Related links

Expand Down
4 changes: 2 additions & 2 deletions README_CN.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# OrbbecSDK

![stability](https://img.shields.io/badge/stability-stable-green) ![version](https://img.shields.io/badge/version-1.10.5-green)
![stability](https://img.shields.io/badge/stability-stable-green) ![version](https://img.shields.io/badge/version-1.10.8-green)

Orbbec 3D 相机产品软件开发套件,全面支持 UVC,实现免驱动即插即用,提供低层和高层简单易用的 API,帮助开发者在不同场景下灵活使用。

Expand Down Expand Up @@ -142,7 +142,7 @@ target_link_libraries(${PROJECT_NAME} OrbbecSDK::OrbbecSDK)
* OrbbecSDK C++ API user guide:[doc/tutorial/Chinese/OrbbecSDK_C++_API_user_guide-v1.0.pdf](https://orbbec.github.io/OrbbecSDK/doc/tutorial/Chinese/OrbbecSDK_C++_API_user_guide-v1.0.pdf)
* Environment Configuration:[doc/tutorial/Chinese/Environment_Configuration.md](doc/tutorial/Chinese/Environment_Configuration.md)
* 示例说明: [examples/README.md](examples/README_CN.md)
* 示例描述: [doc/tutorial/Chinese/Code_Sample_Description/Sample_Description(C_C++).md](doc/tutorial/Chinese/Code_Sample_Description/Sample_Description(C_C++).md)


## 相关链接

Expand Down
9 changes: 7 additions & 2 deletions cmake/InstallTargets.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ if (UNIX)
DESTINATION lib
FILES_MATCHING PATTERN "libOrbbecSDK.so"
PATTERN "libOrbbecSDK.so.*"
PATTERN "libdepthengine.so"
PATTERN "libdepthengine.so.*"
PATTERN "libOrbbecSDK.dylib"
PATTERN "libOrbbecSDK.*.dylib"
)
Expand All @@ -34,12 +36,15 @@ elseif (WIN32)
install(DIRECTORY
${OrbbecSDK_LIBS_DIR}/
DESTINATION bin
FILES_MATCHING PATTERN "OrbbecSDK.dll"
FILES_MATCHING PATTERN "*.dll"
PATTERN ".lib"
)
install(DIRECTORY
${OrbbecSDK_LIBS_DIR}/
DESTINATION lib
FILES_MATCHING PATTERN "OrbbecSDK*"
FILES_MATCHING
PATTERN "*.dll"
PATTERN ".lib"
)
endif ()

Expand Down
235 changes: 110 additions & 125 deletions doc/api/English/Context_8h.html

Large diffs are not rendered by default.

178 changes: 76 additions & 102 deletions doc/api/English/Context_8h_source.html

Large diffs are not rendered by default.

105 changes: 60 additions & 45 deletions doc/api/English/Context_8hpp.html
Original file line number Diff line number Diff line change
@@ -1,28 +1,31 @@
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
<meta http-equiv="X-UA-Compatible" content="IE=11"/>
<meta name="generator" content="Doxygen 1.9.7"/>
<meta name="viewport" content="width=device-width, initial-scale=1"/>
<title>OrbbecSDK: E:/Projects/Jenkins/workspace/OrbbecSDK/libobsensor/include/libobsensor/hpp/Context.hpp File Reference</title>
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
<meta name="generator" content="Doxygen 1.8.11"/>
<title>OrbbecSDK: /root/libobsensor/include/libobsensor/hpp/Context.hpp File Reference</title>
<link href="tabs.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="jquery.js"></script>
<script type="text/javascript" src="dynsections.js"></script>
<link href="search/search.css" rel="stylesheet" type="text/css"/>
<script type="text/javascript" src="search/searchdata.js"></script>
<script type="text/javascript" src="search/search.js"></script>
<script type="text/javascript">
$(document).ready(function() { init_search(); });
</script>
<link href="doxygen.css" rel="stylesheet" type="text/css" />
</head>
<body>
<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
<div id="titlearea">
<table cellspacing="0" cellpadding="0">
<tbody>
<tr id="projectrow">
<tr style="height: 56px;">
<td id="projectlogo"><img alt="Logo" src="orbbec_icon.png"/></td>
<td id="projectalign">
<div id="projectname">OrbbecSDK<span id="projectnumber">&#160;1.10.5</span>
<td id="projectalign" style="padding-left: 0.5em;">
<div id="projectname">OrbbecSDK
&#160;<span id="projectnumber">1.10.8</span>
</div>
<div id="projectbrief">OrbbecSDK: Software-Development-Kit for Orbbec 3D Cameras</div>
</td>
Expand All @@ -31,23 +34,41 @@
</table>
</div>
<!-- end header part -->
<!-- Generated by Doxygen 1.9.7 -->
<script type="text/javascript">
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
var searchBox = new SearchBox("searchBox", "search/",'.html');
/* @license-end */
</script>
<script type="text/javascript" src="menudata.js"></script>
<script type="text/javascript" src="menu.js"></script>
<!-- Generated by Doxygen 1.8.11 -->
<script type="text/javascript">
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
$(function() {
initMenu('',true,false,'search.php','Search');
$(document).ready(function() { init_search(); });
});
/* @license-end */
var searchBox = new SearchBox("searchBox", "search",false,'Search');
</script>
<div id="main-nav"></div>
<div id="navrow1" class="tabs">
<ul class="tablist">
<li><a href="index.html"><span>Main&#160;Page</span></a></li>
<li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
<li><a href="namespaces.html"><span>Namespaces</span></a></li>
<li><a href="annotated.html"><span>Classes</span></a></li>
<li class="current"><a href="files.html"><span>Files</span></a></li>
<li>
<div id="MSearchBox" class="MSearchBoxInactive">
<span class="left">
<img id="MSearchSelect" src="search/mag_sel.png"
onmouseover="return searchBox.OnSearchSelectShow()"
onmouseout="return searchBox.OnSearchSelectHide()"
alt=""/>
<input type="text" id="MSearchField" value="Search" accesskey="S"
onfocus="searchBox.OnSearchFieldFocus(true)"
onblur="searchBox.OnSearchFieldFocus(false)"
onkeyup="searchBox.OnSearchFieldChange(event)"/>
</span><span class="right">
<a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
</span>
</div>
</li>
</ul>
</div>
<div id="navrow2" class="tabs2">
<ul class="tablist">
<li><a href="files.html"><span>File&#160;List</span></a></li>
<li><a href="globals.html"><span>File&#160;Members</span></a></li>
</ul>
</div>
<!-- window showing the filter options -->
<div id="MSearchSelectWindow"
onmouseover="return searchBox.OnSearchSelectShow()"
Expand All @@ -57,16 +78,9 @@

<!-- iframe showing the search results (closed by default) -->
<div id="MSearchResultsWindow">
<div id="MSearchResults">
<div class="SRPage">
<div id="SRIndex">
<div id="SRResults"></div>
<div class="SRStatus" id="Loading">Loading...</div>
<div class="SRStatus" id="Searching">Searching...</div>
<div class="SRStatus" id="NoMatches">No Matches</div>
</div>
</div>
</div>
<iframe src="javascript:void(0)" frameborder="0"
name="MSearchResults" id="MSearchResults">
</iframe>
</div>

<div id="nav-path" class="navpath">
Expand All @@ -79,7 +93,8 @@
<a href="#nested-classes">Classes</a> &#124;
<a href="#namespaces">Namespaces</a> &#124;
<a href="#define-members">Macros</a> </div>
<div class="headertitle"><div class="title">Context.hpp File Reference</div></div>
<div class="headertitle">
<div class="title">Context.hpp File Reference</div> </div>
</div><!--header-->
<div class="contents">

Expand All @@ -91,29 +106,27 @@
</div>
<p><a href="Context_8hpp_source.html">Go to the source code of this file.</a></p>
<table class="memberdecls">
<tr class="heading"><td colspan="2"><h2 class="groupheader"><a id="nested-classes" name="nested-classes"></a>
<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="nested-classes"></a>
Classes</h2></td></tr>
<tr class="memitem:"><td class="memItemLeft" align="right" valign="top">class &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="classob_1_1Context.html">ob::Context</a></td></tr>
<tr class="separator:"><td class="memSeparator" colspan="2">&#160;</td></tr>
</table><table class="memberdecls">
<tr class="heading"><td colspan="2"><h2 class="groupheader"><a id="namespaces" name="namespaces"></a>
<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="namespaces"></a>
Namespaces</h2></td></tr>
<tr class="memitem:namespaceob"><td class="memItemLeft" align="right" valign="top">namespace &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="namespaceob.html">ob</a></td></tr>
<tr class="memitem:namespaceob"><td class="memItemLeft" align="right" valign="top"> &#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="namespaceob.html">ob</a></td></tr>
<tr class="separator:"><td class="memSeparator" colspan="2">&#160;</td></tr>
</table><table class="memberdecls">
<tr class="heading"><td colspan="2"><h2 class="groupheader"><a id="define-members" name="define-members"></a>
<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="define-members"></a>
Macros</h2></td></tr>
<tr class="memitem:a77befc5d9971137cb6980f723461e52c"><td class="memItemLeft" align="right" valign="top">#define&#160;</td><td class="memItemRight" valign="bottom"><a class="el" href="Context_8hpp.html#a77befc5d9971137cb6980f723461e52c">enableMultiDeviceSync</a>&#160;&#160;&#160;enableDeviceClockSync</td></tr>
<tr class="separator:a77befc5d9971137cb6980f723461e52c"><td class="memSeparator" colspan="2">&#160;</td></tr>
</table>
<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
<div class="textblock"><p>The SDK context class, which serves as the entry point to the underlying SDK. It is used to query device lists, handle device callbacks, and set the log level. </p>

<p class="definition">Definition in file <a class="el" href="Context_8hpp_source.html">Context.hpp</a>.</p>
<p>Definition in file <a class="el" href="Context_8hpp_source.html">Context.hpp</a>.</p>
</div><h2 class="groupheader">Macro Definition Documentation</h2>
<a id="a77befc5d9971137cb6980f723461e52c" name="a77befc5d9971137cb6980f723461e52c"></a>
<h2 class="memtitle"><span class="permalink"><a href="#a77befc5d9971137cb6980f723461e52c">&#9670;&#160;</a></span>enableMultiDeviceSync</h2>

<a class="anchor" id="a77befc5d9971137cb6980f723461e52c"></a>
<div class="memitem">
<div class="memproto">
<table class="memname">
Expand All @@ -123,14 +136,16 @@ <h2 class="memtitle"><span class="permalink"><a href="#a77befc5d9971137cb6980f72
</table>
</div><div class="memdoc">

<p class="definition">Definition at line <a class="el" href="Context_8hpp_source.html#l00084">84</a> of file <a class="el" href="Context_8hpp_source.html">Context.hpp</a>.</p>
<p>Definition at line <a class="el" href="Context_8hpp_source.html#l00084">84</a> of file <a class="el" href="Context_8hpp_source.html">Context.hpp</a>.</p>

</div>
</div>
</div><!-- contents -->
<!-- start footer part -->
<hr class="footer"/><address class="footer"><small>
Generated on Sat May 11 2024 17:13:38 for OrbbecSDK by&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.7
Generated on Tue Jun 4 2024 08:48:15 for OrbbecSDK by &#160;<a href="http://www.doxygen.org/index.html">
<img class="footer" src="doxygen.png" alt="doxygen"/>
</a> 1.8.11
</small></address>
</body>
</html>
Loading

0 comments on commit 1842cc7

Please sign in to comment.