From b7be696848f8dd3d44a1a886b2549a19d9abe568 Mon Sep 17 00:00:00 2001 From: kervala Date: Sun, 28 Oct 2012 11:55:21 +0100 Subject: [PATCH] Move all PACS headers in nel/include/pacs directory (fixes #2) --- code/nel/{src => include/nel}/pacs/build_indoor.h | 0 code/nel/{src => include/nel}/pacs/chain.h | 0 code/nel/{src => include/nel}/pacs/chain_quad.h | 0 .../{src => include/nel}/pacs/collision_callback.h | 0 .../nel/{src => include/nel}/pacs/collision_desc.h | 0 .../nel}/pacs/collision_mesh_build.h | 0 code/nel/{src => include/nel}/pacs/collision_ot.h | 0 .../nel}/pacs/collision_surface_temp.h | 0 code/nel/{src => include/nel}/pacs/edge_collide.h | 0 code/nel/{src => include/nel}/pacs/edge_quad.h | 0 code/nel/{src => include/nel}/pacs/exterior_mesh.h | 0 code/nel/{src => include/nel}/pacs/face_grid.h | 0 .../{src => include/nel}/pacs/global_retriever.h | 0 .../{src => include/nel}/pacs/local_retriever.h | 0 code/nel/{src => include/nel}/pacs/move_cell.h | 0 .../nel/{src => include/nel}/pacs/move_container.h | 0 .../nel}/pacs/move_container_inline.h | 0 code/nel/{src => include/nel}/pacs/move_element.h | 0 .../nel}/pacs/move_element_inline.h | 0 .../nel/{src => include/nel}/pacs/move_primitive.h | 0 .../{src => include/nel}/pacs/primitive_block.h | 0 .../nel}/pacs/primitive_world_image.h | 0 code/nel/{src => include/nel}/pacs/quad_grid.h | 0 .../nel}/pacs/retrievable_surface.h | 0 .../nel/{src => include/nel}/pacs/retriever_bank.h | 0 .../{src => include/nel}/pacs/retriever_instance.h | 0 code/nel/{src => include/nel}/pacs/surface_quad.h | 0 code/nel/{src => include/nel}/pacs/vector_2s.h | 0 code/nel/src/pacs/build_indoor.cpp | 8 ++++---- code/nel/src/pacs/chain.cpp | 2 +- code/nel/src/pacs/chain_quad.cpp | 2 +- code/nel/src/pacs/collision_callback.cpp | 2 +- code/nel/src/pacs/collision_desc.cpp | 2 +- code/nel/src/pacs/collision_ot.cpp | 4 ++-- code/nel/src/pacs/collision_surface_temp.cpp | 2 +- code/nel/src/pacs/edge_collide.cpp | 2 +- code/nel/src/pacs/edge_quad.cpp | 4 ++-- code/nel/src/pacs/exterior_mesh.cpp | 6 +++--- code/nel/src/pacs/global_retriever.cpp | 4 ++-- code/nel/src/pacs/local_retriever.cpp | 6 +++--- code/nel/src/pacs/move_cell.cpp | 6 +++--- code/nel/src/pacs/move_container.cpp | 6 +++--- code/nel/src/pacs/move_element.cpp | 4 ++-- code/nel/src/pacs/move_primitive.cpp | 6 +++--- code/nel/src/pacs/primitive_block_pacs.cpp | 2 +- code/nel/src/pacs/primitive_world_image.cpp | 6 +++--- code/nel/src/pacs/retrievable_surface.cpp | 2 +- code/nel/src/pacs/retriever_bank.cpp | 2 +- code/nel/src/pacs/retriever_instance.cpp | 4 ++-- code/nel/src/pacs/surface_quad.cpp | 2 +- code/nel/src/pacs/vector_2s.cpp | 2 +- code/nel/tools/3d/ig_lighter/ig_lighter.cpp | 6 +++--- .../nel/tools/3d/ig_lighter_lib/ig_lighter_lib.cpp | 4 ++-- code/nel/tools/3d/object_viewer/object_viewer.cpp | 2 +- .../plugin_max/nel_export/nel_export_collision.cpp | 4 ++-- .../3d/plugin_max/nel_export/nel_export_view.cpp | 4 ++-- .../plugin_max/nel_mesh_lib/export_collision.cpp | 13 +++++-------- .../tools/3d/plugin_max/nel_mesh_lib/export_nel.h | 2 +- .../pacs/build_indoor_rbank/build_surfaces.cpp | 10 +++++----- .../tools/pacs/build_indoor_rbank/build_surfaces.h | 2 +- code/nel/tools/pacs/build_indoor_rbank/main.cpp | 10 +++++----- code/nel/tools/pacs/build_indoor_rbank/mouline.cpp | 6 +++--- code/nel/tools/pacs/build_rbank/build_rbank.cpp | 14 +++++++------- code/nel/tools/pacs/build_rbank/build_surf.cpp | 2 +- code/nel/tools/pacs/build_rbank/build_surf.h | 4 ++-- code/nel/tools/pacs/build_rbank/main.cpp | 10 +++++----- code/nel/tools/pacs/build_rbank/surface_splitter.h | 4 ++-- .../ryzom/server/src/ai_data_service/pacs_scan.cpp | 2 +- .../world_editor/land_export_lib/export.cpp | 2 +- 69 files changed, 92 insertions(+), 95 deletions(-) rename code/nel/{src => include/nel}/pacs/build_indoor.h (100%) rename code/nel/{src => include/nel}/pacs/chain.h (100%) rename code/nel/{src => include/nel}/pacs/chain_quad.h (100%) rename code/nel/{src => include/nel}/pacs/collision_callback.h (100%) rename code/nel/{src => include/nel}/pacs/collision_desc.h (100%) rename code/nel/{src => include/nel}/pacs/collision_mesh_build.h (100%) rename code/nel/{src => include/nel}/pacs/collision_ot.h (100%) rename code/nel/{src => include/nel}/pacs/collision_surface_temp.h (100%) rename code/nel/{src => include/nel}/pacs/edge_collide.h (100%) rename code/nel/{src => include/nel}/pacs/edge_quad.h (100%) rename code/nel/{src => include/nel}/pacs/exterior_mesh.h (100%) rename code/nel/{src => include/nel}/pacs/face_grid.h (100%) rename code/nel/{src => include/nel}/pacs/global_retriever.h (100%) rename code/nel/{src => include/nel}/pacs/local_retriever.h (100%) rename code/nel/{src => include/nel}/pacs/move_cell.h (100%) rename code/nel/{src => include/nel}/pacs/move_container.h (100%) rename code/nel/{src => include/nel}/pacs/move_container_inline.h (100%) rename code/nel/{src => include/nel}/pacs/move_element.h (100%) rename code/nel/{src => include/nel}/pacs/move_element_inline.h (100%) rename code/nel/{src => include/nel}/pacs/move_primitive.h (100%) rename code/nel/{src => include/nel}/pacs/primitive_block.h (100%) rename code/nel/{src => include/nel}/pacs/primitive_world_image.h (100%) rename code/nel/{src => include/nel}/pacs/quad_grid.h (100%) rename code/nel/{src => include/nel}/pacs/retrievable_surface.h (100%) rename code/nel/{src => include/nel}/pacs/retriever_bank.h (100%) rename code/nel/{src => include/nel}/pacs/retriever_instance.h (100%) rename code/nel/{src => include/nel}/pacs/surface_quad.h (100%) rename code/nel/{src => include/nel}/pacs/vector_2s.h (100%) diff --git a/code/nel/src/pacs/build_indoor.h b/code/nel/include/nel/pacs/build_indoor.h similarity index 100% rename from code/nel/src/pacs/build_indoor.h rename to code/nel/include/nel/pacs/build_indoor.h diff --git a/code/nel/src/pacs/chain.h b/code/nel/include/nel/pacs/chain.h similarity index 100% rename from code/nel/src/pacs/chain.h rename to code/nel/include/nel/pacs/chain.h diff --git a/code/nel/src/pacs/chain_quad.h b/code/nel/include/nel/pacs/chain_quad.h similarity index 100% rename from code/nel/src/pacs/chain_quad.h rename to code/nel/include/nel/pacs/chain_quad.h diff --git a/code/nel/src/pacs/collision_callback.h b/code/nel/include/nel/pacs/collision_callback.h similarity index 100% rename from code/nel/src/pacs/collision_callback.h rename to code/nel/include/nel/pacs/collision_callback.h diff --git a/code/nel/src/pacs/collision_desc.h b/code/nel/include/nel/pacs/collision_desc.h similarity index 100% rename from code/nel/src/pacs/collision_desc.h rename to code/nel/include/nel/pacs/collision_desc.h diff --git a/code/nel/src/pacs/collision_mesh_build.h b/code/nel/include/nel/pacs/collision_mesh_build.h similarity index 100% rename from code/nel/src/pacs/collision_mesh_build.h rename to code/nel/include/nel/pacs/collision_mesh_build.h diff --git a/code/nel/src/pacs/collision_ot.h b/code/nel/include/nel/pacs/collision_ot.h similarity index 100% rename from code/nel/src/pacs/collision_ot.h rename to code/nel/include/nel/pacs/collision_ot.h diff --git a/code/nel/src/pacs/collision_surface_temp.h b/code/nel/include/nel/pacs/collision_surface_temp.h similarity index 100% rename from code/nel/src/pacs/collision_surface_temp.h rename to code/nel/include/nel/pacs/collision_surface_temp.h diff --git a/code/nel/src/pacs/edge_collide.h b/code/nel/include/nel/pacs/edge_collide.h similarity index 100% rename from code/nel/src/pacs/edge_collide.h rename to code/nel/include/nel/pacs/edge_collide.h diff --git a/code/nel/src/pacs/edge_quad.h b/code/nel/include/nel/pacs/edge_quad.h similarity index 100% rename from code/nel/src/pacs/edge_quad.h rename to code/nel/include/nel/pacs/edge_quad.h diff --git a/code/nel/src/pacs/exterior_mesh.h b/code/nel/include/nel/pacs/exterior_mesh.h similarity index 100% rename from code/nel/src/pacs/exterior_mesh.h rename to code/nel/include/nel/pacs/exterior_mesh.h diff --git a/code/nel/src/pacs/face_grid.h b/code/nel/include/nel/pacs/face_grid.h similarity index 100% rename from code/nel/src/pacs/face_grid.h rename to code/nel/include/nel/pacs/face_grid.h diff --git a/code/nel/src/pacs/global_retriever.h b/code/nel/include/nel/pacs/global_retriever.h similarity index 100% rename from code/nel/src/pacs/global_retriever.h rename to code/nel/include/nel/pacs/global_retriever.h diff --git a/code/nel/src/pacs/local_retriever.h b/code/nel/include/nel/pacs/local_retriever.h similarity index 100% rename from code/nel/src/pacs/local_retriever.h rename to code/nel/include/nel/pacs/local_retriever.h diff --git a/code/nel/src/pacs/move_cell.h b/code/nel/include/nel/pacs/move_cell.h similarity index 100% rename from code/nel/src/pacs/move_cell.h rename to code/nel/include/nel/pacs/move_cell.h diff --git a/code/nel/src/pacs/move_container.h b/code/nel/include/nel/pacs/move_container.h similarity index 100% rename from code/nel/src/pacs/move_container.h rename to code/nel/include/nel/pacs/move_container.h diff --git a/code/nel/src/pacs/move_container_inline.h b/code/nel/include/nel/pacs/move_container_inline.h similarity index 100% rename from code/nel/src/pacs/move_container_inline.h rename to code/nel/include/nel/pacs/move_container_inline.h diff --git a/code/nel/src/pacs/move_element.h b/code/nel/include/nel/pacs/move_element.h similarity index 100% rename from code/nel/src/pacs/move_element.h rename to code/nel/include/nel/pacs/move_element.h diff --git a/code/nel/src/pacs/move_element_inline.h b/code/nel/include/nel/pacs/move_element_inline.h similarity index 100% rename from code/nel/src/pacs/move_element_inline.h rename to code/nel/include/nel/pacs/move_element_inline.h diff --git a/code/nel/src/pacs/move_primitive.h b/code/nel/include/nel/pacs/move_primitive.h similarity index 100% rename from code/nel/src/pacs/move_primitive.h rename to code/nel/include/nel/pacs/move_primitive.h diff --git a/code/nel/src/pacs/primitive_block.h b/code/nel/include/nel/pacs/primitive_block.h similarity index 100% rename from code/nel/src/pacs/primitive_block.h rename to code/nel/include/nel/pacs/primitive_block.h diff --git a/code/nel/src/pacs/primitive_world_image.h b/code/nel/include/nel/pacs/primitive_world_image.h similarity index 100% rename from code/nel/src/pacs/primitive_world_image.h rename to code/nel/include/nel/pacs/primitive_world_image.h diff --git a/code/nel/src/pacs/quad_grid.h b/code/nel/include/nel/pacs/quad_grid.h similarity index 100% rename from code/nel/src/pacs/quad_grid.h rename to code/nel/include/nel/pacs/quad_grid.h diff --git a/code/nel/src/pacs/retrievable_surface.h b/code/nel/include/nel/pacs/retrievable_surface.h similarity index 100% rename from code/nel/src/pacs/retrievable_surface.h rename to code/nel/include/nel/pacs/retrievable_surface.h diff --git a/code/nel/src/pacs/retriever_bank.h b/code/nel/include/nel/pacs/retriever_bank.h similarity index 100% rename from code/nel/src/pacs/retriever_bank.h rename to code/nel/include/nel/pacs/retriever_bank.h diff --git a/code/nel/src/pacs/retriever_instance.h b/code/nel/include/nel/pacs/retriever_instance.h similarity index 100% rename from code/nel/src/pacs/retriever_instance.h rename to code/nel/include/nel/pacs/retriever_instance.h diff --git a/code/nel/src/pacs/surface_quad.h b/code/nel/include/nel/pacs/surface_quad.h similarity index 100% rename from code/nel/src/pacs/surface_quad.h rename to code/nel/include/nel/pacs/surface_quad.h diff --git a/code/nel/src/pacs/vector_2s.h b/code/nel/include/nel/pacs/vector_2s.h similarity index 100% rename from code/nel/src/pacs/vector_2s.h rename to code/nel/include/nel/pacs/vector_2s.h diff --git a/code/nel/src/pacs/build_indoor.cpp b/code/nel/src/pacs/build_indoor.cpp index 51dbdf4c0..b4bad19a6 100644 --- a/code/nel/src/pacs/build_indoor.cpp +++ b/code/nel/src/pacs/build_indoor.cpp @@ -15,11 +15,11 @@ // along with this program. If not, see . #include "stdpacs.h" -#include "build_indoor.h" +#include "nel/pacs/build_indoor.h" -#include "collision_mesh_build.h" -#include "local_retriever.h" -#include "exterior_mesh.h" +#include "nel/pacs/collision_mesh_build.h" +#include "nel/pacs/local_retriever.h" +#include "nel/pacs/exterior_mesh.h" using namespace std; using namespace NLMISC; diff --git a/code/nel/src/pacs/chain.cpp b/code/nel/src/pacs/chain.cpp index 1543d68ab..f908cc875 100644 --- a/code/nel/src/pacs/chain.cpp +++ b/code/nel/src/pacs/chain.cpp @@ -16,7 +16,7 @@ #include "stdpacs.h" -#include "chain.h" +#include "nel/pacs/chain.h" using namespace std; using namespace NLMISC; diff --git a/code/nel/src/pacs/chain_quad.cpp b/code/nel/src/pacs/chain_quad.cpp index 29468fa1f..321761953 100644 --- a/code/nel/src/pacs/chain_quad.cpp +++ b/code/nel/src/pacs/chain_quad.cpp @@ -16,7 +16,7 @@ #include "stdpacs.h" -#include "chain_quad.h" +#include "nel/pacs/chain_quad.h" using namespace std; using namespace NLMISC; diff --git a/code/nel/src/pacs/collision_callback.cpp b/code/nel/src/pacs/collision_callback.cpp index 2d5fc2485..016cda262 100644 --- a/code/nel/src/pacs/collision_callback.cpp +++ b/code/nel/src/pacs/collision_callback.cpp @@ -16,7 +16,7 @@ #include "stdpacs.h" -#include "collision_callback.h" +#include "nel/pacs/collision_callback.h" namespace NLPACS diff --git a/code/nel/src/pacs/collision_desc.cpp b/code/nel/src/pacs/collision_desc.cpp index e501dd716..c38049623 100644 --- a/code/nel/src/pacs/collision_desc.cpp +++ b/code/nel/src/pacs/collision_desc.cpp @@ -16,7 +16,7 @@ #include "stdpacs.h" -#include "collision_desc.h" +#include "nel/pacs/collision_desc.h" namespace NLPACS diff --git a/code/nel/src/pacs/collision_ot.cpp b/code/nel/src/pacs/collision_ot.cpp index 95f15359c..74f93f498 100644 --- a/code/nel/src/pacs/collision_ot.cpp +++ b/code/nel/src/pacs/collision_ot.cpp @@ -16,8 +16,8 @@ #include "stdpacs.h" -#include "collision_ot.h" -#include "move_primitive.h" +#include "nel/pacs/collision_ot.h" +#include "nel/pacs/move_primitive.h" namespace NLPACS diff --git a/code/nel/src/pacs/collision_surface_temp.cpp b/code/nel/src/pacs/collision_surface_temp.cpp index 92f869c2c..4033cc33f 100644 --- a/code/nel/src/pacs/collision_surface_temp.cpp +++ b/code/nel/src/pacs/collision_surface_temp.cpp @@ -16,7 +16,7 @@ #include "stdpacs.h" -#include "collision_surface_temp.h" +#include "nel/pacs/collision_surface_temp.h" namespace NLPACS diff --git a/code/nel/src/pacs/edge_collide.cpp b/code/nel/src/pacs/edge_collide.cpp index f785e97db..700935947 100644 --- a/code/nel/src/pacs/edge_collide.cpp +++ b/code/nel/src/pacs/edge_collide.cpp @@ -16,7 +16,7 @@ #include "stdpacs.h" -#include "edge_collide.h" +#include "nel/pacs/edge_collide.h" using namespace NLMISC; using namespace std; diff --git a/code/nel/src/pacs/edge_quad.cpp b/code/nel/src/pacs/edge_quad.cpp index 9bd60b54b..1515af075 100644 --- a/code/nel/src/pacs/edge_quad.cpp +++ b/code/nel/src/pacs/edge_quad.cpp @@ -16,8 +16,8 @@ #include "stdpacs.h" -#include "edge_quad.h" -#include "global_retriever.h" +#include "nel/pacs/edge_quad.h" +#include "nel/pacs/global_retriever.h" using namespace std; using namespace NLMISC; diff --git a/code/nel/src/pacs/exterior_mesh.cpp b/code/nel/src/pacs/exterior_mesh.cpp index a53873e77..d7c72c96f 100644 --- a/code/nel/src/pacs/exterior_mesh.cpp +++ b/code/nel/src/pacs/exterior_mesh.cpp @@ -16,9 +16,9 @@ #include "stdpacs.h" -#include "exterior_mesh.h" -#include "local_retriever.h" -#include "collision_desc.h" +#include "nel/pacs/exterior_mesh.h" +#include "nel/pacs/local_retriever.h" +#include "nel/pacs/collision_desc.h" using namespace std; diff --git a/code/nel/src/pacs/global_retriever.cpp b/code/nel/src/pacs/global_retriever.cpp index b21b199ec..115fac0e6 100644 --- a/code/nel/src/pacs/global_retriever.cpp +++ b/code/nel/src/pacs/global_retriever.cpp @@ -16,8 +16,8 @@ #include "stdpacs.h" -#include "global_retriever.h" -#include "retriever_bank.h" +#include "nel/pacs/global_retriever.h" +#include "nel/pacs/retriever_bank.h" #include "nel/misc/async_file_manager.h" #include "nel/misc/common.h" diff --git a/code/nel/src/pacs/local_retriever.cpp b/code/nel/src/pacs/local_retriever.cpp index af087219f..7158cee0a 100644 --- a/code/nel/src/pacs/local_retriever.cpp +++ b/code/nel/src/pacs/local_retriever.cpp @@ -18,9 +18,9 @@ #include "nel/misc/plane.h" -#include "local_retriever.h" -#include "collision_desc.h" -#include "retriever_instance.h" +#include "nel/pacs/local_retriever.h" +#include "nel/pacs/collision_desc.h" +#include "nel/pacs/retriever_instance.h" #include "nel/misc/hierarchical_timer.h" diff --git a/code/nel/src/pacs/move_cell.cpp b/code/nel/src/pacs/move_cell.cpp index 2dcb1d987..436808754 100644 --- a/code/nel/src/pacs/move_cell.cpp +++ b/code/nel/src/pacs/move_cell.cpp @@ -16,9 +16,9 @@ #include "stdpacs.h" -#include "move_cell.h" -#include "move_element.h" -#include "move_primitive.h" +#include "nel/pacs/move_cell.h" +#include "nel/pacs/move_element.h" +#include "nel/pacs/move_primitive.h" namespace NLPACS { diff --git a/code/nel/src/pacs/move_container.cpp b/code/nel/src/pacs/move_container.cpp index 6e456a9e1..93e05794a 100644 --- a/code/nel/src/pacs/move_container.cpp +++ b/code/nel/src/pacs/move_container.cpp @@ -16,9 +16,9 @@ #include "stdpacs.h" -#include "move_primitive.h" -#include "move_element.h" -#include "primitive_block.h" +#include "nel/pacs/move_primitive.h" +#include "nel/pacs/move_element.h" +#include "nel/pacs/primitive_block.h" #include "nel/misc/hierarchical_timer.h" diff --git a/code/nel/src/pacs/move_element.cpp b/code/nel/src/pacs/move_element.cpp index e21162ab8..b64285769 100644 --- a/code/nel/src/pacs/move_element.cpp +++ b/code/nel/src/pacs/move_element.cpp @@ -16,8 +16,8 @@ #include "stdpacs.h" -#include "move_element.h" -#include "move_element_inline.h" +#include "nel/pacs/move_element.h" +#include "nel/pacs/move_element_inline.h" // leave not static else this workaround don't work diff --git a/code/nel/src/pacs/move_primitive.cpp b/code/nel/src/pacs/move_primitive.cpp index 661ffa1a4..08da7ac38 100644 --- a/code/nel/src/pacs/move_primitive.cpp +++ b/code/nel/src/pacs/move_primitive.cpp @@ -16,9 +16,9 @@ #include "stdpacs.h" -#include "move_primitive.h" -#include "collision_desc.h" -#include "move_element.h" +#include "nel/pacs/move_primitive.h" +#include "nel/pacs/collision_desc.h" +#include "nel/pacs/move_element.h" #include "nel/misc/hierarchical_timer.h" using namespace NLMISC; diff --git a/code/nel/src/pacs/primitive_block_pacs.cpp b/code/nel/src/pacs/primitive_block_pacs.cpp index 8cbf47c39..0681d2eea 100644 --- a/code/nel/src/pacs/primitive_block_pacs.cpp +++ b/code/nel/src/pacs/primitive_block_pacs.cpp @@ -16,7 +16,7 @@ #include "stdpacs.h" #include "nel/misc/i_xml.h" -#include "primitive_block.h" +#include "nel/pacs/primitive_block.h" namespace NLPACS diff --git a/code/nel/src/pacs/primitive_world_image.cpp b/code/nel/src/pacs/primitive_world_image.cpp index 050b8dd9f..e8d0378e6 100644 --- a/code/nel/src/pacs/primitive_world_image.cpp +++ b/code/nel/src/pacs/primitive_world_image.cpp @@ -18,9 +18,9 @@ #include "nel/misc/hierarchical_timer.h" -#include "primitive_world_image.h" -#include "move_primitive.h" -#include "move_element.h" +#include "nel/pacs/primitive_world_image.h" +#include "nel/pacs/move_primitive.h" +#include "nel/pacs/move_element.h" using namespace NLMISC; diff --git a/code/nel/src/pacs/retrievable_surface.cpp b/code/nel/src/pacs/retrievable_surface.cpp index 65ce01e55..308034083 100644 --- a/code/nel/src/pacs/retrievable_surface.cpp +++ b/code/nel/src/pacs/retrievable_surface.cpp @@ -16,7 +16,7 @@ #include "stdpacs.h" -#include "retrievable_surface.h" +#include "nel/pacs/retrievable_surface.h" using namespace std; using namespace NLMISC; diff --git a/code/nel/src/pacs/retriever_bank.cpp b/code/nel/src/pacs/retriever_bank.cpp index ab98323ad..03691aca2 100644 --- a/code/nel/src/pacs/retriever_bank.cpp +++ b/code/nel/src/pacs/retriever_bank.cpp @@ -20,7 +20,7 @@ #include "nel/misc/path.h" #include "nel/misc/progress_callback.h" -#include "retriever_bank.h" +#include "nel/pacs/retriever_bank.h" using namespace std; using namespace NLMISC; diff --git a/code/nel/src/pacs/retriever_instance.cpp b/code/nel/src/pacs/retriever_instance.cpp index 04b902ef9..d5d96510c 100644 --- a/code/nel/src/pacs/retriever_instance.cpp +++ b/code/nel/src/pacs/retriever_instance.cpp @@ -16,8 +16,8 @@ #include "stdpacs.h" -#include "retriever_instance.h" -#include "global_retriever.h" +#include "nel/pacs/retriever_instance.h" +#include "nel/pacs/global_retriever.h" using namespace std; using namespace NLMISC; diff --git a/code/nel/src/pacs/surface_quad.cpp b/code/nel/src/pacs/surface_quad.cpp index a7d22e1c2..dade8462c 100644 --- a/code/nel/src/pacs/surface_quad.cpp +++ b/code/nel/src/pacs/surface_quad.cpp @@ -15,7 +15,7 @@ // along with this program. If not, see . #include "stdpacs.h" -#include "surface_quad.h" +#include "nel/pacs/surface_quad.h" #include "nel/misc/file.h" diff --git a/code/nel/src/pacs/vector_2s.cpp b/code/nel/src/pacs/vector_2s.cpp index f63ba0c72..57e635f5d 100644 --- a/code/nel/src/pacs/vector_2s.cpp +++ b/code/nel/src/pacs/vector_2s.cpp @@ -16,7 +16,7 @@ #include "stdpacs.h" -#include "vector_2s.h" +#include "nel/pacs/vector_2s.h" namespace NLPACS { diff --git a/code/nel/tools/3d/ig_lighter/ig_lighter.cpp b/code/nel/tools/3d/ig_lighter/ig_lighter.cpp index 3041d3b49..a243ad7bc 100644 --- a/code/nel/tools/3d/ig_lighter/ig_lighter.cpp +++ b/code/nel/tools/3d/ig_lighter/ig_lighter.cpp @@ -27,9 +27,9 @@ #include "nel/3d/shape.h" #include "nel/3d/transform_shape.h" #include "nel/3d/register_3d.h" -#include "../../../src/pacs/global_retriever.h" -#include "../../../src/pacs/local_retriever.h" -#include "../../../src/pacs/retriever_bank.h" +#include "nel/pacs/global_retriever.h" +#include "nel/pacs/local_retriever.h" +#include "nel/pacs/retriever_bank.h" #include "../ig_lighter_lib/ig_lighter_lib.h" diff --git a/code/nel/tools/3d/ig_lighter_lib/ig_lighter_lib.cpp b/code/nel/tools/3d/ig_lighter_lib/ig_lighter_lib.cpp index c933947ed..4365eab9b 100644 --- a/code/nel/tools/3d/ig_lighter_lib/ig_lighter_lib.cpp +++ b/code/nel/tools/3d/ig_lighter_lib/ig_lighter_lib.cpp @@ -16,8 +16,8 @@ #include "ig_lighter_lib.h" #include "nel/misc/path.h" -#include "nel/../../src/pacs/retriever_bank.h" -#include "nel/../../src/pacs/global_retriever.h" +#include "nel/pacs/retriever_bank.h" +#include "nel/pacs/global_retriever.h" #include "nel/3d/scene_group.h" diff --git a/code/nel/tools/3d/object_viewer/object_viewer.cpp b/code/nel/tools/3d/object_viewer/object_viewer.cpp index 71aba41df..19490309b 100644 --- a/code/nel/tools/3d/object_viewer/object_viewer.cpp +++ b/code/nel/tools/3d/object_viewer/object_viewer.cpp @@ -54,7 +54,7 @@ #include "nel/3d/ps_util.h" -#include "nel/../../src/pacs/global_retriever.h" +#include "nel/pacs/global_retriever.h" diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export_collision.cpp b/code/nel/tools/3d/plugin_max/nel_export/nel_export_collision.cpp index 4aea7d654..8ff853031 100644 --- a/code/nel/tools/3d/plugin_max/nel_export/nel_export_collision.cpp +++ b/code/nel/tools/3d/plugin_max/nel_export/nel_export_collision.cpp @@ -19,8 +19,8 @@ #include "nel/misc/file.h" #include "nel/misc/o_xml.h" -#include "nel/../../src/pacs/collision_mesh_build.h" -#include "nel/../../src/pacs/primitive_block.h" +#include "nel/pacs/collision_mesh_build.h" +#include "nel/pacs/primitive_block.h" #include "../nel_mesh_lib/export_nel.h" #include "../nel_mesh_lib/export_appdata.h" diff --git a/code/nel/tools/3d/plugin_max/nel_export/nel_export_view.cpp b/code/nel/tools/3d/plugin_max/nel_export/nel_export_view.cpp index ae0b15263..81efc7d4c 100644 --- a/code/nel/tools/3d/plugin_max/nel_export/nel_export_view.cpp +++ b/code/nel/tools/3d/plugin_max/nel_export/nel_export_view.cpp @@ -25,8 +25,8 @@ #include "nel/3d/water_pool_manager.h" #include "nel/3d/instance_lighter.h" -#include "nel/../../src/pacs/retriever_bank.h" -#include "nel/../../src/pacs/global_retriever.h" +#include "nel/pacs/retriever_bank.h" +#include "nel/pacs/global_retriever.h" #include "../../object_viewer/object_viewer_interface.h" diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_collision.cpp b/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_collision.cpp index 16c3ae727..ecc9e8127 100644 --- a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_collision.cpp +++ b/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_collision.cpp @@ -14,9 +14,6 @@ // You should have received a copy of the GNU Affero General Public License // along with this program. If not, see . -#include -#include - #include "stdafx.h" #include "export_nel.h" #include "export_appdata.h" @@ -25,11 +22,11 @@ #include "../nel_export/nel_export.h" #include "../nel_export/nel_export_scene.h" -#include "nel/../../src/pacs/collision_mesh_build.h" -#include "nel/../../src/pacs/retriever_bank.h" -#include "nel/../../src/pacs/global_retriever.h" -#include "nel/../../src/pacs/build_indoor.h" -#include "nel/../../src/pacs/primitive_block.h" +#include "nel/pacs/collision_mesh_build.h" +#include "nel/pacs/retriever_bank.h" +#include "nel/pacs/global_retriever.h" +#include "nel/pacs/build_indoor.h" +#include "nel/pacs/primitive_block.h" #include "nel/3d/quad_grid.h" diff --git a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_nel.h b/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_nel.h index d9383fea2..11e762099 100644 --- a/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_nel.h +++ b/code/nel/tools/3d/plugin_max/nel_mesh_lib/export_nel.h @@ -27,7 +27,7 @@ #include "nel/3d/bone.h" #include "nel/3d/animation_time.h" #include "nel/3d/animation_time.h" -#include "nel/../../src/pacs/collision_mesh_build.h" +#include "nel/pacs/collision_mesh_build.h" #define UVGEN_MISSING (-1) #define UVGEN_REFLEXION (-2) diff --git a/code/nel/tools/pacs/build_indoor_rbank/build_surfaces.cpp b/code/nel/tools/pacs/build_indoor_rbank/build_surfaces.cpp index f6bb4681d..f553eaf47 100644 --- a/code/nel/tools/pacs/build_indoor_rbank/build_surfaces.cpp +++ b/code/nel/tools/pacs/build_indoor_rbank/build_surfaces.cpp @@ -17,11 +17,11 @@ #include #include -#include "nel/../../src/pacs/collision_mesh_build.h" -#include "nel/../../src/pacs/local_retriever.h" -#include "nel/../../src/pacs/exterior_mesh.h" -#include "nel/../../src/pacs/surface_quad.h" -#include "nel/../../src/pacs/chain.h" +#include "nel/pacs/collision_mesh_build.h" +#include "nel/pacs/local_retriever.h" +#include "nel/pacs/exterior_mesh.h" +#include "nel/pacs/surface_quad.h" +#include "nel/pacs/chain.h" #include "build_surfaces.h" diff --git a/code/nel/tools/pacs/build_indoor_rbank/build_surfaces.h b/code/nel/tools/pacs/build_indoor_rbank/build_surfaces.h index a3e86dd09..fdfbb2c21 100644 --- a/code/nel/tools/pacs/build_indoor_rbank/build_surfaces.h +++ b/code/nel/tools/pacs/build_indoor_rbank/build_surfaces.h @@ -23,7 +23,7 @@ #include "nel/misc/vector.h" #include "nel/misc/file.h" -#include "nel/../../src/pacs/collision_mesh_build.h" +#include "nel/pacs/collision_mesh_build.h" // External class declaration namespace NLPACS diff --git a/code/nel/tools/pacs/build_indoor_rbank/main.cpp b/code/nel/tools/pacs/build_indoor_rbank/main.cpp index a749572f7..2e797d61d 100644 --- a/code/nel/tools/pacs/build_indoor_rbank/main.cpp +++ b/code/nel/tools/pacs/build_indoor_rbank/main.cpp @@ -23,11 +23,11 @@ #include "nel/misc/time_nl.h" #include "nel/misc/file.h" -#include "nel/../../src/pacs/collision_mesh_build.h" -#include "nel/../../src/pacs/local_retriever.h" -#include "nel/../../src/pacs/retriever_instance.h" -#include "nel/../../src/pacs/global_retriever.h" -#include "nel/../../src/pacs/retriever_bank.h" +#include "nel/pacs/collision_mesh_build.h" +#include "nel/pacs/local_retriever.h" +#include "nel/pacs/retriever_instance.h" +#include "nel/pacs/global_retriever.h" +#include "nel/pacs/retriever_bank.h" #include "nel/pacs/u_global_position.h" diff --git a/code/nel/tools/pacs/build_indoor_rbank/mouline.cpp b/code/nel/tools/pacs/build_indoor_rbank/mouline.cpp index 8322daa33..57592a431 100644 --- a/code/nel/tools/pacs/build_indoor_rbank/mouline.cpp +++ b/code/nel/tools/pacs/build_indoor_rbank/mouline.cpp @@ -17,9 +17,9 @@ #include #include -#include "nel/../../src/pacs/collision_mesh_build.h" -#include "nel/../../src/pacs/local_retriever.h" -#include "nel/../../src/pacs/exterior_mesh.h" +#include "nel/pacs/collision_mesh_build.h" +#include "nel/pacs/local_retriever.h" +#include "nel/pacs/exterior_mesh.h" #include "mouline.h" #include "build_surfaces.h" diff --git a/code/nel/tools/pacs/build_rbank/build_rbank.cpp b/code/nel/tools/pacs/build_rbank/build_rbank.cpp index 7003e93d6..2285873c0 100644 --- a/code/nel/tools/pacs/build_rbank/build_rbank.cpp +++ b/code/nel/tools/pacs/build_rbank/build_rbank.cpp @@ -35,13 +35,13 @@ #include "surface_splitter.h" -#include "nel/../../src/pacs/global_retriever.h" -#include "nel/../../src/pacs/retriever_bank.h" -#include "nel/../../src/pacs/surface_quad.h" -#include "nel/../../src/pacs/local_retriever.h" -#include "nel/../../src/pacs/retriever_instance.h" -#include "nel/../../src/pacs/chain.h" -#include "nel/../../src/pacs/collision_mesh_build.h" +#include "nel/pacs/global_retriever.h" +#include "nel/pacs/retriever_bank.h" +#include "nel/pacs/surface_quad.h" +#include "nel/pacs/local_retriever.h" +#include "nel/pacs/retriever_instance.h" +#include "nel/pacs/chain.h" +#include "nel/pacs/collision_mesh_build.h" #include #include diff --git a/code/nel/tools/pacs/build_rbank/build_surf.cpp b/code/nel/tools/pacs/build_rbank/build_surf.cpp index 7500d1083..9546e19f1 100644 --- a/code/nel/tools/pacs/build_rbank/build_surf.cpp +++ b/code/nel/tools/pacs/build_rbank/build_surf.cpp @@ -31,7 +31,7 @@ #include "nel/3d/mesh.h" #include "nel/3d/quad_grid.h" -#include "nel/../../src/pacs/vector_2s.h" +#include "nel/pacs/vector_2s.h" #include "build_surf.h" diff --git a/code/nel/tools/pacs/build_rbank/build_surf.h b/code/nel/tools/pacs/build_rbank/build_surf.h index 2e0588546..ad0342b1e 100644 --- a/code/nel/tools/pacs/build_rbank/build_surf.h +++ b/code/nel/tools/pacs/build_rbank/build_surf.h @@ -35,8 +35,8 @@ #include "nel/misc/geom_ext.h" #include "nel/misc/polygon.h" -#include "nel/../../src/pacs/surface_quad.h" -#include "nel/../../src/pacs/retrievable_surface.h" +#include "nel/pacs/surface_quad.h" +#include "nel/pacs/retrievable_surface.h" #include "prim_checker.h" diff --git a/code/nel/tools/pacs/build_rbank/main.cpp b/code/nel/tools/pacs/build_rbank/main.cpp index ef805e8e0..8421ed807 100644 --- a/code/nel/tools/pacs/build_rbank/main.cpp +++ b/code/nel/tools/pacs/build_rbank/main.cpp @@ -29,11 +29,11 @@ #include "build_rbank.h" #include "prim_checker.h" -#include "nel/../../src/pacs/global_retriever.h" -#include "nel/../../src/pacs/retriever_bank.h" -#include "nel/../../src/pacs/surface_quad.h" -#include "nel/../../src/pacs/local_retriever.h" -#include "nel/../../src/pacs/retriever_instance.h" +#include "nel/pacs/global_retriever.h" +#include "nel/pacs/retriever_bank.h" +#include "nel/pacs/surface_quad.h" +#include "nel/pacs/local_retriever.h" +#include "nel/pacs/retriever_instance.h" #include #include diff --git a/code/nel/tools/pacs/build_rbank/surface_splitter.h b/code/nel/tools/pacs/build_rbank/surface_splitter.h index 0aea88968..3cf035e9d 100644 --- a/code/nel/tools/pacs/build_rbank/surface_splitter.h +++ b/code/nel/tools/pacs/build_rbank/surface_splitter.h @@ -19,8 +19,8 @@ #include "nel/misc/types_nl.h" -#include "../../../src/pacs/local_retriever.h" -#include "../../../src/pacs/quad_grid.h" +#include "nel/pacs/local_retriever.h" +#include "nel/pacs/quad_grid.h" #include diff --git a/code/ryzom/server/src/ai_data_service/pacs_scan.cpp b/code/ryzom/server/src/ai_data_service/pacs_scan.cpp index c65636565..6a15900d0 100644 --- a/code/ryzom/server/src/ai_data_service/pacs_scan.cpp +++ b/code/ryzom/server/src/ai_data_service/pacs_scan.cpp @@ -39,7 +39,7 @@ #include "nel/pacs/u_retriever_bank.h" #include "nel/pacs/u_primitive_block.h" -#include "nel/../../src/pacs/global_retriever.h" +#include "nel/pacs/global_retriever.h" // Nel Ligo diff --git a/code/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp b/code/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp index 64e156909..1b0d6c078 100644 --- a/code/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp +++ b/code/ryzom/tools/leveldesign/world_editor/land_export_lib/export.cpp @@ -34,7 +34,7 @@ #include "nel/ligo/zone_region.h" #include "nel/ligo/zone_bank.h" -#include "nel/../../src/pacs/collision_mesh_build.h" +#include "nel/pacs/collision_mesh_build.h" #include "../../../leveldesign/export/tools.h"