From 5cc2b2865f03729c1327d1da39e9d0ea62e7fe9b Mon Sep 17 00:00:00 2001 From: kervala Date: Tue, 19 Jan 2016 20:38:05 +0100 Subject: [PATCH] Changed: Local includes against system includes --HG-- branch : develop --- code/nel/src/3d/fxaa.cpp | 16 ++++++++-------- code/nel/src/3d/geometry_program.cpp | 4 ++-- code/nel/src/3d/pixel_program.cpp | 4 ++-- code/nel/src/3d/stereo_debugger.cpp | 18 +++++++++--------- code/nel/src/3d/stereo_display.cpp | 10 +++++----- code/nel/src/3d/stereo_hmd.cpp | 2 +- code/nel/src/3d/stereo_libvr.cpp | 18 +++++++++--------- code/nel/src/3d/stereo_ovr.cpp | 16 ++++++++-------- code/nel/src/3d/stereo_ovr_04.cpp | 16 ++++++++-------- 9 files changed, 52 insertions(+), 52 deletions(-) diff --git a/code/nel/src/3d/fxaa.cpp b/code/nel/src/3d/fxaa.cpp index 9acbd6870..1eff22501 100644 --- a/code/nel/src/3d/fxaa.cpp +++ b/code/nel/src/3d/fxaa.cpp @@ -34,14 +34,14 @@ // #include // Project includes -#include -#include -#include -#include -#include -#include -#include -#include +#include "nel/3d/u_camera.h" +#include "nel/3d/u_driver.h" +#include "nel/3d/material.h" +#include "nel/3d/texture_bloom.h" +#include "nel/3d/texture_user.h" +#include "nel/3d/driver_user.h" +#include "nel/3d/u_texture.h" +#include "nel/3d/render_target_manager.h" using namespace std; // using namespace NLMISC; diff --git a/code/nel/src/3d/geometry_program.cpp b/code/nel/src/3d/geometry_program.cpp index 26fb15ae9..8f785b6c6 100644 --- a/code/nel/src/3d/geometry_program.cpp +++ b/code/nel/src/3d/geometry_program.cpp @@ -23,9 +23,9 @@ #include "std3d.h" -#include +#include "nel/3d/geometry_program.h" -#include +#include "nel/3d/driver.h" namespace NL3D { diff --git a/code/nel/src/3d/pixel_program.cpp b/code/nel/src/3d/pixel_program.cpp index adb2163e5..120e7def6 100644 --- a/code/nel/src/3d/pixel_program.cpp +++ b/code/nel/src/3d/pixel_program.cpp @@ -23,9 +23,9 @@ #include "std3d.h" -#include +#include "nel/3d/pixel_program.h" -#include +#include "nel/3d/driver.h" namespace NL3D { diff --git a/code/nel/src/3d/stereo_debugger.cpp b/code/nel/src/3d/stereo_debugger.cpp index 6650e1c2b..138f8e3ae 100644 --- a/code/nel/src/3d/stereo_debugger.cpp +++ b/code/nel/src/3d/stereo_debugger.cpp @@ -27,7 +27,7 @@ #if !FINAL_VERSION #include "std3d.h" -#include +#include "nel/3d/stereo_debugger.h" // STL includes @@ -35,14 +35,14 @@ // #include // Project includes -#include -#include -#include -#include -#include -#include -#include -#include +#include "nel/3d/u_camera.h" +#include "nel/3d/u_driver.h" +#include "nel/3d/material.h" +#include "nel/3d/texture_bloom.h" +#include "nel/3d/texture_user.h" +#include "nel/3d/driver_user.h" +#include "nel/3d/u_texture.h" +#include "nel/3d/render_target_manager.h" using namespace std; // using namespace NLMISC; diff --git a/code/nel/src/3d/stereo_display.cpp b/code/nel/src/3d/stereo_display.cpp index 2a79c1039..dede3fbf6 100644 --- a/code/nel/src/3d/stereo_display.cpp +++ b/code/nel/src/3d/stereo_display.cpp @@ -26,7 +26,7 @@ */ #include "std3d.h" -#include +#include "nel/3d/stereo_display.h" // STL includes @@ -34,10 +34,10 @@ // #include // Project includes -#include -#include -#include -#include +#include "nel/3d/stereo_ovr.h" +#include "nel/3d/stereo_ovr_04.h" +#include "nel/3d/stereo_libvr.h" +#include "nel/3d/stereo_debugger.h" using namespace std; // using namespace NLMISC; diff --git a/code/nel/src/3d/stereo_hmd.cpp b/code/nel/src/3d/stereo_hmd.cpp index 25249e2b4..207965636 100644 --- a/code/nel/src/3d/stereo_hmd.cpp +++ b/code/nel/src/3d/stereo_hmd.cpp @@ -26,7 +26,7 @@ */ #include "std3d.h" -#include +#include "nel/3d/stereo_hmd.h" // STL includes diff --git a/code/nel/src/3d/stereo_libvr.cpp b/code/nel/src/3d/stereo_libvr.cpp index c655f959c..2f31beac4 100644 --- a/code/nel/src/3d/stereo_libvr.cpp +++ b/code/nel/src/3d/stereo_libvr.cpp @@ -28,8 +28,8 @@ #ifdef HAVE_LIBVR #include "std3d.h" -#include -#include +#include "nel/misc/time_nl.h" +#include "nel/3d/stereo_libvr.h" // STL includes #include @@ -41,13 +41,13 @@ extern "C" { // NeL includes // #include -#include -#include -#include -#include -#include -#include -#include +#include "nel/3d/u_camera.h" +#include "nel/3d/u_driver.h" +#include "nel/3d/material.h" +#include "nel/3d/texture_bloom.h" +#include "nel/3d/texture_user.h" +#include "nel/3d/driver_user.h" +#include "nel/3d/u_texture.h" // Project includes diff --git a/code/nel/src/3d/stereo_ovr.cpp b/code/nel/src/3d/stereo_ovr.cpp index f4b910bc6..103b44696 100644 --- a/code/nel/src/3d/stereo_ovr.cpp +++ b/code/nel/src/3d/stereo_ovr.cpp @@ -44,7 +44,7 @@ #ifdef HAVE_LIBOVR_02 #include "std3d.h" -#include +#include "nel/3d/stereo_ovr.h" // STL includes #include @@ -55,13 +55,13 @@ // NeL includes // #include -#include -#include -#include -#include -#include -#include -#include +#include "nel/3d/u_camera.h" +#include "nel/3d/u_driver.h" +#include "nel/3d/material.h" +#include "nel/3d/texture_bloom.h" +#include "nel/3d/texture_user.h" +#include "nel/3d/driver_user.h" +#include "nel/3d/u_texture.h" // Project includes diff --git a/code/nel/src/3d/stereo_ovr_04.cpp b/code/nel/src/3d/stereo_ovr_04.cpp index 121855fb8..fcccc2f6b 100644 --- a/code/nel/src/3d/stereo_ovr_04.cpp +++ b/code/nel/src/3d/stereo_ovr_04.cpp @@ -44,7 +44,7 @@ #ifdef HAVE_LIBOVR #include "std3d.h" -#include +#include "nel/3d/stereo_ovr_04.h" // STL includes #include @@ -55,13 +55,13 @@ // NeL includes // #include -#include -#include -#include -#include -#include -#include -#include +#include "nel/3d/u_camera.h" +#include "nel/3d/u_driver.h" +#include "nel/3d/material.h" +#include "nel/3d/texture_bloom.h" +#include "nel/3d/texture_user.h" +#include "nel/3d/driver_user.h" +#include "nel/3d/u_texture.h" // Project includes