X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fscreen.cpp;h=3bbf00822209320d2514fbbb4bdd87ae6d9c1b48;hp=6d67820126f5ab24cee9dab9a5ca40934c8a5417;hb=255065a607d82846c4a8b730000d547b3f080d0c;hpb=af1f07330cb8f4d448cc75ee720b633338eba1e8

diff --git a/src/screen.cpp b/src/screen.cpp
index 6d67820..3bbf008 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -8,47 +8,8 @@
 #include "bufferbuilder.h"
 #include "shaderprogram.h"
 
-#define BASICTEX_VERT \
-	"#version 140\n"\
-	"#extension GL_ARB_shading_language_420pack : require\n"\
-	"#extension GL_ARB_explicit_attrib_location : require\n"\
-	"\n"\
-	"layout(std140, binding=0) uniform Viewport\n"\
-	"{\n"\
-	"\tfloat width;\n"\
-	"\tfloat height;\n"\
-	"};\n"\
-	"\n"\
-	"layout(location = 0) in vec2 position;\n"\
-	"layout(location = 1) in vec2 tex_coord;\n"\
-	"\n"\
-	"out vec2 fp_tex_coord;\n"\
-	"\n"\
-	"void main()\n"\
-	"{\n"\
-	"\t// Transform to clip coordinates (-1,1, -1,1).\n"\
-	"\tgl_Position.x = (position.x*2/width) - 1;\n"\
-	"\tgl_Position.y = 1 - (position.y*2/height);\n"\
-	"\tgl_Position.z = 0.0;\n"\
-	"\tgl_Position.w = 1.0;\n"\
-	"\tfp_tex_coord = tex_coord;\n"\
-	"}\n"
-
-#define BASICTEX_FRAG \
-	"#version 140\n"\
-	"\n"\
-	"in vec2 fp_tex_coord;\n"\
-	"\n"\
-	"out vec4 output_colour;\n"\
-	"\n"\
-	"uniform sampler2D tex;\n"\
-	"uniform vec4 colour;\n"\
-	"\n"\
-	"void main()\n"\
-	"{\n"\
-	"\toutput_colour = colour;\n"\
-	"\toutput_colour.a = texture(tex, fp_tex_coord).r;\n"\
-	"}\n"
+#define BASICTEX_VERT "shaders/basictex_vert.glsl"
+#define BASICTEX_FRAG "shaders/basictex_frag.glsl"
 
 using namespace IPDF;
 using namespace std;
