API tools faq
paste
Guest User

Untitled

a guest
Dec 13th, 2018
117
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 83.60 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/dev-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.cbp b/pierre-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.cbp
  2. index 4c960de..25bdf23 100644
  3. --- a/dev-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.cbp
  4. +++ b/pierre-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.cbp
  5. @@ -144,12 +144,6 @@
  6. <Unit filename="../../../addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.h">
  7. <Option virtualFolder="addons/ofxAssimpModelLoader/src" />
  8. </Unit>
  9. - <Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/poppack1.h">
  10. - <Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include/Compiler" />
  11. - </Unit>
  12. - <Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/pushpack1.h">
  13. - <Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include/Compiler" />
  14. - </Unit>
  15. <Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/DefaultLogger.h">
  16. <Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include" />
  17. </Unit>
  18. @@ -237,5 +231,11 @@
  19. <Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/assimp.hpp">
  20. <Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include" />
  21. </Unit>
  22. + <Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/poppack1.h">
  23. + <Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include/Compiler" />
  24. + </Unit>
  25. + <Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/pushpack1.h">
  26. + <Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include/Compiler" />
  27. + </Unit>
  28. </Project>
  29. </CodeBlocks_project_file>
  30. diff --git a/dev-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.vcxproj b/pierre-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.vcxproj
  31. index d2f5477..39f65af 100644
  32. --- a/dev-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.vcxproj
  33. +++ b/pierre-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.vcxproj
  34. @@ -107,8 +107,6 @@
  35. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\src\ofx3DBaseLoader.h" />
  36. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\src\ofxAssimpMeshHelper.h" />
  37. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\src\ofxAssimpModelLoader.h" />
  38. - <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\poppack1.h" />
  39. - <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\pushpack1.h" />
  40. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\DefaultLogger.h" />
  41. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\IOStream.h" />
  42. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\IOSystem.h" />
  43. @@ -138,6 +136,8 @@
  44. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\aiVersion.h" />
  45. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp.h" />
  46. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp.hpp" />
  47. + <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\poppack1.h" />
  48. + <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\pushpack1.h" />
  49. </ItemGroup>
  50. <ItemGroup>
  51. <ProjectReference Include="..\..\..\libs\openFrameworksCompiled\project\vs2010\openframeworksLib.vcxproj">
  52. diff --git a/dev-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.vcxproj.filters b/pierre-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.vcxproj.filters
  53. index de96ba2..b0a4d38 100644
  54. --- a/dev-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.vcxproj.filters
  55. +++ b/pierre-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.vcxproj.filters
  56. @@ -50,12 +50,6 @@
  57. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\src\ofxAssimpModelLoader.h">
  58. <Filter>addons\ofxAssimpModelLoader\src</Filter>
  59. </ClInclude>
  60. - <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\poppack1.h">
  61. - <Filter>addons\ofxAssimpModelLoader\libs\assimp\include\Compiler</Filter>
  62. - </ClInclude>
  63. - <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\pushpack1.h">
  64. - <Filter>addons\ofxAssimpModelLoader\libs\assimp\include\Compiler</Filter>
  65. - </ClInclude>
  66. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\DefaultLogger.h">
  67. <Filter>addons\ofxAssimpModelLoader\libs\assimp\include</Filter>
  68. </ClInclude>
  69. @@ -143,5 +137,11 @@
  70. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp.hpp">
  71. <Filter>addons\ofxAssimpModelLoader\libs\assimp\include</Filter>
  72. </ClInclude>
  73. + <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\poppack1.h">
  74. + <Filter>addons\ofxAssimpModelLoader\libs\assimp\include\Compiler</Filter>
  75. + </ClInclude>
  76. + <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\pushpack1.h">
  77. + <Filter>addons\ofxAssimpModelLoader\libs\assimp\include\Compiler</Filter>
  78. + </ClInclude>
  79. </ItemGroup>
  80. </Project>
  81. diff --git a/dev-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.xcodeproj/project.pbxproj b/pierre-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.xcodeproj/project.pbxproj
  82. index 6d3b4b8..9ab840f 100644
  83. --- a/dev-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.xcodeproj/project.pbxproj
  84. +++ b/pierre-openFrameworks/examples/3d/modelNoiseExample/modelNoiseExample.xcodeproj/project.pbxproj
  85. @@ -9,6 +9,50 @@
  86. <string>42</string>
  87. <key>objects</key>
  88. <dict>
  89. + <key>65bac5a3b9c9387859a2b0e01dd0c5e7</key>
  90. + <dict>
  91. + <key>explicitFileType</key>
  92. + <string>sourcecode.c.h</string>
  93. + <key>fileEncoding</key>
  94. + <string>30</string>
  95. + <key>isa</key>
  96. + <string>PBXFileReference</string>
  97. + <key>name</key>
  98. + <string>pushpack1.h</string>
  99. + <key>path</key>
  100. + <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/pushpack1.h</string>
  101. + <key>sourceTree</key>
  102. + <string>SOURCE_ROOT</string>
  103. + </dict>
  104. + <key>93a9152986a73da32dbd796433b96c9f</key>
  105. + <dict>
  106. + <key>children</key>
  107. + <array>
  108. + <string>1aa18353f9701b01731dfadf228466c5</string>
  109. + <string>65bac5a3b9c9387859a2b0e01dd0c5e7</string>
  110. + </array>
  111. + <key>isa</key>
  112. + <string>PBXGroup</string>
  113. + <key>name</key>
  114. + <string>Compiler</string>
  115. + <key>sourceTree</key>
  116. + <string><group></string>
  117. + </dict>
  118. + <key>1aa18353f9701b01731dfadf228466c5</key>
  119. + <dict>
  120. + <key>explicitFileType</key>
  121. + <string>sourcecode.c.h</string>
  122. + <key>fileEncoding</key>
  123. + <string>30</string>
  124. + <key>isa</key>
  125. + <string>PBXFileReference</string>
  126. + <key>name</key>
  127. + <string>poppack1.h</string>
  128. + <key>path</key>
  129. + <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/poppack1.h</string>
  130. + <key>sourceTree</key>
  131. + <string>SOURCE_ROOT</string>
  132. + </dict>
  133. <key>53ea0e889f34624ce3313e04cd77bdc4</key>
  134. <dict>
  135. <key>explicitFileType</key>
  136. @@ -429,55 +473,10 @@
  137. <key>sourceTree</key>
  138. <string>SOURCE_ROOT</string>
  139. </dict>
  140. - <key>9d3fbfbcc1ee3203c85613ccf7e80431</key>
  141. - <dict>
  142. - <key>explicitFileType</key>
  143. - <string>sourcecode.c.h</string>
  144. - <key>fileEncoding</key>
  145. - <string>30</string>
  146. - <key>isa</key>
  147. - <string>PBXFileReference</string>
  148. - <key>name</key>
  149. - <string>DefaultLogger.h</string>
  150. - <key>path</key>
  151. - <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/DefaultLogger.h</string>
  152. - <key>sourceTree</key>
  153. - <string>SOURCE_ROOT</string>
  154. - </dict>
  155. - <key>65bac5a3b9c9387859a2b0e01dd0c5e7</key>
  156. - <dict>
  157. - <key>explicitFileType</key>
  158. - <string>sourcecode.c.h</string>
  159. - <key>fileEncoding</key>
  160. - <string>30</string>
  161. - <key>isa</key>
  162. - <string>PBXFileReference</string>
  163. - <key>name</key>
  164. - <string>pushpack1.h</string>
  165. - <key>path</key>
  166. - <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/pushpack1.h</string>
  167. - <key>sourceTree</key>
  168. - <string>SOURCE_ROOT</string>
  169. - </dict>
  170. - <key>93a9152986a73da32dbd796433b96c9f</key>
  171. - <dict>
  172. - <key>children</key>
  173. - <array>
  174. - <string>1aa18353f9701b01731dfadf228466c5</string>
  175. - <string>65bac5a3b9c9387859a2b0e01dd0c5e7</string>
  176. - </array>
  177. - <key>isa</key>
  178. - <string>PBXGroup</string>
  179. - <key>name</key>
  180. - <string>Compiler</string>
  181. - <key>sourceTree</key>
  182. - <string><group></string>
  183. - </dict>
  184. <key>eefdd7ae0009ae6f77ef2a937399e1cd</key>
  185. <dict>
  186. <key>children</key>
  187. <array>
  188. - <string>93a9152986a73da32dbd796433b96c9f</string>
  189. <string>9d3fbfbcc1ee3203c85613ccf7e80431</string>
  190. <string>cc940533e79102644e0eba5599fb0fb6</string>
  191. <string>8ebbbb59caed1e54f37c7038f27990ee</string>
  192. @@ -507,6 +506,7 @@
  193. <string>c72403edcb7dcaec60d1dcdd13017e0c</string>
  194. <string>564045ef0424b7037832d90382f88900</string>
  195. <string>53ea0e889f34624ce3313e04cd77bdc4</string>
  196. + <string>93a9152986a73da32dbd796433b96c9f</string>
  197. </array>
  198. <key>isa</key>
  199. <string>PBXGroup</string>
  200. @@ -541,7 +541,7 @@
  201. <key>sourceTree</key>
  202. <string><group></string>
  203. </dict>
  204. - <key>1aa18353f9701b01731dfadf228466c5</key>
  205. + <key>9d3fbfbcc1ee3203c85613ccf7e80431</key>
  206. <dict>
  207. <key>explicitFileType</key>
  208. <string>sourcecode.c.h</string>
  209. @@ -550,9 +550,9 @@
  210. <key>isa</key>
  211. <string>PBXFileReference</string>
  212. <key>name</key>
  213. - <string>poppack1.h</string>
  214. + <string>DefaultLogger.h</string>
  215. <key>path</key>
  216. - <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/poppack1.h</string>
  217. + <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/DefaultLogger.h</string>
  218. <key>sourceTree</key>
  219. <string>SOURCE_ROOT</string>
  220. </dict>
  221. diff --git a/dev-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.cbp b/pierre-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.cbp
  222. index 419be1d..6528162 100644
  223. --- a/dev-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.cbp
  224. +++ b/pierre-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.cbp
  225. @@ -127,6 +127,15 @@
  226. <debugger />
  227. <envvars />
  228. </Extensions>
  229. + <Unit filename="../../../addons/ofx3DModelLoader/src/ofx3DBaseLoader.h">
  230. + <Option virtualFolder="addons/ofx3DModelLoader/src" />
  231. + </Unit>
  232. + <Unit filename="../../../addons/ofx3DModelLoader/src/ofx3DModelLoader.h">
  233. + <Option virtualFolder="addons/ofx3DModelLoader/src" />
  234. + </Unit>
  235. + <Unit filename="../../../addons/ofx3DModelLoader/src/ofx3dModelLoader.cpp">
  236. + <Option virtualFolder="addons/ofx3DModelLoader/src" />
  237. + </Unit>
  238. <Unit filename="../../../addons/ofx3DModelLoader/src/3DS/Vector3DS.h">
  239. <Option virtualFolder="addons/ofx3DModelLoader/src/3DS" />
  240. </Unit>
  241. @@ -142,14 +151,5 @@
  242. <Unit filename="../../../addons/ofx3DModelLoader/src/3DS/texture3DS.h">
  243. <Option virtualFolder="addons/ofx3DModelLoader/src/3DS" />
  244. </Unit>
  245. - <Unit filename="../../../addons/ofx3DModelLoader/src/ofx3DBaseLoader.h">
  246. - <Option virtualFolder="addons/ofx3DModelLoader/src" />
  247. - </Unit>
  248. - <Unit filename="../../../addons/ofx3DModelLoader/src/ofx3DModelLoader.h">
  249. - <Option virtualFolder="addons/ofx3DModelLoader/src" />
  250. - </Unit>
  251. - <Unit filename="../../../addons/ofx3DModelLoader/src/ofx3dModelLoader.cpp">
  252. - <Option virtualFolder="addons/ofx3DModelLoader/src" />
  253. - </Unit>
  254. </Project>
  255. </CodeBlocks_project_file>
  256. diff --git a/dev-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.vcxproj b/pierre-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.vcxproj
  257. index 474f238..5ed2d39 100644
  258. --- a/dev-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.vcxproj
  259. +++ b/pierre-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.vcxproj
  260. @@ -100,17 +100,17 @@
  261. <ItemGroup>
  262. <ClCompile Include="src\main.cpp" />
  263. <ClCompile Include="src\testApp.cpp" />
  264. + <ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\ofx3dModelLoader.cpp" />
  265. <ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\3DS\model3DS.cpp" />
  266. <ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\3DS\texture3DS.cpp" />
  267. - <ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\ofx3dModelLoader.cpp" />
  268. </ItemGroup>
  269. <ItemGroup>
  270. <ClInclude Include="src\testApp.h" />
  271. + <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DBaseLoader.h" />
  272. + <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DModelLoader.h" />
  273. <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\3DS\Vector3DS.h" />
  274. <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\3DS\model3DS.h" />
  275. <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\3DS\texture3DS.h" />
  276. - <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DBaseLoader.h" />
  277. - <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DModelLoader.h" />
  278. </ItemGroup>
  279. <ItemGroup>
  280. <ProjectReference Include="..\..\..\libs\openFrameworksCompiled\project\vs2010\openframeworksLib.vcxproj">
  281. diff --git a/dev-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.vcxproj.filters b/pierre-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.vcxproj.filters
  282. index 56b4749..087590f 100644
  283. --- a/dev-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.vcxproj.filters
  284. +++ b/pierre-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.vcxproj.filters
  285. @@ -7,15 +7,15 @@
  286. <ClCompile Include="src\main.cpp">
  287. <Filter>src</Filter>
  288. </ClCompile>
  289. + <ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\ofx3dModelLoader.cpp">
  290. + <Filter>addons\ofx3DModelLoader\src</Filter>
  291. + </ClCompile>
  292. <ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\3DS\model3DS.cpp">
  293. <Filter>addons\ofx3DModelLoader\src\3DS</Filter>
  294. </ClCompile>
  295. <ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\3DS\texture3DS.cpp">
  296. <Filter>addons\ofx3DModelLoader\src\3DS</Filter>
  297. </ClCompile>
  298. - <ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\ofx3dModelLoader.cpp">
  299. - <Filter>addons\ofx3DModelLoader\src</Filter>
  300. - </ClCompile>
  301. </ItemGroup>
  302. <ItemGroup>
  303. <Filter Include="src">
  304. @@ -38,6 +38,12 @@
  305. <ClInclude Include="src\testApp.h">
  306. <Filter>src</Filter>
  307. </ClInclude>
  308. + <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DBaseLoader.h">
  309. + <Filter>addons\ofx3DModelLoader\src</Filter>
  310. + </ClInclude>
  311. + <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DModelLoader.h">
  312. + <Filter>addons\ofx3DModelLoader\src</Filter>
  313. + </ClInclude>
  314. <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\3DS\Vector3DS.h">
  315. <Filter>addons\ofx3DModelLoader\src\3DS</Filter>
  316. </ClInclude>
  317. @@ -47,11 +53,5 @@
  318. <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\3DS\texture3DS.h">
  319. <Filter>addons\ofx3DModelLoader\src\3DS</Filter>
  320. </ClInclude>
  321. - <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DBaseLoader.h">
  322. - <Filter>addons\ofx3DModelLoader\src</Filter>
  323. - </ClInclude>
  324. - <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DModelLoader.h">
  325. - <Filter>addons\ofx3DModelLoader\src</Filter>
  326. - </ClInclude>
  327. </ItemGroup>
  328. </Project>
  329. diff --git a/dev-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.xcodeproj/project.pbxproj b/pierre-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.xcodeproj/project.pbxproj
  330. index c7c325a..88baaa6 100644
  331. --- a/dev-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.xcodeproj/project.pbxproj
  332. +++ b/pierre-openFrameworks/examples/addons/3DModelLoaderExample/3DModelLoaderExample.xcodeproj/project.pbxproj
  333. @@ -9,58 +9,6 @@
  334. <string>42</string>
  335. <key>objects</key>
  336. <dict>
  337. - <key>59db8a662b2617751f4a94123a6e8f80</key>
  338. - <dict>
  339. - <key>fileRef</key>
  340. - <string>f19ab0f312d36358fc181e5b50be8b71</string>
  341. - <key>isa</key>
  342. - <string>PBXBuildFile</string>
  343. - </dict>
  344. - <key>f19ab0f312d36358fc181e5b50be8b71</key>
  345. - <dict>
  346. - <key>explicitFileType</key>
  347. - <string>sourcecode.cpp.cpp</string>
  348. - <key>fileEncoding</key>
  349. - <string>30</string>
  350. - <key>isa</key>
  351. - <string>PBXFileReference</string>
  352. - <key>name</key>
  353. - <string>ofx3dModelLoader.cpp</string>
  354. - <key>path</key>
  355. - <string>../../../addons/ofx3DModelLoader/src/ofx3dModelLoader.cpp</string>
  356. - <key>sourceTree</key>
  357. - <string>SOURCE_ROOT</string>
  358. - </dict>
  359. - <key>6a430934ff822613cc649f404e58f939</key>
  360. - <dict>
  361. - <key>explicitFileType</key>
  362. - <string>sourcecode.c.h</string>
  363. - <key>fileEncoding</key>
  364. - <string>30</string>
  365. - <key>isa</key>
  366. - <string>PBXFileReference</string>
  367. - <key>name</key>
  368. - <string>ofx3DModelLoader.h</string>
  369. - <key>path</key>
  370. - <string>../../../addons/ofx3DModelLoader/src/ofx3DModelLoader.h</string>
  371. - <key>sourceTree</key>
  372. - <string>SOURCE_ROOT</string>
  373. - </dict>
  374. - <key>3ff4c30062c687195b53f1f90832fb81</key>
  375. - <dict>
  376. - <key>explicitFileType</key>
  377. - <string>sourcecode.c.h</string>
  378. - <key>fileEncoding</key>
  379. - <string>30</string>
  380. - <key>isa</key>
  381. - <string>PBXFileReference</string>
  382. - <key>name</key>
  383. - <string>ofx3DBaseLoader.h</string>
  384. - <key>path</key>
  385. - <string>../../../addons/ofx3DModelLoader/src/ofx3DBaseLoader.h</string>
  386. - <key>sourceTree</key>
  387. - <string>SOURCE_ROOT</string>
  388. - </dict>
  389. <key>e99f05e7cac8bdef4b1d0c0b1f134f6c</key>
  390. <dict>
  391. <key>explicitFileType</key>
  392. @@ -152,14 +100,66 @@
  393. <key>sourceTree</key>
  394. <string><group></string>
  395. </dict>
  396. + <key>1f75a6d2a65723a63e2341dbc35861cf</key>
  397. + <dict>
  398. + <key>explicitFileType</key>
  399. + <string>sourcecode.c.h</string>
  400. + <key>fileEncoding</key>
  401. + <string>30</string>
  402. + <key>isa</key>
  403. + <string>PBXFileReference</string>
  404. + <key>name</key>
  405. + <string>Vector3DS.h</string>
  406. + <key>path</key>
  407. + <string>../../../addons/ofx3DModelLoader/src/3DS/Vector3DS.h</string>
  408. + <key>sourceTree</key>
  409. + <string>SOURCE_ROOT</string>
  410. + </dict>
  411. + <key>59db8a662b2617751f4a94123a6e8f80</key>
  412. + <dict>
  413. + <key>fileRef</key>
  414. + <string>f19ab0f312d36358fc181e5b50be8b71</string>
  415. + <key>isa</key>
  416. + <string>PBXBuildFile</string>
  417. + </dict>
  418. + <key>f19ab0f312d36358fc181e5b50be8b71</key>
  419. + <dict>
  420. + <key>explicitFileType</key>
  421. + <string>sourcecode.cpp.cpp</string>
  422. + <key>fileEncoding</key>
  423. + <string>30</string>
  424. + <key>isa</key>
  425. + <string>PBXFileReference</string>
  426. + <key>name</key>
  427. + <string>ofx3dModelLoader.cpp</string>
  428. + <key>path</key>
  429. + <string>../../../addons/ofx3DModelLoader/src/ofx3dModelLoader.cpp</string>
  430. + <key>sourceTree</key>
  431. + <string>SOURCE_ROOT</string>
  432. + </dict>
  433. + <key>6a430934ff822613cc649f404e58f939</key>
  434. + <dict>
  435. + <key>explicitFileType</key>
  436. + <string>sourcecode.c.h</string>
  437. + <key>fileEncoding</key>
  438. + <string>30</string>
  439. + <key>isa</key>
  440. + <string>PBXFileReference</string>
  441. + <key>name</key>
  442. + <string>ofx3DModelLoader.h</string>
  443. + <key>path</key>
  444. + <string>../../../addons/ofx3DModelLoader/src/ofx3DModelLoader.h</string>
  445. + <key>sourceTree</key>
  446. + <string>SOURCE_ROOT</string>
  447. + </dict>
  448. <key>e8d037ddfdfb2ec263740ac3f0c5db8f</key>
  449. <dict>
  450. <key>children</key>
  451. <array>
  452. - <string>ed90198659e5967fb2ea39d72ece86b8</string>
  453. <string>3ff4c30062c687195b53f1f90832fb81</string>
  454. <string>6a430934ff822613cc649f404e58f939</string>
  455. <string>f19ab0f312d36358fc181e5b50be8b71</string>
  456. + <string>ed90198659e5967fb2ea39d72ece86b8</string>
  457. </array>
  458. <key>isa</key>
  459. <string>PBXGroup</string>
  460. @@ -181,7 +181,7 @@
  461. <key>sourceTree</key>
  462. <string><group></string>
  463. </dict>
  464. - <key>1f75a6d2a65723a63e2341dbc35861cf</key>
  465. + <key>3ff4c30062c687195b53f1f90832fb81</key>
  466. <dict>
  467. <key>explicitFileType</key>
  468. <string>sourcecode.c.h</string>
  469. @@ -190,9 +190,9 @@
  470. <key>isa</key>
  471. <string>PBXFileReference</string>
  472. <key>name</key>
  473. - <string>Vector3DS.h</string>
  474. + <string>ofx3DBaseLoader.h</string>
  475. <key>path</key>
  476. - <string>../../../addons/ofx3DModelLoader/src/3DS/Vector3DS.h</string>
  477. + <string>../../../addons/ofx3DModelLoader/src/ofx3DBaseLoader.h</string>
  478. <key>sourceTree</key>
  479. <string>SOURCE_ROOT</string>
  480. </dict>
  481. @@ -717,9 +717,9 @@
  482. <array>
  483. <string>E4B69E200A3A1BDC003C02F2</string>
  484. <string>E4B69E210A3A1BDC003C02F2</string>
  485. + <string>59db8a662b2617751f4a94123a6e8f80</string>
  486. <string>4e322024174afb49a3bea15285a09d6a</string>
  487. <string>c2b7714e50909a7bcae5a51c9821f98a</string>
  488. - <string>59db8a662b2617751f4a94123a6e8f80</string>
  489. </array>
  490. <key>isa</key>
  491. <string>PBXSourcesBuildPhase</string>
  492. diff --git a/dev-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.cbp b/pierre-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.cbp
  493. index f594dc1..1e2bc8e 100644
  494. --- a/dev-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.cbp
  495. +++ b/pierre-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.cbp
  496. @@ -193,6 +193,15 @@
  497. <debugger />
  498. <envvars />
  499. </Extensions>
  500. + <Unit filename="../../../addons/ofx3DModelLoader/src/ofx3DBaseLoader.h">
  501. + <Option virtualFolder="addons/ofx3DModelLoader/src" />
  502. + </Unit>
  503. + <Unit filename="../../../addons/ofx3DModelLoader/src/ofx3DModelLoader.h">
  504. + <Option virtualFolder="addons/ofx3DModelLoader/src" />
  505. + </Unit>
  506. + <Unit filename="../../../addons/ofx3DModelLoader/src/ofx3dModelLoader.cpp">
  507. + <Option virtualFolder="addons/ofx3DModelLoader/src" />
  508. + </Unit>
  509. <Unit filename="../../../addons/ofx3DModelLoader/src/3DS/Vector3DS.h">
  510. <Option virtualFolder="addons/ofx3DModelLoader/src/3DS" />
  511. </Unit>
  512. @@ -208,15 +217,6 @@
  513. <Unit filename="../../../addons/ofx3DModelLoader/src/3DS/texture3DS.h">
  514. <Option virtualFolder="addons/ofx3DModelLoader/src/3DS" />
  515. </Unit>
  516. - <Unit filename="../../../addons/ofx3DModelLoader/src/ofx3DBaseLoader.h">
  517. - <Option virtualFolder="addons/ofx3DModelLoader/src" />
  518. - </Unit>
  519. - <Unit filename="../../../addons/ofx3DModelLoader/src/ofx3DModelLoader.h">
  520. - <Option virtualFolder="addons/ofx3DModelLoader/src" />
  521. - </Unit>
  522. - <Unit filename="../../../addons/ofx3DModelLoader/src/ofx3dModelLoader.cpp">
  523. - <Option virtualFolder="addons/ofx3DModelLoader/src" />
  524. - </Unit>
  525. <Unit filename="../../../addons/ofxNetwork/src/ofxNetwork.h">
  526. <Option virtualFolder="addons/ofxNetwork/src" />
  527. </Unit>
  528. @@ -529,9 +529,6 @@
  529. <Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/objdetect/objdetect.hpp">
  530. <Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2/objdetect" />
  531. </Unit>
  532. - <Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp">
  533. - <Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2" />
  534. - </Unit>
  535. <Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/ts/ts.hpp">
  536. <Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2/ts" />
  537. </Unit>
  538. @@ -547,6 +544,9 @@
  539. <Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/video/video.hpp">
  540. <Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2/video" />
  541. </Unit>
  542. + <Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp">
  543. + <Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2" />
  544. + </Unit>
  545. <Unit filename="../../../addons/ofxOsc/src/ofxOsc.h">
  546. <Option virtualFolder="addons/ofxOsc/src" />
  547. </Unit>
  548. @@ -688,12 +688,6 @@
  549. <Unit filename="../../../addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.h">
  550. <Option virtualFolder="addons/ofxAssimpModelLoader/src" />
  551. </Unit>
  552. - <Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/poppack1.h">
  553. - <Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include/Compiler" />
  554. - </Unit>
  555. - <Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/pushpack1.h">
  556. - <Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include/Compiler" />
  557. - </Unit>
  558. <Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/DefaultLogger.h">
  559. <Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include" />
  560. </Unit>
  561. @@ -781,6 +775,12 @@
  562. <Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/assimp.hpp">
  563. <Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include" />
  564. </Unit>
  565. + <Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/poppack1.h">
  566. + <Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include/Compiler" />
  567. + </Unit>
  568. + <Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/pushpack1.h">
  569. + <Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include/Compiler" />
  570. + </Unit>
  571. <Unit filename="../../../addons/ofxThreadedImageLoader/src/ofxThreadedImageLoader.cpp">
  572. <Option virtualFolder="addons/ofxThreadedImageLoader/src" />
  573. </Unit>
  574. diff --git a/dev-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.vcxproj b/pierre-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.vcxproj
  575. index fa3acd5..082d0c1 100644
  576. --- a/dev-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.vcxproj
  577. +++ b/pierre-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.vcxproj
  578. @@ -100,9 +100,9 @@
  579. <ItemGroup>
  580. <ClCompile Include="src\main.cpp" />
  581. <ClCompile Include="src\testApp.cpp" />
  582. + <ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\ofx3dModelLoader.cpp" />
  583. <ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\3DS\model3DS.cpp" />
  584. <ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\3DS\texture3DS.cpp" />
  585. - <ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\ofx3dModelLoader.cpp" />
  586. <ClCompile Include="..\..\..\addons\ofxNetwork\src\ofxTCPClient.cpp" />
  587. <ClCompile Include="..\..\..\addons\ofxNetwork\src\ofxTCPManager.cpp" />
  588. <ClCompile Include="..\..\..\addons\ofxNetwork\src\ofxTCPServer.cpp" />
  589. @@ -138,11 +138,11 @@
  590. </ItemGroup>
  591. <ItemGroup>
  592. <ClInclude Include="src\testApp.h" />
  593. + <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DBaseLoader.h" />
  594. + <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DModelLoader.h" />
  595. <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\3DS\Vector3DS.h" />
  596. <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\3DS\model3DS.h" />
  597. <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\3DS\texture3DS.h" />
  598. - <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DBaseLoader.h" />
  599. - <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DModelLoader.h" />
  600. <ClInclude Include="..\..\..\addons\ofxNetwork\src\ofxNetwork.h" />
  601. <ClInclude Include="..\..\..\addons\ofxNetwork\src\ofxNetworkUtils.h" />
  602. <ClInclude Include="..\..\..\addons\ofxNetwork\src\ofxTCPClient.h" />
  603. @@ -236,12 +236,12 @@
  604. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\legacy\streams.hpp" />
  605. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ml\ml.hpp" />
  606. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\objdetect\objdetect.hpp" />
  607. - <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp" />
  608. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ts\ts.hpp" />
  609. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ts\ts_gtest.h" />
  610. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\background_segm.hpp" />
  611. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\tracking.hpp" />
  612. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\video.hpp" />
  613. + <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp" />
  614. <ClInclude Include="..\..\..\addons\ofxOsc\src\ofxOsc.h" />
  615. <ClInclude Include="..\..\..\addons\ofxOsc\src\ofxOscArg.h" />
  616. <ClInclude Include="..\..\..\addons\ofxOsc\src\ofxOscBundle.h" />
  617. @@ -269,8 +269,6 @@
  618. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\src\ofx3DBaseLoader.h" />
  619. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\src\ofxAssimpMeshHelper.h" />
  620. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\src\ofxAssimpModelLoader.h" />
  621. - <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\poppack1.h" />
  622. - <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\pushpack1.h" />
  623. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\DefaultLogger.h" />
  624. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\IOStream.h" />
  625. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\IOSystem.h" />
  626. @@ -300,6 +298,8 @@
  627. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\aiVersion.h" />
  628. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp.h" />
  629. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp.hpp" />
  630. + <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\poppack1.h" />
  631. + <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\pushpack1.h" />
  632. <ClInclude Include="..\..\..\addons\ofxThreadedImageLoader\src\ofxThreadedImageLoader.h" />
  633. </ItemGroup>
  634. <ItemGroup>
  635. diff --git a/dev-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.vcxproj.filters b/pierre-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.vcxproj.filters
  636. index 443d521..a8f744e 100644
  637. --- a/dev-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.vcxproj.filters
  638. +++ b/pierre-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.vcxproj.filters
  639. @@ -7,15 +7,15 @@
  640. <ClCompile Include="src\main.cpp">
  641. <Filter>src</Filter>
  642. </ClCompile>
  643. + <ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\ofx3dModelLoader.cpp">
  644. + <Filter>addons\ofx3DModelLoader\src</Filter>
  645. + </ClCompile>
  646. <ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\3DS\model3DS.cpp">
  647. <Filter>addons\ofx3DModelLoader\src\3DS</Filter>
  648. </ClCompile>
  649. <ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\3DS\texture3DS.cpp">
  650. <Filter>addons\ofx3DModelLoader\src\3DS</Filter>
  651. </ClCompile>
  652. - <ClCompile Include="..\..\..\addons\ofx3DModelLoader\src\ofx3dModelLoader.cpp">
  653. - <Filter>addons\ofx3DModelLoader\src</Filter>
  654. - </ClCompile>
  655. <ClCompile Include="..\..\..\addons\ofxNetwork\src\ofxTCPClient.cpp">
  656. <Filter>addons\ofxNetwork\src</Filter>
  657. </ClCompile>
  658. @@ -269,6 +269,12 @@
  659. <ClInclude Include="src\testApp.h">
  660. <Filter>src</Filter>
  661. </ClInclude>
  662. + <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DBaseLoader.h">
  663. + <Filter>addons\ofx3DModelLoader\src</Filter>
  664. + </ClInclude>
  665. + <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DModelLoader.h">
  666. + <Filter>addons\ofx3DModelLoader\src</Filter>
  667. + </ClInclude>
  668. <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\3DS\Vector3DS.h">
  669. <Filter>addons\ofx3DModelLoader\src\3DS</Filter>
  670. </ClInclude>
  671. @@ -278,12 +284,6 @@
  672. <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\3DS\texture3DS.h">
  673. <Filter>addons\ofx3DModelLoader\src\3DS</Filter>
  674. </ClInclude>
  675. - <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DBaseLoader.h">
  676. - <Filter>addons\ofx3DModelLoader\src</Filter>
  677. - </ClInclude>
  678. - <ClInclude Include="..\..\..\addons\ofx3DModelLoader\src\ofx3DModelLoader.h">
  679. - <Filter>addons\ofx3DModelLoader\src</Filter>
  680. - </ClInclude>
  681. <ClInclude Include="..\..\..\addons\ofxNetwork\src\ofxNetwork.h">
  682. <Filter>addons\ofxNetwork\src</Filter>
  683. </ClInclude>
  684. @@ -563,9 +563,6 @@
  685. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\objdetect\objdetect.hpp">
  686. <Filter>addons\ofxOpenCv\libs\opencv\include\opencv2\objdetect</Filter>
  687. </ClInclude>
  688. - <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp">
  689. - <Filter>addons\ofxOpenCv\libs\opencv\include\opencv2</Filter>
  690. - </ClInclude>
  691. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ts\ts.hpp">
  692. <Filter>addons\ofxOpenCv\libs\opencv\include\opencv2\ts</Filter>
  693. </ClInclude>
  694. @@ -581,6 +578,9 @@
  695. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\video.hpp">
  696. <Filter>addons\ofxOpenCv\libs\opencv\include\opencv2\video</Filter>
  697. </ClInclude>
  698. + <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp">
  699. + <Filter>addons\ofxOpenCv\libs\opencv\include\opencv2</Filter>
  700. + </ClInclude>
  701. <ClInclude Include="..\..\..\addons\ofxOsc\src\ofxOsc.h">
  702. <Filter>addons\ofxOsc\src</Filter>
  703. </ClInclude>
  704. @@ -662,12 +662,6 @@
  705. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\src\ofxAssimpModelLoader.h">
  706. <Filter>addons\ofxAssimpModelLoader\src</Filter>
  707. </ClInclude>
  708. - <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\poppack1.h">
  709. - <Filter>addons\ofxAssimpModelLoader\libs\assimp\include\Compiler</Filter>
  710. - </ClInclude>
  711. - <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\pushpack1.h">
  712. - <Filter>addons\ofxAssimpModelLoader\libs\assimp\include\Compiler</Filter>
  713. - </ClInclude>
  714. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\DefaultLogger.h">
  715. <Filter>addons\ofxAssimpModelLoader\libs\assimp\include</Filter>
  716. </ClInclude>
  717. @@ -755,6 +749,12 @@
  718. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp.hpp">
  719. <Filter>addons\ofxAssimpModelLoader\libs\assimp\include</Filter>
  720. </ClInclude>
  721. + <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\poppack1.h">
  722. + <Filter>addons\ofxAssimpModelLoader\libs\assimp\include\Compiler</Filter>
  723. + </ClInclude>
  724. + <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\pushpack1.h">
  725. + <Filter>addons\ofxAssimpModelLoader\libs\assimp\include\Compiler</Filter>
  726. + </ClInclude>
  727. <ClInclude Include="..\..\..\addons\ofxThreadedImageLoader\src\ofxThreadedImageLoader.h">
  728. <Filter>addons\ofxThreadedImageLoader\src</Filter>
  729. </ClInclude>
  730. diff --git a/dev-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.xcodeproj/project.pbxproj b/pierre-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.xcodeproj/project.pbxproj
  731. index d712a93..06164d9 100644
  732. --- a/dev-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.xcodeproj/project.pbxproj
  733. +++ b/pierre-openFrameworks/examples/addons/allAddonsExample/allAddonsExample.xcodeproj/project.pbxproj
  734. @@ -73,6 +73,50 @@
  735. <key>sourceTree</key>
  736. <string>SOURCE_ROOT</string>
  737. </dict>
  738. + <key>65bac5a3b9c9387859a2b0e01dd0c5e7</key>
  739. + <dict>
  740. + <key>explicitFileType</key>
  741. + <string>sourcecode.c.h</string>
  742. + <key>fileEncoding</key>
  743. + <string>30</string>
  744. + <key>isa</key>
  745. + <string>PBXFileReference</string>
  746. + <key>name</key>
  747. + <string>pushpack1.h</string>
  748. + <key>path</key>
  749. + <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/pushpack1.h</string>
  750. + <key>sourceTree</key>
  751. + <string>SOURCE_ROOT</string>
  752. + </dict>
  753. + <key>93a9152986a73da32dbd796433b96c9f</key>
  754. + <dict>
  755. + <key>children</key>
  756. + <array>
  757. + <string>1aa18353f9701b01731dfadf228466c5</string>
  758. + <string>65bac5a3b9c9387859a2b0e01dd0c5e7</string>
  759. + </array>
  760. + <key>isa</key>
  761. + <string>PBXGroup</string>
  762. + <key>name</key>
  763. + <string>Compiler</string>
  764. + <key>sourceTree</key>
  765. + <string><group></string>
  766. + </dict>
  767. + <key>1aa18353f9701b01731dfadf228466c5</key>
  768. + <dict>
  769. + <key>explicitFileType</key>
  770. + <string>sourcecode.c.h</string>
  771. + <key>fileEncoding</key>
  772. + <string>30</string>
  773. + <key>isa</key>
  774. + <string>PBXFileReference</string>
  775. + <key>name</key>
  776. + <string>poppack1.h</string>
  777. + <key>path</key>
  778. + <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/poppack1.h</string>
  779. + <key>sourceTree</key>
  780. + <string>SOURCE_ROOT</string>
  781. + </dict>
  782. <key>53ea0e889f34624ce3313e04cd77bdc4</key>
  783. <dict>
  784. <key>explicitFileType</key>
  785. @@ -493,55 +537,10 @@
  786. <key>sourceTree</key>
  787. <string>SOURCE_ROOT</string>
  788. </dict>
  789. - <key>9d3fbfbcc1ee3203c85613ccf7e80431</key>
  790. - <dict>
  791. - <key>explicitFileType</key>
  792. - <string>sourcecode.c.h</string>
  793. - <key>fileEncoding</key>
  794. - <string>30</string>
  795. - <key>isa</key>
  796. - <string>PBXFileReference</string>
  797. - <key>name</key>
  798. - <string>DefaultLogger.h</string>
  799. - <key>path</key>
  800. - <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/DefaultLogger.h</string>
  801. - <key>sourceTree</key>
  802. - <string>SOURCE_ROOT</string>
  803. - </dict>
  804. - <key>65bac5a3b9c9387859a2b0e01dd0c5e7</key>
  805. - <dict>
  806. - <key>explicitFileType</key>
  807. - <string>sourcecode.c.h</string>
  808. - <key>fileEncoding</key>
  809. - <string>30</string>
  810. - <key>isa</key>
  811. - <string>PBXFileReference</string>
  812. - <key>name</key>
  813. - <string>pushpack1.h</string>
  814. - <key>path</key>
  815. - <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/pushpack1.h</string>
  816. - <key>sourceTree</key>
  817. - <string>SOURCE_ROOT</string>
  818. - </dict>
  819. - <key>93a9152986a73da32dbd796433b96c9f</key>
  820. - <dict>
  821. - <key>children</key>
  822. - <array>
  823. - <string>1aa18353f9701b01731dfadf228466c5</string>
  824. - <string>65bac5a3b9c9387859a2b0e01dd0c5e7</string>
  825. - </array>
  826. - <key>isa</key>
  827. - <string>PBXGroup</string>
  828. - <key>name</key>
  829. - <string>Compiler</string>
  830. - <key>sourceTree</key>
  831. - <string><group></string>
  832. - </dict>
  833. <key>eefdd7ae0009ae6f77ef2a937399e1cd</key>
  834. <dict>
  835. <key>children</key>
  836. <array>
  837. - <string>93a9152986a73da32dbd796433b96c9f</string>
  838. <string>9d3fbfbcc1ee3203c85613ccf7e80431</string>
  839. <string>cc940533e79102644e0eba5599fb0fb6</string>
  840. <string>8ebbbb59caed1e54f37c7038f27990ee</string>
  841. @@ -571,6 +570,7 @@
  842. <string>c72403edcb7dcaec60d1dcdd13017e0c</string>
  843. <string>564045ef0424b7037832d90382f88900</string>
  844. <string>53ea0e889f34624ce3313e04cd77bdc4</string>
  845. + <string>93a9152986a73da32dbd796433b96c9f</string>
  846. </array>
  847. <key>isa</key>
  848. <string>PBXGroup</string>
  849. @@ -605,7 +605,7 @@
  850. <key>sourceTree</key>
  851. <string><group></string>
  852. </dict>
  853. - <key>1aa18353f9701b01731dfadf228466c5</key>
  854. + <key>9d3fbfbcc1ee3203c85613ccf7e80431</key>
  855. <dict>
  856. <key>explicitFileType</key>
  857. <string>sourcecode.c.h</string>
  858. @@ -614,9 +614,9 @@
  859. <key>isa</key>
  860. <string>PBXFileReference</string>
  861. <key>name</key>
  862. - <string>poppack1.h</string>
  863. + <string>DefaultLogger.h</string>
  864. <key>path</key>
  865. - <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/poppack1.h</string>
  866. + <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/DefaultLogger.h</string>
  867. <key>sourceTree</key>
  868. <string>SOURCE_ROOT</string>
  869. </dict>
  870. @@ -1730,6 +1730,21 @@
  871. <key>sourceTree</key>
  872. <string>SOURCE_ROOT</string>
  873. </dict>
  874. + <key>9b7d592e7ab311451a27c46e68e8680d</key>
  875. + <dict>
  876. + <key>explicitFileType</key>
  877. + <string>sourcecode.c.h</string>
  878. + <key>fileEncoding</key>
  879. + <string>30</string>
  880. + <key>isa</key>
  881. + <string>PBXFileReference</string>
  882. + <key>name</key>
  883. + <string>opencv.hpp</string>
  884. + <key>path</key>
  885. + <string>../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp</string>
  886. + <key>sourceTree</key>
  887. + <string>SOURCE_ROOT</string>
  888. + </dict>
  889. <key>97fbd89e6180673035ad1083e6afc93e</key>
  890. <dict>
  891. <key>explicitFileType</key>
  892. @@ -1834,21 +1849,6 @@
  893. <key>sourceTree</key>
  894. <string>SOURCE_ROOT</string>
  895. </dict>
  896. - <key>9b7d592e7ab311451a27c46e68e8680d</key>
  897. - <dict>
  898. - <key>explicitFileType</key>
  899. - <string>sourcecode.c.h</string>
  900. - <key>fileEncoding</key>
  901. - <string>30</string>
  902. - <key>isa</key>
  903. - <string>PBXFileReference</string>
  904. - <key>name</key>
  905. - <string>opencv.hpp</string>
  906. - <key>path</key>
  907. - <string>../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp</string>
  908. - <key>sourceTree</key>
  909. - <string>SOURCE_ROOT</string>
  910. - </dict>
  911. <key>d0cafe48ee488eeed9149670a8175de8</key>
  912. <dict>
  913. <key>children</key>
  914. @@ -3021,9 +3021,9 @@
  915. <string>961a625bd21068033782887c0c93e535</string>
  916. <string>0f288fd421d474f4ae2684d36104f270</string>
  917. <string>d0cafe48ee488eeed9149670a8175de8</string>
  918. - <string>9b7d592e7ab311451a27c46e68e8680d</string>
  919. <string>0478e60892bf4c0731ae0763e72eb53d</string>
  920. <string>c58cc92a5283b95aa31d50fb5e0ffc6b</string>
  921. + <string>9b7d592e7ab311451a27c46e68e8680d</string>
  922. </array>
  923. <key>isa</key>
  924. <string>PBXGroup</string>
  925. @@ -3851,58 +3851,6 @@
  926. <key>sourceTree</key>
  927. <string>SOURCE_ROOT</string>
  928. </dict>
  929. - <key>59db8a662b2617751f4a94123a6e8f80</key>
  930. - <dict>
  931. - <key>fileRef</key>
  932. - <string>f19ab0f312d36358fc181e5b50be8b71</string>
  933. - <key>isa</key>
  934. - <string>PBXBuildFile</string>
  935. - </dict>
  936. - <key>f19ab0f312d36358fc181e5b50be8b71</key>
  937. - <dict>
  938. - <key>explicitFileType</key>
  939. - <string>sourcecode.cpp.cpp</string>
  940. - <key>fileEncoding</key>
  941. - <string>30</string>
  942. - <key>isa</key>
  943. - <string>PBXFileReference</string>
  944. - <key>name</key>
  945. - <string>ofx3dModelLoader.cpp</string>
  946. - <key>path</key>
  947. - <string>../../../addons/ofx3DModelLoader/src/ofx3dModelLoader.cpp</string>
  948. - <key>sourceTree</key>
  949. - <string>SOURCE_ROOT</string>
  950. - </dict>
  951. - <key>6a430934ff822613cc649f404e58f939</key>
  952. - <dict>
  953. - <key>explicitFileType</key>
  954. - <string>sourcecode.c.h</string>
  955. - <key>fileEncoding</key>
  956. - <string>30</string>
  957. - <key>isa</key>
  958. - <string>PBXFileReference</string>
  959. - <key>name</key>
  960. - <string>ofx3DModelLoader.h</string>
  961. - <key>path</key>
  962. - <string>../../../addons/ofx3DModelLoader/src/ofx3DModelLoader.h</string>
  963. - <key>sourceTree</key>
  964. - <string>SOURCE_ROOT</string>
  965. - </dict>
  966. - <key>3ff4c30062c687195b53f1f90832fb81</key>
  967. - <dict>
  968. - <key>explicitFileType</key>
  969. - <string>sourcecode.c.h</string>
  970. - <key>fileEncoding</key>
  971. - <string>30</string>
  972. - <key>isa</key>
  973. - <string>PBXFileReference</string>
  974. - <key>name</key>
  975. - <string>ofx3DBaseLoader.h</string>
  976. - <key>path</key>
  977. - <string>../../../addons/ofx3DModelLoader/src/ofx3DBaseLoader.h</string>
  978. - <key>sourceTree</key>
  979. - <string>SOURCE_ROOT</string>
  980. - </dict>
  981. <key>e99f05e7cac8bdef4b1d0c0b1f134f6c</key>
  982. <dict>
  983. <key>explicitFileType</key>
  984. @@ -3994,14 +3942,66 @@
  985. <key>sourceTree</key>
  986. <string><group></string>
  987. </dict>
  988. + <key>1f75a6d2a65723a63e2341dbc35861cf</key>
  989. + <dict>
  990. + <key>explicitFileType</key>
  991. + <string>sourcecode.c.h</string>
  992. + <key>fileEncoding</key>
  993. + <string>30</string>
  994. + <key>isa</key>
  995. + <string>PBXFileReference</string>
  996. + <key>name</key>
  997. + <string>Vector3DS.h</string>
  998. + <key>path</key>
  999. + <string>../../../addons/ofx3DModelLoader/src/3DS/Vector3DS.h</string>
  1000. + <key>sourceTree</key>
  1001. + <string>SOURCE_ROOT</string>
  1002. + </dict>
  1003. + <key>59db8a662b2617751f4a94123a6e8f80</key>
  1004. + <dict>
  1005. + <key>fileRef</key>
  1006. + <string>f19ab0f312d36358fc181e5b50be8b71</string>
  1007. + <key>isa</key>
  1008. + <string>PBXBuildFile</string>
  1009. + </dict>
  1010. + <key>f19ab0f312d36358fc181e5b50be8b71</key>
  1011. + <dict>
  1012. + <key>explicitFileType</key>
  1013. + <string>sourcecode.cpp.cpp</string>
  1014. + <key>fileEncoding</key>
  1015. + <string>30</string>
  1016. + <key>isa</key>
  1017. + <string>PBXFileReference</string>
  1018. + <key>name</key>
  1019. + <string>ofx3dModelLoader.cpp</string>
  1020. + <key>path</key>
  1021. + <string>../../../addons/ofx3DModelLoader/src/ofx3dModelLoader.cpp</string>
  1022. + <key>sourceTree</key>
  1023. + <string>SOURCE_ROOT</string>
  1024. + </dict>
  1025. + <key>6a430934ff822613cc649f404e58f939</key>
  1026. + <dict>
  1027. + <key>explicitFileType</key>
  1028. + <string>sourcecode.c.h</string>
  1029. + <key>fileEncoding</key>
  1030. + <string>30</string>
  1031. + <key>isa</key>
  1032. + <string>PBXFileReference</string>
  1033. + <key>name</key>
  1034. + <string>ofx3DModelLoader.h</string>
  1035. + <key>path</key>
  1036. + <string>../../../addons/ofx3DModelLoader/src/ofx3DModelLoader.h</string>
  1037. + <key>sourceTree</key>
  1038. + <string>SOURCE_ROOT</string>
  1039. + </dict>
  1040. <key>e8d037ddfdfb2ec263740ac3f0c5db8f</key>
  1041. <dict>
  1042. <key>children</key>
  1043. <array>
  1044. - <string>ed90198659e5967fb2ea39d72ece86b8</string>
  1045. <string>3ff4c30062c687195b53f1f90832fb81</string>
  1046. <string>6a430934ff822613cc649f404e58f939</string>
  1047. <string>f19ab0f312d36358fc181e5b50be8b71</string>
  1048. + <string>ed90198659e5967fb2ea39d72ece86b8</string>
  1049. </array>
  1050. <key>isa</key>
  1051. <string>PBXGroup</string>
  1052. @@ -4023,7 +4023,7 @@
  1053. <key>sourceTree</key>
  1054. <string><group></string>
  1055. </dict>
  1056. - <key>1f75a6d2a65723a63e2341dbc35861cf</key>
  1057. + <key>3ff4c30062c687195b53f1f90832fb81</key>
  1058. <dict>
  1059. <key>explicitFileType</key>
  1060. <string>sourcecode.c.h</string>
  1061. @@ -4032,9 +4032,9 @@
  1062. <key>isa</key>
  1063. <string>PBXFileReference</string>
  1064. <key>name</key>
  1065. - <string>Vector3DS.h</string>
  1066. + <string>ofx3DBaseLoader.h</string>
  1067. <key>path</key>
  1068. - <string>../../../addons/ofx3DModelLoader/src/3DS/Vector3DS.h</string>
  1069. + <string>../../../addons/ofx3DModelLoader/src/ofx3DBaseLoader.h</string>
  1070. <key>sourceTree</key>
  1071. <string>SOURCE_ROOT</string>
  1072. </dict>
  1073. @@ -4678,9 +4678,9 @@
  1074. <array>
  1075. <string>E4B69E200A3A1BDC003C02F2</string>
  1076. <string>E4B69E210A3A1BDC003C02F2</string>
  1077. + <string>59db8a662b2617751f4a94123a6e8f80</string>
  1078. <string>4e322024174afb49a3bea15285a09d6a</string>
  1079. <string>c2b7714e50909a7bcae5a51c9821f98a</string>
  1080. - <string>59db8a662b2617751f4a94123a6e8f80</string>
  1081. <string>960d20b191346612d5c05a6af838c285</string>
  1082. <string>125506cd3e5f428aafe5cc657e873ba0</string>
  1083. <string>66ca411c5a9664e27326bf369079f00e</string>
  1084. diff --git a/dev-openFrameworks/examples/addons/assimpExample/assimpExample.cbp b/pierre-openFrameworks/examples/addons/assimpExample/assimpExample.cbp
  1085. index 406bbaf..7ed0555 100644
  1086. --- a/dev-openFrameworks/examples/addons/assimpExample/assimpExample.cbp
  1087. +++ b/pierre-openFrameworks/examples/addons/assimpExample/assimpExample.cbp
  1088. @@ -144,12 +144,6 @@
  1089. <Unit filename="../../../addons/ofxAssimpModelLoader/src/ofxAssimpModelLoader.h">
  1090. <Option virtualFolder="addons/ofxAssimpModelLoader/src" />
  1091. </Unit>
  1092. - <Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/poppack1.h">
  1093. - <Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include/Compiler" />
  1094. - </Unit>
  1095. - <Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/pushpack1.h">
  1096. - <Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include/Compiler" />
  1097. - </Unit>
  1098. <Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/DefaultLogger.h">
  1099. <Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include" />
  1100. </Unit>
  1101. @@ -237,5 +231,11 @@
  1102. <Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/assimp.hpp">
  1103. <Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include" />
  1104. </Unit>
  1105. + <Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/poppack1.h">
  1106. + <Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include/Compiler" />
  1107. + </Unit>
  1108. + <Unit filename="../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/pushpack1.h">
  1109. + <Option virtualFolder="addons/ofxAssimpModelLoader/libs/assimp/include/Compiler" />
  1110. + </Unit>
  1111. </Project>
  1112. </CodeBlocks_project_file>
  1113. diff --git a/dev-openFrameworks/examples/addons/assimpExample/assimpExample.vcxproj b/pierre-openFrameworks/examples/addons/assimpExample/assimpExample.vcxproj
  1114. index 8ec4ad9..40530e1 100644
  1115. --- a/dev-openFrameworks/examples/addons/assimpExample/assimpExample.vcxproj
  1116. +++ b/pierre-openFrameworks/examples/addons/assimpExample/assimpExample.vcxproj
  1117. @@ -107,8 +107,6 @@
  1118. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\src\ofx3DBaseLoader.h" />
  1119. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\src\ofxAssimpMeshHelper.h" />
  1120. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\src\ofxAssimpModelLoader.h" />
  1121. - <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\poppack1.h" />
  1122. - <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\pushpack1.h" />
  1123. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\DefaultLogger.h" />
  1124. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\IOStream.h" />
  1125. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\IOSystem.h" />
  1126. @@ -138,6 +136,8 @@
  1127. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\aiVersion.h" />
  1128. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp.h" />
  1129. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp.hpp" />
  1130. + <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\poppack1.h" />
  1131. + <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\pushpack1.h" />
  1132. </ItemGroup>
  1133. <ItemGroup>
  1134. <ProjectReference Include="..\..\..\libs\openFrameworksCompiled\project\vs2010\openframeworksLib.vcxproj">
  1135. diff --git a/dev-openFrameworks/examples/addons/assimpExample/assimpExample.vcxproj.filters b/pierre-openFrameworks/examples/addons/assimpExample/assimpExample.vcxproj.filters
  1136. index de96ba2..b0a4d38 100644
  1137. --- a/dev-openFrameworks/examples/addons/assimpExample/assimpExample.vcxproj.filters
  1138. +++ b/pierre-openFrameworks/examples/addons/assimpExample/assimpExample.vcxproj.filters
  1139. @@ -50,12 +50,6 @@
  1140. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\src\ofxAssimpModelLoader.h">
  1141. <Filter>addons\ofxAssimpModelLoader\src</Filter>
  1142. </ClInclude>
  1143. - <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\poppack1.h">
  1144. - <Filter>addons\ofxAssimpModelLoader\libs\assimp\include\Compiler</Filter>
  1145. - </ClInclude>
  1146. - <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\pushpack1.h">
  1147. - <Filter>addons\ofxAssimpModelLoader\libs\assimp\include\Compiler</Filter>
  1148. - </ClInclude>
  1149. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\DefaultLogger.h">
  1150. <Filter>addons\ofxAssimpModelLoader\libs\assimp\include</Filter>
  1151. </ClInclude>
  1152. @@ -143,5 +137,11 @@
  1153. <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\assimp.hpp">
  1154. <Filter>addons\ofxAssimpModelLoader\libs\assimp\include</Filter>
  1155. </ClInclude>
  1156. + <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\poppack1.h">
  1157. + <Filter>addons\ofxAssimpModelLoader\libs\assimp\include\Compiler</Filter>
  1158. + </ClInclude>
  1159. + <ClInclude Include="..\..\..\addons\ofxAssimpModelLoader\libs\assimp\include\Compiler\pushpack1.h">
  1160. + <Filter>addons\ofxAssimpModelLoader\libs\assimp\include\Compiler</Filter>
  1161. + </ClInclude>
  1162. </ItemGroup>
  1163. </Project>
  1164. diff --git a/dev-openFrameworks/examples/addons/assimpExample/assimpExample.xcodeproj/project.pbxproj b/pierre-openFrameworks/examples/addons/assimpExample/assimpExample.xcodeproj/project.pbxproj
  1165. index 1811420..fbf8d5c 100644
  1166. --- a/dev-openFrameworks/examples/addons/assimpExample/assimpExample.xcodeproj/project.pbxproj
  1167. +++ b/pierre-openFrameworks/examples/addons/assimpExample/assimpExample.xcodeproj/project.pbxproj
  1168. @@ -9,6 +9,50 @@
  1169. <string>42</string>
  1170. <key>objects</key>
  1171. <dict>
  1172. + <key>65bac5a3b9c9387859a2b0e01dd0c5e7</key>
  1173. + <dict>
  1174. + <key>explicitFileType</key>
  1175. + <string>sourcecode.c.h</string>
  1176. + <key>fileEncoding</key>
  1177. + <string>30</string>
  1178. + <key>isa</key>
  1179. + <string>PBXFileReference</string>
  1180. + <key>name</key>
  1181. + <string>pushpack1.h</string>
  1182. + <key>path</key>
  1183. + <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/pushpack1.h</string>
  1184. + <key>sourceTree</key>
  1185. + <string>SOURCE_ROOT</string>
  1186. + </dict>
  1187. + <key>93a9152986a73da32dbd796433b96c9f</key>
  1188. + <dict>
  1189. + <key>children</key>
  1190. + <array>
  1191. + <string>1aa18353f9701b01731dfadf228466c5</string>
  1192. + <string>65bac5a3b9c9387859a2b0e01dd0c5e7</string>
  1193. + </array>
  1194. + <key>isa</key>
  1195. + <string>PBXGroup</string>
  1196. + <key>name</key>
  1197. + <string>Compiler</string>
  1198. + <key>sourceTree</key>
  1199. + <string><group></string>
  1200. + </dict>
  1201. + <key>1aa18353f9701b01731dfadf228466c5</key>
  1202. + <dict>
  1203. + <key>explicitFileType</key>
  1204. + <string>sourcecode.c.h</string>
  1205. + <key>fileEncoding</key>
  1206. + <string>30</string>
  1207. + <key>isa</key>
  1208. + <string>PBXFileReference</string>
  1209. + <key>name</key>
  1210. + <string>poppack1.h</string>
  1211. + <key>path</key>
  1212. + <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/poppack1.h</string>
  1213. + <key>sourceTree</key>
  1214. + <string>SOURCE_ROOT</string>
  1215. + </dict>
  1216. <key>53ea0e889f34624ce3313e04cd77bdc4</key>
  1217. <dict>
  1218. <key>explicitFileType</key>
  1219. @@ -429,55 +473,10 @@
  1220. <key>sourceTree</key>
  1221. <string>SOURCE_ROOT</string>
  1222. </dict>
  1223. - <key>9d3fbfbcc1ee3203c85613ccf7e80431</key>
  1224. - <dict>
  1225. - <key>explicitFileType</key>
  1226. - <string>sourcecode.c.h</string>
  1227. - <key>fileEncoding</key>
  1228. - <string>30</string>
  1229. - <key>isa</key>
  1230. - <string>PBXFileReference</string>
  1231. - <key>name</key>
  1232. - <string>DefaultLogger.h</string>
  1233. - <key>path</key>
  1234. - <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/DefaultLogger.h</string>
  1235. - <key>sourceTree</key>
  1236. - <string>SOURCE_ROOT</string>
  1237. - </dict>
  1238. - <key>65bac5a3b9c9387859a2b0e01dd0c5e7</key>
  1239. - <dict>
  1240. - <key>explicitFileType</key>
  1241. - <string>sourcecode.c.h</string>
  1242. - <key>fileEncoding</key>
  1243. - <string>30</string>
  1244. - <key>isa</key>
  1245. - <string>PBXFileReference</string>
  1246. - <key>name</key>
  1247. - <string>pushpack1.h</string>
  1248. - <key>path</key>
  1249. - <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/pushpack1.h</string>
  1250. - <key>sourceTree</key>
  1251. - <string>SOURCE_ROOT</string>
  1252. - </dict>
  1253. - <key>93a9152986a73da32dbd796433b96c9f</key>
  1254. - <dict>
  1255. - <key>children</key>
  1256. - <array>
  1257. - <string>1aa18353f9701b01731dfadf228466c5</string>
  1258. - <string>65bac5a3b9c9387859a2b0e01dd0c5e7</string>
  1259. - </array>
  1260. - <key>isa</key>
  1261. - <string>PBXGroup</string>
  1262. - <key>name</key>
  1263. - <string>Compiler</string>
  1264. - <key>sourceTree</key>
  1265. - <string><group></string>
  1266. - </dict>
  1267. <key>eefdd7ae0009ae6f77ef2a937399e1cd</key>
  1268. <dict>
  1269. <key>children</key>
  1270. <array>
  1271. - <string>93a9152986a73da32dbd796433b96c9f</string>
  1272. <string>9d3fbfbcc1ee3203c85613ccf7e80431</string>
  1273. <string>cc940533e79102644e0eba5599fb0fb6</string>
  1274. <string>8ebbbb59caed1e54f37c7038f27990ee</string>
  1275. @@ -507,6 +506,7 @@
  1276. <string>c72403edcb7dcaec60d1dcdd13017e0c</string>
  1277. <string>564045ef0424b7037832d90382f88900</string>
  1278. <string>53ea0e889f34624ce3313e04cd77bdc4</string>
  1279. + <string>93a9152986a73da32dbd796433b96c9f</string>
  1280. </array>
  1281. <key>isa</key>
  1282. <string>PBXGroup</string>
  1283. @@ -541,7 +541,7 @@
  1284. <key>sourceTree</key>
  1285. <string><group></string>
  1286. </dict>
  1287. - <key>1aa18353f9701b01731dfadf228466c5</key>
  1288. + <key>9d3fbfbcc1ee3203c85613ccf7e80431</key>
  1289. <dict>
  1290. <key>explicitFileType</key>
  1291. <string>sourcecode.c.h</string>
  1292. @@ -550,9 +550,9 @@
  1293. <key>isa</key>
  1294. <string>PBXFileReference</string>
  1295. <key>name</key>
  1296. - <string>poppack1.h</string>
  1297. + <string>DefaultLogger.h</string>
  1298. <key>path</key>
  1299. - <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/poppack1.h</string>
  1300. + <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/DefaultLogger.h</string>
  1301. <key>sourceTree</key>
  1302. <string>SOURCE_ROOT</string>
  1303. </dict>
  1304. diff --git a/dev-openFrameworks/examples/addons/opencvExample/opencvExample.cbp b/pierre-openFrameworks/examples/addons/opencvExample/opencvExample.cbp
  1305. index 442447a..a4261e0 100644
  1306. --- a/dev-openFrameworks/examples/addons/opencvExample/opencvExample.cbp
  1307. +++ b/pierre-openFrameworks/examples/addons/opencvExample/opencvExample.cbp
  1308. @@ -442,9 +442,6 @@
  1309. <Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/objdetect/objdetect.hpp">
  1310. <Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2/objdetect" />
  1311. </Unit>
  1312. - <Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp">
  1313. - <Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2" />
  1314. - </Unit>
  1315. <Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/ts/ts.hpp">
  1316. <Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2/ts" />
  1317. </Unit>
  1318. @@ -460,5 +457,8 @@
  1319. <Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/video/video.hpp">
  1320. <Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2/video" />
  1321. </Unit>
  1322. + <Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp">
  1323. + <Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2" />
  1324. + </Unit>
  1325. </Project>
  1326. </CodeBlocks_project_file>
  1327. diff --git a/dev-openFrameworks/examples/addons/opencvExample/opencvExample.vcxproj b/pierre-openFrameworks/examples/addons/opencvExample/opencvExample.vcxproj
  1328. index f8c7a1c..db23512 100644
  1329. --- a/dev-openFrameworks/examples/addons/opencvExample/opencvExample.vcxproj
  1330. +++ b/pierre-openFrameworks/examples/addons/opencvExample/opencvExample.vcxproj
  1331. @@ -197,12 +197,12 @@
  1332. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\legacy\streams.hpp" />
  1333. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ml\ml.hpp" />
  1334. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\objdetect\objdetect.hpp" />
  1335. - <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp" />
  1336. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ts\ts.hpp" />
  1337. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ts\ts_gtest.h" />
  1338. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\background_segm.hpp" />
  1339. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\tracking.hpp" />
  1340. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\video.hpp" />
  1341. + <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp" />
  1342. </ItemGroup>
  1343. <ItemGroup>
  1344. <ProjectReference Include="..\..\..\libs\openFrameworksCompiled\project\vs2010\openframeworksLib.vcxproj">
  1345. diff --git a/dev-openFrameworks/examples/addons/opencvExample/opencvExample.vcxproj.filters b/pierre-openFrameworks/examples/addons/opencvExample/opencvExample.vcxproj.filters
  1346. index 6d8abd3..03762e8 100644
  1347. --- a/dev-openFrameworks/examples/addons/opencvExample/opencvExample.vcxproj.filters
  1348. +++ b/pierre-openFrameworks/examples/addons/opencvExample/opencvExample.vcxproj.filters
  1349. @@ -362,9 +362,6 @@
  1350. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\objdetect\objdetect.hpp">
  1351. <Filter>addons\ofxOpenCv\libs\opencv\include\opencv2\objdetect</Filter>
  1352. </ClInclude>
  1353. - <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp">
  1354. - <Filter>addons\ofxOpenCv\libs\opencv\include\opencv2</Filter>
  1355. - </ClInclude>
  1356. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ts\ts.hpp">
  1357. <Filter>addons\ofxOpenCv\libs\opencv\include\opencv2\ts</Filter>
  1358. </ClInclude>
  1359. @@ -380,5 +377,8 @@
  1360. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\video.hpp">
  1361. <Filter>addons\ofxOpenCv\libs\opencv\include\opencv2\video</Filter>
  1362. </ClInclude>
  1363. + <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp">
  1364. + <Filter>addons\ofxOpenCv\libs\opencv\include\opencv2</Filter>
  1365. + </ClInclude>
  1366. </ItemGroup>
  1367. </Project>
  1368. diff --git a/dev-openFrameworks/examples/addons/opencvExample/opencvExample.xcodeproj/project.pbxproj b/pierre-openFrameworks/examples/addons/opencvExample/opencvExample.xcodeproj/project.pbxproj
  1369. index 693b5d8..10e79cd 100644
  1370. --- a/dev-openFrameworks/examples/addons/opencvExample/opencvExample.xcodeproj/project.pbxproj
  1371. +++ b/pierre-openFrameworks/examples/addons/opencvExample/opencvExample.xcodeproj/project.pbxproj
  1372. @@ -9,6 +9,21 @@
  1373. <string>42</string>
  1374. <key>objects</key>
  1375. <dict>
  1376. + <key>9b7d592e7ab311451a27c46e68e8680d</key>
  1377. + <dict>
  1378. + <key>explicitFileType</key>
  1379. + <string>sourcecode.c.h</string>
  1380. + <key>fileEncoding</key>
  1381. + <string>30</string>
  1382. + <key>isa</key>
  1383. + <string>PBXFileReference</string>
  1384. + <key>name</key>
  1385. + <string>opencv.hpp</string>
  1386. + <key>path</key>
  1387. + <string>../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp</string>
  1388. + <key>sourceTree</key>
  1389. + <string>SOURCE_ROOT</string>
  1390. + </dict>
  1391. <key>97fbd89e6180673035ad1083e6afc93e</key>
  1392. <dict>
  1393. <key>explicitFileType</key>
  1394. @@ -113,21 +128,6 @@
  1395. <key>sourceTree</key>
  1396. <string>SOURCE_ROOT</string>
  1397. </dict>
  1398. - <key>9b7d592e7ab311451a27c46e68e8680d</key>
  1399. - <dict>
  1400. - <key>explicitFileType</key>
  1401. - <string>sourcecode.c.h</string>
  1402. - <key>fileEncoding</key>
  1403. - <string>30</string>
  1404. - <key>isa</key>
  1405. - <string>PBXFileReference</string>
  1406. - <key>name</key>
  1407. - <string>opencv.hpp</string>
  1408. - <key>path</key>
  1409. - <string>../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp</string>
  1410. - <key>sourceTree</key>
  1411. - <string>SOURCE_ROOT</string>
  1412. - </dict>
  1413. <key>d0cafe48ee488eeed9149670a8175de8</key>
  1414. <dict>
  1415. <key>children</key>
  1416. @@ -1300,9 +1300,9 @@
  1417. <string>961a625bd21068033782887c0c93e535</string>
  1418. <string>0f288fd421d474f4ae2684d36104f270</string>
  1419. <string>d0cafe48ee488eeed9149670a8175de8</string>
  1420. - <string>9b7d592e7ab311451a27c46e68e8680d</string>
  1421. <string>0478e60892bf4c0731ae0763e72eb53d</string>
  1422. <string>c58cc92a5283b95aa31d50fb5e0ffc6b</string>
  1423. + <string>9b7d592e7ab311451a27c46e68e8680d</string>
  1424. </array>
  1425. <key>isa</key>
  1426. <string>PBXGroup</string>
  1427. diff --git a/dev-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.cbp b/pierre-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.cbp
  1428. index 8b90921..7eb6678 100644
  1429. --- a/dev-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.cbp
  1430. +++ b/pierre-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.cbp
  1431. @@ -442,9 +442,6 @@
  1432. <Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/objdetect/objdetect.hpp">
  1433. <Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2/objdetect" />
  1434. </Unit>
  1435. - <Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp">
  1436. - <Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2" />
  1437. - </Unit>
  1438. <Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/ts/ts.hpp">
  1439. <Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2/ts" />
  1440. </Unit>
  1441. @@ -460,5 +457,8 @@
  1442. <Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/video/video.hpp">
  1443. <Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2/video" />
  1444. </Unit>
  1445. + <Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp">
  1446. + <Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2" />
  1447. + </Unit>
  1448. </Project>
  1449. </CodeBlocks_project_file>
  1450. diff --git a/dev-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.vcxproj b/pierre-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.vcxproj
  1451. index 734a73f..57ae00f 100644
  1452. --- a/dev-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.vcxproj
  1453. +++ b/pierre-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.vcxproj
  1454. @@ -197,12 +197,12 @@
  1455. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\legacy\streams.hpp" />
  1456. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ml\ml.hpp" />
  1457. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\objdetect\objdetect.hpp" />
  1458. - <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp" />
  1459. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ts\ts.hpp" />
  1460. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ts\ts_gtest.h" />
  1461. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\background_segm.hpp" />
  1462. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\tracking.hpp" />
  1463. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\video.hpp" />
  1464. + <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp" />
  1465. </ItemGroup>
  1466. <ItemGroup>
  1467. <ProjectReference Include="..\..\..\libs\openFrameworksCompiled\project\vs2010\openframeworksLib.vcxproj">
  1468. diff --git a/dev-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.vcxproj.filters b/pierre-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.vcxproj.filters
  1469. index 6d8abd3..03762e8 100644
  1470. --- a/dev-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.vcxproj.filters
  1471. +++ b/pierre-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.vcxproj.filters
  1472. @@ -362,9 +362,6 @@
  1473. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\objdetect\objdetect.hpp">
  1474. <Filter>addons\ofxOpenCv\libs\opencv\include\opencv2\objdetect</Filter>
  1475. </ClInclude>
  1476. - <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp">
  1477. - <Filter>addons\ofxOpenCv\libs\opencv\include\opencv2</Filter>
  1478. - </ClInclude>
  1479. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ts\ts.hpp">
  1480. <Filter>addons\ofxOpenCv\libs\opencv\include\opencv2\ts</Filter>
  1481. </ClInclude>
  1482. @@ -380,5 +377,8 @@
  1483. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\video.hpp">
  1484. <Filter>addons\ofxOpenCv\libs\opencv\include\opencv2\video</Filter>
  1485. </ClInclude>
  1486. + <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp">
  1487. + <Filter>addons\ofxOpenCv\libs\opencv\include\opencv2</Filter>
  1488. + </ClInclude>
  1489. </ItemGroup>
  1490. </Project>
  1491. diff --git a/dev-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.xcodeproj/project.pbxproj b/pierre-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.xcodeproj/project.pbxproj
  1492. index 1cf6da9..88fbd42 100644
  1493. --- a/dev-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.xcodeproj/project.pbxproj
  1494. +++ b/pierre-openFrameworks/examples/addons/opencvHaarFinderExample/opencvHaarFinderExample.xcodeproj/project.pbxproj
  1495. @@ -9,6 +9,21 @@
  1496. <string>42</string>
  1497. <key>objects</key>
  1498. <dict>
  1499. + <key>9b7d592e7ab311451a27c46e68e8680d</key>
  1500. + <dict>
  1501. + <key>explicitFileType</key>
  1502. + <string>sourcecode.c.h</string>
  1503. + <key>fileEncoding</key>
  1504. + <string>30</string>
  1505. + <key>isa</key>
  1506. + <string>PBXFileReference</string>
  1507. + <key>name</key>
  1508. + <string>opencv.hpp</string>
  1509. + <key>path</key>
  1510. + <string>../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp</string>
  1511. + <key>sourceTree</key>
  1512. + <string>SOURCE_ROOT</string>
  1513. + </dict>
  1514. <key>97fbd89e6180673035ad1083e6afc93e</key>
  1515. <dict>
  1516. <key>explicitFileType</key>
  1517. @@ -113,21 +128,6 @@
  1518. <key>sourceTree</key>
  1519. <string>SOURCE_ROOT</string>
  1520. </dict>
  1521. - <key>9b7d592e7ab311451a27c46e68e8680d</key>
  1522. - <dict>
  1523. - <key>explicitFileType</key>
  1524. - <string>sourcecode.c.h</string>
  1525. - <key>fileEncoding</key>
  1526. - <string>30</string>
  1527. - <key>isa</key>
  1528. - <string>PBXFileReference</string>
  1529. - <key>name</key>
  1530. - <string>opencv.hpp</string>
  1531. - <key>path</key>
  1532. - <string>../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp</string>
  1533. - <key>sourceTree</key>
  1534. - <string>SOURCE_ROOT</string>
  1535. - </dict>
  1536. <key>d0cafe48ee488eeed9149670a8175de8</key>
  1537. <dict>
  1538. <key>children</key>
  1539. @@ -1300,9 +1300,9 @@
  1540. <string>961a625bd21068033782887c0c93e535</string>
  1541. <string>0f288fd421d474f4ae2684d36104f270</string>
  1542. <string>d0cafe48ee488eeed9149670a8175de8</string>
  1543. - <string>9b7d592e7ab311451a27c46e68e8680d</string>
  1544. <string>0478e60892bf4c0731ae0763e72eb53d</string>
  1545. <string>c58cc92a5283b95aa31d50fb5e0ffc6b</string>
  1546. + <string>9b7d592e7ab311451a27c46e68e8680d</string>
  1547. </array>
  1548. <key>isa</key>
  1549. <string>PBXGroup</string>
  1550. diff --git a/dev-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.cbp b/pierre-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.cbp
  1551. index df175ff..7097671 100644
  1552. --- a/dev-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.cbp
  1553. +++ b/pierre-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.cbp
  1554. @@ -442,9 +442,6 @@
  1555. <Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/objdetect/objdetect.hpp">
  1556. <Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2/objdetect" />
  1557. </Unit>
  1558. - <Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp">
  1559. - <Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2" />
  1560. - </Unit>
  1561. <Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/ts/ts.hpp">
  1562. <Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2/ts" />
  1563. </Unit>
  1564. @@ -460,5 +457,8 @@
  1565. <Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/video/video.hpp">
  1566. <Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2/video" />
  1567. </Unit>
  1568. + <Unit filename="../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp">
  1569. + <Option virtualFolder="addons/ofxOpenCv/libs/opencv/include/opencv2" />
  1570. + </Unit>
  1571. </Project>
  1572. </CodeBlocks_project_file>
  1573. diff --git a/dev-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.vcxproj b/pierre-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.vcxproj
  1574. index a298a5a..5c9e983 100644
  1575. --- a/dev-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.vcxproj
  1576. +++ b/pierre-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.vcxproj
  1577. @@ -197,12 +197,12 @@
  1578. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\legacy\streams.hpp" />
  1579. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ml\ml.hpp" />
  1580. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\objdetect\objdetect.hpp" />
  1581. - <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp" />
  1582. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ts\ts.hpp" />
  1583. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ts\ts_gtest.h" />
  1584. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\background_segm.hpp" />
  1585. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\tracking.hpp" />
  1586. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\video.hpp" />
  1587. + <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp" />
  1588. </ItemGroup>
  1589. <ItemGroup>
  1590. <ProjectReference Include="..\..\..\libs\openFrameworksCompiled\project\vs2010\openframeworksLib.vcxproj">
  1591. diff --git a/dev-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.vcxproj.filters b/pierre-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.vcxproj.filters
  1592. index 6d8abd3..03762e8 100644
  1593. --- a/dev-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.vcxproj.filters
  1594. +++ b/pierre-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.vcxproj.filters
  1595. @@ -362,9 +362,6 @@
  1596. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\objdetect\objdetect.hpp">
  1597. <Filter>addons\ofxOpenCv\libs\opencv\include\opencv2\objdetect</Filter>
  1598. </ClInclude>
  1599. - <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp">
  1600. - <Filter>addons\ofxOpenCv\libs\opencv\include\opencv2</Filter>
  1601. - </ClInclude>
  1602. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\ts\ts.hpp">
  1603. <Filter>addons\ofxOpenCv\libs\opencv\include\opencv2\ts</Filter>
  1604. </ClInclude>
  1605. @@ -380,5 +377,8 @@
  1606. <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\video\video.hpp">
  1607. <Filter>addons\ofxOpenCv\libs\opencv\include\opencv2\video</Filter>
  1608. </ClInclude>
  1609. + <ClInclude Include="..\..\..\addons\ofxOpenCv\libs\opencv\include\opencv2\opencv.hpp">
  1610. + <Filter>addons\ofxOpenCv\libs\opencv\include\opencv2</Filter>
  1611. + </ClInclude>
  1612. </ItemGroup>
  1613. </Project>
  1614. diff --git a/dev-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.xcodeproj/project.pbxproj b/pierre-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.xcodeproj/project.pbxproj
  1615. index 3aab171..dd6d482 100644
  1616. --- a/dev-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.xcodeproj/project.pbxproj
  1617. +++ b/pierre-openFrameworks/examples/graphics/polylineBlobsExample/polylineBlobsExample.xcodeproj/project.pbxproj
  1618. @@ -9,6 +9,21 @@
  1619. <string>42</string>
  1620. <key>objects</key>
  1621. <dict>
  1622. + <key>9b7d592e7ab311451a27c46e68e8680d</key>
  1623. + <dict>
  1624. + <key>explicitFileType</key>
  1625. + <string>sourcecode.c.h</string>
  1626. + <key>fileEncoding</key>
  1627. + <string>30</string>
  1628. + <key>isa</key>
  1629. + <string>PBXFileReference</string>
  1630. + <key>name</key>
  1631. + <string>opencv.hpp</string>
  1632. + <key>path</key>
  1633. + <string>../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp</string>
  1634. + <key>sourceTree</key>
  1635. + <string>SOURCE_ROOT</string>
  1636. + </dict>
  1637. <key>97fbd89e6180673035ad1083e6afc93e</key>
  1638. <dict>
  1639. <key>explicitFileType</key>
  1640. @@ -113,21 +128,6 @@
  1641. <key>sourceTree</key>
  1642. <string>SOURCE_ROOT</string>
  1643. </dict>
  1644. - <key>9b7d592e7ab311451a27c46e68e8680d</key>
  1645. - <dict>
  1646. - <key>explicitFileType</key>
  1647. - <string>sourcecode.c.h</string>
  1648. - <key>fileEncoding</key>
  1649. - <string>30</string>
  1650. - <key>isa</key>
  1651. - <string>PBXFileReference</string>
  1652. - <key>name</key>
  1653. - <string>opencv.hpp</string>
  1654. - <key>path</key>
  1655. - <string>../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp</string>
  1656. - <key>sourceTree</key>
  1657. - <string>SOURCE_ROOT</string>
  1658. - </dict>
  1659. <key>d0cafe48ee488eeed9149670a8175de8</key>
  1660. <dict>
  1661. <key>children</key>
  1662. @@ -1300,9 +1300,9 @@
  1663. <string>961a625bd21068033782887c0c93e535</string>
  1664. <string>0f288fd421d474f4ae2684d36104f270</string>
  1665. <string>d0cafe48ee488eeed9149670a8175de8</string>
  1666. - <string>9b7d592e7ab311451a27c46e68e8680d</string>
  1667. <string>0478e60892bf4c0731ae0763e72eb53d</string>
  1668. <string>c58cc92a5283b95aa31d50fb5e0ffc6b</string>
  1669. + <string>9b7d592e7ab311451a27c46e68e8680d</string>
  1670. </array>
  1671. <key>isa</key>
  1672. <string>PBXGroup</string>
  1673. diff --git a/dev-openFrameworks/examples/ios/assimpExample/assimpExample.xcodeproj/project.pbxproj b/pierre-openFrameworks/examples/ios/assimpExample/assimpExample.xcodeproj/project.pbxproj
  1674. index 922247b..28c0e84 100644
  1675. --- a/dev-openFrameworks/examples/ios/assimpExample/assimpExample.xcodeproj/project.pbxproj
  1676. +++ b/pierre-openFrameworks/examples/ios/assimpExample/assimpExample.xcodeproj/project.pbxproj
  1677. @@ -9,6 +9,50 @@
  1678. <string>45</string>
  1679. <key>objects</key>
  1680. <dict>
  1681. + <key>65bac5a3b9c9387859a2b0e01dd0c5e7</key>
  1682. + <dict>
  1683. + <key>explicitFileType</key>
  1684. + <string>sourcecode.c.h</string>
  1685. + <key>fileEncoding</key>
  1686. + <string>30</string>
  1687. + <key>isa</key>
  1688. + <string>PBXFileReference</string>
  1689. + <key>name</key>
  1690. + <string>pushpack1.h</string>
  1691. + <key>path</key>
  1692. + <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/pushpack1.h</string>
  1693. + <key>sourceTree</key>
  1694. + <string>SOURCE_ROOT</string>
  1695. + </dict>
  1696. + <key>93a9152986a73da32dbd796433b96c9f</key>
  1697. + <dict>
  1698. + <key>children</key>
  1699. + <array>
  1700. + <string>1aa18353f9701b01731dfadf228466c5</string>
  1701. + <string>65bac5a3b9c9387859a2b0e01dd0c5e7</string>
  1702. + </array>
  1703. + <key>isa</key>
  1704. + <string>PBXGroup</string>
  1705. + <key>name</key>
  1706. + <string>Compiler</string>
  1707. + <key>sourceTree</key>
  1708. + <string><group></string>
  1709. + </dict>
  1710. + <key>1aa18353f9701b01731dfadf228466c5</key>
  1711. + <dict>
  1712. + <key>explicitFileType</key>
  1713. + <string>sourcecode.c.h</string>
  1714. + <key>fileEncoding</key>
  1715. + <string>30</string>
  1716. + <key>isa</key>
  1717. + <string>PBXFileReference</string>
  1718. + <key>name</key>
  1719. + <string>poppack1.h</string>
  1720. + <key>path</key>
  1721. + <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/poppack1.h</string>
  1722. + <key>sourceTree</key>
  1723. + <string>SOURCE_ROOT</string>
  1724. + </dict>
  1725. <key>53ea0e889f34624ce3313e04cd77bdc4</key>
  1726. <dict>
  1727. <key>explicitFileType</key>
  1728. @@ -429,55 +473,10 @@
  1729. <key>sourceTree</key>
  1730. <string>SOURCE_ROOT</string>
  1731. </dict>
  1732. - <key>9d3fbfbcc1ee3203c85613ccf7e80431</key>
  1733. - <dict>
  1734. - <key>explicitFileType</key>
  1735. - <string>sourcecode.c.h</string>
  1736. - <key>fileEncoding</key>
  1737. - <string>30</string>
  1738. - <key>isa</key>
  1739. - <string>PBXFileReference</string>
  1740. - <key>name</key>
  1741. - <string>DefaultLogger.h</string>
  1742. - <key>path</key>
  1743. - <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/DefaultLogger.h</string>
  1744. - <key>sourceTree</key>
  1745. - <string>SOURCE_ROOT</string>
  1746. - </dict>
  1747. - <key>65bac5a3b9c9387859a2b0e01dd0c5e7</key>
  1748. - <dict>
  1749. - <key>explicitFileType</key>
  1750. - <string>sourcecode.c.h</string>
  1751. - <key>fileEncoding</key>
  1752. - <string>30</string>
  1753. - <key>isa</key>
  1754. - <string>PBXFileReference</string>
  1755. - <key>name</key>
  1756. - <string>pushpack1.h</string>
  1757. - <key>path</key>
  1758. - <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/pushpack1.h</string>
  1759. - <key>sourceTree</key>
  1760. - <string>SOURCE_ROOT</string>
  1761. - </dict>
  1762. - <key>93a9152986a73da32dbd796433b96c9f</key>
  1763. - <dict>
  1764. - <key>children</key>
  1765. - <array>
  1766. - <string>1aa18353f9701b01731dfadf228466c5</string>
  1767. - <string>65bac5a3b9c9387859a2b0e01dd0c5e7</string>
  1768. - </array>
  1769. - <key>isa</key>
  1770. - <string>PBXGroup</string>
  1771. - <key>name</key>
  1772. - <string>Compiler</string>
  1773. - <key>sourceTree</key>
  1774. - <string><group></string>
  1775. - </dict>
  1776. <key>eefdd7ae0009ae6f77ef2a937399e1cd</key>
  1777. <dict>
  1778. <key>children</key>
  1779. <array>
  1780. - <string>93a9152986a73da32dbd796433b96c9f</string>
  1781. <string>9d3fbfbcc1ee3203c85613ccf7e80431</string>
  1782. <string>cc940533e79102644e0eba5599fb0fb6</string>
  1783. <string>8ebbbb59caed1e54f37c7038f27990ee</string>
  1784. @@ -507,6 +506,7 @@
  1785. <string>c72403edcb7dcaec60d1dcdd13017e0c</string>
  1786. <string>564045ef0424b7037832d90382f88900</string>
  1787. <string>53ea0e889f34624ce3313e04cd77bdc4</string>
  1788. + <string>93a9152986a73da32dbd796433b96c9f</string>
  1789. </array>
  1790. <key>isa</key>
  1791. <string>PBXGroup</string>
  1792. @@ -541,7 +541,7 @@
  1793. <key>sourceTree</key>
  1794. <string><group></string>
  1795. </dict>
  1796. - <key>1aa18353f9701b01731dfadf228466c5</key>
  1797. + <key>9d3fbfbcc1ee3203c85613ccf7e80431</key>
  1798. <dict>
  1799. <key>explicitFileType</key>
  1800. <string>sourcecode.c.h</string>
  1801. @@ -550,9 +550,9 @@
  1802. <key>isa</key>
  1803. <string>PBXFileReference</string>
  1804. <key>name</key>
  1805. - <string>poppack1.h</string>
  1806. + <string>DefaultLogger.h</string>
  1807. <key>path</key>
  1808. - <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/Compiler/poppack1.h</string>
  1809. + <string>../../../addons/ofxAssimpModelLoader/libs/assimp/include/DefaultLogger.h</string>
  1810. <key>sourceTree</key>
  1811. <string>SOURCE_ROOT</string>
  1812. </dict>
  1813. diff --git a/dev-openFrameworks/examples/ios/opencvExample/opencvExample.xcodeproj/project.pbxproj b/pierre-openFrameworks/examples/ios/opencvExample/opencvExample.xcodeproj/project.pbxproj
  1814. index 94b9c4a..a5e19d9 100644
  1815. --- a/dev-openFrameworks/examples/ios/opencvExample/opencvExample.xcodeproj/project.pbxproj
  1816. +++ b/pierre-openFrameworks/examples/ios/opencvExample/opencvExample.xcodeproj/project.pbxproj
  1817. @@ -9,6 +9,21 @@
  1818. <string>45</string>
  1819. <key>objects</key>
  1820. <dict>
  1821. + <key>9b7d592e7ab311451a27c46e68e8680d</key>
  1822. + <dict>
  1823. + <key>explicitFileType</key>
  1824. + <string>sourcecode.c.h</string>
  1825. + <key>fileEncoding</key>
  1826. + <string>30</string>
  1827. + <key>isa</key>
  1828. + <string>PBXFileReference</string>
  1829. + <key>name</key>
  1830. + <string>opencv.hpp</string>
  1831. + <key>path</key>
  1832. + <string>../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp</string>
  1833. + <key>sourceTree</key>
  1834. + <string>SOURCE_ROOT</string>
  1835. + </dict>
  1836. <key>97fbd89e6180673035ad1083e6afc93e</key>
  1837. <dict>
  1838. <key>explicitFileType</key>
  1839. @@ -113,21 +128,6 @@
  1840. <key>sourceTree</key>
  1841. <string>SOURCE_ROOT</string>
  1842. </dict>
  1843. - <key>9b7d592e7ab311451a27c46e68e8680d</key>
  1844. - <dict>
  1845. - <key>explicitFileType</key>
  1846. - <string>sourcecode.c.h</string>
  1847. - <key>fileEncoding</key>
  1848. - <string>30</string>
  1849. - <key>isa</key>
  1850. - <string>PBXFileReference</string>
  1851. - <key>name</key>
  1852. - <string>opencv.hpp</string>
  1853. - <key>path</key>
  1854. - <string>../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp</string>
  1855. - <key>sourceTree</key>
  1856. - <string>SOURCE_ROOT</string>
  1857. - </dict>
  1858. <key>d0cafe48ee488eeed9149670a8175de8</key>
  1859. <dict>
  1860. <key>children</key>
  1861. @@ -1300,9 +1300,9 @@
  1862. <string>961a625bd21068033782887c0c93e535</string>
  1863. <string>0f288fd421d474f4ae2684d36104f270</string>
  1864. <string>d0cafe48ee488eeed9149670a8175de8</string>
  1865. - <string>9b7d592e7ab311451a27c46e68e8680d</string>
  1866. <string>0478e60892bf4c0731ae0763e72eb53d</string>
  1867. <string>c58cc92a5283b95aa31d50fb5e0ffc6b</string>
  1868. + <string>9b7d592e7ab311451a27c46e68e8680d</string>
  1869. </array>
  1870. <key>isa</key>
  1871. <string>PBXGroup</string>
  1872. diff --git a/dev-openFrameworks/examples/ios/opencvFaceExample/opencvFaceExample.xcodeproj/project.pbxproj b/pierre-openFrameworks/examples/ios/opencvFaceExample/opencvFaceExample.xcodeproj/project.pbxproj
  1873. index 688c4f4..0151985 100644
  1874. --- a/dev-openFrameworks/examples/ios/opencvFaceExample/opencvFaceExample.xcodeproj/project.pbxproj
  1875. +++ b/pierre-openFrameworks/examples/ios/opencvFaceExample/opencvFaceExample.xcodeproj/project.pbxproj
  1876. @@ -9,6 +9,21 @@
  1877. <string>45</string>
  1878. <key>objects</key>
  1879. <dict>
  1880. + <key>9b7d592e7ab311451a27c46e68e8680d</key>
  1881. + <dict>
  1882. + <key>explicitFileType</key>
  1883. + <string>sourcecode.c.h</string>
  1884. + <key>fileEncoding</key>
  1885. + <string>30</string>
  1886. + <key>isa</key>
  1887. + <string>PBXFileReference</string>
  1888. + <key>name</key>
  1889. + <string>opencv.hpp</string>
  1890. + <key>path</key>
  1891. + <string>../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp</string>
  1892. + <key>sourceTree</key>
  1893. + <string>SOURCE_ROOT</string>
  1894. + </dict>
  1895. <key>97fbd89e6180673035ad1083e6afc93e</key>
  1896. <dict>
  1897. <key>explicitFileType</key>
  1898. @@ -113,21 +128,6 @@
  1899. <key>sourceTree</key>
  1900. <string>SOURCE_ROOT</string>
  1901. </dict>
  1902. - <key>9b7d592e7ab311451a27c46e68e8680d</key>
  1903. - <dict>
  1904. - <key>explicitFileType</key>
  1905. - <string>sourcecode.c.h</string>
  1906. - <key>fileEncoding</key>
  1907. - <string>30</string>
  1908. - <key>isa</key>
  1909. - <string>PBXFileReference</string>
  1910. - <key>name</key>
  1911. - <string>opencv.hpp</string>
  1912. - <key>path</key>
  1913. - <string>../../../addons/ofxOpenCv/libs/opencv/include/opencv2/opencv.hpp</string>
  1914. - <key>sourceTree</key>
  1915. - <string>SOURCE_ROOT</string>
  1916. - </dict>
  1917. <key>d0cafe48ee488eeed9149670a8175de8</key>
  1918. <dict>
  1919. <key>children</key>
  1920. @@ -1300,9 +1300,9 @@
  1921. <string>961a625bd21068033782887c0c93e535</string>
  1922. <string>0f288fd421d474f4ae2684d36104f270</string>
  1923. <string>d0cafe48ee488eeed9149670a8175de8</string>
  1924. - <string>9b7d592e7ab311451a27c46e68e8680d</string>
  1925. <string>0478e60892bf4c0731ae0763e72eb53d</string>
  1926. <string>c58cc92a5283b95aa31d50fb5e0ffc6b</string>
  1927. + <string>9b7d592e7ab311451a27c46e68e8680d</string>
  1928. </array>
  1929. <key>isa</key>
  1930. <string>PBXGroup</string>
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!