Procházet zdrojové kódy

remove resolution from GuiResource

mikymod před 12 roky
rodič
revize
2affbda927
2 změnil soubory, kde provedl 1 přidání a 18 odebrání
  1. 1 6
      engine/resource/GuiResource.cpp
  2. 0 12
      engine/resource/GuiResource.h

+ 1 - 6
engine/resource/GuiResource.cpp

@@ -97,11 +97,8 @@ void compile(Filesystem& fs, const char* resource_path, File* out_file)
 	JSONParser json(buf);
 	JSONElement root = json.root();
 
-	List<float>			m_gui_position(default_allocator());
-	List<float>			m_gui_size(default_allocator());
-
+	List<float>	m_gui_position(default_allocator());
 	root.key("position").to_array(m_gui_position);
-	root.key("size").to_array(m_gui_size);
 
 	// Parse & compile all rects
 	if (root.has_key("rects"))
@@ -201,8 +198,6 @@ void compile(Filesystem& fs, const char* resource_path, File* out_file)
 	// Fill resource header
 	h.position[0] = m_gui_position[0];
 	h.position[1] = m_gui_position[1];
-	h.size[0] = m_gui_size[0];
-	h.size[1] = m_gui_size[1];
 	h.num_rects = m_gui_rects.size();
 	h.num_triangles = m_gui_triangles.size();
 	h.num_images = m_gui_images.size();

+ 0 - 12
engine/resource/GuiResource.h

@@ -51,7 +51,6 @@ const uint32_t GUI_RESOURCE_VERSION = 1;
 struct GuiHeader
 {
 	uint32_t position[2];
-	uint32_t size[2];
 	uint32_t num_rects;
 	uint32_t num_triangles;
 	uint32_t num_images;
@@ -129,17 +128,6 @@ struct GuiResource
 		return pos;
 	}
 
-	//-----------------------------------------------------------------------------
-	Vector2 gui_size() const
-	{
-		Vector2 size;
-
-		size.x = ((GuiHeader*)this)->size[0];
-		size.y = ((GuiHeader*)this)->size[1];
-
-		return size;
-	}
-
 	//-----------------------------------------------------------------------------
 	uint32_t num_rects() const
 	{