@@ -61,6 +22,7 @@ static void opengl_debug_callback(GLenum source, GLenum type, GLuint id, GLenum
 
 Screen::Screen()
 {
+
 	SDL_Init(SDL_INIT_VIDEO);
 	m_window = SDL_CreateWindow("IPDF", SDL_WINDOWPOS_UNDEFINED, SDL_WINDOWPOS_UNDEFINED,
 			800, 600, SDL_WINDOW_OPENGL | SDL_WINDOW_RESIZABLE);
@@ -107,23 +69,27 @@ Screen::Screen()
 	glGenVertexArrays(1, &default_vao);
 	glBindVertexArray(default_vao);
 
-	//TODO: Error checking.
-	m_texture_prog.AttachVertexProgram(BASICTEX_VERT);
-	m_texture_prog.AttachFragmentProgram(BASICTEX_FRAG);
-	m_texture_prog.Link();
+	m_texture_prog.InitialiseShaders(BASICTEX_VERT, BASICTEX_FRAG);
 	m_texture_prog.Use();
 
 	// We always want to use the texture bound to texture unit 0.
 	GLint texture_uniform_location = m_texture_prog.GetUniformLocation("tex");
 	glUniform1i(texture_uniform_location, 0);
 
-	m_colour_uniform_location = m_texture_prog.GetUniformLocation("colour");
+	m_font_prog.InitialiseShaders(BASICTEX_VERT, "shaders/fonttex_frag.glsl");
+	m_font_prog.Use();
+
+	// We always want to use the texture bound to texture unit 0.
+	GLint font_texture_uniform_location = m_font_prog.GetUniformLocation("tex");
+	glUniform1i(font_texture_uniform_location, 0);
+	m_colour_uniform_location = m_font_prog.GetUniformLocation("colour");
 
 	m_viewport_ubo.SetUsage(GraphicsBuffer::BufferUsageDynamicDraw);
 	m_viewport_ubo.SetType(GraphicsBuffer::BufferTypeUniform);
 
 	m_debug_font_atlas = 0;
 
+	m_view = NULL;
 	ResizeViewport(800, 600);
 
 	Clear();
@@ -180,7 +146,7 @@ bool Screen::PumpEvents()
 			m_last_mouse_y = evt.motion.y;
 			if (m_mouse_handler)
 			{
-				m_mouse_handler(evt.motion.x, evt.motion.y,evt.motion.state, 0);
+				m_mouse_handler(evt.motion.x, evt.motion.y,evt.motion.state, 0, this, m_view);
 			}
 			break;
 		case SDL_MOUSEBUTTONDOWN:
@@ -189,13 +155,13 @@ bool Screen::PumpEvents()
 			m_last_mouse_y = evt.button.y;
 			if (m_mouse_handler)
 			{
-				m_mouse_handler(evt.button.x, evt.button.y, evt.button.state?evt.button.button:0, 0);
+				m_mouse_handler(evt.button.x, evt.button.y, evt.button.state?evt.button.button:0, 0, this, m_view);
 			}
 			break;
 		case SDL_MOUSEWHEEL:
 			if (m_mouse_handler)
 			{
-				m_mouse_handler(m_last_mouse_x, m_last_mouse_y, 0, evt.wheel.y);
+				m_mouse_handler(m_last_mouse_x, m_last_mouse_y, 0, evt.wheel.y, this, m_view);
 			}
 			break;
 		case SDL_KEYDOWN:
@@ -257,6 +223,48 @@ double Screen::GetLastFrameTimeGPU() const
 	return frame_time_ns/1000000000.0;
 }
 
+void Screen::RenderPixels(int x, int y, int w, int h, uint8_t *pixels) const
+{
+	GLenum texture_format = GL_RGBA;
+
+	m_texture_prog.Use();
+	GraphicsBuffer quad_vertex_buffer;
+	quad_vertex_buffer.SetUsage(GraphicsBuffer::BufferUsageStaticDraw);
+	quad_vertex_buffer.SetType(GraphicsBuffer::BufferTypeVertex);
+	//rectangular texture == 2 triangles
+	GLfloat quad[] = { 
+		0, 0, (float)x, (float)y,
+		1, 0, (float)(x+w), (float)y,
+		0, 1, (float)x, (float)(y+h),
+		1, 1, (float)(x+w), (float)(y+h)
+	};
+	quad_vertex_buffer.Upload(sizeof(GLfloat) * 16, quad);
+	quad_vertex_buffer.Bind();
+	m_viewport_ubo.Bind();
+
+	glUniform4f(m_colour_uniform_location, 1.0f, 1.0f, 1.0f, 1.0f);
+
+	GLuint texID;
+	glGenTextures(1, &texID);
+	glBindTexture(GL_TEXTURE_2D, texID);
+
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
+
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, w, h, 0, texture_format, GL_UNSIGNED_BYTE, pixels);
+
+	glEnableVertexAttribArray(0);
+	glEnableVertexAttribArray(1);
+	glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, 4*sizeof(float), (void*)(2*sizeof(float)));
+	glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, 4*sizeof(float), 0);
+	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+	glDisableVertexAttribArray(1);
+	glDisableVertexAttribArray(0);
+
+}
+
 void Screen::ScreenShot(const char * filename) const
 {
 	Debug("Attempting to save BMP to file %s", filename);
@@ -371,7 +379,7 @@ void Screen::DebugFontInit(const char *name, float font_size)
 	size_t font_file_size = ftell(font_file);
 	fseek(font_file, 0, SEEK_SET);
 	unsigned char *font_file_data = (unsigned char*)malloc(font_file_size);
-	fread(font_file_data, 1, font_file_size, font_file);
+	SDL_assert(fread(font_file_data, 1, font_file_size, font_file) == font_file_size);
 	fclose(font_file);
 	stbtt_BakeFontBitmap(font_file_data,0, font_size, font_atlas_data,1024,1024, 32,96, m_debug_font_rects);
 	free(font_file_data);
@@ -383,7 +391,7 @@ void Screen::DebugFontInit(const char *name, float font_size)
 
 	m_debug_font_vertices.SetUsage(GraphicsBuffer::BufferUsageStreamDraw);
 	m_debug_font_vertices.SetType(GraphicsBuffer::BufferTypeVertex);
-	m_debug_font_vertices.Upload(8192, nullptr);
+	m_debug_font_vertices.Upload(8192,NULL);
 	m_debug_font_vertex_head = 0;
 
 	m_debug_font_indices.SetUsage(GraphicsBuffer::BufferUsageStreamDraw);
@@ -407,7 +415,7 @@ void Screen::DebugFontFlush()
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 	glBindTexture(GL_TEXTURE_2D, m_debug_font_atlas);
 
-	m_texture_prog.Use();
+	m_font_prog.Use();
 	m_viewport_ubo.Bind();
 	m_debug_font_vertices.Bind();
 	m_debug_font_indices.Bind();
@@ -431,14 +439,15 @@ void Screen::DebugFontFlush()
 	m_debug_font_index_head = 0;
 }
 
+struct fontvertex
+{
+	float x, y, s, t;
+};
+
 void Screen::DebugFontPrint(const char* str)
 {
 	if (!m_debug_font_atlas) return;
 
-	struct fontvertex
-	{
-		float x, y, s, t;
-	};
 
 	BufferBuilder<fontvertex> vertexData(m_debug_font_vertices.MapRange(m_debug_font_vertex_head*sizeof(float), m_debug_font_vertices.GetSize() - m_debug_font_vertex_head*sizeof(float), false, true, true), m_debug_font_vertices.GetSize() - m_debug_font_vertex_head*sizeof(float));
 	BufferBuilder<uint16_t> indexData(m_debug_font_indices.MapRange(m_debug_font_index_head*sizeof(uint16_t), m_debug_font_indices.GetSize() - m_debug_font_index_head*sizeof(uint16_t), false, true, true), m_debug_font_indices.GetSize() - m_debug_font_index_head*sizeof(uint16_t));