Skip to content
Merged

Dev #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
8c3db5c
feat/basicrotation
urastogi2048 Mar 23, 2026
aea124b
phase5rotation
urastogi2048 Mar 23, 2026
d81c0c8
resolve merge conflicts
urastogi2048 Mar 23, 2026
bcc0a2a
Merge pull request #60 from Satvik-Singh192/feat/rotationstep
PresenceOP-Coder Mar 24, 2026
90f3fce
minorchanges
urastogi2048 Mar 24, 2026
e643b0b
feat/boxrotationphysics
urastogi2048 Mar 24, 2026
93c281d
feat: rendering extended for rope, rod and spring
Just-Here-TO-Code Mar 25, 2026
d8574e4
Merge pull request #64 from Satvik-Singh192/feat/render_new_bodies
Satvik-Singh192 Mar 25, 2026
f28753c
Merge branch 'dev' into feat/rotationstep
Just-Here-TO-Code Mar 25, 2026
7e75b04
Merge pull request #63 from Satvik-Singh192/feat/rotationstep
Just-Here-TO-Code Mar 25, 2026
b48808d
feat: added a main menu and fixed ui
PresenceOP-Coder Mar 25, 2026
b070fe2
fixed body inspector issue
PresenceOP-Coder Mar 25, 2026
f2b8a34
Merge pull request #65 from Satvik-Singh192/ui/improvement
Satvik-Singh192 Mar 25, 2026
65bbdbb
feat: added function to delete bodies,constraints and performed some …
Satvik-Singh192 Mar 25, 2026
2224848
Merge pull request #66 from Satvik-Singh192/feat/handling_deletion
Just-Here-TO-Code Mar 25, 2026
f2b9849
fixed ui
PresenceOP-Coder Mar 25, 2026
5d88ea7
Merge pull request #67 from Satvik-Singh192/ui/improvement
Satvik-Singh192 Mar 25, 2026
959b119
feat: rendering the rotation
Just-Here-TO-Code Mar 25, 2026
c90661f
Merge pull request #68 from Satvik-Singh192/feat/render_rotation
Satvik-Singh192 Mar 26, 2026
2cb5741
feat: added status message popup and handled cases for body addition/…
Just-Here-TO-Code Mar 26, 2026
c66fc4e
feat: handeled deletion of manifolds,prev_manifolds when a body is de…
Satvik-Singh192 Mar 26, 2026
6c1046f
Merge pull request #69 from Satvik-Singh192/feat/status_popup
Satvik-Singh192 Mar 26, 2026
f023923
Merge branch 'dev' into feat/manifold_deletion
Satvik-Singh192 Mar 26, 2026
6196dff
feat: implemented response handling at constraint creation
Satvik-Singh192 Mar 26, 2026
46fdf94
Merge pull request #70 from Satvik-Singh192/feat/manifold_deletion
Just-Here-TO-Code Mar 26, 2026
9e1b8cb
feat: render polish
Just-Here-TO-Code Mar 27, 2026
54eab96
Merge pull request #71 from Satvik-Singh192/feat/render_polish
urastogi2048 Mar 27, 2026
9ebe0f0
feat/box-sphererotation
urastogi2048 Mar 27, 2026
b1e2ca4
Merge branch 'dev' of https://github.com/Satvik-Singh192/Aether into …
urastogi2048 Mar 27, 2026
90d7760
Merge pull request #72 from Satvik-Singh192/rotation
Just-Here-TO-Code Mar 27, 2026
bfc75a6
chore/binary
Satvik-Singh192 Mar 27, 2026
67f912f
ramp
urastogi2048 Mar 27, 2026
4c2e656
Merge pull request #73 from Satvik-Singh192/chore/binary
urastogi2048 Mar 27, 2026
d413a7d
fix: git wasnt tracking release binaries
Satvik-Singh192 Mar 27, 2026
8b9f5b1
Merge pull request #74 from Satvik-Singh192/chore/binary
urastogi2048 Mar 27, 2026
3472cc4
feat:added guide option
PresenceOP-Coder Mar 27, 2026
02f1d94
feat: added arrow heads to show velocity vectors
Just-Here-TO-Code Mar 27, 2026
6a84360
feat: added a toggle to switch between showing arrows
Just-Here-TO-Code Mar 27, 2026
bfa6873
Merge pull request #76 from Satvik-Singh192/ui/guide_ui
Just-Here-TO-Code Mar 27, 2026
d031057
fix: jittering and rotation energy explosion
Satvik-Singh192 Mar 27, 2026
fcb0308
Merge pull request #77 from Satvik-Singh192/fix/rot_jitter
Just-Here-TO-Code Mar 27, 2026
56b2b42
feat: scaling arrow head size based on velocity magnitude
Just-Here-TO-Code Mar 27, 2026
5010af6
chore: merge dev
Just-Here-TO-Code Mar 27, 2026
02e77fc
Merge pull request #78 from Satvik-Singh192/feat/vector_display
urastogi2048 Mar 28, 2026
e51e736
Merge branch 'dev' of https://github.com/Satvik-Singh192/Aether into …
urastogi2048 Mar 28, 2026
f331d1f
feat/spherefixes
urastogi2048 Mar 28, 2026
98ef456
Merge pull request #79 from Satvik-Singh192/rotation
Just-Here-TO-Code Mar 28, 2026
3b57943
ramp patch
urastogi2048 Mar 28, 2026
d5289e8
feat: added popup for constraint success and failure messages
Just-Here-TO-Code Mar 28, 2026
5ac9d88
Merge pull request #80 from Satvik-Singh192/rotation
Just-Here-TO-Code Mar 28, 2026
1606aef
Merge branch 'dev' into feat/message_popup
Just-Here-TO-Code Mar 28, 2026
ead6432
Merge pull request #81 from Satvik-Singh192/feat/message_popup
Satvik-Singh192 Mar 28, 2026
488642b
feat:improved obb collision of rampbox
PresenceOP-Coder Mar 28, 2026
fdbdd5b
feat:added ramp box collision
PresenceOP-Coder Mar 28, 2026
40745cd
Merge pull request #82 from Satvik-Singh192/feat/ramprampcollision
urastogi2048 Mar 28, 2026
616a93f
feat: implemented good prebuilt scenarios
Satvik-Singh192 Mar 28, 2026
d4b4b04
startedfluid
urastogi2048 Mar 28, 2026
e0507f8
Merge pull request #83 from Satvik-Singh192/feat/testcases
urastogi2048 Mar 28, 2026
3b38084
Merge branch 'dev' of https://github.com/Satvik-Singh192/Aether into …
urastogi2048 Mar 28, 2026
e5013d7
feat:buoyancy
urastogi2048 Mar 28, 2026
1f5286b
feat/buoyancy
urastogi2048 Mar 29, 2026
d3ca599
feat: added more testcases
Satvik-Singh192 Mar 29, 2026
af4127a
Merge pull request #85 from Satvik-Singh192/fluid
Satvik-Singh192 Mar 29, 2026
33157b7
feat/addedbeaker
urastogi2048 Mar 29, 2026
aae437f
feat: added even more new test cases
Satvik-Singh192 Mar 29, 2026
0e5d73a
Merge branch 'dev' into feat/new_testcases
Satvik-Singh192 Mar 29, 2026
cb12a31
chore/organising test cases
urastogi2048 Mar 29, 2026
432ea1b
fix: syntax error, missing comma
Satvik-Singh192 Mar 30, 2026
52b576e
Merge pull request #86 from Satvik-Singh192/feat/new_testcases
PresenceOP-Coder Mar 30, 2026
ca89303
Merge pull request #87 from Satvik-Singh192/fluid
Just-Here-TO-Code Mar 30, 2026
e7b15dd
feat: implemented a special test case showcasing heat transfer throug…
Satvik-Singh192 Mar 30, 2026
fa881fd
Merge pull request #89 from Satvik-Singh192/feat/thermal
Just-Here-TO-Code Mar 30, 2026
7fcfc9f
Merge branch 'dev' into testcase
urastogi2048 Mar 30, 2026
435ca8b
feat: rendering fluids and buoyancy scenario
Just-Here-TO-Code Mar 30, 2026
0529b84
merged
urastogi2048 Mar 30, 2026
58763b8
Merge pull request #88 from Satvik-Singh192/testcase
Just-Here-TO-Code Mar 30, 2026
00cc464
chore: merge branch 'dev' into feat/render__fluids
Just-Here-TO-Code Mar 30, 2026
38f92a9
Merge pull request #90 from Satvik-Singh192/feat/render__fluids
Satvik-Singh192 Mar 30, 2026
3a66d37
feat/addedtestcases
urastogi2048 Mar 30, 2026
100f628
feat: added styling to the main menu
Satvik-Singh192 Mar 31, 2026
00e98dc
Merge pull request #92 from Satvik-Singh192/feat/menu_style
Just-Here-TO-Code Mar 31, 2026
d527d0d
feat: README.md updated
Just-Here-TO-Code Mar 31, 2026
ddf5e56
Merge pull request #91 from Satvik-Singh192/testcase
Just-Here-TO-Code Mar 31, 2026
7cef632
feat: README.md updated
Just-Here-TO-Code Mar 31, 2026
c3cb335
chore: merge branch 'dev' into feat/update_readme
Just-Here-TO-Code Mar 31, 2026
2e1699e
feat: updated scenarios
Just-Here-TO-Code Mar 31, 2026
46b00a7
feat: implemented chapter selection along with scenario selection
Just-Here-TO-Code Mar 31, 2026
7f3e1d5
Merge pull request #94 from Satvik-Singh192/feat/group_scenario
Satvik-Singh192 Mar 31, 2026
b5e5bbd
Merge pull request #93 from Satvik-Singh192/feat/update_readme
Satvik-Singh192 Mar 31, 2026
7411517
fix: start screen body spawning fixed
Just-Here-TO-Code Mar 31, 2026
7647055
Merge pull request #95 from Satvik-Singh192/fix/startScreen
Satvik-Singh192 Mar 31, 2026
78456fb
chore: building latest quick start binaries
Satvik-Singh192 Mar 31, 2026
0acdda0
chore: updated the README
Satvik-Singh192 Mar 31, 2026
4dbce72
Merge pull request #96 from Satvik-Singh192/chore/binaries
Satvik-Singh192 Mar 31, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,12 @@ build/_deps/

