Compare commits
25 Commits
09a70ab98d
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
565c91b276 | ||
|
|
fec9286dee | ||
|
|
9f83ac816a | ||
|
|
076fe75409 | ||
|
|
913d1437c0 | ||
|
|
edd6b2f19e | ||
|
|
1a5dc70632 | ||
|
|
037aefc711 | ||
|
|
61bc9f032d | ||
|
|
b1b283f4c6 | ||
|
|
2fa9c3780d | ||
|
|
c99c89d26a | ||
|
|
b02fc33da3 | ||
|
|
9005863300 | ||
|
|
60a1683255 | ||
|
|
e85781c29e | ||
|
|
580c05c37b | ||
|
|
2c7bb51658 | ||
|
|
3f80057682 | ||
|
|
8f868529f8 | ||
|
|
8e6da66609 | ||
|
|
ae4e81c937 | ||
|
|
ed1dc1eed9 | ||
|
|
50dc6c8195 | ||
|
|
bbbe7adb3a |
@@ -13,6 +13,7 @@ jobs:
|
|||||||
triggers:
|
triggers:
|
||||||
- type: BranchUpdateTrigger
|
- type: BranchUpdateTrigger
|
||||||
branches: main
|
branches: main
|
||||||
|
paths: -.onedev-buildspec.yml
|
||||||
userMatch: anyone
|
userMatch: anyone
|
||||||
projects: OpenEngine
|
projects: OpenEngine
|
||||||
- type: TagCreateTrigger
|
- type: TagCreateTrigger
|
||||||
@@ -24,15 +25,6 @@ jobs:
|
|||||||
timeout: 14400
|
timeout: 14400
|
||||||
- name: Compile for Linux
|
- name: Compile for Linux
|
||||||
steps:
|
steps:
|
||||||
- type: SetupCacheStep
|
|
||||||
name: conan-cache
|
|
||||||
key: conan-cache-@file:conanfile.py@
|
|
||||||
paths:
|
|
||||||
- /root/.conan2
|
|
||||||
uploadStrategy: UPLOAD_IF_CHANGED
|
|
||||||
changeDetectionExcludes: /root/.conan2/p/*/dl /root/.conan2/logs
|
|
||||||
condition: SUCCESSFUL
|
|
||||||
optional: true
|
|
||||||
- type: CheckoutStep
|
- type: CheckoutStep
|
||||||
name: Checkout
|
name: Checkout
|
||||||
cloneCredential:
|
cloneCredential:
|
||||||
@@ -41,6 +33,17 @@ jobs:
|
|||||||
withSubmodules: false
|
withSubmodules: false
|
||||||
condition: SUCCESSFUL
|
condition: SUCCESSFUL
|
||||||
optional: false
|
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
|
- type: CommandStep
|
||||||
name: Compile for Linux
|
name: Compile for Linux
|
||||||
runInContainer: true
|
runInContainer: true
|
||||||
@@ -48,6 +51,12 @@ jobs:
|
|||||||
interpreter:
|
interpreter:
|
||||||
type: DefaultInterpreter
|
type: DefaultInterpreter
|
||||||
commands: |
|
commands: |
|
||||||
|
#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
|
git submodule update --init --recursive
|
||||||
|
|
||||||
conan profile detect --force
|
conan profile detect --force
|
||||||
@@ -74,6 +83,57 @@ jobs:
|
|||||||
condition: SUCCESSFUL
|
condition: SUCCESSFUL
|
||||||
optional: false
|
optional: false
|
||||||
jobExecutor: luna-executor
|
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
|
retryCondition: never
|
||||||
maxRetries: 3
|
maxRetries: 3
|
||||||
retryDelay: 30
|
retryDelay: 30
|
||||||
|
|||||||
@@ -8,6 +8,7 @@ fastgltf/0.9.0
|
|||||||
glm/1.0.1
|
glm/1.0.1
|
||||||
glfw/3.4
|
glfw/3.4
|
||||||
shaderc/2025.3
|
shaderc/2025.3
|
||||||
|
spirv-cross/1.4.321.0
|
||||||
|
|
||||||
[generators]
|
[generators]
|
||||||
CMakeDeps
|
CMakeDeps
|
||||||
|
|||||||
@@ -10,6 +10,7 @@
|
|||||||
#include "open_engine/renderer/renderer3d.hpp"
|
#include "open_engine/renderer/renderer3d.hpp"
|
||||||
#include "open_engine/scene/components.hpp"
|
#include "open_engine/scene/components.hpp"
|
||||||
#include "panels/content_browser.hpp"
|
#include "panels/content_browser.hpp"
|
||||||
|
#include "panels/models_panel.hpp"
|
||||||
#include "panels/scene_hierarchy.hpp"
|
#include "panels/scene_hierarchy.hpp"
|
||||||
|
|
||||||
#include <Jolt/Physics/Collision/Shape/Shape.h>
|
#include <Jolt/Physics/Collision/Shape/Shape.h>
|
||||||
@@ -585,6 +586,7 @@ namespace OpenEngine {
|
|||||||
DrawStats();
|
DrawStats();
|
||||||
scene_hierarchy.OnImGuiRender();
|
scene_hierarchy.OnImGuiRender();
|
||||||
browser.OnImGuiRender();
|
browser.OnImGuiRender();
|
||||||
|
ModelsPanelOnImGuiRender();
|
||||||
DrawViewport();
|
DrawViewport();
|
||||||
DrawPlayBar();
|
DrawPlayBar();
|
||||||
|
|
||||||
|
|||||||
10
editor/include/panels/models_panel.hpp
Normal file
10
editor/include/panels/models_panel.hpp
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
#ifndef MODELS_PANEL_HPP
|
||||||
|
#define MODELS_PANEL_HPP
|
||||||
|
|
||||||
|
namespace OpenEngine {
|
||||||
|
|
||||||
|
void ModelsPanelOnImGuiRender();
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
#endif // MODELS_PANEL_HPP
|
||||||
20
editor/src/panels/models_panel.cpp
Normal file
20
editor/src/panels/models_panel.cpp
Normal 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();
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
34
imgui.ini
34
imgui.ini
@@ -1,6 +1,6 @@
|
|||||||
[Window][WindowOverViewport_11111111]
|
[Window][WindowOverViewport_11111111]
|
||||||
Pos=0,24
|
Pos=0,24
|
||||||
Size=1272,1363
|
Size=2560,1371
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
|
|
||||||
[Window][Debug##Default]
|
[Window][Debug##Default]
|
||||||
@@ -10,31 +10,31 @@ Collapsed=0
|
|||||||
|
|
||||||
[Window][Statistics]
|
[Window][Statistics]
|
||||||
Pos=0,24
|
Pos=0,24
|
||||||
Size=409,437
|
Size=409,439
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
DockId=0x00000003,0
|
DockId=0x00000003,0
|
||||||
|
|
||||||
[Window][Properties]
|
[Window][Properties]
|
||||||
Pos=822,24
|
Pos=2110,24
|
||||||
Size=450,805
|
Size=450,810
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
DockId=0x00000007,0
|
DockId=0x00000007,0
|
||||||
|
|
||||||
[Window][Viewport]
|
[Window][Viewport]
|
||||||
Pos=411,61
|
Pos=411,61
|
||||||
Size=409,956
|
Size=1697,964
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
DockId=0x00000012,0
|
DockId=0x00000012,0
|
||||||
|
|
||||||
[Window][Dear ImGui Demo]
|
[Window][Dear ImGui Demo]
|
||||||
Pos=822,831
|
Pos=2110,836
|
||||||
Size=450,556
|
Size=450,559
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
DockId=0x00000008,0
|
DockId=0x00000008,0
|
||||||
|
|
||||||
[Window][Scene]
|
[Window][Scene]
|
||||||
Pos=0,463
|
Pos=0,465
|
||||||
Size=409,924
|
Size=409,930
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
DockId=0x00000004,0
|
DockId=0x00000004,0
|
||||||
|
|
||||||
@@ -143,8 +143,8 @@ Collapsed=0
|
|||||||
DockId=0x00000012,1
|
DockId=0x00000012,1
|
||||||
|
|
||||||
[Window][Assets]
|
[Window][Assets]
|
||||||
Pos=411,1019
|
Pos=411,1027
|
||||||
Size=409,368
|
Size=1697,368
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
DockId=0x0000000C,0
|
DockId=0x0000000C,0
|
||||||
|
|
||||||
@@ -156,12 +156,18 @@ DockId=0x0000000F,0
|
|||||||
|
|
||||||
[Window][##play_state_bar]
|
[Window][##play_state_bar]
|
||||||
Pos=411,24
|
Pos=411,24
|
||||||
Size=409,35
|
Size=1697,35
|
||||||
Collapsed=0
|
Collapsed=0
|
||||||
DockId=0x00000011,0
|
DockId=0x00000011,0
|
||||||
|
|
||||||
|
[Window][Models]
|
||||||
|
Pos=411,1027
|
||||||
|
Size=1697,368
|
||||||
|
Collapsed=0
|
||||||
|
DockId=0x0000000C,1
|
||||||
|
|
||||||
[Docking][Data]
|
[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=0x00000005 Parent=0x08BD597D SizeRef=820,1386 Split=X
|
||||||
DockNode ID=0x00000001 Parent=0x00000005 SizeRef=409,1386 Split=Y Selected=0xE601B12F
|
DockNode ID=0x00000001 Parent=0x00000005 SizeRef=409,1386 Split=Y Selected=0xE601B12F
|
||||||
DockNode ID=0x00000003 Parent=0x00000001 SizeRef=255,417 Selected=0x553E127E
|
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=0x00000011 Parent=0x00000010 SizeRef=594,35 HiddenTabBar=1 Selected=0xAB37695D
|
||||||
DockNode ID=0x00000012 Parent=0x00000010 SizeRef=594,964 CentralNode=1 Selected=0xC450F867
|
DockNode ID=0x00000012 Parent=0x00000010 SizeRef=594,964 CentralNode=1 Selected=0xC450F867
|
||||||
DockNode ID=0x0000000E Parent=0x0000000B SizeRef=800,993 Selected=0x3EEA4247
|
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=0x0000000A Parent=0x00000002 SizeRef=483,600 Selected=0x1BCA3180
|
||||||
DockNode ID=0x00000006 Parent=0x08BD597D SizeRef=450,1386 Split=Y Selected=0x8C72BEA8
|
DockNode ID=0x00000006 Parent=0x08BD597D SizeRef=450,1386 Split=Y Selected=0x8C72BEA8
|
||||||
DockNode ID=0x00000007 Parent=0x00000006 SizeRef=444,805 Selected=0x8C72BEA8
|
DockNode ID=0x00000007 Parent=0x00000006 SizeRef=444,805 Selected=0x8C72BEA8
|
||||||
|
|||||||
BIN
lib/libnethost.a
BIN
lib/libnethost.a
Binary file not shown.
@@ -19,6 +19,7 @@ find_package(spdlog REQUIRED)
|
|||||||
find_package(glm REQUIRED)
|
find_package(glm REQUIRED)
|
||||||
find_package(glfw3 REQUIRED)
|
find_package(glfw3 REQUIRED)
|
||||||
find_package(shaderc REQUIRED)
|
find_package(shaderc REQUIRED)
|
||||||
|
find_package(spirv-cross REQUIRED)
|
||||||
|
|
||||||
file(GLOB_RECURSE SRC_FILES "src/*.cpp")
|
file(GLOB_RECURSE SRC_FILES "src/*.cpp")
|
||||||
file(GLOB IMGUIZMO_SRC_FILES "${CMAKE_SOURCE_DIR}/vendor/ImGuizmo/*.cpp")
|
file(GLOB IMGUIZMO_SRC_FILES "${CMAKE_SOURCE_DIR}/vendor/ImGuizmo/*.cpp")
|
||||||
|
|||||||
@@ -27,6 +27,7 @@
|
|||||||
#include "open_engine/renderer/renderer2d.hpp"
|
#include "open_engine/renderer/renderer2d.hpp"
|
||||||
#include "open_engine/renderer/renderer3d.hpp"
|
#include "open_engine/renderer/renderer3d.hpp"
|
||||||
#include "open_engine/renderer/renderer.hpp"
|
#include "open_engine/renderer/renderer.hpp"
|
||||||
|
#include <open_engine/renderer/model3d.hpp>
|
||||||
#include "open_engine/renderer/texture.hpp"
|
#include "open_engine/renderer/texture.hpp"
|
||||||
#include "open_engine/renderer/buffer.hpp"
|
#include "open_engine/renderer/buffer.hpp"
|
||||||
#include "open_engine/renderer/shader.hpp"
|
#include "open_engine/renderer/shader.hpp"
|
||||||
|
|||||||
@@ -1,3 +1,4 @@
|
|||||||
|
#include "core/uuid.hpp"
|
||||||
#include "logging.hpp"
|
#include "logging.hpp"
|
||||||
#include "scene/scene_camera.hpp"
|
#include "scene/scene_camera.hpp"
|
||||||
#include <pch.hpp>
|
#include <pch.hpp>
|
||||||
@@ -19,6 +20,7 @@
|
|||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
|
||||||
#include <glad/glad.h>
|
#include <glad/glad.h>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
namespace OpenEngine {
|
namespace OpenEngine {
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user