Lenheart
/
Magic_Game
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[deploy] Merge pull request #51 from KiwanoEngine/dev 

Update FrameSequence
This commit is contained in:
Haibo 2020-02-11 18:02:00 +08:00 committed by GitHub
parent f2baffab8e 27fa580cc1
commit bd3fe87a95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 146 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
projects/kiwano-imgui/kiwano-imgui.vcxproj
View File

@ -3,9 +3,9 @@
<ItemGroup>
<ClInclude Include="..\..\src\kiwano-imgui\ImGuiLayer.h" />
<ClInclude Include="..\..\src\kiwano-imgui\ImGuiModule.h" />
<ClInclude Include="..\..\src\kiwano-imgui\imgui_impl.h" />
<ClInclude Include="..\..\src\kiwano-imgui\imgui_impl_dx10.h" />
<ClInclude Include="..\..\src\kiwano-imgui\imgui_impl_dx11.h" />
<ClInclude Include="..\..\src\kiwano-imgui\imgui_impl\imgui_impl.h" />
<ClInclude Include="..\..\src\kiwano-imgui\imgui_impl\imgui_impl_dx10.h" />
<ClInclude Include="..\..\src\kiwano-imgui\imgui_impl\imgui_impl_dx11.h" />
<ClInclude Include="..\..\src\kiwano-imgui\kiwano-imgui.h" />
</ItemGroup>
<ItemGroup Label="ProjectConfigurations">
@ -21,8 +21,8 @@
<ItemGroup>
<ClCompile Include="..\..\src\kiwano-imgui\ImGuiLayer.cpp" />
<ClCompile Include="..\..\src\kiwano-imgui\ImGuiModule.cpp" />
<ClCompile Include="..\..\src\kiwano-imgui\imgui_impl_dx10.cpp" />
<ClCompile Include="..\..\src\kiwano-imgui\imgui_impl_dx11.cpp" />
<ClCompile Include="..\..\src\kiwano-imgui\imgui_impl\imgui_impl_dx10.cpp" />
<ClCompile Include="..\..\src\kiwano-imgui\imgui_impl\imgui_impl_dx11.cpp" />
</ItemGroup>
<PropertyGroup Label="Globals">
<ProjectGuid>{A7062ED8-8910-48A5-A3BC-C1612672571F}</ProjectGuid>
@ -112,4 +112,4 @@
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
</Project>
</Project>

25
projects/kiwano-imgui/kiwano-imgui.vcxproj.filters
View File

@ -2,16 +2,31 @@
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<ClInclude Include="..\..\src\kiwano-imgui\kiwano-imgui.h" />
<ClInclude Include="..\..\src\kiwano-imgui\imgui_impl.h" />
<ClInclude Include="..\..\src\kiwano-imgui\imgui_impl_dx10.h" />
<ClInclude Include="..\..\src\kiwano-imgui\imgui_impl_dx11.h" />
<ClInclude Include="..\..\src\kiwano-imgui\ImGuiLayer.h" />
<ClInclude Include="..\..\src\kiwano-imgui\ImGuiModule.h" />
<ClInclude Include="..\..\src\kiwano-imgui\imgui_impl\imgui_impl.h">
<Filter>imgui_impl</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano-imgui\imgui_impl\imgui_impl_dx10.h">
<Filter>imgui_impl</Filter>
</ClInclude>
<ClInclude Include="..\..\src\kiwano-imgui\imgui_impl\imgui_impl_dx11.h">
<Filter>imgui_impl</Filter>
</ClInclude>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\src\kiwano-imgui\imgui_impl_dx10.cpp" />
<ClCompile Include="..\..\src\kiwano-imgui\imgui_impl_dx11.cpp" />
<ClCompile Include="..\..\src\kiwano-imgui\ImGuiLayer.cpp" />
<ClCompile Include="..\..\src\kiwano-imgui\ImGuiModule.cpp" />
<ClCompile Include="..\..\src\kiwano-imgui\imgui_impl\imgui_impl_dx10.cpp">
<Filter>imgui_impl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\kiwano-imgui\imgui_impl\imgui_impl_dx11.cpp">
<Filter>imgui_impl</Filter>
</ClCompile>
</ItemGroup>
<ItemGroup>
<Filter Include="imgui_impl">
<UniqueIdentifier>{a11036bf-f334-4e51-aef2-15dd46be924d}</UniqueIdentifier>
</Filter>
</ItemGroup>
</Project>

