105 Commits

Author SHA1 Message Date
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
Erris
2f1bb884d7 Merge branch 'main' of https://git.anfer.fr/OpenEngine 2026-03-10 17:06:33 +01:00
Erris
9d36bfd13f final cmake fix? 2026-03-10 17:06:28 +01:00
erris
734caada6c Edit .onedev-buildspec.yml 2026-03-10 17:01:16 +01:00
erris
3ae209819a Edit .onedev-buildspec.yml 2026-03-10 15:59:02 +01:00
Erris
e3678118b4 trying to get everything to work 2026-03-10 14:47:54 +01:00
Erris
d654c99a8e fixing 2026-03-10 13:41:54 +01:00
Erris
ee4729d31e fixing fixing 2026-03-10 12:33:12 +01:00
Erris
32746e7f95 fixing 2026-03-10 12:19:33 +01:00
Erris
dac1551039 fixing 2026-03-10 12:07:46 +01:00
Erris
9a395bd741 Merge branch 'main' of https://git.anfer.fr/OpenEngine 2026-03-10 11:56:20 +01:00
Erris
e106427ebc fixing 2026-03-10 11:56:13 +01:00
erris
6a858f49e6 Edit .onedev-buildspec.yml 2026-03-10 11:55:16 +01:00
erris
87af2e752e Edit .onedev-buildspec.yml 2026-03-10 11:43:36 +01:00
Erris
959728aee3 still fixing 2026-03-10 11:41:12 +01:00
Erris
ad63b7d9ed trying to fix compilation issues with dotnet sdk 2026-03-10 11:28:50 +01:00
Erris
d898960494 same old same old 2026-03-10 11:11:52 +01:00
Erris
073bb47586 fixing compilation 2026-03-10 10:12:48 +01:00
Erris
0abc3dbfab still fixing compilation errors 2026-03-10 09:57:38 +01:00
Erris
820442c4d6 updating cmakelists 2026-03-10 09:41:46 +01:00
Erris
9145e739ba Merge branch 'main' of https://git.anfer.fr/OpenEngine 2026-03-10 09:29:19 +01:00
Erris
988f7f8805 fixing cmakefiles 2026-03-10 09:29:13 +01:00
erris
e4dcfeccb9 Edit .onedev-buildspec.yml 2026-03-10 09:19:03 +01:00
Erris
c808fe2903 Merge branch 'main' of https://git.anfer.fr/OpenEngine 2026-03-10 09:17:07 +01:00
Erris
f603d3b58f updating cmakelists.txt 2026-03-10 09:16:48 +01:00
erris
1a312832ea Edit .onedev-buildspec.yml 2026-03-10 08:49:13 +01:00
erris
85c45f0929 Edit .onedev-buildspec.yml 2026-03-10 08:47:07 +01:00
erris
6abfe9f27b Edit .onedev-buildspec.yml 2026-03-10 08:46:09 +01:00
erris
a84b35c105 Edit .onedev-buildspec.yml 2026-03-10 08:40:17 +01:00
erris
8db8ca679e Edit .onedev-buildspec.yml 2026-03-10 08:37:26 +01:00
erris
83bb2c6932 Edit .onedev-buildspec.yml 2026-03-10 08:32:37 +01:00
erris
4d5c9fc614 Edit .onedev-buildspec.yml 2026-03-10 08:28:38 +01:00
erris
c9c0a328dc Edit .onedev-buildspec.yml 2026-03-10 08:26:43 +01:00
erris
7ab3e7434a Edit .onedev-buildspec.yml 2026-03-10 08:25:18 +01:00
erris
fe4b54699b Edit .onedev-buildspec.yml 2026-03-10 08:23:05 +01:00
erris
b69f9c5305 Edit .onedev-buildspec.yml 2026-03-10 08:17:16 +01:00
Erris
adc6676dc9 fixing cmakelists 2026-03-10 08:02:29 +01:00
Erris
43c66d887b fixing compilation 2026-03-10 07:42:42 +01:00
Erris
6970df2ead forgor glm 2026-03-10 07:25:50 +01:00
Erris
b24578ad70 updating cmakelists.txt 2026-03-10 07:16:49 +01:00
Erris
2463a5f001 Merge branch 'main' of https://git.anfer.fr/OpenEngine 2026-03-10 07:02:44 +01:00
Erris
697ae61109 fixing missing spdlog 2026-03-10 07:02:37 +01:00
erris
e20853fdb1 Edit .onedev-buildspec.yml 2026-03-10 06:32:57 +01:00
erris
55437f397e Edit .onedev-buildspec.yml 2026-03-10 06:22:04 +01:00
erris
729abc17f0 Edit .onedev-buildspec.yml 2026-03-10 06:12:45 +01:00
erris
42090a5d47 Edit .onedev-buildspec.yml 2026-03-10 05:50:45 +01:00
erris
88ea35ab67 Edit .onedev-buildspec.yml 2026-03-10 05:37:41 +01:00
erris
a6a3340334 Edit .onedev-buildspec.yml 2026-03-10 05:15:18 +01:00
erris
73a82a00b4 Edit .onedev-buildspec.yml 2026-03-10 05:04:29 +01:00
erris
7d7b09df55 Edit .onedev-buildspec.yml 2026-03-10 05:03:37 +01:00
erris
9fc3422913 Edit .onedev-buildspec.yml 2026-03-10 04:46:15 +01:00
erris
f053f23ed6 Edit .onedev-buildspec.yml 2026-03-10 04:30:51 +01:00
erris
8b093603f5 Edit .onedev-buildspec.yml 2026-03-10 04:14:30 +01:00
Erris
27365835fa 04:04am commit 2026-03-10 04:04:49 +01:00
Erris
04ce3f4b8f 4am commit 2026-03-10 03:57:40 +01:00
Erris
15a137644f moving nfde 2026-03-10 03:36:27 +01:00
Erris
9add74afa8 submodules 2026-03-10 03:26:42 +01:00
erris
7b6afc5240 Edit .onedev-buildspec.yml 2026-03-10 03:22:09 +01:00
erris
2b0b81b2c8 Edit .onedev-buildspec.yml 2026-03-10 03:07:51 +01:00
Erris
0d9dcfd541 Merge branch 'main' of https://git.anfer.fr/OpenEngine 2026-03-10 03:07:33 +01:00
Erris
772b219caa updating cmakelists 2026-03-10 03:07:27 +01:00
erris
be57a1fc16 Edit .onedev-buildspec.yml 2026-03-10 02:58:52 +01:00
erris
67a42e5685 Edit .onedev-buildspec.yml 2026-03-10 02:47:19 +01:00
Erris
6ace0bac91 updating cmakelists 2026-03-10 02:41:24 +01:00
erris
9b2d5bf35a Edit .onedev-buildspec.yml 2026-03-10 02:31:38 +01:00
erris
378d4c58a9 Edit .onedev-buildspec.yml 2026-03-10 02:19:15 +01:00
erris
c5d650cf6b Edit .onedev-buildspec.yml 2026-03-10 02:16:45 +01:00
erris
709fb3141b Edit .onedev-buildspec.yml 2026-03-10 02:13:21 +01:00
erris
3e96b676da Edit .onedev-buildspec.yml 2026-03-10 02:10:50 +01:00
erris
f761718957 Edit .onedev-buildspec.yml 2026-03-10 02:06:35 +01:00
erris
b72206b531 Edit .onedev-buildspec.yml 2026-03-10 02:01:13 +01:00
erris
ca74942001 Edit .onedev-buildspec.yml 2026-03-10 01:59:32 +01:00
erris
57a15752c7 Edit .onedev-buildspec.yml 2026-03-10 01:56:50 +01:00
Erris
5c5f55ec16 Merge branch 'main' of https://git.anfer.fr/OpenEngine 2026-03-10 01:56:00 +01:00
Erris
25d82d6689 adding .envrc necessary for compilation 2026-03-10 01:55:47 +01:00
erris
2e3f7c9e20 Edit .onedev-buildspec.yml 2026-03-10 01:53:39 +01:00
erris
0001e7e023 Edit .onedev-buildspec.yml 2026-03-10 01:51:20 +01:00
erris
d3a0e88eb0 Edit .onedev-buildspec.yml 2026-03-10 01:45:26 +01:00
erris
752d556204 Edit .onedev-buildspec.yml 2026-03-10 01:41:33 +01:00
erris
94529460e2 Edit .onedev-buildspec.yml 2026-03-10 01:40:54 +01:00
erris
37864d6d37 Edit .onedev-buildspec.yml 2026-03-10 01:39:59 +01:00
erris
54c083ccda Edit .onedev-buildspec.yml 2026-03-10 01:09:15 +01:00
Erris
44910bd3f8 test autopush 2026-03-09 17:41:40 +01:00
Erris
b4f4aa010e Merge branch 'main' of https://git.anfer.fr/OpenEngine 2026-03-09 17:40:10 +01:00
Erris
521ee17daf Merge branch 'fastgltf' 2026-03-09 17:35:29 +01:00
Erris
2175b60990 test commit to sync to gitea 2026-03-09 17:19:20 +01:00
erris
ebb179ec68 Adding repo sync to gitea 2026-03-09 17:18:07 +01:00
erris
ee8841b6d4 Add README.md 2026-03-09 16:39:04 +01:00
Erris
464ab70c46 Merge branch 'jolt' 2026-03-07 11:53:40 +01:00
Erris
1eda916f3e Merge branch '3d' 2026-03-06 18:09:39 +01:00
Erris
7da00008e0 Merge branch '3d' 2026-03-02 21:28:20 +01:00
Erris
f26ee2bca8 Merge branch '3d' 2026-03-02 13:12:56 +01:00
19 changed files with 199 additions and 242 deletions

