-
Notifications
You must be signed in to change notification settings - Fork 35
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
# Conflicts: # example-planes/example-planes.xcodeproj/project.xcworkspace/xcuserdata/joschow1.xcuserdatad/UserInterfaceState.xcuserstate # example-planes/src/ofApp.mm # src/ARAnchorManager.mm
- Loading branch information
Showing
177 changed files
with
11,939 additions
and
102 deletions.
There are no files selected for viewing
Binary file modified
BIN
+65.8 KB
(120%)
...deproj/project.xcworkspace/xcuserdata/joschow1.xcuserdatad/UserInterfaceState.xcuserstate
Binary file not shown.
14 changes: 14 additions & 0 deletions
14
...nchormanager.xcodeproj/xcuserdata/joschow1.xcuserdatad/xcschemes/xcschememanagement.plist
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd"> | ||
| <plist version="1.0"> | ||
| <dict> | ||
| <key>SchemeUserState</key> | ||
| <dict> | ||
| <key>example-basic.xcscheme_^#shared#^_</key> | ||
| <dict> | ||
| <key>orderHint</key> | ||
| <integer>0</integer> | ||
| </dict> | ||
| </dict> | ||
| </dict> | ||
| </plist> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
+113 KB
(180%)
...deproj/project.xcworkspace/xcuserdata/joschow1.xcuserdatad/UserInterfaceState.xcuserstate
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,5 @@ | ||
| # example-camera-correction | ||
|
|
||
| If you happen to own a larger device, such as an iPad, you may discover the camera image to be somewhat distorted. The ARCam class should automatically correct the distortion but this example demonstrates the function to call in the event that the correction attempt failed. | ||
|
|
||
| This project is really more a testing ground for exploring how best to correct the camera. |
Binary file modified
BIN
+2.35 KB
(100%)
...deproj/project.xcworkspace/xcuserdata/joschow1.xcuserdatad/UserInterfaceState.xcuserstate
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file modified
BIN
+70.1 KB
(130%)
...deproj/project.xcworkspace/xcuserdata/joschow1.xcuserdatad/UserInterfaceState.xcuserstate
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| <!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=9"/> | ||
| <meta name="generator" content="Doxygen 1.8.13"/> | ||
| <meta name="viewport" content="width=device-width, initial-scale=1"/> | ||
| <title>ofxARKit: src/ARObjects.h Source File</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> | ||
| <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 style="height: 56px;"> | ||
| <td id="projectalign" style="padding-left: 0.5em;"> | ||
| <div id="projectname">ofxARKit | ||
| </div> | ||
| </td> | ||
| </tr> | ||
| </tbody> | ||
| </table> | ||
| </div> | ||
| <!-- end header part --> | ||
| <!-- Generated by Doxygen 1.8.13 --> | ||
| <script type="text/javascript"> | ||
| var searchBox = new SearchBox("searchBox", "search",false,'Search'); | ||
| </script> | ||
| <script type="text/javascript" src="menudata.js"></script> | ||
| <script type="text/javascript" src="menu.js"></script> | ||
| <script type="text/javascript"> | ||
| $(function() { | ||
| initMenu('',true,false,'search.php','Search'); | ||
| $(document).ready(function() { init_search(); }); | ||
| }); | ||
| </script> | ||
| <div id="main-nav"></div> | ||
| <!-- window showing the filter options --> | ||
| <div id="MSearchSelectWindow" | ||
| onmouseover="return searchBox.OnSearchSelectShow()" | ||
| onmouseout="return searchBox.OnSearchSelectHide()" | ||
| onkeydown="return searchBox.OnSearchSelectKey(event)"> | ||
| </div> | ||
|
|
||
| <!-- iframe showing the search results (closed by default) --> | ||
| <div id="MSearchResultsWindow"> | ||
| <iframe src="javascript:void(0)" frameborder="0" | ||
| name="MSearchResults" id="MSearchResults"> | ||
| </iframe> | ||
| </div> | ||
|
|
||
| <div id="nav-path" class="navpath"> | ||
| <ul> | ||
| <li class="navelem"><a class="el" href="dir_68267d1309a1af8e8297ef4c3efbcdba.html">src</a></li> </ul> | ||
| </div> | ||
| </div><!-- top --> | ||
| <div class="header"> | ||
| <div class="headertitle"> | ||
| <div class="title">ARObjects.h</div> </div> | ||
| </div><!--header--> | ||
| <div class="contents"> | ||
| <div class="fragment"><div class="line"><a name="l00001"></a><span class="lineno"> 1</span> <span class="comment">//</span></div><div class="line"><a name="l00002"></a><span class="lineno"> 2</span> <span class="comment">// ARObjects.hpp</span></div><div class="line"><a name="l00003"></a><span class="lineno"> 3</span> <span class="comment">//</span></div><div class="line"><a name="l00004"></a><span class="lineno"> 4</span> <span class="comment">// Created by Joseph Chow on 8/25/17.</span></div><div class="line"><a name="l00005"></a><span class="lineno"> 5</span> <span class="comment">//</span></div><div class="line"><a name="l00006"></a><span class="lineno"> 6</span> </div><div class="line"><a name="l00007"></a><span class="lineno"> 7</span> <span class="preprocessor">#ifndef ARObjects_hpp</span></div><div class="line"><a name="l00008"></a><span class="lineno"> 8</span> <span class="preprocessor">#define ARObjects_hpp</span></div><div class="line"><a name="l00009"></a><span class="lineno"> 9</span> </div><div class="line"><a name="l00010"></a><span class="lineno"> 10</span> <span class="preprocessor">#include <stdio.h></span></div><div class="line"><a name="l00011"></a><span class="lineno"> 11</span> <span class="preprocessor">#include "ofMain.h"</span></div><div class="line"><a name="l00012"></a><span class="lineno"> 12</span> <span class="preprocessor">#include <ARKit/ARKit.h></span></div><div class="line"><a name="l00013"></a><span class="lineno"> 13</span> </div><div class="line"><a name="l00014"></a><span class="lineno"> 14</span> <span class="keyword">namespace </span><a class="code" href="namespace_a_r_objects.html">ARObjects</a> {</div><div class="line"><a name="l00015"></a><span class="lineno"> 15</span>  </div><div class="line"><a name="l00017"></a><span class="lineno"><a class="line" href="struct_a_r_objects_1_1_plane_anchor_object.html"> 17</a></span>  <span class="keyword">typedef</span> <span class="keyword">struct </span>{</div><div class="line"><a name="l00018"></a><span class="lineno"> 18</span>  ofVec3f position;</div><div class="line"><a name="l00019"></a><span class="lineno"> 19</span>  <span class="keywordtype">float</span> width;</div><div class="line"><a name="l00020"></a><span class="lineno"> 20</span>  <span class="keywordtype">float</span> height;</div><div class="line"><a name="l00021"></a><span class="lineno"> 21</span>  ofMatrix4x4 transform;</div><div class="line"><a name="l00022"></a><span class="lineno"> 22</span>  NSUUID * uuid;</div><div class="line"><a name="l00023"></a><span class="lineno"> 23</span>  ARPlaneAnchor * rawAnchor; </div><div class="line"><a name="l00024"></a><span class="lineno"> 24</span>  }<a class="code" href="struct_a_r_objects_1_1_plane_anchor_object.html">PlaneAnchorObject</a>;</div><div class="line"><a name="l00025"></a><span class="lineno"> 25</span>  </div><div class="line"><a name="l00027"></a><span class="lineno"><a class="line" href="struct_a_r_objects_1_1_a_r_object.html"> 27</a></span>  <span class="keyword">typedef</span> <span class="keyword">struct </span>{</div><div class="line"><a name="l00028"></a><span class="lineno"> 28</span>  </div><div class="line"><a name="l00029"></a><span class="lineno"> 29</span>  <span class="comment">// a flag indicating whether or not this object was found by ARKit itself, or whether or not it was user added.</span></div><div class="line"><a name="l00030"></a><span class="lineno"> 30</span>  <span class="keywordtype">bool</span> systemAdded=<span class="keyword">false</span>;</div><div class="line"><a name="l00031"></a><span class="lineno"> 31</span>  </div><div class="line"><a name="l00032"></a><span class="lineno"> 32</span>  <span class="comment">// mesh for drawing a 3d object</span></div><div class="line"><a name="l00033"></a><span class="lineno"> 33</span>  ofMesh mesh;</div><div class="line"><a name="l00034"></a><span class="lineno"> 34</span>  </div><div class="line"><a name="l00035"></a><span class="lineno"> 35</span>  <span class="comment">// model matrix to store anchor tranform info</span></div><div class="line"><a name="l00036"></a><span class="lineno"> 36</span>  ofMatrix4x4 modelMatrix;</div><div class="line"><a name="l00037"></a><span class="lineno"> 37</span>  </div><div class="line"><a name="l00038"></a><span class="lineno"> 38</span>  <span class="comment">// a reference to the anchor itself.</span></div><div class="line"><a name="l00039"></a><span class="lineno"> 39</span>  ARAnchor * rawAnchor;</div><div class="line"><a name="l00040"></a><span class="lineno"> 40</span>  </div><div class="line"><a name="l00041"></a><span class="lineno"> 41</span>  NSUUID * getUUID(){</div><div class="line"><a name="l00042"></a><span class="lineno"> 42</span>  <span class="keywordflow">return</span> rawAnchor.identifier;</div><div class="line"><a name="l00043"></a><span class="lineno"> 43</span>  }</div><div class="line"><a name="l00044"></a><span class="lineno"> 44</span>  }<a class="code" href="struct_a_r_objects_1_1_a_r_object.html">ARObject</a>;</div><div class="line"><a name="l00045"></a><span class="lineno"> 45</span>  </div><div class="line"><a name="l00047"></a><span class="lineno"> 47</span>  <span class="keyword">static</span> <span class="keyword">inline</span> <a class="code" href="struct_a_r_objects_1_1_a_r_object.html">ARObject</a> buildARObject(ARAnchor * rawAnchor,ofMatrix4x4 modelMatrix,<span class="keywordtype">bool</span> systemAdded=<span class="keyword">false</span>){</div><div class="line"><a name="l00048"></a><span class="lineno"> 48</span>  <a class="code" href="struct_a_r_objects_1_1_a_r_object.html">ARObject</a> obj;</div><div class="line"><a name="l00049"></a><span class="lineno"> 49</span>  obj.rawAnchor = rawAnchor;</div><div class="line"><a name="l00050"></a><span class="lineno"> 50</span>  obj.modelMatrix = modelMatrix;</div><div class="line"><a name="l00051"></a><span class="lineno"> 51</span>  obj.systemAdded = systemAdded;</div><div class="line"><a name="l00052"></a><span class="lineno"> 52</span>  </div><div class="line"><a name="l00053"></a><span class="lineno"> 53</span>  <span class="keywordflow">return</span> obj;</div><div class="line"><a name="l00054"></a><span class="lineno"> 54</span>  }</div><div class="line"><a name="l00055"></a><span class="lineno"> 55</span> };</div><div class="line"><a name="l00056"></a><span class="lineno"> 56</span> </div><div class="line"><a name="l00057"></a><span class="lineno"> 57</span> <span class="preprocessor">#endif </span><span class="comment">/* ARObjects_hpp */</span><span class="preprocessor"></span></div><div class="line"><a name="l00058"></a><span class="lineno"> 58</span> </div><div class="ttc" id="namespace_a_r_objects_html"><div class="ttname"><a href="namespace_a_r_objects.html">ARObjects</a></div><div class="ttdef"><b>Definition:</b> ARObjects.h:14</div></div> | ||
| <div class="ttc" id="struct_a_r_objects_1_1_plane_anchor_object_html"><div class="ttname"><a href="struct_a_r_objects_1_1_plane_anchor_object.html">ARObjects::PlaneAnchorObject</a></div><div class="ttdoc">This defines the basic data structure of a Plane. </div><div class="ttdef"><b>Definition:</b> ARObjects.h:17</div></div> | ||
| <div class="ttc" id="struct_a_r_objects_1_1_a_r_object_html"><div class="ttname"><a href="struct_a_r_objects_1_1_a_r_object.html">ARObjects::ARObject</a></div><div class="ttdoc">The base class you can use to build your AR object. Provides a model matrix and a mesh for easy track...</div><div class="ttdef"><b>Definition:</b> ARObjects.h:27</div></div> | ||
| </div><!-- fragment --></div><!-- contents --> | ||
| <!-- start footer part --> | ||
| <hr class="footer"/><address class="footer"><small> | ||
| Generated by  <a href="http://www.doxygen.org/index.html"> | ||
| <img class="footer" src="doxygen.png" alt="doxygen"/> | ||
| </a> 1.8.13 | ||
| </small></address> | ||
| </body> | ||
| </html> |
Large diffs are not rendered by default.
Oops, something went wrong.
Oops, something went wrong.