2
src/kiwano-imgui/ImGuiModule.cpp
View File

@ -8,7 +8,7 @@
#include <kiwano/platform/win32/WindowImpl.h>
#include <kiwano/render/Renderer.h>
#include <kiwano-imgui/ImGuiModule.h>
#include <kiwano-imgui/imgui_impl.h>
#include <kiwano-imgui/imgui_impl/imgui_impl.h>
namespace kiwano
{

4
src/kiwano-imgui/imgui_impl.h → src/kiwano-imgui/imgui_impl/imgui_impl.h
View File

@ -6,7 +6,7 @@
#if !defined(KGE_USE_DIRECTX10)
#include <kiwano-imgui/imgui_impl_dx11.h>
#include <kiwano-imgui/imgui_impl/imgui_impl_dx11.h>
#include <kiwano/render/DirectX/RendererImpl.h>
inline bool ImGui_Impl_Init()
@ -43,7 +43,7 @@ inline bool ImGui_Impl_CreateDeviceObjects()
#else
#include <kiwano-imgui/imgui_impl_dx10.h>
#include <kiwano-imgui/imgui_impl/imgui_impl_dx10.h>
inline bool ImGui_Impl_Init()
{

2
src/kiwano-imgui/imgui_impl_dx10.cpp → src/kiwano-imgui/imgui_impl/imgui_impl_dx10.cpp
View File

@ -1,6 +1,6 @@
// dear imgui: Renderer for Kiwano (DirectX10)
#include <kiwano-imgui/imgui_impl_dx10.h>
#include <kiwano-imgui/imgui_impl/imgui_impl_dx10.h>
// DirectX
#include <d3d10_1.h>

0
src/kiwano-imgui/imgui_impl_dx10.h → src/kiwano-imgui/imgui_impl/imgui_impl_dx10.h
View File

2
src/kiwano-imgui/imgui_impl_dx11.cpp → src/kiwano-imgui/imgui_impl/imgui_impl_dx11.cpp
View File

@ -1,6 +1,6 @@
// dear imgui: Renderer for Kiwano (DirectX11)
#include <kiwano-imgui/imgui_impl_dx11.h>
#include <kiwano-imgui/imgui_impl/imgui_impl_dx11.h>
// DirectX
#include <d3d11.h>

0
src/kiwano-imgui/imgui_impl_dx11.h → src/kiwano-imgui/imgui_impl/imgui_impl_dx11.h
View File

62
src/kiwano/2d/FrameSequence.cpp
View File

@ -24,6 +24,12 @@
namespace kiwano
{
FrameSequencePtr FrameSequence::Create()
{
FrameSequencePtr ptr = new (std::nothrow) FrameSequence;
return ptr;
}
FrameSequencePtr FrameSequence::Create(Vector<FramePtr> const& frames)
{
FrameSequencePtr ptr = new (std::nothrow) FrameSequence;
@ -34,6 +40,17 @@ FrameSequencePtr FrameSequence::Create(Vector<FramePtr> const& frames)
return ptr;
}
FrameSequencePtr FrameSequence::Create(FramePtr frame, int cols, int rows, int max_num, float padding_x,
float padding_y)
{
FrameSequencePtr ptr = new (std::nothrow) FrameSequence;
if (ptr)
{
ptr->AddFrames(frame, cols, rows, max_num, padding_x, padding_y);
}
return ptr;
}
FrameSequence::FrameSequence() {}
FrameSequence::~FrameSequence() {}
@ -60,6 +77,51 @@ void FrameSequence::AddFrames(Vector<FramePtr> const& frames)
}
}
void FrameSequence::AddFrames(FramePtr frame, int cols, int rows, int max_num, float padding_x, float padding_y)
{
if (cols <= 0 || rows <= 0 || max_num == 0)
return;
if (!frame)
return;
Rect src_rect = frame->GetCropRect();
float raw_width = src_rect.GetWidth();
float raw_height = src_rect.GetHeight();
float width = (raw_width - (cols - 1) * padding_x) / cols;
float height = (raw_height - (rows - 1) * padding_y) / rows;
Vector<FramePtr> frames;
frames.reserve((max_num > 0) ? max_num : (rows * cols));
int current_num = 0;
float dty = src_rect.GetTop();
for (int i = 0; i < rows; i++)
{
float dtx = src_rect.GetLeft();
for (int j = 0; j < cols; j++)
{
FramePtr ptr = new (std::nothrow) Frame;
if (ptr)
{
ptr->SetTexture(frame->GetTexture());
ptr->SetCropRect(Rect{ dtx, dty, dtx + width, dty + height });
frames.push_back(ptr);
++current_num;
}
dtx += (width + padding_x);
}
dty += (height + padding_y);
if (max_num > 0 && current_num == max_num)
break;
}
AddFrames(frames);
}
FramePtr FrameSequence::GetFrame(size_t index) const
{
KGE_ASSERT(index < frames_.size());

25
src/kiwano/2d/FrameSequence.h
View File

@ -34,11 +34,26 @@ KGE_DECLARE_SMART_PTR(FrameSequence);
class KGE_API FrameSequence : public virtual ObjectBase
{
public:
/// \~chinese
/// @brief 创建序列帧
static FrameSequencePtr Create();
/// \~chinese
/// @brief 创建序列帧
/// @param frames 图像帧集合
static FrameSequencePtr Create(Vector<FramePtr> const& frames);
/// \~chinese
/// @brief 按行列分割图像并创建序列帧
/// @param frame 图像帧
/// @param cols 列数
/// @param rows 行数
/// @param max_num 最大帧数量，设-1为将分割后的图像全部作为序列帧
/// @param padding_x X方向间隔
/// @param padding_y Y方向间隔
static FrameSequencePtr Create(FramePtr frame, int cols, int rows = 1, int max_num = -1, float padding_x = 0,
float padding_y = 0);
/// \~chinese
/// @brief 构建空序列帧
FrameSequence();
@ -55,6 +70,16 @@ public:
/// @param frames 图像帧集合
void AddFrames(Vector<FramePtr> const& frames);
/// \~chinese
/// @brief 按行列分割图像并添加序列帧
/// @param frame 图像帧
/// @param cols 列数
/// @param rows 行数
/// @param max_num 最大帧数量，设-1为将分割后的图像全部作为序列帧
/// @param padding_x X方向间隔
/// @param padding_y Y方向间隔
void AddFrames(FramePtr frame, int cols, int rows = 1, int max_num = -1, float padding_x = 0, float padding_y = 0);
/// \~chinese
/// @brief 获取关键帧
/// @param index 图像帧下标

148
src/kiwano/utils/ResourceCache.cpp
View File

@ -26,23 +26,27 @@
namespace kiwano
{
namespace __resource_cache_01
namespace resource_cache_01
{
bool LoadJsonData(ResourceCache* loader, Json const& json_data);
bool LoadXmlData(ResourceCache* loader, const pugi::xml_node& elem);
} // namespace __resource_cache_01
} // namespace resource_cache_01
namespace
{
Map<String, Function<bool(ResourceCache*, Json const&)>> load_json_funcs = {
{ "latest", __resource_cache_01::LoadJsonData },
{ "0.1", __resource_cache_01::LoadJsonData },
{ "latest", resource_cache_01::LoadJsonData },
{ "0.1", resource_cache_01::LoadJsonData },
};
Map<String, Function<bool(ResourceCache*, const pugi::xml_node&)>> load_xml_funcs = {
{ "latest", __resource_cache_01::LoadXmlData },
{ "0.1", __resource_cache_01::LoadXmlData },
{ "latest", resource_cache_01::LoadXmlData },
{ "0.1", resource_cache_01::LoadXmlData },
};
} // namespace
ResourceCache::ResourceCache() {}
@ -162,109 +166,6 @@ bool ResourceCache::LoadFromXml(const pugi::xml_document& doc)
return false;
}
size_t ResourceCache::AddFrameSequence(String const& id, Vector<String> const& files)
{
if (files.empty())
return 0;
Vector<FramePtr> frames;
frames.reserve(files.size());
for (const auto& file : files)
{
FramePtr ptr = new (std::nothrow) Frame;
if (ptr)
{
if (ptr->Load(file))
{
frames.push_back(ptr);
}
}
}
return AddFrameSequence(id, frames);
}
size_t ResourceCache::AddFrameSequence(String const& id, Vector<Resource> const& resources)
{
if (resources.empty())
return 0;
Vector<FramePtr> frames;
frames.reserve(resources.size());
for (const auto& res : resources)
{
FramePtr ptr = new (std::nothrow) Frame;
if (ptr)
{
if (ptr->Load(res))
{
frames.push_back(ptr);
}
}
}
return AddFrameSequence(id, frames);
}
size_t ResourceCache::AddFrameSequence(String const& id, Vector<FramePtr> const& frames)
{
if (frames.empty())
return 0;
FrameSequencePtr fs = FrameSequence::Create(frames);
if (fs)
{
AddObject(id, fs);
return fs->GetFramesCount();
}
return 0;
}
size_t ResourceCache::AddFrameSequence(String const& id, FramePtr frame, int cols, int rows, float padding_x,
float padding_y)
{
if (cols <= 0 || rows <= 0)
return 0;
if (!frame)
return 0;
float raw_width = frame->GetWidth();
float raw_height = frame->GetHeight();
float width = (raw_width - (cols - 1) * padding_x) / cols;
float height = (raw_height - (rows - 1) * padding_y) / rows;
Vector<FramePtr> frames;
frames.reserve(rows * cols);
float dty = 0;
for (int i = 0; i < rows; i++)
{
float dtx = 0;
for (int j = 0; j < cols; j++)
{
FramePtr ptr = new (std::nothrow) Frame;
if (ptr)
{
ptr->SetTexture(frame->GetTexture());
ptr->SetCropRect(Rect{ dtx, dty, dtx + width, dty + height });
frames.push_back(ptr);
}
dtx += (width + padding_x);
}
dty += (height + padding_y);
}
FrameSequencePtr fs = new (std::nothrow) FrameSequence;
if (fs)
{
fs->AddFrames(frames);
AddObject(id, fs);
return fs->GetFramesCount();
}
return 0;
}
bool ResourceCache::AddObject(String const& id, ObjectBasePtr obj)
{
if (obj)
@ -297,7 +198,7 @@ ObjectBasePtr ResourceCache::Get(String const& id) const
namespace kiwano
{
namespace __resource_cache_01
namespace resource_cache_01
{
struct GlobalData
{
@ -332,8 +233,7 @@ bool LoadTexturesFromData(ResourceCache* loader, GlobalData* gdata, const String
return false;
}
bool LoadTexturesFromData(ResourceCache* loader, GlobalData* gdata, const String& id,
const Vector<String>& files)
bool LoadTexturesFromData(ResourceCache* loader, GlobalData* gdata, const String& id, const Vector<String>& files)
{
if (!gdata)
return false;
@ -361,7 +261,7 @@ bool LoadTexturesFromData(ResourceCache* loader, GlobalData* gdata, const String
}
bool LoadTexturesFromData(ResourceCache* loader, GlobalData* gdata, const String& id, const String& file, int rows,
int cols, float padding_x, float padding_y)
int cols, int max_num, float padding_x, float padding_y)
{
if (!gdata)
return false;
@ -374,8 +274,12 @@ bool LoadTexturesFromData(ResourceCache* loader, GlobalData* gdata, const String
FramePtr frame = new (std::nothrow) Frame;
if (frame && frame->Load(gdata->path + file))
{
return !!loader->AddFrameSequence(id, frame, std::max(cols, 1), std::max(rows, 1), padding_x,
padding_y);
FrameSequencePtr frame_seq = new (std::nothrow) FrameSequence;
if (frame_seq)
{
frame_seq->AddFrames(frame, cols, rows, max_num, padding_x, padding_y);
return loader->AddObject(id, frame_seq);
}
}
}
else
@ -417,7 +321,7 @@ bool LoadJsonData(ResourceCache* loader, Json const& json_data)
for (const auto& image : json_data["images"])
{
String id, type, file;
int rows = 0, cols = 0;
int rows = 0, cols = 0, max_num = -1;
if (image.count("id"))
id = image["id"].get<String>();
@ -429,6 +333,8 @@ bool LoadJsonData(ResourceCache* loader, Json const& json_data)
rows = image["rows"].get<int>();
if (image.count("cols"))
cols = image["cols"].get<int>();
if (image.count("max_num"))
max_num = image["max_num"].get<int>();
if (rows || cols)
{
@ -438,7 +344,7 @@ bool LoadJsonData(ResourceCache* loader, Json const& json_data)
if (image.count("padding-y"))
padding_y = image["padding-y"].get<float>();
if (!LoadTexturesFromData(loader, &global_data, id, file, rows, cols, padding_x, padding_y))
if (!LoadTexturesFromData(loader, &global_data, id, file, rows, cols, max_num, padding_x, padding_y))
return false;
}
@ -492,7 +398,7 @@ bool LoadXmlData(ResourceCache* loader, const pugi::xml_node& elem)
for (auto image : images.children())
{
String id, type, file;
int rows = 0, cols = 0;
int rows = 0, cols = 0, max_num = -1;
if (auto attr = image.attribute("id"))
id.assign(attr.value());
@ -504,6 +410,8 @@ bool LoadXmlData(ResourceCache* loader, const pugi::xml_node& elem)
rows = attr.as_int(0);
if (auto attr = image.attribute("cols"))
cols = attr.as_int(0);
if (auto attr = image.attribute("max_num"))
max_num = attr.as_int(-1);
if (rows || cols)
{
@ -513,7 +421,7 @@ bool LoadXmlData(ResourceCache* loader, const pugi::xml_node& elem)
if (auto attr = image.attribute("padding-y"))
padding_y = attr.as_float(0.0f);
if (!LoadTexturesFromData(loader, &global_data, id, file, rows, cols, padding_x, padding_y))
if (!LoadTexturesFromData(loader, &global_data, id, file, rows, cols, max_num, padding_x, padding_y))
return false;
}
@ -554,5 +462,5 @@ bool LoadXmlData(ResourceCache* loader, const pugi::xml_node& elem)
}
return true;
}
} // namespace __resource_cache_01
} // namespace resource_cache_01
} // namespace kiwano

34
src/kiwano/utils/ResourceCache.h
View File

@ -78,40 +78,6 @@ public:
/// @param obj 对象
bool AddObject(String const& id, ObjectBasePtr obj);
/// \~chinese
/// @brief 从多个本地图片构建序列帧，并放入缓存
/// @param id 对象ID
/// @param files 本地图片路径集合
/// @return 序列帧的帧数量
size_t AddFrameSequence(String const& id, Vector<String> const& files);
/// \~chinese
/// @brief 从多个图片资源构建序列帧，并放入缓存
/// @param id 对象ID
/// @param resources 图片资源集合
/// @return 序列帧的帧数量
size_t AddFrameSequence(String const& id, Vector<Resource> const& resources);
/// \~chinese
/// @brief 从多个图像帧构建序列帧，并放入缓存
/// @param id 对象ID
/// @param frames 图像帧集合
/// @return 序列帧的帧数量
size_t AddFrameSequence(String const& id, Vector<FramePtr> const& frames);
/// \~chinese
/// @brief 将图像帧按行列分割构建序列帧，并放入缓存
/// @brief 按行列数裁剪图片
/// @param id 对象ID
/// @param frame 图像帧
/// @param cols 列
/// @param rows 行
/// @param padding_x X方向间隔
/// @param padding_y Y方向间隔
/// @return 序列帧的帧数量
size_t AddFrameSequence(String const& id, FramePtr frame, int cols, int rows = 1, float padding_x = 0,
float padding_y = 0);
/// \~chinese
/// @brief 删除指定资源
/// @param id 对象ID