0.7.0 rewrite dev
- remove everyting - keep core -rename bit_utils to bits - add formatter for color - add float getters to color - start with new drivers api
This commit is contained in:
9
.gitmodules
vendored
9
.gitmodules
vendored
@@ -1,6 +1,3 @@
|
|||||||
[submodule "backends/desktop/glfw"]
|
[submodule "vendor/stb"]
|
||||||
path = backends/desktop/glfw
|
path = vendor/stb
|
||||||
url = https://github.com/glfw/glfw
|
url = https://github.com/nothings/stb.git
|
||||||
[submodule "backends/3ds/libpicasso"]
|
|
||||||
path = backends/3ds/libpicasso
|
|
||||||
url = https://github.com/npid7/libpicasso
|
|
||||||
|
|||||||
@@ -3,7 +3,7 @@ cmake_minimum_required(VERSION 3.22)
|
|||||||
include(GNUInstallDirs)
|
include(GNUInstallDirs)
|
||||||
|
|
||||||
# Set Project
|
# Set Project
|
||||||
project(palladium LANGUAGES C CXX VERSION 0.6.0)
|
project(palladium LANGUAGES C CXX VERSION 0.7.0)
|
||||||
|
|
||||||
# Required to add this Variable
|
# Required to add this Variable
|
||||||
set(PD_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
|
set(PD_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/include)
|
||||||
@@ -12,9 +12,6 @@ include(cmake/palladium.cmake)
|
|||||||
option(PD_BUILD_TESTS "Sets if TestApp and TestBench get build" OFF)
|
option(PD_BUILD_TESTS "Sets if TestApp and TestBench get build" OFF)
|
||||||
option(PD_BUILD_SHARED "Build Shared Library" OFF)
|
option(PD_BUILD_SHARED "Build Shared Library" OFF)
|
||||||
option(PD_BUILD_TOOLS "Build Palladium Tools" OFF)
|
option(PD_BUILD_TOOLS "Build Palladium Tools" OFF)
|
||||||
option(PD_BUILD_DESKTOP "Build Desktop Backend" OFF)
|
|
||||||
option(PD_BUILD_3DS "Build 3ds Backend" OFF)
|
|
||||||
option(PD_BUNDLE_GLFW "Bundle GLFW in install" OFF)
|
|
||||||
|
|
||||||
if(${PD_BUILD_TOOLS})
|
if(${PD_BUILD_TOOLS})
|
||||||
add_subdirectory(tools)
|
add_subdirectory(tools)
|
||||||
@@ -22,52 +19,13 @@ endif()
|
|||||||
|
|
||||||
# # Include Library Source
|
# # Include Library Source
|
||||||
set(PD_SOURCES
|
set(PD_SOURCES
|
||||||
|
|
||||||
# Core
|
# Core
|
||||||
source/core/bit_util.cpp
|
source/core/bits.cpp
|
||||||
source/core/color.cpp
|
source/core/color.cpp
|
||||||
source/core/io.cpp
|
|
||||||
source/core/mat.cpp
|
source/core/mat.cpp
|
||||||
source/core/strings.cpp
|
source/core/strings.cpp
|
||||||
source/core/timer.cpp
|
|
||||||
source/core/timetrace.cpp
|
|
||||||
|
|
||||||
# Drivers
|
|
||||||
source/drivers/context.cpp
|
|
||||||
source/drivers/gfx.cpp
|
|
||||||
source/drivers/hid.cpp
|
|
||||||
source/drivers/os.cpp
|
source/drivers/os.cpp
|
||||||
|
|
||||||
# External
|
|
||||||
source/external/stb.cpp
|
|
||||||
|
|
||||||
# Image
|
|
||||||
source/image/image.cpp
|
|
||||||
source/image/img_blur.cpp
|
|
||||||
source/image/img_convert.cpp
|
|
||||||
|
|
||||||
# Lithium
|
|
||||||
source/lithium/command.cpp
|
|
||||||
source/lithium/drawlist.cpp
|
|
||||||
source/lithium/font.cpp
|
|
||||||
source/lithium/fonts.cpp
|
|
||||||
source/lithium/renderer.cpp
|
|
||||||
|
|
||||||
# UI7
|
|
||||||
source/ui7/container/button.cpp
|
|
||||||
source/ui7/container/checkbox.cpp
|
|
||||||
source/ui7/container/coloredit.cpp
|
|
||||||
source/ui7/container/container.cpp
|
|
||||||
source/ui7/container/dragdata.cpp
|
|
||||||
source/ui7/container/dynobj.cpp
|
|
||||||
source/ui7/container/image.cpp
|
|
||||||
source/ui7/container/label.cpp
|
|
||||||
source/ui7/container/slider.cpp
|
|
||||||
source/ui7/io.cpp
|
|
||||||
source/ui7/layout.cpp
|
|
||||||
source/ui7/menu.cpp
|
|
||||||
source/ui7/theme.cpp
|
|
||||||
source/ui7/ui7.cpp
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if(${PD_BUILD_SHARED})
|
if(${PD_BUILD_SHARED})
|
||||||
@@ -86,26 +44,11 @@ target_include_directories(palladium
|
|||||||
$<INSTALL_INTERFACE:include>
|
$<INSTALL_INTERFACE:include>
|
||||||
)
|
)
|
||||||
|
|
||||||
if(${CMAKE_SYSTEM_NAME} STREQUAL "Nintendo3DS")
|
|
||||||
target_compile_options(palladium PRIVATE
|
|
||||||
$<$<COMPILE_LANGUAGE:C>:-Wall>
|
|
||||||
$<$<COMPILE_LANGUAGE:C>:-Wno-psabi>
|
|
||||||
$<$<COMPILE_LANGUAGE:CXX>:-fno-exceptions>
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
target_compile_options(palladium PRIVATE
|
target_compile_options(palladium PRIVATE
|
||||||
$<$<CONFIG:Debug>:-O0 -g>
|
$<$<CONFIG:Debug>:-O0 -g>
|
||||||
$<$<CONFIG:Release>:-O3>
|
$<$<CONFIG:Release>:-O3>
|
||||||
)
|
)
|
||||||
|
|
||||||
if(PD_BUILD_DESKTOP AND NOT PD_BUILD_3DS)
|
|
||||||
add_subdirectory(backends/desktop)
|
|
||||||
endif()
|
|
||||||
if(PD_BUILD_3DS AND NOT PD_BUILD_DESKTOP)
|
|
||||||
add_subdirectory(backends/3ds)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
install(TARGETS palladium
|
install(TARGETS palladium
|
||||||
EXPORT palladiumTargets
|
EXPORT palladiumTargets
|
||||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
||||||
@@ -145,19 +88,12 @@ find_program(CLANG_FORMAT clang-format)
|
|||||||
|
|
||||||
file(GLOB_RECURSE PD_FMTFILES CONFIGURE_DEPENDS
|
file(GLOB_RECURSE PD_FMTFILES CONFIGURE_DEPENDS
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/source/*.cpp
|
${CMAKE_CURRENT_SOURCE_DIR}/source/*.cpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/include/pd/core/*.hpp
|
${CMAKE_CURRENT_SOURCE_DIR}/include/*.hpp
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/include/pd/drivers/*.hpp
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/include/pd/image/*.hpp
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/include/pd/lithium/*.hpp
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/include/pd/ui7/*.hpp
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/backends/desktop/include/*.hpp
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/backends/3ds/include/*.hpp
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/backends/desktop/include/*.cpp
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/backends/3ds/include/*.cpp
|
|
||||||
${CMAKE_CURRENT_SOURCE_DIR}/test/source*.cpp
|
|
||||||
)
|
)
|
||||||
|
|
||||||
add_custom_target(pd-clang-format
|
add_custom_target(pd-clang-format
|
||||||
COMMAND ${CLANG_FORMAT} --style=file -i ${PD_FMTFILES}
|
COMMAND ${CLANG_FORMAT} --style=file -i ${PD_FMTFILES}
|
||||||
COMMENT "Formatting Project Sources"
|
COMMENT "Formatting Project Sources"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/tests)
|
||||||
|
|||||||
2
LICENSE
2
LICENSE
@@ -1,6 +1,6 @@
|
|||||||
MIT License
|
MIT License
|
||||||
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor tobid7
|
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
|||||||
@@ -1,37 +0,0 @@
|
|||||||
cmake_minimum_required(VERSION 3.22)
|
|
||||||
|
|
||||||
project(pd-3ds LANGUAGES CXX VERSION 0.6.0)
|
|
||||||
|
|
||||||
set(SRC
|
|
||||||
source/bknd-gfx.cpp
|
|
||||||
source/bknd-hid.cpp
|
|
||||||
source/pd-3ds.cpp
|
|
||||||
)
|
|
||||||
add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/libpicasso)
|
|
||||||
add_library(pd-3ds STATIC ${SRC})
|
|
||||||
target_include_directories(pd-3ds PUBLIC
|
|
||||||
PUBLIC
|
|
||||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
|
|
||||||
$<INSTALL_INTERFACE:include>
|
|
||||||
)
|
|
||||||
target_link_libraries(pd-3ds PUBLIC m palladium ctru citro3d pica::pica)
|
|
||||||
add_library(palladium::pd-3ds ALIAS pd-3ds)
|
|
||||||
install(TARGETS pd-3ds
|
|
||||||
EXPORT palladiumTargets
|
|
||||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
||||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
||||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
||||||
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
|
||||||
)
|
|
||||||
|
|
||||||
install(DIRECTORY include/
|
|
||||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
|
||||||
)
|
|
||||||
|
|
||||||
install(TARGETS pica
|
|
||||||
EXPORT palladiumTargets
|
|
||||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
||||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
||||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
||||||
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
|
||||||
)
|
|
||||||
@@ -1,32 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd-3ds/bknd-gfx.hpp>
|
|
||||||
#include <pd-3ds/bknd-hid.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
PD::Li::Font::Ref LoadSystemFont(Context& ctx);
|
|
||||||
void Init(void* data = nullptr);
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,64 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <3ds.h>
|
|
||||||
#include <citro3d.h>
|
|
||||||
|
|
||||||
#include <pd-3ds/linearAllocator.hpp>
|
|
||||||
#include <pd/lithium/lithium.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
class GfxC3D : public GfxDriver {
|
|
||||||
public:
|
|
||||||
GfxC3D(PDDriverData data = nullptr) : GfxDriver("Citro3D") {}
|
|
||||||
~GfxC3D() = default;
|
|
||||||
|
|
||||||
PD_SHARED(GfxC3D);
|
|
||||||
|
|
||||||
void Init() override;
|
|
||||||
void Deinit() override;
|
|
||||||
void NewFrame() override;
|
|
||||||
void BindTex(PD::Li::TexAddress addr) override;
|
|
||||||
void RenderDrawData(const PD::Li::CmdPool& Commands) override;
|
|
||||||
PD::Li::Texture::Ref LoadTex(
|
|
||||||
const std::vector<PD::u8>& pixels, int w, int h,
|
|
||||||
PD::Li::Texture::Type type = PD::Li::Texture::Type::RGBA32,
|
|
||||||
PD::Li::Texture::Filter filter =
|
|
||||||
PD::Li::Texture::Filter::LINEAR) override;
|
|
||||||
void DestroyTex(PD::Li::Texture::Ref tex) override;
|
|
||||||
|
|
||||||
std::vector<Li::Vertex, LinearAllocator<Li::Vertex>> VertexBuffer;
|
|
||||||
std::vector<u16, LinearAllocator<u16>> IndexBuffer;
|
|
||||||
int pLocProjection = 0;
|
|
||||||
DVLB_s* ShaderCode;
|
|
||||||
shaderProgram_s Shader;
|
|
||||||
C3D_AttrInfo ShaderInfo;
|
|
||||||
std::vector<u8> pRawShader;
|
|
||||||
u32 pCountVertices = 0;
|
|
||||||
u32 pCountIndices = 0;
|
|
||||||
u32 pCountDrawCalls = 0;
|
|
||||||
u32 pDrawCommands = 0;
|
|
||||||
};
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,72 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <3ds.h>
|
|
||||||
|
|
||||||
#include <pd/core/common.hpp>
|
|
||||||
|
|
||||||
// Custom C++ Allocator class to interface with libctru linear heap memory
|
|
||||||
// based on this guide:
|
|
||||||
// https://johnfarrier.com/custom-allocators-in-c-high-performance-memory-management/
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
template <typename T>
|
|
||||||
class LinearAllocator {
|
|
||||||
public:
|
|
||||||
using value_type = T;
|
|
||||||
LinearAllocator() noexcept = default;
|
|
||||||
template <typename U>
|
|
||||||
constexpr LinearAllocator(const LinearAllocator<U>&) noexcept {}
|
|
||||||
|
|
||||||
T* allocate(std::size_t n) {
|
|
||||||
if (n > max_size()) {
|
|
||||||
PD::Throw("[PD] LinearAllocator: Bad alloc!");
|
|
||||||
}
|
|
||||||
return static_cast<T*>(linearAlloc(n * sizeof(T)));
|
|
||||||
}
|
|
||||||
void deallocate(T* p, std::size_t) noexcept { linearFree(p); }
|
|
||||||
|
|
||||||
template <class U, class... Args>
|
|
||||||
void construct(U* p, Args&&... args) {
|
|
||||||
::new ((void*)p) U(std::forward<Args>(args)...);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <class U>
|
|
||||||
void destroy(U* p) {
|
|
||||||
p->~U();
|
|
||||||
}
|
|
||||||
|
|
||||||
friend bool operator==(const LinearAllocator, const LinearAllocator) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
friend bool operator!=(const LinearAllocator, const LinearAllocator) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Use linearSpace free as max_size to not allocate out of bounds
|
|
||||||
// or to b eable to see a crash report screen.
|
|
||||||
size_t max_size() const noexcept { return linearSpaceFree(); }
|
|
||||||
};
|
|
||||||
} // namespace PD
|
|
||||||
Submodule backends/3ds/libpicasso deleted from a6b1e8ddbd
@@ -1,281 +0,0 @@
|
|||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd-3ds/bknd-gfx.hpp>
|
|
||||||
#include <pica.hpp>
|
|
||||||
|
|
||||||
const char* LIShaderCTR = R"(
|
|
||||||
; LI7 Shader
|
|
||||||
; Constants
|
|
||||||
.constf myconst(0.0, 1.0, 0.00392156862745, 0.0)
|
|
||||||
.alias ones myconst.yyyy ; Vector full of ones
|
|
||||||
|
|
||||||
; Uniforms
|
|
||||||
.fvec projection[4]
|
|
||||||
|
|
||||||
; Outputs
|
|
||||||
.out out_position position
|
|
||||||
.out out_color color
|
|
||||||
.out out_uv texcoord0
|
|
||||||
|
|
||||||
; Inputs
|
|
||||||
.alias in_xy v0
|
|
||||||
.alias in_uvc v1
|
|
||||||
.alias in_col v2
|
|
||||||
|
|
||||||
.entry vmain
|
|
||||||
.proc vmain
|
|
||||||
mov r0.xy, in_xy.xy
|
|
||||||
mov r0.w, ones
|
|
||||||
|
|
||||||
dp4 out_position.x, projection[0], r0
|
|
||||||
dp4 out_position.y, projection[1], r0
|
|
||||||
dp4 out_position.z, projection[2], r0
|
|
||||||
dp4 out_position.w, projection[3], r0
|
|
||||||
|
|
||||||
mov out_uv, in_uvc.xy
|
|
||||||
|
|
||||||
mul r1, myconst.zzzz, in_col
|
|
||||||
mov out_color, r1
|
|
||||||
end
|
|
||||||
.end
|
|
||||||
)";
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
GPU_TEXCOLOR GetTexFmt(Li::Texture::Type type) {
|
|
||||||
if (type == Li::Texture::RGBA32)
|
|
||||||
return GPU_RGBA8;
|
|
||||||
else if (type == Li::Texture::RGB24)
|
|
||||||
return GPU_RGB8;
|
|
||||||
else if (type == Li::Texture::A8)
|
|
||||||
return GPU_A8;
|
|
||||||
return GPU_RGBA8; // Default
|
|
||||||
}
|
|
||||||
int GetBPP(Li::Texture::Type type) {
|
|
||||||
if (type == Li::Texture::RGBA32)
|
|
||||||
return 4;
|
|
||||||
else if (type == Li::Texture::RGB24)
|
|
||||||
return 3;
|
|
||||||
else if (type == Li::Texture::A8)
|
|
||||||
return 1;
|
|
||||||
return 0; // Error
|
|
||||||
}
|
|
||||||
|
|
||||||
void FragCfg(GPU_TEXCOLOR clr) {
|
|
||||||
C3D_DepthTest(false, GPU_GREATER, GPU_WRITE_ALL);
|
|
||||||
C3D_TexEnv* env = C3D_GetTexEnv(0);
|
|
||||||
C3D_TexEnvInit(env);
|
|
||||||
switch (clr) {
|
|
||||||
case GPU_A4:
|
|
||||||
case GPU_A8:
|
|
||||||
case GPU_L4:
|
|
||||||
case GPU_L8:
|
|
||||||
C3D_TexEnvSrc(env, C3D_Alpha, GPU_TEXTURE0);
|
|
||||||
C3D_TexEnvFunc(env, C3D_RGB, GPU_REPLACE);
|
|
||||||
C3D_TexEnvFunc(env, C3D_Alpha, GPU_MODULATE);
|
|
||||||
break;
|
|
||||||
case GPU_RGB565:
|
|
||||||
C3D_TexEnvSrc(env, C3D_Alpha, GPU_TEXTURE0);
|
|
||||||
C3D_TexEnvFunc(env, C3D_RGB, GPU_MODULATE);
|
|
||||||
C3D_TexEnvFunc(env, C3D_Alpha, GPU_REPLACE);
|
|
||||||
break;
|
|
||||||
|
|
||||||
default:
|
|
||||||
C3D_TexEnvSrc(env, C3D_Both, GPU_TEXTURE0);
|
|
||||||
C3D_TexEnvFunc(env, C3D_Both, GPU_MODULATE);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
void GfxC3D::Init() {
|
|
||||||
VertexBuffer.resize(4 * 8192);
|
|
||||||
IndexBuffer.resize(6 * 8192);
|
|
||||||
|
|
||||||
Flags |= LiBackendFlags_FlipUV_Y;
|
|
||||||
|
|
||||||
pRawShader = Pica::AssembleCode(LIShaderCTR);
|
|
||||||
ShaderCode = DVLB_ParseFile((uint32_t*)&pRawShader[0], pRawShader.size());
|
|
||||||
shaderProgramInit(&Shader);
|
|
||||||
shaderProgramSetVsh(&Shader, &ShaderCode->DVLE[0]);
|
|
||||||
pLocProjection =
|
|
||||||
shaderInstanceGetUniformLocation(Shader.vertexShader, "projection");
|
|
||||||
|
|
||||||
AttrInfo_Init(&ShaderInfo);
|
|
||||||
AttrInfo_AddLoader(&ShaderInfo, 0, GPU_FLOAT, 2);
|
|
||||||
AttrInfo_AddLoader(&ShaderInfo, 1, GPU_FLOAT, 2);
|
|
||||||
AttrInfo_AddLoader(&ShaderInfo, 2, GPU_UNSIGNED_BYTE, 4);
|
|
||||||
}
|
|
||||||
|
|
||||||
void GfxC3D::Deinit() {
|
|
||||||
shaderProgramFree(&Shader);
|
|
||||||
DVLB_Free(ShaderCode);
|
|
||||||
}
|
|
||||||
|
|
||||||
void GfxC3D::NewFrame() {
|
|
||||||
C3D_BindProgram(&Shader);
|
|
||||||
C3D_SetAttrInfo(&ShaderInfo);
|
|
||||||
CurrentIndex = 0;
|
|
||||||
CurrentVertex = 0;
|
|
||||||
FrameCounter++;
|
|
||||||
/** Probably completly incorrect but just do it like that */
|
|
||||||
VertexCounter = pCountVertices;
|
|
||||||
IndexCounter = pCountIndices;
|
|
||||||
DrawCalls = pCountDrawCalls;
|
|
||||||
DrawCommands = pDrawCommands;
|
|
||||||
pCountDrawCalls = 0;
|
|
||||||
pCountIndices = 0;
|
|
||||||
pCountVertices = 0;
|
|
||||||
pDrawCommands = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void GfxC3D::BindTex(PD::Li::TexAddress addr) {
|
|
||||||
C3D_TexBind(0, reinterpret_cast<C3D_Tex*>(addr));
|
|
||||||
}
|
|
||||||
|
|
||||||
void GfxC3D::RenderDrawData(const PD::Li::CmdPool& Commands) {
|
|
||||||
pDrawCommands += Commands.Size();
|
|
||||||
shaderProgramUse(&Shader);
|
|
||||||
C3D_SetAttrInfo(&ShaderInfo);
|
|
||||||
C3D_Mtx proj;
|
|
||||||
Mtx_OrthoTilt(&proj, 0.f, ViewPort.x, ViewPort.y, 0.f, 1.f, -1.f, false);
|
|
||||||
C3D_FVUnifMtx4x4(GPU_VERTEX_SHADER, pLocProjection, &proj);
|
|
||||||
// Mat4 proj = Mat4::Ortho(0.f, ViewPort.x, ViewPort.y, 0.f, 1.f, -1.f);
|
|
||||||
// C3D_FVUnifMtx4x4(GPU_VERTEX_SHADER, pLocProjection, (C3D_Mtx*)&proj);
|
|
||||||
size_t index = 0;
|
|
||||||
while (index < Commands.Size()) {
|
|
||||||
PD::Li::TexAddress Tex = Commands.GetCmd(index)->Tex;
|
|
||||||
if (!Tex) {
|
|
||||||
index++;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
bool ScissorEnabled = Commands.GetCmd(index)->ScissorOn;
|
|
||||||
ivec4 ScissorRect = Commands.GetCmd(index)->ScissorRect;
|
|
||||||
size_t StartIndex = CurrentIndex;
|
|
||||||
|
|
||||||
while (index < Commands.Size() && Commands.GetCmd(index)->Tex == Tex &&
|
|
||||||
Commands.GetCmd(index)->ScissorOn == ScissorEnabled &&
|
|
||||||
Commands.GetCmd(index)->ScissorRect == ScissorRect) {
|
|
||||||
auto c = Commands.GetCmd(index);
|
|
||||||
pCountIndices += c->IndexBuffer.size();
|
|
||||||
pCountVertices += c->VertexBuffer.size();
|
|
||||||
for (size_t i = 0; i < c->IndexBuffer.size(); i++) {
|
|
||||||
IndexBuffer[CurrentIndex++] = CurrentVertex + c->IndexBuffer.at(i);
|
|
||||||
}
|
|
||||||
for (size_t i = 0; i < c->VertexBuffer.size(); i++) {
|
|
||||||
VertexBuffer[CurrentVertex++] = c->VertexBuffer.at(i);
|
|
||||||
}
|
|
||||||
index++;
|
|
||||||
}
|
|
||||||
if (ScissorEnabled) {
|
|
||||||
// Figure out this setup was pain
|
|
||||||
C3D_SetScissor(GPU_SCISSOR_NORMAL,
|
|
||||||
std::clamp(ViewPort.y - (ScissorRect.y + ScissorRect.w), 0,
|
|
||||||
ViewPort.y),
|
|
||||||
std::clamp(ViewPort.x - (ScissorRect.x + ScissorRect.z), 0,
|
|
||||||
ViewPort.x),
|
|
||||||
ViewPort.y - ScissorRect.y, ViewPort.x - ScissorRect.x);
|
|
||||||
} else {
|
|
||||||
C3D_SetScissor(GPU_SCISSOR_DISABLE, 0, 0, 0, 0);
|
|
||||||
}
|
|
||||||
FragCfg(((C3D_Tex*)Tex)->fmt);
|
|
||||||
BindTex(Tex);
|
|
||||||
auto bufInfo = C3D_GetBufInfo();
|
|
||||||
BufInfo_Init(bufInfo);
|
|
||||||
BufInfo_Add(bufInfo, VertexBuffer.data(), sizeof(Li::Vertex), 3, 0x210);
|
|
||||||
|
|
||||||
C3D_DrawElements(GPU_TRIANGLES, CurrentIndex - StartIndex,
|
|
||||||
C3D_UNSIGNED_SHORT, IndexBuffer.data() + StartIndex);
|
|
||||||
pCountDrawCalls++;
|
|
||||||
}
|
|
||||||
C3D_DepthTest(true, GPU_GREATER, GPU_WRITE_ALL);
|
|
||||||
}
|
|
||||||
|
|
||||||
PD::Li::Texture::Ref GfxC3D::LoadTex(const std::vector<PD::u8>& pixels, int w,
|
|
||||||
int h, PD::Li::Texture::Type type,
|
|
||||||
PD::Li::Texture::Filter filter) {
|
|
||||||
if (w > 1024 || h > 1024) {
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
// Don't check here as check done before
|
|
||||||
PD::Li::Texture::Ref res = PD::Li::Texture::New();
|
|
||||||
int bpp = GetBPP(type);
|
|
||||||
ivec2 tex_size(w, h);
|
|
||||||
// Pow2
|
|
||||||
if (!PD::BitUtil::IsSingleBit(w)) {
|
|
||||||
tex_size.x = PD::BitUtil::GetPow2((unsigned int)w);
|
|
||||||
}
|
|
||||||
if (!PD::BitUtil::IsSingleBit(h)) {
|
|
||||||
tex_size.y = PD::BitUtil::GetPow2((unsigned int)h);
|
|
||||||
}
|
|
||||||
res->Size.x = w;
|
|
||||||
res->Size.y = h;
|
|
||||||
res->UV = fvec4(0.f, 1.f, ((float)w / (float)tex_size.x),
|
|
||||||
1.0 - ((float)h / (float)tex_size.y));
|
|
||||||
|
|
||||||
// Texture Setup
|
|
||||||
auto fltr = (filter == Li::Texture::NEAREST ? GPU_NEAREST : GPU_LINEAR);
|
|
||||||
auto tex_fmt = GetTexFmt(type);
|
|
||||||
auto tex = new C3D_Tex;
|
|
||||||
C3D_TexInit(tex, (u16)tex_size.x, (u16)tex_size.y, tex_fmt);
|
|
||||||
C3D_TexSetFilter(tex, fltr, fltr);
|
|
||||||
|
|
||||||
// Using std::fill_n instead cause i hate this error lines
|
|
||||||
// under the memset func in my editor
|
|
||||||
std::fill_n((PD::u8*)tex->data, tex->size, 0);
|
|
||||||
// memset(tex->data, 0, tex->size);s
|
|
||||||
|
|
||||||
/// Probably Remove this if statement in future
|
|
||||||
/// This are the things confirmed as working
|
|
||||||
if (bpp == 3 || bpp == 4 || bpp == 1) {
|
|
||||||
for (int x = 0; x < w; x++) {
|
|
||||||
for (int y = 0; y < h; y++) {
|
|
||||||
int dst_pos = ((((y >> 3) * ((int)tex_size.x >> 3) + (x >> 3)) << 6) +
|
|
||||||
((x & 1) | ((y & 1) << 1) | ((x & 2) << 1) |
|
|
||||||
((y & 2) << 2) | ((x & 4) << 2) | ((y & 4) << 3))) *
|
|
||||||
bpp;
|
|
||||||
int src_pos = (y * w + x) * bpp;
|
|
||||||
/// Best idea i had
|
|
||||||
for (int i = 0; i < bpp; i++) {
|
|
||||||
((u8*)tex->data)[dst_pos + bpp - 1 - i] = pixels[src_pos + i];
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
C3D_TexFlush(tex);
|
|
||||||
}
|
|
||||||
|
|
||||||
tex->border = 0x00000000;
|
|
||||||
C3D_TexSetWrap(tex, GPU_REPEAT, GPU_REPEAT);
|
|
||||||
res->Address = (Li::TexAddress)tex;
|
|
||||||
std::cout << std::format("Tex {:#08x} Addr {:#08X}",
|
|
||||||
(Li::TexAddress)res.get(), res->Address)
|
|
||||||
<< std::endl;
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
|
|
||||||
void GfxC3D::DestroyTex(PD::Li::Texture::Ref tex) {
|
|
||||||
C3D_Tex* t = reinterpret_cast<C3D_Tex*>(tex->Address);
|
|
||||||
C3D_TexDelete(t);
|
|
||||||
delete t;
|
|
||||||
tex->Address = 0;
|
|
||||||
}
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,86 +0,0 @@
|
|||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <3ds.h>
|
|
||||||
|
|
||||||
#include <pd-3ds/bknd-hid.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
Hid3DS::Hid3DS(PDDriverData data) : HidDriver("Hid3DS") {
|
|
||||||
this->Flags |= Flags_HasTouch;
|
|
||||||
this->Flags |= FLags_HasGamepad;
|
|
||||||
pBinds[KEY_A] = A;
|
|
||||||
pBinds[KEY_B] = B;
|
|
||||||
pBinds[KEY_X] = X;
|
|
||||||
pBinds[KEY_Y] = Y;
|
|
||||||
pBinds[KEY_START] = Start;
|
|
||||||
pBinds[KEY_SELECT] = Select;
|
|
||||||
pBinds[KEY_L] = L;
|
|
||||||
pBinds[KEY_R] = R;
|
|
||||||
pBinds[KEY_DUP] = DUp;
|
|
||||||
pBinds[KEY_DDOWN] = DDown;
|
|
||||||
pBinds[KEY_DLEFT] = DLeft;
|
|
||||||
pBinds[KEY_DRIGHT] = DRight;
|
|
||||||
pBinds[KEY_CPAD_UP] = CPUp;
|
|
||||||
pBinds[KEY_CPAD_DOWN] = CPDown;
|
|
||||||
pBinds[KEY_CPAD_LEFT] = CPLeft;
|
|
||||||
pBinds[KEY_CPAD_RIGHT] = CPRight;
|
|
||||||
pBinds[KEY_CSTICK_UP] = CSUp;
|
|
||||||
pBinds[KEY_CSTICK_DOWN] = CSDown;
|
|
||||||
pBinds[KEY_CSTICK_LEFT] = CSLeft;
|
|
||||||
pBinds[KEY_CSTICK_RIGHT] = CSRight;
|
|
||||||
pBinds[KEY_ZL] = ZL;
|
|
||||||
pBinds[KEY_ZR] = ZR;
|
|
||||||
pBinds[KEY_TOUCH] = Touch;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Hid3DS::Update() {
|
|
||||||
hidScanInput();
|
|
||||||
for (int i = 0; i < 2; i++) {
|
|
||||||
KeyEvents[i][Event_Down] = 0;
|
|
||||||
KeyEvents[i][Event_Held] = 0;
|
|
||||||
KeyEvents[i][Event_Up] = 0;
|
|
||||||
}
|
|
||||||
u32 kd = hidKeysDown();
|
|
||||||
u32 kh = hidKeysHeld();
|
|
||||||
u32 ku = hidKeysUp();
|
|
||||||
for (auto& b : pBinds) {
|
|
||||||
if (b.first & kd) {
|
|
||||||
KeyEvents[0][Event_Down] |= b.second;
|
|
||||||
}
|
|
||||||
if (b.first & kh) {
|
|
||||||
KeyEvents[0][Event_Held] |= b.second;
|
|
||||||
}
|
|
||||||
if (b.first & ku) {
|
|
||||||
KeyEvents[0][Event_Up] |= b.second;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (pLocked) {
|
|
||||||
SwapTab();
|
|
||||||
}
|
|
||||||
touchPosition t;
|
|
||||||
hidTouchRead(&t);
|
|
||||||
pMouse[1] = pMouse[0]; // Cycle pMouse pos
|
|
||||||
pMouse[0] = fvec2(t.px, t.py);
|
|
||||||
}
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,131 +0,0 @@
|
|||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <3ds.h>
|
|
||||||
|
|
||||||
#include <palladium>
|
|
||||||
#include <pd-3ds.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
PD::Li::Font::Ref LoadSystemFont(Context& ctx) {
|
|
||||||
TT::Scope st(*ctx.Os(), "LI_SystemFont"); // Trace loading time
|
|
||||||
Li::Font::Ref ret = Li::Font::New(ctx);
|
|
||||||
fontEnsureMapped(); // Call this to be sure the font is mapped
|
|
||||||
// Get some const references for system font loading
|
|
||||||
const auto fnt = fontGetSystemFont();
|
|
||||||
const auto fnt_info = fontGetInfo(fnt);
|
|
||||||
const auto glyph_info = fontGetGlyphInfo(fnt);
|
|
||||||
// Resize the Texture list by the num of sysfont textures
|
|
||||||
ret->Textures.resize(glyph_info->nSheets + 1);
|
|
||||||
/// Modify the Pixel Height by 1.1f to fit the
|
|
||||||
/// Size og ttf font Rendering
|
|
||||||
ret->PixelHeight = glyph_info->cellHeight;
|
|
||||||
// Load the Textures and make sure they don't auto unload
|
|
||||||
for (size_t i = 0; i < glyph_info->nSheets; i++) {
|
|
||||||
auto stex = Li::Texture::New();
|
|
||||||
auto tx = new C3D_Tex;
|
|
||||||
tx->data = fontGetGlyphSheetTex(fnt, i);
|
|
||||||
tx->fmt = (GPU_TEXCOLOR)glyph_info->sheetFmt;
|
|
||||||
tx->size = glyph_info->sheetSize;
|
|
||||||
tx->width = glyph_info->sheetWidth;
|
|
||||||
tx->height = glyph_info->sheetHeight;
|
|
||||||
tx->param = GPU_TEXTURE_MAG_FILTER(GPU_LINEAR) |
|
|
||||||
GPU_TEXTURE_MIN_FILTER(GPU_LINEAR) |
|
|
||||||
GPU_TEXTURE_WRAP_S(GPU_REPEAT) | GPU_TEXTURE_WRAP_T(GPU_REPEAT);
|
|
||||||
tx->border = 0xffffffff;
|
|
||||||
tx->lodParam = 0;
|
|
||||||
stex->Address = (Li::TexAddress)tx;
|
|
||||||
stex->Size = fvec2(tx->width, tx->height);
|
|
||||||
stex->UV = fvec4(0, 1, 1, 0);
|
|
||||||
ret->Textures[i] = stex;
|
|
||||||
}
|
|
||||||
std::vector<unsigned int> charSet;
|
|
||||||
// Write the Charset into a vector
|
|
||||||
for (auto cmap = fnt_info->cmap; cmap; cmap = cmap->next) {
|
|
||||||
if (cmap->mappingMethod == CMAP_TYPE_DIRECT) {
|
|
||||||
if (cmap->codeEnd >= cmap->codeBegin) {
|
|
||||||
charSet.reserve(charSet.size() + cmap->codeEnd - cmap->codeBegin + 1);
|
|
||||||
for (auto i = cmap->codeBegin; i <= cmap->codeEnd; ++i) {
|
|
||||||
if (cmap->indexOffset + (i - cmap->codeBegin) == 0xFFFF) break;
|
|
||||||
charSet.emplace_back(i);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if (cmap->mappingMethod == CMAP_TYPE_TABLE) {
|
|
||||||
if (cmap->codeEnd >= cmap->codeBegin) {
|
|
||||||
charSet.reserve(charSet.size() + cmap->codeEnd - cmap->codeBegin + 1);
|
|
||||||
for (auto i = cmap->codeBegin; i <= cmap->codeEnd; ++i) {
|
|
||||||
if (cmap->indexTable[i - cmap->codeBegin] == 0xFFFF) continue;
|
|
||||||
charSet.emplace_back(i);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else if (cmap->mappingMethod == CMAP_TYPE_SCAN) {
|
|
||||||
charSet.reserve(charSet.size() + cmap->nScanEntries);
|
|
||||||
for (unsigned i = 0; i < cmap->nScanEntries; ++i) {
|
|
||||||
if (cmap->scanEntries[i].code >= cmap->codeBegin &&
|
|
||||||
cmap->scanEntries[i].code <= cmap->codeEnd) {
|
|
||||||
if (cmap->scanEntries[i].glyphIndex != 0xFFFF) {
|
|
||||||
charSet.emplace_back(cmap->scanEntries[i].code);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Sort the charset and make sure all values are unique
|
|
||||||
std::sort(charSet.begin(), charSet.end());
|
|
||||||
charSet.erase(std::unique(charSet.begin(), charSet.end()));
|
|
||||||
|
|
||||||
// Setup the Codepoint map by the charset
|
|
||||||
for (auto cp : charSet) {
|
|
||||||
int gidx = fontGlyphIndexFromCodePoint(fnt, cp);
|
|
||||||
if (gidx >= 0xFFFF) continue;
|
|
||||||
Li::Font::Codepoint codepoint;
|
|
||||||
fontGlyphPos_s dat;
|
|
||||||
fontCalcGlyphPos(&dat, fnt, gidx, GLYPH_POS_CALC_VTXCOORD, 1.f, 1.f);
|
|
||||||
|
|
||||||
codepoint.pCodepoint = cp;
|
|
||||||
codepoint.SimpleUV = fvec4(dat.texcoord.left, dat.texcoord.top,
|
|
||||||
dat.texcoord.right, dat.texcoord.bottom);
|
|
||||||
|
|
||||||
if (dat.sheetIndex < (int)ret->Textures.size()) {
|
|
||||||
codepoint.Tex = ret->Textures[dat.sheetIndex];
|
|
||||||
} else {
|
|
||||||
codepoint.pInvalid = true;
|
|
||||||
}
|
|
||||||
codepoint.Size = fvec2(dat.vtxcoord.right, dat.vtxcoord.bottom);
|
|
||||||
codepoint.Offset = 0;
|
|
||||||
ret->CodeMap[cp] = codepoint;
|
|
||||||
}
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Init(void* data) {
|
|
||||||
// Dekstop Init Stage
|
|
||||||
// First use default OS Driver
|
|
||||||
// PD::OS::Init();
|
|
||||||
// PD::Gfx::Init(PD::GfxC3D::New());
|
|
||||||
// PD::Hid::Init(PD::Hid3DS::New());
|
|
||||||
}
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,62 +0,0 @@
|
|||||||
cmake_minimum_required(VERSION 3.22)
|
|
||||||
|
|
||||||
project(pd-desktop LANGUAGES CXX VERSION 0.5.0)
|
|
||||||
|
|
||||||
set(PD_GL_VERSION 21 CACHE STRING "OpenGL Version (2.1 -> 21, 3.3 -> 33)")
|
|
||||||
|
|
||||||
if(APPLE)
|
|
||||||
set(PD_GL_VERSION 33 CACHE STRING "33" FORCE)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
message("Using OpenGL: " ${PD_GL_VERSION})
|
|
||||||
|
|
||||||
add_subdirectory(glad)
|
|
||||||
add_subdirectory(glfw)
|
|
||||||
|
|
||||||
set(SRC
|
|
||||||
source/bknd-gfx.cpp
|
|
||||||
source/bknd-hid.cpp
|
|
||||||
source/pd-desktop.cpp
|
|
||||||
)
|
|
||||||
|
|
||||||
add_library(pd-desktop STATIC ${SRC})
|
|
||||||
target_include_directories(pd-desktop
|
|
||||||
PUBLIC
|
|
||||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
|
|
||||||
$<INSTALL_INTERFACE:include>
|
|
||||||
)
|
|
||||||
target_link_libraries(pd-desktop PUBLIC palladium glad glfw)
|
|
||||||
|
|
||||||
target_compile_definitions(pd-desktop
|
|
||||||
PRIVATE PD_OPENGL=${PD_GL_VERSION}
|
|
||||||
)
|
|
||||||
|
|
||||||
add_library(palladium::pd-desktop ALIAS pd-desktop)
|
|
||||||
|
|
||||||
install(TARGETS pd-desktop
|
|
||||||
EXPORT palladiumTargets
|
|
||||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
||||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
||||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
||||||
INCLUDES DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
|
||||||
)
|
|
||||||
|
|
||||||
install(DIRECTORY include/
|
|
||||||
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}
|
|
||||||
)
|
|
||||||
|
|
||||||
install(TARGETS glad
|
|
||||||
EXPORT palladiumTargets
|
|
||||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
||||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
||||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
||||||
)
|
|
||||||
|
|
||||||
if(PD_BUNDLE_GLFW)
|
|
||||||
install(TARGETS glfw
|
|
||||||
EXPORT palladiumTargets
|
|
||||||
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
||||||
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
|
|
||||||
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
cmake_minimum_required(VERSION 3.22)
|
|
||||||
|
|
||||||
add_library(glad source/glad.c)
|
|
||||||
target_include_directories(glad
|
|
||||||
PUBLIC
|
|
||||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
|
|
||||||
$<INSTALL_INTERFACE:include>
|
|
||||||
)
|
|
||||||
@@ -1,311 +0,0 @@
|
|||||||
#ifndef __khrplatform_h_
|
|
||||||
#define __khrplatform_h_
|
|
||||||
|
|
||||||
/*
|
|
||||||
** Copyright (c) 2008-2018 The Khronos Group Inc.
|
|
||||||
**
|
|
||||||
** Permission is hereby granted, free of charge, to any person obtaining a
|
|
||||||
** copy of this software and/or associated documentation files (the
|
|
||||||
** "Materials"), to deal in the Materials without restriction, including
|
|
||||||
** without limitation the rights to use, copy, modify, merge, publish,
|
|
||||||
** distribute, sublicense, and/or sell copies of the Materials, and to
|
|
||||||
** permit persons to whom the Materials are furnished to do so, subject to
|
|
||||||
** the following conditions:
|
|
||||||
**
|
|
||||||
** The above copyright notice and this permission notice shall be included
|
|
||||||
** in all copies or substantial portions of the Materials.
|
|
||||||
**
|
|
||||||
** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
||||||
** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
||||||
** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
|
|
||||||
** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
|
|
||||||
** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
|
|
||||||
** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
|
|
||||||
** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/* Khronos platform-specific types and definitions.
|
|
||||||
*
|
|
||||||
* The master copy of khrplatform.h is maintained in the Khronos EGL
|
|
||||||
* Registry repository at https://github.com/KhronosGroup/EGL-Registry
|
|
||||||
* The last semantic modification to khrplatform.h was at commit ID:
|
|
||||||
* 67a3e0864c2d75ea5287b9f3d2eb74a745936692
|
|
||||||
*
|
|
||||||
* Adopters may modify this file to suit their platform. Adopters are
|
|
||||||
* encouraged to submit platform specific modifications to the Khronos
|
|
||||||
* group so that they can be included in future versions of this file.
|
|
||||||
* Please submit changes by filing pull requests or issues on
|
|
||||||
* the EGL Registry repository linked above.
|
|
||||||
*
|
|
||||||
*
|
|
||||||
* See the Implementer's Guidelines for information about where this file
|
|
||||||
* should be located on your system and for more details of its use:
|
|
||||||
* http://www.khronos.org/registry/implementers_guide.pdf
|
|
||||||
*
|
|
||||||
* This file should be included as
|
|
||||||
* #include <KHR/khrplatform.h>
|
|
||||||
* by Khronos client API header files that use its types and defines.
|
|
||||||
*
|
|
||||||
* The types in khrplatform.h should only be used to define API-specific types.
|
|
||||||
*
|
|
||||||
* Types defined in khrplatform.h:
|
|
||||||
* khronos_int8_t signed 8 bit
|
|
||||||
* khronos_uint8_t unsigned 8 bit
|
|
||||||
* khronos_int16_t signed 16 bit
|
|
||||||
* khronos_uint16_t unsigned 16 bit
|
|
||||||
* khronos_int32_t signed 32 bit
|
|
||||||
* khronos_uint32_t unsigned 32 bit
|
|
||||||
* khronos_int64_t signed 64 bit
|
|
||||||
* khronos_uint64_t unsigned 64 bit
|
|
||||||
* khronos_intptr_t signed same number of bits as a pointer
|
|
||||||
* khronos_uintptr_t unsigned same number of bits as a pointer
|
|
||||||
* khronos_ssize_t signed size
|
|
||||||
* khronos_usize_t unsigned size
|
|
||||||
* khronos_float_t signed 32 bit floating point
|
|
||||||
* khronos_time_ns_t unsigned 64 bit time in nanoseconds
|
|
||||||
* khronos_utime_nanoseconds_t unsigned time interval or absolute time in
|
|
||||||
* nanoseconds
|
|
||||||
* khronos_stime_nanoseconds_t signed time interval in nanoseconds
|
|
||||||
* khronos_boolean_enum_t enumerated boolean type. This should
|
|
||||||
* only be used as a base type when a client API's boolean type is
|
|
||||||
* an enum. Client APIs which use an integer or other type for
|
|
||||||
* booleans cannot use this as the base type for their boolean.
|
|
||||||
*
|
|
||||||
* Tokens defined in khrplatform.h:
|
|
||||||
*
|
|
||||||
* KHRONOS_FALSE, KHRONOS_TRUE Enumerated boolean false/true values.
|
|
||||||
*
|
|
||||||
* KHRONOS_SUPPORT_INT64 is 1 if 64 bit integers are supported; otherwise 0.
|
|
||||||
* KHRONOS_SUPPORT_FLOAT is 1 if floats are supported; otherwise 0.
|
|
||||||
*
|
|
||||||
* Calling convention macros defined in this file:
|
|
||||||
* KHRONOS_APICALL
|
|
||||||
* KHRONOS_APIENTRY
|
|
||||||
* KHRONOS_APIATTRIBUTES
|
|
||||||
*
|
|
||||||
* These may be used in function prototypes as:
|
|
||||||
*
|
|
||||||
* KHRONOS_APICALL void KHRONOS_APIENTRY funcname(
|
|
||||||
* int arg1,
|
|
||||||
* int arg2) KHRONOS_APIATTRIBUTES;
|
|
||||||
*/
|
|
||||||
|
|
||||||
#if defined(__SCITECH_SNAP__) && !defined(KHRONOS_STATIC)
|
|
||||||
# define KHRONOS_STATIC 1
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*-------------------------------------------------------------------------
|
|
||||||
* Definition of KHRONOS_APICALL
|
|
||||||
*-------------------------------------------------------------------------
|
|
||||||
* This precedes the return type of the function in the function prototype.
|
|
||||||
*/
|
|
||||||
#if defined(KHRONOS_STATIC)
|
|
||||||
/* If the preprocessor constant KHRONOS_STATIC is defined, make the
|
|
||||||
* header compatible with static linking. */
|
|
||||||
# define KHRONOS_APICALL
|
|
||||||
#elif defined(_WIN32)
|
|
||||||
# define KHRONOS_APICALL __declspec(dllimport)
|
|
||||||
#elif defined (__SYMBIAN32__)
|
|
||||||
# define KHRONOS_APICALL IMPORT_C
|
|
||||||
#elif defined(__ANDROID__)
|
|
||||||
# define KHRONOS_APICALL __attribute__((visibility("default")))
|
|
||||||
#else
|
|
||||||
# define KHRONOS_APICALL
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*-------------------------------------------------------------------------
|
|
||||||
* Definition of KHRONOS_APIENTRY
|
|
||||||
*-------------------------------------------------------------------------
|
|
||||||
* This follows the return type of the function and precedes the function
|
|
||||||
* name in the function prototype.
|
|
||||||
*/
|
|
||||||
#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__)
|
|
||||||
/* Win32 but not WinCE */
|
|
||||||
# define KHRONOS_APIENTRY __stdcall
|
|
||||||
#else
|
|
||||||
# define KHRONOS_APIENTRY
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*-------------------------------------------------------------------------
|
|
||||||
* Definition of KHRONOS_APIATTRIBUTES
|
|
||||||
*-------------------------------------------------------------------------
|
|
||||||
* This follows the closing parenthesis of the function prototype arguments.
|
|
||||||
*/
|
|
||||||
#if defined (__ARMCC_2__)
|
|
||||||
#define KHRONOS_APIATTRIBUTES __softfp
|
|
||||||
#else
|
|
||||||
#define KHRONOS_APIATTRIBUTES
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*-------------------------------------------------------------------------
|
|
||||||
* basic type definitions
|
|
||||||
*-----------------------------------------------------------------------*/
|
|
||||||
#if (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L) || defined(__GNUC__) || defined(__SCO__) || defined(__USLC__)
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Using <stdint.h>
|
|
||||||
*/
|
|
||||||
#include <stdint.h>
|
|
||||||
typedef int32_t khronos_int32_t;
|
|
||||||
typedef uint32_t khronos_uint32_t;
|
|
||||||
typedef int64_t khronos_int64_t;
|
|
||||||
typedef uint64_t khronos_uint64_t;
|
|
||||||
#define KHRONOS_SUPPORT_INT64 1
|
|
||||||
#define KHRONOS_SUPPORT_FLOAT 1
|
|
||||||
/*
|
|
||||||
* To support platform where unsigned long cannot be used interchangeably with
|
|
||||||
* inptr_t (e.g. CHERI-extended ISAs), we can use the stdint.h intptr_t.
|
|
||||||
* Ideally, we could just use (u)intptr_t everywhere, but this could result in
|
|
||||||
* ABI breakage if khronos_uintptr_t is changed from unsigned long to
|
|
||||||
* unsigned long long or similar (this results in different C++ name mangling).
|
|
||||||
* To avoid changes for existing platforms, we restrict usage of intptr_t to
|
|
||||||
* platforms where the size of a pointer is larger than the size of long.
|
|
||||||
*/
|
|
||||||
#if defined(__SIZEOF_LONG__) && defined(__SIZEOF_POINTER__)
|
|
||||||
#if __SIZEOF_POINTER__ > __SIZEOF_LONG__
|
|
||||||
#define KHRONOS_USE_INTPTR_T
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#elif defined(__VMS ) || defined(__sgi)
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Using <inttypes.h>
|
|
||||||
*/
|
|
||||||
#include <inttypes.h>
|
|
||||||
typedef int32_t khronos_int32_t;
|
|
||||||
typedef uint32_t khronos_uint32_t;
|
|
||||||
typedef int64_t khronos_int64_t;
|
|
||||||
typedef uint64_t khronos_uint64_t;
|
|
||||||
#define KHRONOS_SUPPORT_INT64 1
|
|
||||||
#define KHRONOS_SUPPORT_FLOAT 1
|
|
||||||
|
|
||||||
#elif defined(_WIN32) && !defined(__SCITECH_SNAP__)
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Win32
|
|
||||||
*/
|
|
||||||
typedef __int32 khronos_int32_t;
|
|
||||||
typedef unsigned __int32 khronos_uint32_t;
|
|
||||||
typedef __int64 khronos_int64_t;
|
|
||||||
typedef unsigned __int64 khronos_uint64_t;
|
|
||||||
#define KHRONOS_SUPPORT_INT64 1
|
|
||||||
#define KHRONOS_SUPPORT_FLOAT 1
|
|
||||||
|
|
||||||
#elif defined(__sun__) || defined(__digital__)
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Sun or Digital
|
|
||||||
*/
|
|
||||||
typedef int khronos_int32_t;
|
|
||||||
typedef unsigned int khronos_uint32_t;
|
|
||||||
#if defined(__arch64__) || defined(_LP64)
|
|
||||||
typedef long int khronos_int64_t;
|
|
||||||
typedef unsigned long int khronos_uint64_t;
|
|
||||||
#else
|
|
||||||
typedef long long int khronos_int64_t;
|
|
||||||
typedef unsigned long long int khronos_uint64_t;
|
|
||||||
#endif /* __arch64__ */
|
|
||||||
#define KHRONOS_SUPPORT_INT64 1
|
|
||||||
#define KHRONOS_SUPPORT_FLOAT 1
|
|
||||||
|
|
||||||
#elif 0
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Hypothetical platform with no float or int64 support
|
|
||||||
*/
|
|
||||||
typedef int khronos_int32_t;
|
|
||||||
typedef unsigned int khronos_uint32_t;
|
|
||||||
#define KHRONOS_SUPPORT_INT64 0
|
|
||||||
#define KHRONOS_SUPPORT_FLOAT 0
|
|
||||||
|
|
||||||
#else
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Generic fallback
|
|
||||||
*/
|
|
||||||
#include <stdint.h>
|
|
||||||
typedef int32_t khronos_int32_t;
|
|
||||||
typedef uint32_t khronos_uint32_t;
|
|
||||||
typedef int64_t khronos_int64_t;
|
|
||||||
typedef uint64_t khronos_uint64_t;
|
|
||||||
#define KHRONOS_SUPPORT_INT64 1
|
|
||||||
#define KHRONOS_SUPPORT_FLOAT 1
|
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Types that are (so far) the same on all platforms
|
|
||||||
*/
|
|
||||||
typedef signed char khronos_int8_t;
|
|
||||||
typedef unsigned char khronos_uint8_t;
|
|
||||||
typedef signed short int khronos_int16_t;
|
|
||||||
typedef unsigned short int khronos_uint16_t;
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Types that differ between LLP64 and LP64 architectures - in LLP64,
|
|
||||||
* pointers are 64 bits, but 'long' is still 32 bits. Win64 appears
|
|
||||||
* to be the only LLP64 architecture in current use.
|
|
||||||
*/
|
|
||||||
#ifdef KHRONOS_USE_INTPTR_T
|
|
||||||
typedef intptr_t khronos_intptr_t;
|
|
||||||
typedef uintptr_t khronos_uintptr_t;
|
|
||||||
#elif defined(_WIN64)
|
|
||||||
typedef signed long long int khronos_intptr_t;
|
|
||||||
typedef unsigned long long int khronos_uintptr_t;
|
|
||||||
#else
|
|
||||||
typedef signed long int khronos_intptr_t;
|
|
||||||
typedef unsigned long int khronos_uintptr_t;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if defined(_WIN64)
|
|
||||||
typedef signed long long int khronos_ssize_t;
|
|
||||||
typedef unsigned long long int khronos_usize_t;
|
|
||||||
#else
|
|
||||||
typedef signed long int khronos_ssize_t;
|
|
||||||
typedef unsigned long int khronos_usize_t;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if KHRONOS_SUPPORT_FLOAT
|
|
||||||
/*
|
|
||||||
* Float type
|
|
||||||
*/
|
|
||||||
typedef float khronos_float_t;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#if KHRONOS_SUPPORT_INT64
|
|
||||||
/* Time types
|
|
||||||
*
|
|
||||||
* These types can be used to represent a time interval in nanoseconds or
|
|
||||||
* an absolute Unadjusted System Time. Unadjusted System Time is the number
|
|
||||||
* of nanoseconds since some arbitrary system event (e.g. since the last
|
|
||||||
* time the system booted). The Unadjusted System Time is an unsigned
|
|
||||||
* 64 bit value that wraps back to 0 every 584 years. Time intervals
|
|
||||||
* may be either signed or unsigned.
|
|
||||||
*/
|
|
||||||
typedef khronos_uint64_t khronos_utime_nanoseconds_t;
|
|
||||||
typedef khronos_int64_t khronos_stime_nanoseconds_t;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Dummy value used to pad enum types to 32 bits.
|
|
||||||
*/
|
|
||||||
#ifndef KHRONOS_MAX_ENUM
|
|
||||||
#define KHRONOS_MAX_ENUM 0x7FFFFFFF
|
|
||||||
#endif
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Enumerated boolean type
|
|
||||||
*
|
|
||||||
* Values other than zero should be considered to be true. Therefore
|
|
||||||
* comparisons should not be made against KHRONOS_TRUE.
|
|
||||||
*/
|
|
||||||
typedef enum {
|
|
||||||
KHRONOS_FALSE = 0,
|
|
||||||
KHRONOS_TRUE = 1,
|
|
||||||
KHRONOS_BOOLEAN_ENUM_FORCE_SIZE = KHRONOS_MAX_ENUM
|
|
||||||
} khronos_boolean_enum_t;
|
|
||||||
|
|
||||||
#endif /* __khrplatform_h_ */
|
|
||||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
Submodule backends/desktop/glfw deleted from e7ea71be03
@@ -1,31 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd-desktop/bknd-gfx.hpp>
|
|
||||||
#include <pd-desktop/bknd-hid.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
void Init(void* data = nullptr);
|
|
||||||
}
|
|
||||||
@@ -1,89 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <glad/glad.h>
|
|
||||||
|
|
||||||
/** SEPARATOR */
|
|
||||||
#include <GLFW/glfw3.h>
|
|
||||||
/** SEPARATOR */
|
|
||||||
|
|
||||||
#include <pd/lithium/lithium.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
class GfxGL2 : public GfxDriver {
|
|
||||||
public:
|
|
||||||
GfxGL2(PDDriverData data = nullptr) : GfxDriver("OpenGL2") {}
|
|
||||||
~GfxGL2() = default;
|
|
||||||
|
|
||||||
PD_SHARED(GfxGL2);
|
|
||||||
|
|
||||||
void Init() override;
|
|
||||||
void Deinit() override;
|
|
||||||
void NewFrame() override;
|
|
||||||
void BindTex(PD::Li::TexAddress addr) override;
|
|
||||||
void RenderDrawData(const Li::CmdPool& Commands) override;
|
|
||||||
PD::Li::Texture::Ref LoadTex(
|
|
||||||
const std::vector<PD::u8>& pixels, int w, int h,
|
|
||||||
PD::Li::Texture::Type type = PD::Li::Texture::Type::RGBA32,
|
|
||||||
PD::Li::Texture::Filter filter =
|
|
||||||
PD::Li::Texture::Filter::LINEAR) override;
|
|
||||||
|
|
||||||
std::vector<Li::Vertex> VertexBuffer;
|
|
||||||
std::vector<PD::u16> IndexBuffer;
|
|
||||||
GLuint Shader;
|
|
||||||
GLuint pLocProjection;
|
|
||||||
GLuint pLocTex;
|
|
||||||
GLuint pLocAlfa;
|
|
||||||
GLuint VBO, IBO, VAO; // vao is only used in > 3.3
|
|
||||||
};
|
|
||||||
|
|
||||||
class GfxGL3 : public GfxDriver2 {
|
|
||||||
public:
|
|
||||||
GfxGL3() : GfxDriver2("OpenGL3") {}
|
|
||||||
~GfxGL3() = default;
|
|
||||||
|
|
||||||
PD_SHARED(GfxGL3);
|
|
||||||
|
|
||||||
void Init() override;
|
|
||||||
void Deinit() override;
|
|
||||||
// void NewFrame() override;
|
|
||||||
void TexBind(PD::Li::TexAddress addr) override;
|
|
||||||
void Draw(const Li::CmdPool& pool) override;
|
|
||||||
PD::Li::TexAddress TexLoad(
|
|
||||||
const std::vector<PD::u8>& pixels, int w, int h,
|
|
||||||
PD::Li::Texture::Type type = PD::Li::Texture::Type::RGBA32,
|
|
||||||
PD::Li::Texture::Filter filter =
|
|
||||||
PD::Li::Texture::Filter::LINEAR) override;
|
|
||||||
void TexDelete(PD::Li::TexAddress tex) override;
|
|
||||||
|
|
||||||
std::vector<Li::Vertex> VertexBuffer;
|
|
||||||
std::vector<PD::u16> IndexBuffer;
|
|
||||||
GLuint Shader;
|
|
||||||
GLuint pLocProjection;
|
|
||||||
GLuint pLocTex;
|
|
||||||
GLuint pLocAlfa;
|
|
||||||
GLuint VBO, IBO, VAO; // vao is only used in > 3.3
|
|
||||||
};
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,72 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <GLFW/glfw3.h>
|
|
||||||
|
|
||||||
#include <pd/drivers/drivers.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
class HidGLFW : public HidDriver {
|
|
||||||
public:
|
|
||||||
HidGLFW(PDDriverData data);
|
|
||||||
~HidGLFW() = default;
|
|
||||||
|
|
||||||
PD_SHARED(HidGLFW);
|
|
||||||
|
|
||||||
void Update() override;
|
|
||||||
void GetInputStr(std::string& str) override;
|
|
||||||
void HandleTextOps();
|
|
||||||
bool pTimedHeld(KbKey k) {
|
|
||||||
if (pTimings.count(k)) {
|
|
||||||
if (IsEvent(Event_Up, k)) {
|
|
||||||
pTimings.erase(k);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
return 0; //(PD::OS::GetTime() - pTimings[k]) > 50;
|
|
||||||
}
|
|
||||||
if (!IsEvent(Event_Held, k)) {
|
|
||||||
if (pTimings.count(k)) {
|
|
||||||
pTimings.erase(k);
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (IsEvent(Event_Held, k)) {
|
|
||||||
pTimings[k] = 0; // PD::OS::GetTime();
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Data section */
|
|
||||||
GLFWwindow* Window;
|
|
||||||
int PrevState;
|
|
||||||
std::unordered_map<int, int> PrevStates;
|
|
||||||
static GLFWcharfun pOldTextCB;
|
|
||||||
static std::string* pText;
|
|
||||||
bool pInTextMode = false;
|
|
||||||
PD::u64 pLastUpdate = 0;
|
|
||||||
std::unordered_map<KbKey, u64> pTimings;
|
|
||||||
};
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,502 +0,0 @@
|
|||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd-desktop/bknd-gfx.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
#if PD_OPENGL >= 21 && PD_OPENGL < 33
|
|
||||||
const char* vertex_shader = R"(
|
|
||||||
#version 120
|
|
||||||
|
|
||||||
attribute vec2 pos;
|
|
||||||
attribute vec2 uv;
|
|
||||||
attribute vec4 color;
|
|
||||||
|
|
||||||
varying vec2 oUV;
|
|
||||||
varying vec4 oColor;
|
|
||||||
|
|
||||||
// Probably forgot about this matrix and
|
|
||||||
// searched hours for why the rendering isn't working :/
|
|
||||||
uniform mat4 projection;
|
|
||||||
|
|
||||||
void main() {
|
|
||||||
gl_Position = projection*vec4(pos, 0.0, 1.0);
|
|
||||||
oUV = uv;
|
|
||||||
oColor = color;
|
|
||||||
}
|
|
||||||
)";
|
|
||||||
|
|
||||||
const char* frag_shader = R"(
|
|
||||||
#version 120
|
|
||||||
|
|
||||||
varying vec2 oUV;
|
|
||||||
varying vec4 oColor;
|
|
||||||
|
|
||||||
uniform sampler2D tex;
|
|
||||||
uniform bool alfa;
|
|
||||||
|
|
||||||
void main() {
|
|
||||||
vec4 tc = texture2D(tex, oUV);
|
|
||||||
if (alfa) {
|
|
||||||
gl_FragColor = vec4(oColor.rgb, tc.a * oColor.a);
|
|
||||||
} else {
|
|
||||||
gl_FragColor = tc * oColor;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
)";
|
|
||||||
#elif PD_OPENGL >= 33
|
|
||||||
const char* vertex_shader = R"(
|
|
||||||
#version 330 core
|
|
||||||
|
|
||||||
layout(location = 0) in vec2 pos;
|
|
||||||
layout(location = 1) in vec2 uv;
|
|
||||||
layout(location = 2) in vec4 color;
|
|
||||||
|
|
||||||
out vec2 oUV;
|
|
||||||
out vec4 oColor;
|
|
||||||
|
|
||||||
// Probably forgot about this matrix and
|
|
||||||
// searched hours for why the rendering isn't working :/
|
|
||||||
uniform mat4 projection;
|
|
||||||
|
|
||||||
void main() {
|
|
||||||
gl_Position = projection*vec4(pos, 0.0, 1.0);
|
|
||||||
oUV = uv;
|
|
||||||
oColor = color;
|
|
||||||
}
|
|
||||||
)";
|
|
||||||
|
|
||||||
const char* frag_shader = R"(
|
|
||||||
#version 330 core
|
|
||||||
|
|
||||||
in vec2 oUV;
|
|
||||||
in vec4 oColor;
|
|
||||||
|
|
||||||
uniform sampler2D tex;
|
|
||||||
uniform bool alfa;
|
|
||||||
|
|
||||||
out vec4 FragColor;
|
|
||||||
|
|
||||||
void main() {
|
|
||||||
vec4 tc = texture(tex, oUV);
|
|
||||||
if (alfa) {
|
|
||||||
FragColor = vec4(oColor.rgb, tc.a * oColor.a);
|
|
||||||
} else {
|
|
||||||
FragColor = tc * oColor;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
)";
|
|
||||||
#else
|
|
||||||
// Need to show error
|
|
||||||
#endif
|
|
||||||
|
|
||||||
GLuint compileShader(const std::string& source, GLenum type) {
|
|
||||||
GLuint shader = glCreateShader(type);
|
|
||||||
const char* src = source.c_str();
|
|
||||||
glShaderSource(shader, 1, &src, nullptr);
|
|
||||||
glCompileShader(shader);
|
|
||||||
|
|
||||||
GLint success;
|
|
||||||
glGetShaderiv(shader, GL_COMPILE_STATUS, &success);
|
|
||||||
if (!success) {
|
|
||||||
char infoLog[512];
|
|
||||||
glGetShaderInfoLog(shader, 512, nullptr, infoLog);
|
|
||||||
std::cerr << "Shader Compilation Error: " << infoLog << std::endl;
|
|
||||||
}
|
|
||||||
|
|
||||||
return shader;
|
|
||||||
}
|
|
||||||
|
|
||||||
GLuint createShaderProgram(const std::string& vertexShaderSource,
|
|
||||||
const std::string& fragmentShaderSource) {
|
|
||||||
GLuint vertexShader = compileShader(vertexShaderSource, GL_VERTEX_SHADER);
|
|
||||||
GLuint fragmentShader =
|
|
||||||
compileShader(fragmentShaderSource, GL_FRAGMENT_SHADER);
|
|
||||||
|
|
||||||
GLuint shaderProgram = glCreateProgram();
|
|
||||||
glAttachShader(shaderProgram, vertexShader);
|
|
||||||
glAttachShader(shaderProgram, fragmentShader);
|
|
||||||
glLinkProgram(shaderProgram);
|
|
||||||
|
|
||||||
GLint success;
|
|
||||||
glGetProgramiv(shaderProgram, GL_LINK_STATUS, &success);
|
|
||||||
if (!success) {
|
|
||||||
char infoLog[512];
|
|
||||||
glGetProgramInfoLog(shaderProgram, 512, nullptr, infoLog);
|
|
||||||
std::cerr << "Shader Program Linking Error: " << infoLog << std::endl;
|
|
||||||
}
|
|
||||||
|
|
||||||
glDeleteShader(vertexShader);
|
|
||||||
glDeleteShader(fragmentShader);
|
|
||||||
|
|
||||||
return shaderProgram;
|
|
||||||
}
|
|
||||||
|
|
||||||
void SetupShaderAttribs(GLuint Shader) {
|
|
||||||
GLint _pos = glGetAttribLocation(Shader, "pos");
|
|
||||||
GLint _uv = glGetAttribLocation(Shader, "uv");
|
|
||||||
GLint _color = glGetAttribLocation(Shader, "color");
|
|
||||||
glVertexAttribPointer(_pos, 2, GL_FLOAT, GL_FALSE, sizeof(PD::Li::Vertex),
|
|
||||||
(void*)offsetof(PD::Li::Vertex, Pos));
|
|
||||||
glEnableVertexAttribArray(_pos);
|
|
||||||
|
|
||||||
glVertexAttribPointer(_uv, 2, GL_FLOAT, GL_FALSE, sizeof(PD::Li::Vertex),
|
|
||||||
(void*)offsetof(PD::Li::Vertex, UV));
|
|
||||||
glEnableVertexAttribArray(_uv);
|
|
||||||
|
|
||||||
glVertexAttribPointer(_color, 4, GL_UNSIGNED_BYTE, GL_TRUE,
|
|
||||||
sizeof(PD::Li::Vertex),
|
|
||||||
(void*)offsetof(PD::Li::Vertex, Color));
|
|
||||||
glEnableVertexAttribArray(_color);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Actual Backend */
|
|
||||||
|
|
||||||
void GfxGL2::Init() {
|
|
||||||
VertexBuffer.resize(4 * 8192);
|
|
||||||
IndexBuffer.resize(6 * 8192);
|
|
||||||
Shader = createShaderProgram(vertex_shader, frag_shader);
|
|
||||||
glUseProgram(Shader);
|
|
||||||
|
|
||||||
#if PD_OPENGL >= 33
|
|
||||||
glGenVertexArrays(1, &VAO);
|
|
||||||
glBindVertexArray(VAO);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
glGenBuffers(1, &VBO);
|
|
||||||
glBindBuffer(GL_ARRAY_BUFFER, VBO);
|
|
||||||
|
|
||||||
#if PD_OPENGL < 33
|
|
||||||
SetupShaderAttribs(Shader); // GL 2.1
|
|
||||||
#else
|
|
||||||
glEnableVertexAttribArray(0);
|
|
||||||
glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(PD::Li::Vertex),
|
|
||||||
(void*)offsetof(PD::Li::Vertex, Pos));
|
|
||||||
glEnableVertexAttribArray(1);
|
|
||||||
glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, sizeof(PD::Li::Vertex),
|
|
||||||
(void*)offsetof(PD::Li::Vertex, UV));
|
|
||||||
glEnableVertexAttribArray(2);
|
|
||||||
glVertexAttribPointer(2, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(PD::Li::Vertex),
|
|
||||||
(void*)offsetof(PD::Li::Vertex, Color));
|
|
||||||
#endif
|
|
||||||
glGenBuffers(1, &IBO);
|
|
||||||
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, IBO);
|
|
||||||
|
|
||||||
pLocTex = glGetUniformLocation(Shader, "tex");
|
|
||||||
pLocAlfa = glGetUniformLocation(Shader, "alfa");
|
|
||||||
pLocProjection = glGetUniformLocation(Shader, "projection");
|
|
||||||
|
|
||||||
glBindBuffer(GL_ARRAY_BUFFER, 0);
|
|
||||||
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
|
|
||||||
#if PD_OPENGL >= 33
|
|
||||||
glBindVertexArray(0);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
void GfxGL2::Deinit() {
|
|
||||||
glDeleteBuffers(1, &VBO);
|
|
||||||
glDeleteBuffers(1, &IBO);
|
|
||||||
#if PD_OPENGL >= 33
|
|
||||||
glDeleteBuffers(1, &VAO);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
void GfxGL2::NewFrame() {
|
|
||||||
/*
|
|
||||||
glViewport(0, 0, ViewPort.x, ViewPort.y);
|
|
||||||
glClearColor(ClearColor.x, ClearColor.y, ClearColor.z, ClearColor.w);
|
|
||||||
glClear(GL_COLOR_BUFFER_BIT);
|
|
||||||
*/
|
|
||||||
Projection = Mat4::Ortho(0.f, ViewPort.x, ViewPort.y, 0.f, -1.f, 1.f);
|
|
||||||
glUseProgram(Shader);
|
|
||||||
glUniformMatrix4fv(pLocProjection, 1, GL_FALSE, Projection.m.data());
|
|
||||||
glEnable(GL_BLEND);
|
|
||||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
|
||||||
FrameCounter++;
|
|
||||||
VertexCounter = CurrentVertex;
|
|
||||||
IndexCounter = CurrentIndex;
|
|
||||||
CurrentVertex = 0;
|
|
||||||
CurrentIndex = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void GfxGL2::BindTex(PD::Li::TexAddress addr) {
|
|
||||||
// Actually not using the Address as Address
|
|
||||||
glActiveTexture(GL_TEXTURE0);
|
|
||||||
glBindTexture(GL_TEXTURE_2D, (GLuint)addr);
|
|
||||||
glUniform1i(pLocTex, 0);
|
|
||||||
GLint fmt = 0;
|
|
||||||
glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_INTERNAL_FORMAT, &fmt);
|
|
||||||
glUniform1i(pLocAlfa, fmt == GL_ALPHA);
|
|
||||||
}
|
|
||||||
|
|
||||||
void GfxGL2::RenderDrawData(const Li::CmdPool& Commands) {
|
|
||||||
size_t index = 0;
|
|
||||||
while (index < Commands.Size()) {
|
|
||||||
PD::Li::TexAddress Tex = Commands.GetCmd(index)->Tex;
|
|
||||||
if (!Tex) {
|
|
||||||
index++;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
size_t StartIndex = CurrentIndex;
|
|
||||||
bool ScissorOn = Commands.GetCmd(index)->ScissorOn;
|
|
||||||
ivec4 ScissorRect = Commands.GetCmd(index)->ScissorRect;
|
|
||||||
|
|
||||||
while (index < Commands.Size() && Commands.GetCmd(index)->Tex == Tex &&
|
|
||||||
Commands.GetCmd(index)->ScissorOn == ScissorOn &&
|
|
||||||
Commands.GetCmd(index)->ScissorRect == ScissorRect) {
|
|
||||||
auto c = Commands.GetCmd(index);
|
|
||||||
for (size_t i = 0; i < c->IndexBuffer.size(); i++) {
|
|
||||||
IndexBuffer[CurrentIndex++] = CurrentVertex + c->IndexBuffer.at(i);
|
|
||||||
}
|
|
||||||
for (size_t i = 0; i < c->VertexBuffer.size(); i++) {
|
|
||||||
VertexBuffer[CurrentVertex++] = c->VertexBuffer.at(i);
|
|
||||||
}
|
|
||||||
index++;
|
|
||||||
}
|
|
||||||
if (ScissorOn) {
|
|
||||||
glScissor(ScissorRect.x, ViewPort.y - (ScissorRect.y + ScissorRect.w),
|
|
||||||
ScissorRect.z, ScissorRect.w);
|
|
||||||
glEnable(GL_SCISSOR_TEST);
|
|
||||||
} else {
|
|
||||||
glDisable(GL_SCISSOR_TEST);
|
|
||||||
}
|
|
||||||
BindTex(Tex);
|
|
||||||
|
|
||||||
#if PD_OPENGL >= 33
|
|
||||||
glBindVertexArray(VAO);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
glBindBuffer(GL_ARRAY_BUFFER, VBO);
|
|
||||||
glBufferData(GL_ARRAY_BUFFER, CurrentVertex * sizeof(PD::Li::Vertex),
|
|
||||||
&VertexBuffer[0], GL_DYNAMIC_DRAW);
|
|
||||||
|
|
||||||
#if PD_OPENGL < 33
|
|
||||||
// For some reason we need to set these every frame for every buffer
|
|
||||||
// Found that out when creating My 3d Engine
|
|
||||||
SetupShaderAttribs(Shader);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, IBO);
|
|
||||||
glBufferData(GL_ELEMENT_ARRAY_BUFFER, CurrentIndex * sizeof(PD::u16),
|
|
||||||
&IndexBuffer[0], GL_DYNAMIC_DRAW);
|
|
||||||
|
|
||||||
glDrawElements(GL_TRIANGLES, CurrentIndex - StartIndex, GL_UNSIGNED_SHORT,
|
|
||||||
(void*)(StartIndex * sizeof(PD::u16)));
|
|
||||||
|
|
||||||
glBindBuffer(GL_ARRAY_BUFFER, 0);
|
|
||||||
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
|
|
||||||
BindTex(0);
|
|
||||||
#if PD_OPENGL >= 33
|
|
||||||
glBindVertexArray(0);
|
|
||||||
#endif
|
|
||||||
glDisable(GL_SCISSOR_TEST);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
PD::Li::Texture::Ref GfxGL2::LoadTex(const std::vector<PD::u8>& pixels, int w,
|
|
||||||
int h, PD::Li::Texture::Type type,
|
|
||||||
PD::Li::Texture::Filter filter) {
|
|
||||||
GLuint texID;
|
|
||||||
glGenTextures(1, &texID);
|
|
||||||
glBindTexture(GL_TEXTURE_2D, texID);
|
|
||||||
|
|
||||||
// Set base format (Always using RGBA as base)
|
|
||||||
GLenum fmt = GL_RGBA;
|
|
||||||
if (type == PD::Li::Texture::Type::RGB24) {
|
|
||||||
fmt = GL_RGB;
|
|
||||||
} else if (type == PD::Li::Texture::Type::A8) {
|
|
||||||
fmt = GL_ALPHA;
|
|
||||||
}
|
|
||||||
glTexImage2D(GL_TEXTURE_2D, 0, fmt, w, h, 0, fmt, GL_UNSIGNED_BYTE,
|
|
||||||
pixels.data());
|
|
||||||
if (filter == PD::Li::Texture::Filter::LINEAR) {
|
|
||||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
|
||||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
|
||||||
} else if (filter == PD::Li::Texture::Filter::NEAREST) {
|
|
||||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
|
|
||||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
|
||||||
}
|
|
||||||
glBindTexture(GL_TEXTURE_2D, 0);
|
|
||||||
auto res = PD::Li::Texture::New(texID, PD::ivec2(w, h));
|
|
||||||
std::cout << std::format("Texture loaded: {} {}", texID, PD::ivec2(w, h))
|
|
||||||
<< std::endl;
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
|
|
||||||
void GfxGL3::Init() {
|
|
||||||
VertexBuffer.resize(4 * 8192);
|
|
||||||
IndexBuffer.resize(6 * 8192);
|
|
||||||
Shader = createShaderProgram(vertex_shader, frag_shader);
|
|
||||||
glUseProgram(Shader);
|
|
||||||
|
|
||||||
#if PD_OPENGL >= 33
|
|
||||||
glGenVertexArrays(1, &VAO);
|
|
||||||
glBindVertexArray(VAO);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
glGenBuffers(1, &VBO);
|
|
||||||
glBindBuffer(GL_ARRAY_BUFFER, VBO);
|
|
||||||
|
|
||||||
#if PD_OPENGL < 33
|
|
||||||
SetupShaderAttribs(Shader); // GL 2.1
|
|
||||||
#else
|
|
||||||
glEnableVertexAttribArray(0);
|
|
||||||
glVertexAttribPointer(0, 2, GL_FLOAT, GL_FALSE, sizeof(PD::Li::Vertex),
|
|
||||||
(void*)offsetof(PD::Li::Vertex, Pos));
|
|
||||||
glEnableVertexAttribArray(1);
|
|
||||||
glVertexAttribPointer(1, 2, GL_FLOAT, GL_FALSE, sizeof(PD::Li::Vertex),
|
|
||||||
(void*)offsetof(PD::Li::Vertex, UV));
|
|
||||||
glEnableVertexAttribArray(2);
|
|
||||||
glVertexAttribPointer(2, 4, GL_UNSIGNED_BYTE, GL_TRUE, sizeof(PD::Li::Vertex),
|
|
||||||
(void*)offsetof(PD::Li::Vertex, Color));
|
|
||||||
#endif
|
|
||||||
glGenBuffers(1, &IBO);
|
|
||||||
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, IBO);
|
|
||||||
|
|
||||||
pLocTex = glGetUniformLocation(Shader, "tex");
|
|
||||||
pLocAlfa = glGetUniformLocation(Shader, "alfa");
|
|
||||||
pLocProjection = glGetUniformLocation(Shader, "projection");
|
|
||||||
|
|
||||||
glBindBuffer(GL_ARRAY_BUFFER, 0);
|
|
||||||
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
|
|
||||||
#if PD_OPENGL >= 33
|
|
||||||
glBindVertexArray(0);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
void GfxGL3::Deinit() {
|
|
||||||
glDeleteBuffers(1, &VBO);
|
|
||||||
glDeleteBuffers(1, &IBO);
|
|
||||||
#if PD_OPENGL >= 33
|
|
||||||
glDeleteBuffers(1, &VAO);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
|
|
||||||
// void NewFrame() {
|
|
||||||
//}
|
|
||||||
|
|
||||||
void GfxGL3::TexBind(PD::Li::TexAddress addr) {
|
|
||||||
glActiveTexture(GL_TEXTURE0);
|
|
||||||
glBindTexture(GL_TEXTURE_2D, (GLuint)addr);
|
|
||||||
glUniform1i(pLocTex, 0);
|
|
||||||
GLint fmt = 0;
|
|
||||||
glGetTexLevelParameteriv(GL_TEXTURE_2D, 0, GL_TEXTURE_INTERNAL_FORMAT, &fmt);
|
|
||||||
glUniform1i(pLocAlfa, fmt == GL_ALPHA);
|
|
||||||
}
|
|
||||||
|
|
||||||
void GfxGL3::Draw(const Li::CmdPool& pool) {
|
|
||||||
size_t index = 0;
|
|
||||||
while (index < pool.Size()) {
|
|
||||||
PD::Li::TexAddress Tex = pool.GetCmd(index)->Tex;
|
|
||||||
if (Tex == 0) {
|
|
||||||
index++;
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
size_t StartIndex = CurrentIndex;
|
|
||||||
bool ScissorOn = pool.GetCmd(index)->ScissorOn;
|
|
||||||
ivec4 ScissorRect = pool.GetCmd(index)->ScissorRect;
|
|
||||||
|
|
||||||
while (index < pool.Size() && pool.GetCmd(index)->Tex == Tex &&
|
|
||||||
pool.GetCmd(index)->ScissorOn == ScissorOn &&
|
|
||||||
pool.GetCmd(index)->ScissorRect == ScissorRect) {
|
|
||||||
auto c = pool.GetCmd(index);
|
|
||||||
for (size_t i = 0; i < c->IndexBuffer.size(); i++) {
|
|
||||||
IndexBuffer[CurrentIndex++] = CurrentVertex + c->IndexBuffer.at(i);
|
|
||||||
}
|
|
||||||
for (size_t i = 0; i < c->VertexBuffer.size(); i++) {
|
|
||||||
VertexBuffer[CurrentVertex++] = c->VertexBuffer.at(i);
|
|
||||||
}
|
|
||||||
index++;
|
|
||||||
}
|
|
||||||
if (ScissorOn) {
|
|
||||||
glScissor(ScissorRect.x, ViewPort.y - (ScissorRect.y + ScissorRect.w),
|
|
||||||
ScissorRect.z, ScissorRect.w);
|
|
||||||
glEnable(GL_SCISSOR_TEST);
|
|
||||||
} else {
|
|
||||||
glDisable(GL_SCISSOR_TEST);
|
|
||||||
}
|
|
||||||
TexBind(Tex);
|
|
||||||
|
|
||||||
#if PD_OPENGL >= 33
|
|
||||||
glBindVertexArray(VAO);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
glBindBuffer(GL_ARRAY_BUFFER, VBO);
|
|
||||||
glBufferData(GL_ARRAY_BUFFER, CurrentVertex * sizeof(PD::Li::Vertex),
|
|
||||||
&VertexBuffer[0], GL_DYNAMIC_DRAW);
|
|
||||||
|
|
||||||
#if PD_OPENGL < 33
|
|
||||||
// For some reason we need to set these every frame for every buffer
|
|
||||||
// Found that out when creating My 3d Engine
|
|
||||||
SetupShaderAttribs(Shader);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, IBO);
|
|
||||||
glBufferData(GL_ELEMENT_ARRAY_BUFFER, CurrentIndex * sizeof(PD::u16),
|
|
||||||
&IndexBuffer[0], GL_DYNAMIC_DRAW);
|
|
||||||
|
|
||||||
glDrawElements(GL_TRIANGLES, CurrentIndex - StartIndex, GL_UNSIGNED_SHORT,
|
|
||||||
(void*)(StartIndex * sizeof(PD::u16)));
|
|
||||||
|
|
||||||
glBindBuffer(GL_ARRAY_BUFFER, 0);
|
|
||||||
glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
|
|
||||||
TexBind(0);
|
|
||||||
#if PD_OPENGL >= 33
|
|
||||||
glBindVertexArray(0);
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
PD::Li::TexAddress GfxGL3::TexLoad(const std::vector<PD::u8>& pixels, int w,
|
|
||||||
int h, PD::Li::Texture::Type type,
|
|
||||||
PD::Li::Texture::Filter filter) {
|
|
||||||
GLuint texID;
|
|
||||||
glGenTextures(1, &texID);
|
|
||||||
glBindTexture(GL_TEXTURE_2D, texID);
|
|
||||||
|
|
||||||
// Set base format (Always using RGBA as base)
|
|
||||||
GLenum fmt = GL_RGBA;
|
|
||||||
if (type == PD::Li::Texture::Type::RGB24) {
|
|
||||||
fmt = GL_RGB;
|
|
||||||
} else if (type == PD::Li::Texture::Type::A8) {
|
|
||||||
fmt = GL_ALPHA;
|
|
||||||
}
|
|
||||||
glTexImage2D(GL_TEXTURE_2D, 0, fmt, w, h, 0, fmt, GL_UNSIGNED_BYTE,
|
|
||||||
pixels.data());
|
|
||||||
if (filter == PD::Li::Texture::Filter::LINEAR) {
|
|
||||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
|
|
||||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
|
|
||||||
} else if (filter == PD::Li::Texture::Filter::NEAREST) {
|
|
||||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
|
|
||||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
|
||||||
}
|
|
||||||
glBindTexture(GL_TEXTURE_2D, 0);
|
|
||||||
return texID;
|
|
||||||
}
|
|
||||||
|
|
||||||
void GfxGL3::TexDelete(PD::Li::TexAddress tex) {
|
|
||||||
GLuint tex_ = tex;
|
|
||||||
glDeleteTextures(1, &tex_);
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,178 +0,0 @@
|
|||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd-desktop/bknd-hid.hpp>
|
|
||||||
namespace PD {
|
|
||||||
std::string* HidGLFW::pText = nullptr;
|
|
||||||
GLFWcharfun HidGLFW::pOldTextCB = nullptr;
|
|
||||||
// Default Call back (If no Text input is requsted)
|
|
||||||
void NullTextCB(GLFWwindow* win, unsigned int c) {
|
|
||||||
// Chain
|
|
||||||
if (HidGLFW::pOldTextCB) {
|
|
||||||
HidGLFW::pOldTextCB(win, c);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Text callback if requested
|
|
||||||
void TextCB(GLFWwindow* win, unsigned int c) {
|
|
||||||
// Chain
|
|
||||||
if (HidGLFW::pOldTextCB) {
|
|
||||||
HidGLFW::pOldTextCB(win, c);
|
|
||||||
}
|
|
||||||
if (!HidGLFW::pText) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
*HidGLFW::pText += (char)c;
|
|
||||||
}
|
|
||||||
HidGLFW::HidGLFW(PDDriverData data) : HidDriver("HidGLFW") {
|
|
||||||
if (!data) {
|
|
||||||
std::cout << "[HidGLFW] Error: Data pointer was null" << std::endl;
|
|
||||||
}
|
|
||||||
Window = reinterpret_cast<GLFWwindow*>(data);
|
|
||||||
HidGLFW::pOldTextCB = glfwSetCharCallback(Window, NullTextCB);
|
|
||||||
Flags |= Flags_HasKeyboard;
|
|
||||||
Flags |= Flags_HasMouse;
|
|
||||||
pBinds[GLFW_MOUSE_BUTTON_LEFT] = Touch;
|
|
||||||
/*pBinds[GLFW_KEY_F3] = Kb_3;
|
|
||||||
pBinds[GLFW_KEY_ESCAPE] = Kb_Escape;
|
|
||||||
pBinds[GLFW_KEY_F11] = Kb_F11;
|
|
||||||
pBinds[GLFW_KEY_ESCAPE] = Kb_Escape;
|
|
||||||
pBinds[GLFW_KEY_Q] = Kb_Q;
|
|
||||||
pBinds[GLFW_KEY_W] = Kb_W;
|
|
||||||
pBinds[GLFW_KEY_E] = Kb_E;
|
|
||||||
pBinds[GLFW_KEY_R] = Kb_R;
|
|
||||||
pBinds[GLFW_KEY_T] = Kb_T;
|
|
||||||
pBinds[GLFW_KEY_Z] = Kb_Z;
|
|
||||||
pBinds[GLFW_KEY_U] = Kb_U;
|
|
||||||
pBinds[GLFW_KEY_I] = Kb_I;
|
|
||||||
pBinds[GLFW_KEY_O] = Kb_O;
|
|
||||||
pBinds[GLFW_KEY_P] = Kb_P;
|
|
||||||
pBinds[GLFW_KEY_A] = Kb_A;
|
|
||||||
pBinds[GLFW_KEY_S] = Kb_S;
|
|
||||||
pBinds[GLFW_KEY_D] = Kb_D;
|
|
||||||
pBinds[GLFW_KEY_F] = Kb_F;
|
|
||||||
pBinds[GLFW_KEY_G] = Kb_G;
|
|
||||||
pBinds[GLFW_KEY_H] = Kb_H;
|
|
||||||
pBinds[GLFW_KEY_J] = Kb_J;
|
|
||||||
pBinds[GLFW_KEY_K] = Kb_K;
|
|
||||||
pBinds[GLFW_KEY_L] = Kb_L;
|
|
||||||
pBinds[GLFW_KEY_Y] = Kb_Y;
|
|
||||||
pBinds[GLFW_KEY_X] = Kb_X;
|
|
||||||
pBinds[GLFW_KEY_C] = Kb_C;
|
|
||||||
pBinds[GLFW_KEY_V] = Kb_V;
|
|
||||||
pBinds[GLFW_KEY_B] = Kb_B;
|
|
||||||
pBinds[GLFW_KEY_N] = Kb_N;
|
|
||||||
pBinds[GLFW_KEY_M] = Kb_M;
|
|
||||||
pBinds[GLFW_KEY_LEFT_SHIFT] = Kb_LShift;
|
|
||||||
pBinds[GLFW_KEY_F1] = Kb_F1;
|
|
||||||
pBinds[GLFW_KEY_F2] = Kb_F2;
|
|
||||||
pBinds[GLFW_KEY_F3] = Kb_F3;
|
|
||||||
pBinds[GLFW_KEY_F4] = Kb_F4;
|
|
||||||
pBinds[GLFW_KEY_F5] = Kb_F5;
|
|
||||||
pBinds[GLFW_KEY_F6] = Kb_F6;
|
|
||||||
pBinds[GLFW_KEY_F7] = Kb_F7;
|
|
||||||
pBinds[GLFW_KEY_F8] = Kb_F8;
|
|
||||||
pBinds[GLFW_KEY_F9] = Kb_F9;
|
|
||||||
pBinds[GLFW_KEY_F10] = Kb_F10;
|
|
||||||
pBinds[GLFW_KEY_F11] = Kb_F11;
|
|
||||||
pBinds[GLFW_KEY_F12] = Kb_F12;
|
|
||||||
pBinds[GLFW_KEY_1] = Kb_1;
|
|
||||||
pBinds[GLFW_KEY_2] = Kb_2;
|
|
||||||
pBinds[GLFW_KEY_3] = Kb_3;
|
|
||||||
pBinds[GLFW_KEY_4] = Kb_4;
|
|
||||||
pBinds[GLFW_KEY_5] = Kb_5;
|
|
||||||
pBinds[GLFW_KEY_6] = Kb_6;
|
|
||||||
pBinds[GLFW_KEY_7] = Kb_7;
|
|
||||||
pBinds[GLFW_KEY_8] = Kb_8;
|
|
||||||
pBinds[GLFW_KEY_9] = Kb_9;
|
|
||||||
pBinds[GLFW_KEY_0] = Kb_0;
|
|
||||||
pBinds[GLFW_KEY_BACKSPACE] = Kb_Backspace;
|
|
||||||
pBinds[GLFW_KEY_ENTER] = Kb_Enter;*/
|
|
||||||
}
|
|
||||||
|
|
||||||
void HidGLFW::Update() {
|
|
||||||
// Clear States
|
|
||||||
for (int i = 0; i < 2; i++) {
|
|
||||||
KeyEvents[i][Event_Down] = 0;
|
|
||||||
KeyEvents[i][Event_Held] = 0;
|
|
||||||
KeyEvents[i][Event_Up] = 0;
|
|
||||||
for (auto& it : KbKeyEvents[i]) {
|
|
||||||
it.second = Event_Null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Keyboard Logic
|
|
||||||
/*for (auto& it : pBinds) {
|
|
||||||
int kbstate = glfwGetKey(Window, it.first);
|
|
||||||
if (kbstate == GLFW_PRESS) {
|
|
||||||
if (PrevStates[it.first] == GLFW_RELEASE) {
|
|
||||||
KbKeyEvents[0][it.second] = Event_Down;
|
|
||||||
}
|
|
||||||
KbKeyEvents[0][it.second] = Event_Held;
|
|
||||||
} else if (kbstate == GLFW_RELEASE && PrevStates[it.first] == GLFW_PRESS) {
|
|
||||||
KbKeyEvents[0][it.second] = Event_Up;
|
|
||||||
}
|
|
||||||
PrevStates[it.first] = kbstate;
|
|
||||||
}*/
|
|
||||||
// Mouse Logic (Todo: Support all mouse buttons)
|
|
||||||
int state = glfwGetMouseButton(Window, GLFW_MOUSE_BUTTON_LEFT);
|
|
||||||
if (state == GLFW_PRESS) {
|
|
||||||
if (PrevState == GLFW_RELEASE) {
|
|
||||||
KeyEvents[0][Event_Down] |= Touch;
|
|
||||||
}
|
|
||||||
KeyEvents[0][Event_Held] |= Touch;
|
|
||||||
} else if (state == GLFW_RELEASE && PrevState == GLFW_PRESS) {
|
|
||||||
KeyEvents[0][Event_Up] |= Touch;
|
|
||||||
}
|
|
||||||
|
|
||||||
PrevState = state;
|
|
||||||
if (pLocked) {
|
|
||||||
SwapTab();
|
|
||||||
}
|
|
||||||
double x, y;
|
|
||||||
glfwGetCursorPos(Window, &x, &y);
|
|
||||||
pMouse[1] = pMouse[0]; // Cycle pMouse pos
|
|
||||||
pMouse[0] = fvec2(x, y);
|
|
||||||
/*if (pInTextMode && (PD::OS::GetTime() - pLastUpdate) > 50) {
|
|
||||||
pLastUpdate = PD::OS::GetTime();
|
|
||||||
HandleTextOps();
|
|
||||||
}*/
|
|
||||||
}
|
|
||||||
|
|
||||||
void HidGLFW::GetInputStr(std::string& str) {
|
|
||||||
pText = &str;
|
|
||||||
glfwSetCharCallback(Window, TextCB);
|
|
||||||
pInTextMode = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
void HidGLFW::HandleTextOps() {
|
|
||||||
if (!pText) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
/*if (pTimedHeld(Kb_Backspace)) {
|
|
||||||
if (!pText->empty()) {
|
|
||||||
pText->pop_back();
|
|
||||||
}
|
|
||||||
} else if (pTimedHeld(Kb_Enter)) {
|
|
||||||
*pText += '\n';
|
|
||||||
}*/
|
|
||||||
}
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <palladium>
|
|
||||||
#include <pd-desktop.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
void Init(void* data) {
|
|
||||||
/*if (!data) {
|
|
||||||
std::cout << "[PD-DRIVERS] Error: pd-desktop requires GLFWwindow* "
|
|
||||||
"reference as data "
|
|
||||||
"input!"
|
|
||||||
<< std::endl;
|
|
||||||
abort();
|
|
||||||
}
|
|
||||||
// Dekstop Init Stage
|
|
||||||
// First use default OS Driver
|
|
||||||
PD::OS::Init();
|
|
||||||
PD::Gfx::Init(PD::GfxGL2::New());
|
|
||||||
PD::Hid::Init(PD::HidGLFW::New(reinterpret_cast<GLFWwindow*>(data)));*/
|
|
||||||
}
|
|
||||||
} // namespace PD
|
|
||||||
@@ -11,51 +11,6 @@ set(CMAKE_CXX_STANDARD_REQUIRED TRUE)
|
|||||||
# Enable Compile Command Export
|
# Enable Compile Command Export
|
||||||
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
|
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
|
||||||
|
|
||||||
option(PD_INCLUDE_DIR "")
|
|
||||||
|
|
||||||
### Helper Function to Build Librarys without have always
|
|
||||||
### These includes and definition defines
|
|
||||||
function(pd_add_lib TARGET_NAME)
|
|
||||||
set(opts "BUILD_SHARED")
|
|
||||||
set(one_val_args "")
|
|
||||||
set(multi_val_args SRC_FILES DEPENDS)
|
|
||||||
cmake_parse_arguments(ARG "${opts}" "${one_val_args}" "${multi_val_args}" ${ARGN})
|
|
||||||
|
|
||||||
string(REPLACE "-" "_" FLAG_NAME_T ${TARGET_NAME})
|
|
||||||
string(TOUPPER ${FLAG_NAME_T} FLAG_NAME_F)
|
|
||||||
|
|
||||||
if(ARG_BUILD_SHARED)
|
|
||||||
add_library(${TARGET_NAME} SHARED ${ARG_SRC_FILES})
|
|
||||||
target_compile_definitions(${TARGET_NAME} PUBLIC -D${FLAG_NAME_F}_BUILD_SHARED=1)
|
|
||||||
message("Building SHARED library: ${FLAG_NAME_F}_BUILD_SHARED=1")
|
|
||||||
else()
|
|
||||||
add_library(${TARGET_NAME} STATIC ${ARG_SRC_FILES})
|
|
||||||
target_compile_definitions(${TARGET_NAME} PUBLIC -D${FLAG_NAME_F}_BUILD_SHARED=0)
|
|
||||||
message("Building STATIC library: ${FLAG_NAME_F}_BUILD_SHARED=0")
|
|
||||||
endif()
|
|
||||||
target_include_directories(${TARGET_NAME} PUBLIC
|
|
||||||
${PD_INCLUDE_DIR}
|
|
||||||
${DEVKITPRO}/portlibs/3ds/include
|
|
||||||
)
|
|
||||||
target_compile_definitions(${TARGET_NAME} PRIVATE
|
|
||||||
-D_GNU_SOURCE=1
|
|
||||||
-DPALLADIUM_VERSION="${PROJECT_VERSION}"
|
|
||||||
-DPALLADIUM_GIT_COMMIT="${GIT_SHORT_HASH}"
|
|
||||||
-DPALLADIUM_GIT_BRANCH="${GIT_BRANCH}"
|
|
||||||
-DBUILD_CTR=1
|
|
||||||
)
|
|
||||||
if(${CMAKE_SYSTEM_NAME} STREQUAL "Nintendo3DS")
|
|
||||||
target_compile_options(${TARGET_NAME} PRIVATE
|
|
||||||
-Wno-abi
|
|
||||||
)
|
|
||||||
endif()
|
|
||||||
### For the libs that depend on another
|
|
||||||
if(ARG_DEPENDS)
|
|
||||||
target_link_libraries(${TARGET_NAME} PUBLIC ${ARG_DEPENDS})
|
|
||||||
endif()
|
|
||||||
install(TARGETS ${TARGET_NAME})
|
|
||||||
endfunction()
|
|
||||||
|
|
||||||
### GIT HELPER ###
|
### GIT HELPER ###
|
||||||
|
|
||||||
function(pd_git_get_hash ret)
|
function(pd_git_get_hash ret)
|
||||||
|
|||||||
@@ -24,8 +24,4 @@ SOFTWARE.
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <pd/core/core.hpp>
|
#include <pd/core/core.hpp>
|
||||||
#include <pd/drivers/drivers.hpp>
|
#include <pd/drivers/drivers.hpp>
|
||||||
#include <pd/external/json.hpp>
|
|
||||||
#include <pd/image/image.hpp>
|
|
||||||
#include <pd/lithium/lithium.hpp>
|
|
||||||
#include <pd/ui7/ui7.hpp>
|
|
||||||
87
include/pd/ui7/viewport.hpp → include/pd/common.hpp
Executable file → Normal file
87
include/pd/ui7/viewport.hpp → include/pd/common.hpp
Executable file → Normal file
@@ -1,45 +1,44 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
/*
|
/*
|
||||||
MIT License
|
MIT License
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
in the Software without restriction, including without limitation the rights
|
in the Software without restriction, including without limitation the rights
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
furnished to do so, subject to the following conditions:
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
The above copyright notice and this permission notice shall be included in all
|
||||||
copies or substantial portions of the Software.
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
SOFTWARE.
|
SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <pd/core/core.hpp>
|
#include <chrono>
|
||||||
#include <pd/ui7/id.hpp>
|
#include <cmath>
|
||||||
|
#include <exception>
|
||||||
namespace PD {
|
#include <format>
|
||||||
namespace UI7 {
|
#include <fstream>
|
||||||
class ViewPort {
|
#include <pd/pd_p_api.hpp>
|
||||||
public:
|
#include <string>
|
||||||
ViewPort(const ID& id, const ivec4& size) : pID(id), pSize(size) {}
|
#include <vector>
|
||||||
~ViewPort() {}
|
|
||||||
|
namespace PD {
|
||||||
PD_SHARED(ViewPort);
|
[[noreturn]] inline void Throw(const std::string& msg) {
|
||||||
|
throw std::runtime_error(msg);
|
||||||
ID GetID() const { return pID; }
|
}
|
||||||
ivec4& GetSize() { return pSize; }
|
using u8 = unsigned char;
|
||||||
|
using u16 = unsigned short;
|
||||||
ID pID;
|
using u32 = unsigned int;
|
||||||
ivec4 pSize;
|
using u64 = unsigned long long;
|
||||||
};
|
using ptr = uintptr_t;
|
||||||
} // namespace UI7
|
|
||||||
} // namespace PD
|
} // namespace PD
|
||||||
87
include/pd/core/bit_util.hpp → include/pd/core/bits.hpp
Executable file → Normal file
87
include/pd/core/bit_util.hpp → include/pd/core/bits.hpp
Executable file → Normal file
@@ -1,46 +1,43 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
/*
|
/*
|
||||||
MIT License
|
MIT License
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
in the Software without restriction, including without limitation the rights
|
in the Software without restriction, including without limitation the rights
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
furnished to do so, subject to the following conditions:
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
The above copyright notice and this permission notice shall be included in all
|
||||||
copies or substantial portions of the Software.
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
SOFTWARE.
|
SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <pd/core/common.hpp>
|
#include <pd/common.hpp>
|
||||||
|
|
||||||
namespace PD {
|
namespace PD {
|
||||||
/**
|
namespace Bits {
|
||||||
* Binary Utillity Functions
|
/**
|
||||||
*/
|
* Check if a 32 Bit number only set a sigle bit to 1
|
||||||
namespace BitUtil {
|
* @param v 32 bit unsigned int
|
||||||
/**
|
* @return true if its a single bit number
|
||||||
* Check if a 32 Bit number only set a sigle bit to 1
|
*/
|
||||||
* @param v 32 bit unsigned int
|
PD_API bool IsSingleBit(u32 v);
|
||||||
* @return true if its a single bit number
|
/**
|
||||||
*/
|
* Get the Next Power of two Number
|
||||||
PD_API bool IsSingleBit(u32 v);
|
* @param v Current Number
|
||||||
/**
|
* @return Next Number thats a Pow of 2
|
||||||
* Get the Next Power of two Number
|
*/
|
||||||
* @param v Current Number
|
PD_API u32 GetPow2(u32 v);
|
||||||
* @return Next Number thats a Pow of 2
|
} // namespace Bits
|
||||||
*/
|
|
||||||
PD_API u32 GetPow2(u32 v);
|
|
||||||
} // namespace BitUtil
|
|
||||||
} // namespace PD
|
} // namespace PD
|
||||||
@@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|||||||
SOFTWARE.
|
SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <pd/core/common.hpp>
|
#include <pd/common.hpp>
|
||||||
#include <pd/core/strings.hpp>
|
#include <pd/core/strings.hpp>
|
||||||
|
|
||||||
namespace PD {
|
namespace PD {
|
||||||
@@ -140,6 +140,11 @@ class PD_API Color {
|
|||||||
*/
|
*/
|
||||||
constexpr operator u32() const { return Get(); }
|
constexpr operator u32() const { return Get(); }
|
||||||
|
|
||||||
|
const float rf() const { return static_cast<float>(r) / 255.f; }
|
||||||
|
const float gf() const { return static_cast<float>(g) / 255.f; }
|
||||||
|
const float bf() const { return static_cast<float>(b) / 255.f; }
|
||||||
|
const float af() const { return static_cast<float>(a) / 255.f; }
|
||||||
|
|
||||||
/** Public Access Data section */
|
/** Public Access Data section */
|
||||||
u8 r;
|
u8 r;
|
||||||
u8 g;
|
u8 g;
|
||||||
|
|||||||
@@ -1,89 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <array>
|
|
||||||
#include <chrono>
|
|
||||||
#include <cinttypes>
|
|
||||||
#include <cmath>
|
|
||||||
#include <filesystem> // Requires C++ 17 or later
|
|
||||||
#include <format> // Requires C++ 20 or later
|
|
||||||
#include <fstream>
|
|
||||||
#include <functional>
|
|
||||||
#include <iostream>
|
|
||||||
#include <list>
|
|
||||||
#include <map>
|
|
||||||
#include <memory>
|
|
||||||
#include <numbers>
|
|
||||||
#include <sstream>
|
|
||||||
#include <stack>
|
|
||||||
#include <string>
|
|
||||||
#include <vector>
|
|
||||||
|
|
||||||
/** Dynamic Lib loading */
|
|
||||||
#include <pd/pd_p_api.hpp>
|
|
||||||
|
|
||||||
/** Memory Management */
|
|
||||||
|
|
||||||
#define PD_SHARED(x) \
|
|
||||||
using Ref = std::shared_ptr<x>; \
|
|
||||||
template <typename... Args> \
|
|
||||||
static Ref New(Args&&... args) { \
|
|
||||||
return std::make_shared<x>(std::forward<Args>(args)...); \
|
|
||||||
}
|
|
||||||
|
|
||||||
#define PD_RAW(x) \
|
|
||||||
using Ref = x*; \
|
|
||||||
template <typename... Args> \
|
|
||||||
static Ref New(Args&&... args) { \
|
|
||||||
x* v = new x; \
|
|
||||||
new (v) x(std::forward<Args>(args)...); \
|
|
||||||
return v; \
|
|
||||||
} \
|
|
||||||
static void Delete(Ref ref) { delete ref; }
|
|
||||||
|
|
||||||
#define PD_UNIQUE(x) \
|
|
||||||
using Ref = std::unique_ptr<x>; \
|
|
||||||
template <typename... Args> \
|
|
||||||
static Ref New(Args&&... args) { \
|
|
||||||
return std::make_unique<x>(std::forward<Args>(args)...); \
|
|
||||||
}
|
|
||||||
|
|
||||||
#define PD_BIT(x) (1 << x)
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
[[noreturn]] inline void Throw(const std::string& str) {
|
|
||||||
#ifdef _EXCEPTIONS
|
|
||||||
throw std::runtime_error("PD Error " + str);
|
|
||||||
#else
|
|
||||||
std::cout << "PD Error " << str << std::endl;
|
|
||||||
std::abort();
|
|
||||||
#endif
|
|
||||||
}
|
|
||||||
/** Types */
|
|
||||||
using u8 = unsigned char;
|
|
||||||
using u16 = unsigned short;
|
|
||||||
using u32 = unsigned int;
|
|
||||||
using u64 = unsigned long long;
|
|
||||||
} // namespace PD
|
|
||||||
@@ -23,9 +23,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|||||||
SOFTWARE.
|
SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <pd/core/bit_util.hpp>
|
#include <pd/core/bits.hpp>
|
||||||
#include <pd/core/color.hpp>
|
#include <pd/core/color.hpp>
|
||||||
#include <pd/core/fnv.hpp>
|
#include <pd/core/fnv.hpp>
|
||||||
|
#include <pd/core/formatters.hpp>
|
||||||
|
#include <pd/core/fquat.hpp>
|
||||||
#include <pd/core/hashid.hpp>
|
#include <pd/core/hashid.hpp>
|
||||||
#include <pd/core/io.hpp>
|
#include <pd/core/io.hpp>
|
||||||
#include <pd/core/mat.hpp>
|
#include <pd/core/mat.hpp>
|
||||||
@@ -35,4 +37,4 @@ SOFTWARE.
|
|||||||
#include <pd/core/timetrace.hpp>
|
#include <pd/core/timetrace.hpp>
|
||||||
#include <pd/core/tween.hpp>
|
#include <pd/core/tween.hpp>
|
||||||
#include <pd/core/u128.hpp>
|
#include <pd/core/u128.hpp>
|
||||||
#include <pd/core/vec.hpp>
|
#include <pd/core/vec.hpp>
|
||||||
@@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|||||||
SOFTWARE.
|
SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <pd/core/common.hpp>
|
#include <pd/common.hpp>
|
||||||
|
|
||||||
namespace PD {
|
namespace PD {
|
||||||
/**
|
/**
|
||||||
|
|||||||
98
include/pd/core/formatters.hpp
Normal file
98
include/pd/core/formatters.hpp
Normal file
@@ -0,0 +1,98 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
/*
|
||||||
|
MIT License
|
||||||
|
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
||||||
|
|
||||||
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
|
in the Software without restriction, including without limitation the rights
|
||||||
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
|
The above copyright notice and this permission notice shall be included in all
|
||||||
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
|
SOFTWARE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#include <pd/core/color.hpp>
|
||||||
|
|
||||||
|
template <>
|
||||||
|
struct std::formatter<PD::Color> : std::formatter<std::string> {
|
||||||
|
enum class ColorFmt {
|
||||||
|
Hex,
|
||||||
|
Rgbf,
|
||||||
|
Rgb,
|
||||||
|
Rgba,
|
||||||
|
Rgbaf,
|
||||||
|
};
|
||||||
|
ColorFmt mode = ColorFmt::Hex;
|
||||||
|
constexpr auto parse(std::format_parse_context& ctx) {
|
||||||
|
auto it = ctx.begin();
|
||||||
|
auto end = ctx.end();
|
||||||
|
|
||||||
|
if (it == end || *it == '}') return it;
|
||||||
|
|
||||||
|
if (check(it, end, 5, "rgbaf")) {
|
||||||
|
mode = ColorFmt::Rgbaf;
|
||||||
|
it += 5;
|
||||||
|
} else if (check(it, end, 4, "rgba")) {
|
||||||
|
mode = ColorFmt::Rgba;
|
||||||
|
it += 4;
|
||||||
|
} else if (check(it, end, 4, "rgbf")) {
|
||||||
|
mode = ColorFmt::Rgbf;
|
||||||
|
it += 4;
|
||||||
|
} else if (check(it, end, 3, "rgb")) {
|
||||||
|
mode = ColorFmt::Rgb;
|
||||||
|
it += 3;
|
||||||
|
} else if (check(it, end, 3, "hex")) {
|
||||||
|
mode = ColorFmt::Hex;
|
||||||
|
it += 3;
|
||||||
|
} else {
|
||||||
|
throw std::format_error("invalid format for PD::Color");
|
||||||
|
}
|
||||||
|
|
||||||
|
if (it == end || *it != '}')
|
||||||
|
throw std::format_error("invalid format for PD::Color");
|
||||||
|
|
||||||
|
return it;
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename FormatContext>
|
||||||
|
auto format(const PD::Color& value, FormatContext& ctx) const {
|
||||||
|
switch (mode) {
|
||||||
|
case ColorFmt::Hex:
|
||||||
|
return std::format_to(ctx.out(), "#{:02X}{:02X}{:02X}{:02X}", value.r,
|
||||||
|
value.g, value.b, value.a);
|
||||||
|
case ColorFmt::Rgb:
|
||||||
|
return std::format_to(ctx.out(), "{}, {}, {}", value.r, value.g,
|
||||||
|
value.b);
|
||||||
|
case ColorFmt::Rgba:
|
||||||
|
return std::format_to(ctx.out(), "{}, {}, {}, {}", value.r, value.g,
|
||||||
|
value.b, value.a);
|
||||||
|
case ColorFmt::Rgbf:
|
||||||
|
return std::format_to(ctx.out(), "{}, {}, {}", value.rf(), value.gf(),
|
||||||
|
value.bf());
|
||||||
|
case ColorFmt::Rgbaf:
|
||||||
|
return std::format_to(ctx.out(), "{}, {}, {}, {}", value.rf(),
|
||||||
|
value.gf(), value.bf(), value.af());
|
||||||
|
default:
|
||||||
|
return ctx.out();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
constexpr bool check(std::format_parse_context::const_iterator it,
|
||||||
|
std::format_parse_context::const_iterator end,
|
||||||
|
size_t len, const char* what) {
|
||||||
|
return (end - it >= static_cast<std::ptrdiff_t>(len) &&
|
||||||
|
std::string_view(it, len) == what);
|
||||||
|
}
|
||||||
|
};
|
||||||
@@ -25,7 +25,7 @@ SOFTWARE.
|
|||||||
|
|
||||||
// This file is based on fvec4
|
// This file is based on fvec4
|
||||||
|
|
||||||
#include <pd/core/common.hpp>
|
#include <pd/common.hpp>
|
||||||
#include <pd/core/vec4.hpp>
|
#include <pd/core/vec4.hpp>
|
||||||
|
|
||||||
namespace PD {
|
namespace PD {
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|||||||
SOFTWARE.
|
SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <pd/core/common.hpp>
|
#include <pd/common.hpp>
|
||||||
|
|
||||||
namespace PD {
|
namespace PD {
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|||||||
SOFTWARE.
|
SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <pd/core/common.hpp>
|
#include <pd/common.hpp>
|
||||||
#include <pd/core/vec3.hpp>
|
#include <pd/core/vec3.hpp>
|
||||||
|
|
||||||
namespace PD {
|
namespace PD {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <pd/core/common.hpp>
|
#include <pd/common.hpp>
|
||||||
|
|
||||||
namespace PD {
|
namespace PD {
|
||||||
template <typename T, typename Alloc = std::allocator<T>>
|
template <typename T, typename Alloc = std::allocator<T>>
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|||||||
SOFTWARE.
|
SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <pd/core/common.hpp>
|
#include <pd/common.hpp>
|
||||||
|
|
||||||
namespace PD {
|
namespace PD {
|
||||||
/**
|
/**
|
||||||
@@ -92,9 +92,7 @@ PD_API const std::string PathRemoveExtension(const std::string& path);
|
|||||||
*/
|
*/
|
||||||
template <typename T>
|
template <typename T>
|
||||||
inline const std::string ToHex(const T& v) {
|
inline const std::string ToHex(const T& v) {
|
||||||
std::stringstream s;
|
return std::format("{0:0{1}X}", v, sizeof(v) * 2);
|
||||||
s << "0x" << std::setfill('0') << std::setw(sizeof(v) * 2) << std::hex << v;
|
|
||||||
return s.str();
|
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* Generate a Hash out of a string
|
* Generate a Hash out of a string
|
||||||
@@ -107,24 +105,22 @@ PD_API u32 FastHash(const std::string& s);
|
|||||||
* Based on their Macros
|
* Based on their Macros
|
||||||
* @return CompilerName: Version
|
* @return CompilerName: Version
|
||||||
*/
|
*/
|
||||||
inline const std::string GetCompilerVersion() {
|
inline const char* GetCompilerVersion() {
|
||||||
/// As the function looks like this Project is meant to
|
/// As the function looks like this Project is meant to
|
||||||
/// Be ported to other systems as well
|
/// Be ported to other systems as well
|
||||||
std::stringstream res;
|
#define __mks(x) #x
|
||||||
|
#define mkstring(x) __mks(x)
|
||||||
#ifdef __clang__ // Check clang first
|
#ifdef __clang__ // Check clang first
|
||||||
res << "Clang: " << __clang_major__ << ".";
|
return "Clang: " mkstring(__clang_major__) "." mkstring(
|
||||||
res << __clang_minor__ << ".";
|
__clang_minor__) "." mkstring(__clang_patchlevel__);
|
||||||
res << __clang_patchlevel__;
|
|
||||||
#elif __GNUC__
|
#elif __GNUC__
|
||||||
res << "GCC: " << __GNUC__;
|
return "GCC: " mkstring(__GNUC__) "." mkstring(__GNUC_MINOR__) "." mkstring(
|
||||||
res << "." << __GNUC_MINOR__ << ".";
|
__GNUC_PATCHLEVEL__);
|
||||||
res << __GNUC_PATCHLEVEL__;
|
|
||||||
#elif _MSC_VER
|
#elif _MSC_VER
|
||||||
res << "MSVC: " << _MSC_VER;
|
return "MSVC; " mkstring(_MSC_VER);
|
||||||
#else
|
#else
|
||||||
res << "Unknown Compiler";
|
return "Unknown Compiler";
|
||||||
#endif
|
#endif
|
||||||
return res.str();
|
|
||||||
}
|
}
|
||||||
} // namespace Strings
|
} // namespace Strings
|
||||||
class U8Iterator {
|
class U8Iterator {
|
||||||
|
|||||||
@@ -23,10 +23,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|||||||
SOFTWARE.
|
SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <pd/core/common.hpp>
|
#include <pd/common.hpp>
|
||||||
|
|
||||||
namespace PD {
|
namespace PD {
|
||||||
class OsDriver;
|
|
||||||
/**
|
/**
|
||||||
* Timer class
|
* Timer class
|
||||||
*/
|
*/
|
||||||
@@ -36,14 +35,12 @@ class PD_API Timer {
|
|||||||
* Constructor
|
* Constructor
|
||||||
* @param auto_start [default true] sets if timer should start after creation
|
* @param auto_start [default true] sets if timer should start after creation
|
||||||
*/
|
*/
|
||||||
Timer(OsDriver& os, bool auto_start = true);
|
Timer(bool auto_start = true);
|
||||||
/**
|
/**
|
||||||
* Unused Deconstructor
|
* Unused Deconstructor
|
||||||
*/
|
*/
|
||||||
~Timer() {}
|
~Timer() {}
|
||||||
|
|
||||||
PD_SHARED(Timer);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Resume Timer if Paused
|
* Resume Timer if Paused
|
||||||
*/
|
*/
|
||||||
@@ -82,7 +79,5 @@ class PD_API Timer {
|
|||||||
u64 pNow;
|
u64 pNow;
|
||||||
/** Is Running */
|
/** Is Running */
|
||||||
bool pIsRunning = false;
|
bool pIsRunning = false;
|
||||||
/** Os Driver reference */
|
|
||||||
OsDriver& pOs;
|
|
||||||
};
|
};
|
||||||
} // namespace PD
|
} // namespace PD
|
||||||
@@ -23,10 +23,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|||||||
SOFTWARE.
|
SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <pd/core/common.hpp>
|
#include <pd/common.hpp>
|
||||||
|
|
||||||
namespace PD {
|
namespace PD {
|
||||||
class OsDriver;
|
|
||||||
/**
|
/**
|
||||||
* Class to calculate Maximum/Minimum and Average Timings
|
* Class to calculate Maximum/Minimum and Average Timings
|
||||||
*/
|
*/
|
||||||
@@ -39,8 +38,6 @@ class TimeStats {
|
|||||||
TimeStats(int l) : len(l), val(l, 0) {}
|
TimeStats(int l) : len(l), val(l, 0) {}
|
||||||
~TimeStats() = default;
|
~TimeStats() = default;
|
||||||
|
|
||||||
PD_SHARED(TimeStats);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add a New Value to the list
|
* Add a New Value to the list
|
||||||
* @param v value to add
|
* @param v value to add
|
||||||
@@ -152,11 +149,9 @@ namespace TT {
|
|||||||
class Res {
|
class Res {
|
||||||
public:
|
public:
|
||||||
/** Constructore that Inits a protocol at size of 60 frames */
|
/** Constructore that Inits a protocol at size of 60 frames */
|
||||||
Res() : start(0), end(0) { protocol = TimeStats::New(60); }
|
Res() : start(0), end(0), protocol(60) {}
|
||||||
~Res() = default;
|
~Res() = default;
|
||||||
|
|
||||||
PD_SHARED(Res);
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Setter for the ID (Name)
|
* Setter for the ID (Name)
|
||||||
* @param v ID of the Trace
|
* @param v ID of the Trace
|
||||||
@@ -184,7 +179,7 @@ class Res {
|
|||||||
void SetEnd(u64 v) {
|
void SetEnd(u64 v) {
|
||||||
end = v;
|
end = v;
|
||||||
diff = end - start;
|
diff = end - start;
|
||||||
protocol->Add(GetLastDiff());
|
protocol.Add(GetLastDiff());
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* Getter for the End Time
|
* Getter for the End Time
|
||||||
@@ -201,7 +196,7 @@ class Res {
|
|||||||
* Get Protcol Reference
|
* Get Protcol Reference
|
||||||
* @return Protocol Ref
|
* @return Protocol Ref
|
||||||
*/
|
*/
|
||||||
TimeStats::Ref GetProtocol() { return protocol; }
|
TimeStats& GetProtocol() { return protocol; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
/** Trace ID */
|
/** Trace ID */
|
||||||
@@ -213,18 +208,18 @@ class Res {
|
|||||||
/** Last Diff */
|
/** Last Diff */
|
||||||
u64 diff;
|
u64 diff;
|
||||||
/** Protocol */
|
/** Protocol */
|
||||||
TimeStats::Ref protocol;
|
TimeStats protocol;
|
||||||
};
|
};
|
||||||
/**
|
/**
|
||||||
* Begin a Trace
|
* Begin a Trace
|
||||||
* @param id Name of the Trace
|
* @param id Name of the Trace
|
||||||
*/
|
*/
|
||||||
PD_API void Beg(OsDriver& os, const std::string& id);
|
PD_API void Beg(const std::string& id);
|
||||||
/**
|
/**
|
||||||
* End a Trace
|
* End a Trace
|
||||||
* @param id Name of the Trace
|
* @param id Name of the Trace
|
||||||
*/
|
*/
|
||||||
PD_API void End(OsDriver& os, const std::string& id);
|
PD_API void End(const std::string& id);
|
||||||
/**
|
/**
|
||||||
* Collect Start end end of the trace by tracking
|
* Collect Start end end of the trace by tracking
|
||||||
* when the Scope object goes out of scope
|
* when the Scope object goes out of scope
|
||||||
@@ -246,20 +241,18 @@ class Scope {
|
|||||||
* Constructor requiring a Name for the Trace
|
* Constructor requiring a Name for the Trace
|
||||||
* @param id Name of the Trace
|
* @param id Name of the Trace
|
||||||
*/
|
*/
|
||||||
Scope(OsDriver& os, const std::string& id) : pOs(os) {
|
Scope(const std::string& id) {
|
||||||
this->ID = id;
|
this->ID = id;
|
||||||
Beg(pOs, id);
|
Beg(id);
|
||||||
}
|
}
|
||||||
/**
|
/**
|
||||||
* Deconstructor getting the end time when going out of scope
|
* Deconstructor getting the end time when going out of scope
|
||||||
*/
|
*/
|
||||||
~Scope() { End(pOs, ID); }
|
~Scope() { End(ID); }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
/** Trace Name/ID */
|
/** Trace Name/ID */
|
||||||
std::string ID;
|
std::string ID;
|
||||||
/** Os Driver Reference */
|
|
||||||
OsDriver& pOs;
|
|
||||||
};
|
};
|
||||||
} // namespace TT
|
} // namespace TT
|
||||||
} // namespace PD
|
} // namespace PD
|
||||||
@@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|||||||
SOFTWARE.
|
SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <pd/core/common.hpp>
|
#include <pd/common.hpp>
|
||||||
|
|
||||||
#ifndef M_PI
|
#ifndef M_PI
|
||||||
#define M_PI 3.14159265358979323846
|
#define M_PI 3.14159265358979323846
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <pd/core/common.hpp>
|
#include <pd/common.hpp>
|
||||||
|
|
||||||
namespace PD {
|
namespace PD {
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|||||||
SOFTWARE.
|
SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <pd/core/common.hpp>
|
#include <pd/common.hpp>
|
||||||
#include <pd/core/vec2.hpp>
|
#include <pd/core/vec2.hpp>
|
||||||
#include <pd/core/vec3.hpp>
|
#include <pd/core/vec3.hpp>
|
||||||
#include <pd/core/vec4.hpp>
|
#include <pd/core/vec4.hpp>
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ SOFTWARE.
|
|||||||
|
|
||||||
// This file is generated by lazyvec 2.0.0
|
// This file is generated by lazyvec 2.0.0
|
||||||
|
|
||||||
#include <pd/core/common.hpp>
|
#include <pd/common.hpp>
|
||||||
|
|
||||||
namespace PD {
|
namespace PD {
|
||||||
template <typename T>
|
template <typename T>
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ SOFTWARE.
|
|||||||
|
|
||||||
// This file is generated by lazyvec 2.0.0
|
// This file is generated by lazyvec 2.0.0
|
||||||
|
|
||||||
#include <pd/core/common.hpp>
|
#include <pd/common.hpp>
|
||||||
// Extended includes (rename if you use other filenames/paths)
|
// Extended includes (rename if you use other filenames/paths)
|
||||||
#include <pd/core/vec2.hpp>
|
#include <pd/core/vec2.hpp>
|
||||||
|
|
||||||
|
|||||||
@@ -25,7 +25,7 @@ SOFTWARE.
|
|||||||
|
|
||||||
// This file is generated by lazyvec 2.0.0
|
// This file is generated by lazyvec 2.0.0
|
||||||
|
|
||||||
#include <pd/core/common.hpp>
|
#include <pd/common.hpp>
|
||||||
// Extended includes (rename if you use other filenames/paths)
|
// Extended includes (rename if you use other filenames/paths)
|
||||||
#include <pd/core/vec2.hpp>
|
#include <pd/core/vec2.hpp>
|
||||||
#include <pd/core/vec3.hpp>
|
#include <pd/core/vec3.hpp>
|
||||||
|
|||||||
@@ -1,79 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/core/core.hpp>
|
|
||||||
#include <pd/drivers/gfx.hpp>
|
|
||||||
#include <pd/drivers/hid.hpp>
|
|
||||||
#include <pd/drivers/os.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
class PD_API Context {
|
|
||||||
public:
|
|
||||||
Context()
|
|
||||||
: pOs(OsDriver::New()), pGfx(GfxDriver::New()), pHid(HidDriver::New()) {}
|
|
||||||
~Context() {}
|
|
||||||
|
|
||||||
PD_RAW(Context);
|
|
||||||
|
|
||||||
static Context::Ref Create();
|
|
||||||
|
|
||||||
template <typename Driver>
|
|
||||||
void UseGfxDriver(PDDriverData data) {
|
|
||||||
static_assert(std::is_base_of<GfxDriver, Driver>::value,
|
|
||||||
"Driver must extend GfxDriver");
|
|
||||||
pGfx.reset();
|
|
||||||
pGfx = Driver::New(data);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename Driver>
|
|
||||||
void UseHidDriver(PDDriverData data) {
|
|
||||||
static_assert(std::is_base_of<HidDriver, Driver>::value,
|
|
||||||
"Driver must extend HidDriver");
|
|
||||||
pHid.reset();
|
|
||||||
pHid = Driver::New(data);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename Driver>
|
|
||||||
void UseOsDriver(PDDriverData data) {
|
|
||||||
static_assert(std::is_base_of<OsDriver, Driver>::value,
|
|
||||||
"Driver must extend OsDriver");
|
|
||||||
pOs.reset();
|
|
||||||
pOs = Driver::New(data);
|
|
||||||
}
|
|
||||||
|
|
||||||
PD::Li::Texture::Ref GetSolidTex();
|
|
||||||
|
|
||||||
OsDriver::Ref Os() { return pOs; }
|
|
||||||
GfxDriver::Ref Gfx() { return pGfx; }
|
|
||||||
HidDriver::Ref Hid() { return pHid; }
|
|
||||||
|
|
||||||
private:
|
|
||||||
OsDriver::Ref pOs = nullptr;
|
|
||||||
GfxDriver::Ref pGfx = nullptr;
|
|
||||||
HidDriver::Ref pHid = nullptr;
|
|
||||||
|
|
||||||
PD::Li::Texture::Ref pSolidTex = nullptr;
|
|
||||||
};
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,29 +1,3 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
/*
|
#include <pd/drivers/os.hpp>
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/drivers/context.hpp>
|
|
||||||
#include <pd/drivers/gfx.hpp>
|
|
||||||
#include <pd/drivers/hid.hpp>
|
|
||||||
#include <pd/drivers/os.hpp>
|
|
||||||
@@ -1,119 +1,82 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
/*
|
#include <pd/core/mat.hpp>
|
||||||
MIT License
|
#include <pd/drivers/interface.hpp>
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/core/core.hpp>
|
|
||||||
#include <pd/drivers/types.hpp>
|
|
||||||
#include <pd/lithium/command.hpp>
|
#include <pd/lithium/command.hpp>
|
||||||
#include <pd/lithium/texture.hpp>
|
|
||||||
|
|
||||||
using LiBackendFlags = PD::u32;
|
using LiBackendFlags = PD::u32;
|
||||||
enum LiBackendFlags_ {
|
enum LiBackendFlags_ {
|
||||||
LiBackendFlags_None = 0,
|
LiBackendFlags_None = 0,
|
||||||
LiBackendFlags_FlipUV_Y = PD_BIT(0), // Essential for font loading
|
LiBackendFlags_FlipUV_Y = 1 << 0, // Essential for font loading
|
||||||
};
|
};
|
||||||
|
|
||||||
namespace PD {
|
namespace PD {
|
||||||
// The backend api nobody asked for
|
using TextureID = ptr;
|
||||||
class GfxDriver2 {
|
enum class TextureFilter {
|
||||||
public:
|
Linear,
|
||||||
GfxDriver2(const std::string& name = "NullGfx") : pName(name) {};
|
Nearest,
|
||||||
~GfxDriver2() = default;
|
|
||||||
|
|
||||||
virtual void Init() {}
|
|
||||||
virtual void Deinit() {}
|
|
||||||
virtual void Draw(const PD::Li::CmdPool& pool) {}
|
|
||||||
virtual void TexBind(PD::Li::TexAddress addr) {}
|
|
||||||
virtual PD::Li::TexAddress TexLoad(
|
|
||||||
const std::vector<PD::u8>& pixels, int w, int h,
|
|
||||||
PD::Li::Texture::Type type = PD::Li::Texture::Type::RGBA32,
|
|
||||||
PD::Li::Texture::Filter filter = PD::Li::Texture::Filter::LINEAR) {
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
virtual void TexDelete(PD::Li::TexAddress tex) {}
|
|
||||||
|
|
||||||
protected:
|
|
||||||
const std::string pName;
|
|
||||||
LiBackendFlags pFlags = 0;
|
|
||||||
size_t CurrentIndex = 0;
|
|
||||||
size_t CurrentVertex = 0;
|
|
||||||
ivec2 ViewPort;
|
|
||||||
};
|
};
|
||||||
class GfxDriver {
|
|
||||||
|
enum class TextureFormat {
|
||||||
|
RGBA32,
|
||||||
|
A8,
|
||||||
|
};
|
||||||
|
|
||||||
|
class PD_API GfxDriver : public DriverInterface {
|
||||||
public:
|
public:
|
||||||
GfxDriver(const std::string& name = "NullGfx") : pName(name) {}
|
GfxDriver(std::string_view name = "Default") : DriverInterface(name) {}
|
||||||
GfxDriver(PDDriverData data) : pName("NullGfx") {}
|
virtual ~GfxDriver() {}
|
||||||
~GfxDriver() = default;
|
|
||||||
|
|
||||||
PD_SHARED(GfxDriver);
|
|
||||||
|
|
||||||
void PostInit();
|
|
||||||
|
|
||||||
virtual void Init() {}
|
virtual void Init() {}
|
||||||
virtual void Deinit() {}
|
virtual void Deinit() {}
|
||||||
virtual void NewFrame() {}
|
virtual void Submit() {}
|
||||||
|
virtual void BindTexture(TextureID id) {}
|
||||||
virtual void BindTex(Li::TexAddress addr) {}
|
virtual void Reset() {}
|
||||||
|
virtual TextureID LoadTexture(const std::vector<PD::u8>& pixels, int w, int h,
|
||||||
virtual void RenderDrawData(const Li::CmdPool& Commands) {}
|
TextureFormat type = TextureFormat::RGBA32,
|
||||||
|
TextureFilter filter = TextureFilter::Linear) {}
|
||||||
void SetViewPort(const ivec2& vp) { ViewPort = vp; }
|
virtual void DeleteTexture(const TextureID& tex) {}
|
||||||
void SetViewPort(int w, int h) { ViewPort = PD::ivec2(w, h); }
|
void Draw(const std::vector<Li::Command>& commands) {
|
||||||
|
CountCommands += commands.size();
|
||||||
virtual Li::Texture::Ref LoadTex(
|
// Bind shader
|
||||||
const std::vector<u8>& pixels, int w, int h,
|
Projection = Mat4::Ortho(0.f, ViewPort.x, ViewPort.y, 0.f, 1.f, -1.f);
|
||||||
Li::Texture::Type type = Li::Texture::Type::RGBA32,
|
// Shader Set Mtx
|
||||||
Li::Texture::Filter filter = Li::Texture::Filter::LINEAR) {
|
size_t index = 0;
|
||||||
// Texture loading not supported (when this func not get override)
|
while (index < commands.size()) {
|
||||||
return nullptr;
|
CurrentTex = commands[index].Tex;
|
||||||
|
if (!CurrentTex) {
|
||||||
|
index++;
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
virtual void DestroyTex(PD::Li::Texture::Ref tex) {}
|
private:
|
||||||
|
|
||||||
Li::Texture::Ref GetSolidTex() { return pSolid; }
|
|
||||||
|
|
||||||
const std::string& GetName() const { return pName; }
|
|
||||||
|
|
||||||
const std::string pName = "NullGfx";
|
|
||||||
LiBackendFlags Flags = 0;
|
|
||||||
ivec2 ViewPort;
|
|
||||||
Mat4 Projection;
|
|
||||||
Li::Texture::Ref pSolid;
|
|
||||||
size_t CurrentVertex = 0;
|
|
||||||
size_t CurrentIndex = 0;
|
size_t CurrentIndex = 0;
|
||||||
|
size_t CurrentVertex = 0;
|
||||||
|
TextureID CurrentTex = 0;
|
||||||
|
Mat4 Projection;
|
||||||
|
ivec2 ViewPort;
|
||||||
|
|
||||||
/** Debug Variables */
|
// Counters
|
||||||
|
size_t CountDrawcalls = 0;
|
||||||
|
size_t CountCommands = 0;
|
||||||
|
size_t CountVertices = 0;
|
||||||
|
size_t CountIndices = 0;
|
||||||
|
};
|
||||||
|
|
||||||
// Optional Index counter
|
class PD_API Gfx {
|
||||||
u32 IndexCounter;
|
public:
|
||||||
// Optional Vertex counter
|
Gfx() = default;
|
||||||
u32 VertexCounter;
|
~Gfx() = default;
|
||||||
// Optional Frame Counter
|
|
||||||
u64 FrameCounter;
|
template <typename T, typename... Args>
|
||||||
// Draw calls counter
|
static void UseDriver(Args&&... args) {
|
||||||
u32 DrawCalls;
|
// assert(driver == nullptr && "OS Driver already set");
|
||||||
// Command Counter
|
driver = std::make_unique<T>(std::forward<Args>(args)...);
|
||||||
u32 DrawCommands;
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
static std::unique_ptr<GfxDriver> driver;
|
||||||
};
|
};
|
||||||
} // namespace PD
|
} // namespace PD
|
||||||
@@ -1,267 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPHidE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/core/core.hpp>
|
|
||||||
#include <pd/drivers/types.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
/** Did not found a better solution yet sadly */
|
|
||||||
namespace HidKb {
|
|
||||||
// Lets use u128 here
|
|
||||||
using KbKey = u128;
|
|
||||||
constexpr static KbKey Kb_No = 0;
|
|
||||||
constexpr static KbKey Kb_Escape = KbKey::Flag(0);
|
|
||||||
constexpr static KbKey Kb_Q = KbKey::Flag(1);
|
|
||||||
constexpr static KbKey Kb_W = KbKey::Flag(2);
|
|
||||||
constexpr static KbKey Kb_E = KbKey::Flag(3);
|
|
||||||
constexpr static KbKey Kb_R = KbKey::Flag(4);
|
|
||||||
constexpr static KbKey Kb_T = KbKey::Flag(5);
|
|
||||||
constexpr static KbKey Kb_Z = KbKey::Flag(6);
|
|
||||||
constexpr static KbKey Kb_U = KbKey::Flag(7);
|
|
||||||
constexpr static KbKey Kb_I = KbKey::Flag(8);
|
|
||||||
constexpr static KbKey Kb_O = KbKey::Flag(9);
|
|
||||||
constexpr static KbKey Kb_P = KbKey::Flag(10);
|
|
||||||
constexpr static KbKey Kb_A = KbKey::Flag(11);
|
|
||||||
constexpr static KbKey Kb_S = KbKey::Flag(12);
|
|
||||||
constexpr static KbKey Kb_D = KbKey::Flag(13);
|
|
||||||
constexpr static KbKey Kb_F = KbKey::Flag(14);
|
|
||||||
constexpr static KbKey Kb_G = KbKey::Flag(15);
|
|
||||||
constexpr static KbKey Kb_H = KbKey::Flag(16);
|
|
||||||
constexpr static KbKey Kb_J = KbKey::Flag(17);
|
|
||||||
constexpr static KbKey Kb_K = KbKey::Flag(18);
|
|
||||||
constexpr static KbKey Kb_L = KbKey::Flag(19);
|
|
||||||
constexpr static KbKey Kb_Y = KbKey::Flag(20);
|
|
||||||
constexpr static KbKey Kb_X = KbKey::Flag(21);
|
|
||||||
constexpr static KbKey Kb_C = KbKey::Flag(22);
|
|
||||||
constexpr static KbKey Kb_V = KbKey::Flag(23);
|
|
||||||
constexpr static KbKey Kb_B = KbKey::Flag(24);
|
|
||||||
constexpr static KbKey Kb_N = KbKey::Flag(25);
|
|
||||||
constexpr static KbKey Kb_M = KbKey::Flag(26);
|
|
||||||
constexpr static KbKey Kb_1 = KbKey::Flag(27);
|
|
||||||
constexpr static KbKey Kb_2 = KbKey::Flag(28);
|
|
||||||
constexpr static KbKey Kb_3 = KbKey::Flag(29);
|
|
||||||
constexpr static KbKey Kb_4 = KbKey::Flag(30);
|
|
||||||
constexpr static KbKey Kb_5 = KbKey::Flag(31);
|
|
||||||
constexpr static KbKey Kb_6 = KbKey::Flag(32);
|
|
||||||
constexpr static KbKey Kb_7 = KbKey::Flag(33);
|
|
||||||
constexpr static KbKey Kb_8 = KbKey::Flag(34);
|
|
||||||
constexpr static KbKey Kb_9 = KbKey::Flag(35);
|
|
||||||
constexpr static KbKey Kb_0 = KbKey::Flag(36);
|
|
||||||
constexpr static KbKey Kb_F1 = KbKey::Flag(37);
|
|
||||||
constexpr static KbKey Kb_F2 = KbKey::Flag(38);
|
|
||||||
constexpr static KbKey Kb_F3 = KbKey::Flag(39);
|
|
||||||
constexpr static KbKey Kb_F4 = KbKey::Flag(40);
|
|
||||||
constexpr static KbKey Kb_F5 = KbKey::Flag(41);
|
|
||||||
constexpr static KbKey Kb_F6 = KbKey::Flag(42);
|
|
||||||
constexpr static KbKey Kb_F7 = KbKey::Flag(43);
|
|
||||||
constexpr static KbKey Kb_F8 = KbKey::Flag(44);
|
|
||||||
constexpr static KbKey Kb_F9 = KbKey::Flag(45);
|
|
||||||
constexpr static KbKey Kb_F10 = KbKey::Flag(46);
|
|
||||||
constexpr static KbKey Kb_F11 = KbKey::Flag(47);
|
|
||||||
constexpr static KbKey Kb_F12 = KbKey::Flag(48);
|
|
||||||
constexpr static KbKey Kb_MouseLeft = KbKey::Flag(120);
|
|
||||||
} // namespace HidKb
|
|
||||||
|
|
||||||
class PD_API HidDriver {
|
|
||||||
public:
|
|
||||||
enum Flags : u32 {
|
|
||||||
Flags_None = 0,
|
|
||||||
FLags_HasGamepad = 1 << 0,
|
|
||||||
Flags_HasKeyboard = 1 << 1,
|
|
||||||
Flags_HasTouch = 1 << 2,
|
|
||||||
Flags_HasMouse = 1 << 3,
|
|
||||||
};
|
|
||||||
// Todo: Name to GpKey (GamepadKey)
|
|
||||||
/** Key [Controller] */
|
|
||||||
enum Key : u32 {
|
|
||||||
No = 0, ///< No Key
|
|
||||||
A = 1 << 0, ///< A
|
|
||||||
B = 1 << 1, ///< B
|
|
||||||
X = 1 << 2, ///< X
|
|
||||||
Y = 1 << 3, ///< Y
|
|
||||||
Start = 1 << 4, ///< Start
|
|
||||||
Select = 1 << 5, ///< Select
|
|
||||||
L = 1 << 6, ///< L
|
|
||||||
R = 1 << 7, ///< R
|
|
||||||
DUp = 1 << 8, ///< Dpad Up
|
|
||||||
DDown = 1 << 9, ///< Dpad down
|
|
||||||
DLeft = 1 << 10, ///< Dpad left
|
|
||||||
DRight = 1 << 11, ///< Dpad right
|
|
||||||
CPUp = 1 << 12, ///< Cpad up
|
|
||||||
CPDown = 1 << 13, ///< cpad down
|
|
||||||
CPLeft = 1 << 14, ///< cpad left
|
|
||||||
CPRight = 1 << 15, ///< Cpad right
|
|
||||||
CSUp = 1 << 16, ///< Cstick up
|
|
||||||
CSDown = 1 << 17, ///< cstick down
|
|
||||||
CSLeft = 1 << 18, ///< cstick left
|
|
||||||
CSRight = 1 << 19, ///< cstick right
|
|
||||||
ZL = 1 << 20, ///< ZL
|
|
||||||
ZR = 1 << 21, ///< ZR
|
|
||||||
Touch = 1 << 22, ///< Touch
|
|
||||||
Up = DUp | CPUp, ///< DPad or CPad Up
|
|
||||||
Down = DDown | CPDown, ///< DPad or CPad Down
|
|
||||||
Left = DLeft | CPLeft, ///< DPad or CPad Left
|
|
||||||
Right = DRight | CPRight, ///< DPad or CPad Right
|
|
||||||
};
|
|
||||||
|
|
||||||
using KbKey = HidKb::KbKey;
|
|
||||||
|
|
||||||
/** Event */
|
|
||||||
enum Event {
|
|
||||||
Event_Null,
|
|
||||||
Event_Down, ///< Key Pressed
|
|
||||||
Event_Held, ///< Key Held
|
|
||||||
Event_Up, ///< Key released
|
|
||||||
};
|
|
||||||
|
|
||||||
HidDriver(const std::string& name = "NullHid") : pName(name) {}
|
|
||||||
HidDriver(PDDriverData data) : pName("NullHid") {}
|
|
||||||
virtual ~HidDriver() = default;
|
|
||||||
PD_SHARED(HidDriver);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get Mouse Position
|
|
||||||
* @return Mouse pos
|
|
||||||
*/
|
|
||||||
fvec2 MousePos() const {
|
|
||||||
return pMouse[0];
|
|
||||||
} /**
|
|
||||||
* Get Last Mouse Position (from last frame)
|
|
||||||
* @return Mouse pos
|
|
||||||
*/
|
|
||||||
fvec2 MousePosLast() const { return pMouse[1]; }
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check for a Button Event
|
|
||||||
* @param e Event Type
|
|
||||||
* @param keys Keys to check for
|
|
||||||
* @return if key(s) doing the requiested event
|
|
||||||
*/
|
|
||||||
bool IsEvent(Event e, Key keys);
|
|
||||||
bool IsEvent(Event e, KbKey key);
|
|
||||||
/**
|
|
||||||
* Check for Key Press Event
|
|
||||||
* @param keys set of keys
|
|
||||||
* @return true if key is pressed
|
|
||||||
*/
|
|
||||||
bool IsDown(Key keys) const { return KeyEvents[0].at(Event_Down) & keys; }
|
|
||||||
/**
|
|
||||||
* Check for Key Held Event
|
|
||||||
* @param keys set of keys
|
|
||||||
* @return true if key is held
|
|
||||||
*/
|
|
||||||
bool IsHeld(Key keys) const { return KeyEvents[0].at(Event_Held) & keys; }
|
|
||||||
/**
|
|
||||||
* Check for Key Release Event
|
|
||||||
* @param keys set of keys
|
|
||||||
* @return true if key is released
|
|
||||||
*/
|
|
||||||
bool IsUp(Key keys) const { return KeyEvents[0].at(Event_Up) & keys; }
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Sett all keyevents to 0
|
|
||||||
*/
|
|
||||||
void Clear() {
|
|
||||||
for (int i = 0; i < 2; i++) {
|
|
||||||
KeyEvents[i][Event_Down] = 0;
|
|
||||||
KeyEvents[i][Event_Up] = 0;
|
|
||||||
KeyEvents[i][Event_Held] = 0;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Lock input driver
|
|
||||||
* @param v lock or not lock
|
|
||||||
*/
|
|
||||||
void Lock(bool v) {
|
|
||||||
if (v != pLocked) {
|
|
||||||
SwapTab();
|
|
||||||
}
|
|
||||||
pLocked = v;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Check if Driver is locked
|
|
||||||
* @return true if locked
|
|
||||||
*/
|
|
||||||
bool Locked() const { return pLocked; }
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Lock Input Driver
|
|
||||||
*/
|
|
||||||
void Lock() {
|
|
||||||
if (!pLocked) {
|
|
||||||
SwapTab();
|
|
||||||
}
|
|
||||||
pLocked = true;
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* Unlock Input Driver
|
|
||||||
*/
|
|
||||||
void Unlock() {
|
|
||||||
if (pLocked) {
|
|
||||||
SwapTab();
|
|
||||||
}
|
|
||||||
pLocked = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Template Update Function for a device specific driver
|
|
||||||
*/
|
|
||||||
virtual void Update();
|
|
||||||
/**
|
|
||||||
* Get Text from Keyboard
|
|
||||||
*/
|
|
||||||
virtual void GetInputStr(std::string& str) {}
|
|
||||||
|
|
||||||
const std::string& GetName() const { return pName; }
|
|
||||||
|
|
||||||
/** Data Section */
|
|
||||||
|
|
||||||
/** Backend Identification Name */
|
|
||||||
const std::string pName;
|
|
||||||
|
|
||||||
/** Flags */
|
|
||||||
u32 Flags = 0;
|
|
||||||
|
|
||||||
/** Key Binds Map */
|
|
||||||
std::unordered_map<u32, u32> pBinds;
|
|
||||||
std::unordered_map<u128, u128> pKbBinds;
|
|
||||||
/** Swap Tabe Function */
|
|
||||||
void SwapTab();
|
|
||||||
/** Using 2 Positions for Current and Last */
|
|
||||||
fvec2 pMouse[2];
|
|
||||||
/** Lock State */
|
|
||||||
bool pLocked = false;
|
|
||||||
/** Key Event Table Setup */
|
|
||||||
std::unordered_map<Event, u32> KeyEvents[2];
|
|
||||||
/** Keyboard Key Event Table Setup */
|
|
||||||
std::unordered_map<Event, u128> KbKeyEvents[2];
|
|
||||||
};
|
|
||||||
namespace Hid {
|
|
||||||
using Event = HidDriver::Event;
|
|
||||||
using Key = HidDriver::Key;
|
|
||||||
} // namespace Hid
|
|
||||||
} // namespace PD
|
|
||||||
16
include/pd/drivers/interface.hpp
Normal file
16
include/pd/drivers/interface.hpp
Normal file
@@ -0,0 +1,16 @@
|
|||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <pd/common.hpp>
|
||||||
|
|
||||||
|
namespace PD {
|
||||||
|
class DriverInterface {
|
||||||
|
public:
|
||||||
|
DriverInterface(const std::string_view& name) : pName(name) {}
|
||||||
|
virtual ~DriverInterface() {}
|
||||||
|
|
||||||
|
const char* GetName() const { return pName.data(); }
|
||||||
|
|
||||||
|
private:
|
||||||
|
std::string_view pName;
|
||||||
|
};
|
||||||
|
} // namespace PD
|
||||||
@@ -1,53 +1,32 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
/*
|
#include <pd/drivers/interface.hpp>
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/core/common.hpp>
|
|
||||||
#include <pd/core/timetrace.hpp>
|
|
||||||
#include <pd/drivers/types.hpp>
|
|
||||||
#include <pd/pd_p_api.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
namespace PD {
|
||||||
using TraceMap = std::map<std::string, TT::Res::Ref>;
|
class PD_API OsDriver : public DriverInterface {
|
||||||
|
|
||||||
class PD_API OsDriver {
|
|
||||||
public:
|
public:
|
||||||
OsDriver(const std::string& name = "StdPd") : pName(name) {}
|
OsDriver(std::string_view name = "Default") : DriverInterface(name) {}
|
||||||
OsDriver(PDDriverData data) : pName("StdPd") {}
|
virtual ~OsDriver() {}
|
||||||
virtual ~OsDriver() = default;
|
|
||||||
PD_SHARED(OsDriver);
|
|
||||||
|
|
||||||
virtual u64 GetTime();
|
virtual u64 GetTime() const;
|
||||||
virtual u64 GetNanoTime();
|
virtual u64 GetTimeNano() const;
|
||||||
TraceMap& GetTraceMap();
|
};
|
||||||
TT::Res::Ref& GetTraceRef(const std::string& id);
|
|
||||||
bool TraceExist(const std::string& id);
|
|
||||||
const std::string& GetName() const { return pName; }
|
|
||||||
|
|
||||||
TraceMap pTraces;
|
class PD_API Os {
|
||||||
|
public:
|
||||||
|
Os() = default;
|
||||||
|
~Os() = default;
|
||||||
|
|
||||||
|
template <typename T, typename... Args>
|
||||||
|
static void UseDriver(Args&&... args) {
|
||||||
|
// assert(driver == nullptr && "OS Driver already set");
|
||||||
|
driver = std::make_unique<T>(std::forward<Args>(args)...);
|
||||||
|
}
|
||||||
|
|
||||||
|
static u64 GetTime() { return driver->GetTime(); }
|
||||||
|
static u64 GetTimeNano() { return driver->GetTimeNano(); }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
const std::string pName = "StdPd";
|
static std::unique_ptr<OsDriver> driver;
|
||||||
};
|
};
|
||||||
} // namespace PD
|
} // namespace PD
|
||||||
@@ -1,45 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/core/core.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
class Snd {
|
|
||||||
public:
|
|
||||||
Snd(const std::string& name = "NullSnd") : pName(name) {};
|
|
||||||
~Snd() = default;
|
|
||||||
|
|
||||||
PD_SHARED(Snd);
|
|
||||||
|
|
||||||
virtual void Init() {}
|
|
||||||
virtual void Deinit() {}
|
|
||||||
virtual bool Done(int buf_idx) {}
|
|
||||||
virtual void Update(int buf_idx, void* data) {}
|
|
||||||
virtual bool IsChannelPlaying(int chn) {}
|
|
||||||
virtual bool IsChannelPaused(int chn) {}
|
|
||||||
|
|
||||||
const std::string pName = "NullSnd";
|
|
||||||
};
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
using PDDriverData = void*;
|
|
||||||
24962
include/pd/external/json.hpp
vendored
24962
include/pd/external/json.hpp
vendored
File diff suppressed because it is too large
Load Diff
7988
include/pd/external/stb_image.hpp
vendored
7988
include/pd/external/stb_image.hpp
vendored
File diff suppressed because it is too large
Load Diff
5079
include/pd/external/stb_truetype.hpp
vendored
5079
include/pd/external/stb_truetype.hpp
vendored
File diff suppressed because it is too large
Load Diff
@@ -1,88 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/core/core.hpp>
|
|
||||||
#include <pd/pd_p_api.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
class PD_API Image {
|
|
||||||
public:
|
|
||||||
enum Format {
|
|
||||||
RGBA, // bpp == 4
|
|
||||||
RGB, // bpp == 3
|
|
||||||
RGB565, // bpp == 2 (not supported in laoding)
|
|
||||||
BGR, // bpp == 3
|
|
||||||
ABGR, // bpp == 4
|
|
||||||
BGRA, // bpp == 4
|
|
||||||
};
|
|
||||||
Image() = default;
|
|
||||||
Image(const std::string& path) { this->Load(path); }
|
|
||||||
Image(const std::vector<u8>& buf) { this->Load(buf); }
|
|
||||||
Image(const std::vector<u8>& buf, int w, int h, int bpp = 4) {
|
|
||||||
this->Copy(buf, w, h, bpp);
|
|
||||||
}
|
|
||||||
~Image() = default;
|
|
||||||
|
|
||||||
PD_SHARED(Image)
|
|
||||||
|
|
||||||
void Load(const std::string& path);
|
|
||||||
void Load(const std::vector<u8>& buf);
|
|
||||||
void Copy(const std::vector<u8>& buf, int w, int h, int bpp = 4);
|
|
||||||
|
|
||||||
std::vector<PD::u8>& GetBuffer() { return pBuffer; }
|
|
||||||
std::vector<PD::u8> GetBuffer() const { return pBuffer; }
|
|
||||||
|
|
||||||
int Width() const { return pWidth; }
|
|
||||||
int Height() const { return pHeight; }
|
|
||||||
ivec2 Size() const { return ivec2(pWidth, pHeight); }
|
|
||||||
Format Fmt() const { return pFmt; }
|
|
||||||
|
|
||||||
void FlipVertical();
|
|
||||||
void FlipHorizontal();
|
|
||||||
|
|
||||||
u8& operator[](int idx) { return pBuffer[idx]; }
|
|
||||||
u8 operator[](int idx) const { return pBuffer[idx]; }
|
|
||||||
|
|
||||||
// Probably these make th eabove ones useless
|
|
||||||
|
|
||||||
operator std::vector<PD::u8>&() { return pBuffer; }
|
|
||||||
operator std::vector<PD::u8>() const { return pBuffer; }
|
|
||||||
|
|
||||||
static void Convert(Image::Ref img, Image::Format dst);
|
|
||||||
static void ReTile(Image::Ref img,
|
|
||||||
std::function<u32(int x, int y, int w)> src,
|
|
||||||
std::function<u32(int x, int y, int w)> dst);
|
|
||||||
static int Fmt2Bpp(Format fmt);
|
|
||||||
|
|
||||||
std::vector<PD::u8> pBuffer;
|
|
||||||
int pWidth;
|
|
||||||
int pHeight;
|
|
||||||
Format pFmt = Format::RGBA;
|
|
||||||
|
|
||||||
private:
|
|
||||||
/** Leftover variable used for stbi_load */
|
|
||||||
int fmt = 0;
|
|
||||||
};
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,71 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/core/core.hpp>
|
|
||||||
#include <pd/pd_p_api.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
/**
|
|
||||||
* Namepace containing functions to blur images
|
|
||||||
*/
|
|
||||||
namespace ImgBlur {
|
|
||||||
/**
|
|
||||||
* Function to create Gaussian Kernel List
|
|
||||||
* @param radius Rasius to use
|
|
||||||
* @param si sigma value to use
|
|
||||||
* @return list of kernel values
|
|
||||||
*/
|
|
||||||
PD_API std::vector<float> GaussianKernel(int radius, float si);
|
|
||||||
/**
|
|
||||||
* Gaussian Blur for basic Image Buffer
|
|
||||||
* @param buf Image Buffer (unsigned char)
|
|
||||||
* @param w width of the image
|
|
||||||
* @param h width of the image
|
|
||||||
* @param radius Blur radius
|
|
||||||
* @param si Blur sigma
|
|
||||||
* @param idxfn Indexing function
|
|
||||||
*/
|
|
||||||
PD_API void GaussianBlur(
|
|
||||||
std::vector<u8>& buf, int w, int h, float radius, float si,
|
|
||||||
std::function<int(int, int, int)> idxfn = [](int x, int y, int w) -> int {
|
|
||||||
return y * w + x;
|
|
||||||
});
|
|
||||||
/**
|
|
||||||
* Advanced func to access memory directly
|
|
||||||
* @param buf Referenvce to the buffer
|
|
||||||
* @param w width of the image
|
|
||||||
* @param h width of the image
|
|
||||||
* @param bpp Bytes per Pixels (RGB[A], RGB565, etc)
|
|
||||||
* @param radius Blur radius
|
|
||||||
* @param si Blur sigma
|
|
||||||
* @param idxfn Indexing function
|
|
||||||
*/
|
|
||||||
PD_API void GaussianBlur(
|
|
||||||
void* buf, int w, int h, int bpp, float radius, float si,
|
|
||||||
std::function<int(int, int, int)> idxfn = [](int x, int y, int w) -> int {
|
|
||||||
return y * w + x;
|
|
||||||
});
|
|
||||||
} // namespace ImgBlur
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/core/core.hpp>
|
|
||||||
#include <pd/image/image.hpp>
|
|
||||||
#include <pd/pd_p_api.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
/**
|
|
||||||
* Namespace containing function to convert images
|
|
||||||
*/
|
|
||||||
namespace ImgConvert {
|
|
||||||
/**
|
|
||||||
* Convert RGB24 to RGBA32 by adding a 4th alpha value set to 255
|
|
||||||
* to every pixel
|
|
||||||
* @param out Result List
|
|
||||||
* @param in Input Buffer List (rgb24)
|
|
||||||
* @param w width of the image
|
|
||||||
* @param h height of the image
|
|
||||||
*/
|
|
||||||
PD_API
|
|
||||||
void RGB24toRGBA32(std::vector<PD::u8>& out, const std::vector<u8>& in,
|
|
||||||
const int& w, const int& h);
|
|
||||||
PD_API
|
|
||||||
void RGB32toRGBA24(std::vector<u8>& out, const std::vector<u8>& in,
|
|
||||||
const int& w, const int& h);
|
|
||||||
/**
|
|
||||||
* Reverse 32 (RGBA -> ABGR || ABGR -> RGBA)
|
|
||||||
* @param buf Buffer to convert
|
|
||||||
* @param w width
|
|
||||||
* @param h height
|
|
||||||
*/
|
|
||||||
PD_API void Reverse32(std::vector<u8>& buf, const int& w, const int& h);
|
|
||||||
PD_API void ReverseBuf(std::vector<u8>& buf, size_t bpp, int w, int h);
|
|
||||||
} // namespace ImgConvert
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,103 +1,24 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
/*
|
#include <pd/core/pool.hpp>
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/core/core.hpp>
|
|
||||||
#include <pd/lithium/texture.hpp>
|
|
||||||
#include <pd/lithium/vertex.hpp>
|
#include <pd/lithium/vertex.hpp>
|
||||||
#include <pd/pd_p_api.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
namespace PD {
|
||||||
namespace Li {
|
namespace Li {
|
||||||
class Command {
|
class Command {
|
||||||
public:
|
public:
|
||||||
Command() = default;
|
Command() {}
|
||||||
~Command() = default;
|
~Command() {}
|
||||||
|
|
||||||
PD_RAW(Command);
|
|
||||||
|
|
||||||
Command& AddIdx(const u16& idx) {
|
|
||||||
IndexBuffer.push_back(VertexBuffer.size() + idx);
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
Command& AddIdxs(const u16& a, const u16& b, const u16& c) {
|
|
||||||
IndexBuffer.push_back(VertexBuffer.size() + a);
|
|
||||||
IndexBuffer.push_back(VertexBuffer.size() + b);
|
|
||||||
IndexBuffer.push_back(VertexBuffer.size() + c);
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
Command& AddVtx(const Vertex& v) {
|
|
||||||
VertexBuffer.push_back(std::move(v));
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
void Clear() {
|
|
||||||
VertexBuffer.clear();
|
|
||||||
IndexBuffer.clear();
|
|
||||||
Index = 0;
|
|
||||||
Layer = 0;
|
|
||||||
Tex = 0;
|
|
||||||
ScissorOn = false;
|
|
||||||
ScissorRect = ivec4();
|
|
||||||
}
|
|
||||||
|
|
||||||
std::vector<Vertex> VertexBuffer;
|
|
||||||
std::vector<u16> IndexBuffer;
|
|
||||||
ivec4 ScissorRect;
|
|
||||||
bool ScissorOn = false;
|
|
||||||
int Layer = 0;
|
|
||||||
int Index = 0;
|
|
||||||
TexAddress Tex;
|
|
||||||
};
|
|
||||||
|
|
||||||
class PD_API CmdPool {
|
|
||||||
public:
|
|
||||||
CmdPool() {}
|
|
||||||
~CmdPool() {}
|
|
||||||
|
|
||||||
Command::Ref NewCmd();
|
|
||||||
void Init(size_t initial_size);
|
|
||||||
void Deinit();
|
|
||||||
void Resize(size_t nulen);
|
|
||||||
void Reset();
|
|
||||||
Command::Ref GetCmd(size_t idx) const;
|
|
||||||
Command::Ref GetCmd(size_t idx);
|
|
||||||
size_t Size() const;
|
|
||||||
size_t Cap() const;
|
|
||||||
void Merge(CmdPool& p);
|
|
||||||
void Copy(CmdPool& p);
|
|
||||||
void Sort();
|
|
||||||
|
|
||||||
private:
|
|
||||||
static bool pTheOrder(const Command::Ref& a, const Command::Ref& b);
|
|
||||||
friend class DrawList;
|
|
||||||
Command::Ref* begin() { return &pPool[0]; }
|
|
||||||
Command::Ref* end() { return &pPool[pPoolIdx - 1]; }
|
|
||||||
std::vector<Command::Ref> pPool;
|
|
||||||
u32 pPoolIdx = 0;
|
|
||||||
int Layer = 0;
|
int Layer = 0;
|
||||||
|
ptr Tex = 0;
|
||||||
|
Vertex* FirstVertex = nullptr;
|
||||||
|
u16* FirstIndex = nullptr;
|
||||||
|
size_t VertexCount;
|
||||||
|
size_t IndexCount;
|
||||||
|
|
||||||
|
PD::Pool<Vertex>* pVpool;
|
||||||
|
PD::Pool<u16>* pIpool;
|
||||||
};
|
};
|
||||||
} // namespace Li
|
} // namespace Li
|
||||||
} // namespace PD
|
} // namespace PD
|
||||||
@@ -1,224 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/lithium/command.hpp>
|
|
||||||
#include <pd/lithium/font.hpp>
|
|
||||||
#include <pd/pd_p_api.hpp>
|
|
||||||
|
|
||||||
/** Path Rect Flags */
|
|
||||||
using LiPathRectFlags = PD::u32;
|
|
||||||
|
|
||||||
/** Setup for everything (oder so) */
|
|
||||||
enum LiPathRectFlags_ : PD::u32 {
|
|
||||||
LiPathRectFlags_None = 0,
|
|
||||||
LiPathRectFlags_KeepTopLeft = PD_BIT(0),
|
|
||||||
LiPathRectFlags_KeepTopRight = PD_BIT(1),
|
|
||||||
LiPathRectFlags_KeepBotRight = PD_BIT(2),
|
|
||||||
LiPathRectFlags_KeepBotLeft = PD_BIT(3),
|
|
||||||
LiPathRectFlags_KeepTop = PD_BIT(0) | PD_BIT(1),
|
|
||||||
LiPathRectFlags_KeepBot = PD_BIT(2) | PD_BIT(3),
|
|
||||||
LiPathRectFlags_KeepLeft = PD_BIT(0) | PD_BIT(3),
|
|
||||||
LiPathRectFlags_KeepRight = PD_BIT(1) | PD_BIT(2),
|
|
||||||
};
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
namespace Li {
|
|
||||||
class PD_API DrawList {
|
|
||||||
public:
|
|
||||||
DrawList(Context& ctx, int initial_size = 64);
|
|
||||||
~DrawList();
|
|
||||||
|
|
||||||
/** Require Copy and Move Constructors */
|
|
||||||
|
|
||||||
DrawList(const DrawList&) = delete;
|
|
||||||
DrawList& operator=(const DrawList&) = delete;
|
|
||||||
|
|
||||||
DrawList(DrawList&&) noexcept = default;
|
|
||||||
DrawList& operator=(DrawList&&) noexcept = default;
|
|
||||||
|
|
||||||
PD_SHARED(DrawList);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Append an input drawlist on top of this one
|
|
||||||
* This Function will clear the Input list to make sure
|
|
||||||
* That the moved memory blocks don't get used
|
|
||||||
* @param list DrawList to move into current
|
|
||||||
*/
|
|
||||||
void Merge(DrawList::Ref list);
|
|
||||||
/**
|
|
||||||
* Copy another drawlist to this drawist.
|
|
||||||
* This is important for static prerendered Drawlists
|
|
||||||
* @param list DrawList Reference to copy from
|
|
||||||
*/
|
|
||||||
void Copy(DrawList::Ref list);
|
|
||||||
/**
|
|
||||||
* Optimize a Drawlist to a more or less perfect order
|
|
||||||
* to reduce drawcall overhead... This function also uses
|
|
||||||
* the Layersystem to keep specific stuff in the correct order
|
|
||||||
*/
|
|
||||||
void Optimize();
|
|
||||||
|
|
||||||
Command::Ref GetNewCmd();
|
|
||||||
void Clear();
|
|
||||||
void Layer(int l) { this->pPool.Layer = l; }
|
|
||||||
int Layer() { return this->pPool.Layer; }
|
|
||||||
void LayerUp() { this->pPool.Layer++; }
|
|
||||||
void LayerDown() { this->pPool.Layer--; }
|
|
||||||
|
|
||||||
void SetFont(Font::Ref font) { pCurrentFont = font; }
|
|
||||||
void SetFontScale(float scale) { pFontScale = scale; }
|
|
||||||
|
|
||||||
void DrawSolid();
|
|
||||||
void DrawTexture(Texture::Ref tex);
|
|
||||||
|
|
||||||
// SECTION: Draw API //
|
|
||||||
|
|
||||||
void DrawRect(const fvec2& pos, const fvec2& size, u32 color,
|
|
||||||
int thickness = 1);
|
|
||||||
void DrawRectFilled(const fvec2& pos, const fvec2& size, u32 color);
|
|
||||||
void DrawTriangle(const fvec2& a, const fvec2& b, const fvec2& c, u32 color,
|
|
||||||
int thickness = 1);
|
|
||||||
void DrawTriangleFilled(const fvec2& a, const fvec2& b, const fvec2& c,
|
|
||||||
u32 color);
|
|
||||||
void DrawCircle(const fvec2& center, float rad, u32 color, int num_segments,
|
|
||||||
int thickness = 1);
|
|
||||||
void DrawCircleFilled(const fvec2& center, float rad, u32 color,
|
|
||||||
int num_segments);
|
|
||||||
void DrawText(const fvec2& p, const std::string& text, u32 color);
|
|
||||||
/**
|
|
||||||
* Extended Draw Text Function
|
|
||||||
*/
|
|
||||||
void DrawTextEx(const fvec2& p, const std::string& text, u32 color,
|
|
||||||
LiTextFlags flags, const fvec2& box = fvec2(0.f));
|
|
||||||
void DrawLine(const fvec2& a, const fvec2& b, u32 color, int t = 1);
|
|
||||||
/**
|
|
||||||
* Take list of points and display it as a line on screen
|
|
||||||
* @param points List of Positions
|
|
||||||
* @param clr Color of the Line
|
|
||||||
* @param flags Additional Flags (Close for go back to starting point)
|
|
||||||
* @param thickness Thickness of the Line
|
|
||||||
*/
|
|
||||||
void DrawPolyLine(const std::vector<fvec2>& points, u32 clr, u32 flags = 0,
|
|
||||||
int thickness = 1);
|
|
||||||
/**
|
|
||||||
* Take a List ofpoints and display it as Filled Shape
|
|
||||||
* @note Keep in mind to setup the list of points clockwise
|
|
||||||
* @param points List of Points
|
|
||||||
* @param clr Color of the shape
|
|
||||||
*/
|
|
||||||
void DrawConvexPolyFilled(const std::vector<fvec2>& points, u32 clr);
|
|
||||||
|
|
||||||
// SECTION: PATH API //
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Function to reserve Memory to prevent overhead on
|
|
||||||
* pusing a lot of points with PathNext
|
|
||||||
* @param num_points Number of Positions you want to add
|
|
||||||
*/
|
|
||||||
void PathReserve(size_t num_points) {
|
|
||||||
pPath.reserve(pPath.size() + num_points);
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* Clear current Path
|
|
||||||
* @note PathStroke and PathFill will automatically clear
|
|
||||||
*/
|
|
||||||
void PathClear() { pPath.clear(); }
|
|
||||||
/**
|
|
||||||
* Add a Point to the Path
|
|
||||||
* @note Keep in mind that this function is used for
|
|
||||||
* setting the starting point
|
|
||||||
* @param v Position to add
|
|
||||||
*/
|
|
||||||
void PathAdd(const fvec2& v) { pPath.push_back(v); }
|
|
||||||
/**
|
|
||||||
* Add a Point to the Path
|
|
||||||
* @note Keep in mind that this function is used for
|
|
||||||
* setting the starting point
|
|
||||||
* @param x X Position to add
|
|
||||||
* @param y Y Position to add
|
|
||||||
*/
|
|
||||||
void PathAdd(float x, float y) { pPath.push_back(fvec2(x, y)); }
|
|
||||||
/**
|
|
||||||
* Path Stroke Create Line from point to point
|
|
||||||
* @note For Primitives like Rect or Triangle mak sure to use
|
|
||||||
* UI7DrawFlags_Close to add a line back to the starting point
|
|
||||||
* @param clr Color od the line
|
|
||||||
* @param thickness Thickness of the line
|
|
||||||
* @param flags Additional Drawflags
|
|
||||||
*/
|
|
||||||
void PathStroke(u32 clr, int thickness = 1, u32 flags = 0) {
|
|
||||||
DrawPolyLine(pPath, clr, flags, thickness);
|
|
||||||
pPath.clear();
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* Fill a Path with a Color
|
|
||||||
* @note **IMPORTANT: ** Paths need to be setup clockwise
|
|
||||||
* to be rendered correctly
|
|
||||||
* @param clr Fill Color
|
|
||||||
*/
|
|
||||||
void PathFill(u32 clr) {
|
|
||||||
DrawConvexPolyFilled(pPath, clr);
|
|
||||||
pPath.clear();
|
|
||||||
}
|
|
||||||
void PathArcToN(const fvec2& c, float radius, float a_min, float a_max,
|
|
||||||
int segments);
|
|
||||||
void PathFastArcToN(const fvec2& c, float r, float amin, float amax, int s);
|
|
||||||
/// @brief Create a Path Rect (uses to Positions instead of Pos/Size)
|
|
||||||
/// @param a Top Left Position
|
|
||||||
/// @param b Bottom Right Position
|
|
||||||
/// @param rounding rounding
|
|
||||||
void PathRect(fvec2 a, fvec2 b, float rounding = 0.f);
|
|
||||||
/// @brief Create a Path Rect (uses to Positions instead of Pos/Size)
|
|
||||||
/// @param a Top Left Position
|
|
||||||
/// @param b Bottom Right Position
|
|
||||||
/// @param rounding rounding
|
|
||||||
/// @param flags DrawFlags (for special rounding rules)
|
|
||||||
void PathRectEx(fvec2 a, fvec2 b, float rounding = 0.f, u32 flags = 0);
|
|
||||||
|
|
||||||
void PushClipRect(const fvec4& cr) { pClipRects.push(cr); }
|
|
||||||
void PopClipRect() {
|
|
||||||
if (pClipRects.empty()) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
pClipRects.pop();
|
|
||||||
}
|
|
||||||
const CmdPool& Data() const { return pPool; }
|
|
||||||
/** One linear Clip rect Setup */
|
|
||||||
void pClipCmd(Command* cmd);
|
|
||||||
|
|
||||||
/** Data Section */
|
|
||||||
|
|
||||||
std::stack<fvec4> pClipRects;
|
|
||||||
float pFontScale = 0.7f;
|
|
||||||
Font::Ref pCurrentFont;
|
|
||||||
Texture::Ref CurrentTex;
|
|
||||||
CmdPool pPool;
|
|
||||||
std::vector<fvec2> pPath;
|
|
||||||
u32 pNumIndices = 0;
|
|
||||||
u32 pNumVertices = 0;
|
|
||||||
Context* pCtx = nullptr;
|
|
||||||
};
|
|
||||||
} // namespace Li
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,136 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/core/core.hpp>
|
|
||||||
#include <pd/lithium/command.hpp>
|
|
||||||
#include <pd/lithium/rect.hpp>
|
|
||||||
#include <pd/lithium/texture.hpp>
|
|
||||||
#include <pd/pd_p_api.hpp>
|
|
||||||
|
|
||||||
using LiTextFlags = PD::u32;
|
|
||||||
enum LiTextFlags_ {
|
|
||||||
LiTextFlags_None = 0, ///< Do nothing
|
|
||||||
LiTextFlags_AlignRight = 1 << 0, ///< Align Right of position
|
|
||||||
LiTextFlags_AlignMid = 1 << 1, ///< Align in the middle of pos and box
|
|
||||||
LiTextFlags_Shaddow = 1 << 2, ///< Draws the text twice to create shaddow
|
|
||||||
LiTextFlags_Wrap = 1 << 3, ///< Wrap Text: May be runs better with TMS
|
|
||||||
LiTextFlags_Short = 1 << 4, ///< Short Text: May be runs better with TMS
|
|
||||||
LiTextFlags_Scroll = 1 << 5, ///< Not implemented [scoll text if to long]
|
|
||||||
LiTextFlags_NoOOS = 1 << 6, ///< No Out of Screen Rendering
|
|
||||||
};
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
class Context;
|
|
||||||
namespace Li {
|
|
||||||
class DrawList;
|
|
||||||
class PD_API Font {
|
|
||||||
public:
|
|
||||||
/** Codepoint Data holder */
|
|
||||||
struct Codepoint {
|
|
||||||
u32 pCodepoint = 0;
|
|
||||||
fvec4 SimpleUV;
|
|
||||||
Texture::Ref Tex;
|
|
||||||
fvec2 Size;
|
|
||||||
float Offset = 0.f;
|
|
||||||
bool pInvalid = false;
|
|
||||||
};
|
|
||||||
|
|
||||||
/** Constructore doesnt need Backand anymore */
|
|
||||||
Font(Context& ctx) : pCtx(ctx) {}
|
|
||||||
~Font() = default;
|
|
||||||
|
|
||||||
PD_SHARED(Font);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Load a TTF File
|
|
||||||
* @param path Path to the TTF file
|
|
||||||
* @param px_height Pixelheight of the codepoints (limit by 64)
|
|
||||||
*/
|
|
||||||
void LoadTTF(const std::string& path, int px_height = 32);
|
|
||||||
/**
|
|
||||||
* Load a TTF File from Memory
|
|
||||||
* @param data File data
|
|
||||||
* @param px_height Pixelheight of the codepoints (limit by 64)
|
|
||||||
*/
|
|
||||||
void LoadTTF(const std::vector<u8>& data, int px_height = 32);
|
|
||||||
/**
|
|
||||||
* Function that loads a default integrated font...
|
|
||||||
* This will only work if PD_LI_INCLUDE_FONTS was set
|
|
||||||
* on lithium build cause otherwise the font data is not included
|
|
||||||
*/
|
|
||||||
void LoadDefaultFont(int id = 0, int pixel_height = 32);
|
|
||||||
/**
|
|
||||||
* Getter for Codepoint reference
|
|
||||||
* @return codepoint dataholder reference
|
|
||||||
*/
|
|
||||||
Codepoint& GetCodepoint(u32 c);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get Text Bounding Box
|
|
||||||
*/
|
|
||||||
fvec2 GetTextBounds(const std::string& text, float scale);
|
|
||||||
/**
|
|
||||||
* Extended Draw Text Function that vreates a Command List
|
|
||||||
*/
|
|
||||||
void CmdTextEx(DrawList& dl, const fvec2& pos, u32 color, float scale,
|
|
||||||
const std::string& text, LiTextFlags flags = 0,
|
|
||||||
const fvec2& box = 0);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Garbage collection for TextMapSystem
|
|
||||||
*/
|
|
||||||
void CleanupTMS();
|
|
||||||
/**
|
|
||||||
* Utility function to create a font atlas
|
|
||||||
* During TTF loading (Internal and should not be called)
|
|
||||||
*/
|
|
||||||
void pMakeAtlas(bool final, std::vector<u8>& font_tex, int texszs,
|
|
||||||
PD::Li::Texture::Ref tex);
|
|
||||||
std::string pWrapText(const std::string& txt, float scale,
|
|
||||||
const PD::fvec2& max, PD::fvec2& dim);
|
|
||||||
std::string pShortText(const std::string& txt, float scale,
|
|
||||||
const PD::fvec2& max, PD::fvec2& dim);
|
|
||||||
|
|
||||||
/** Data Section */
|
|
||||||
int PixelHeight;
|
|
||||||
int DefaultPixelHeight = 24;
|
|
||||||
std::vector<Texture::Ref> Textures;
|
|
||||||
/**
|
|
||||||
* 32Bit Codepoint Dataholder reference map
|
|
||||||
* **Now using unordered map**
|
|
||||||
*/
|
|
||||||
std::unordered_map<u32, Codepoint> CodeMap;
|
|
||||||
/** TMS */
|
|
||||||
struct TMELEM {
|
|
||||||
PD::u32 ID;
|
|
||||||
PD::fvec2 Size;
|
|
||||||
std::string Text;
|
|
||||||
u64 TimeStamp;
|
|
||||||
};
|
|
||||||
std::unordered_map<u32, TMELEM> pTMS;
|
|
||||||
Context& pCtx;
|
|
||||||
};
|
|
||||||
} // namespace Li
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#ifdef PD_LI_INCLUDE_FONTS
|
|
||||||
|
|
||||||
#include <pd/core/common.hpp>
|
|
||||||
|
|
||||||
/** Generated with pdfm */
|
|
||||||
namespace PD {
|
|
||||||
struct FontFileData {
|
|
||||||
std::string Name;
|
|
||||||
u32 StartOff;
|
|
||||||
u32 Size;
|
|
||||||
};
|
|
||||||
extern FontFileData pFontData[];
|
|
||||||
extern size_t pNumFonts;
|
|
||||||
extern PD::u8 pFontsDataRaw[];
|
|
||||||
} // namespace PD
|
|
||||||
#endif
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/lithium/command.hpp>
|
|
||||||
#include <pd/lithium/drawlist.hpp>
|
|
||||||
#include <pd/lithium/font.hpp>
|
|
||||||
#include <pd/lithium/rect.hpp>
|
|
||||||
#include <pd/lithium/renderer.hpp>
|
|
||||||
#include <pd/lithium/texture.hpp>
|
|
||||||
@@ -1,149 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/core/core.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
namespace Li {
|
|
||||||
class Rect {
|
|
||||||
public:
|
|
||||||
Rect() : Top(0), Bot(0) {}
|
|
||||||
~Rect() = default;
|
|
||||||
/**
|
|
||||||
* Constructor that initializes the rectangle using top and bottom positions.
|
|
||||||
* @param t Top left and right corner positions.
|
|
||||||
* @param b Bottom left and right corner positions.
|
|
||||||
*/
|
|
||||||
Rect(const fvec4& t, const fvec4& b) {
|
|
||||||
Top = t;
|
|
||||||
Bot = b;
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* Constructor that initializes the rectangle using individual corner
|
|
||||||
* positions.
|
|
||||||
* @param tl Top left corner position.
|
|
||||||
* @param tr Top right corner position.
|
|
||||||
* @param bl Bottom left corner position.
|
|
||||||
* @param br Bottom right corner position.
|
|
||||||
*/
|
|
||||||
Rect(const fvec2& tl, const fvec2& tr, const fvec2& bl, const fvec2& br) {
|
|
||||||
Top = fvec4(tl, tr);
|
|
||||||
Bot = fvec4(bl, br);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Constructor that initializes the rectangle using a UV mapping vector.
|
|
||||||
*
|
|
||||||
* - The old API used vec4 for UV mapping.
|
|
||||||
* - Spritesheets have rotated images, so this was updated to use Rect for UV.
|
|
||||||
*
|
|
||||||
* @param uv Vec4 UV map.
|
|
||||||
*/
|
|
||||||
Rect(const fvec4& uv) {
|
|
||||||
Top = vec4(uv.x, uv.y, uv.z, uv.y);
|
|
||||||
Bot = vec4(uv.x, uv.w, uv.z, uv.w);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the top-left corner position.
|
|
||||||
* @return Top-left position as vec2.
|
|
||||||
*/
|
|
||||||
fvec2 TopLeft() const { return fvec2(Top.x, Top.y); }
|
|
||||||
/**
|
|
||||||
* Get the top-right corner position.
|
|
||||||
* @return Top-right position as vec2.
|
|
||||||
*/
|
|
||||||
fvec2 TopRight() const { return fvec2(Top.z, Top.w); }
|
|
||||||
/**
|
|
||||||
* Get the bottom-left corner position.
|
|
||||||
* @return Bottom-left position as vec2.
|
|
||||||
*/
|
|
||||||
fvec2 BotLeft() const { return fvec2(Bot.x, Bot.y); }
|
|
||||||
/**
|
|
||||||
* Get the bottom-right corner position.
|
|
||||||
* @return Bottom-right position as vec2.
|
|
||||||
*/
|
|
||||||
fvec2 BotRight() const { return fvec2(Bot.z, Bot.w); }
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set the top-left corner position.
|
|
||||||
* @param v New top-left position.
|
|
||||||
* @return Reference to the updated Rect.
|
|
||||||
*/
|
|
||||||
Rect& TopLeft(const fvec2& v) {
|
|
||||||
Top.x = v.x;
|
|
||||||
Top.y = v.y;
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set the top-right corner position.
|
|
||||||
* @param v New top-right position.
|
|
||||||
* @return Reference to the updated Rect.
|
|
||||||
*/
|
|
||||||
Rect& TopRight(const fvec2& v) {
|
|
||||||
Top.z = v.x;
|
|
||||||
Top.w = v.y;
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set the bottom-left corner position.
|
|
||||||
* @param v New bottom-left position.
|
|
||||||
* @return Reference to the updated Rect.
|
|
||||||
*/
|
|
||||||
Rect& BotLeft(const fvec2& v) {
|
|
||||||
Bot.x = v.x;
|
|
||||||
Bot.y = v.y;
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Set the bottom-right corner position.
|
|
||||||
* @param v New bottom-right position.
|
|
||||||
* @return Reference to the updated Rect.
|
|
||||||
*/
|
|
||||||
Rect& BotRight(const fvec2& v) {
|
|
||||||
Bot.z = v.x;
|
|
||||||
Bot.w = v.y;
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool operator==(const Rect& r) const { return Top == r.Top && Bot == r.Bot; }
|
|
||||||
|
|
||||||
void SwapVec2XY() {
|
|
||||||
Top.SwapXY();
|
|
||||||
Top.SwapZW();
|
|
||||||
Bot.SwapXY();
|
|
||||||
Bot.SwapZW();
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Data Section */
|
|
||||||
|
|
||||||
fvec4 Top;
|
|
||||||
fvec4 Bot;
|
|
||||||
};
|
|
||||||
} // namespace Li
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,62 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/drivers/drivers.hpp>
|
|
||||||
#include <pd/lithium/rect.hpp>
|
|
||||||
#include <pd/pd_p_api.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
namespace Li {
|
|
||||||
/**
|
|
||||||
* Static Class Render Setup Functions
|
|
||||||
*/
|
|
||||||
class PD_API Renderer {
|
|
||||||
public:
|
|
||||||
Renderer() = default;
|
|
||||||
~Renderer() = default;
|
|
||||||
|
|
||||||
// SECTION: Open Command and Object creation API
|
|
||||||
static void RotateCorner(fvec2& pos, float s, float c);
|
|
||||||
static Rect PrimRect(const fvec2& pos, const fvec2& size, float angle = 0.f);
|
|
||||||
static Rect PrimLine(const fvec2& a, const fvec2& b, int thickness = 1);
|
|
||||||
static void CmdQuad(Command* cmd, const Rect& quad, const Rect& uv,
|
|
||||||
u32 color);
|
|
||||||
static void CmdTriangle(Command* cmd, const fvec2 a, const fvec2 b,
|
|
||||||
const fvec2 c, u32 clr);
|
|
||||||
static void CmdPolyLine(const std::vector<fvec2>& points, u32 clr,
|
|
||||||
u32 flags = 0, int thickness = 1);
|
|
||||||
static void CmdConvexPolyFilled(Command* cmd,
|
|
||||||
const std::vector<fvec2>& points, u32 clr,
|
|
||||||
Texture::Ref tex);
|
|
||||||
|
|
||||||
// SECTION: InBounds Checks
|
|
||||||
|
|
||||||
static bool InBox(const fvec2& pos, const fvec2& size, const fvec4& area);
|
|
||||||
static bool InBox(const fvec2& pos, const fvec4& area);
|
|
||||||
static bool InBox(const fvec2& a, const fvec2& b, const fvec2& c,
|
|
||||||
const fvec4& area);
|
|
||||||
};
|
|
||||||
} // namespace Li
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,75 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/core/core.hpp>
|
|
||||||
#include <pd/lithium/rect.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
namespace Li {
|
|
||||||
/** Use so address type for TexAddress */
|
|
||||||
using TexAddress = uintptr_t;
|
|
||||||
class Texture {
|
|
||||||
public:
|
|
||||||
/** Texture Types */
|
|
||||||
enum Type {
|
|
||||||
RGBA32, ///< Rgba 32Bit
|
|
||||||
RGB24, ///< Rgb 24 Bit
|
|
||||||
A8, ///< A8 8Bit alpha
|
|
||||||
};
|
|
||||||
/** Texture Filters */
|
|
||||||
enum Filter {
|
|
||||||
NEAREST, ///< Nearest
|
|
||||||
LINEAR, ///< Linear
|
|
||||||
};
|
|
||||||
/** Constructor */
|
|
||||||
Texture() : Address(0), Size(0), UV(fvec4(0.f, 0.f, 1.f, 1.f)) {}
|
|
||||||
Texture(TexAddress addr, ivec2 size,
|
|
||||||
Li::Rect uv = fvec4(0.f, 0.f, 1.f, 1.f)) {
|
|
||||||
Address = addr;
|
|
||||||
Size = size;
|
|
||||||
UV = uv;
|
|
||||||
}
|
|
||||||
|
|
||||||
PD_SHARED(Texture);
|
|
||||||
|
|
||||||
void CopyFrom(Texture::Ref tex) {
|
|
||||||
Address = tex->Address;
|
|
||||||
Size = tex->Size;
|
|
||||||
UV = tex->UV;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Left in Code getter (should be remoevd) */
|
|
||||||
ivec2 GetSize() const { return Size; }
|
|
||||||
Li::Rect GetUV() const { return UV; }
|
|
||||||
|
|
||||||
operator ivec2() const { return Size; }
|
|
||||||
operator Li::Rect() const { return UV; }
|
|
||||||
|
|
||||||
TexAddress Address;
|
|
||||||
ivec2 Size;
|
|
||||||
Li::Rect UV;
|
|
||||||
};
|
|
||||||
} // namespace Li
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,52 +1,19 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
/*
|
#include <pd/core/vec.hpp>
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/core/core.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
namespace PD {
|
||||||
namespace Li {
|
namespace Li {
|
||||||
class Vertex {
|
class Vertex {
|
||||||
public:
|
public:
|
||||||
Vertex() {}
|
Vertex() {}
|
||||||
Vertex(const fvec2& p, const fvec2& u, u32 c) {
|
Vertex(const fvec2& pos, const fvec2& uv, u32 color)
|
||||||
Pos.x = p.x;
|
: pos(pos), uv(uv), color(color) {}
|
||||||
Pos.y = p.y;
|
|
||||||
UV = u;
|
|
||||||
Color = c;
|
|
||||||
}
|
|
||||||
~Vertex() {}
|
~Vertex() {}
|
||||||
|
|
||||||
PD_RAW(Vertex);
|
fvec2 pos;
|
||||||
|
fvec2 uv;
|
||||||
// private:
|
u32 color = 0x00000000;
|
||||||
|
|
||||||
/** Open Access Data Section */
|
|
||||||
|
|
||||||
fvec2 Pos;
|
|
||||||
fvec2 UV;
|
|
||||||
u32 Color;
|
|
||||||
};
|
};
|
||||||
} // namespace Li
|
} // namespace Li
|
||||||
} // namespace PD
|
} // namespace PD
|
||||||
90
backends/3ds/include/pd-3ds/bknd-hid.hpp → include/pd/std/vector.hpp
Executable file → Normal file
90
backends/3ds/include/pd-3ds/bknd-hid.hpp → include/pd/std/vector.hpp
Executable file → Normal file
@@ -1,38 +1,54 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
/*
|
/*
|
||||||
MIT License
|
MIT License
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
in the Software without restriction, including without limitation the rights
|
in the Software without restriction, including without limitation the rights
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
furnished to do so, subject to the following conditions:
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
The above copyright notice and this permission notice shall be included in all
|
||||||
copies or substantial portions of the Software.
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
SOFTWARE.
|
SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <pd/drivers/drivers.hpp>
|
#include <pd/common.hpp>
|
||||||
|
|
||||||
namespace PD {
|
namespace PD {
|
||||||
class Hid3DS : public HidDriver {
|
namespace Std {
|
||||||
public:
|
template <typename T>
|
||||||
Hid3DS(PDDriverData data = nullptr);
|
class Vector {
|
||||||
~Hid3DS() = default;
|
public:
|
||||||
|
// for c++ std stuff
|
||||||
PD_SHARED(Hid3DS);
|
using value_type = T;
|
||||||
|
using iterator = value_type*;
|
||||||
void Update() override;
|
using const_iterator = const value_type*;
|
||||||
};
|
|
||||||
|
Vector() {
|
||||||
|
Size = 0;
|
||||||
|
Cap = 0;
|
||||||
|
Data = nullptr;
|
||||||
|
}
|
||||||
|
~Vector() {
|
||||||
|
if (Data) {
|
||||||
|
delete Data;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
T* Data = nullptr;
|
||||||
|
size_t Size = 0;
|
||||||
|
size_t Cap = 0;
|
||||||
|
};
|
||||||
|
} // namespace Std
|
||||||
} // namespace PD
|
} // namespace PD
|
||||||
@@ -1,76 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/ui7/container/container.hpp>
|
|
||||||
#include <pd/ui7/io.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
namespace UI7 {
|
|
||||||
/**
|
|
||||||
* Button Object
|
|
||||||
* @note Button Press is delayed by 1 frame
|
|
||||||
* (but the visual reaction is done in the same frame)
|
|
||||||
* This only means that InPressed is responding the info in
|
|
||||||
* the next frame
|
|
||||||
*/
|
|
||||||
class PD_API Button : public Container {
|
|
||||||
public:
|
|
||||||
/**
|
|
||||||
* Button Object constructor
|
|
||||||
* @param label Label of the Button
|
|
||||||
* @param pos Base Position
|
|
||||||
* @param lr Reference to the Renderer
|
|
||||||
*/
|
|
||||||
Button(const std::string& label, UI7::IO::Ref io) {
|
|
||||||
this->label = label;
|
|
||||||
this->tdim = io->Font->GetTextBounds(label, io->FontScale);
|
|
||||||
}
|
|
||||||
~Button() = default;
|
|
||||||
PD_SHARED(Button);
|
|
||||||
|
|
||||||
/** Return true if butten is pressed*/
|
|
||||||
bool IsPressed() { return pressed; }
|
|
||||||
/**
|
|
||||||
* Override for the Input Handler
|
|
||||||
* @note This function is usally called by Menu::Update
|
|
||||||
*/
|
|
||||||
void HandleInput() override;
|
|
||||||
/**
|
|
||||||
* Override for the Rendering Handler
|
|
||||||
* @note This function is usally called by Menu::Update
|
|
||||||
* */
|
|
||||||
void Draw() override;
|
|
||||||
|
|
||||||
/** Function to Update Size if framepadding changes */
|
|
||||||
void Update() override;
|
|
||||||
|
|
||||||
private:
|
|
||||||
fvec2 tdim; ///< Text size
|
|
||||||
UI7Color color = UI7Color_Button; ///< current button color
|
|
||||||
std::string label; ///< Label of the Button
|
|
||||||
bool pressed = false; ///< ispressed value
|
|
||||||
};
|
|
||||||
} // namespace UI7
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,73 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/ui7/container/container.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
namespace UI7 {
|
|
||||||
/**
|
|
||||||
* Checkbox Object
|
|
||||||
* @note The Updated input is available after
|
|
||||||
* Context::Update while the visual update is done
|
|
||||||
* during the Update
|
|
||||||
*/
|
|
||||||
class PD_API Checkbox : public Container {
|
|
||||||
public:
|
|
||||||
/**
|
|
||||||
* Constructor for Checkbox Object
|
|
||||||
* @param label Label of the Checkbox
|
|
||||||
* @param usr_ref Reference to the bool value to update
|
|
||||||
* @param io IO Reference
|
|
||||||
*/
|
|
||||||
Checkbox(const std::string& label, bool& usr_ref, UI7::IO::Ref io)
|
|
||||||
: usr_ref(usr_ref) {
|
|
||||||
this->label = label;
|
|
||||||
this->tdim = io->Font->GetTextBounds(label, io->FontScale);
|
|
||||||
}
|
|
||||||
~Checkbox() = default;
|
|
||||||
PD_SHARED(Checkbox);
|
|
||||||
/**
|
|
||||||
* Override for the Input Handler
|
|
||||||
* @note This function is usally called by Menu::Update
|
|
||||||
*/
|
|
||||||
void HandleInput() override;
|
|
||||||
/**
|
|
||||||
* Override for the Rendering Handler
|
|
||||||
* @note This function is usally called by Menu::Update
|
|
||||||
* */
|
|
||||||
void Draw() override;
|
|
||||||
|
|
||||||
/** Update Size if framepadding changed */
|
|
||||||
void Update() override;
|
|
||||||
|
|
||||||
private:
|
|
||||||
fvec2 tdim; ///< Text Size
|
|
||||||
fvec2 cbs = fvec2(18); ///< Checkbox size
|
|
||||||
UI7Color color = UI7Color_FrameBackground; ///< Checkbox background Color
|
|
||||||
std::string label; ///< Checkbox Label
|
|
||||||
bool& usr_ref; ///< User bool reference
|
|
||||||
};
|
|
||||||
} // namespace UI7
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,76 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/ui7/container/container.hpp>
|
|
||||||
#include <pd/ui7/io.hpp>
|
|
||||||
#include <pd/ui7/layout.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
namespace UI7 {
|
|
||||||
/**
|
|
||||||
* Color Editor (Creating a PopUP when clicking)
|
|
||||||
*/
|
|
||||||
class PD_API ColorEdit : public Container {
|
|
||||||
public:
|
|
||||||
/**
|
|
||||||
* Constructor
|
|
||||||
* @param label Label of the Button
|
|
||||||
* @param pos Base Position
|
|
||||||
* @param lr Reference to the Renderer
|
|
||||||
*/
|
|
||||||
ColorEdit(const std::string& label, u32* color, UI7::IO::Ref io) {
|
|
||||||
// PD::Assert(color != nullptr, "Input Color Address is null!");
|
|
||||||
this->label = label;
|
|
||||||
this->color_ref = color;
|
|
||||||
this->initial_color = *color;
|
|
||||||
this->tdim = io->Font->GetTextBounds(label, io->FontScale);
|
|
||||||
}
|
|
||||||
~ColorEdit() = default;
|
|
||||||
PD_SHARED(ColorEdit);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Override for the Input Handler
|
|
||||||
* @note This function is usally called by Menu::Update
|
|
||||||
*/
|
|
||||||
void HandleInput() override;
|
|
||||||
/**
|
|
||||||
* Override for the Rendering Handler
|
|
||||||
* @note This function is usally called by Menu::Update
|
|
||||||
* */
|
|
||||||
void Draw() override;
|
|
||||||
|
|
||||||
/** Function to Update Size if framepadding changes */
|
|
||||||
void Update() override;
|
|
||||||
|
|
||||||
private:
|
|
||||||
fvec2 tdim; ///< Text size
|
|
||||||
u32* color_ref = nullptr; ///< Color Reference
|
|
||||||
u32 initial_color; ///< Initial Color
|
|
||||||
std::string label; ///< Label of the Button
|
|
||||||
Layout::Ref layout; ///< Layout to open
|
|
||||||
bool is_shown = false; ///< AHow Layout Editor
|
|
||||||
};
|
|
||||||
} // namespace UI7
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,180 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/core/core.hpp>
|
|
||||||
#include <pd/pd_p_api.hpp>
|
|
||||||
#include <pd/ui7/io.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
namespace UI7 {
|
|
||||||
/**
|
|
||||||
* Container base class all Objects are based on
|
|
||||||
* @note this class can be used to create custom Objects as well
|
|
||||||
*/
|
|
||||||
class PD_API Container {
|
|
||||||
public:
|
|
||||||
Container() = default;
|
|
||||||
/**
|
|
||||||
* Constructor with pos and Size
|
|
||||||
* @param pos Container Position
|
|
||||||
* @param size Container Size
|
|
||||||
*/
|
|
||||||
Container(const fvec2& pos, const fvec2& size) : pos(pos), size(size) {}
|
|
||||||
/**
|
|
||||||
* Constructor by a vec4 box
|
|
||||||
* @param box Box containing top left and bottom right coords
|
|
||||||
*/
|
|
||||||
Container(const fvec4& box)
|
|
||||||
: pos(fvec2(box.x, box.y)), size(fvec2(box.z - box.x, box.w - box.y)) {}
|
|
||||||
~Container() = default;
|
|
||||||
|
|
||||||
PD_SHARED(Container);
|
|
||||||
/**
|
|
||||||
* Init Function Required by every Object that uses
|
|
||||||
* Render or Input functions
|
|
||||||
* @param io IO Reference
|
|
||||||
* @param l DrawList Reference
|
|
||||||
*/
|
|
||||||
void Init(UI7::IO::Ref io, Li::DrawList::Ref l) {
|
|
||||||
list = l;
|
|
||||||
this->io = io;
|
|
||||||
// this->screen = io->Ren->CurrentScreen();
|
|
||||||
}
|
|
||||||
|
|
||||||
void SetClipRect(fvec4 clip) {
|
|
||||||
pClipRect = clip;
|
|
||||||
pCLipRectUsed = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Setter for Position */
|
|
||||||
void SetPos(const fvec2& pos) { this->pos = pos; }
|
|
||||||
/** Setter for Size */
|
|
||||||
void SetSize(const fvec2& size) { this->size = size; }
|
|
||||||
/** Getter for Position */
|
|
||||||
fvec2 GetPos() { return pos; }
|
|
||||||
/** Getter for Size */
|
|
||||||
fvec2 GetSize() { return size; }
|
|
||||||
/**
|
|
||||||
* Get the Containers Final Position
|
|
||||||
* for Rendering and Input (if it has a parent Object)
|
|
||||||
*/
|
|
||||||
fvec2 FinalPos() {
|
|
||||||
vec2 res = pos;
|
|
||||||
if (parent) {
|
|
||||||
/// Probably should use parant->FinalPos here
|
|
||||||
res += parent->GetPos();
|
|
||||||
}
|
|
||||||
return res;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Setter for Parent Container */
|
|
||||||
void SetParent(Container::Ref v) { parent = v; }
|
|
||||||
/** Getter for Parent Container */
|
|
||||||
Container::Ref GetParent() { return parent; }
|
|
||||||
|
|
||||||
/** Check if Rendering can be skipped */
|
|
||||||
bool Skippable() const { return skippable; }
|
|
||||||
/** Check if the Object got a timeout (ID OBJ Relevant) */
|
|
||||||
bool Removable() const { return rem; }
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Handles Scrolling by scrolling pos as well as
|
|
||||||
* Time for Remove for ID Objects
|
|
||||||
* @param scrolling Scrolling Position
|
|
||||||
* @param viewport Viewport to check if the Object is skippable
|
|
||||||
*/
|
|
||||||
void HandleScrolling(fvec2 scrolling, fvec4 viewport);
|
|
||||||
/** Template function for Input Handling */
|
|
||||||
virtual void HandleInput() {}
|
|
||||||
/** Tamplate function for Object rendering */
|
|
||||||
virtual void Draw() {}
|
|
||||||
/** Template function to update internal data (if needed) */
|
|
||||||
virtual void Update() {}
|
|
||||||
|
|
||||||
/** Internal function */
|
|
||||||
void PreDraw();
|
|
||||||
/** Internal function */
|
|
||||||
void PostDraw();
|
|
||||||
|
|
||||||
/** Internal Input Handler */
|
|
||||||
void HandleInternalInput();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Function to unlock Input after Rendering is done in
|
|
||||||
* Menu::Update
|
|
||||||
* @note This is used if the Object got Input Handled directly after creation
|
|
||||||
* to not check for Inputs twice
|
|
||||||
*/
|
|
||||||
void UnlockInput() { inp_done = false; }
|
|
||||||
|
|
||||||
/** Get the Objects ID (if it is an ID object)*/
|
|
||||||
u32 GetID() const { return id; }
|
|
||||||
/**
|
|
||||||
* Set ID for ID Objects
|
|
||||||
* @param id Object ID (hashed prefix+objname+prefixed_counter)
|
|
||||||
*/
|
|
||||||
void SetID(u32 id) { this->id = id; }
|
|
||||||
|
|
||||||
/** Get a reference to IO */
|
|
||||||
UI7::IO::Ref GetIO() { return io; }
|
|
||||||
|
|
||||||
protected:
|
|
||||||
/** used to skip Input/Render preocessing ot not*/
|
|
||||||
bool skippable = false;
|
|
||||||
/** value to check if an ID Object goes out of lifetime*/
|
|
||||||
bool rem = false;
|
|
||||||
/** Time of the last use (set by HandleScrolling)*/
|
|
||||||
u64 last_use = 0;
|
|
||||||
/** Input done or not for current frame*/
|
|
||||||
bool inp_done = false;
|
|
||||||
/** Reference to the Screen to draw the Object on*/
|
|
||||||
// Screen::Ref screen;
|
|
||||||
/** Container Position*/
|
|
||||||
fvec2 pos;
|
|
||||||
/** Container Size*/
|
|
||||||
fvec2 size;
|
|
||||||
/** Reference to the Drawlist to Draw to*/
|
|
||||||
Li::DrawList::Ref list;
|
|
||||||
/** IO Reference for Renderer and Theme */
|
|
||||||
UI7::IO::Ref io;
|
|
||||||
/** Reference to the parent container*/
|
|
||||||
Container::Ref parent;
|
|
||||||
/** Object ID (0 if unused)*/
|
|
||||||
u32 id = 0;
|
|
||||||
/** Internal Flags */
|
|
||||||
u32 pFlags = 0;
|
|
||||||
/** Is Selected? */
|
|
||||||
bool pSelected = false;
|
|
||||||
/** Was Pressed */
|
|
||||||
bool pPressed = false;
|
|
||||||
/** Was Pressed Twice */
|
|
||||||
bool pPressedTwice = false;
|
|
||||||
/** ClipRect */
|
|
||||||
fvec4 pClipRect;
|
|
||||||
/** Clip Rect used */
|
|
||||||
bool pCLipRectUsed = false;
|
|
||||||
};
|
|
||||||
} // namespace UI7
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,92 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/ui7/container/container.hpp>
|
|
||||||
#include <pd/ui7/io.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
namespace UI7 {
|
|
||||||
/**
|
|
||||||
* DragData Object can take a datatype or a list
|
|
||||||
* and modifys these by moving left or right when dragging
|
|
||||||
*/
|
|
||||||
template <typename T>
|
|
||||||
class PD_API DragData : public Container {
|
|
||||||
public:
|
|
||||||
/**
|
|
||||||
* Constructor
|
|
||||||
* @param label Label of the Button
|
|
||||||
* @param data Data reference (Supported types can be seen in dragdata.cpp)
|
|
||||||
* @param num_elms Number of Array elements (for exaple with use ofvec4)
|
|
||||||
* @param io IO Reference
|
|
||||||
* @param min minimum number using Minimum limit
|
|
||||||
* @param max Maximum number set by max limit by default
|
|
||||||
* @param step To set the modifier for drag movement
|
|
||||||
* @param precision for float and double to set precision
|
|
||||||
*/
|
|
||||||
DragData(const std::string& label, T* data, size_t num_elms, UI7::IO::Ref io,
|
|
||||||
T min = std::numeric_limits<T>::min(),
|
|
||||||
T max = std::numeric_limits<T>::max(), T step = 1,
|
|
||||||
int precision = 1) {
|
|
||||||
// PD::Assert(data != nullptr, "Input Data Address is null!");
|
|
||||||
this->label = label;
|
|
||||||
this->data = data;
|
|
||||||
this->elm_count = num_elms;
|
|
||||||
this->min = min;
|
|
||||||
this->max = max;
|
|
||||||
this->step = step;
|
|
||||||
this->precision = precision;
|
|
||||||
this->tdim = io->Font->GetTextBounds(label, io->FontScale);
|
|
||||||
}
|
|
||||||
~DragData() = default;
|
|
||||||
|
|
||||||
/** Als ob das funktioniert... */
|
|
||||||
PD_SHARED(DragData<T>);
|
|
||||||
/**
|
|
||||||
* Override for the Input Handler
|
|
||||||
* @note This function is usally called by Menu::Update
|
|
||||||
*/
|
|
||||||
void HandleInput() override;
|
|
||||||
/**
|
|
||||||
* Override for the Rendering Handler
|
|
||||||
* @note This function is usally called by Menu::Update
|
|
||||||
* */
|
|
||||||
void Draw() override;
|
|
||||||
|
|
||||||
/** Function to Update Size if framepadding changes */
|
|
||||||
void Update() override;
|
|
||||||
|
|
||||||
private:
|
|
||||||
fvec2 tdim; ///< Text size
|
|
||||||
std::string label; ///< Label of the Button
|
|
||||||
T* data;
|
|
||||||
size_t elm_count = 0;
|
|
||||||
T min;
|
|
||||||
T max;
|
|
||||||
T step;
|
|
||||||
int precision = 1;
|
|
||||||
};
|
|
||||||
} // namespace UI7
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,81 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/ui7/container/container.hpp>
|
|
||||||
#include <pd/ui7/io.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
namespace UI7 {
|
|
||||||
/**
|
|
||||||
* Button Object
|
|
||||||
* @note Button Press is delayed by 1 frame
|
|
||||||
* (but the visual reaction is done in the same frame)
|
|
||||||
* This only means that InPressed is responding the info in
|
|
||||||
* the next frame
|
|
||||||
*/
|
|
||||||
class PD_API DynObj : public Container {
|
|
||||||
public:
|
|
||||||
/**
|
|
||||||
* Button Object constructor
|
|
||||||
* @param label Label of the Button
|
|
||||||
* @param pos Base Position
|
|
||||||
* @param lr Reference to the Renderer
|
|
||||||
*/
|
|
||||||
DynObj(std::function<void(UI7::IO::Ref, Li::DrawList::Ref, Container*)>
|
|
||||||
RenderFunc) {
|
|
||||||
pRenFun = RenderFunc;
|
|
||||||
}
|
|
||||||
~DynObj() = default;
|
|
||||||
|
|
||||||
PD_SHARED(DynObj);
|
|
||||||
|
|
||||||
void AddInputHandler(std::function<void(UI7::IO::Ref, Container*)> inp) {
|
|
||||||
pInp = inp;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Return true if butten is pressed*/
|
|
||||||
bool IsPressed() { return pressed; }
|
|
||||||
/**
|
|
||||||
* Override for the Input Handler
|
|
||||||
* @note This function is usally called by Menu::Update
|
|
||||||
*/
|
|
||||||
void HandleInput() override;
|
|
||||||
/**
|
|
||||||
* Override for the Rendering Handler
|
|
||||||
* @note This function is usally called by Menu::Update
|
|
||||||
* */
|
|
||||||
void Draw() override;
|
|
||||||
|
|
||||||
/** Function to Update Size if framepadding changes */
|
|
||||||
void Update() override;
|
|
||||||
|
|
||||||
private:
|
|
||||||
UI7Color color = UI7Color_Button; ///< current button color
|
|
||||||
bool pressed = false; ///< ispressed value
|
|
||||||
std::function<void(UI7::IO::Ref, Li::DrawList::Ref, Container*)> pRenFun;
|
|
||||||
std::function<void(UI7::IO::Ref, Container*)> pInp;
|
|
||||||
};
|
|
||||||
} // namespace UI7
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,69 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/ui7/container/container.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
namespace UI7 {
|
|
||||||
/**
|
|
||||||
* Image Object
|
|
||||||
*/
|
|
||||||
class PD_API Image : public Container {
|
|
||||||
public:
|
|
||||||
/**
|
|
||||||
* Constructor for the Image Object
|
|
||||||
* @param img Image Texture Reference
|
|
||||||
* @param size Custom Size of the Image
|
|
||||||
*/
|
|
||||||
Image(Li::Texture::Ref img, fvec2 size = 0.f, Li::Rect uv = fvec4(0.f)) {
|
|
||||||
if (!img) return;
|
|
||||||
this->img = img;
|
|
||||||
if (size == fvec2(0.f)) {
|
|
||||||
size = img->GetSize();
|
|
||||||
}
|
|
||||||
if (uv == Li::Rect(fvec4(0.f))) {
|
|
||||||
uv = img->GetUV();
|
|
||||||
}
|
|
||||||
this->cuv = uv;
|
|
||||||
this->newsize = size;
|
|
||||||
SetSize(size);
|
|
||||||
}
|
|
||||||
~Image() = default;
|
|
||||||
|
|
||||||
PD_SHARED(Image);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Override for the Rendering Handler
|
|
||||||
* @note This function is usally called by Menu::Update
|
|
||||||
* */
|
|
||||||
void Draw() override;
|
|
||||||
|
|
||||||
private:
|
|
||||||
Li::Texture::Ref img = nullptr; ///< Texture reference to the Image
|
|
||||||
fvec2 newsize = 0.f; ///< New Size
|
|
||||||
Li::Rect cuv; ///< Custom UV
|
|
||||||
};
|
|
||||||
} // namespace UI7
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,65 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/ui7/container/container.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
namespace UI7 {
|
|
||||||
/**
|
|
||||||
* Label [Text] Object
|
|
||||||
*/
|
|
||||||
class PD_API Label : public Container {
|
|
||||||
public:
|
|
||||||
/**
|
|
||||||
* Constructor for Label Object
|
|
||||||
* @param label Label [Text] to Draw
|
|
||||||
* @param lr Renderer Reference
|
|
||||||
*/
|
|
||||||
Label(const std::string& label, IO::Ref io) {
|
|
||||||
this->label = label;
|
|
||||||
this->tdim = io->Font->GetTextBounds(label, io->FontScale);
|
|
||||||
this->SetSize(tdim);
|
|
||||||
}
|
|
||||||
~Label() = default;
|
|
||||||
|
|
||||||
PD_SHARED(Label);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Override for the Rendering Handler
|
|
||||||
* @note This function is usally called by Menu::Update
|
|
||||||
* */
|
|
||||||
void Draw() override;
|
|
||||||
/**
|
|
||||||
* Override Update func to support Text modifications
|
|
||||||
*/
|
|
||||||
void Update() override;
|
|
||||||
|
|
||||||
private:
|
|
||||||
fvec2 tdim; ///< Text Size
|
|
||||||
UI7Color color = UI7Color_Text; ///< Color
|
|
||||||
std::string label; ///< Text to Render
|
|
||||||
};
|
|
||||||
} // namespace UI7
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,91 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/ui7/container/container.hpp>
|
|
||||||
#include <pd/ui7/io.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
namespace UI7 {
|
|
||||||
/**
|
|
||||||
* Slider Object can take a datatype or a list
|
|
||||||
* and modifys these by moving left or right when dragging
|
|
||||||
*/
|
|
||||||
template <typename T>
|
|
||||||
class PD_API Slider : public Container {
|
|
||||||
public:
|
|
||||||
/**
|
|
||||||
* Constructor
|
|
||||||
* @param label Label of the Button
|
|
||||||
* @param data Data reference (Supported types can be seen in Slider.cpp)
|
|
||||||
* @param num_elms Number of Array elements (for exaple with use ofvec4)
|
|
||||||
* @param io IO Reference
|
|
||||||
* @param min minimum number using Minimum limit
|
|
||||||
* @param max Maximum number set by max limit by default
|
|
||||||
* @param step To set the modifier for drag movement
|
|
||||||
* @param precision for float and double to set precision
|
|
||||||
*/
|
|
||||||
Slider(const std::string& label, T* data, UI7::IO::Ref io,
|
|
||||||
T min = std::numeric_limits<T>::min(),
|
|
||||||
T max = std::numeric_limits<T>::max(), int precision = 1) {
|
|
||||||
// PD::Assert(data != nullptr, "Input Data Address is null!");
|
|
||||||
this->label = label;
|
|
||||||
this->data = data;
|
|
||||||
this->min = min;
|
|
||||||
this->max = max;
|
|
||||||
this->precision = precision;
|
|
||||||
this->width = io->CurrentViewPort.z * 0.3f;
|
|
||||||
this->tdim = io->Font->GetTextBounds(label, io->FontScale);
|
|
||||||
}
|
|
||||||
~Slider() = default;
|
|
||||||
|
|
||||||
/** Als ob das funktioniert... */
|
|
||||||
PD_SHARED(Slider<T>);
|
|
||||||
/**
|
|
||||||
* Override for the Input Handler
|
|
||||||
* @note This function is usally called by Menu::Update
|
|
||||||
*/
|
|
||||||
void HandleInput() override;
|
|
||||||
/**
|
|
||||||
* Override for the Rendering Handler
|
|
||||||
* @note This function is usally called by Menu::Update
|
|
||||||
* */
|
|
||||||
void Draw() override;
|
|
||||||
|
|
||||||
/** Function to Update Size if framepadding changes */
|
|
||||||
void Update() override;
|
|
||||||
|
|
||||||
private:
|
|
||||||
fvec2 tdim; ///< Text size
|
|
||||||
float width; ///< Size
|
|
||||||
std::string label; ///< Label of the Button
|
|
||||||
T* data;
|
|
||||||
T min;
|
|
||||||
T max;
|
|
||||||
int precision = 1;
|
|
||||||
float slw = 0.f; // silider drag width (calculated in update)
|
|
||||||
float slp = 0.f; // silider drag pos (calculated in update)
|
|
||||||
};
|
|
||||||
} // namespace UI7
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,33 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/ui7/container/button.hpp>
|
|
||||||
#include <pd/ui7/container/checkbox.hpp>
|
|
||||||
#include <pd/ui7/container/coloredit.hpp>
|
|
||||||
#include <pd/ui7/container/dragdata.hpp>
|
|
||||||
#include <pd/ui7/container/dynobj.hpp>
|
|
||||||
#include <pd/ui7/container/image.hpp>
|
|
||||||
#include <pd/ui7/container/label.hpp>
|
|
||||||
#include <pd/ui7/container/slider.hpp>
|
|
||||||
@@ -1,100 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
/** 32Bit Value to Stpre Menu Flags */
|
|
||||||
using UI7MenuFlags = unsigned int;
|
|
||||||
/** 32Bit Value to store Alignment Flags */
|
|
||||||
using UI7Align = unsigned int;
|
|
||||||
/** 32Bit Value to store Context (IO) flags */
|
|
||||||
using UI7IOFlags = unsigned int;
|
|
||||||
/** 32Bit Value for Layout Flags */
|
|
||||||
using UI7LayoutFlags = unsigned int;
|
|
||||||
|
|
||||||
/** Menu Flags */
|
|
||||||
enum UI7MenuFlags_ {
|
|
||||||
UI7MenuFlags_None = 0, ///< No Flags (Default)
|
|
||||||
UI7MenuFlags_NoTitlebar = 1 << 0, ///< Dont Show Titlebar
|
|
||||||
UI7MenuFlags_CenterTitle = 1 << 1, ///< Center the Menu Title in Titlebar
|
|
||||||
UI7MenuFlags_HzScrolling = 1 << 2, ///< Enable Horizontal Scrolling
|
|
||||||
UI7MenuFlags_VtScrolling = 1 << 3, ///< Enable Vertical Scrolling
|
|
||||||
UI7MenuFlags_NoBackground = 1 << 4, ///< Dont Render Menu Background
|
|
||||||
UI7MenuFlags_NoClipRect = 1 << 5, ///< Disable clip render area of the Menu
|
|
||||||
UI7MenuFlags_NoCollapse = 1 << 6, ///< Disable Menu Collapse
|
|
||||||
UI7MenuFlags_NoMove = 1 << 7, ///< Disable Menu Movement
|
|
||||||
UI7MenuFlags_NoResize = 1 << 8, ///< Disable Menu Resize
|
|
||||||
UI7MenuFlags_NoClose = 1 << 9, ///< Disable Close Button
|
|
||||||
UI7MenuFlags_NoScrollbar = 1 << 10, ///< Hide the Scrollbar
|
|
||||||
// POC
|
|
||||||
UI7MenuFlags_Maximize = 1 << 11, ///< Add a Maximize Button
|
|
||||||
UI7MenuFlags_Minimize = 1 << 12, ///< Add a Minimize Button
|
|
||||||
UI7MenuFlags_AlwaysAutoSize = 1 << 13, ///< Always Auto Resize Menu
|
|
||||||
// Enable Horizontal and Vertical Scrolling
|
|
||||||
UI7MenuFlags_Scrolling = UI7MenuFlags_HzScrolling | UI7MenuFlags_VtScrolling,
|
|
||||||
};
|
|
||||||
|
|
||||||
/** UI7 Layout Flags */
|
|
||||||
enum UI7LayoutFlags_ {
|
|
||||||
UI7LayoutFlags_None = 0, ///< No Flags used
|
|
||||||
UI7LayoutFlags_UseClipRect = 1 << 0, ///< Enable ClipRect
|
|
||||||
};
|
|
||||||
|
|
||||||
/** UI7 Context Flags */
|
|
||||||
enum UI7IOFlags_ {
|
|
||||||
UI7IOFlags_None = 0, ///< No Additional Config available
|
|
||||||
UI7IOFlags_HasTouch = 1 << 0, ///< Enable touch support [future]
|
|
||||||
UI7IOFlags_HasMouseCursor = 1 << 1, ///< Enable Mouse support [future]
|
|
||||||
};
|
|
||||||
|
|
||||||
/** Probably need to update this */
|
|
||||||
enum UI7Align_ {
|
|
||||||
UI7Align_Left = 1 << 0, ///< [Hz Op] Align Left (Default)
|
|
||||||
UI7Align_Center = 1 << 1, ///< [Hz Op] Align Center
|
|
||||||
UI7Align_Right = 1 << 2, ///< [Hz Op] Align Right
|
|
||||||
UI7Align_Top = 1 << 3, ///< [Vt Op] Align Top (Default)
|
|
||||||
UI7Align_Mid = 1 << 4, ///< [Vt Op] Align Mid
|
|
||||||
UI7Align_Bottom = 1 << 5, ///< [Vt Op] Align Bottom
|
|
||||||
// Default Horizontal and Vertical Alignment
|
|
||||||
UI7Align_Default = UI7Align_Left | UI7Align_Top,
|
|
||||||
};
|
|
||||||
|
|
||||||
/** Special flags for Layout::AddObjectEx */
|
|
||||||
enum UI7LytAdd_ {
|
|
||||||
UI7LytAdd_None = 0, ///< Also known as default or ->AddObject
|
|
||||||
UI7LytAdd_NoCursorUpdate = 1 << 0, ///< Add without cursor alignment
|
|
||||||
UI7LytAdd_NoScrollHandle = 1 << 1, ///< Skip HandleScrolling
|
|
||||||
UI7LytAdd_Front = 1 << 2, ///< Add in front of the list
|
|
||||||
};
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Todo: Look at this
|
|
||||||
* Maybe proof of concept ???
|
|
||||||
* Didnt remember that this exists
|
|
||||||
*/
|
|
||||||
enum UI7ContainerFlags_ {
|
|
||||||
UI7ContainerFlags_None = 0,
|
|
||||||
UI7ContainerFlags_EnableInternalInput = 1 << 0,
|
|
||||||
UI7ContainerFlags_Selectable = 1 << 1,
|
|
||||||
UI7ContainerFlags_OutlineSelected = 1 << 2,
|
|
||||||
};
|
|
||||||
@@ -1,74 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/core/core.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
namespace UI7 {
|
|
||||||
/**
|
|
||||||
* ID Class (Generating an ID by String)
|
|
||||||
*/
|
|
||||||
class ID {
|
|
||||||
public:
|
|
||||||
/**
|
|
||||||
* Constructor to Generate ID by input string
|
|
||||||
* @param text Input String
|
|
||||||
*/
|
|
||||||
ID(const std::string& text) {
|
|
||||||
pID = PD::Strings::FastHash(text);
|
|
||||||
// pStrName = text;
|
|
||||||
pName = text;
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* Constructor used for const char* which is automatically
|
|
||||||
* used when directly placing a string istead of using ID("")
|
|
||||||
* @param text Input String
|
|
||||||
*/
|
|
||||||
constexpr ID(const char* text) {
|
|
||||||
pID = PD::FNV1A32(text);
|
|
||||||
pName = text;
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* Use an ID as Input
|
|
||||||
*/
|
|
||||||
ID(u32 id) { pID = id; }
|
|
||||||
~ID() = default;
|
|
||||||
|
|
||||||
/** Get The ID Initial Name */
|
|
||||||
// constexpr const std::string_view& GetNameView() const { return pName; }
|
|
||||||
const std::string GetName() const { return std::string(pName); }
|
|
||||||
|
|
||||||
/** Getter for the raw 32bit int id */
|
|
||||||
constexpr const u32& RawID() const { return pID; }
|
|
||||||
|
|
||||||
/** Return the ID when casting to u32 */
|
|
||||||
constexpr operator u32() const { return pID; }
|
|
||||||
|
|
||||||
u32 pID; ///< Hash of the name
|
|
||||||
std::string pName; ///< Name
|
|
||||||
// std::string pStrName; ///< Keep this stringview alive
|
|
||||||
};
|
|
||||||
} // namespace UI7
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,140 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/core/core.hpp>
|
|
||||||
#include <pd/lithium/lithium.hpp>
|
|
||||||
#include <pd/pd_p_api.hpp>
|
|
||||||
#include <pd/ui7/id.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
namespace UI7 {
|
|
||||||
class InputHandler {
|
|
||||||
public:
|
|
||||||
InputHandler(PD::Context& ctx) : pCtx(ctx) {
|
|
||||||
DragTime = Timer::New(*pCtx.Os().get(), false);
|
|
||||||
}
|
|
||||||
~InputHandler() = default;
|
|
||||||
|
|
||||||
PD_SHARED(InputHandler);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Function to Check if current Object is dragged
|
|
||||||
* or set it dragged
|
|
||||||
* @param id ID to identify this specific Object
|
|
||||||
* @param area Area where to start dragging
|
|
||||||
* @return if inputs to this objects are alowed or not
|
|
||||||
*/
|
|
||||||
bool DragObject(const UI7::ID& id, fvec4 area) {
|
|
||||||
if (CurrentMenu != FocusedMenu) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
if (IsObjectDragged()) {
|
|
||||||
// Only block if the Dragged Object has a difrent id
|
|
||||||
if (DraggedObject != id) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Get a Short define for touch pos
|
|
||||||
fvec2 p = pCtx.Hid()->MousePos();
|
|
||||||
// Check if Drag starts in the area position
|
|
||||||
if ((pCtx.Hid()->IsDown(pCtx.Hid()->Key::Touch) ||
|
|
||||||
pCtx.Hid()->IsEvent(PD::HidDriver::Event_Down, HidKb::Kb_MouseLeft)) &&
|
|
||||||
Li::Renderer::InBox(p, area)) {
|
|
||||||
// Set ID and iniatial Positions
|
|
||||||
DraggedObject = id;
|
|
||||||
DragSourcePos = p;
|
|
||||||
DragPosition = p;
|
|
||||||
DragLastPosition = p;
|
|
||||||
DragDestination = area;
|
|
||||||
// Reset and Start DragTimer
|
|
||||||
DragTime->Reset();
|
|
||||||
DragTime->Rseume();
|
|
||||||
return false; // To make sure the Object is "Dragged"
|
|
||||||
} else if ((pCtx.Hid()->IsHeld(pCtx.Hid()->Key::Touch) ||
|
|
||||||
pCtx.Hid()->IsEvent(PD::HidDriver::Event_Held,
|
|
||||||
HidKb::Kb_MouseLeft)) &&
|
|
||||||
IsObjectDragged()) {
|
|
||||||
// Update DragLast and DragPoisition
|
|
||||||
DragLastPosition = DragPosition;
|
|
||||||
DragPosition = p;
|
|
||||||
} else if ((pCtx.Hid()->IsUp(pCtx.Hid()->Key::Touch) ||
|
|
||||||
pCtx.Hid()->IsEvent(PD::HidDriver::Event_Up,
|
|
||||||
HidKb::Kb_MouseLeft)) &&
|
|
||||||
IsObjectDragged()) {
|
|
||||||
// Released... Everything gets reset
|
|
||||||
DraggedObject = 0;
|
|
||||||
DragPosition = 0;
|
|
||||||
DragSourcePos = 0;
|
|
||||||
DragLastPosition = 0;
|
|
||||||
DragDestination = fvec4(0);
|
|
||||||
// Set Drag released to true (only one frame)
|
|
||||||
// and Only if still in Box
|
|
||||||
DragReleased = Li::Renderer::InBox(pCtx.Hid()->MousePosLast(), area);
|
|
||||||
DragReleasedAW = true; // Advanced
|
|
||||||
u64 d_rel = pCtx.Os()->GetTime();
|
|
||||||
if (d_rel - DragLastReleased < DoubleClickTime) {
|
|
||||||
DragDoubleRelease = true;
|
|
||||||
DragLastReleased = 0; // Set 0 to prevent double exec
|
|
||||||
} else {
|
|
||||||
DragLastReleased = d_rel;
|
|
||||||
}
|
|
||||||
// Ensure timer is paused
|
|
||||||
DragTime->Pause();
|
|
||||||
DragTime->Reset();
|
|
||||||
// Still return The Object is Dragged to ensure
|
|
||||||
// the DragReleased var can be used
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
return IsObjectDragged();
|
|
||||||
}
|
|
||||||
|
|
||||||
void Update() {
|
|
||||||
DragTime->Update();
|
|
||||||
DragReleased = false;
|
|
||||||
DragReleasedAW = false;
|
|
||||||
DragDoubleRelease = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
u64 DoubleClickTime = 500; // Milliseconds
|
|
||||||
u32 FocusedMenu = 0;
|
|
||||||
fvec4 FocusedMenuRect;
|
|
||||||
u32 CurrentMenu = 0;
|
|
||||||
u32 DraggedObject = 0;
|
|
||||||
fvec2 DragSourcePos = 0;
|
|
||||||
fvec2 DragPosition = 0;
|
|
||||||
fvec2 DragLastPosition = 0;
|
|
||||||
/** Fvec4 has an constructor problem currently */
|
|
||||||
fvec4 DragDestination = fvec4(0);
|
|
||||||
Timer::Ref DragTime;
|
|
||||||
u64 DragLastReleased = 0;
|
|
||||||
bool DragReleased = false; ///< Drag Releaded in Box
|
|
||||||
bool DragReleasedAW = false; ///< Drag Released Anywhere
|
|
||||||
bool DragDoubleRelease = false; ///< Double Click
|
|
||||||
PD::Context& pCtx;
|
|
||||||
/** Check if an object is Dragged already */
|
|
||||||
bool IsObjectDragged() const { return DraggedObject != 0; }
|
|
||||||
};
|
|
||||||
} // namespace UI7
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,118 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/core/core.hpp>
|
|
||||||
#include <pd/pd_p_api.hpp>
|
|
||||||
#include <pd/ui7/input_api.hpp>
|
|
||||||
#include <pd/ui7/theme.hpp>
|
|
||||||
#include <pd/ui7/viewport.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
class Context;
|
|
||||||
namespace UI7 {
|
|
||||||
class PD_API IO {
|
|
||||||
public:
|
|
||||||
IO(PD::Context& ctx) : pCtx(ctx) {
|
|
||||||
Time = Timer::New(*pCtx.Os().get());
|
|
||||||
InputHandler = InputHandler::New(pCtx);
|
|
||||||
Theme = UI7::Theme::New();
|
|
||||||
Back = Li::DrawList::New(pCtx);
|
|
||||||
Front = Li::DrawList::New(pCtx);
|
|
||||||
FDL = Li::DrawList::New(pCtx);
|
|
||||||
DeltaStats = TimeStats::New(60);
|
|
||||||
/** Probably not the best solution i guess */
|
|
||||||
CurrentViewPort.z = pCtx.Gfx()->ViewPort.x;
|
|
||||||
CurrentViewPort.w = pCtx.Gfx()->ViewPort.y;
|
|
||||||
}
|
|
||||||
~IO() {}
|
|
||||||
|
|
||||||
PD_SHARED(IO);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* IO Update Internal Variables
|
|
||||||
*/
|
|
||||||
void Update();
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Final Draw List for PD::Li::Gfx::RednerDrawData
|
|
||||||
*
|
|
||||||
* Possible thanks to the DrawList::Merge Feature
|
|
||||||
*/
|
|
||||||
Li::DrawList::Ref FDL = nullptr;
|
|
||||||
ivec4 CurrentViewPort = ivec4(0, 0, 0, 0);
|
|
||||||
std::unordered_map<u32, ViewPort::Ref> ViewPorts;
|
|
||||||
float Framerate = 0.f;
|
|
||||||
float Delta = 0.f;
|
|
||||||
u64 LastTime = 0;
|
|
||||||
TimeStats::Ref DeltaStats;
|
|
||||||
Timer::Ref Time;
|
|
||||||
Li::Font::Ref Font;
|
|
||||||
float FontScale = 0.7f;
|
|
||||||
UI7::Theme::Ref Theme;
|
|
||||||
fvec2 MenuPadding = 5.f;
|
|
||||||
fvec2 FramePadding = 5.f;
|
|
||||||
float ItemRowHeight = 0.f;
|
|
||||||
float FrameRounding = 0.f;
|
|
||||||
fvec2 ItemSpace = vec2(5.f, 2.f);
|
|
||||||
fvec2 MinSliderDragSize = 10.f; // Min height (Vt) and Min Width (Hz)
|
|
||||||
bool ShowMenuBorder = true;
|
|
||||||
bool ShowFrameBorder = false; // not implemented yet
|
|
||||||
bool WrapLabels = false; // Beta state
|
|
||||||
float OverScrollMod = 0.15f;
|
|
||||||
u64 DoubleClickTime = 500; // Milliseconds
|
|
||||||
std::list<std::pair<UI7::ID, Li::DrawList::Ref>> DrawListRegestry;
|
|
||||||
// Short define for DrawKistRegestryLast
|
|
||||||
std::list<std::pair<UI7::ID, Li::DrawList::Ref>> pDLRL;
|
|
||||||
Li::DrawList::Ref Back;
|
|
||||||
Li::DrawList::Ref Front;
|
|
||||||
u32 NumVertices = 0; ///< Debug Vertices Num
|
|
||||||
u32 NumIndices = 0; ///< Debug Indices Num
|
|
||||||
std::vector<u32> MenuOrder;
|
|
||||||
|
|
||||||
PD::Context& pCtx; // Palladium base context
|
|
||||||
|
|
||||||
// DrawListApi
|
|
||||||
void RegisterDrawList(const UI7::ID& id, Li::DrawList::Ref v) {
|
|
||||||
DrawListRegestry.push_back(std::make_pair(id, v));
|
|
||||||
}
|
|
||||||
|
|
||||||
void AddViewPort(const ID& id, const ivec4& size) {
|
|
||||||
if (ViewPorts.count(id)) {
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
ViewPorts[id] = ViewPort::New(id, size);
|
|
||||||
}
|
|
||||||
|
|
||||||
ViewPort::Ref GetViewPort(const ID& id) {
|
|
||||||
if (!ViewPorts.count(id)) {
|
|
||||||
return nullptr;
|
|
||||||
}
|
|
||||||
return ViewPorts[id];
|
|
||||||
}
|
|
||||||
|
|
||||||
UI7::InputHandler::Ref InputHandler;
|
|
||||||
};
|
|
||||||
} // namespace UI7
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,211 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/core/core.hpp>
|
|
||||||
#include <pd/pd_p_api.hpp>
|
|
||||||
#include <pd/ui7/container/container.hpp>
|
|
||||||
#include <pd/ui7/container/dragdata.hpp>
|
|
||||||
#include <pd/ui7/container/slider.hpp>
|
|
||||||
#include <pd/ui7/flags.hpp>
|
|
||||||
#include <pd/ui7/input_api.hpp>
|
|
||||||
#include <pd/ui7/theme.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
namespace UI7 {
|
|
||||||
class Context;
|
|
||||||
class PD_API Layout {
|
|
||||||
public:
|
|
||||||
Layout(const ID& id, IO::Ref io) : ID(id) {
|
|
||||||
this->IO = io;
|
|
||||||
DrawList = Li::DrawList::New(io->pCtx);
|
|
||||||
DrawList->SetFont(IO->Font);
|
|
||||||
DrawList->SetFontScale(io->FontScale);
|
|
||||||
Scrolling[0] = false;
|
|
||||||
Scrolling[1] = false;
|
|
||||||
CursorInit();
|
|
||||||
Pos = fvec2(io->CurrentViewPort.x, io->CurrentViewPort.y);
|
|
||||||
Size = 0;
|
|
||||||
WorkRect = fvec4(IO->MenuPadding, Size - (fvec2(2) * IO->MenuPadding));
|
|
||||||
}
|
|
||||||
~Layout() = default;
|
|
||||||
|
|
||||||
PD_SHARED(Layout);
|
|
||||||
|
|
||||||
/** SECTION CONTAINERS */
|
|
||||||
/**
|
|
||||||
* Render a Simple Label
|
|
||||||
* @param label The text to draw
|
|
||||||
*/
|
|
||||||
void Label(const std::string& label);
|
|
||||||
template <typename... Args>
|
|
||||||
void Label(std::format_string<Args...> s, Args&&... args) {
|
|
||||||
Label(std::format(s, std::forward<Args>(args)...));
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* Render a Button
|
|
||||||
* @param label The buttons text
|
|
||||||
* @return if the button was pressed
|
|
||||||
*/
|
|
||||||
bool Button(const std::string& label);
|
|
||||||
/**
|
|
||||||
* Render a Checkbox
|
|
||||||
* @param label Label of the Checkbox
|
|
||||||
* @param v A value to update
|
|
||||||
*/
|
|
||||||
void Checkbox(const std::string& label, bool& v);
|
|
||||||
/**
|
|
||||||
* Render an Image
|
|
||||||
* @param img Texture reference of the image
|
|
||||||
* @param size a Custom Size if needed
|
|
||||||
*/
|
|
||||||
void Image(Li::Texture::Ref img, fvec2 size = 0.f, Li::Rect uv = fvec4(0));
|
|
||||||
/**
|
|
||||||
* Render a Drag Object witth any supported type:
|
|
||||||
* [`int`, `float`, `double`, `u8`, `u16`, `u32`]
|
|
||||||
* @param label Name of the Drag
|
|
||||||
* @param data Reference to Data Object (can be multiple as well)
|
|
||||||
* @param num_elements Defien the number of Elements in the Data addr
|
|
||||||
* @param precission Difine the Format string len for float/double
|
|
||||||
*/
|
|
||||||
template <typename T>
|
|
||||||
void DragData(const std::string& label, T* data, size_t num_elms = 1,
|
|
||||||
T min = std::numeric_limits<T>::min(),
|
|
||||||
T max = std::numeric_limits<T>::max(), T step = 1,
|
|
||||||
int precision = 1) {
|
|
||||||
u32 id = Strings::FastHash("drd" + label + std::to_string((uintptr_t)data));
|
|
||||||
Container::Ref r = FindObject(id);
|
|
||||||
if (!r) {
|
|
||||||
r = UI7::DragData<T>::New(label, data, num_elms, this->IO, min, max, step,
|
|
||||||
precision);
|
|
||||||
r->SetID(id);
|
|
||||||
}
|
|
||||||
AddObject(r);
|
|
||||||
}
|
|
||||||
template <typename T>
|
|
||||||
void Slider(const std::string& label, T* data,
|
|
||||||
T min = std::numeric_limits<T>::min(),
|
|
||||||
T max = std::numeric_limits<T>::max(), int precision = 1) {
|
|
||||||
u32 id = Strings::FastHash("drd" + label + std::to_string((uintptr_t)data));
|
|
||||||
Container::Ref r = FindObject(id);
|
|
||||||
if (!r) {
|
|
||||||
r = UI7::Slider<T>::New(label, data, this->IO, min, max, precision);
|
|
||||||
r->SetID(id);
|
|
||||||
}
|
|
||||||
AddObject(r);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** SECTION OTHERSTUFF */
|
|
||||||
|
|
||||||
const std::string GetName() const { return ID.GetName(); }
|
|
||||||
const UI7::ID& GetID() const { return this->ID; }
|
|
||||||
|
|
||||||
const fvec2& GetPosition() const { return Pos; }
|
|
||||||
void SetPosition(const fvec2& v) { Pos = v; }
|
|
||||||
const fvec2& GetSize() const { return Size; }
|
|
||||||
void SetSize(const fvec2& v) { Size = v; }
|
|
||||||
|
|
||||||
Li::DrawList::Ref GetDrawList() { return DrawList; }
|
|
||||||
|
|
||||||
void CursorInit();
|
|
||||||
void SameLine();
|
|
||||||
void CursorMove(const fvec2& size);
|
|
||||||
|
|
||||||
bool ObjectWorkPos(fvec2& movpos);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Extended Object Add Func to Add Object in Front or disable
|
|
||||||
* Position by cursor as well as cursor update...
|
|
||||||
* Should only be used in special cases as the
|
|
||||||
* AddObject function is faster
|
|
||||||
* Using Flags for its features cause dont want to have too much args
|
|
||||||
*/
|
|
||||||
void AddObjectEx(Container::Ref obj, u32 Flags);
|
|
||||||
/**
|
|
||||||
* Fast Function to Add Object in Layout SPace like
|
|
||||||
* button Label images etc
|
|
||||||
*/
|
|
||||||
void AddObject(Container::Ref obj);
|
|
||||||
Container::Ref FindObject(u32 id);
|
|
||||||
void ClearIDObjects() { IDObjects.clear(); }
|
|
||||||
|
|
||||||
fvec2 AlignPosition(fvec2 pos, fvec2 size, fvec4 area, UI7Align alignment);
|
|
||||||
|
|
||||||
/** Get the Alignment for Current State */
|
|
||||||
UI7Align GetAlignment() {
|
|
||||||
/// if temp alignment is used then return it and
|
|
||||||
/// reset tmpalign
|
|
||||||
if (TempAlign) {
|
|
||||||
auto t = TempAlign;
|
|
||||||
TempAlign = 0;
|
|
||||||
return t;
|
|
||||||
}
|
|
||||||
return Alignment;
|
|
||||||
}
|
|
||||||
|
|
||||||
void SetAlign(UI7Align a) { Alignment = a; }
|
|
||||||
void NextAlign(UI7Align a) { TempAlign = a; }
|
|
||||||
|
|
||||||
void Update();
|
|
||||||
|
|
||||||
fvec2 DbgScrollOffset() { return ScrollOffset; }
|
|
||||||
|
|
||||||
private:
|
|
||||||
friend class Menu;
|
|
||||||
friend class PD::UI7::Context;
|
|
||||||
friend class ReMenu;
|
|
||||||
// Base Components
|
|
||||||
UI7::ID ID;
|
|
||||||
UI7::IO::Ref IO;
|
|
||||||
Li::DrawList::Ref DrawList;
|
|
||||||
UI7LayoutFlags Flags;
|
|
||||||
|
|
||||||
// Positioning
|
|
||||||
fvec2 Pos;
|
|
||||||
fvec2 Size;
|
|
||||||
UI7Align Alignment = UI7Align_Default;
|
|
||||||
UI7Align TempAlign;
|
|
||||||
|
|
||||||
// Cursor
|
|
||||||
fvec2 Cursor;
|
|
||||||
fvec2 InitialCursorOffset;
|
|
||||||
fvec2 BackupCursor;
|
|
||||||
fvec2 SamelineCursor;
|
|
||||||
fvec2 BeforeSameLine;
|
|
||||||
fvec2 LastObjSize;
|
|
||||||
fvec2 MaxPosition;
|
|
||||||
fvec4 WorkRect;
|
|
||||||
|
|
||||||
// Scrolling (Only theoretical)
|
|
||||||
// Rendering must be done by the Objective that uses the Lyt
|
|
||||||
fvec2 ScrollOffset;
|
|
||||||
fvec2 ScrollStart;
|
|
||||||
bool Scrolling[2];
|
|
||||||
|
|
||||||
// Objects
|
|
||||||
std::list<Container::Ref> Objects;
|
|
||||||
std::vector<Container::Ref> IDObjects;
|
|
||||||
};
|
|
||||||
} // namespace UI7
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,146 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/core/core.hpp>
|
|
||||||
#include <pd/pd_p_api.hpp>
|
|
||||||
#include <pd/ui7/containers.hpp>
|
|
||||||
#include <pd/ui7/io.hpp>
|
|
||||||
#include <pd/ui7/layout.hpp>
|
|
||||||
|
|
||||||
#include "pd/ui7/container/dragdata.hpp"
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
namespace UI7 {
|
|
||||||
class PD_API Menu {
|
|
||||||
public:
|
|
||||||
Menu(const UI7::ID& id, UI7::IO::Ref pIO);
|
|
||||||
~Menu() {}
|
|
||||||
|
|
||||||
PD_SHARED(Menu);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Render a Simple Label
|
|
||||||
* @param label The text to draw
|
|
||||||
*/
|
|
||||||
void Label(const std::string& label);
|
|
||||||
template <typename... Args>
|
|
||||||
void Label(std::format_string<Args...> s, Args&&... args) {
|
|
||||||
Label(std::format(s, std::forward<Args>(args)...));
|
|
||||||
}
|
|
||||||
/**
|
|
||||||
* Render a Button
|
|
||||||
* @param label The buttons text
|
|
||||||
* @return if the button was pressed
|
|
||||||
*/
|
|
||||||
bool Button(const std::string& label);
|
|
||||||
/**
|
|
||||||
* Render a Checkbox
|
|
||||||
* @param label Label of the Checkbox
|
|
||||||
* @param v A value to update
|
|
||||||
*/
|
|
||||||
void Checkbox(const std::string& label, bool& v);
|
|
||||||
/**
|
|
||||||
* Render an Image
|
|
||||||
* @param img Texture reference of the image
|
|
||||||
* @param size a Custom Size if needed
|
|
||||||
*/
|
|
||||||
void Image(Li::Texture::Ref img, fvec2 size = 0.f, Li::Rect uv = fvec4(0));
|
|
||||||
/**
|
|
||||||
* Render a Drag Object witth any supported type:
|
|
||||||
* [`int`, `float`, `double`, `u8`, `u16`, `u32`]
|
|
||||||
* @param label Name of the Drag
|
|
||||||
* @param data Reference to Data Object (can be multiple as well)
|
|
||||||
* @param num_elements Defien the number of Elements in the Data addr
|
|
||||||
* @param precission Difine the Format string len for float/double
|
|
||||||
*/
|
|
||||||
template <typename T>
|
|
||||||
void DragData(const std::string& label, T* data, size_t num_elms = 1,
|
|
||||||
T min = std::numeric_limits<T>::min(),
|
|
||||||
T max = std::numeric_limits<T>::max(), T step = 1,
|
|
||||||
int precision = 1) {
|
|
||||||
u32 id = Strings::FastHash("drd" + label + std::to_string((uintptr_t)data));
|
|
||||||
Container::Ref r = pLayout->FindObject(id);
|
|
||||||
if (!r) {
|
|
||||||
r = UI7::DragData<T>::New(label, data, num_elms, pIO, min, max, step,
|
|
||||||
precision);
|
|
||||||
// Isnt This exactly the same line???
|
|
||||||
// r = UI7::DragData<T>::New(label, data, num_elms, pIO, min, max, step,
|
|
||||||
// precision);
|
|
||||||
r->SetID(id);
|
|
||||||
}
|
|
||||||
pLayout->AddObject(r);
|
|
||||||
}
|
|
||||||
template <typename T>
|
|
||||||
void Slider(const std::string& label, T* data,
|
|
||||||
T min = std::numeric_limits<T>::min(),
|
|
||||||
T max = std::numeric_limits<T>::max(), int precision = 1) {
|
|
||||||
u32 id = Strings::FastHash("drd" + label + std::to_string((uintptr_t)data));
|
|
||||||
Container::Ref r = pLayout->FindObject(id);
|
|
||||||
if (!r) {
|
|
||||||
r = UI7::Slider<T>::New(label, data, pIO, min, max, precision);
|
|
||||||
r->SetID(id);
|
|
||||||
}
|
|
||||||
pLayout->AddObject(r);
|
|
||||||
}
|
|
||||||
void ColorEdit(const std::string& label, u32& clr);
|
|
||||||
void SameLine() { pLayout->SameLine(); }
|
|
||||||
void Separator();
|
|
||||||
void SeparatorText(const std::string& label);
|
|
||||||
bool BeginTreeNode(const ID& id);
|
|
||||||
void EndTreeNode();
|
|
||||||
|
|
||||||
void HandleFocus();
|
|
||||||
void HandleScrolling();
|
|
||||||
void HandleTitlebarActions();
|
|
||||||
void DrawBaseLayout();
|
|
||||||
|
|
||||||
void AddObject(PD::UI7::Container::Ref obj) { pLayout->AddObject(obj); }
|
|
||||||
void AddObjectEx(PD::UI7::Container::Ref obj, PD::u32 flags) {
|
|
||||||
pLayout->AddObjectEx(obj, flags);
|
|
||||||
}
|
|
||||||
Container::Ref FindObject(u32 id) { return pLayout->FindObject(id); }
|
|
||||||
|
|
||||||
void Update();
|
|
||||||
|
|
||||||
void SetSize(PD::fvec2 size) { pLayout->SetSize(size); }
|
|
||||||
void SetPosition(PD::fvec2 pos) { pLayout->SetPosition(pos); }
|
|
||||||
const PD::fvec2& GetSize() const { return pLayout->GetSize(); }
|
|
||||||
const PD::fvec2& GetPosition() const { return pLayout->GetPosition(); }
|
|
||||||
|
|
||||||
/** Data Section */
|
|
||||||
|
|
||||||
UI7MenuFlags Flags = 0;
|
|
||||||
Layout::Ref pLayout;
|
|
||||||
IO::Ref pIO;
|
|
||||||
ID pID;
|
|
||||||
bool* pIsShown = nullptr;
|
|
||||||
bool pIsOpen = true;
|
|
||||||
std::unordered_map<u32, bool> pTreeNodes;
|
|
||||||
fvec2 TempScrollXY;
|
|
||||||
|
|
||||||
float TitleBarHeight = 0.f;
|
|
||||||
};
|
|
||||||
} // namespace UI7
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,160 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/core/core.hpp>
|
|
||||||
#include <pd/pd_p_api.hpp>
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Using this to support 32bit color values as well as
|
|
||||||
* values from UI7Color_
|
|
||||||
*/
|
|
||||||
using UI7Color = PD::u32;
|
|
||||||
|
|
||||||
/** Theme Color */
|
|
||||||
enum UI7Color_ {
|
|
||||||
UI7Color_Background, ///< UI7 Menu Background
|
|
||||||
UI7Color_Border, ///< Menu/Frame Border Color
|
|
||||||
UI7Color_Button, ///< UI7 Button Idle Color
|
|
||||||
UI7Color_ButtonDead, ///< UI7 Disabled Button Color
|
|
||||||
UI7Color_ButtonActive, ///< UI7 Pressed Button Color
|
|
||||||
UI7Color_ButtonHovered, ///< UI7 Hovered Button Color
|
|
||||||
UI7Color_Text, ///< UI7 Text Color
|
|
||||||
UI7Color_TextDead, ///< UI7 Dead Text Color
|
|
||||||
UI7Color_Header, ///< UI7 Menu Header Color
|
|
||||||
UI7Color_HeaderDead, ///< Inactive Header
|
|
||||||
UI7Color_Selector, ///< UI7 Selector Color
|
|
||||||
UI7Color_Checkmark, ///< UI7 Checkmark Color
|
|
||||||
UI7Color_FrameBackground, ///< UI7 Frame Background
|
|
||||||
UI7Color_FrameBackgroundHovered, ///< UI7 Hovered Frame Background
|
|
||||||
UI7Color_Progressbar, ///< UI7 Progressbar Background
|
|
||||||
UI7Color_ListEven, ///< UI7 List (Even Entry) Background Color
|
|
||||||
UI7Color_ListOdd, ///< UI7 List (Odd Entry) Background Color
|
|
||||||
};
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
namespace UI7 {
|
|
||||||
class PD_API Theme {
|
|
||||||
public:
|
|
||||||
/**
|
|
||||||
* Default Constructor Setting up the Default theme
|
|
||||||
* @note if using Shared Reference you probably need to do
|
|
||||||
* Theme::Default(*theme.get());
|
|
||||||
*/
|
|
||||||
Theme() { Default(*this); }
|
|
||||||
~Theme() {}
|
|
||||||
PD_SHARED(Theme);
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Simple static Loader for the Default Theme
|
|
||||||
* @param theme Theme Reference
|
|
||||||
*/
|
|
||||||
static void Default(Theme& theme);
|
|
||||||
/**
|
|
||||||
* White Mode Theme
|
|
||||||
* @param Theme theme reference
|
|
||||||
*/
|
|
||||||
static void Flashbang(Theme& theme);
|
|
||||||
|
|
||||||
/** Revert the last Color Change */
|
|
||||||
Theme& Pop() {
|
|
||||||
pTheme[pChanges[pChanges.size() - 1].first] =
|
|
||||||
pChanges[pChanges.size() - 1].second;
|
|
||||||
pChanges.pop_back();
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Revert the last color Change done for a specific color
|
|
||||||
* @param c Color to revert change from
|
|
||||||
*/
|
|
||||||
Theme& Pop(UI7Color c) {
|
|
||||||
for (size_t i = pChanges.size() - 1; i > 0; i--) {
|
|
||||||
if (pChanges[i].first == c) {
|
|
||||||
pTheme[c] = pChanges[i].second;
|
|
||||||
pChanges.erase(pChanges.begin() + i);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Change a Color
|
|
||||||
* @param tc Color Identifier
|
|
||||||
* @param color Color to change to
|
|
||||||
*/
|
|
||||||
Theme& Change(UI7Color tc, u32 color) {
|
|
||||||
if (pTheme.find(tc) == pTheme.end()) {
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
pChanges.push_back(std::make_pair(tc, pTheme[tc]));
|
|
||||||
pTheme[tc] = color;
|
|
||||||
return *this;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Get the Color of a Color ReferenceID
|
|
||||||
* @param c ReferenceID
|
|
||||||
*/
|
|
||||||
u32 Get(UI7Color c) const {
|
|
||||||
auto e = pTheme.find(c);
|
|
||||||
if (e == pTheme.end()) {
|
|
||||||
return 0x00000000;
|
|
||||||
}
|
|
||||||
return e->second;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* [UNSAFE] to use
|
|
||||||
* Get the Color Ref of a Color ReferenceID
|
|
||||||
* @param c ReferenceID
|
|
||||||
*/
|
|
||||||
u32& GetRef(UI7Color c) {
|
|
||||||
auto e = pTheme.find(c);
|
|
||||||
if (e == pTheme.end()) {
|
|
||||||
static u32 noclr = 0x00000000;
|
|
||||||
return noclr;
|
|
||||||
}
|
|
||||||
return e->second;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Operator wrapper for get
|
|
||||||
* @param c Color ReferenceID
|
|
||||||
*/
|
|
||||||
u32 operator[](UI7Color c) const { return Get(c); }
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Change but just sets [can implement completly new ids]
|
|
||||||
* @param tc Color ID (Can be self creeated ones as well)
|
|
||||||
* @param clr Color it should be set to
|
|
||||||
*/
|
|
||||||
void Set(UI7Color tc, u32 clr) { pTheme[tc] = clr; }
|
|
||||||
|
|
||||||
std::unordered_map<u32, u32> pTheme; ///< Theme Data
|
|
||||||
std::vector<std::pair<UI7Color, u32>> pChanges; ///< List of Changes
|
|
||||||
};
|
|
||||||
} // namespace UI7
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,88 +0,0 @@
|
|||||||
#pragma once
|
|
||||||
|
|
||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/core/core.hpp>
|
|
||||||
#include <pd/pd_p_api.hpp>
|
|
||||||
#include <pd/ui7/io.hpp>
|
|
||||||
#include <pd/ui7/menu.hpp>
|
|
||||||
|
|
||||||
#include "pd/ui7/flags.hpp"
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Declare UI7 Version
|
|
||||||
* Format: 00 00 00 00
|
|
||||||
* Major Minor Patch Build
|
|
||||||
* 0x01010000 -> 1.1.0-0
|
|
||||||
*/
|
|
||||||
#define UI7_VERSION 0x00060000
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
namespace UI7 {
|
|
||||||
/**
|
|
||||||
* Get UI7 Version String
|
|
||||||
* @param show_build Show build num (mostly unused)
|
|
||||||
* @return Version String (1.0.0-1 for example)
|
|
||||||
*/
|
|
||||||
PD_API std::string GetVersion(bool show_build = false);
|
|
||||||
/** Base Context for UI7 */
|
|
||||||
class PD_API Context {
|
|
||||||
public:
|
|
||||||
Context(PD::Context& ctx) { pIO = IO::New(ctx); }
|
|
||||||
~Context() = default;
|
|
||||||
|
|
||||||
PD_SHARED(Context);
|
|
||||||
|
|
||||||
IO::Ref GetIO() { return pIO; }
|
|
||||||
void AddViewPort(const ID& id, const ivec4& vp);
|
|
||||||
void UseViewPort(const ID& id);
|
|
||||||
void Update();
|
|
||||||
Menu::Ref BeginMenu(const ID& id, UI7MenuFlags flags = 0,
|
|
||||||
bool* pShow = nullptr);
|
|
||||||
Menu::Ref CurrentMenu() { return pCurrent; }
|
|
||||||
void EndMenu();
|
|
||||||
void AboutMenu(bool* show = nullptr);
|
|
||||||
void MetricsMenu(bool* show = nullptr);
|
|
||||||
void StyleEditor(bool* show = nullptr);
|
|
||||||
|
|
||||||
Li::DrawList::Ref GetDrawData() { return pIO->FDL; }
|
|
||||||
|
|
||||||
Menu::Ref pGetOrCreateMenu(const ID& id) {
|
|
||||||
auto menu = pMenus.find(id);
|
|
||||||
if (menu == pMenus.end()) {
|
|
||||||
pMenus[id] = Menu::New(id, pIO);
|
|
||||||
menu = pMenus.find(id);
|
|
||||||
}
|
|
||||||
return menu->second;
|
|
||||||
}
|
|
||||||
|
|
||||||
IO::Ref pIO;
|
|
||||||
/** Current Menu */
|
|
||||||
Menu::Ref pCurrent = nullptr;
|
|
||||||
std::vector<u32> pCurrentMenus;
|
|
||||||
std::vector<u32> pDFO; /** Debug Final Order */
|
|
||||||
std::unordered_map<u32, Menu::Ref> pMenus;
|
|
||||||
};
|
|
||||||
} // namespace UI7
|
|
||||||
} // namespace PD
|
|
||||||
76
source/core/bit_util.cpp → source/core/bits.cpp
Executable file → Normal file
76
source/core/bit_util.cpp → source/core/bits.cpp
Executable file → Normal file
@@ -1,38 +1,38 @@
|
|||||||
/*
|
/*
|
||||||
MIT License
|
MIT License
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
Permission is hereby granted, free of charge, to any person obtaining a copy
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
of this software and associated documentation files (the "Software"), to deal
|
||||||
in the Software without restriction, including without limitation the rights
|
in the Software without restriction, including without limitation the rights
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
copies of the Software, and to permit persons to whom the Software is
|
||||||
furnished to do so, subject to the following conditions:
|
furnished to do so, subject to the following conditions:
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
The above copyright notice and this permission notice shall be included in all
|
||||||
copies or substantial portions of the Software.
|
copies or substantial portions of the Software.
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
||||||
SOFTWARE.
|
SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <pd/core/bit_util.hpp>
|
#include <pd/core/bits.hpp>
|
||||||
|
|
||||||
namespace PD::BitUtil {
|
namespace PD::Bits {
|
||||||
PD_API bool IsSingleBit(u32 v) { return v && !(v & (v - 1)); }
|
PD_API bool IsSingleBit(u32 v) { return v && !(v & (v - 1)); }
|
||||||
PD_API u32 GetPow2(u32 v) {
|
PD_API u32 GetPow2(u32 v) {
|
||||||
v--;
|
v--;
|
||||||
v |= v >> 1;
|
v |= v >> 1;
|
||||||
v |= v >> 2;
|
v |= v >> 2;
|
||||||
v |= v >> 4;
|
v |= v >> 4;
|
||||||
v |= v >> 8;
|
v |= v >> 8;
|
||||||
v |= v >> 16;
|
v |= v >> 16;
|
||||||
v++;
|
v++;
|
||||||
return (v >= 64 ? v : 64);
|
return (v >= 64 ? v : 64);
|
||||||
}
|
}
|
||||||
} // namespace PD::BitUtil
|
} // namespace PD::Bits
|
||||||
@@ -26,14 +26,10 @@ SOFTWARE.
|
|||||||
namespace PD {
|
namespace PD {
|
||||||
PD_API std::string Color::Hex(bool rgba) const {
|
PD_API std::string Color::Hex(bool rgba) const {
|
||||||
/** Need to int cast (so it is used as num and not char...) */
|
/** Need to int cast (so it is used as num and not char...) */
|
||||||
std::stringstream s;
|
std::string ret = std::format("#{:02X}{:02X}{:02X}", r, g, b);
|
||||||
s << "#";
|
|
||||||
s << std::hex << std::setw(2) << std::setfill('0') << (int)r;
|
|
||||||
s << std::hex << std::setw(2) << std::setfill('0') << (int)g;
|
|
||||||
s << std::hex << std::setw(2) << std::setfill('0') << (int)b;
|
|
||||||
if (rgba || a != 255) { // QoL change btw
|
if (rgba || a != 255) { // QoL change btw
|
||||||
s << std::hex << std::setw(2) << std::setfill('0') << (int)a;
|
ret += std::format("{:02X}", a);
|
||||||
}
|
}
|
||||||
return s.str();
|
return ret;
|
||||||
}
|
}
|
||||||
} // namespace PD
|
} // namespace PD
|
||||||
@@ -22,22 +22,25 @@ SOFTWARE.
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <pd/core/timer.hpp>
|
#include <pd/core/timer.hpp>
|
||||||
#include <pd/drivers/drivers.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
namespace PD {
|
||||||
PD_API Timer::Timer(OsDriver& os, bool autostart) : pOs(os) {
|
PD_API Timer::Timer(bool autostart) {
|
||||||
pIsRunning = autostart;
|
pIsRunning = autostart;
|
||||||
Reset();
|
Reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
PD_API void Timer::Reset() {
|
PD_API void Timer::Reset() {
|
||||||
pStart = pOs.GetTime();
|
pStart = std::chrono::duration_cast<std::chrono::milliseconds>(
|
||||||
|
std::chrono::steady_clock::now().time_since_epoch())
|
||||||
|
.count();
|
||||||
pNow = pStart;
|
pNow = pStart;
|
||||||
}
|
}
|
||||||
|
|
||||||
PD_API void Timer::Update() {
|
PD_API void Timer::Update() {
|
||||||
if (pIsRunning) {
|
if (pIsRunning) {
|
||||||
pNow = pOs.GetTime();
|
pNow = std::chrono::duration_cast<std::chrono::milliseconds>(
|
||||||
|
std::chrono::steady_clock::now().time_since_epoch())
|
||||||
|
.count();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -22,15 +22,14 @@ SOFTWARE.
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include <pd/core/timetrace.hpp>
|
#include <pd/core/timetrace.hpp>
|
||||||
#include <pd/drivers/drivers.hpp>
|
|
||||||
|
|
||||||
namespace PD::TT {
|
namespace PD::TT {
|
||||||
PD_API void Beg(OsDriver& os, const std::string& id) {
|
PD_API void Beg(const std::string& id) {
|
||||||
auto trace = os.GetTraceRef(id);
|
auto trace = os.GetTraceRef(id);
|
||||||
trace->SetStart(os.GetNanoTime());
|
trace->SetStart(os.GetNanoTime());
|
||||||
}
|
}
|
||||||
|
|
||||||
PD_API void End(OsDriver& os, const std::string& id) {
|
PD_API void End(const std::string& id) {
|
||||||
auto trace = os.GetTraceRef(id);
|
auto trace = os.GetTraceRef(id);
|
||||||
trace->SetEnd(os.GetNanoTime());
|
trace->SetEnd(os.GetNanoTime());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,42 +0,0 @@
|
|||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/drivers/context.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
PD_API Context::Ref Context::Create() {
|
|
||||||
Context::Ref ctx = Context::New();
|
|
||||||
ctx->pGfx = GfxDriver::New();
|
|
||||||
ctx->pOs = OsDriver::New();
|
|
||||||
ctx->pHid = HidDriver::New();
|
|
||||||
return ctx;
|
|
||||||
}
|
|
||||||
|
|
||||||
PD_API PD::Li::Texture::Ref Context::GetSolidTex() {
|
|
||||||
if (pSolidTex == nullptr) {
|
|
||||||
std::vector<u8> data(16 * 16 * 4, 0xff);
|
|
||||||
pSolidTex = pGfx->LoadTex(data, 16, 16);
|
|
||||||
}
|
|
||||||
return pSolidTex;
|
|
||||||
}
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/drivers/gfx.hpp>
|
|
||||||
|
|
||||||
namespace PD {} // namespace PD
|
|
||||||
@@ -1,62 +0,0 @@
|
|||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/drivers/hid.hpp>
|
|
||||||
|
|
||||||
namespace PD {
|
|
||||||
PD_API bool HidDriver::IsEvent(Event e, Key keys) {
|
|
||||||
return KeyEvents[0][e] & keys;
|
|
||||||
}
|
|
||||||
|
|
||||||
PD_API bool HidDriver::IsEvent(Event e, KbKey keys) {
|
|
||||||
return KbKeyEvents[0][e].Has(keys);
|
|
||||||
}
|
|
||||||
|
|
||||||
PD_API void HidDriver::SwapTab() {
|
|
||||||
auto tkd = KeyEvents[1][Event_Down];
|
|
||||||
auto tkh = KeyEvents[1][Event_Held];
|
|
||||||
auto tku = KeyEvents[1][Event_Up];
|
|
||||||
KeyEvents[1][Event_Down] = KeyEvents[0][Event_Down];
|
|
||||||
KeyEvents[1][Event_Held] = KeyEvents[0][Event_Held];
|
|
||||||
KeyEvents[1][Event_Up] = KeyEvents[0][Event_Up];
|
|
||||||
KeyEvents[0][Event_Down] = tkd;
|
|
||||||
KeyEvents[0][Event_Held] = tkh;
|
|
||||||
KeyEvents[0][Event_Up] = tku;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* If this func has no verride, still clear the stats
|
|
||||||
* cause if they are empty this leads to a crash
|
|
||||||
*/
|
|
||||||
PD_API void HidDriver::Update() {
|
|
||||||
// Clear States
|
|
||||||
for (int i = 0; i < 2; i++) {
|
|
||||||
KeyEvents[i][Event_Down] = 0;
|
|
||||||
KeyEvents[i][Event_Held] = 0;
|
|
||||||
KeyEvents[i][Event_Up] = 0;
|
|
||||||
for (auto& it : KbKeyEvents[i]) {
|
|
||||||
it.second = Event_Null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} // namespace PD
|
|
||||||
@@ -1,52 +1,16 @@
|
|||||||
/*
|
|
||||||
MIT License
|
|
||||||
Copyright (c) 2024 - 2026 René Amthor (tobid7)
|
|
||||||
|
|
||||||
Permission is hereby granted, free of charge, to any person obtaining a copy
|
|
||||||
of this software and associated documentation files (the "Software"), to deal
|
|
||||||
in the Software without restriction, including without limitation the rights
|
|
||||||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
|
|
||||||
copies of the Software, and to permit persons to whom the Software is
|
|
||||||
furnished to do so, subject to the following conditions:
|
|
||||||
|
|
||||||
The above copyright notice and this permission notice shall be included in all
|
|
||||||
copies or substantial portions of the Software.
|
|
||||||
|
|
||||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
||||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
||||||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
|
||||||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
||||||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
|
|
||||||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
||||||
SOFTWARE.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <pd/drivers/os.hpp>
|
#include <pd/drivers/os.hpp>
|
||||||
|
|
||||||
namespace PD {
|
namespace PD {
|
||||||
PD_API TT::Res::Ref& OsDriver::GetTraceRef(const std::string& id) {
|
PD_API std::unique_ptr<OsDriver> Os::driver;
|
||||||
if (!pTraces.count(id)) {
|
|
||||||
pTraces[id] = TT::Res::New();
|
|
||||||
pTraces[id]->SetID(id);
|
|
||||||
}
|
|
||||||
return pTraces[id];
|
|
||||||
}
|
|
||||||
|
|
||||||
PD_API TraceMap& OsDriver::GetTraceMap() { return pTraces; }
|
PD_API u64 OsDriver::GetTime() const {
|
||||||
|
|
||||||
PD_API bool OsDriver::TraceExist(const std::string& id) {
|
|
||||||
return pTraces.count(id);
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Standart Driver */
|
|
||||||
PD_API u64 OsDriver::GetTime() {
|
|
||||||
return std::chrono::duration_cast<std::chrono::milliseconds>(
|
return std::chrono::duration_cast<std::chrono::milliseconds>(
|
||||||
std::chrono::steady_clock::now().time_since_epoch())
|
std::chrono::steady_clock::now().time_since_epoch())
|
||||||
.count();
|
.count();
|
||||||
}
|
}
|
||||||
|
|
||||||
PD_API u64 OsDriver::GetNanoTime() {
|
PD_API u64 OsDriver::GetTimeNano() const {
|
||||||
return std::chrono::duration_cast<std::chrono::nanoseconds>(
|
return std::chrono::duration_cast<std::chrono::milliseconds>(
|
||||||
std::chrono::steady_clock::now().time_since_epoch())
|
std::chrono::steady_clock::now().time_since_epoch())
|
||||||
.count();
|
.count();
|
||||||
}
|
}
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user