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.

Sign up for GitHub

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

Jump to bottom

Physics/collision resolution #58

Merged
merged 56 commits into from
Dec 11, 2018
Merged

Physics/collision resolution #58

merged 56 commits into from
Dec 11, 2018

Conversation

ArturoKuang
Copy link
Contributor

Feature/Issue

Collision resolution with angular momentum, linear momentum, and interpenetration.

Implementation/Solution

Iterative solution for interpenetration, angular momentum, and linear momentum.

Dependencies (if any?)

  • [ ]

Screenshots/GIF (if applicable)

collision

Tests

  • [ x ] Have you reviewed your own code?
  • Does it pass unit tests?

ArturoKuang and others added 30 commits September 27, 2018 18:34
@ArturoKuang
Created time class
97e181c
@ArturoKuang
Changed debug settings
66e6c55
@ArturoKuang
Created singleton class for time
cf97d24
added comments to header
6d7b874
@ArturoKuang
fixed merge conflicts behind development
a7b1c99
@ArturoKuang
Added time in engine
111742f
@ArturoKuang
Delete main.cpp.orig
f3d0382
@ArturoKuang
Delete vs_basic_LOCAL_2736.hlsl
a95bc65
@ArturoKuang
Removed unnecessary files from merge conflicts
b734ea4
@ArturoKuang
Merge branch 'arturo' of https://github.com/engine-buddies/light-vox-…
878be3f 
…engine into arturo
@ArturoKuang
Delete Light Vox Engine.vcxproj.filters.orig
5f97f48
@ArturoKuang
Changed classname to GameTime, and fixed unnecessary conversions
cead67e
@ArturoKuang
Merge branch 'development' into arturo
c075836
@ArturoKuang
Changed to uppercase
e72733d
@ArturoKuang
Merge branch 'arturo' of https://github.com/engine-buddies/light-vox-…
735dcc2 
…engine into arturo
@ArturoKuang
__int64 to double
dd44386
@ArturoKuang
static_cast to double in time
b3dc7c7
@ArturoKuang
Merge instancing branch
4f3b3c4
@ArturoKuang
Created ECS and Physics
46fb487
@ArturoKuang
Changed ECS to be data oriented
83f8d7a
@ArturoKuang
Finished ECS and time can return floats and doubles
0225c1b
@ArturoKuang
Added glm math and finished basic physics framework
389b066
Fixed changes for review
f15b088
@ArturoKuang
fixed typo
29b0d47
@ArturoKuang
Merge development
e28ebe7
@ArturoKuang
Merge development
87a2de7
@ArturoKuang
Deleted .orig files
fce7e31
@ArturoKuang
pulled from development
4bee7fa
@ArturoKuang
Refactored Physics class and created RigidBody Class
970282f
@ArturoKuang
Changed Physics.h to Solver.h
96dbb3b
@ArturoKuang ArturoKuang added P3 Stretch Goal Physics For the physics pod! feature This is feature we are working towards labels Dec 10, 2018
BenjaFriend
BenjaFriend previously requested changes Dec 10, 2018
View reviewed changes
Copy link
Contributor

@BenjaFriend BenjaFriend left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remove that namespace from the header file and we are good to go

Light Vox Engine/ECS/ComponentManager.h Show resolved Hide resolved
Light Vox Engine/Physics/ContactSolver.h Outdated Show resolved Hide resolved
Light Vox Engine/Physics/RigidBody.cpp Outdated Show resolved Hide resolved
ArturoKuang
ArturoKuang commented Dec 10, 2018
View reviewed changes
Copy link
Contributor Author

@ArturoKuang ArturoKuang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ready for re-review

ttanatb
ttanatb approved these changes Dec 11, 2018
View reviewed changes
Copy link
Contributor

@ttanatb ttanatb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm 🚢

@ArturoKuang ArturoKuang merged commit 9cc9e84 into development Dec 11, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ttanatb ttanatb ttanatb approved these changes

@BenjaFriend BenjaFriend BenjaFriend left review comments

Assignees

@ttanatb ttanatb

@BenjaFriend BenjaFriend

@arb7887 arb7887

@ArturoKuang ArturoKuang

Labels
feature This is feature we are working towards P3 Stretch Goal Physics For the physics pod!
Projects
None yet
Milestone
Sprint 3 - Everything Else
Development

Successfully merging this pull request may close these issues.
4 participants
@ArturoKuang @ttanatb @BenjaFriend @arb7887