Remove unused functions

renderLine16_Blend(), renderLine16_Decal(), renderLine32_Blend(), renderLine32_Decal()
clipLine()
frand()
drawRectangle() and drawLine()

remove unused private fields

diff --git a/include/IRandomizer.h b/include/IRandomizer.h
index a0c073017575781f3600e26e833e0745ad14647a..e821190eaa5720f9a834d4382834136f7bfbc4dc 100644 (file)
--- a/include/IRandomizer.h
+++ b/include/IRandomizer.h
@@ -21,9 +21,6 @@ public:
        //! generates a pseudo random number in the range 0..randMax()\r
        virtual s32 rand() const =0;\r
 \r
-       //! generates a pseudo random number in the range 0..1\r
-       virtual f32 frand() const =0;\r
-\r
        //! get maxmimum number generated by rand()\r
        virtual s32 randMax() const =0;\r
 };\r

diff --git a/source/Irrlicht/CB3DMeshFileLoader.cpp b/source/Irrlicht/CB3DMeshFileLoader.cpp
index ec20bf8d5f773af87ba4087c6ca2eb883071bd69..41498eaa808bdf1b0d43db642d664de8ef5a02a5 100644 (file)
--- a/source/Irrlicht/CB3DMeshFileLoader.cpp
+++ b/source/Irrlicht/CB3DMeshFileLoader.cpp
@@ -26,7 +26,7 @@ namespace scene
 \r
 //! Constructor\r
 CB3DMeshFileLoader::CB3DMeshFileLoader(scene::ISceneManager* smgr)\r
-: SceneManager(smgr), AnimatedMesh(0), B3DFile(0), NormalsInFile(false),\r
+: AnimatedMesh(0), B3DFile(0), NormalsInFile(false),\r
        HasVertexColors(false), ShowWarning(true)\r
 {\r
        #ifdef _DEBUG\r

diff --git a/source/Irrlicht/CB3DMeshFileLoader.h b/source/Irrlicht/CB3DMeshFileLoader.h
index 6a3c4c73af8ffe72a4180ddbc42c977a0fe30fad..12784c4568a722ea71bd4472a046be30c9af6234 100644 (file)
--- a/source/Irrlicht/CB3DMeshFileLoader.h
+++ b/source/Irrlicht/CB3DMeshFileLoader.h
@@ -68,7 +68,6 @@ private:
 \r
        core::array<video::S3DVertex2TCoords> BaseVertices;\r
 \r
-       ISceneManager*  SceneManager;\r
        CSkinnedMesh*   AnimatedMesh;\r
        io::IReadFile*  B3DFile;\r
 \r

diff --git a/source/Irrlicht/CBlit.h b/source/Irrlicht/CBlit.h
index c2fcf77592b3eff7c96dba4457fc63f0ad81c513..7a9455aac18d2e77fd4f573663f278c1ecfaa236 100644 (file)
--- a/source/Irrlicht/CBlit.h
+++ b/source/Irrlicht/CBlit.h
@@ -85,96 +85,6 @@ inline u32 GetClipCode( const AbsRectangle &r, const core::position2d<s32> &p )
        return code;\r
 }\r
 \r
