Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
c882a29
feat(keyframe-video): bool for show toolbar
ThomasParenteau Sep 12, 2025
8cc5041
fix(demo/scenes): clean files + code style + sonar errors + documenta…
Sauterelle57 Sep 26, 2025
f36b867
feat(demo/EIP-trophies): add demo scene
Sauterelle57 Nov 8, 2025
cc1cefc
feat(demo/EIP-trophies): add dominos pos and NEXO logo in full room
Sauterelle57 Nov 9, 2025
74594c6
feat(demo/EIP-trophies): add dominos
Sauterelle57 Nov 11, 2025
4abecb5
feat(demo/EIP-trophies): add full scene
Sauterelle57 Nov 11, 2025
04ed87e
feat(pbr): textures now supports pbr images and maps
iMeaNz Nov 9, 2025
8b7c6e8
fix(physics): fix collision step that was too big + now only retrieve…
iMeaNz Nov 10, 2025
fc9e588
feat: chamboule scene WIP
ThomasParenteau Nov 11, 2025
5e2db21
feat(demo/EIP-trophies): add full scene + emissive textures for logos
Sauterelle57 Nov 11, 2025
2a899c7
feat(demo/EIP-trophies): add plane model
Sauterelle57 Nov 11, 2025
96d9a7f
feat: chamboule scene WIP
ThomasParenteau Nov 11, 2025
4fad5c3
fix(physics): add accumulator to physics clock to avoid skipping updates
iMeaNz Nov 11, 2025
55e624f
fix(physics): fix biplane + add helix rotation
iMeaNz Nov 11, 2025
b524923
feat(demo/EIP-trophies): rename polaroid picture texture
Sauterelle57 Nov 11, 2025
c1927ef
feat(demo/EIP-trophies): add pictures in frames
Sauterelle57 Nov 11, 2025
5b2247d
fix(fullscreen): fix going to windowed
Sauterelle57 Nov 11, 2025
082fb4c
feat(physics): setup camera + billboard
Sauterelle57 Nov 12, 2025
0caf1aa
feat(physics): video system does not need play to update
Sauterelle57 Nov 12, 2025
490fece
feat(physics): add script to translate camera + add shortcut to play …
Sauterelle57 Nov 12, 2025
8df5fb2
feat(physics): add script to translate camera + add shortcut to play …
Sauterelle57 Nov 12, 2025
4198e84
feat(physics): add script to move light
Sauterelle57 Nov 12, 2025
4d5c65b
feat(physics): hide light billboards
Sauterelle57 Nov 12, 2025
c617186
video frames
Thyodas Nov 12, 2025
25812fa
fix(physics): compilation on both ubuntu and windows
Sauterelle57 Nov 19, 2025
ec832be
fix(physics): split demo scenes function into a new file
Sauterelle57 Nov 20, 2025
5d50724
fix(physics): compilation ?
Sauterelle57 Nov 20, 2025
1b45bbb
demo
ThomasParenteau Feb 3, 2026
98f261b
fix(physics-clean): fix different performance problems and crashes th…
iMeaNz Feb 8, 2026
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
1 change: 1 addition & 0 deletions editor/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@ set(SRCS
editor/src/DocumentWindows/EditorScene/Toolbar.cpp
editor/src/DocumentWindows/EditorScene/Update.cpp
editor/src/DocumentWindows/EditorScene/DragDrop.cpp
editor/src/DocumentWindows/EditorScene/DemoScenes.cpp
editor/src/DocumentWindows/AssetManager/Init.cpp
editor/src/DocumentWindows/AssetManager/Show.cpp
editor/src/DocumentWindows/AssetManager/Shutdown.cpp
Expand Down
34 changes: 32 additions & 2 deletions editor/src/DocumentWindows/AssetManager/Init.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ namespace nexo::editor {
}
{
assets::AssetImporter importer;
std::filesystem::path path = Path::resolvePathRelativeToExe("../resources/models/Demo/chair/chair.gltf");
std::filesystem::path path = Path::resolvePathRelativeToExe("../resources/models/Demo/chair/scene.gltf");
assets::ImporterFileInput fileInput{path};
importer.importAsset<assets::Model>(assets::AssetLocation("my_package::chair@Demo"), fileInput);
}
Expand All @@ -103,6 +103,24 @@ namespace nexo::editor {
assets::ImporterFileInput fileInput{path};
importer.importAsset<assets::Model>(assets::AssetLocation("my_package::cork_board@Demo"), fileInput);
}
{
assets::AssetImporter importer;
std::filesystem::path path = Path::resolvePathRelativeToExe("../resources/models/Demo/domino/domino_vertical.gltf");
assets::ImporterFileInput fileInput{path};
importer.importAsset<assets::Model>(assets::AssetLocation("my_package::dominoV@Demo"), fileInput);
}
{
assets::AssetImporter importer;
std::filesystem::path path = Path::resolvePathRelativeToExe("../resources/models/Demo/domino/domino_horizontal.gltf");
assets::ImporterFileInput fileInput{path};
importer.importAsset<assets::Model>(assets::AssetLocation("my_package::dominoH@Demo"), fileInput);
}
{
assets::AssetImporter importer;
std::filesystem::path path = Path::resolvePathRelativeToExe("../resources/models/Demo/desk/desk.gltf");
assets::ImporterFileInput fileInput{path};
importer.importAsset<assets::Model>(assets::AssetLocation("my_package::desk@Demo"), fileInput);
}
{
assets::AssetImporter importer;
std::filesystem::path path = Path::resolvePathRelativeToExe("../resources/models/Demo/duck/duck.gltf");
Expand All @@ -117,7 +135,7 @@ namespace nexo::editor {
}
{
assets::AssetImporter importer;
std::filesystem::path path = Path::resolvePathRelativeToExe("../resources/models/Demo/full_room/fullRoom.gltf");
std::filesystem::path path = Path::resolvePathRelativeToExe("../resources/models/Demo/full_room/full_room.gltf");
assets::ImporterFileInput fileInput{path};
importer.importAsset<assets::Model>(assets::AssetLocation("my_package::full_room@Demo"), fileInput);
}
Expand All @@ -133,6 +151,12 @@ namespace nexo::editor {
assets::ImporterFileInput fileInput{path};
importer.importAsset<assets::Model>(assets::AssetLocation("my_package::polaroid@Demo"), fileInput);
}
{
assets::AssetImporter importer;
std::filesystem::path path = Path::resolvePathRelativeToExe("../resources/models/Demo/shelf/shelf.gltf");
assets::ImporterFileInput fileInput{path};
importer.importAsset<assets::Model>(assets::AssetLocation("my_package::shelf@Demo"), fileInput);
}
{
assets::AssetImporter importer;
std::filesystem::path path = Path::resolvePathRelativeToExe("../resources/models/Demo/bin.glb");
Expand Down Expand Up @@ -314,6 +338,12 @@ namespace nexo::editor {
assets::ImporterFileInput fileInput{path};
importer.importAsset<assets::Texture>(assets::AssetLocation("my_package::kaben@Textures/Picture"), fileInput);
}
{
assets::AssetImporter importer;
std::filesystem::path path = Path::resolvePathRelativeToExe("../resources/textures/kevin.jpg");
assets::ImporterFileInput fileInput{path};
importer.importAsset<assets::Texture>(assets::AssetLocation("my_package::kevin@Textures/Picture"), fileInput);
}
{
assets::AssetImporter importer;
std::filesystem::path path = Path::resolvePathRelativeToExe("../resources/textures/baz.jpg");
Expand Down
Loading
Loading