components-include-diligentcore.diff 13 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302
  1. diff --git a/Components/interface/BoundBoxRenderer.hpp b/Components/interface/BoundBoxRenderer.hpp
  2. index 039f569..1ed4419 100644
  3. --- a/Components/interface/BoundBoxRenderer.hpp
  4. +++ b/Components/interface/BoundBoxRenderer.hpp
  5. @@ -28,12 +28,12 @@
  6. #include <vector>
  7. #include <memory>
  8. -#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/RenderDevice.h"
  9. -#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/DeviceContext.h"
  10. -#include "../../../DiligentCore/Graphics/GraphicsTools/interface/RenderStateCache.h"
  11. -#include "../../../DiligentCore/Common/interface/RefCntAutoPtr.hpp"
  12. -#include "../../../DiligentCore/Common/interface/HashUtils.hpp"
  13. -#include "../../../DiligentCore/Common/interface/BasicMath.hpp"
  14. +#include "DiligentCore/Graphics/GraphicsEngine/interface/RenderDevice.h"
  15. +#include "DiligentCore/Graphics/GraphicsEngine/interface/DeviceContext.h"
  16. +#include "DiligentCore/Graphics/GraphicsTools/interface/RenderStateCache.h"
  17. +#include "DiligentCore/Common/interface/RefCntAutoPtr.hpp"
  18. +#include "DiligentCore/Common/interface/HashUtils.hpp"
  19. +#include "DiligentCore/Common/interface/BasicMath.hpp"
  20. namespace Diligent
  21. {
  22. diff --git a/Components/interface/CoordinateGridRenderer.hpp b/Components/interface/CoordinateGridRenderer.hpp
  23. index f02cb29..0ab3557 100644
  24. --- a/Components/interface/CoordinateGridRenderer.hpp
  25. +++ b/Components/interface/CoordinateGridRenderer.hpp
  26. @@ -29,14 +29,14 @@
  27. #include <unordered_map>
  28. #include <vector>
  29. -#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/RenderDevice.h"
  30. -#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/DeviceContext.h"
  31. -#include "../../../DiligentCore/Graphics/GraphicsTools/interface/RenderStateCache.h"
  32. -#include "../../../DiligentCore/Graphics/GraphicsTools/interface/ResourceRegistry.hpp"
  33. -#include "../../../DiligentCore/Graphics/GraphicsTools/interface/ShaderMacroHelper.hpp"
  34. -#include "../../../DiligentCore/Common/interface/RefCntAutoPtr.hpp"
  35. -#include "../../../DiligentCore/Common/interface/BasicMath.hpp"
  36. -#include "../../../DiligentCore/Common/interface/HashUtils.hpp"
  37. +#include "DiligentCore/Graphics/GraphicsEngine/interface/RenderDevice.h"
  38. +#include "DiligentCore/Graphics/GraphicsEngine/interface/DeviceContext.h"
  39. +#include "DiligentCore/Graphics/GraphicsTools/interface/RenderStateCache.h"
  40. +#include "DiligentCore/Graphics/GraphicsTools/interface/ResourceRegistry.hpp"
  41. +#include "DiligentCore/Graphics/GraphicsTools/interface/ShaderMacroHelper.hpp"
  42. +#include "DiligentCore/Common/interface/RefCntAutoPtr.hpp"
  43. +#include "DiligentCore/Common/interface/BasicMath.hpp"
  44. +#include "DiligentCore/Common/interface/HashUtils.hpp"
  45. namespace Diligent
  46. {
  47. diff --git a/Components/interface/EnvMapRenderer.hpp b/Components/interface/EnvMapRenderer.hpp
  48. index e4e61f4..18815ce 100644
  49. --- a/Components/interface/EnvMapRenderer.hpp
  50. +++ b/Components/interface/EnvMapRenderer.hpp
  51. @@ -29,12 +29,12 @@
  52. #include <memory>
  53. #include <array>
  54. -#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/RenderDevice.h"
  55. -#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/DeviceContext.h"
  56. -#include "../../../DiligentCore/Graphics/GraphicsTools/interface/RenderStateCache.h"
  57. -#include "../../../DiligentCore/Common/interface/RefCntAutoPtr.hpp"
  58. -#include "../../../DiligentCore/Common/interface/BasicMath.hpp"
  59. -#include "../../../DiligentCore/Common/interface/HashUtils.hpp"
  60. +#include "DiligentCore/Graphics/GraphicsEngine/interface/RenderDevice.h"
  61. +#include "DiligentCore/Graphics/GraphicsEngine/interface/DeviceContext.h"
  62. +#include "DiligentCore/Graphics/GraphicsTools/interface/RenderStateCache.h"
  63. +#include "DiligentCore/Common/interface/RefCntAutoPtr.hpp"
  64. +#include "DiligentCore/Common/interface/BasicMath.hpp"
  65. +#include "DiligentCore/Common/interface/HashUtils.hpp"
  66. namespace Diligent
  67. {
  68. diff --git a/Components/interface/GBuffer.hpp b/Components/interface/GBuffer.hpp
  69. index 4aa8dd0..a235bdc 100644
  70. --- a/Components/interface/GBuffer.hpp
  71. +++ b/Components/interface/GBuffer.hpp
  72. @@ -26,8 +26,8 @@
  73. #include <vector>
  74. -#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/RenderDevice.h"
  75. -#include "../../../DiligentCore/Common/interface/RefCntAutoPtr.hpp"
  76. +#include "DiligentCore/Graphics/GraphicsEngine/interface/RenderDevice.h"
  77. +#include "DiligentCore/Common/interface/RefCntAutoPtr.hpp"
  78. namespace Diligent
  79. {
  80. diff --git a/Components/interface/ShadowMapManager.hpp b/Components/interface/ShadowMapManager.hpp
  81. index 2897ad0..bde4dee 100644
  82. --- a/Components/interface/ShadowMapManager.hpp
  83. +++ b/Components/interface/ShadowMapManager.hpp
  84. @@ -30,13 +30,13 @@
  85. #include <vector>
  86. #include <array>
  87. -#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/RenderDevice.h"
  88. -#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/DeviceContext.h"
  89. -#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/Texture.h"
  90. -#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/TextureView.h"
  91. -#include "../../../DiligentCore/Graphics/GraphicsTools/interface/RenderStateCache.h"
  92. -#include "../../../DiligentCore/Common/interface/RefCntAutoPtr.hpp"
  93. -#include "../../../DiligentCore/Common/interface/BasicMath.hpp"
  94. +#include "DiligentCore/Graphics/GraphicsEngine/interface/RenderDevice.h"
  95. +#include "DiligentCore/Graphics/GraphicsEngine/interface/DeviceContext.h"
  96. +#include "DiligentCore/Graphics/GraphicsEngine/interface/Texture.h"
  97. +#include "DiligentCore/Graphics/GraphicsEngine/interface/TextureView.h"
  98. +#include "DiligentCore/Graphics/GraphicsTools/interface/RenderStateCache.h"
  99. +#include "DiligentCore/Common/interface/RefCntAutoPtr.hpp"
  100. +#include "DiligentCore/Common/interface/BasicMath.hpp"
  101. namespace Diligent
  102. {
  103. diff --git a/Components/interface/ToneMapping.hpp b/Components/interface/ToneMapping.hpp
  104. index ff899c0..bf0e790 100644
  105. --- a/Components/interface/ToneMapping.hpp
  106. +++ b/Components/interface/ToneMapping.hpp
  107. @@ -24,7 +24,7 @@
  108. * of the possibility of such damages.
  109. */
  110. -#include "../../../DiligentCore/Common/interface/BasicMath.hpp"
  111. +#include "DiligentCore/Common/interface/BasicMath.hpp"
  112. namespace Diligent
  113. {
  114. diff --git a/Components/interface/VectorFieldRenderer.hpp b/Components/interface/VectorFieldRenderer.hpp
  115. index 68eb87a..6537408 100644
  116. --- a/Components/interface/VectorFieldRenderer.hpp
  117. +++ b/Components/interface/VectorFieldRenderer.hpp
  118. @@ -27,12 +27,12 @@
  119. #include <unordered_map>
  120. #include <vector>
  121. -#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/RenderDevice.h"
  122. -#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/DeviceContext.h"
  123. -#include "../../../DiligentCore/Graphics/GraphicsTools/interface/RenderStateCache.h"
  124. -#include "../../../DiligentCore/Common/interface/RefCntAutoPtr.hpp"
  125. -#include "../../../DiligentCore/Common/interface/BasicMath.hpp"
  126. -#include "../../../DiligentCore/Common/interface/HashUtils.hpp"
  127. +#include "DiligentCore/Graphics/GraphicsEngine/interface/RenderDevice.h"
  128. +#include "DiligentCore/Graphics/GraphicsEngine/interface/DeviceContext.h"
  129. +#include "DiligentCore/Graphics/GraphicsTools/interface/RenderStateCache.h"
  130. +#include "DiligentCore/Common/interface/RefCntAutoPtr.hpp"
  131. +#include "DiligentCore/Common/interface/BasicMath.hpp"
  132. +#include "DiligentCore/Common/interface/HashUtils.hpp"
  133. namespace Diligent
  134. {
  135. diff --git a/Components/src/BoundBoxRenderer.cpp b/Components/src/BoundBoxRenderer.cpp
  136. index a4aa4cd..b1beecc 100644
  137. --- a/Components/src/BoundBoxRenderer.cpp
  138. +++ b/Components/src/BoundBoxRenderer.cpp
  139. @@ -27,13 +27,13 @@
  140. #include "BoundBoxRenderer.hpp"
  141. #include "Utilities/interface/DiligentFXShaderSourceStreamFactory.hpp"
  142. -#include "ShaderMacroHelper.hpp"
  143. -#include "RenderStateCache.hpp"
  144. -#include "CommonlyUsedStates.h"
  145. -#include "MapHelper.hpp"
  146. -#include "GraphicsUtilities.h"
  147. -#include "ShaderSourceFactoryUtils.hpp"
  148. -#include "GraphicsAccessories.hpp"
  149. +#include "DiligentCore/Graphics/GraphicsTools/interface/ShaderMacroHelper.hpp"
  150. +#include "DiligentCore/Graphics/GraphicsTools/interface/RenderStateCache.hpp"
  151. +#include "DiligentCore/Graphics/GraphicsTools/interface/CommonlyUsedStates.h"
  152. +#include "DiligentCore/Graphics/GraphicsTools/interface/MapHelper.hpp"
  153. +#include "DiligentCore/Graphics/GraphicsTools/interface/GraphicsUtilities.h"
  154. +#include "DiligentCore/Graphics/GraphicsTools/interface/ShaderSourceFactoryUtils.hpp"
  155. +#include "DiligentCore/Graphics/GraphicsAccessories/interface/GraphicsAccessories.hpp"
  156. namespace Diligent
  157. {
  158. diff --git a/Components/src/CoordinateGridRenderer.cpp b/Components/src/CoordinateGridRenderer.cpp
  159. index ab7b833..1ca8c03 100644
  160. --- a/Components/src/CoordinateGridRenderer.cpp
  161. +++ b/Components/src/CoordinateGridRenderer.cpp
  162. @@ -25,17 +25,17 @@
  163. */
  164. #include "imgui.h"
  165. -#include "ImGuiUtils.hpp"
  166. +#include "DiligentTools/Imgui/interface/ImGuiUtils.hpp"
  167. #include "CoordinateGridRenderer.hpp"
  168. -#include "GraphicsUtilities.h"
  169. -#include "ShaderMacroHelper.hpp"
  170. +#include "DiligentCore/Graphics/GraphicsTools/interface/GraphicsUtilities.h"
  171. +#include "DiligentCore/Graphics/GraphicsTools/interface/ShaderMacroHelper.hpp"
  172. #include "PostFXRenderTechnique.hpp"
  173. -#include "GraphicsTypesX.hpp"
  174. -#include "RenderStateCache.hpp"
  175. -#include "CommonlyUsedStates.h"
  176. -#include "MapHelper.hpp"
  177. -#include "ScopedDebugGroup.hpp"
  178. +#include "DiligentCore/Graphics/GraphicsEngine/interface/GraphicsTypesX.hpp"
  179. +#include "DiligentCore/Graphics/GraphicsTools/interface/RenderStateCache.hpp"
  180. +#include "DiligentCore/Graphics/GraphicsTools/interface/CommonlyUsedStates.h"
  181. +#include "DiligentCore/Graphics/GraphicsTools/interface/MapHelper.hpp"
  182. +#include "DiligentCore/Graphics/GraphicsTools/interface/ScopedDebugGroup.hpp"
  183. namespace Diligent
  184. {
  185. diff --git a/Components/src/EnvMapRenderer.cpp b/Components/src/EnvMapRenderer.cpp
  186. index 762bcf1..7b069e1 100644
  187. --- a/Components/src/EnvMapRenderer.cpp
  188. +++ b/Components/src/EnvMapRenderer.cpp
  189. @@ -27,12 +27,12 @@
  190. #include "EnvMapRenderer.hpp"
  191. #include "Utilities/interface/DiligentFXShaderSourceStreamFactory.hpp"
  192. -#include "ShaderMacroHelper.hpp"
  193. -#include "RenderStateCache.hpp"
  194. -#include "CommonlyUsedStates.h"
  195. -#include "MapHelper.hpp"
  196. -#include "GraphicsUtilities.h"
  197. -#include "ShaderSourceFactoryUtils.hpp"
  198. +#include "DiligentCore/Graphics/GraphicsTools/interface/ShaderMacroHelper.hpp"
  199. +#include "DiligentCore/Graphics/GraphicsTools/interface/RenderStateCache.hpp"
  200. +#include "DiligentCore/Graphics/GraphicsTools/interface/CommonlyUsedStates.h"
  201. +#include "DiligentCore/Graphics/GraphicsTools/interface/MapHelper.hpp"
  202. +#include "DiligentCore/Graphics/GraphicsTools/interface/GraphicsUtilities.h"
  203. +#include "DiligentCore/Graphics/GraphicsTools/interface/ShaderSourceFactoryUtils.hpp"
  204. namespace Diligent
  205. {
  206. diff --git a/Components/src/GBuffer.cpp b/Components/src/GBuffer.cpp
  207. index a5b5493..d20c8de 100644
  208. --- a/Components/src/GBuffer.cpp
  209. +++ b/Components/src/GBuffer.cpp
  210. @@ -26,8 +26,8 @@
  211. #include "GBuffer.hpp"
  212. -#include "GraphicsAccessories.hpp"
  213. -#include "PlatformMisc.hpp"
  214. +#include "DiligentCore/Graphics/GraphicsAccessories/interface/GraphicsAccessories.hpp"
  215. +#include "DiligentCore/Platforms/interface/PlatformMisc.hpp"
  216. #include <array>
  217. diff --git a/Components/src/ShadowMapManager.cpp b/Components/src/ShadowMapManager.cpp
  218. index 06a9e2f..15317b0 100644
  219. --- a/Components/src/ShadowMapManager.cpp
  220. +++ b/Components/src/ShadowMapManager.cpp
  221. @@ -28,13 +28,13 @@
  222. #include <cfloat>
  223. #include "ShadowMapManager.hpp"
  224. -#include "AdvancedMath.hpp"
  225. +#include "DiligentCore/Common/interface/AdvancedMath.hpp"
  226. #include "Utilities/interface/DiligentFXShaderSourceStreamFactory.hpp"
  227. -#include "GraphicsUtilities.h"
  228. -#include "MapHelper.hpp"
  229. -#include "CommonlyUsedStates.h"
  230. -#include "RenderStateCache.hpp"
  231. -#include "GraphicsAccessories.hpp"
  232. +#include "DiligentCore/Graphics/GraphicsTools/interface/GraphicsUtilities.h"
  233. +#include "DiligentCore/Graphics/GraphicsTools/interface/MapHelper.hpp"
  234. +#include "DiligentCore/Graphics/GraphicsTools/interface/CommonlyUsedStates.h"
  235. +#include "DiligentCore/Graphics/GraphicsTools/interface/RenderStateCache.hpp"
  236. +#include "DiligentCore/Graphics/GraphicsAccessories/interface/GraphicsAccessories.hpp"
  237. namespace Diligent
  238. {
  239. diff --git a/Components/src/ToneMapping.cpp b/Components/src/ToneMapping.cpp
  240. index 5751484..262cd75 100644
  241. --- a/Components/src/ToneMapping.cpp
  242. +++ b/Components/src/ToneMapping.cpp
  243. @@ -25,7 +25,7 @@
  244. */
  245. #include "imgui.h"
  246. -#include "ImGuiUtils.hpp"
  247. +#include "DiligentTools/Imgui/interface/ImGuiUtils.hpp"
  248. #include "ToneMapping.hpp"
  249. diff --git a/Components/src/VectorFieldRenderer.cpp b/Components/src/VectorFieldRenderer.cpp
  250. index 8fdf164..8204ad7 100644
  251. --- a/Components/src/VectorFieldRenderer.cpp
  252. +++ b/Components/src/VectorFieldRenderer.cpp
  253. @@ -27,12 +27,12 @@
  254. #include "VectorFieldRenderer.hpp"
  255. #include "Utilities/interface/DiligentFXShaderSourceStreamFactory.hpp"
  256. -#include "ShaderMacroHelper.hpp"
  257. -#include "RenderStateCache.hpp"
  258. -#include "CommonlyUsedStates.h"
  259. -#include "MapHelper.hpp"
  260. -#include "GraphicsUtilities.h"
  261. -#include "ShaderSourceFactoryUtils.hpp"
  262. +#include "DiligentCore/Graphics/GraphicsTools/interface/ShaderMacroHelper.hpp"
  263. +#include "DiligentCore/Graphics/GraphicsTools/interface/RenderStateCache.hpp"
  264. +#include "DiligentCore/Graphics/GraphicsTools/interface/CommonlyUsedStates.h"
  265. +#include "DiligentCore/Graphics/GraphicsTools/interface/MapHelper.hpp"
  266. +#include "DiligentCore/Graphics/GraphicsTools/interface/GraphicsUtilities.h"
  267. +#include "DiligentCore/Graphics/GraphicsTools/interface/ShaderSourceFactoryUtils.hpp"
  268. namespace Diligent
  269. {