27 Commits

Author SHA1 Message Date
Erris
565c91b276 Merge branch 'main' of https://git.anfer.fr/OpenEngine 2026-03-12 20:08:55 +01:00
Erris
fec9286dee Merge branch 'fastgltf' 2026-03-12 20:08:43 +01:00
Erris
9f83ac816a reuploading missing .envrc 2026-03-12 20:06:51 +01:00
Erris
076fe75409 preparing for basic model loading once for several entities 2026-03-12 20:04:57 +01:00
Erris
913d1437c0 fixing double adding a component 2026-03-12 20:03:40 +01:00
erris
edd6b2f19e Edit .onedev-buildspec.yml 2026-03-11 16:03:59 +01:00
erris
1a5dc70632 Edit .onedev-buildspec.yml 2026-03-11 16:02:31 +01:00
erris
037aefc711 Edit .onedev-buildspec.yml 2026-03-11 16:00:16 +01:00
erris
61bc9f032d Edit .onedev-buildspec.yml 2026-03-11 15:41:59 +01:00
erris
b1b283f4c6 Edit .onedev-buildspec.yml 2026-03-11 10:14:48 +01:00
erris
2fa9c3780d Edit .onedev-buildspec.yml 2026-03-11 00:08:23 +01:00
erris
c99c89d26a Edit .onedev-buildspec.yml 2026-03-10 23:58:18 +01:00
erris
b02fc33da3 Edit .onedev-buildspec.yml 2026-03-10 23:57:37 +01:00
erris
9005863300 Edit .onedev-buildspec.yml 2026-03-10 23:36:50 +01:00
erris
60a1683255 Edit .onedev-buildspec.yml 2026-03-10 23:34:04 +01:00
erris
e85781c29e Edit .onedev-buildspec.yml 2026-03-10 23:32:10 +01:00
erris
580c05c37b Edit .onedev-buildspec.yml 2026-03-10 23:16:22 +01:00
erris
2c7bb51658 Edit .onedev-buildspec.yml 2026-03-10 22:58:27 +01:00
erris
3f80057682 Edit .onedev-buildspec.yml 2026-03-10 22:19:05 +01:00
erris
8f868529f8 Edit .onedev-buildspec.yml 2026-03-10 22:14:22 +01:00
erris
8e6da66609 Edit .onedev-buildspec.yml 2026-03-10 20:50:41 +01:00
erris
ae4e81c937 Edit .onedev-buildspec.yml 2026-03-10 20:48:44 +01:00
Erris
ed1dc1eed9 removing nethost lib to fix compatibility issue 2026-03-10 19:30:38 +01:00
Erris
50dc6c8195 Merge branch 'main' of https://git.anfer.fr/OpenEngine 2026-03-10 19:12:07 +01:00
Erris
bbbe7adb3a fixing compilation error 2026-03-10 19:12:01 +01:00
erris
09a70ab98d Edit .onedev-buildspec.yml 2026-03-10 17:12:20 +01:00
erris
84c0733a77 Edit .onedev-buildspec.yml 2026-03-10 17:07:22 +01:00
10 changed files with 125 additions and 16 deletions

View File

