Properly displaying texture color channels

Now displaying alpha with white color

Author: gildor2

Core/CoreGL.h

@@ -16,6 +16,9 @@
 #define USE_SDL			1
 #include "GLBind.h"
 
+// For CVec4 type
+#include "MathSSE.h"
+
 bool	QGL_Init(const char *libName);
 void	QGL_Shutdown();
 void	QGL_InitExtensions();
@@ -157,6 +160,13 @@ class CShader
 		glUniform3fv(u, 1, value.v);
 		return true;
 	}
+	inline bool SetUniform(const char *name, const CVec4& value) const
+	{
+		GLint u = glGetUniformLocation(PrObj, name);
+		if (u == -1) return false;
+		glUniform4fv(u, 1, value.v);
+		return true;
+	}
 	// attributes
 	inline GLint GetAttrib(const char *name) const
 	{

Core/GL/funcs.in

@@ -445,7 +445,7 @@ void Uniform1i(GLint, GLint) ARGS
 //void Uniform1fv(GLint, GLsizei, const GLfloat *);
 //void Uniform2fv(GLint, GLsizei, const GLfloat *);
 void Uniform3fv(GLint, GLsizei, const GLfloat *v);
-//void Uniform4fv(GLint, GLsizei, const GLfloat *);
+void Uniform4fv(GLint, GLsizei, const GLfloat *);
 //void Uniform1iv(GLint, GLsizei, const GLint *);
 //void Uniform2iv(GLint, GLsizei, const GLint *);
 //void Uniform3iv(GLint, GLsizei, const GLint *);

Core/GLBind.h

@@ -90,6 +90,7 @@ struct GL_t
 	void	(APIENTRY * Uniform2f) (GLint, GLfloat, GLfloat);
 	void	(APIENTRY * Uniform1i) (GLint, GLint);
 	void	(APIENTRY * Uniform3fv) (GLint, GLsizei, const GLfloat *v);
+	void	(APIENTRY * Uniform4fv) (GLint, GLsizei, const GLfloat *);
 	void	(APIENTRY * VertexAttrib3fv) (GLuint index, const GLfloat *v);
 	void	(APIENTRY * VertexAttribPointer) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
 	void	(APIENTRY * BindRenderbufferEXT) (GLenum target, GLuint renderbuffer);
@@ -204,6 +205,7 @@ extern GL_t GL;
 #define glUniform2f	GL.Uniform2f
 #define glUniform1i	GL.Uniform1i
 #define glUniform3fv	GL.Uniform3fv
+#define glUniform4fv	GL.Uniform4fv
 #define glVertexAttrib3fv	GL.VertexAttrib3fv
 #define glVertexAttribPointer	GL.VertexAttribPointer
 #define glBindRenderbufferEXT	GL.BindRenderbufferEXT

Core/GLBindImpl.h

@@ -2,15 +2,15 @@
 
 #if _WIN32
 #	define NUM_GLFUNCS	58
-#	define NUM_EXTFUNCS	37
+#	define NUM_EXTFUNCS	38
 #	define NUM_EXTENSIONS	11
 #elif __linux__
 #	define NUM_GLFUNCS	58
-#	define NUM_EXTFUNCS	37
+#	define NUM_EXTFUNCS	38
 #	define NUM_EXTENSIONS	11
 #else
 #	define NUM_GLFUNCS	58
-#	define NUM_EXTFUNCS	37
+#	define NUM_EXTFUNCS	38
 #	define NUM_EXTENSIONS	11
 #endif
 
@@ -104,6 +104,7 @@ static const char *GLNames[NUM_GLFUNCS + NUM_EXTFUNCS] = {
 	"glUniform2f",
 	"glUniform1i",
 	"glUniform3fv",
+	"glUniform4fv",
 	"glVertexAttrib3fv",
 	"glVertexAttribPointer",
 	"glBindRenderbufferEXT",
@@ -657,6 +658,12 @@ static void APIENTRY logUniform3fv(GLint arg1, GLsizei arg2, const GLfloat * v)
 	lib.Uniform3fv(arg1, arg2, v);
 }
 
+static void APIENTRY logUniform4fv(GLint arg1, GLsizei arg2, const GLfloat)
+{
+	printf("%s\n", "glUniform4fv");
+	lib.Uniform4fv(arg1, arg2, GLfloat);
+}
+
 static void APIENTRY logVertexAttrib3fv(GLuint index, const GLfloat * v)
 {
 	printf("%s\n", "glVertexAttrib3fv");
@@ -832,6 +839,7 @@ static const GL_t logFuncs = {
 	logUniform2f,
 	logUniform1i,
 	logUniform3fv,
+	logUniform4fv,
 	logVertexAttrib3fv,
 	logVertexAttribPointer,
 	logBindRenderbufferEXT,
@@ -871,10 +879,10 @@ static extInfo_t extInfo[NUM_EXTENSIONS] = {
 	{"1.2\0", NULL, NULL, 0, 0, 0, 0},
 	{"1.3\0", NULL, NULL, NUM_GLFUNCS+0, 2, 0, 0},
 	{"1.4\0", NULL, NULL, 0, 0, 0, 0},
-	{"2.0\0", NULL, NULL, NUM_GLFUNCS+2, 24, 0, 0},
+	{"2.0\0", NULL, NULL, NUM_GLFUNCS+2, 25, 0, 0},
 	{"3.1\0", NULL, NULL, 0, 0, 0, 0},
 	{"GL_EXT_texture_compression_s3tc\0", NULL, NULL, 0, 0, 0, 0},
-	{"GL_EXT_framebuffer_object\0", NULL, NULL, NUM_GLFUNCS+26, 11, 0, 0},
+	{"GL_EXT_framebuffer_object\0", NULL, NULL, NUM_GLFUNCS+27, 11, 0, 0},
 	{"GL_ARB_half_float_pixel\0", NULL, NULL, 0, 0, 0, 0},
 	{"GL_ARB_texture_float\0", NULL, NULL, 0, 0, 0, 0},
 	{"GL_ARB_texture_compression_rgtc\0" "GL_EXT_texture_compression_rgtc\0", NULL, NULL, 0, 0, 0, 0},

Core/MathSSE.h

@@ -32,6 +32,11 @@ struct CVec4
 		v[3] = 0;
 	}
 
+	inline void Set(float x, float y, float z, float w)
+	{
+		v[0] = x; v[1] = y; v[2] = z; v[3] = w;
+	}
+
 	FORCEINLINE CVec4& operator=(const CVec3 &src)
 	{
 		Set(src);

README.md

@@ -100,7 +100,7 @@ Using IDE
 As UE Viewer is using custom cross-platform build system, there's no MSBuild support. However we have a simple Visual Studio
 project which allows to use this IDE to edit, compile, run and debug the project. Project files are located in `.vs` directory.
 In order to open the project, you should start Visual Studio, use "Open a local folder" command, and then choose root project's
-directory. Please note: there's .sln file somewhere in *Tools* folder, don't use it - it is intended for UI framewwork testing.
+directory. Please note: there's .sln file somewhere in *Tools* folder, don't use it - it is intended for UI framework testing.
 
 Please note that you should use Visual Studio 2019 or newer, otherwise [some features will not work](https://www.gildor.org/smf/index.php/topic,7419.0.html).
 

Unreal/Shaders/ColorFilter.ush

@@ -0,0 +1,24 @@
+/******************************************************************************
+ *	This shader allows to extract specific color channel from texture
+ *****************************************************************************/
+
+uniform sampler2D Tex;
+uniform vec4      FilterValue;
+uniform vec4      Colorizer;
+
+void VertexShaderMain()
+{
+	gl_TexCoord[0] = gl_MultiTexCoord0;
+	gl_Position    = ftransform();
+}
+
+
+void PixelShaderMain()
+{
+	vec4 c;
+	vec2 TexCoord = gl_TexCoord[0].st;
+	c  = texture2D(Tex, TexCoord);
+	float d = dot(c, FilterValue);
+	c = vec4(d, d, d, 1.0) * Colorizer;
+	gl_FragColor = c;
+}

Viewers/MaterialViewer.cpp

@@ -11,6 +11,9 @@
 
 #include "ObjectViewer.h"
 
+// For ColorFilter_ush
+#include "Shaders.h"
+
 
 #define NEW_OUTLINE		1
 
@@ -385,6 +388,14 @@ void CMaterialViewer::Draw2D()
 		int width, height;
 		Window->GetWindowSize(width, height);
 		int w = min(width, height) / 2;
+
+		static CShader shader;
+		if (GUseGLSL)
+		{
+			if (!shader.IsValid()) shader.Make(ColorFilter_ush);
+			shader.Use();
+		}
+
 		for (int i = 0; i < 4; i++)
 		{
 			int x0 =  (i       & 1) * w;
@@ -393,7 +404,29 @@ void CMaterialViewer::Draw2D()
 			{
 				{ 1, 1, 1 }, { 1, 0, 0 }, { 0, 1, 0 }, { 0, 0, 1 }	// normal, red, green, blue
 			};
-			glColor3fv(colors[i].v);
+			if (GUseGLSL)
+			{
+				// Use color filter, so we could display RGB channels as colors, and alpha as white
+				CVec4 filter, colorizer;
+				filter.Set(0, 0, 0, 0);
+				filter.v[i] = 1.0f;
+				colorizer.Set(0, 0, 0, 0);
+				if (i < 3)
+				{
+					colorizer.v[i] = 1.0f;
+				}
+				else
+				{
+					colorizer.Set(1, 1, 1, 1);
+				}
+				shader.SetUniform("FilterValue", filter);
+				shader.SetUniform("Colorizer", colorizer);
+				shader.SetUniform("Tex", 0);
+			}
+			else
+			{
+				glColor3fv(colors[i].v);
+			}
 			glBegin(GL_QUADS);
 			glTexCoord2f(1, 0);
 			glVertex2f(x0+w, y0);
@@ -405,6 +438,8 @@ void CMaterialViewer::Draw2D()
 			glVertex2f(x0+w, y0+w);
 			glEnd();
 		}
+
+		BindDefaultMaterial();
 	}
 
 	// UE1 and UE2