summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Projects/VisualStudio/Editor/Editor.vcxproj10
-rw-r--r--Projects/VisualStudio/Editor/Editor.vcxproj.filters18
-rw-r--r--Projects/VisualStudio/GameLab.sln20
-rw-r--r--Runtime/GUI/Font.cpp0
-rw-r--r--Runtime/GUI/Font.h0
-rw-r--r--Runtime/Graphics/DynamicVertexBuffer.cpp (renamed from Runtime/Graphics/SharedVertexBuffer.cpp)22
-rw-r--r--Runtime/Graphics/DynamicVertexBuffer.h (renamed from Runtime/Graphics/SharedVertexBuffer.h)6
-rw-r--r--Runtime/Graphics/GfxDevice.h6
8 files changed, 45 insertions, 37 deletions
diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj b/Projects/VisualStudio/Editor/Editor.vcxproj
index 3dda150..ffdf5ef 100644
--- a/Projects/VisualStudio/Editor/Editor.vcxproj
+++ b/Projects/VisualStudio/Editor/Editor.vcxproj
@@ -93,7 +93,7 @@
<Link>
<SubSystem>Console</SubSystem>
<AdditionalDependencies>freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>D:\Documents\VisualStudio2017\Projects\GameLab\ThirdParty\freetype\release static\vs2015-2019\win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(SolutionDir)..\..\ThirdParty\freetype\release static\vs2015-2019\win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -142,7 +142,7 @@
<EnableCOMDATFolding>true</EnableCOMDATFolding>
<OptimizeReferences>true</OptimizeReferences>
<AdditionalDependencies>freetype.lib;%(AdditionalDependencies)</AdditionalDependencies>
- <AdditionalLibraryDirectories>D:\Documents\VisualStudio2017\Projects\GameLab\ThirdParty\freetype\release static\vs2015-2019\win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+ <AdditionalLibraryDirectories>$(SolutionDir)..\..\ThirdParty\freetype\release static\vs2015-2019\win64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link>
</ItemDefinitionGroup>
<ItemGroup>
@@ -195,10 +195,11 @@
<ClCompile Include="..\..\..\Runtime\Graphics\RenderTexture.cpp" />
<ClCompile Include="..\..\..\Runtime\Graphics\Shader.cpp" />
<ClCompile Include="..\..\..\Runtime\Graphics\ShaderCompiler.cpp" />
- <ClCompile Include="..\..\..\Runtime\Graphics\SharedVertexBuffer.cpp" />
+ <ClCompile Include="..\..\..\Runtime\Graphics\DynamicVertexBuffer.cpp" />
<ClCompile Include="..\..\..\Runtime\Graphics\Texture.cpp" />
<ClCompile Include="..\..\..\Runtime\Graphics\VertexAttribute.cpp" />
<ClCompile Include="..\..\..\Runtime\Graphics\VertexBuffer.cpp" />
+ <ClCompile Include="..\..\..\Runtime\GUI\Font.cpp" />
<ClCompile Include="..\..\..\Runtime\GUI\TextGenerator.cpp" />
<ClCompile Include="..\..\..\Runtime\Lua\LuaBind\LuaBindCFunctions.cpp" />
<ClCompile Include="..\..\..\Runtime\Lua\LuaBind\LuaBindClass.cpp" />
@@ -279,10 +280,11 @@
<ClInclude Include="..\..\..\Runtime\Graphics\RenderTexture.h" />
<ClInclude Include="..\..\..\Runtime\Graphics\Shader.h" />
<ClInclude Include="..\..\..\Runtime\Graphics\ShaderCompiler.h" />
- <ClInclude Include="..\..\..\Runtime\Graphics\SharedVertexBuffer.h" />
+ <ClInclude Include="..\..\..\Runtime\Graphics\DynamicVertexBuffer.h" />
<ClInclude Include="..\..\..\Runtime\Graphics\Texture.h" />
<ClInclude Include="..\..\..\Runtime\Graphics\VertexAttribute.h" />
<ClInclude Include="..\..\..\Runtime\Graphics\VertexBuffer.h" />
+ <ClInclude Include="..\..\..\Runtime\GUI\Font.h" />
<ClInclude Include="..\..\..\Runtime\GUI\freetype.h" />
<ClInclude Include="..\..\..\Runtime\GUI\TextGenerator.h" />
<ClInclude Include="..\..\..\Runtime\Lua\LuaBind\LuaBind.h" />
diff --git a/Projects/VisualStudio/Editor/Editor.vcxproj.filters b/Projects/VisualStudio/Editor/Editor.vcxproj.filters
index 32f64ac..9fb8bf2 100644
--- a/Projects/VisualStudio/Editor/Editor.vcxproj.filters
+++ b/Projects/VisualStudio/Editor/Editor.vcxproj.filters
@@ -363,9 +363,6 @@
<ClCompile Include="..\..\..\Runtime\Graphics\DefaultVertexLayout.cpp">
<Filter>Runtime\FileSystem</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\Runtime\Graphics\SharedVertexBuffer.cpp">
- <Filter>Runtime\Graphics</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\Runtime\Graphics\VertexAttribute.cpp">
<Filter>Runtime\Graphics</Filter>
</ClCompile>
@@ -393,6 +390,12 @@
<ClCompile Include="..\..\..\Runtime\Graphics\RenderCommands.cpp">
<Filter>Runtime\Graphics</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\Runtime\GUI\Font.cpp">
+ <Filter>Runtime\GUI</Filter>
+ </ClCompile>
+ <ClCompile Include="..\..\..\Runtime\Graphics\DynamicVertexBuffer.cpp">
+ <Filter>Runtime\Graphics</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\..\Editor\GUI\Dock.h">
@@ -635,9 +638,6 @@
<ClInclude Include="..\..\..\Runtime\Graphics\VertexAttribute.h">
<Filter>Runtime\Graphics</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\Runtime\Graphics\SharedVertexBuffer.h">
- <Filter>Runtime\Graphics</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\Runtime\Graphics\Primitive.h">
<Filter>Runtime\Graphics</Filter>
</ClInclude>
@@ -683,6 +683,12 @@
<ClInclude Include="..\..\..\Runtime\Graphics\RenderCommands.h">
<Filter>Runtime\Graphics</Filter>
</ClInclude>
+ <ClInclude Include="..\..\..\Runtime\GUI\Font.h">
+ <Filter>Runtime\GUI</Filter>
+ </ClInclude>
+ <ClInclude Include="..\..\..\Runtime\Graphics\DynamicVertexBuffer.h">
+ <Filter>Runtime\Graphics</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\Runtime\Lua\LuaBind\LuaBindClass.inc">
diff --git a/Projects/VisualStudio/GameLab.sln b/Projects/VisualStudio/GameLab.sln
index 8013406..9a7496c 100644
--- a/Projects/VisualStudio/GameLab.sln
+++ b/Projects/VisualStudio/GameLab.sln
@@ -3,6 +3,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.28307.1022
MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Runtime", "Runtime\Runtime.vcxproj", "{4C26BDCC-CA08-4C43-8EFF-B62A204D5FBD}"
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL2", "SDL2\SDL2.vcxproj", "{8658F91C-9AAE-4819-9005-77D09C61D97F}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ThirdParty", "ThirdParty", "{0F6EE105-E1FF-4770-8314-06F9F98FB68F}"
@@ -29,8 +31,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "AsyncTask", "AsyncTask\Asyn
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "hash-library", "hash-library\hash-library.vcxproj", "{F5341260-AFF4-4F99-9182-C8A0673E3B14}"
EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Runner", "Runner\Runner.vcxproj", "{0168C539-D3F8-48AD-BBB0-259B87786D1F}"
-EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|x64 = Debug|x64
@@ -39,6 +39,14 @@ Global
Release|x86 = Release|x86
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {4C26BDCC-CA08-4C43-8EFF-B62A204D5FBD}.Debug|x64.ActiveCfg = Debug|x64
+ {4C26BDCC-CA08-4C43-8EFF-B62A204D5FBD}.Debug|x64.Build.0 = Debug|x64
+ {4C26BDCC-CA08-4C43-8EFF-B62A204D5FBD}.Debug|x86.ActiveCfg = Debug|Win32
+ {4C26BDCC-CA08-4C43-8EFF-B62A204D5FBD}.Debug|x86.Build.0 = Debug|Win32
+ {4C26BDCC-CA08-4C43-8EFF-B62A204D5FBD}.Release|x64.ActiveCfg = Release|x64
+ {4C26BDCC-CA08-4C43-8EFF-B62A204D5FBD}.Release|x64.Build.0 = Release|x64
+ {4C26BDCC-CA08-4C43-8EFF-B62A204D5FBD}.Release|x86.ActiveCfg = Release|Win32
+ {4C26BDCC-CA08-4C43-8EFF-B62A204D5FBD}.Release|x86.Build.0 = Release|Win32
{8658F91C-9AAE-4819-9005-77D09C61D97F}.Debug|x64.ActiveCfg = Debug|x64
{8658F91C-9AAE-4819-9005-77D09C61D97F}.Debug|x64.Build.0 = Debug|x64
{8658F91C-9AAE-4819-9005-77D09C61D97F}.Debug|x86.ActiveCfg = Debug|Win32
@@ -127,14 +135,6 @@ Global
{F5341260-AFF4-4F99-9182-C8A0673E3B14}.Release|x64.Build.0 = Release|x64
{F5341260-AFF4-4F99-9182-C8A0673E3B14}.Release|x86.ActiveCfg = Release|Win32
{F5341260-AFF4-4F99-9182-C8A0673E3B14}.Release|x86.Build.0 = Release|Win32
- {0168C539-D3F8-48AD-BBB0-259B87786D1F}.Debug|x64.ActiveCfg = Debug|x64
- {0168C539-D3F8-48AD-BBB0-259B87786D1F}.Debug|x64.Build.0 = Debug|x64
- {0168C539-D3F8-48AD-BBB0-259B87786D1F}.Debug|x86.ActiveCfg = Debug|Win32
- {0168C539-D3F8-48AD-BBB0-259B87786D1F}.Debug|x86.Build.0 = Debug|Win32
- {0168C539-D3F8-48AD-BBB0-259B87786D1F}.Release|x64.ActiveCfg = Release|x64
- {0168C539-D3F8-48AD-BBB0-259B87786D1F}.Release|x64.Build.0 = Release|x64
- {0168C539-D3F8-48AD-BBB0-259B87786D1F}.Release|x86.ActiveCfg = Release|Win32
- {0168C539-D3F8-48AD-BBB0-259B87786D1F}.Release|x86.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/Runtime/GUI/Font.cpp b/Runtime/GUI/Font.cpp
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Runtime/GUI/Font.cpp
diff --git a/Runtime/GUI/Font.h b/Runtime/GUI/Font.h
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/Runtime/GUI/Font.h
diff --git a/Runtime/Graphics/SharedVertexBuffer.cpp b/Runtime/Graphics/DynamicVertexBuffer.cpp
index 976fb70..203aa26 100644
--- a/Runtime/Graphics/SharedVertexBuffer.cpp
+++ b/Runtime/Graphics/DynamicVertexBuffer.cpp
@@ -1,11 +1,11 @@
-#include "SharedVertexBuffer.h"
+#include "DynamicVertexBuffer.h"
#include "../Profiling/FrameStats.h"
-SharedVertexBuffer::SharedVertexBuffer()
+DynamicVertexBuffer::DynamicVertexBuffer()
{
}
-SharedVertexBuffer::~SharedVertexBuffer()
+DynamicVertexBuffer::~DynamicVertexBuffer()
{
}
@@ -16,7 +16,7 @@ SharedVertexBuffer::~SharedVertexBuffer()
//-> ReleaseChunk
//-> DrawChunk
-void SharedVertexBuffer::GetChunk(uint attrsMask, int maxVerts, int maxIndices, EPrimitive primitive, void **out_vb, void **out_ib)
+void DynamicVertexBuffer::GetChunk(uint attrsMask, int maxVerts, int maxIndices, EPrimitive primitive, void **out_vb, void **out_ib)
{
Assert(out_vb && out_ib);
@@ -28,7 +28,7 @@ void SharedVertexBuffer::GetChunk(uint attrsMask, int maxVerts, int maxIndices,
m_CurStride = stride;
}
-void SharedVertexBuffer::DrawChunk()
+void DynamicVertexBuffer::DrawChunk()
{
DefaultVertexLayout vertexArray;
FillDefaultVertexLayout(vertexArray);
@@ -67,7 +67,7 @@ void SharedVertexBuffer::DrawChunk()
Clean();
}
-void SharedVertexBuffer::FillDefaultVertexLayout(DefaultVertexLayout& dst)
+void DynamicVertexBuffer::FillDefaultVertexLayout(DefaultVertexLayout& dst)
{
const byte* basepointer = m_CurVB ? 0 : &m_CurVBData[0];
const GLuint buffer = m_CurVB ? m_CurVB->GetHandle() : 0;
@@ -105,7 +105,7 @@ void SharedVertexBuffer::FillDefaultVertexLayout(DefaultVertexLayout& dst)
// Custom Vertex Layout
// 用buffersize为依据决定用vbo或者pinned memory
-void SharedVertexBuffer::GetChunk(uint sizePerVert, uint sizePerIndex, int maxVerts, int maxIndices, EPrimitive primitive, void **out_vb, void **out_ib)
+void DynamicVertexBuffer::GetChunk(uint sizePerVert, uint sizePerIndex, int maxVerts, int maxIndices, EPrimitive primitive, void **out_vb, void **out_ib)
{
Assert(out_vb && out_ib);
@@ -150,7 +150,7 @@ void SharedVertexBuffer::GetChunk(uint sizePerVert, uint sizePerIndex, int maxVe
m_CurPrimitive = primitive;
}
-void SharedVertexBuffer::FillCustomVertexLayout(CustomVertexLayout& dst)
+void DynamicVertexBuffer::FillCustomVertexLayout(CustomVertexLayout& dst)
{
const byte* basepointer = m_CurVB ? 0 : &m_CurVBData[0];
const GLuint buffer = m_CurVB ? m_CurVB->GetHandle() : 0;
@@ -164,7 +164,7 @@ void SharedVertexBuffer::FillCustomVertexLayout(CustomVertexLayout& dst)
}
}
-void SharedVertexBuffer::DrawChunk(CustomVertexLayout& layout)
+void DynamicVertexBuffer::DrawChunk(CustomVertexLayout& layout)
{
const byte* basepointer = m_CurVB ? 0 : &m_CurVBData[0];
const GLuint buffer = m_CurVB ? m_CurVB->GetHandle() : 0;
@@ -209,7 +209,7 @@ void SharedVertexBuffer::DrawChunk(CustomVertexLayout& layout)
//------------------------------------------------------------------------------------------------------------
// Both Default and Custom Vertex Layout
-void SharedVertexBuffer::ReleaseChunk(int actualVerts, int actualIndices)
+void DynamicVertexBuffer::ReleaseChunk(int actualVerts, int actualIndices)
{
int actualVBufferSize = m_CurStride * actualVerts;
int actualIBufferSize = VertexLayout::GetDefaultIndexSize() * actualIndices;
@@ -242,7 +242,7 @@ void SharedVertexBuffer::ReleaseChunk(int actualVerts, int actualIndices)
m_CurIndexCount = actualIndices;
}
-void SharedVertexBuffer::Clean()
+void DynamicVertexBuffer::Clean()
{
if (m_CurVB)
{
diff --git a/Runtime/Graphics/SharedVertexBuffer.h b/Runtime/Graphics/DynamicVertexBuffer.h
index cc89752..a849f4c 100644
--- a/Runtime/Graphics/SharedVertexBuffer.h
+++ b/Runtime/Graphics/DynamicVertexBuffer.h
@@ -10,11 +10,11 @@
#include "CustomVertexLayout.h"
#include "Primitive.h"
-class SharedVertexBuffer
+class DynamicVertexBuffer
{
public:
- SharedVertexBuffer();
- ~SharedVertexBuffer();
+ DynamicVertexBuffer();
+ ~DynamicVertexBuffer();
// default layout
void GetChunk(uint attrs, int maxVerts, int maxIndices, EPrimitive primitive, void **out_vb, void **out_ib);
diff --git a/Runtime/Graphics/GfxDevice.h b/Runtime/Graphics/GfxDevice.h
index 68cd6c0..437696a 100644
--- a/Runtime/Graphics/GfxDevice.h
+++ b/Runtime/Graphics/GfxDevice.h
@@ -13,7 +13,7 @@
#include "Texture.h"
#include "DeviceDefine.h"
#include "VertexBuffer.h"
-#include "SharedVertexBuffer.h"
+#include "DynamicVertexBuffer.h"
#include "Color.h"
struct GfxDeviceSetting
@@ -77,7 +77,7 @@ public:
bool IsInsideFrame();
- SharedVertexBuffer* GetSharedVBO() { return &m_SharedVBO; }
+ DynamicVertexBuffer* GetSharedVBO() { return &m_DynamicVBO; }
GET_SET(Internal::Color, ClearColor, m_ClearColor);
GET_SET(ETextureFilterMode, DefaultFilterMode, m_DefaultFilterMode);
@@ -100,7 +100,7 @@ private:
ETextureFilterMode m_DefaultFilterMode;
ETextureWrapMode m_DefaultWrapMode;
- SharedVertexBuffer m_SharedVBO; // 共享的VBO，用来做立即渲染
+ DynamicVertexBuffer m_DynamicVBO; // 共享的VBO，用来做立即渲染
};
generated by cgit v1.1-26-g67d0 at 2025-05-18 23:32:13 +0000