Skip to content

Commit 1842cc7

Browse files
Merge 1.10.x to main (#93)
* 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 <[email protected]>
1 parent cde2404 commit 1842cc7

File tree

838 files changed

+55810
-41495
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

838 files changed

+55810
-41495
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.1.15)
2-
project(OrbbecSDK VERSION 1.10.5 LANGUAGES C CXX)
2+
project(OrbbecSDK VERSION 1.10.8 LANGUAGES C CXX)
33

44
# Determine host platform
55
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/DetermineHostPlatform.cmake)

README.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Orbbec SDK
22

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

55
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.
66

@@ -157,7 +157,6 @@ target_link_libraries(${PROJECT_NAME} OrbbecSDK::OrbbecSDK)
157157
* 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)
158158
* Environment Configuration:[doc/tutorial/English/Environment_Configuration.md](doc/tutorial/English/Environment_Configuration.md)
159159
* examples: [examples/README.md](examples/README.md)
160-
* example description: [doc/tutorial/English/Code_Sample_Description/Sample_Description(C_C++).md](doc/tutorial/English/Code_Sample_Description/Sample_Description(C_C++).md)
161160

162161
## Related links
163162

README_CN.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# OrbbecSDK
22

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

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

@@ -142,7 +142,7 @@ target_link_libraries(${PROJECT_NAME} OrbbecSDK::OrbbecSDK)
142142
* 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)
143143
* Environment Configuration:[doc/tutorial/Chinese/Environment_Configuration.md](doc/tutorial/Chinese/Environment_Configuration.md)
144144
* 示例说明: [examples/README.md](examples/README_CN.md)
145-
* 示例描述: [doc/tutorial/Chinese/Code_Sample_Description/Sample_Description(C_C++).md](doc/tutorial/Chinese/Code_Sample_Description/Sample_Description(C_C++).md)
145+
146146

147147
## 相关链接
148148

cmake/InstallTargets.cmake

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ if (UNIX)
1313
DESTINATION lib
1414
FILES_MATCHING PATTERN "libOrbbecSDK.so"
1515
PATTERN "libOrbbecSDK.so.*"
16+
PATTERN "libdepthengine.so"
17+
PATTERN "libdepthengine.so.*"
1618
PATTERN "libOrbbecSDK.dylib"
1719
PATTERN "libOrbbecSDK.*.dylib"
1820
)
@@ -34,12 +36,15 @@ elseif (WIN32)
3436
install(DIRECTORY
3537
${OrbbecSDK_LIBS_DIR}/
3638
DESTINATION bin
37-
FILES_MATCHING PATTERN "OrbbecSDK.dll"
39+
FILES_MATCHING PATTERN "*.dll"
40+
PATTERN ".lib"
3841
)
3942
install(DIRECTORY
4043
${OrbbecSDK_LIBS_DIR}/
4144
DESTINATION lib
42-
FILES_MATCHING PATTERN "OrbbecSDK*"
45+
FILES_MATCHING
46+
PATTERN "*.dll"
47+
PATTERN ".lib"
4348
)
4449
endif ()
4550

doc/api/English/Context_8h.html

Lines changed: 110 additions & 125 deletions
Large diffs are not rendered by default.

doc/api/English/Context_8h_source.html

Lines changed: 76 additions & 102 deletions
Large diffs are not rendered by default.

doc/api/English/Context_8hpp.html