-\r
-/*!\r
-       Cohen Sutherland clipping\r
-       @return: 1 if valid\r
-*/\r
-\r
-static int ClipLine(const AbsRectangle &clipping,\r
-                       core::position2d<s32> &p0,\r
-                       core::position2d<s32> &p1,\r
-                       const core::position2d<s32>& p0_in,\r
-                       const core::position2d<s32>& p1_in)\r
-{\r
-       u32 code0;\r
-       u32 code1;\r
-       u32 code;\r
-\r
-       p0 = p0_in;\r
-       p1 = p1_in;\r
-\r
-       code0 = GetClipCode( clipping, p0 );\r
-       code1 = GetClipCode( clipping, p1 );\r
-\r
-       // trivial accepted\r
-       while ( code0 | code1 )\r
-       {\r
-               s32 x=0;\r
-               s32 y=0;\r
-\r
-               // trivial reject\r
-               if ( code0 & code1 )\r
-                       return 0;\r
-\r
-               if ( code0 )\r
-               {\r
-                       // clip first point\r
-                       code = code0;\r
-               }\r
-               else\r
-               {\r
-                       // clip last point\r
-                       code = code1;\r
-               }\r
-\r
-               if ( (code & CLIPCODE_BOTTOM) == CLIPCODE_BOTTOM )\r
-               {\r
-                       // clip bottom viewport\r
-                       y = clipping.y1;\r
-                       x = p0.X + ( p1.X - p0.X ) * ( y - p0.Y ) / ( p1.Y - p0.Y );\r
-               }\r
-               else\r
-               if ( (code & CLIPCODE_TOP) == CLIPCODE_TOP )\r
-               {\r
-                       // clip to viewport\r
-                       y = clipping.y0;\r
-                       x = p0.X + ( p1.X - p0.X ) * ( y - p0.Y ) / ( p1.Y - p0.Y );\r
-               }\r
-               else\r
-               if ( (code & CLIPCODE_RIGHT) == CLIPCODE_RIGHT )\r
-               {\r
-                       // clip right viewport\r
-                       x = clipping.x1;\r
-                       y = p0.Y + ( p1.Y - p0.Y ) * ( x - p0.X ) / ( p1.X - p0.X );\r
-               }\r
-               else\r
-               if ( (code & CLIPCODE_LEFT) == CLIPCODE_LEFT )\r
-               {\r
-                       // clip left viewport\r
-                       x = clipping.x0;\r
-                       y = p0.Y + ( p1.Y - p0.Y ) * ( x - p0.X ) / ( p1.X - p0.X );\r
-               }\r
-\r
-               if ( code == code0 )\r
-               {\r
-                       // modify first point\r
-                       p0.X = x;\r
-                       p0.Y = y;\r
-                       code0 = GetClipCode( clipping, p0 );\r
-               }\r
-               else\r
-               {\r
-                       // modify second point\r
-                       p1.X = x;\r
-                       p1.Y = y;\r
-                       code1 = GetClipCode( clipping, p1 );\r
-               }\r
-       }\r
-\r
-       return 1;\r
-}\r
-\r
 /*\r
 */\r
 inline void GetClip(AbsRectangle &clipping, video::IImage * t)\r
@@ -226,263 +136,6 @@ inline u32 PixelLerp32(const u32 source, const u32 value)
 }\r
 \r
 \r
