This commit is contained in:
MihailRis
2024-05-06 03:15:27 +03:00
parent 91aacafecb
commit f27a418dbe
81 changed files with 310 additions and 302 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
#include "BlocksPreview.hpp"
#include "../../assets/Assets.h"
#include "../../assets/Assets.hpp"
#include "../../constants.h"
#include "../../content/Content.h"
#include "../../frontend/ContentGfxCache.hpp"
+1 -1
View File
@@ -1,5 +1,5 @@
#include "Skybox.hpp"
#include "../../assets/Assets.h"
#include "../../assets/Assets.hpp"
#include "../../graphics/core/Shader.hpp"
#include "../../graphics/core/Mesh.hpp"
#include "../../graphics/core/Batch3D.hpp"
+1 -1
View File
@@ -3,7 +3,7 @@
#include "ChunksRenderer.hpp"
#include "Skybox.hpp"
#include "../../assets/Assets.h"
#include "../../assets/Assets.hpp"
#include "../../content/Content.h"
#include "../../engine.h"
#include "../../frontend/LevelFrontend.hpp"
+4 -4
View File
@@ -2,10 +2,7 @@
#include "elements/UINode.hpp"
#include "elements/Menu.hpp"
#include <iostream>
#include <algorithm>
#include "../../assets/Assets.h"
#include "../../assets/Assets.hpp"
#include "../../frontend/UiDocument.hpp"
#include "../../graphics/core/Batch2D.hpp"
#include "../../graphics/core/Shader.hpp"
@@ -14,6 +11,9 @@
#include "../../window/input.hpp"
#include "../../window/Camera.hpp"
#include <iostream>
#include <algorithm>
using namespace gui;
GUI::GUI() {
+1 -1
View File
@@ -3,7 +3,7 @@
#include "../../core/DrawContext.hpp"
#include "../../core/Batch2D.hpp"
#include "../../core/Texture.hpp"
#include "../../../assets/Assets.h"
#include "../../../assets/Assets.hpp"
#include "../../../maths/UVRegion.hpp"
using namespace gui;
+1 -1
View File
@@ -3,7 +3,7 @@
#include "Label.hpp"
#include "../../core/DrawContext.hpp"
#include "../../core/Batch2D.hpp"
#include "../../../util/stringutil.h"
#include "../../../util/stringutil.hpp"
using namespace gui;
+2 -2
View File
@@ -1,5 +1,5 @@
#include "InventoryView.hpp"
#include "../../../assets/Assets.h"
#include "../../../assets/Assets.hpp"
#include "../../../content/Content.h"
#include "../../../frontend/LevelFrontend.hpp"
#include "../../../items/Inventories.h"
@@ -9,7 +9,7 @@
#include "../../../logic/scripting/scripting.h"
#include "../../../maths/voxmaths.h"
#include "../../../objects/Player.h"
#include "../../../util/stringutil.h"
#include "../../../util/stringutil.hpp"
#include "../../../voxels/Block.h"
#include "../../../window/Events.hpp"
#include "../../../window/input.hpp"
+2 -2
View File
@@ -2,8 +2,8 @@
#include "../../core/DrawContext.hpp"
#include "../../core/Batch2D.hpp"
#include "../../core/Font.hpp"
#include "../../../assets/Assets.h"
#include "../../../util/stringutil.h"
#include "../../../assets/Assets.hpp"
#include "../../../util/stringutil.hpp"
using namespace gui;
+2 -2
View File
@@ -3,8 +3,8 @@
#include "../../core/Batch2D.hpp"
#include "../../core/Font.hpp"
#include "../../core/DrawContext.hpp"
#include "../../../assets/Assets.h"
#include "../../../util/stringutil.h"
#include "../../../assets/Assets.hpp"
#include "../../../util/stringutil.hpp"
using namespace gui;
+2 -2
View File
@@ -4,8 +4,8 @@
#include "../../core/DrawContext.hpp"
#include "../../core/Batch2D.hpp"
#include "../../core/Font.hpp"
#include "../../../assets/Assets.h"
#include "../../../util/stringutil.h"
#include "../../../assets/Assets.hpp"
#include "../../../util/stringutil.hpp"
#include "../../../window/Events.hpp"
using namespace gui;
+1 -1
View File
@@ -2,7 +2,7 @@
#include "../../core/DrawContext.hpp"
#include "../../core/Batch2D.hpp"
#include "../../../assets/Assets.h"
#include "../../../assets/Assets.hpp"
using namespace gui;
+4 -3
View File
@@ -1,16 +1,17 @@
#include "gui_util.hpp"
#include "elements/Label.hpp"
#include "elements/Menu.hpp"
#include "elements/Button.hpp"
#include "gui_xml.hpp"
#include <glm/glm.hpp>
#include "../../logic/scripting/scripting.h"
#include "../../frontend/locale.hpp"
#include "../../util/stringutil.h"
#include "../../util/stringutil.hpp"
#include "../../delegates.h"
#include <glm/glm.hpp>
using namespace gui;
std::shared_ptr<Button> guiutil::backButton(std::shared_ptr<Menu> menu) {
+1 -1
View File
@@ -15,7 +15,7 @@
#include "../../items/Inventory.h"
#include "../../logic/scripting/scripting.h"
#include "../../maths/voxmaths.h"
#include "../../util/stringutil.h"
#include "../../util/stringutil.hpp"
#include "../../window/Events.hpp"
#include <stdexcept>