hydrogent-interface-include-diligentcore.diff 8.8 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208
  1. diff --git a/Hydrogent/interface/GfTypeConversions.hpp b/Hydrogent/interface/GfTypeConversions.hpp
  2. index bdce614..73050cb 100644
  3. --- a/Hydrogent/interface/GfTypeConversions.hpp
  4. +++ b/Hydrogent/interface/GfTypeConversions.hpp
  5. @@ -26,8 +26,8 @@
  6. #pragma once
  7. -#include "../../../DiligentCore/Common/interface/BasicMath.hpp"
  8. -#include "../../../DiligentCore/Common/interface/AdvancedMath.hpp"
  9. +#include "DiligentCore/Common/interface/BasicMath.hpp"
  10. +#include "DiligentCore/Common/interface/AdvancedMath.hpp"
  11. #include "pxr/base/gf/vec2f.h"
  12. #include "pxr/base/gf/vec3f.h"
  13. diff --git a/Hydrogent/interface/HnBuffer.hpp b/Hydrogent/interface/HnBuffer.hpp
  14. index e482aff..894fd49 100644
  15. --- a/Hydrogent/interface/HnBuffer.hpp
  16. +++ b/Hydrogent/interface/HnBuffer.hpp
  17. @@ -28,8 +28,8 @@
  18. #include "pxr/imaging/hd/bprim.h"
  19. -#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/Buffer.h"
  20. -#include "../../../DiligentCore/Common/interface/RefCntAutoPtr.hpp"
  21. +#include "DiligentCore/Graphics/GraphicsEngine/interface/Buffer.h"
  22. +#include "DiligentCore/Common/interface/RefCntAutoPtr.hpp"
  23. namespace Diligent
  24. {
  25. diff --git a/Hydrogent/interface/HnCamera.hpp b/Hydrogent/interface/HnCamera.hpp
  26. index b066fe6..ae717d5 100644
  27. --- a/Hydrogent/interface/HnCamera.hpp
  28. +++ b/Hydrogent/interface/HnCamera.hpp
  29. @@ -28,7 +28,7 @@
  30. #include "pxr/imaging/hd/camera.h"
  31. -#include "../../../../DiligentCore/Common/interface/BasicMath.hpp"
  32. +#include "DiligentCore/Common/interface/BasicMath.hpp"
  33. namespace Diligent
  34. {
  35. diff --git a/Hydrogent/interface/HnFrameRenderTargets.hpp b/Hydrogent/interface/HnFrameRenderTargets.hpp
  36. index 8541940..c161ea7 100644
  37. --- a/Hydrogent/interface/HnFrameRenderTargets.hpp
  38. +++ b/Hydrogent/interface/HnFrameRenderTargets.hpp
  39. @@ -28,7 +28,7 @@
  40. #include <array>
  41. -#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/TextureView.h"
  42. +#include "DiligentCore/Graphics/GraphicsEngine/interface/TextureView.h"
  43. namespace Diligent
  44. {
  45. diff --git a/Hydrogent/interface/HnLight.hpp b/Hydrogent/interface/HnLight.hpp
  46. index 46d2317..b563e5a 100644
  47. --- a/Hydrogent/interface/HnLight.hpp
  48. +++ b/Hydrogent/interface/HnLight.hpp
  49. @@ -28,9 +28,9 @@
  50. #include "pxr/imaging/hd/light.h"
  51. -#include "../../../DiligentCore/Common/interface/BasicMath.hpp"
  52. -#include "../../../DiligentCore/Common/interface/AdvancedMath.hpp"
  53. -#include "../../../DiligentTools/AssetLoader/interface/GLTFLoader.hpp"
  54. +#include "DiligentCore/Common/interface/BasicMath.hpp"
  55. +#include "DiligentCore/Common/interface/AdvancedMath.hpp"
  56. +#include "DiligentTools/AssetLoader/interface/GLTFLoader.hpp"
  57. namespace Diligent
  58. {
  59. diff --git a/Hydrogent/interface/HnMaterial.hpp b/Hydrogent/interface/HnMaterial.hpp
  60. index 4cfca7d..ce1dc2f 100644
  61. --- a/Hydrogent/interface/HnMaterial.hpp
  62. +++ b/Hydrogent/interface/HnMaterial.hpp
  63. @@ -35,11 +35,11 @@
  64. #include "pxr/imaging/hd/material.h"
  65. -#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/RenderDevice.h"
  66. -#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/ShaderResourceBinding.h"
  67. -#include "../../../DiligentCore/Common/interface/RefCntAutoPtr.hpp"
  68. -#include "../../../DiligentCore/Common/interface/BasicMath.hpp"
  69. -#include "../../../DiligentTools/AssetLoader/interface/GLTFLoader.hpp"
  70. +#include "DiligentCore/Graphics/GraphicsEngine/interface/RenderDevice.h"
  71. +#include "DiligentCore/Graphics/GraphicsEngine/interface/ShaderResourceBinding.h"
  72. +#include "DiligentCore/Common/interface/RefCntAutoPtr.hpp"
  73. +#include "DiligentCore/Common/interface/BasicMath.hpp"
  74. +#include "DiligentTools/AssetLoader/interface/GLTFLoader.hpp"
  75. #include "../../../DiligentFX/PBR/interface/PBR_Renderer.hpp"
  76. namespace Diligent
  77. diff --git a/Hydrogent/interface/HnMesh.hpp b/Hydrogent/interface/HnMesh.hpp
  78. index acd9d30..4cebca9 100644
  79. --- a/Hydrogent/interface/HnMesh.hpp
  80. +++ b/Hydrogent/interface/HnMesh.hpp
  81. @@ -35,12 +35,12 @@
  82. #include "pxr/imaging/hd/mesh.h"
  83. #include "pxr/base/tf/token.h"
  84. -#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/RenderDevice.h"
  85. -#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/Buffer.h"
  86. -#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/GraphicsTypesX.hpp"
  87. -#include "../../../DiligentCore/Common/interface/RefCntAutoPtr.hpp"
  88. -#include "../../../DiligentCore/Common/interface/BasicMath.hpp"
  89. -#include "../../../DiligentCore/Common/interface/STDAllocator.hpp"
  90. +#include "DiligentCore/Graphics/GraphicsEngine/interface/RenderDevice.h"
  91. +#include "DiligentCore/Graphics/GraphicsEngine/interface/Buffer.h"
  92. +#include "DiligentCore/Graphics/GraphicsEngine/interface/GraphicsTypesX.hpp"
  93. +#include "DiligentCore/Common/interface/RefCntAutoPtr.hpp"
  94. +#include "DiligentCore/Common/interface/BasicMath.hpp"
  95. +#include "DiligentCore/Common/interface/STDAllocator.hpp"
  96. #include "entt/entity/entity.hpp"
  97. diff --git a/Hydrogent/interface/HnRenderBuffer.hpp b/Hydrogent/interface/HnRenderBuffer.hpp
  98. index 1b78069..1e31c73 100644
  99. --- a/Hydrogent/interface/HnRenderBuffer.hpp
  100. +++ b/Hydrogent/interface/HnRenderBuffer.hpp
  101. @@ -28,8 +28,8 @@
  102. #include "pxr/imaging/hd/renderBuffer.h"
  103. -#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/Texture.h"
  104. -#include "../../../DiligentCore/Common/interface/RefCntAutoPtr.hpp"
  105. +#include "DiligentCore/Graphics/GraphicsEngine/interface/Texture.h"
  106. +#include "DiligentCore/Common/interface/RefCntAutoPtr.hpp"
  107. namespace Diligent
  108. {
  109. diff --git a/Hydrogent/interface/HnRenderDelegate.hpp b/Hydrogent/interface/HnRenderDelegate.hpp
  110. index 637aa78..3a68358 100644
  111. --- a/Hydrogent/interface/HnRenderDelegate.hpp
  112. +++ b/Hydrogent/interface/HnRenderDelegate.hpp
  113. @@ -35,9 +35,9 @@
  114. #include "pxr/imaging/hd/renderDelegate.h"
  115. -#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/RenderDevice.h"
  116. -#include "../../../DiligentCore/Graphics/GraphicsTools/interface/RenderStateCache.h"
  117. -#include "../../../DiligentCore/Common/interface/RefCntAutoPtr.hpp"
  118. +#include "DiligentCore/Graphics/GraphicsEngine/interface/RenderDevice.h"
  119. +#include "DiligentCore/Graphics/GraphicsTools/interface/RenderStateCache.h"
  120. +#include "DiligentCore/Common/interface/RefCntAutoPtr.hpp"
  121. #include "../../PBR/interface/USD_Renderer.hpp"
  122. #include "entt/entity/registry.hpp"
  123. diff --git a/Hydrogent/interface/HnRenderPassState.hpp b/Hydrogent/interface/HnRenderPassState.hpp
  124. index 8cab519..cc7bacd 100644
  125. --- a/Hydrogent/interface/HnRenderPassState.hpp
  126. +++ b/Hydrogent/interface/HnRenderPassState.hpp
  127. @@ -28,13 +28,13 @@
  128. #include <array>
  129. -#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/RasterizerState.h"
  130. -#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/BlendState.h"
  131. -#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/DepthStencilState.h"
  132. -#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/PipelineState.h"
  133. -#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/DeviceContext.h"
  134. -#include "../../../DiligentCore/Common/interface/RefCntAutoPtr.hpp"
  135. -#include "../../../DiligentCore/Common/interface/BasicMath.hpp"
  136. +#include "DiligentCore/Graphics/GraphicsEngine/interface/RasterizerState.h"
  137. +#include "DiligentCore/Graphics/GraphicsEngine/interface/BlendState.h"
  138. +#include "DiligentCore/Graphics/GraphicsEngine/interface/DepthStencilState.h"
  139. +#include "DiligentCore/Graphics/GraphicsEngine/interface/PipelineState.h"
  140. +#include "DiligentCore/Graphics/GraphicsEngine/interface/DeviceContext.h"
  141. +#include "DiligentCore/Common/interface/RefCntAutoPtr.hpp"
  142. +#include "DiligentCore/Common/interface/BasicMath.hpp"
  143. #include "HnTypes.hpp"
  144. diff --git a/Hydrogent/interface/HnTextureRegistry.hpp b/Hydrogent/interface/HnTextureRegistry.hpp
  145. index 4bdc5c5..1fbdd29 100644
  146. --- a/Hydrogent/interface/HnTextureRegistry.hpp
  147. +++ b/Hydrogent/interface/HnTextureRegistry.hpp
  148. @@ -35,11 +35,11 @@
  149. #include "pxr/base/tf/token.h"
  150. #include "pxr/imaging/hd/types.h"
  151. -#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/RenderDevice.h"
  152. -#include "../../../DiligentCore/Graphics/GraphicsEngine/interface/DeviceContext.h"
  153. -#include "../../../DiligentCore/Common/interface/RefCntAutoPtr.hpp"
  154. -#include "../../../DiligentCore/Common/interface/ObjectsRegistry.hpp"
  155. -#include "../../../DiligentTools/TextureLoader/interface/TextureLoader.h"
  156. +#include "DiligentCore/Graphics/GraphicsEngine/interface/RenderDevice.h"
  157. +#include "DiligentCore/Graphics/GraphicsEngine/interface/DeviceContext.h"
  158. +#include "DiligentCore/Common/interface/RefCntAutoPtr.hpp"
  159. +#include "DiligentCore/Common/interface/ObjectsRegistry.hpp"
  160. +#include "DiligentTools/TextureLoader/interface/TextureLoader.h"
  161. namespace Diligent
  162. {
  163. diff --git a/Hydrogent/interface/HnTypes.hpp b/Hydrogent/interface/HnTypes.hpp
  164. index ae923de..04a438e 100644
  165. --- a/Hydrogent/interface/HnTypes.hpp
  166. +++ b/Hydrogent/interface/HnTypes.hpp
  167. @@ -26,7 +26,7 @@
  168. #pragma once
  169. -#include "../../../Common/interface/BasicMath.hpp"
  170. +#include "DiligentCore/Common/interface/BasicMath.hpp"
  171. #include "pxr/usd/usd/stage.h"