Compare commits
37 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
15a137644f | ||
|
|
9add74afa8 | ||
|
|
7b6afc5240 | ||
|
|
2b0b81b2c8 | ||
|
|
0d9dcfd541 | ||
|
|
772b219caa | ||
|
|
be57a1fc16 | ||
|
|
67a42e5685 | ||
|
|
6ace0bac91 | ||
|
|
9b2d5bf35a | ||
|
|
378d4c58a9 | ||
|
|
c5d650cf6b | ||
|
|
709fb3141b | ||
|
|
3e96b676da | ||
|
|
f761718957 | ||
|
|
b72206b531 | ||
|
|
ca74942001 | ||
|
|
57a15752c7 | ||
|
|
5c5f55ec16 | ||
|
|
25d82d6689 | ||
|
|
2e3f7c9e20 | ||
|
|
0001e7e023 | ||
|
|
d3a0e88eb0 | ||
|
|
752d556204 | ||
|
|
94529460e2 | ||
|
|
37864d6d37 | ||
|
|
54c083ccda | ||
|
|
44910bd3f8 | ||
|
|
b4f4aa010e | ||
|
|
521ee17daf | ||
|
|
2175b60990 | ||
|
|
ebb179ec68 | ||
|
|
ee8841b6d4 | ||
|
|
464ab70c46 | ||
|
|
1eda916f3e | ||
|
|
7da00008e0 | ||
|
|
f26ee2bca8 |
4
.envrc
Normal file
4
.envrc
Normal file
@@ -0,0 +1,4 @@
|
||||
export CC=clang
|
||||
export CXX=clang++
|
||||
export COMPILE_COMMANDS=ON
|
||||
export BUILD_TYPE=Debug
|
||||
6
.gitmodules
vendored
Normal file
6
.gitmodules
vendored
Normal file
@@ -0,0 +1,6 @@
|
||||
[submodule "vendor/nativefiledialog-extended"]
|
||||
path = vendor/nativefiledialog-extended
|
||||
url = https://github.com/btzy/nativefiledialog-extended
|
||||
[submodule "open_engine/vendor/nativefiledialog-extended"]
|
||||
path = open_engine/vendor/nativefiledialog-extended
|
||||
url = https://github.com/btzy/nativefiledialog-extended
|
||||
69
.onedev-buildspec.yml
Normal file
69
.onedev-buildspec.yml
Normal file
@@ -0,0 +1,69 @@
|
||||
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
|
||||
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
|
||||
paths:
|
||||
- /root/.conan2
|
||||
uploadStrategy: UPLOAD_IF_CHANGED
|
||||
changeDetectionExcludes: .onedev-buildspec.yml open_engine/** editor/**
|
||||
uploadProjectPath: OpenEngine
|
||||
condition: SUCCESSFUL
|
||||
optional: false
|
||||
- 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.3
|
||||
interpreter:
|
||||
type: DefaultInterpreter
|
||||
commands: |
|
||||
conan profile detect --force
|
||||
sed -i 's/cmake_minimum_required(VERSION 3.28)/cmake_minimum_required(VERSION 3.25)/' CMakeLists.txt
|
||||
conan install . --output-folder=. --build=missing -s build_type=${BUILD_TYPE}
|
||||
cmake -S . -G Ninja -B build -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DCMAKE_TOOLCHAIN_FILE=conan_toolchain.cmake
|
||||
cmake --build . --config ${BUILD_TYPE}
|
||||
envVars:
|
||||
- name: BUILD_TYPE
|
||||
value: Debug
|
||||
- name: CC
|
||||
value: clang
|
||||
- name: CXX
|
||||
value: clang++
|
||||
useTTY: true
|
||||
condition: SUCCESSFUL
|
||||
optional: false
|
||||
retryCondition: never
|
||||
maxRetries: 3
|
||||
retryDelay: 30
|
||||
timeout: 14400
|
||||
@@ -1,4 +1,4 @@
|
||||
cmake_minimum_required(VERSION 3.28)
|
||||
cmake_minimum_required(VERSION 3.25.1)
|
||||
|
||||
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
cmake_minimum_required(VERSION 3.28)
|
||||
cmake_minimum_required(VERSION 3.25.1)
|
||||
|
||||
set(CMAKE_CXX_STANDARD 20)
|
||||
|
||||
|
||||
@@ -136,14 +136,17 @@ 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);
|
||||
cube3.AddComponent<ModelComponent>(model2);
|
||||
cube4.AddComponent<ModelComponent>(monkey);
|
||||
|
||||
/*
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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,7 @@ find_package(imgui REQUIRED)
|
||||
find_package(EnTT REQUIRED)
|
||||
find_package(yaml-cpp REQUIRED)
|
||||
find_package(Jolt REQUIRED)
|
||||
find_package(fastgltf REQUIRED)
|
||||
|
||||
file(GLOB_RECURSE SRC_FILES "src/*.cpp")
|
||||
file(GLOB IMGUIZMO_SRC_FILES "${CMAKE_SOURCE_DIR}/vendor/ImGuizmo/*.cpp")
|
||||
@@ -63,6 +64,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
|
||||
|
||||
@@ -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 :
|
||||
2
open_engine/vendor/glad/CMakeLists.txt
vendored
2
open_engine/vendor/glad/CMakeLists.txt
vendored
@@ -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
1
vendor/ImGuizmo
vendored
Submodule
Submodule vendor/ImGuizmo added at a15acd87a3
Reference in New Issue
Block a user