Clean-up include dependencies (video namespace)

git-svn-id: svn://svn.code.sf.net/p/irrlicht/code/trunk@6528 dfc29bdd-3216-0410-991c-e03cc46cb475

source/Irrlicht/CColorConverter.cpp

@@ -3,9 +3,8 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #include "CColorConverter.h"
-#include "SColor.h"
+#include "IImage.h"
 #include "os.h"
-#include "irrString.h"
 
 namespace irr
 {

source/Irrlicht/CColorConverter.h

@@ -6,7 +6,7 @@
 #define IRR_C_COLOR_CONVERTER_H_INCLUDED
 
 #include "irrTypes.h"
-#include "IImage.h"
+#include "SColor.h"
 
 namespace irr
 {

source/Irrlicht/CImage.cpp

@@ -3,7 +3,6 @@
 // For conditions of distribution and use, see copyright notice in irrlicht.h
 
 #include "CImage.h"
-#include "irrString.h"
 #include "CColorConverter.h"
 #include "CBlit.h"
 #include "os.h"

source/Irrlicht/CImageLoaderBMP.cpp

@@ -11,7 +11,6 @@
 #include "CColorConverter.h"
 #include "CImage.h"
 #include "os.h"
-#include "irrString.h"
 
 namespace irr
 {

source/Irrlicht/CImageLoaderDDS.cpp

@@ -18,9 +18,7 @@
 
 #include "IReadFile.h"
 #include "os.h"
-#include "CColorConverter.h"
 #include "CImage.h"
-#include "irrString.h"
 
 // Header flag values
 #define DDSD_CAPS			0x00000001
@@ -721,9 +719,8 @@ IImage* CImageLoaderDDS::loadImage(io::IReadFile* file) const
 
 		image = new CImage(ECF_A8R8G8B8, core::dimension2d<u32>(width, height));
 
-		if (DDSDecompress(&header, memFile, (u8*)image->lock()) == -1)
+		if (DDSDecompress(&header, memFile, (u8*)image->getData()) == -1)
 		{
-			image->unlock();
 			image->drop();
 			image = 0;
 		}

source/Irrlicht/CImageLoaderPCX.cpp

@@ -11,7 +11,6 @@
 #include "CColorConverter.h"
 #include "CImage.h"
 #include "os.h"
-#include "irrString.h"
 
 
 namespace irr

source/Irrlicht/CImageLoaderPNG.cpp

@@ -15,7 +15,7 @@
 #endif // _IRR_COMPILE_WITH_LIBPNG_
 
 #include "CImage.h"
-#include "CReadFile.h"
+#include "IReadFile.h"
 #include "os.h"
 
 namespace irr

source/Irrlicht/CImageLoaderPSD.cpp

@@ -9,7 +9,6 @@
 #include "IReadFile.h"
 #include "os.h"
 #include "CImage.h"
-#include "irrString.h"
 
 
 namespace irr

source/Irrlicht/CImageLoaderPVR.cpp

@@ -9,7 +9,6 @@
 #include "IReadFile.h"
 #include "os.h"
 #include "CImage.h"
-#include "irrString.h"
 
 namespace irr
 {

source/Irrlicht/CImageLoaderRGB.cpp

@@ -130,7 +130,6 @@ DUMMY -		This 404 bytes of data should be set to 0. This makes the Header exactl
 #include "CColorConverter.h"
 #include "CImage.h"
 #include "os.h"
-#include "irrString.h"
 
 
 namespace irr

source/Irrlicht/CImageLoaderTGA.cpp

@@ -10,7 +10,6 @@
 #include "os.h"
 #include "CColorConverter.h"
 #include "CImage.h"
-#include "irrString.h"
 
 
 namespace irr

source/Irrlicht/CImageLoaderWAL.cpp

@@ -9,8 +9,6 @@
 #include "CImage.h"
 #include "os.h"
 #include "dimension2d.h"
-#include "IVideoDriver.h"
-#include "IFileSystem.h"
 #include "IReadFile.h"
 #include "irrString.h"
 

source/Irrlicht/CImageWriterBMP.cpp

@@ -9,7 +9,6 @@
 #include "CImageLoaderBMP.h"
 #include "IWriteFile.h"
 #include "CColorConverter.h"
-#include "irrString.h"
 #include "os.h"
 
 namespace irr

source/Irrlicht/CImageWriterJPG.cpp

@@ -8,8 +8,7 @@
 
 #include "CColorConverter.h"
 #include "IWriteFile.h"
-#include "CImage.h"
-#include "irrString.h"
+#include "IImage.h"
 #include "os.h"
 
 #ifdef _IRR_COMPILE_WITH_LIBJPEG_

source/Irrlicht/CImageWriterPCX.cpp

@@ -6,10 +6,9 @@
 
 #ifdef _IRR_COMPILE_WITH_PCX_WRITER_
 
-#include "CImageLoaderPCX.h"
 #include "IWriteFile.h"
+#include "IImage.h"
 #include "os.h" // for logging
-#include "irrString.h"
 
 namespace irr
 {

source/Irrlicht/CImageWriterPNG.cpp

@@ -6,10 +6,9 @@
 
 #ifdef _IRR_COMPILE_WITH_PNG_WRITER_
 
-#include "CImageLoaderPNG.h"
+#include "IImage.h"
 #include "CColorConverter.h"
 #include "IWriteFile.h"
-#include "irrString.h"
 #include "os.h" // for logging
 
 #ifdef _IRR_COMPILE_WITH_LIBPNG_

source/Irrlicht/CImageWriterPPM.cpp

@@ -9,7 +9,6 @@
 #include "IWriteFile.h"
 #include "IImage.h"
 #include "dimension2d.h"
-#include "irrString.h"
 
 namespace irr
 {

source/Irrlicht/CImageWriterPSD.cpp

@@ -9,7 +9,6 @@
 #include "CImageLoaderPSD.h"
 #include "IWriteFile.h"
 #include "os.h" // for logging
-#include "irrString.h"
 
 namespace irr
 {

source/Irrlicht/CImageWriterTGA.cpp

@@ -9,7 +9,6 @@
 #include "CImageLoaderTGA.h"
 #include "IWriteFile.h"
 #include "CColorConverter.h"
-#include "irrString.h"
 #include "os.h"
 
 namespace irr

source/Irrlicht/CIrrDeviceWin32.h

@@ -9,7 +9,6 @@
 #ifdef _IRR_COMPILE_WITH_WINDOWS_DEVICE_
 
 #include "CIrrDeviceStub.h"
-#include "IImagePresenter.h"
 
 #define WIN32_LEAN_AND_MEAN
 #if !defined(_IRR_XBOX_PLATFORM_)

source/Irrlicht/CNullDriver.cpp

@@ -11,6 +11,7 @@
 #include "IImageLoader.h"
 #include "IImageWriter.h"
 #include "IMaterialRenderer.h"
+#include "IMeshSceneNode.h"
 #include "IAnimatedMeshSceneNode.h"
 #include "CMeshManipulator.h"
 #include "CColorConverter.h"

source/Irrlicht/CNullDriver.h

@@ -7,7 +7,6 @@
 
 #include "IVideoDriver.h"
 #include "IFileSystem.h"
-#include "IImagePresenter.h"
 #include "IGPUProgrammingServices.h"
 #include "irrArray.h"
 #include "irrString.h"

source/Irrlicht/COpenGLCacheHandler.h

@@ -11,8 +11,6 @@
 
 #include "COpenGLCommon.h"
 
-#include "COpenGLCoreFeature.h"
-#include "COpenGLCoreTexture.h"
 #include "COpenGLCoreCacheHandler.h"
 
 namespace irr

source/Irrlicht/COpenGLCoreCacheHandler.h

@@ -9,6 +9,8 @@
 
 #if defined(_IRR_COMPILE_WITH_OPENGL_) || defined(_IRR_COMPILE_WITH_OGLES1_) || defined(_IRR_COMPILE_WITH_OGLES2_)
 
+#include "COpenGLCoreFeature.h"
+#include "COpenGLCoreTexture.h"
 #include "SMaterial.h"
 #include "ITexture.h"
 

source/Irrlicht/COpenGLNormalMapRenderer.cpp

@@ -6,8 +6,6 @@
 
 #ifdef _IRR_COMPILE_WITH_OPENGL_
 
-#include "IGPUProgrammingServices.h"
-#include "IShaderConstantSetCallBack.h"
 #include "IVideoDriver.h"
 #include "os.h"
 

source/Irrlicht/COpenGLParallaxMapRenderer.cpp

@@ -6,8 +6,6 @@
 
 #ifdef _IRR_COMPILE_WITH_OPENGL_
 
-#include "IGPUProgrammingServices.h"
-#include "IShaderConstantSetCallBack.h"
 #include "IVideoDriver.h"
 #include "os.h"
 

source/Irrlicht/COpenGLSLMaterialRenderer.cpp

@@ -14,7 +14,6 @@
 
 #ifdef _IRR_COMPILE_WITH_OPENGL_
 
-#include "IGPUProgrammingServices.h"
 #include "IShaderConstantSetCallBack.h"
 #include "IMaterialRendererServices.h"
 #include "IVideoDriver.h"
@@ -22,7 +21,6 @@
 
 #include "COpenGLDriver.h"
 #include "COpenGLCacheHandler.h"
-#include "COpenGLMaterialRenderer.h"
 
 #include "COpenGLCoreFeature.h"
 

source/Irrlicht/COpenGLShaderMaterialRenderer.cpp

@@ -6,14 +6,12 @@
 
 #ifdef _IRR_COMPILE_WITH_OPENGL_
 
-#include "IGPUProgrammingServices.h"
 #include "IShaderConstantSetCallBack.h"
 #include "IVideoDriver.h"
 #include "os.h"
 
 #include "COpenGLDriver.h"
 #include "COpenGLCacheHandler.h"
-#include "COpenGLMaterialRenderer.h"
 
 namespace irr
 {

source/Irrlicht/CSoftwareDriver.cpp

@@ -11,6 +11,7 @@
 #include "CBlit.h"
 #include "os.h"
 #include "S3DVertex.h"
+#include "SViewFrustum.h"
 
 namespace irr
 {

source/Irrlicht/CSoftwareDriver.h

@@ -6,8 +6,8 @@
 #define IRR_C_SOFTWARE_DRIVER_H_INCLUDED
 
 #include "ITriangleRenderer.h"
+#include "IImagePresenter.h"
 #include "CNullDriver.h"
-#include "SViewFrustum.h"
 #include "CImage.h"
 
 namespace irr

source/Irrlicht/CSoftwareDriver2.h

@@ -7,6 +7,7 @@
 
 #include "SoftwareDriver2_compile_config.h"
 #include "IBurningShader.h"
+#include "IImagePresenter.h"
 #include "CNullDriver.h"
 #include "CImage.h"
 #include "os.h"