Skip to content

Commit 5e811c5

Browse files
DerAndereDomenicDerAndereDomenic
authored
Merge pull request #40 from DerAndereDomenic/dev
Release Version 0.1.1-beta
2 parents 49d8237 + 8338aa6 commit 5e811c5

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+53978
-129700
lines changed

‎.github/workflows/cmake.yml‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ name: CMake
22

33
on:
44
push:
5-
branches: [ "main", "exercises", "dev" ]
5+
branches: ["main", "dev"]
66
pull_request:
7-
branches: [ "main", "exercises", "dev" ]
7+
branches: ["main", "dev"]
88

99
jobs:
1010
ubuntu-build:
@@ -16,10 +16,10 @@ jobs:
1616
submodules: recursive
1717
- uses: actions/setup-python@v5
1818
with:
19-
python-version: '3.9'
20-
cache: 'pip'
19+
python-version: "3.9"
20+
cache: "pip"
2121
- run: sudo apt-get -y update
22-
- run: sudo apt-get install mesa-utils libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev xorg-dev
22+
- run: sudo apt-get install mesa-utils libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libglfw3-dev libglm-dev libao-dev libmpg123-dev xorg-dev libxkbcommon-dev
2323
- run: pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu
2424
- run: cmake -B ./build -S . -DATCG_CUDA_BACKEND=Off
2525
- run: cmake --build build
@@ -40,7 +40,7 @@ jobs:
4040
# - run: pip install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cpu
4141
# - run: cmake -B ./build -S . -DATCG_CUDA_BACKEND=Off -DATCG_HEADLESS=On
4242
# - run: cmake --build build
43-
43+
4444
windows-build:
4545
name: Windows Compile Check
4646
runs-on: windows-latest
@@ -50,8 +50,8 @@ jobs:
5050
submodules: recursive
5151
- uses: actions/setup-python@v5
5252
with:
53-
python-version: '3.9'
54-
cache: 'pip'
53+
python-version: "3.9"
54+
cache: "pip"
5555
- run: pip install torch torchvision torchaudio
5656
- run: cmake -B ./build -S . -DATCG_CUDA_BACKEND=Off
5757
- run: cmake --build build
@@ -77,7 +77,7 @@ jobs:
7777
# - run: pip3 install torch torchvision torchaudio
7878
# - run: cmake -B ./build -S .
7979
# - run: cmake --build build
80-
80+
8181
# windows-cuda-build:
8282
# name: Windows Compile Check
8383
# runs-on: windows-latest
@@ -95,4 +95,4 @@ jobs:
9595
# cuda: '12.1.0'
9696
# - run: pip3 install torch torchvision torchaudio --index-url https://download.pytorch.org/whl/cu121
9797
# - run: cmake -B ./build -S .
98-
# - run: cmake --build build
98+
# - run: cmake --build build

‎.gitmodules‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,3 +28,19 @@
2828
[submodule "external/sfml"]
2929
path = external/sfml
3030
url = https://github.com/SFML/SFML.git
31+
[submodule "external/imgui"]
32+
path = external/imgui
33+
url = https://github.com/ocornut/imgui.git
34+
branch = docking
35+
[submodule "external/implot"]
36+
path = external/implot
37+
url = https://github.com/epezent/implot.git
38+
[submodule "external/nanort"]
39+
path = external/nanort
40+
url = https://github.com/lighttransport/nanort.git
41+
[submodule "external/portable-file-dialogs"]
42+
path = external/portable-file-dialogs
43+
url = https://github.com/samhocevar/portable-file-dialogs.git
44+
[submodule "external/tinyobjloader"]
45+
path = external/tinyobjloader
46+
url = https://github.com/tinyobjloader/tinyobjloader.git

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,16 @@ All notable changes to this project will be documented in this file.
55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
66
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). Note that this project is currently in a beta state. Therefore, there might be API changes that are not reflected in the versioning.
77

8+
## [0.1.1-beta]
9+
10+
### Added
11+
12+
- Updated external libraries
13+
14+
### Fixed
15+
16+
- Added missing include in system registry
17+
818
## [0.1.0-beta]
919

1020
### Added

‎CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.27)
22

3-
project(ATCG_FRAMEWORK LANGUAGES CXX C VERSION 0.1.0)
3+
project(ATCG_FRAMEWORK LANGUAGES CXX C VERSION 0.1.1)
44

