Skip to content
This repository was archived by the owner on Dec 4, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 1 addition & 6 deletions .github/workflows/windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,9 @@ jobs:
uses: actions/checkout@v4

- name: Install Dependencies on Windows
run: choco install nasm openssl make
run: choco install nasm make
shell: bash

- name: List OpenSSL
run: |
dir C:\
dir "C:\Program Files\"

- name: Download NSIS
shell: pwsh
run: |
Expand Down
2 changes: 2 additions & 0 deletions Tests.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,7 @@ file(COPY images/Suzuho-Ueda.bmp DESTINATION ${CMAKE_BINARY_DIR}/images)
file(COPY images/hi.bmp DESTINATION ${CMAKE_BINARY_DIR}/images)
file(COPY models/SaiyanOne.glb DESTINATION ${CMAKE_BINARY_DIR}/models)
file(COPY models/GoldenSportsCar.glb DESTINATION ${CMAKE_BINARY_DIR}/models)
file(COPY models/RedSportsCar.glb DESTINATION ${CMAKE_BINARY_DIR}/models)
file(COPY models/metal_plane.glb DESTINATION ${CMAKE_BINARY_DIR}/models)
file(COPY hdri/autumn_field_puresky_4k.hdr DESTINATION ${CMAKE_BINARY_DIR}/hdri)
file(COPY hdri/zwartkops_straight_afternoon_4k.hdr DESTINATION ${CMAKE_BINARY_DIR}/hdri)
4 changes: 2 additions & 2 deletions include/dz/BufferGroup.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ namespace dz
* @param data_pointer Optional pointer to image data.
* @return Pointer to the created Image.
*/
Image* buffer_group_define_image_2D(BufferGroup* buffer_group, const std::string& buffer_name, uint32_t image_width, uint32_t image_height, void* data_pointer = 0);
Image* buffer_group_define_image_2D(BufferGroup* buffer_group, const std::string& buffer_name, uint32_t image_width, uint32_t image_height, const std::vector<std::shared_ptr<void>>& datas = {});

/**
* @brief Defines a 3D image in the buffer group.
Expand All @@ -59,7 +59,7 @@ namespace dz
* @param data_pointer Optional pointer to image data.
* @return Pointer to the created Image.
*/
Image* buffer_group_define_image_3D(BufferGroup* buffer_group, const std::string& buffer_name, uint32_t image_width, uint32_t image_height, uint32_t image_depth, void* data_pointer = 0);
Image* buffer_group_define_image_3D(BufferGroup* buffer_group, const std::string& buffer_name, uint32_t image_width, uint32_t image_height, uint32_t image_depth, const std::vector<std::shared_ptr<void>>& datas = {});

/**
* @brief Sets the number of elements in a named buffer.
Expand Down
406 changes: 325 additions & 81 deletions include/dz/ECS.hpp

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion include/dz/ECS/Camera.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ void GetCameraModel(int camera_index, out mat4 out_model, out int parent_index,
void NotifyChange(int prop_index) override;
};

struct CameraReflectableGroup : ReflectableGroup {
struct CameraReflectableGroup : ::ReflectableGroup {
BufferGroup* buffer_group = nullptr;
std::string name;
std::string imgui_name;
Expand Down
2 changes: 1 addition & 1 deletion include/dz/ECS/Entity.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ void GetEntityModel(int entity_index, out mat4 out_model, out int parent_index,
void NotifyChange(int prop_index) override;
};

struct EntityReflectableGroup : ReflectableGroup {
struct EntityReflectableGroup : ::ReflectableGroup {
BufferGroup* buffer_group = nullptr;
std::string name;
std::vector<std::shared_ptr<ReflectableGroup>> reflectable_children;
Expand Down
Loading
Loading