Lines changed: 60 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,31 @@
1-
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2-
<html xmlns="http://www.w3.org/1999/xhtml" lang="en-US">
1+
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
2+
<html xmlns="http://www.w3.org/1999/xhtml">
33
<head>
44
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
5-
<meta http-equiv="X-UA-Compatible" content="IE=11"/>
6-
<meta name="generator" content="Doxygen 1.9.7"/>
7-
<meta name="viewport" content="width=device-width, initial-scale=1"/>
8-
<title>OrbbecSDK: E:/Projects/Jenkins/workspace/OrbbecSDK/libobsensor/include/libobsensor/hpp/Context.hpp File Reference</title>
5+
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
6+
<meta name="generator" content="Doxygen 1.8.11"/>
7+
<title>OrbbecSDK: /root/libobsensor/include/libobsensor/hpp/Context.hpp File Reference</title>
98
<link href="tabs.css" rel="stylesheet" type="text/css"/>
109
<script type="text/javascript" src="jquery.js"></script>
1110
<script type="text/javascript" src="dynsections.js"></script>
1211
<link href="search/search.css" rel="stylesheet" type="text/css"/>
1312
<script type="text/javascript" src="search/searchdata.js"></script>
1413
<script type="text/javascript" src="search/search.js"></script>
14+
<script type="text/javascript">
15+
$(document).ready(function() { init_search(); });
16+
</script>
1517
<link href="doxygen.css" rel="stylesheet" type="text/css" />
1618
</head>
1719
<body>
1820
<div id="top"><!-- do not remove this div, it is closed by doxygen! -->
1921
<div id="titlearea">
2022
<table cellspacing="0" cellpadding="0">
2123
<tbody>
22-
<tr id="projectrow">
24+
<tr style="height: 56px;">
2325
<td id="projectlogo"><img alt="Logo" src="orbbec_icon.png"/></td>
24-
<td id="projectalign">
25-
<div id="projectname">OrbbecSDK<span id="projectnumber">&#160;1.10.5</span>
26+
<td id="projectalign" style="padding-left: 0.5em;">
27+
<div id="projectname">OrbbecSDK
28+
&#160;<span id="projectnumber">1.10.8</span>
2629
</div>
2730
<div id="projectbrief">OrbbecSDK: Software-Development-Kit for Orbbec 3D Cameras</div>
2831
</td>
@@ -31,23 +34,41 @@
3134
</table>
3235
</div>
3336
<!-- end header part -->
34-
<!-- Generated by Doxygen 1.9.7 -->
35-
<script type="text/javascript">
36-
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
37-
var searchBox = new SearchBox("searchBox", "search/",'.html');
38-
/* @license-end */
39-
</script>
40-
<script type="text/javascript" src="menudata.js"></script>
41-
<script type="text/javascript" src="menu.js"></script>
37+
<!-- Generated by Doxygen 1.8.11 -->
4238
<script type="text/javascript">
43-
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
44-
$(function() {
45-
initMenu('',true,false,'search.php','Search');
46-
$(document).ready(function() { init_search(); });
47-
});
48-
/* @license-end */
39+
var searchBox = new SearchBox("searchBox", "search",false,'Search');
4940
</script>
50-
<div id="main-nav"></div>
41+
<div id="navrow1" class="tabs">
42+
<ul class="tablist">
43+
<li><a href="index.html"><span>Main&#160;Page</span></a></li>
44+
<li><a href="pages.html"><span>Related&#160;Pages</span></a></li>
45+
<li><a href="namespaces.html"><span>Namespaces</span></a></li>
46+
<li><a href="annotated.html"><span>Classes</span></a></li>
47+
<li class="current"><a href="files.html"><span>Files</span></a></li>
48+
<li>
49+
<div id="MSearchBox" class="MSearchBoxInactive">
50+
<span class="left">
51+
<img id="MSearchSelect" src="search/mag_sel.png"
52+
onmouseover="return searchBox.OnSearchSelectShow()"
53+
onmouseout="return searchBox.OnSearchSelectHide()"
54+
alt=""/>
55+
<input type="text" id="MSearchField" value="Search" accesskey="S"
56+
onfocus="searchBox.OnSearchFieldFocus(true)"
57+
onblur="searchBox.OnSearchFieldFocus(false)"
58+
onkeyup="searchBox.OnSearchFieldChange(event)"/>
59+
</span><span class="right">
60+
<a id="MSearchClose" href="javascript:searchBox.CloseResultsWindow()"><img id="MSearchCloseImg" border="0" src="search/close.png" alt=""/></a>
61+
</span>
62+
</div>
63+
</li>
64+
</ul>
65+
</div>
66+
<div id="navrow2" class="tabs2">
67+
<ul class="tablist">
68+
<li><a href="files.html"><span>File&#160;List</span></a></li>
69+
<li><a href="globals.html"><span>File&#160;Members</span></a></li>
70+
</ul>
71+
</div>
5172
<!-- window showing the filter options -->
5273
<div id="MSearchSelectWindow"
5374
onmouseover="return searchBox.OnSearchSelectShow()"
@@ -57,16 +78,9 @@
5778