@@ -13,6 +13,7 @@ jobs:
triggers:
- type: BranchUpdateTrigger
branches: main
paths: -.onedev-buildspec.yml
userMatch: anyone
projects: OpenEngine
- type: TagCreateTrigger
@@ -32,6 +33,17 @@ jobs:
withSubmodules: false
condition: SUCCESSFUL
optional: false
- type: SetupCacheStep
name: conan-cache
key: conan-cache-@file:./conanfile.txt@
loadKeys:
- conan-cache-@project_name@
paths:
- /root/.conan2
uploadStrategy: UPLOAD_IF_NOT_HIT
changeDetectionExcludes: /root/.conan2/p/*/dl /root/.conan2/logs
condition: SUCCESSFUL
optional: true
- type: CommandStep
name: Compile for Linux
runInContainer: true
@@ -39,8 +51,11 @@ jobs:
interpreter:
type: DefaultInterpreter
commands: |
echo find nethost =================================
find /usr/share/dotnet -name "nethost.h"
#git clone --depth 1 https://github.com/dotnet/runtime.git
#cd runtime
#./build.sh -c Release -subset host
#cp artifacts/bin/native/net10.0-linux-Release-x64/nethost/libnethost.a /onedev-build/workspace/lib/
git submodule update --init --recursive
@@ -68,6 +83,57 @@ jobs:
condition: SUCCESSFUL
optional: false
jobExecutor: luna-executor
triggers:
- type: BranchUpdateTrigger
branches: main
paths: -.onedev-buildspec.yml
userMatch: anyone
projects: OpenEngine
retryCondition: never
maxRetries: 3
retryDelay: 30
timeout: 14400
- name: Release to Gitea
steps:
- type: CommandStep
name: Release to Gitea
runInContainer: true
image: erriss/erris-build_tools:V0.8
interpreter:
type: DefaultInterpreter
commands: |
# 1. Create the Release metadata
RELEASE_JSON=$(printf '{"tag_name":"v0.0.%s","target_commitish":"main","name":"Release v0.0.%s","body":"Automated build from OneDev","draft":false,"prerelease":false}' "$ONEDEV_BUILD_NUMBER" "$ONEDEV_BUILD_NUMBER")
curl -X 'POST' \
"https://gitea.anfer.fr/api/v1/repos/anfer/OpenEngine/releases" \
-H "Authorization: token @secret:Gitea@" \
-H "Content-Type: application/json" \
-d "$RELEASE_JSON" > release_info.json
# 2. Extract the Release ID (using jq)
RELEASE_ID=$(jq '.id' release_info.json)
# 3. Upload your binary (oe_editor)
curl -X 'POST' \
"https://gitea.anfer.fr/api/v1/repos/anfer/OpenEngine/releases/$RELEASE_ID/assets?name=oe_editor" \
-H "Authorization: token @secret:Gitea@" \
-H "Content-Type: multipart/form-data" \
-F attachment=@@editor/oe_editor
envVars:
- name: ONEDEV_BUILD_NUMBER
value: '1'
useTTY: true
condition: SUCCESSFUL
optional: false
jobExecutor: terra-executor
triggers:
- type: DependencyFinishedTrigger
projects: OpenEngine
jobDependencies:
- jobName: Compile for Linux
requireSuccessful: true
artifacts: '**'
retryCondition: never
maxRetries: 3
retryDelay: 30

View File

@@ -8,6 +8,7 @@ fastgltf/0.9.0
glm/1.0.1
glfw/3.4
shaderc/2025.3
spirv-cross/1.4.321.0
[generators]
CMakeDeps

View File

@@ -10,6 +10,7 @@
#include "open_engine/renderer/renderer3d.hpp"
#include "open_engine/scene/components.hpp"
#include "panels/content_browser.hpp"
#include "panels/models_panel.hpp"
#include "panels/scene_hierarchy.hpp"
#include <Jolt/Physics/Collision/Shape/Shape.h>
@@ -585,6 +586,7 @@ namespace OpenEngine {
DrawStats();
scene_hierarchy.OnImGuiRender();
browser.OnImGuiRender();
ModelsPanelOnImGuiRender();
DrawViewport();
DrawPlayBar();

View File

@@ -0,0 +1,10 @@
#ifndef MODELS_PANEL_HPP
#define MODELS_PANEL_HPP
namespace OpenEngine {
void ModelsPanelOnImGuiRender();
}
#endif // MODELS_PANEL_HPP

View File

@@ -0,0 +1,20 @@
#include <panels/models_panel.hpp>
#include <open_engine.hpp>
#include "imgui.h"
#include <vector>
namespace OpenEngine {
static std::vector<Ref<Model3D>> temp_model_list;
void ModelsPanelOnImGuiRender()
{
ImGui::Begin("Models");
ImGui::End();
}
}

View File

@@ -1,6 +1,6 @@
[Window][WindowOverViewport_11111111]
Pos=0,24
Size=1272,1363
Size=2560,1371
Collapsed=0
[Window][Debug##Default]
@@ -10,31 +10,31 @@ Collapsed=0
[Window][Statistics]
Pos=0,24
Size=409,437
Size=409,439
Collapsed=0
DockId=0x00000003,0
[Window][Properties]
Pos=822,24
Size=450,805
Pos=2110,24
Size=450,810
Collapsed=0
DockId=0x00000007,0
[Window][Viewport]
Pos=411,61
Size=409,956
Size=1697,964
Collapsed=0
DockId=0x00000012,0
[Window][Dear ImGui Demo]
Pos=822,831
Size=450,556
Pos=2110,836
Size=450,559
Collapsed=0
DockId=0x00000008,0
[Window][Scene]
Pos=0,463
Size=409,924
Pos=0,465
Size=409,930
Collapsed=0
DockId=0x00000004,0
@@ -143,8 +143,8 @@ Collapsed=0
DockId=0x00000012,1
[Window][Assets]
Pos=411,1019
Size=409,368
Pos=411,1027
Size=1697,368
Collapsed=0
DockId=0x0000000C,0
@@ -156,12 +156,18 @@ DockId=0x0000000F,0
[Window][##play_state_bar]
Pos=411,24
Size=409,35
Size=1697,35
Collapsed=0
DockId=0x00000011,0
[Window][Models]
Pos=411,1027
Size=1697,368
Collapsed=0
DockId=0x0000000C,1
[Docking][Data]
DockSpace ID=0x08BD597D Window=0x1BBC0F80 Pos=0,24 Size=1272,1363 Split=X
DockSpace ID=0x08BD597D Window=0x1BBC0F80 Pos=0,24 Size=2560,1371 Split=X
DockNode ID=0x00000005 Parent=0x08BD597D SizeRef=820,1386 Split=X
DockNode ID=0x00000001 Parent=0x00000005 SizeRef=409,1386 Split=Y Selected=0xE601B12F
DockNode ID=0x00000003 Parent=0x00000001 SizeRef=255,417 Selected=0x553E127E
@@ -175,7 +181,7 @@ DockSpace ID=0x08BD597D Window=0x1BBC0F80 Pos=0,24 Size=1272,1363
DockNode ID=0x00000011 Parent=0x00000010 SizeRef=594,35 HiddenTabBar=1 Selected=0xAB37695D
DockNode ID=0x00000012 Parent=0x00000010 SizeRef=594,964 CentralNode=1 Selected=0xC450F867
DockNode ID=0x0000000E Parent=0x0000000B SizeRef=800,993 Selected=0x3EEA4247
DockNode ID=0x0000000C Parent=0x00000009 SizeRef=409,368 Selected=0x42C24103
DockNode ID=0x0000000C Parent=0x00000009 SizeRef=409,368 Selected=0xEAE75860
DockNode ID=0x0000000A Parent=0x00000002 SizeRef=483,600 Selected=0x1BCA3180
DockNode ID=0x00000006 Parent=0x08BD597D SizeRef=450,1386 Split=Y Selected=0x8C72BEA8
DockNode ID=0x00000007 Parent=0x00000006 SizeRef=444,805 Selected=0x8C72BEA8

Binary file not shown.

View File

@@ -19,6 +19,7 @@ find_package(spdlog REQUIRED)
find_package(glm REQUIRED)
find_package(glfw3 REQUIRED)
find_package(shaderc REQUIRED)
find_package(spirv-cross REQUIRED)
file(GLOB_RECURSE SRC_FILES "src/*.cpp")
file(GLOB IMGUIZMO_SRC_FILES "${CMAKE_SOURCE_DIR}/vendor/ImGuizmo/*.cpp")

View File

@@ -27,6 +27,7 @@
#include "open_engine/renderer/renderer2d.hpp"
#include "open_engine/renderer/renderer3d.hpp"
#include "open_engine/renderer/renderer.hpp"
#include <open_engine/renderer/model3d.hpp>
#include "open_engine/renderer/texture.hpp"
#include "open_engine/renderer/buffer.hpp"
#include "open_engine/renderer/shader.hpp"

View File

@@ -1,3 +1,4 @@
#include "core/uuid.hpp"
#include "logging.hpp"
#include "scene/scene_camera.hpp"
#include <pch.hpp>
@@ -19,6 +20,7 @@
#include <cstdint>
#include <glad/glad.h>
#include <vector>
namespace OpenEngine {