From 25c0f0dd1fd2db036d60777f7c1912f6c084a925 Mon Sep 17 00:00:00 2001
From: MaxED <j.maxed@gmail.com>
Date: Mon, 26 Aug 2013 11:09:37 +0000
Subject: [PATCH] Classic modes: missing floor/ceiling textures are now
rendered using proper texture. Sector Info panel: in soma cases texture size
was shown for unknown/missing textures.
---
Source/Core/Controls/SectorInfoPanel.cs | 2 ++
Source/Core/Rendering/Renderer2D.cs | 1 +
Source/Core/Rendering/SurfaceManager.cs | 5 +++++
3 files changed, 8 insertions(+)
diff --git a/Source/Core/Controls/SectorInfoPanel.cs b/Source/Core/Controls/SectorInfoPanel.cs
index bb2ab59e3..1cf69de80 100644
--- a/Source/Core/Controls/SectorInfoPanel.cs
+++ b/Source/Core/Controls/SectorInfoPanel.cs
@@ -65,6 +65,7 @@ namespace CodeImp.DoomBuilder.Controls
//mxd. Texture info
if ((s.FloorTexture.Length < 1) || (s.FloorTexture == "-")){
+ labelFloorTextureSize.Visible = false;
General.DisplayZoomedImage(floortex, Properties.Resources.MissingTexture);
} else {
ImageData floorImage = General.Map.Data.GetFlatImage(s.FloorTexture);
@@ -73,6 +74,7 @@ namespace CodeImp.DoomBuilder.Controls
}
if((s.CeilTexture.Length < 1) || (s.CeilTexture == "-")) {
+ labelCeilTextureSize.Visible = false;
General.DisplayZoomedImage(ceilingtex, Properties.Resources.MissingTexture);
} else {
ImageData ceilingImage = General.Map.Data.GetFlatImage(s.CeilTexture);
diff --git a/Source/Core/Rendering/Renderer2D.cs b/Source/Core/Rendering/Renderer2D.cs
index 86e3e4d64..6785d7130 100644
--- a/Source/Core/Rendering/Renderer2D.cs
+++ b/Source/Core/Rendering/Renderer2D.cs
@@ -1210,6 +1210,7 @@ namespace CodeImp.DoomBuilder.Rendering
{
// Make sure anything we need is loaded
General.Map.Data.UnknownTexture3D.CreateTexture();
+ General.Map.Data.MissingTexture3D.CreateTexture(); //mxd
// Set transformations
UpdateTransformations();
diff --git a/Source/Core/Rendering/SurfaceManager.cs b/Source/Core/Rendering/SurfaceManager.cs
index 1d204898c..62d530544 100644
--- a/Source/Core/Rendering/SurfaceManager.cs
+++ b/Source/Core/Rendering/SurfaceManager.cs
@@ -20,6 +20,7 @@ using System;
using System.Collections.Generic;
using System.IO;
using System.Drawing;
+using CodeImp.DoomBuilder.IO;
using CodeImp.DoomBuilder.Map;
using SlimDX.Direct3D9;
using SlimDX;
@@ -635,6 +636,10 @@ namespace CodeImp.DoomBuilder.Rendering
{
img = General.Map.Data.WhiteTexture;
}
+ }
+ else if(longimagename == Lump.MakeLongName("-")) //mxd
+ {
+ img = General.Map.Data.MissingTexture3D;
}
else
{
--
GitLab