summaryrefslogtreecommitdiff
path: root/Runtime
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2021-11-02 21:52:09 +0800
committerchai <chaifix@163.com>2021-11-02 21:52:09 +0800
commit3898f2c648b1a731dead8337aad8912d2b8b80d7 (patch)
treeda06ea76f91ead6ba13722dd73ebbd8e8fb9b30c /Runtime
parent72812a7b47f90f9460e54e8149ba9199a7841244 (diff)
*misc
Diffstat (limited to 'Runtime')
-rw-r--r--Runtime/GUI/TextMesh.cpp2
-rw-r--r--Runtime/GUI/TextMesh.h2
-rw-r--r--Runtime/GUI/UIQuad.cpp (renamed from Runtime/Rendering/UIQuad.cpp)0
-rw-r--r--Runtime/GUI/UIQuad.h (renamed from Runtime/Rendering/UIQuad.h)2
-rw-r--r--Runtime/GUI/utf8.cpp (renamed from Runtime/GUI/utf8_decode.cpp)0
-rw-r--r--Runtime/Scripting/Rendering/Rendering.bind.cpp2
-rw-r--r--Runtime/Utilities/Utf8.cpp0
-rw-r--r--Runtime/Utilities/Utf8.h0
8 files changed, 4 insertions, 4 deletions
diff --git a/Runtime/GUI/TextMesh.cpp b/Runtime/GUI/TextMesh.cpp
index de9a195..2f66170 100644
--- a/Runtime/GUI/TextMesh.cpp
+++ b/Runtime/GUI/TextMesh.cpp
@@ -50,6 +50,8 @@ InitializeStaticVariables([]() {
s_SizePerText = sizeof(TextMeshVBOLayout) * 4;
});
+// 一段文字里面的网格可能会来自不同的atlas,在生成TextMesh时做好合批
+
TextMesh::TextMesh(const UnicodeString& str, Font* font,int pixelSize, ETextAnchor anchor, ETextAlignment alignment)
{
m_Font = font;
diff --git a/Runtime/GUI/TextMesh.h b/Runtime/GUI/TextMesh.h
index c091a78..c5f05a2 100644
--- a/Runtime/GUI/TextMesh.h
+++ b/Runtime/GUI/TextMesh.h
@@ -34,8 +34,6 @@ namespace TextHelper
TextMeshHash GetTextMeshHash();
}
-// 一段文字里面的网格可能会来自不同的atlas,在生成TextMesh时做好合批
-
class TextMesh
{
public:
diff --git a/Runtime/Rendering/UIQuad.cpp b/Runtime/GUI/UIQuad.cpp
index 089d0e1..089d0e1 100644
--- a/Runtime/Rendering/UIQuad.cpp
+++ b/Runtime/GUI/UIQuad.cpp
diff --git a/Runtime/Rendering/UIQuad.h b/Runtime/GUI/UIQuad.h
index f6d3a98..bcd95a0 100644
--- a/Runtime/Rendering/UIQuad.h
+++ b/Runtime/GUI/UIQuad.h
@@ -1,5 +1,5 @@
#pragma once
-#include "DynamicMesh.h"
+#include "../Rendering/DynamicMesh.h"
#include "../Utilities/StaticInitiator.h"
class UIQuad : public DynamicMesh
diff --git a/Runtime/GUI/utf8_decode.cpp b/Runtime/GUI/utf8.cpp
index 8a3a086..8a3a086 100644
--- a/Runtime/GUI/utf8_decode.cpp
+++ b/Runtime/GUI/utf8.cpp
diff --git a/Runtime/Scripting/Rendering/Rendering.bind.cpp b/Runtime/Scripting/Rendering/Rendering.bind.cpp
index f4777b7..0b00fa3 100644
--- a/Runtime/Scripting/Rendering/Rendering.bind.cpp
+++ b/Runtime/Scripting/Rendering/Rendering.bind.cpp
@@ -2,7 +2,7 @@
#include "Runtime/Graphics/Texture.h"
#include "Runtime/Graphics/ImageData.h"
#include "Runtime/Graphics/GfxDevice.h"
-#include "Runtime/Rendering/UIQuad.h"
+#include "Runtime/GUI/UIQuad.h"
// Rendering.DrawUIQuad({})
static int DrawUIQuad(lua_State* L)
diff --git a/Runtime/Utilities/Utf8.cpp b/Runtime/Utilities/Utf8.cpp
deleted file mode 100644
index e69de29..0000000
--- a/Runtime/Utilities/Utf8.cpp
+++ /dev/null
diff --git a/Runtime/Utilities/Utf8.h b/Runtime/Utilities/Utf8.h
deleted file mode 100644
index e69de29..0000000
--- a/Runtime/Utilities/Utf8.h
+++ /dev/null