X-Git-Url: https://git.ucc.asn.au/?p=ipdf%2Fcode.git;a=blobdiff_plain;f=src%2Fscreen.cpp;h=3bbf00822209320d2514fbbb4bdd87ae6d9c1b48;hp=dc59de90904d684a6cc378283a1028bdafd783a1;hb=7a83af96414ff156f56455ff7a5e7af01fc403b5;hpb=8942bd699d8e1ddede1127421ad18bed53232ff3

diff --git a/src/screen.cpp b/src/screen.cpp
index dc59de9..3bbf008 100644
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -89,6 +89,7 @@ Screen::Screen()
 
 	m_debug_font_atlas = 0;
 
+	m_view = NULL;
 	ResizeViewport(800, 600);
 
 	Clear();
@@ -145,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:
@@ -154,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:
@@ -378,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);
@@ -390,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);
@@ -438,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));