Skip to content

Document and implement nn::ui2d #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
ThePixelGamer wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

Document and implement nn::ui2d #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4dd2a1c
Some initial work on ui2d Layout
ThePixelGamer Sep 16, 2024
76868f0
Setup most of the ui2d types
ThePixelGamer Sep 14, 2023
64fbc70
Bounding, ControlCreator, Pane, ShaderInfo work
ThePixelGamer Jun 1, 2024
3e5141a
Temp
ThePixelGamer Jul 26, 2024
c98f5c3
ui2d_Animation fully matches
ThePixelGamer Aug 6, 2024
bd94096
make AllocateAndConstruct pass by value
ThePixelGamer Aug 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
131 changes: 125 additions & 6 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,20 +171,38 @@ add_library(NintendoSDK OBJECT
include/nn/oe.h
include/nn/util.h
include/nn/image.h
include/nn/ui2d/ui2d_Animation.h
include/nn/ui2d/ui2d_Animator.h
include/nn/ui2d/ui2d_Bounding.h
include/nn/ui2d/ui2d_Common.h
include/nn/ui2d/ui2d_ControlCreator.h
include/nn/ui2d/ui2d_DrawInfo.h
include/nn/ui2d/ui2d_GraphicsResource.h
include/nn/ui2d/ui2d_Group.h
include/nn/ui2d/ui2d_Layout.h
include/nn/ui2d/ui2d_Material.h
include/nn/ui2d/ui2d_Pane.h
include/nn/ui2d/ui2d_Parts.h
include/nn/ui2d/ui2d_Picture.h
include/nn/ui2d/ui2d_ResourceAccessor.h
include/nn/ui2d/ui2d_Resources.h
include/nn/ui2d/ui2d_ShaderInfo.h
include/nn/ui2d/ui2d_TextBox.h
include/nn/ui2d/ui2d_TextSearcher.h
include/nn/ui2d/ui2d_Types.h
include/nn/ui2d/ui2d_Util.h
include/nn/ui2d/ui2d_Window.h
include/nn/ui2d/ui2d_WindowFoundation.h
include/nn/util/AccessorBase.h
include/nn/util/MathTypes.h
include/nn/util/util_Arithmetic.h
include/nn/util/util_BinTypes.h
include/nn/util/util_BitPack.h
include/nn/util/util_BytePtr.h
include/nn/util/util_BitUtil.h
include/nn/util/util_IntrusiveList.h
include/nn/util/util_MathTypes.h
include/nn/util/util_ResDic.h
include/nn/util/util_StringView.h
include/nn/ui2d/detail/TexCoordArray.h
include/nn/ui2d/Layout.h
include/nn/ui2d/Parts.h
include/nn/ui2d/Pane.h
include/nn/ui2d/Material.h
include/nn/g3d/BindFuncTable.h
include/nn/g3d/ModelObj.h
include/nn/g3d/ResMaterialAnim.h
Expand Down Expand Up @@ -231,11 +249,103 @@ add_library(NintendoSDK OBJECT
include/nn/nex/buffer.h
include/nn/nex/system.h
include/nn/nex/hash.h
include/nn/nn_Allocator.h
include/nn/time.h
include/nn/diag.h
include/nn/init.h
include/nn/crypto.h
include/nn/ssl.h
include/nn/font/font_TagProcessorBase.h
include/nn/font/font_Types.h
include/nn/font/font_Util.h
include/nn/gfx/detail/gfx_Buffer-api.nvn.8.h
include/nn/gfx/detail/gfx_CommandBuffer-api.nvn.8.h
include/nn/gfx/detail/gfx_Common-api.nvn.h
include/nn/gfx/detail/gfx_DataContainer.h
include/nn/gfx/detail/gfx_DescriptorPool-api.nvn.8.h
include/nn/gfx/detail/gfx_Device-api.nvn.8.h
include/nn/gfx/detail/gfx_Fwd.h
include/nn/gfx/detail/gfx_MemoryPool-api.nvn.8.h
include/nn/gfx/detail/gfx_Misc.h
include/nn/gfx/detail/gfx_Pipeline-api.nvn.8.h
include/nn/gfx/detail/gfx_Queue-api.nvn.8.h
include/nn/gfx/detail/gfx_RequiredMemory.h
include/nn/gfx/detail/gfx_ResShaderImpl.h
include/nn/gfx/detail/gfx_RootSignature-api.common.h
include/nn/gfx/detail/gfx_RootSignature-api.nvn.8.h
include/nn/gfx/detail/gfx_Sampler-api.nvn.8.h
include/nn/gfx/detail/gfx_Shader-api.nvn.8.h
include/nn/gfx/detail/gfx_State-api.nvn.8.h
include/nn/gfx/detail/gfx_SwapChain-api.nvn.8.h
include/nn/gfx/detail/gfx_Sync-api.nvn.8.h
include/nn/gfx/detail/gfx_Texture-api.nvn.8.h
include/nn/gfx/util/gfx_PrimitiveShape.h
include/nn/gfx/gfx_Buffer.h
include/nn/gfx/gfx_BufferData-api.nvn.8.h
include/nn/gfx/gfx_BufferInfo.h
include/nn/gfx/gfx_BufferInfoData.h
include/nn/gfx/gfx_CommandBuffer.h
include/nn/gfx/gfx_CommandBufferData-api.nvn.8.h
include/nn/gfx/gfx_CommandBufferInfo.h
include/nn/gfx/gfx_CommandBufferInfoData.h
include/nn/gfx/gfx_Common.h
include/nn/gfx/gfx_DescriptorPool.h
include/nn/gfx/gfx_DescriptorPoolData-api.nvn.8.h
include/nn/gfx/gfx_DescriptorPoolInfo.h
include/nn/gfx/gfx_DescriptorPoolInfoData.h
include/nn/gfx/gfx_DescriptorSlot.h
include/nn/gfx/gfx_Device.h
include/nn/gfx/gfx_DeviceData-api.nvn.8.h
include/nn/gfx/gfx_DeviceInfo.h
include/nn/gfx/gfx_DeviceInfoData.h
include/nn/gfx/gfx_Enum.h
include/nn/gfx/gfx_GpuAddress.h
include/nn/gfx/gfx_Interoperation-api.nvn.8.h
include/nn/gfx/gfx_MemoryPool.h
include/nn/gfx/gfx_MemoryPoolData-api.nvn.8.h
include/nn/gfx/gfx_MemoryPoolInfo.h
include/nn/gfx/gfx_MemoryPoolInfoData.h
include/nn/gfx/gfx_PipelineData-api.nvn.8.h
include/nn/gfx/gfx_Queue.h
include/nn/gfx/gfx_QueueData-api.nvn.8.h
include/nn/gfx/gfx_QueueInfo.h
include/nn/gfx/gfx_QueueInfoData.h
include/nn/gfx/gfx_ResShader.h
include/nn/gfx/gfx_ResShaderData-api.nvn.h
include/nn/gfx/gfx_ResShaderData.h
include/nn/gfx/gfx_ResTexture.h
include/nn/gfx/gfx_ResTextureData.h
include/nn/gfx/gfx_ResUserData.h
include/nn/gfx/gfx_ResUserDataData.h
include/nn/gfx/gfx_RootSignatureData-api.common.h
include/nn/gfx/gfx_RootSignatureInfo.h
include/nn/gfx/gfx_RootSignatureInfoData.h
include/nn/gfx/gfx_Sampler.h
include/nn/gfx/gfx_SamplerData-api.nvn.8.h
include/nn/gfx/gfx_SamplerInfo.h
include/nn/gfx/gfx_SamplerInfoData.h
include/nn/gfx/gfx_Shader.h
include/nn/gfx/gfx_ShaderData-api.nvn.8.h
include/nn/gfx/gfx_ShaderInfo.h
include/nn/gfx/gfx_ShaderInfoData.h
include/nn/gfx/gfx_State.h
include/nn/gfx/gfx_StateData-api.nvn.8.h
include/nn/gfx/gfx_StateInfo.h
include/nn/gfx/gfx_StateInfoData.h
include/nn/gfx/gfx_SwapChain.h
include/nn/gfx/gfx_SwapChainData-api.nvn.8.h
include/nn/gfx/gfx_SwapChainInfo.h
include/nn/gfx/gfx_SwapChainInfoData.h
include/nn/gfx/gfx_Sync.h
include/nn/gfx/gfx_SyncData-api.nvn.8.h
include/nn/gfx/gfx_SyncInfo.h
include/nn/gfx/gfx_SyncInfoData.h
include/nn/gfx/gfx_Texture.h
include/nn/gfx/gfx_TextureData-api.nvn.8.h
include/nn/gfx/gfx_TextureInfo.h
include/nn/gfx/gfx_TextureInfoData.h
include/nn/gfx/gfx_Types.h
include/nn/gfx/gfx_VariationBase.h
include/nn/fs/fs_bcat.h
include/nn/fs/fs_directories.h
include/nn/fs/fs_files.h
Expand Down Expand Up @@ -295,6 +405,15 @@ add_library(NintendoSDK OBJECT
src/NintendoSDK/nvn/nvn_FuncPtrImpl.h
src/NintendoSDK/nvn/nvn_Impl.cpp
src/NintendoSDK/nnSdk/util.cpp
src/NintendoWare/ui2d/ui2d_Animation.cpp
src/NintendoWare/ui2d/ui2d_Bounding.cpp
src/NintendoWare/ui2d/ui2d_ControlCreator.cpp
src/NintendoWare/ui2d/ui2d_Group.cpp
src/NintendoWare/ui2d/ui2d_GraphicsResource.cpp
src/NintendoWare/ui2d/ui2d_Layout.cpp
src/NintendoWare/ui2d/ui2d_Pane.cpp
src/NintendoWare/ui2d/ui2d_ShaderInfo.cpp
src/NintendoWare/ui2d/ui2d_Util.cpp
)

target_include_directories(NintendoSDK PUBLIC include/)
Expand Down
24 changes: 24 additions & 0 deletions include/nn/font/detail/font_FreeList.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
#pragma once

namespace nn {
namespace font {
namespace detail {

// reorder
class FreeList {
void* m_pFree;
void* m_pWork;

public:
FreeList();
void Initialize(void*, int, int);
void* Get();
void Put(void*);
void* GetWork() const;
void Cleanup();
bool IsEmpty() const;
};

} // namespace detail
} // namespace font
} // namespace nn
Loading