Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Physics engine + more scene improvements #44

Merged
merged 18 commits into from
Jan 22, 2024
Merged

Conversation

tippesi
Copy link
Owner

@tippesi tippesi commented Jan 18, 2024

No description provided.

@tippesi tippesi changed the base branch from master to major-rework January 22, 2024 18:27
# Conflicts:
#	CMakeLists.txt
#	src/demo/App.cpp
#	src/engine/RenderList.cpp
#	src/engine/RenderList.h
#	src/engine/ecs/EntityManager.h
#	src/engine/ecs/Subset.h
#	src/engine/raytracing/RayTracingWorld.cpp
#	src/engine/raytracing/RayTracingWorld.h
#	src/engine/scene/Entity.cpp
#	src/engine/scene/Entity.h
#	src/engine/scene/Scene.cpp
#	src/engine/scene/Scene.h
#	src/engine/scene/SpacePartitioning.cpp
#	src/engine/scene/SpacePartitioning.h
#	src/engine/scene/components/Components.h
#	src/engine/scene/components/MeshComponent.cpp
#	src/engine/scene/components/MeshComponent.h
#	src/engine/scene/components/TransformComponent.cpp
#	src/engine/scene/components/TransformComponent.h
#	src/engine/scene/prefabs/MeshInstance.h
#	src/engine/scene/prefabs/Prefabs.h
#	src/tests/App.cpp
#	vcpkg.json
@tippesi tippesi added enhancement New feature or request feature labels Jan 22, 2024
@tippesi tippesi marked this pull request as ready for review January 22, 2024 18:33
@tippesi tippesi merged commit b70e92b into major-rework Jan 22, 2024
1 check was pending
@tippesi tippesi deleted the feature/physics branch February 8, 2024 20:00
tippesi added a commit that referenced this pull request Mar 24, 2024
* Started scene rework

* Refactored the new scene a bit

* More changes

* Attempt fix

* Subset on scene level with scene entity implemented

* Compilation works again

* Fixed a bunch of issues

* First iteration of physics integration

* Some fixes + some improvements

* Some more fixes

* Fixed a few things

* Box shape for rigid body supported + fixes

* Many improvements

* Scaled physics shapes work now + fixes

* Made ray tracing world optional in scene

* Terrain can be inserted into physics world + bug fixes
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant