Ver Fonte

minor fix

mikymod há 12 anos atrás
pai
commit
72f4bd4797
2 ficheiros alterados com 9 adições e 13 exclusões
  1. 4 4
      engine/gui/Gui.cpp
  2. 5 9
      engine/gui/Gui.h

+ 4 - 4
engine/gui/Gui.cpp

@@ -132,10 +132,10 @@ Gui::Gui(RenderWorld& render_world, GuiResource* gr, Renderer& r)
 	, m_r(r)
 	, m_resolution(1000, 625)
 	, m_visible(true)
-	, m_rect_pool(default_allocator(), MAX_GUI_RECTS, sizeof(GuiRect), CE_ALIGNOF(GuiRect))
-	, m_triangle_pool(default_allocator(), MAX_GUI_TRIANGLES, sizeof(GuiTriangle), CE_ALIGNOF(GuiTriangle))
-	, m_image_pool(default_allocator(), MAX_GUI_IMAGES, sizeof(GuiImage), CE_ALIGNOF(GuiImage))
-	, m_text_pool(default_allocator(), MAX_GUI_TEXTS, sizeof(GuiText), CE_ALIGNOF(GuiText))
+	, m_rect_pool(default_allocator(), CE_MAX_GUI_RECTS, sizeof(GuiRect), CE_ALIGNOF(GuiRect))
+	, m_triangle_pool(default_allocator(), CE_MAX_GUI_TRIANGLES, sizeof(GuiTriangle), CE_ALIGNOF(GuiTriangle))
+	, m_image_pool(default_allocator(), CE_MAX_GUI_IMAGES, sizeof(GuiImage), CE_ALIGNOF(GuiImage))
+	, m_text_pool(default_allocator(), CE_MAX_GUI_TEXTS, sizeof(GuiText), CE_ALIGNOF(GuiText))
 {
 	// orthographic projection
 	m_projection.build_projection_ortho_rh(0, m_resolution.x, m_resolution.y, 0, -0.01f, 100.0f);

+ 5 - 9
engine/gui/Gui.h

@@ -32,11 +32,7 @@ OTHER DEALINGS IN THE SOFTWARE.
 #include "PoolAllocator.h"
 #include "Vector2.h"
 #include "Resource.h"
-
-#define MAX_GUI_RECTS 64
-#define MAX_GUI_TRIANGLES 64
-#define MAX_GUI_IMAGES 64
-#define MAX_GUI_TEXTS 64
+#include "Config.h"
 
 namespace crown
 {
@@ -111,10 +107,10 @@ public:
 	PoolAllocator		m_image_pool;
 	PoolAllocator		m_text_pool;
 
-	IdArray<MAX_GUI_RECTS, GuiRect*> m_rects;
-	IdArray<MAX_GUI_TRIANGLES, GuiTriangle*> m_triangles;
-	IdArray<MAX_GUI_IMAGES, GuiImage*> m_images;
-	IdArray<MAX_GUI_TEXTS, GuiText*> m_texts;
+	IdArray<CE_MAX_GUI_RECTS, GuiRect*> m_rects;
+	IdArray<CE_MAX_GUI_TRIANGLES, GuiTriangle*> m_triangles;
+	IdArray<CE_MAX_GUI_IMAGES, GuiImage*> m_images;
+	IdArray<CE_MAX_GUI_TEXTS, GuiText*> m_texts;
 };
 
 } // namespace crown