55
option(ATCG_CUDA_BACKEND "Compile cuda backend" ON)
66
option(ATCG_PYTHON_BINDINGS "Compile python bindings" OFF)
@@ -115,6 +115,7 @@ target_include_directories(portable_file_dialogs INTERFACE "external/portable-fi
115115

116116
# nanoflann
117117
set(NANOFLANN_BUILD_EXAMPLES OFF CACHE BOOL "" FORCE)
118+
set(MASTER_PROJECT_HAS_TARGET_UNINSTALL ON CACHE BOOL "" FORCE) # Make sure nanoflann does not try to define uninstall target
118119
set(NANOFLANN_BUILD_TESTS OFF CACHE BOOL "" FORCE)
119120
add_subdirectory(external/nanoflann)
120121

‎atcg_lib/include/Core/SystemRegistry.h‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
#pragma once
22

3+
#include <unordered_map>
4+
35
namespace atcg
46
{
57

‎atcg_lib/include/Core/glm.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
#define GLM_FORCE_RADIANS
44
#define GLM_FORCE_CTOR_INIT
5+
#define GLM_ENABLE_EXPERIMENTAL
56
#include <Core/Platform.h>
67
#include <ostream>
78
#include <glm/glm.hpp>

‎atcg_lib/platform/glfw/src/ImGui/ImGuiLayer.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ void ImGuiLayer::begin()
166166
_viewport_size = glm::ivec2(viewportPanelSize.x, viewportPanelSize.y);
167167

168168
uint64_t textureID = Renderer::getFramebuffer()->getColorAttachement(0)->getID();
169-
ImGui::Image(reinterpret_cast<void*>(textureID), viewportPanelSize, ImVec2 {0, 1}, ImVec2 {1, 0});
169+
ImGui::Image((ImTextureID)textureID, viewportPanelSize, ImVec2 {0, 1}, ImVec2 {1, 0});
170170

171171
if((ImGui::IsMouseDown(ImGuiMouseButton_Right) && ImGui::IsWindowHovered()) ||
172172
(ImGui::IsWindowHovered() && !ImGui::IsAnyItemActive()))

‎atcg_lib/platform/glfw/src/Scene/ComponentGUIHandler.cpp‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ void ComponentGUIHandler::draw_component<CameraComponent>(Entity entity, CameraC
106106

107107
ImVec2 window_size = ImGui::GetWindowSize();
108108
ImGui::SetCursorPos(ImVec2((window_size.x - width) * 0.5f, ImGui::GetCursorPosY()));
109-
ImGui::Image(reinterpret_cast<void*>(textureID),
109+
ImGui::Image((ImTextureID)textureID,
110110
ImVec2(content_scale * width, content_scale * height),
111111
ImVec2 {0, 1},
112112
ImVec2 {1, 0});
@@ -338,7 +338,7 @@ void ComponentGUIHandler::displayMaterial(const std::string& key, Material& mate
338338
material.setDiffuseColor(glm::vec4(1));
339339
}
340340
else
341-
ImGui::Image((void*)(uint64_t)material.getDiffuseTexture()->getID(),
341+
ImGui::Image((ImTextureID)material.getDiffuseTexture()->getID(),
342342
ImVec2(content_scale * 128, content_scale * 128),
343343
ImVec2 {0, 1},
344344
ImVec2 {1, 0});
@@ -387,7 +387,7 @@ void ComponentGUIHandler::displayMaterial(const std::string& key, Material& mate
387387
material.removeNormalMap();
388388
}
389389
else
390-
ImGui::Image((void*)(uint64_t)material.getNormalTexture()->getID(),
390+
ImGui::Image((ImTextureID)material.getNormalTexture()->getID(),
391391
ImVec2(content_scale * 128, content_scale * 128),
392392
ImVec2 {0, 1},
393393
ImVec2 {1, 0});
@@ -444,7 +444,7 @@ void ComponentGUIHandler::displayMaterial(const std::string& key, Material& mate
444444
material.setRoughness(1.0f);
445445
}
446446
else
447-
ImGui::Image((void*)(uint64_t)material.getRoughnessTexture()->getID(),
447+
ImGui::Image((ImTextureID)material.getRoughnessTexture()->getID(),
448448
ImVec2(content_scale * 128, content_scale * 128),
449449
ImVec2 {0, 1},
450450
ImVec2 {1, 0});
@@ -502,7 +502,7 @@ void ComponentGUIHandler::displayMaterial(const std::string& key, Material& mate
502502
material.setMetallic(0.0f);
503503
}
504504
else
505-
ImGui::Image((void*)(uint64_t)material.getMetallicTexture()->getID(),
505+
ImGui::Image((ImTextureID)material.getMetallicTexture()->getID(),
506506
ImVec2(content_scale * 128, content_scale * 128),
507507
ImVec2 {0, 1},
508508
ImVec2 {1, 0});

‎atcg_lib/platform/glfw/src/Scene/SceneHierarchyPanelDetails.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ void SceneHierarchyPanel<GUIHandler>::drawSceneProperties()
139139
{
140140
if(Renderer::hasSkybox())
141141
{
142-
ImGui::Image((void*)(uint64_t)Renderer::getSkyboxTexture()->getID(),
142+
ImGui::Image((ImTextureID)Renderer::getSkyboxTexture()->getID(),
143143
ImVec2(content_scale * 128, content_scale * 64),
144144
ImVec2 {0, 1},
145145
ImVec2 {1, 0});

‎external/charonload‎

Submodule charonload updated 23 files

0 commit comments

Comments
 (0)