5879
<!-- iframe showing the search results (closed by default) -->
5980
<div id="MSearchResultsWindow">
60-
<div id="MSearchResults">
61-
<div class="SRPage">
62-
<div id="SRIndex">
63-
<div id="SRResults"></div>
64-
<div class="SRStatus" id="Loading">Loading...</div>
65-
<div class="SRStatus" id="Searching">Searching...</div>
66-
<div class="SRStatus" id="NoMatches">No Matches</div>
67-
</div>
68-
</div>
69-
</div>
81+
<iframe src="javascript:void(0)" frameborder="0"
82+
name="MSearchResults" id="MSearchResults">
83+
</iframe>
7084
</div>
7185

7286
<div id="nav-path" class="navpath">
@@ -79,7 +93,8 @@
7993
<a href="#nested-classes">Classes</a> &#124;
8094
<a href="#namespaces">Namespaces</a> &#124;
8195
<a href="#define-members">Macros</a> </div>
82-
<div class="headertitle"><div class="title">Context.hpp File Reference</div></div>
96+
<div class="headertitle">
97+
<div class="title">Context.hpp File Reference</div> </div>
8398
</div><!--header-->
8499
<div class="contents">
85100

@@ -91,29 +106,27 @@
91106
</div>
92107
<p><a href="Context_8hpp_source.html">Go to the source code of this file.</a></p>
93108
<table class="memberdecls">
94-
<tr class="heading"><td colspan="2"><h2 class="groupheader"><a id="nested-classes" name="nested-classes"></a>
109+
<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="nested-classes"></a>
95110
Classes</h2></td></tr>
96111
<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>
97112
<tr class="separator:"><td class="memSeparator" colspan="2">&#160;</td></tr>
98113
</table><table class="memberdecls">
99-
<tr class="heading"><td colspan="2"><h2 class="groupheader"><a id="namespaces" name="namespaces"></a>
114+
<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="namespaces"></a>
100115
Namespaces</h2></td></tr>
101-
<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>
116+
<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>
102117
<tr class="separator:"><td class="memSeparator" colspan="2">&#160;</td></tr>
103118
</table><table class="memberdecls">
104-
<tr class="heading"><td colspan="2"><h2 class="groupheader"><a id="define-members" name="define-members"></a>
119+
<tr class="heading"><td colspan="2"><h2 class="groupheader"><a name="define-members"></a>
105120
Macros</h2></td></tr>
106121
<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>
107122
<tr class="separator:a77befc5d9971137cb6980f723461e52c"><td class="memSeparator" colspan="2">&#160;</td></tr>
108123
</table>
109124
<a name="details" id="details"></a><h2 class="groupheader">Detailed Description</h2>
110125
<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>
111126

112-
<p class="definition">Definition in file <a class="el" href="Context_8hpp_source.html">Context.hpp</a>.</p>
127+
<p>Definition in file <a class="el" href="Context_8hpp_source.html">Context.hpp</a>.</p>
113128
</div><h2 class="groupheader">Macro Definition Documentation</h2>
114-
<a id="a77befc5d9971137cb6980f723461e52c" name="a77befc5d9971137cb6980f723461e52c"></a>
115-
<h2 class="memtitle"><span class="permalink"><a href="#a77befc5d9971137cb6980f723461e52c">&#9670;&#160;</a></span>enableMultiDeviceSync</h2>
116-
129+
<a class="anchor" id="a77befc5d9971137cb6980f723461e52c"></a>
117130
<div class="memitem">
118131
<div class="memproto">
119132
<table class="memname">
@@ -123,14 +136,16 @@ <h2 class="memtitle"><span class="permalink"><a href="#a77befc5d9971137cb6980f72
123136
</table>
124137
</div><div class="memdoc">
125138

126-
<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>
139+
<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>
127140

128141
</div>
129142
</div>
130143
</div><!-- contents -->
131144
<!-- start footer part -->
132145
<hr class="footer"/><address class="footer"><small>
133-
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
146+
Generated on Tue Jun 4 2024 08:48:15 for OrbbecSDK by &#160;<a href="http://www.doxygen.org/index.html">
147+
<img class="footer" src="doxygen.png" alt="doxygen"/>
148+
</a> 1.8.11
134149
</small></address>
135150
</body>
136151
</html>

0 commit comments

Comments
 (0)