-/*\r
-*/\r
-static void RenderLine32_Decal(video::IImage *t,\r
-                               const core::position2d<s32> &p0,\r
-                               const core::position2d<s32> &p1,\r
-                               u32 argb )\r
-{\r
-       s32 dx = p1.X - p0.X;\r
-       s32 dy = p1.Y - p0.Y;\r
-\r
-       s32 c;\r
-       s32 m;\r
-       s32 d = 0;\r
-       s32 run;\r
-\r
-       s32 xInc = 4;\r
-       s32 yInc = (s32) t->getPitch();\r
-\r
-       if ( dx < 0 )\r
-       {\r
-               xInc = -xInc;\r
-               dx = -dx;\r
-       }\r
-\r
-       if ( dy < 0 )\r
-       {\r
-               yInc = -yInc;\r
-               dy = -dy;\r
-       }\r
-\r
-       u32 *dst;\r
-       dst = (u32*) ( (u8*) t->getData() + ( p0.Y * t->getPitch() ) + ( p0.X * 4 ) );\r
-\r
-       if ( dy > dx )\r
-       {\r
-               s32 tmp;\r
-               tmp = dx;\r
-               dx = dy;\r
-               dy = tmp;\r
-               tmp = xInc;\r
-               xInc = yInc;\r
-               yInc = tmp;\r
-       }\r
-\r
-       c = dx << 1;\r
-       m = dy << 1;\r
-\r
-       run = dx;\r
-       do\r
-       {\r
-               *dst = argb;\r
-\r
-               dst = (u32*) ( (u8*) dst + xInc );      // x += xInc\r
-               d += m;\r
-               if ( d > dx )\r
-               {\r
-                       dst = (u32*) ( (u8*) dst + yInc );      // y += yInc\r
-                       d -= c;\r
-               }\r
-               run -= 1;\r
-       } while (run>=0);\r
-}\r
-\r
-\r
-/*\r
-*/\r
-static void RenderLine32_Blend(video::IImage *t,\r
-                               const core::position2d<s32> &p0,\r
-                               const core::position2d<s32> &p1,\r
-                               u32 argb, u32 alpha)\r
-{\r
-       s32 dx = p1.X - p0.X;\r
-       s32 dy = p1.Y - p0.Y;\r
-\r
-       s32 c;\r
-       s32 m;\r
-       s32 d = 0;\r
-       s32 run;\r
-\r
-       s32 xInc = 4;\r
-       s32 yInc = (s32) t->getPitch();\r
-\r
-       if ( dx < 0 )\r
-       {\r
-               xInc = -xInc;\r
-               dx = -dx;\r
-       }\r
-\r
-       if ( dy < 0 )\r
-       {\r
-               yInc = -yInc;\r
-               dy = -dy;\r
-       }\r
-\r
-       u32 *dst;\r
-       dst = (u32*) ( (u8*) t->getData() + ( p0.Y * t->getPitch() ) + ( p0.X * 4 ) );\r
-\r
-       if ( dy > dx )\r
-       {\r
-               s32 tmp;\r
-               tmp = dx;\r
-               dx = dy;\r
-               dy = tmp;\r
-               tmp = xInc;\r
-               xInc = yInc;\r
-               yInc = tmp;\r
-       }\r
-\r
-       c = dx << 1;\r
-       m = dy << 1;\r
-\r
-       run = dx;\r
-       const u32 packA = packAlpha ( alpha );\r
-       do\r
-       {\r
-               *dst = packA | PixelBlend32( *dst, argb, alpha );\r
-\r
-               dst = (u32*) ( (u8*) dst + xInc );      // x += xInc\r
-               d += m;\r
-               if ( d > dx )\r
-               {\r
-                       dst = (u32*) ( (u8*) dst + yInc );      // y += yInc\r
-                       d -= c;\r
-               }\r
-               run -= 1;\r
-       } while (run>=0);\r
-}\r
-\r
-/*\r
-*/\r
-static void RenderLine16_Decal(video::IImage *t,\r
-                               const core::position2d<s32> &p0,\r
-                               const core::position2d<s32> &p1,\r
-                               u32 argb )\r
-{\r
-       s32 dx = p1.X - p0.X;\r
-       s32 dy = p1.Y - p0.Y;\r
-\r
-       s32 c;\r
-       s32 m;\r
-       s32 d = 0;\r
-       s32 run;\r
-\r
-       s32 xInc = 2;\r
-       s32 yInc = (s32) t->getPitch();\r
-\r
-       if ( dx < 0 )\r
-       {\r
-               xInc = -xInc;\r
-               dx = -dx;\r
-       }\r
-\r
-       if ( dy < 0 )\r
-       {\r
-               yInc = -yInc;\r
-               dy = -dy;\r
-       }\r
-\r
-       u16 *dst;\r
-       dst = (u16*) ( (u8*) t->getData() + ( p0.Y * t->getPitch() ) + ( p0.X * 2 ) );\r
-\r
-       if ( dy > dx )\r
-       {\r
-               s32 tmp;\r
-               tmp = dx;\r
-               dx = dy;\r
-               dy = tmp;\r
-               tmp = xInc;\r
-               xInc = yInc;\r
-               yInc = tmp;\r
-       }\r
-\r
-       c = dx << 1;\r
-       m = dy << 1;\r
-\r
-       run = dx;\r
-       do\r
-       {\r
-               *dst = (u16)argb;\r
-\r
-               dst = (u16*) ( (u8*) dst + xInc );      // x += xInc\r
-               d += m;\r
-               if ( d > dx )\r
-               {\r
-                       dst = (u16*) ( (u8*) dst + yInc );      // y += yInc\r
-                       d -= c;\r
-               }\r
-               run -= 1;\r
-       } while (run>=0);\r
-}\r
-\r
-/*\r
-*/\r
-static void RenderLine16_Blend(video::IImage *t,\r
-                               const core::position2d<s32> &p0,\r
-                               const core::position2d<s32> &p1,\r
-                               u16 argb,\r
-                               u16 alpha)\r
-{\r
-       s32 dx = p1.X - p0.X;\r
-       s32 dy = p1.Y - p0.Y;\r
-\r
-       s32 c;\r
-       s32 m;\r
-       s32 d = 0;\r
-       s32 run;\r
-\r
-       s32 xInc = 2;\r
-       s32 yInc = (s32) t->getPitch();\r
-\r
-       if ( dx < 0 )\r
-       {\r
-               xInc = -xInc;\r
-               dx = -dx;\r
-       }\r
-\r
-       if ( dy < 0 )\r
-       {\r
-               yInc = -yInc;\r
-               dy = -dy;\r
-       }\r
-\r
-       u16 *dst;\r
-       dst = (u16*) ( (u8*) t->getData() + ( p0.Y * t->getPitch() ) + ( p0.X * 2 ) );\r
-\r
-       if ( dy > dx )\r
-       {\r
-               s32 tmp;\r
-               tmp = dx;\r
-               dx = dy;\r
-               dy = tmp;\r
-               tmp = xInc;\r
-               xInc = yInc;\r
-               yInc = tmp;\r
-       }\r
-\r
-       c = dx << 1;\r
-       m = dy << 1;\r
-\r
-       run = dx;\r
-       const u16 packA = alpha ? 0x8000 : 0;\r
-       do\r
-       {\r
-               *dst = packA | PixelBlend16( *dst, argb, alpha );\r
-\r
-               dst = (u16*) ( (u8*) dst + xInc );      // x += xInc\r
-               d += m;\r
-               if ( d > dx )\r
-               {\r
-                       dst = (u16*) ( (u8*) dst + yInc );      // y += yInc\r
-                       d -= c;\r
-               }\r
-               run -= 1;\r
-       } while (run>=0);\r
-}\r
-\r
-\r
 /*!\r
 */\r
 static void executeBlit_TextureCopy_x_to_x( const SBlitJob * job )\r
