[GEN] Backport WW3D2's TextureClass dimension functions from Zero Hour (#710)

Author: tomsons26

Generals/Code/Libraries/Source/WWVegas/WW3D2/bmp2d.cpp

@@ -213,12 +213,12 @@ Bitmap2DObjClass::Bitmap2DObjClass
 	//Set_Aspect(resh/(float)resw);
 
 	// Find the dimensions of the texture:
-	SurfaceClass::SurfaceDescription sd;
-	texture->Get_Level_Description(sd);
+//	SurfaceClass::SurfaceDescription sd;
+//	texture->Get_Level_Description(sd);
 
 	// convert image width and image height to normalized values
-	float vw = (float) sd.Width / (float)resw;
-	float vh = (float) sd.Height / (float)resh;
+	float vw = (float) texture->Get_Width() / (float)resw;
+	float vh = (float) texture->Get_Height() / (float)resh;
 
 	// if we requested the image to be centered around a point adjust the
 	// coordinates accordingly.
@@ -236,7 +236,7 @@ Bitmap2DObjClass::Bitmap2DObjClass
 	if (additive) {
 		shader = ShaderClass::_PresetAdditive2DShader;
 	} else {
-		if (ignore_alpha == false && Has_Alpha(sd.Format)) {
+		if (ignore_alpha == false && Has_Alpha(texture->Get_Texture_Format())) {
 			shader = ShaderClass::_PresetAlpha2DShader;
 		} else {
 			shader = ShaderClass::_PresetOpaque2DShader;

Generals/Code/Libraries/Source/WWVegas/WW3D2/decalsys.cpp

@@ -279,9 +279,10 @@ void DecalGeneratorClass::Set_Mesh_Transform(const Matrix3D & mesh_transform)
 		TextureClass * tex = Material->Peek_Texture();
 		WWASSERT(tex != NULL);
 		if (tex) {
-			SurfaceClass::SurfaceDescription surface_desc;
-			tex->Get_Level_Description(surface_desc);
-			texsize = surface_desc.Width;
+//			SurfaceClass::SurfaceDescription surface_desc;
+//			tex->Get_Level_Description(surface_desc);
+//			texsize = surface_desc.Width;
+			texsize = tex->Get_Width();
 		}
 
 		Mapper->Set_Texture_Transform(mesh_to_texture,texsize);

Generals/Code/Libraries/Source/WWVegas/WW3D2/part_ldr.cpp

@@ -465,10 +465,11 @@ ParticleEmitterDefClass::Convert_To_Ver2 (void)
 		if (ptexture != NULL) {
 			// If texture has an alpha channel do alpha blending instead of additive
 			// (which is the default for point groups):
-			SurfaceClass::SurfaceDescription surf_desc;
-			::ZeroMemory(&surf_desc, sizeof(SurfaceClass::SurfaceDescription));
-			ptexture->Get_Level_Description(surf_desc);
-			if (Has_Alpha(surf_desc.Format)) {
+//			SurfaceClass::SurfaceDescription surf_desc;
+//			::ZeroMemory(&surf_desc, sizeof(SurfaceClass::SurfaceDescription));
+//			ptexture->Get_Level_Description(surf_desc);
+//			if (Has_Alpha(surf_desc.Format)) {
+			if (Has_Alpha(ptexture->Get_Texture_Format())) {
 				shader = ShaderClass::_PresetAlphaSpriteShader;
 			}
 			ptexture->Release_Ref();

Generals/Code/Libraries/Source/WWVegas/WW3D2/texproject.cpp

@@ -734,10 +734,6 @@ void TexProjectClass::Set_Texture(TextureClass * texture)
 		texture->Get_Filter().Set_U_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);
 		texture->Get_Filter().Set_V_Addr_Mode(TextureFilterClass::TEXTURE_ADDRESS_CLAMP);	
 		MaterialPass->Set_Texture(texture);
-
-		SurfaceClass::SurfaceDescription surface_desc;
-		texture->Get_Level_Description(surface_desc);
-		Set_Texture_Size(surface_desc.Width);
 	}
 }
 
@@ -1319,6 +1315,14 @@ void TexProjectClass::Pre_Render_Update(const Matrix3D & camera)
 	} else {
 		Mapper->Set_Type(MatrixMapperClass::ORTHO_PROJECTION);
 	}
+
+	if (Get_Texture_Size() == 0) {
+//		SurfaceClass::SurfaceDescription surface_desc;
+//		MaterialPass->Peek_Texture()->Get_Level_Description(surface_desc);
+		Set_Texture_Size(MaterialPass->Peek_Texture()->Get_Width());
+		WWASSERT(Get_Texture_Size() != 0);
+	}
+	
 	Mapper->Set_Texture_Transform(view_to_texture,Get_Texture_Size());
 	if (Mapper1) {
 		Mapper1->Set_Texture_Transform(view_to_texture,Get_Texture_Size());

Generals/Code/Libraries/Source/WWVegas/WW3D2/texture.cpp

@@ -94,7 +94,9 @@ TextureClass::TextureClass(unsigned width, unsigned height, WW3DFormat format, M
 	Name(""),
 	TextureFormat(format),
 	IsCompressionAllowed(false),
-	TextureLoadTask(NULL)
+	TextureLoadTask(NULL),
+	Width(width),
+	Height(height)
 {
 	switch (format) 
 	{
@@ -155,7 +157,9 @@ TextureClass::TextureClass
 	IsProcedural(false),
 	TextureFormat(texture_format),
 	IsCompressionAllowed(allow_compression),
-	TextureLoadTask(NULL)
+	TextureLoadTask(NULL),
+	Width(0),
+	Height(0)
 {
 	switch (TextureFormat) 
 	{
@@ -241,10 +245,14 @@ TextureClass::TextureClass(SurfaceClass *surface, MipCountType mip_level_count)
 	IsProcedural(true),
 	TextureFormat(surface->Get_Surface_Format()),
 	IsCompressionAllowed(false),
-	TextureLoadTask(NULL)
+	TextureLoadTask(NULL),
+	Width(0),
+	Height(0)
 {
 	SurfaceClass::SurfaceDescription sd;
 	surface->Get_Description(sd);
+	Width=sd.Width;
+	Height=sd.Height;
 	switch (sd.Format) 
 	{
 	case WW3D_FORMAT_DXT1:
@@ -276,14 +284,18 @@ TextureClass::TextureClass(IDirect3DTexture8* d3d_texture)
 	Name(""),
 	IsProcedural(true),
 	IsCompressionAllowed(false),
-	TextureLoadTask(NULL)
+	TextureLoadTask(NULL),
+	Width(0),
+	Height(0)
 {
 	D3DTexture->AddRef();
 	IDirect3DSurface8* surface;
 	DX8_ErrorCode(D3DTexture->GetSurfaceLevel(0,&surface));
 	D3DSURFACE_DESC d3d_desc;
 	::ZeroMemory(&d3d_desc, sizeof(D3DSURFACE_DESC));
 	DX8_ErrorCode(surface->GetDesc(&d3d_desc));
+	Width=d3d_desc.Width;
+	Height=d3d_desc.Height;
 	TextureFormat=D3DFormat_To_WW3DFormat(d3d_desc.Format);
 	switch (TextureFormat) 
 	{
@@ -514,6 +526,8 @@ void TextureClass::Apply_New_Surface(bool initialized)
 	DX8_ErrorCode(surface->GetDesc(&d3d_desc));
 //	if (TextureFormat==WW3D_FORMAT_UNKNOWN) {
 		TextureFormat=D3DFormat_To_WW3DFormat(d3d_desc.Format);
+		Width=d3d_desc.Width;
+		Height=d3d_desc.Height;
 //	}
 //	else {
 //		WWASSERT(D3DFormat_To_WW3DFormat(d3d_desc.Format)==TextureFormat);

Generals/Code/Libraries/Source/WWVegas/WW3D2/texture.h

@@ -120,6 +120,16 @@ class TextureClass : public W3DMPO, public RefCountClass
 
 		// The number of Mip levels in the texture
 		unsigned int Get_Mip_Level_Count(void);
+	
+		// Note! Width and Height may be zero and may change if texture uses mipmaps
+		int Get_Width() const
+		{
+			return Width;
+		}
+		int Get_Height() const
+		{
+			return Height; 
+		}
 
 		// Get surface description of a Mip level (defaults to the highest-resolution one)
 		void Get_Level_Description(SurfaceClass::SurfaceDescription &surface_desc, unsigned int level = 0);
@@ -208,6 +218,9 @@ class TextureClass : public W3DMPO, public RefCountClass
 		unsigned LastAccessed;
 		WW3DFormat TextureFormat;
 
+		int Width;
+		int Height;
+
 		// Support for self-managed textures
 
 		PoolType Pool;