4
.envrc Normal file
View File

@@ -0,0 +1,4 @@
export CC=clang
export CXX=clang++
export COMPILE_COMMANDS=ON
export BUILD_TYPE=Debug

6
.gitmodules vendored Normal file
View File

@@ -0,0 +1,6 @@
[submodule "vendor/ImGuizmo"]
path = vendor/ImGuizmo
url = https://github.com/CedricGuillemet/ImGuizmo
[submodule "open_engine/vendor/nativefiledialog-extended"]
path = open_engine/vendor/nativefiledialog-extended
url = https://github.com/btzy/nativefiledialog-extended

136
.onedev-buildspec.yml Normal file
View File

@@ -0,0 +1,136 @@
version: 46
jobs:
- name: Push to Gitea
steps:
- type: PushRepository
name: Push to Gitea
remoteUrl: https://gitea.anfer.fr/anfer/OpenEngine
passwordSecret: Gitea
force: false
condition: SUCCESSFUL
optional: false
jobExecutor: terra-executor
triggers:
- type: BranchUpdateTrigger
branches: main
userMatch: anyone
projects: OpenEngine
- type: TagCreateTrigger
branches: main
projects: OpenEngine
retryCondition: never
maxRetries: 3
retryDelay: 30
timeout: 14400
- name: Compile for Linux
steps:
- type: SetupCacheStep
name: conan-cache
key: conan-cache-@file:conanfile.txt@
paths:
- /root/.conan2
uploadStrategy: UPLOAD_IF_CHANGED
changeDetectionExcludes: /root/.conan2/p/*/dl /root/.conan2/logs
condition: SUCCESSFUL
optional: true
- type: CheckoutStep
name: Checkout
cloneCredential:
type: DefaultCredential
withLfs: false
withSubmodules: false
condition: SUCCESSFUL
optional: false
- type: CommandStep
name: Compile for Linux
runInContainer: true
image: erriss/erris-build_tools:V0.7
interpreter:
type: DefaultInterpreter
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
conan profile detect --force
conan install . -c tools.system.package_manager:mode=install --output-folder=build --build=missing -s build_type=${BUILD_TYPE}
cmake -S . -G Ninja -B build -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake
echo ====== Building =============================
cmake --build build --config ${BUILD_TYPE}
envVars:
- name: BUILD_TYPE
value: Debug
- name: CC
value: clang
- name: CXX
value: clang++
useTTY: true
condition: SUCCESSFUL
optional: false
- type: PublishArtifactStep
name: Get build artifacts
sourcePath: build
artifacts: editor/* open_engine/*
condition: SUCCESSFUL
optional: false
jobExecutor: luna-executor
triggers:
- type: BranchUpdateTrigger
branches: main
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":"v1.0.%s","target_commitish":"main","name":"Release v1.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: application/octet-stream" \
--data-binary=build/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
timeout: 14400

View File

@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.28)
cmake_minimum_required(VERSION 3.25.1)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)

1
README.md Normal file
View File

@@ -0,0 +1 @@
Readme

View File

@@ -5,6 +5,10 @@ entt/3.16.0
yaml-cpp/0.8.0
joltphysics/5.2.0
fastgltf/0.9.0
glm/1.0.1
glfw/3.4
shaderc/2025.3
spirv-cross/1.4.321.0
[generators]
CMakeDeps

View File

@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.28)
cmake_minimum_required(VERSION 3.25.1)
set(CMAKE_CXX_STANDARD 20)
@@ -19,10 +19,25 @@ add_executable(${PROJECT_EXECUTABLE_NAME}
${SRC_FILES}
)
file(GLOB NETHOST_DIR_CANDIDATES
"/usr/share/dotnet/packs/Microsoft.NETCore.App.Host.*-x64/*/runtimes/linux-x64/native"
"/usr/share/dotnet/packs/Microsoft.NETCore.App.Host.*-x64/*/runtimes/arch-x64/native"
)
# Pick the first match
list(GET NETHOST_DIR_CANDIDATES 0 NETHOST_DIR)
if(NOT NETHOST_DIR)
message(FATAL_ERROR "Could not find NETCore native directory")
else()
message(STATUS "Found nethost dir: ${NETHOST_DIR}")
endif()
target_include_directories(${PROJECT_EXECUTABLE_NAME} PRIVATE
"${PROJECT_SOURCE_DIR}/include"
"${PROJECT_SOURCE_DIR}/editor/include"
"/usr/include/freetype2/"
"${NETHOST_DIR}"
)
target_link_libraries(${PROJECT_EXECUTABLE_NAME} PRIVATE
@@ -30,12 +45,12 @@ target_link_libraries(${PROJECT_EXECUTABLE_NAME} PRIVATE
imgui::imgui
open_engine
dl
nethost
freetype
EnTT::EnTT
nethost
)
target_link_directories(${PROJECT_EXECUTABLE_NAME} PRIVATE
${PROJECT_SOURCE_DIR}/lib
/usr/share/dotnet/packs/Microsoft.NETCore.App.Host.arch-x64/10.0.3/runtimes/arch-x64/native
${CMAKE_SOURCE_DIR}/lib
${NETHOST_DIR}
)

View File

@@ -136,15 +136,18 @@ namespace OpenEngine {
Entity cube3 = scene->CreateEntity("glb");
Entity cube4 = scene->CreateEntity("glb2");
Entity cube5 = scene->CreateEntity("glb2");
cube3.AddComponent<TransformComponent>();
cube4.AddComponent<TransformComponent>();
cube5.AddComponent<TransformComponent>();
Ref<Model3D> model = Model3D::Create("./assets/models/cubes.glb");
Ref<Model3D> model2 = Model3D::Create("./assets/models/cube_legs.glb");
Ref<Model3D> monkey = Model3D::Create("./assets/models/monkey.glb");
cube3.AddComponent<ModelComponent>(model);
cube4.AddComponent<ModelComponent>(monkey);
cube4.AddComponent<ModelComponent>(model2);
cube5.AddComponent<ModelComponent>(monkey);
/*
auto view = scene->GetRegistry().view<TagComponent>();

View File

@@ -5,9 +5,9 @@
#include <open_engine.hpp>
#include <unistd.h>
#include "/usr/share/dotnet/packs/Microsoft.NETCore.App.Host.arch-x64/10.0.3/runtimes/arch-x64/native/nethost.h"
#include "/usr/share/dotnet/packs/Microsoft.NETCore.App.Host.arch-x64/10.0.3/runtimes/arch-x64/native/hostfxr.h"
#include "/usr/share/dotnet/packs/Microsoft.NETCore.App.Host.arch-x64/10.0.3/runtimes/arch-x64/native/coreclr_delegates.h"
#include <nethost.h>
#include <hostfxr.h>
#include <coreclr_delegates.h>
class Modding : public OpenEngine::Layer
{

View File

@@ -304,9 +304,7 @@ namespace OpenEngine {
bool opened = ImGui::TreeNodeEx(
(void*)(intptr_t)entity,
ImGuiTreeNodeFlags_None,
"Meshes",
nullptr
);
"Meshes");
if (opened) {
unsigned int i = 0;

View File

@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.28)
cmake_minimum_required(VERSION 3.25.1)
set(CMAKE_CXX_STANDARD 23)
@@ -14,6 +14,12 @@ find_package(imgui REQUIRED)
find_package(EnTT REQUIRED)
find_package(yaml-cpp REQUIRED)
find_package(Jolt REQUIRED)
find_package(fastgltf REQUIRED)
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")
@@ -34,7 +40,7 @@ target_include_directories(${PROJECT_EXECUTABLE_NAME} PRIVATE
target_include_directories(${PROJECT_EXECUTABLE_NAME} PUBLIC
"${CMAKE_CURRENT_SOURCE_DIR}/include"
"/home/erris/.conan2/p/b/imguic69fe98538919/p/include"
#"/home/erris/.conan2/p/b/imguic69fe98538919/p/include"
"vendor/nativefiledialog-extended/src/include"
"${CMAKE_SOURCE_DIR}/vendor/ImGuizmo"
)
@@ -44,16 +50,16 @@ target_include_directories(${PROJECT_EXECUTABLE_NAME} PUBLIC
target_link_libraries(${PROJECT_EXECUTABLE_NAME} PUBLIC
imgui::imgui
spdlog
spdlog::spdlog
glad
glfw
glm
glm::glm
dl
EnTT::EnTT
X11
yaml-cpp::yaml-cpp
nfd
shaderc_combined
shaderc::shaderc
glslang
glslang-default-resource-limits
SPIRV
@@ -63,6 +69,7 @@ target_link_libraries(${PROJECT_EXECUTABLE_NAME} PUBLIC
spirv-cross-glsl
spirv-cross-reflect
Jolt::Jolt
fastgltf::fastgltf
)
#target_link_directories(${PROJECT_EXECUTABLE_NAME} PRIVATE

View File

@@ -3,6 +3,7 @@
#include "open_engine/logging.hpp"
#include <iomanip>
#include <mutex>
#include <sstream>
#include <string>

View File

@@ -1,7 +1,8 @@
#ifndef PCH_HPP
#define PCH_HPP
#include "open_engine/logging.hpp"
#include <open_engine/logging.hpp>
#include <shaderc/shaderc.hpp>
#include <functional>

View File

@@ -1,220 +0,0 @@
let SessionLoad = 1
let s:so_save = &g:so | let s:siso_save = &g:siso | setg so=0 siso=0 | setl so=-1 siso=-1
let v:this_session=expand("<sfile>:p")
silent only
silent tabonly
cd ~/projects/open_engine/open_engine
if expand('%') == '' && !&modified && line('$') <= 1 && getline(1) == ''
let s:wipebuf = bufnr('%')
endif
let s:shortmess_save = &shortmess
if &shortmess =~ 'A'
set shortmess=aoOA
else
set shortmess=aoO
endif
badd +1 ~/projects/open_engine/open_engine
badd +170 ~/projects/open_engine/open_engine/src/open_engine/imgui/imgui_layer.cpp
badd +4 ~/projects/open_engine/open_engine/include/open_engine/opengl/imgui_glfw.h
badd +35 ~/projects/open_engine/open_engine/include/open_engine/opengl/imgui_opengl.h
badd +23 ~/projects/open_engine/open_engine/src/open_engine/application.cpp
badd +47 ~/projects/open_engine/open_engine/CMakeLists.txt
badd +12 ~/projects/open_engine/open_engine/include/open_engine/imgui/imgui_layer.hpp
badd +123 ~/projects/open_engine/open_engine/src/open_engine/opengl/imgui_opengl.cpp
badd +89 ~/.conan2/p/b/imgui15e51a8fb5246/p/include/imgui.h
badd +7 ~/projects/open_engine/open_engine/.envrc
badd +5 ~/projects/open_engine/open_engine/include/open_engine/core.hpp
badd +11 ~/.conan2/p/b/imgui15e51a8fb5246/p/include/imgui_export_headers.h
badd +1 ~/projects/open_engine/open_engine/src/open_engine/opengl/build_opengl.cpp
badd +4 ~/projects/open_engine/open_engine/src/open_engine/opengl/imgui_build.cpp
badd +1 ~/projects/open_engine/open_engine/conanfile.txt
badd +1 ~/projects/open_engine/open_engine/build/imguiTargets.cmake
badd +8 ~/projects/open_engine/open_engine/include/open_engine/logging.hpp
badd +4 ~/projects/open_engine/open_engine/src/open_engine/logging.cpp
badd +110 ~/projects/open_engine/open_engine/src/open_engine/opengl/imgui_glfw.cpp
badd +1 ~/projects/open_engine/open_engine/include/open_engine/application.hpp
badd +21 ~/projects/open_engine/open_engine/src/open_engine/window/linux_window.cpp
badd +24 ~/projects/open_engine/open_engine/include/open_engine/window/window.hpp
badd +27 ~/projects/open_engine/open_engine/include/open_engine/window/linux_window.hpp
badd +7 ~/projects/open_engine/open_engine/include/open_engine/renderer/GraphicsContext.hpp
badd +12 ~/projects/open_engine/open_engine/include/open_engine/opengl/opengl_context.hpp
badd +10 ~/projects/open_engine/open_engine/src/open_engine/input/linux_input.cpp
badd +17 ~/projects/open_engine/open_engine/src/open_engine/opengl/opengl_context.cpp
badd +3295 ~/projects/open_engine/open_engine/vendor/glad/include/glad/glad.h
badd +148 ~/projects/open_engine/open_engine/vendor/glad/src/glad/glad.c
badd +13 ~/projects/open_engine/open_engine/include/open_engine/renderer/graphics_context.hpp
badd +80 ~/projects/open_engine/open_engine/src/open_engine/opengl/opengl_shader.cpp
badd +8 ~/projects/open_engine/open_engine/include/open_engine/opengl/opengl_shader.hpp
badd +8 ~/projects/open_engine/open_engine/include/open_engine/renderer/shader.hpp
badd +1 ~/projects/open_engine/open_engine/src/open_engine/renderer/shader.cpp
badd +1 ~/projects/open_engine/open_engine/include/open_engine/pch.hpp
badd +3 ~/projects/open_engine/open_engine/assets/shaders/fragment.frag.old
badd +1 ~/projects/open_engine/open_engine/assets/shaders/fragment.frag
badd +5 ~/projects/open_engine/open_engine/assets/shaders/vertex.vert
badd +1 ~/projects/open_engine/open_engine/\'
badd +66 ~/projects/open_engine/open_engine/include/open_engine/renderer/buffer.hpp
badd +56 ~/projects/open_engine/open_engine/src/open_engine/renderer/buffer.cpp
badd +18 ~/projects/open_engine/open_engine/include/open_engine/opengl/opengl_buffer.hpp
badd +34 ~/projects/open_engine/open_engine/src/open_engine/opengl/opengl_buffer.cpp
badd +2 ~/projects/open_engine/open_engine/src/open_engine/renderer/renderer.cpp
badd +5 ~/projects/open_engine/open_engine/include/open_engine/renderer/renderer.hpp
badd +1 ~/projects/open_engine/open_engine/src/open_engine/layer.cpp
badd +12 ~/projects/open_engine/open_engine/include/open_engine/layer.hpp
badd +21 ~/projects/open_engine/open_engine/include/open_engine/events/event.hpp
badd +11 ~/projects/open_engine/open_engine/src/open_engine/renderer/vertex_array.cpp
badd +8 ~/projects/open_engine/open_engine/include/open_engine/renderer/vertex_array.hpp
badd +27 ~/projects/open_engine/open_engine/src/open_engine/layer_stack.cpp
badd +1 ~/projects/open_engine/open_engine/include/open_engine/layer_stack.hpp
argglobal
%argdel
$argadd ~/projects/open_engine/open_engine
set stal=2
tabnew +setlocal\ bufhidden=wipe
tabrewind
edit ~/projects/open_engine/open_engine/include/open_engine/renderer/vertex_array.hpp
let s:save_splitbelow = &splitbelow
let s:save_splitright = &splitright
set splitbelow splitright
wincmd _ | wincmd |
vsplit
1wincmd h
wincmd w
let &splitbelow = s:save_splitbelow
let &splitright = s:save_splitright
wincmd t
let s:save_winminheight = &winminheight
let s:save_winminwidth = &winminwidth
set winminheight=0
set winheight=1
set winminwidth=0
set winwidth=1
exe 'vert 1resize ' . ((&columns * 127 + 127) / 255)
exe 'vert 2resize ' . ((&columns * 127 + 127) / 255)
argglobal
setlocal foldmethod=manual
setlocal foldexpr=0
setlocal foldmarker={{{,}}}
setlocal foldignore=#
setlocal foldlevel=0
setlocal foldminlines=1
setlocal foldnestmax=20
setlocal foldenable
silent! normal! zE
let &fdl = &fdl
let s:l = 8 - ((7 * winheight(0) + 13) / 27)
if s:l < 1 | let s:l = 1 | endif
keepjumps exe s:l
normal! zt
keepjumps 8
normal! 0
lcd ~/projects/open_engine/open_engine
wincmd w
argglobal
if bufexists(fnamemodify("~/projects/open_engine/open_engine/include/open_engine/renderer/vertex_array.hpp", ":p")) | buffer ~/projects/open_engine/open_engine/include/open_engine/renderer/vertex_array.hpp | else | edit ~/projects/open_engine/open_engine/include/open_engine/renderer/vertex_array.hpp | endif
if &buftype ==# 'terminal'
silent file ~/projects/open_engine/open_engine/include/open_engine/renderer/vertex_array.hpp
endif
setlocal foldmethod=manual
setlocal foldexpr=0
setlocal foldmarker={{{,}}}
setlocal foldignore=#
setlocal foldlevel=0
setlocal foldminlines=1
setlocal foldnestmax=20
setlocal foldenable
silent! normal! zE
let &fdl = &fdl
let s:l = 1 - ((0 * winheight(0) + 13) / 27)
if s:l < 1 | let s:l = 1 | endif
keepjumps exe s:l
normal! zt
keepjumps 1
normal! 0
lcd ~/projects/open_engine/open_engine
wincmd w
exe 'vert 1resize ' . ((&columns * 127 + 127) / 255)
exe 'vert 2resize ' . ((&columns * 127 + 127) / 255)
tabnext
edit ~/projects/open_engine/open_engine/assets/shaders/fragment.frag
let s:save_splitbelow = &splitbelow
let s:save_splitright = &splitright
set splitbelow splitright
wincmd _ | wincmd |
vsplit
1wincmd h
wincmd w
let &splitbelow = s:save_splitbelow
let &splitright = s:save_splitright
wincmd t
let s:save_winminheight = &winminheight
let s:save_winminwidth = &winminwidth
set winminheight=0
set winheight=1
set winminwidth=0
set winwidth=1
exe 'vert 1resize ' . ((&columns * 254 + 127) / 255)
exe 'vert 2resize ' . ((&columns * 0 + 127) / 255)
argglobal
setlocal foldmethod=manual
setlocal foldexpr=0
setlocal foldmarker={{{,}}}
setlocal foldignore=#
setlocal foldlevel=0
setlocal foldminlines=1
setlocal foldnestmax=20
setlocal foldenable
silent! normal! zE
let &fdl = &fdl
let s:l = 11 - ((8 * winheight(0) + 13) / 27)
if s:l < 1 | let s:l = 1 | endif
keepjumps exe s:l
normal! zt
keepjumps 11
normal! 020|
lcd ~/projects/open_engine/open_engine
wincmd w
argglobal
if bufexists(fnamemodify("~/projects/open_engine/open_engine/assets/shaders/vertex.vert", ":p")) | buffer ~/projects/open_engine/open_engine/assets/shaders/vertex.vert | else | edit ~/projects/open_engine/open_engine/assets/shaders/vertex.vert | endif
if &buftype ==# 'terminal'
silent file ~/projects/open_engine/open_engine/assets/shaders/vertex.vert
endif
balt ~/projects/open_engine/open_engine/assets/shaders/fragment.frag
setlocal foldmethod=manual
setlocal foldexpr=0
setlocal foldmarker={{{,}}}
setlocal foldignore=#
setlocal foldlevel=0
setlocal foldminlines=1
setlocal foldnestmax=20
setlocal foldenable
silent! normal! zE
let &fdl = &fdl
let s:l = 12 - ((11 * winheight(0) + 13) / 27)
if s:l < 1 | let s:l = 1 | endif
keepjumps exe s:l
normal! zt
keepjumps 12
normal! 022|
lcd ~/projects/open_engine/open_engine
wincmd w
exe 'vert 1resize ' . ((&columns * 254 + 127) / 255)
exe 'vert 2resize ' . ((&columns * 0 + 127) / 255)
tabnext 1
set stal=1
if exists('s:wipebuf') && len(win_findbuf(s:wipebuf)) == 0 && getbufvar(s:wipebuf, '&buftype') isnot# 'terminal'
silent exe 'bwipe ' . s:wipebuf
endif
unlet! s:wipebuf
set winheight=1 winwidth=20
let &shortmess = s:shortmess_save
let &winminheight = s:save_winminheight
let &winminwidth = s:save_winminwidth
let s:sx = expand("<sfile>:p:r")."x.vim"
if filereadable(s:sx)
exe "source " . fnameescape(s:sx)
endif
let &g:so = s:so_save | let &g:siso = s:siso_save
set hlsearch
doautoall SessionLoadPost
unlet SessionLoad
" vim: set ft=vim :

View File

@@ -2,6 +2,7 @@
#define SHADER_HPP
#include <open_engine/ref_scope.hpp>
#include <glm/glm.hpp>
#include <string>

View File

@@ -6,14 +6,12 @@
#include <core/time.hpp>
#include <logging.hpp>
#include <shaderc/shaderc.hpp>
#include <spirv_cross/spirv_cross.hpp>
#include <spirv_cross/spirv_glsl.hpp>
#include <glm/gtc/type_ptr.hpp>
#include <glm/glm.hpp>
#include <filesystem>
#include <glad/glad.h>
//#include <alloca.h>
namespace OpenEngine {
@@ -30,7 +28,7 @@ namespace OpenEngine {
return 0;
}
static shaderc_shader_kind GLShaderStageToShaderC(GLenum stage)
static ::shaderc_shader_kind GLShaderStageToShaderC(GLenum stage)
{
switch (stage)
{

View File

@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 3.28)
cmake_minimum_required(VERSION 3.25.1)
set(CMAKE_CXX_STANDARD 20)

1
vendor/ImGuizmo vendored Submodule

Submodule vendor/ImGuizmo added at a15acd87a3