Fix last merge mess

src/FontResource.cpp

@@ -29,15 +29,8 @@ OTHER DEALINGS IN THE SOFTWARE.
 namespace crown
 {
 
-<<<<<<< HEAD:src/Font.cpp
-FontResource::FontResource() :
-	m_max_text_height(0),
-	m_max_character_height(0),
-	m_max_character_width(0)
-=======
 //-----------------------------------------------------------------------------
 void* FontResource::load(Allocator& allocator, ResourceArchive& archive, ResourceId id)
->>>>>>> ba0fda4e8fc32e2c778ec5c565355d5b6fafe5c0:src/FontResource.cpp
 {
 	(void)allocator;
 	(void)archive;
@@ -52,29 +45,6 @@ void FontResource::online(void* resource)
 	(void)resource;
 }
 
-<<<<<<< HEAD:src/Font.cpp
-Glyph& FontResource::glyph(uint32_t code)
-{
-	if (m_code_glyph_dict.contains(code))
-	{
-		return m_code_glyph_dict[code];
-	}
-
-	static Glyph null_glyph;
-	return null_glyph;
-}
-
-void FontResource::set_code_glyph_metrics(uint32_t code, float left, float right, float bottom, float top, float width, float height, float advance, float baseline)
-{
-	if (m_code_glyph_dict.contains(code))
-	{
-		m_code_glyph_dict[code].set_metrics(left, right, bottom, top, width, height, advance, baseline);
-	}
-	else
-	{
-		m_code_glyph_dict[code] = Glyph(code, left, right, bottom, top, width, height, advance, baseline);
-	}
-=======
 //-----------------------------------------------------------------------------
 void FontResource::unload(Allocator& allocator, void* resource)
 {
@@ -85,7 +55,6 @@ void FontResource::unload(Allocator& allocator, void* resource)
 //-----------------------------------------------------------------------------
 void FontResource::offline()
 {
->>>>>>> ba0fda4e8fc32e2c778ec5c565355d5b6fafe5c0:src/FontResource.cpp
 }
 
 } // namespace crown

src/FontResource.h

@@ -46,9 +46,6 @@ public:
 
 public:
 
-	/// Returns the glyph for the desired point32_t code
-	Glyph&					glyph(uint32_t code);
-
 	inline uint32_t			mat_text_heigth() { return m_max_text_height; }
 	inline uint32_t			max_character_height() { return m_max_character_height; }
 	inline uint32_t			max_character_width() { return m_max_character_width; }

src/Glyph.h

@@ -48,13 +48,8 @@ public:
 	{
 	}
 
-<<<<<<< HEAD
-	//! Constructor
-	Glyph(uint32_t code, float left, float right, float bottom, float top, float width, float height, float advance, float baseline) :
-=======
 	/// Constructor
-	Glyph(uint32_t code, float left, float right, float bottom, float top, float width, float height, float advance, float m_baseline) :
->>>>>>> ba0fda4e8fc32e2c778ec5c565355d5b6fafe5c0
+	Glyph(uint32_t code, float left, float right, float bottom, float top, float width, float height, float advance, float baseline) :
 		m_code_point(code),
 		m_left(left),
 		m_right(right),
@@ -63,11 +58,7 @@ public:
 		m_width(width),
 		m_height(height),
 		m_advance(advance),
-<<<<<<< HEAD
 		m_baseline(baseline)
-=======
-		m_baseline(m_baseline)
->>>>>>> ba0fda4e8fc32e2c778ec5c565355d5b6fafe5c0
 	{
 	}
 
@@ -76,13 +67,8 @@ public:
 	{
 	}
 
-<<<<<<< HEAD
-	//! Returns the glyph's metrics
-	void metrics(float& left, float& right, float& bottom, float& top, float& width, float& height, float& advance, float& baseline) const
-=======
 	/// Returns the glyph's metrics
-	void metrics(float& left, float& right, float& bottom, float& top, float& width, float& height, float& advance, float& m_baseline) const
->>>>>>> ba0fda4e8fc32e2c778ec5c565355d5b6fafe5c0
+	void metrics(float& left, float& right, float& bottom, float& top, float& width, float& height, float& advance, float& baseline) const
 	{
 		left = m_left;
 		right = m_right;
@@ -91,19 +77,11 @@ public:
 		width = m_width;
 		height = m_height;
 		advance = m_advance;
-<<<<<<< HEAD
 		baseline = m_baseline;
 	}
 
-	//! Sets the glyph's metrics
-	void set_metrics(float left, float right, float bottom, float top, float width, float height, float advance, float baseline)
-=======
-		m_baseline = m_baseline;
-	}
-
 	/// Sets the glyph's metrics
-	void set_metrics(float left, float right, float bottom, float top, float width, float height, float advance, float m_baseline)
->>>>>>> ba0fda4e8fc32e2c778ec5c565355d5b6fafe5c0
+	void set_metrics(float left, float right, float bottom, float top, float width, float height, float advance, float baseline)
 	{
 		m_left = left;
 		m_right = right;
@@ -112,17 +90,10 @@ public:
 		m_width = width;
 		m_height = height;
 		m_advance = advance;
-<<<<<<< HEAD
 		m_baseline = baseline;
 	}
 
-	//! Returns the glyph's code point
-=======
-		m_baseline = m_baseline;
-	}
-
-	/// Returns the glyph's code point32_t
->>>>>>> ba0fda4e8fc32e2c778ec5c565355d5b6fafe5c0
+	/// Returns the glyph's code point
 	uint32_t code_point() const
 	{
 		return m_code_point;