@@ -1471,56 +1124,6 @@ static s32 StretchBlit(eBlitter operation,
 }\r
 #endif\r
 \r
-// Methods for Software drivers\r
-//! draws a rectangle\r
-static void drawRectangle(video::IImage* img, const core::rect<s32>& rect, const video::SColor &color)\r
-{\r
-       Blit(color.getAlpha() == 0xFF ? BLITTER_COLOR : BLITTER_COLOR_ALPHA,\r
-                       img, 0, &rect.UpperLeftCorner, 0, &rect, color.color);\r
-}\r
-\r
-\r
-//! draws a line from to with color\r
-static void drawLine(video::IImage* img, const core::position2d<s32>& from,\r
-                                       const core::position2d<s32>& to, const video::SColor &color)\r
-{\r
-       AbsRectangle clip;\r
-       GetClip(clip, img);\r
-\r
-       core::position2d<s32> p[2];\r
-       if (ClipLine( clip, p[0], p[1], from, to))\r
-       {\r
-               u32 alpha = extractAlpha(color.color);\r
-\r
-               switch(img->getColorFormat())\r
-               {\r
-               case video::ECF_A1R5G5B5:\r
-                               if (alpha == 256)\r
-                               {\r
-                                       RenderLine16_Decal(img, p[0], p[1], video::A8R8G8B8toA1R5G5B5(color.color));\r
-                               }\r
-                               else\r
-                               {\r
-                                       RenderLine16_Blend(img, p[0], p[1], video::A8R8G8B8toA1R5G5B5(color.color), alpha >> 3);\r
-                               }\r
-                               break;\r
-               case video::ECF_A8R8G8B8:\r
-                               if (alpha == 256)\r
-                               {\r
-                                       RenderLine32_Decal(img, p[0], p[1], color.color);\r
-                               }\r
-                               else\r
-                               {\r
-                                       RenderLine32_Blend(img, p[0], p[1], color.color, alpha);\r
-                               }\r
-                               break;\r
-               default:\r
-                               break;\r
-               }\r
-       }\r
-}\r
-\r
-\r
 }\r
 \r
 #endif\r

