Remove more unused code (#87)

[irrlicht.git] / source / Irrlicht / CNullDriver.h

diff --git a/source/Irrlicht/CNullDriver.h b/source/Irrlicht/CNullDriver.h
index 111916616930f2fa07c2da55763c0fa33f589f23..c9e5e7c9002c23a3f87779e133eeb510061890b9 100644 (file)
--- a/source/Irrlicht/CNullDriver.h
+++ b/source/Irrlicht/CNullDriver.h
@@ -335,10 +335,6 @@ namespace video
                virtual void makeColorKeyTexture(video::ITexture* texture, core::position2d<s32> colorKeyPixelPos,\r
                        bool zeroTexels) const _IRR_OVERRIDE_;\r
 \r
-               //! Creates a normal map from a height map texture.\r
-               //! \param amplitude: Constant value by which the height information is multiplied.\r
-               virtual void makeNormalMapTexture(video::ITexture* texture, f32 amplitude=1.0f) const _IRR_OVERRIDE_;\r
-\r
                //! Returns the maximum amount of primitives (mostly vertices) which\r
                //! the device is able to render with one drawIndexedTriangleList\r
                //! call.\r
@@ -720,35 +716,6 @@ namespace video
                // prints renderer version\r
                void printVersion();\r
 \r
-               //! normal map lookup 32 bit version\r
-               inline f32 nml32(int x, int y, int pitch, int height, s32 *p) const\r
-               {\r
-                       if (x < 0)\r
-                               x = pitch-1;\r
-                       if (x >= pitch)\r
-                               x = 0;\r
-                       if (y < 0)\r
-                               y = height-1;\r
-                       if (y >= height)\r
-                               y = 0;\r
-                       return (f32)(((p[(y * pitch) + x])>>16) & 0xff);\r
-               }\r
-\r
-               //! normal map lookup 16 bit version\r
-               inline f32 nml16(int x, int y, int pitch, int height, s16 *p) const\r
-               {\r
-                       if (x < 0)\r
-                               x = pitch-1;\r
-                       if (x >= pitch)\r
-                               x = 0;\r
-                       if (y < 0)\r
-                               y = height-1;\r
-                       if (y >= height)\r
-                               y = 0;\r
-\r
-                       return (f32) getAverage ( p[(y * pitch) + x] );\r
-               }\r
-\r
                inline bool getWriteZBuffer(const SMaterial& material) const\r
                {\r
                        switch ( material.ZWriteEnable )\r
@@ -783,6 +750,8 @@ namespace video
                {\r
                        SDummyTexture(const io::path& name, E_TEXTURE_TYPE type) : ITexture(name, type) {};\r
 \r
+                       void setSize(const core::dimension2d<u32>& size) { Size = OriginalSize = size; }\r
+\r
                        virtual void* lock(E_TEXTURE_LOCK_MODE mode = ETLM_READ_WRITE, u32 mipmapLevel=0, u32 layer = 0, E_TEXTURE_LOCK_FLAGS lockFlags = ETLF_FLIP_Y_UP_RTT) _IRR_OVERRIDE_ { return 0; }\r
                        virtual void unlock()_IRR_OVERRIDE_ {}\r
                        virtual void regenerateMipMapLevels(void* data = 0, u32 layer = 0) _IRR_OVERRIDE_ {}\r