Compare commits
33 Commits
fastgltf
...
0d9dcfd541
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
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
|
||||||
68
.onedev-buildspec.yml
Normal file
68
.onedev-buildspec.yml
Normal file
@@ -0,0 +1,68 @@
|
|||||||
|
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/p
|
||||||
|
uploadStrategy: UPLOAD_IF_NOT_HIT
|
||||||
|
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)
|
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)
|
set(CMAKE_CXX_STANDARD 20)
|
||||||
|
|
||||||
|
|||||||
@@ -136,14 +136,17 @@ namespace OpenEngine {
|
|||||||
|
|
||||||
Entity cube3 = scene->CreateEntity("glb");
|
Entity cube3 = scene->CreateEntity("glb");
|
||||||
Entity cube4 = scene->CreateEntity("glb2");
|
Entity cube4 = scene->CreateEntity("glb2");
|
||||||
|
Entity cube5 = scene->CreateEntity("glb2");
|
||||||
cube3.AddComponent<TransformComponent>();
|
cube3.AddComponent<TransformComponent>();
|
||||||
cube4.AddComponent<TransformComponent>();
|
cube4.AddComponent<TransformComponent>();
|
||||||
|
cube5.AddComponent<TransformComponent>();
|
||||||
|
|
||||||
Ref<Model3D> model = Model3D::Create("./assets/models/cubes.glb");
|
Ref<Model3D> model = Model3D::Create("./assets/models/cubes.glb");
|
||||||
Ref<Model3D> model2 = Model3D::Create("./assets/models/cube_legs.glb");
|
Ref<Model3D> model2 = Model3D::Create("./assets/models/cube_legs.glb");
|
||||||
Ref<Model3D> monkey = Model3D::Create("./assets/models/monkey.glb");
|
Ref<Model3D> monkey = Model3D::Create("./assets/models/monkey.glb");
|
||||||
|
|
||||||
cube3.AddComponent<ModelComponent>(model);
|
cube3.AddComponent<ModelComponent>(model);
|
||||||
|
cube3.AddComponent<ModelComponent>(model2);
|
||||||
cube4.AddComponent<ModelComponent>(monkey);
|
cube4.AddComponent<ModelComponent>(monkey);
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|||||||
@@ -304,9 +304,7 @@ namespace OpenEngine {
|
|||||||
bool opened = ImGui::TreeNodeEx(
|
bool opened = ImGui::TreeNodeEx(
|
||||||
(void*)(intptr_t)entity,
|
(void*)(intptr_t)entity,
|
||||||
ImGuiTreeNodeFlags_None,
|
ImGuiTreeNodeFlags_None,
|
||||||
"Meshes",
|
"Meshes");
|
||||||
nullptr
|
|
||||||
);
|
|
||||||
|
|
||||||
if (opened) {
|
if (opened) {
|
||||||
unsigned int i = 0;
|
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)
|
set(CMAKE_CXX_STANDARD 23)
|
||||||
|
|
||||||
@@ -14,6 +14,7 @@ find_package(imgui REQUIRED)
|
|||||||
find_package(EnTT REQUIRED)
|
find_package(EnTT REQUIRED)
|
||||||
find_package(yaml-cpp REQUIRED)
|
find_package(yaml-cpp REQUIRED)
|
||||||
find_package(Jolt REQUIRED)
|
find_package(Jolt REQUIRED)
|
||||||
|
find_package(fastgltf 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")
|
||||||
@@ -63,6 +64,7 @@ target_link_libraries(${PROJECT_EXECUTABLE_NAME} PUBLIC
|
|||||||
spirv-cross-glsl
|
spirv-cross-glsl
|
||||||
spirv-cross-reflect
|
spirv-cross-reflect
|
||||||
Jolt::Jolt
|
Jolt::Jolt
|
||||||
|
fastgltf::fastgltf
|
||||||
)
|
)
|
||||||
|
|
||||||
#target_link_directories(${PROJECT_EXECUTABLE_NAME} PRIVATE
|
#target_link_directories(${PROJECT_EXECUTABLE_NAME} PRIVATE
|
||||||
|
|||||||
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)
|
set(CMAKE_CXX_STANDARD 20)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user