# Architecture build folders
Debug/
Release/
x64/
x86/
x86/
build_linux/

!release/
!release/windows/
!release/windows/Aether.exe
!release/windows/msvcp140.dll
!release/windows/vcruntime140.dll
4 changes: 4 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ add_executable(Aether_Test
engine/math/mat.cpp
engine/math/quat.cpp
engine/core/rigidbody.cpp
engine/core/buoyancy.cpp
engine/world/physicsworld.cpp
engine/collision/sphere_sphere.cpp
engine/collision/box_box.cpp
Expand All @@ -61,11 +62,14 @@ add_executable(Aether_Test
engine/collision/manifolds/buildRampBoxManifold.cpp
engine/collision/manifolds/buildRampSphereManifold.cpp
engine/collision/manifolds/buildRampRampManifold.cpp
engine/collision/obb.hpp
renderer/window.cpp
renderer/camera.cpp
renderer/drawbodies.cpp
renderer/drawconstraints.cpp
renderer/bodyshaders.cpp
renderer/bodymenu.cpp
renderer/aether_theme.cpp
)

add_library(imgui STATIC
Expand Down
12 changes: 8 additions & 4 deletions CMakeSettings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,12 @@
"name": "x64-Debug",
"generator": "Ninja",
"configurationType": "Debug",
"inheritEnvironments": [ "msvc_x64_x64" ],
"inheritEnvironments": [
"msvc_x64_x64"
],
"buildRoot": "${projectDir}\\out\\build\\${name}",
"installRoot": "${projectDir}\\out\\install\\${name}",
"cmakeCommandArgs": "",
"cmakeCommandArgs": "-DVCPKG_MANIFEST_MODE=ON",
"buildCommandArgs": "",
"ctestCommandArgs": ""
},
Expand All @@ -17,10 +19,12 @@
"configurationType": "RelWithDebInfo",
"buildRoot": "${projectDir}\\out\\build\\${name}",
"installRoot": "${projectDir}\\out\\install\\${name}",
"cmakeCommandArgs": "",
"cmakeCommandArgs": "-DVCPKG_MANIFEST_MODE=ON",
"buildCommandArgs": "",
"ctestCommandArgs": "",
"inheritEnvironments": [ "msvc_x64_x64" ],
"inheritEnvironments": [
"msvc_x64_x64"
],
"variables": []
}
]
Expand Down
302 changes: 266 additions & 36 deletions README.md

Large diffs are not rendered by default.

4 changes: 0 additions & 4 deletions app/main.cpp
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
#include "world/physicsworld.hpp"
#include "../renderer/window.hpp"
#include "test_scenarios.hpp"

// BoxRamp
int main()
{
PhysicsWorld world;

const TestCase active_case = TestCase::RampDropOnSphere;
LoadSingleTestScenario(world, active_case);

CreateWindow(world);
return 0;
}
Loading
Loading