X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=source%2FIrrlicht%2FCNullDriver.h;h=c9e5e7c9002c23a3f87779e133eeb510061890b9;hb=dd09fdcb4e56fc6185ed25d39ab68fad88f31e3b;hp=111916616930f2fa07c2da55763c0fa33f589f23;hpb=fa0b1cb5092bb1c2109ff870587a32b771179705;p=irrlicht.git

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