diff --git a/source/Irrlicht/CIrrDeviceStub.cpp b/source/Irrlicht/CIrrDeviceStub.cpp
index 31e21ab77a85b29b713c82ed21a498128dc663b9..800d3720867e01759402f4849868c14901ab985c 100644 (file)
--- a/source/Irrlicht/CIrrDeviceStub.cpp
+++ b/source/Irrlicht/CIrrDeviceStub.cpp
@@ -308,11 +308,6 @@ namespace
                        return os::Randomizer::rand();\r
                }\r
 \r
-               virtual f32 frand() const _IRR_OVERRIDE_\r
-               {\r
-                       return os::Randomizer::frand();\r
-               }\r
-\r
                virtual s32 randMax() const _IRR_OVERRIDE_\r
                {\r
                        return os::Randomizer::randMax();\r

diff --git a/source/Irrlicht/COBJMeshFileLoader.cpp b/source/Irrlicht/COBJMeshFileLoader.cpp
index 19b9f567b2e7e160b03f4509e3bc030780f4e62d..5997e391d22e3d8db15044b947fbdaed3495988e 100644 (file)
--- a/source/Irrlicht/COBJMeshFileLoader.cpp
+++ b/source/Irrlicht/COBJMeshFileLoader.cpp
@@ -26,8 +26,6 @@ namespace scene
 #define _IRR_DEBUG_OBJ_LOADER_\r
 #endif\r
 \r
-static const u32 WORD_BUFFER_LENGTH = 512;\r
-\r
 //! Constructor\r
 COBJMeshFileLoader::COBJMeshFileLoader(scene::ISceneManager* smgr, io::IFileSystem* fs)\r
 : SceneManager(smgr), FileSystem(fs)\r

diff --git a/source/Irrlicht/COpenGLDriver.cpp b/source/Irrlicht/COpenGLDriver.cpp
index 5315232daa27440ecde9c317e307d77c771608b4..68351efca9c5eb7002705ce0450c799352c5f9df 100644 (file)
--- a/source/Irrlicht/COpenGLDriver.cpp
+++ b/source/Irrlicht/COpenGLDriver.cpp
@@ -38,14 +38,7 @@ const u16 COpenGLDriver::Quad2DIndices[4] = { 0, 1, 2, 3 };
 COpenGLDriver::COpenGLDriver(const SIrrlichtCreationParameters& params, io::IFileSystem* io, IContextManager* contextManager)\r
        : CNullDriver(io, params.WindowSize), COpenGLExtensionHandler(), CacheHandler(0), CurrentRenderMode(ERM_NONE), ResetRenderStates(true),\r
        Transformation3DChanged(true), AntiAlias(params.AntiAlias), ColorFormat(ECF_R8G8B8), FixedPipelineState(EOFPS_ENABLE), Params(params),\r
-       ContextManager(contextManager),\r
-#if defined(_IRR_COMPILE_WITH_WINDOWS_DEVICE_)\r
-       DeviceType(EIDT_WIN32)\r
-#elif defined(_IRR_COMPILE_WITH_X11_DEVICE_)\r
-       DeviceType(EIDT_X11)\r
-#else\r
-       DeviceType(EIDT_OSX)\r
-#endif\r
+       ContextManager(contextManager)\r
 {\r
 #ifdef _DEBUG\r
        setDebugName("COpenGLDriver");\r
@@ -58,7 +51,7 @@ COpenGLDriver::COpenGLDriver(const SIrrlichtCreationParameters& params, io::IFil
        : CNullDriver(io, params.WindowSize), COpenGLExtensionHandler(), CacheHandler(0),\r
        CurrentRenderMode(ERM_NONE), ResetRenderStates(true), Transformation3DChanged(true),\r
        AntiAlias(params.AntiAlias), ColorFormat(ECF_R8G8B8), FixedPipelineState(EOFPS_ENABLE),\r
-       Params(params), SDLDevice(device), ContextManager(0), DeviceType(EIDT_SDL)\r
+       Params(params), SDLDevice(device), ContextManager(0)\r
 {\r
 #ifdef _DEBUG\r
        setDebugName("COpenGLDriver");\r

diff --git a/source/Irrlicht/COpenGLDriver.h b/source/Irrlicht/COpenGLDriver.h
index f3d89fd722e0ffc16e6743973f1e5fdc2208634b..8b2616e141363058a622601f6018481cc672063f 100644 (file)
--- a/source/Irrlicht/COpenGLDriver.h
+++ b/source/Irrlicht/COpenGLDriver.h
@@ -522,8 +522,6 @@ namespace video
                #endif\r
 \r
                IContextManager* ContextManager;\r
-\r
-               E_DEVICE_TYPE DeviceType;\r
        };\r
 \r
 } // end namespace video\r

diff --git a/source/Irrlicht/CXMeshFileLoader.cpp b/source/Irrlicht/CXMeshFileLoader.cpp
index 27c4e36966b0d1dd71790b1ca4ee320748d7da6c..343895ff8b8f8ec435402d52203db2bebf746ccd 100644 (file)
--- a/source/Irrlicht/CXMeshFileLoader.cpp
+++ b/source/Irrlicht/CXMeshFileLoader.cpp
@@ -28,8 +28,7 @@ namespace scene
 \r
 //! Constructor\r
 CXMeshFileLoader::CXMeshFileLoader(scene::ISceneManager* smgr, io::IFileSystem* fs)\r
-: SceneManager(smgr), FileSystem(fs), AnimatedMesh(0),\r
-       Buffer(0), P(0), End(0), BinaryNumCount(0), Line(0),\r
+: AnimatedMesh(0), Buffer(0), P(0), End(0), BinaryNumCount(0), Line(0),\r
        CurFrame(0), MajorVersion(0), MinorVersion(0), BinaryFormat(false), FloatSize(0)\r
 {\r
        #ifdef _DEBUG\r

diff --git a/source/Irrlicht/CXMeshFileLoader.h b/source/Irrlicht/CXMeshFileLoader.h
index a517f55e186580e4d8b206e821f076824922cbc9..8021e8f4b9834f00e7950266cb6924d4dbe8be88 100644 (file)
--- a/source/Irrlicht/CXMeshFileLoader.h
+++ b/source/Irrlicht/CXMeshFileLoader.h
@@ -159,9 +159,6 @@ private:
        bool readRGB(video::SColor& color);\r
        bool readRGBA(video::SColor& color);\r
 \r
-       ISceneManager* SceneManager;\r
-       io::IFileSystem* FileSystem;\r
-\r
        CSkinnedMesh* AnimatedMesh;\r
 \r
        c8* Buffer;\r

diff --git a/source/Irrlicht/os.cpp b/source/Irrlicht/os.cpp
index a410a91a4f1ac27f6ebe18150ac8b60b6f737c9d..b736eafd633336e8c0f37fb8dc32b9026e304b23 100644 (file)
--- a/source/Irrlicht/os.cpp
+++ b/source/Irrlicht/os.cpp
@@ -338,12 +338,6 @@ namespace os
                return seed-1;  // -1 because we want it to start at 0\r
        }\r
 \r
-       //! generates a pseudo random number\r
-       f32 Randomizer::frand()\r
-       {\r
-               return rand()*(1.f/rMax);\r
-       }\r
-\r
        s32 Randomizer::randMax()\r
        {\r
                return rMax;\r

diff --git a/source/Irrlicht/os.h b/source/Irrlicht/os.h
index 379abb838ebbd4f529a05cc17faa7c43a18e38c7..75127570f6c60c080d77ec4927a9eddb90868846 100644 (file)
--- a/source/Irrlicht/os.h
+++ b/source/Irrlicht/os.h
@@ -58,9 +58,6 @@ namespace os
                //! generates a pseudo random number in the range 0..randMax()\r
                static s32 rand();\r
 \r
-               //! generates a pseudo random number in the range 0..1\r
-               static f32 frand();\r
-\r
                //! get maximum number generated by rand()\r
                static s32 randMax();\r
 \r