Skip to content

Separate table collidersv2 #89

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

Open
TheBlek wants to merge 3 commits into
base: game
Choose a base branch
from
Open

Separate table collidersv2 #89

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
99d63ea
Separate table into two colliders
TheBlek May 28, 2024
9185578
Working separate table colliders + TypeFriction
TheBlek May 28, 2024
ad11a6b
Merge with game
TheBlek May 28, 2024
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: 5 additions & 5 deletions include/rigid_body.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
Mat3 IBodySphere(float radius, float mass);
Mat3 IBodyOBB(Vec3 halfWidth, float mass);

enum TypeFriction {
slidingFriction,
rollingFriction,
emptyFriction
enum class TypeFriction {
SlidingFriction,
RollingFriction,
EmptyFriction
};

class RigidBody {
Expand All @@ -32,7 +32,7 @@ class RigidBody {
// should be in {0, 1}
Vec3 angularUnlock = Vec3(1);

TypeFriction typeFriction = TypeFriction::emptyFriction;
TypeFriction typeFriction = TypeFriction::EmptyFriction;

RigidBody() = default;
RigidBody(float mass,
Expand Down
12 changes: 12 additions & 0 deletions resources/models/pool/table_collider_floor.mtl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Blender 4.1.1 MTL File: 'None'
# www.blender.org

newmtl Material.005
Ns 0.000000
Ka 1.000000 1.000000 1.000000
Kd 0.800000 0.800000 0.800000
Ks 0.000000 0.000000 0.000000
Ke 0.000000 0.000000 0.000000
Ni 1.500000
d 1.000000
illum 1
185 changes: 185 additions & 0 deletions resources/models/pool/table_collider_floor.obj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,185 @@
# Blender 4.1.1
# www.blender.org
mtllib table_collider_floor.mtl
o Cylinder.002
v -0.042077 0.841593 0.446419
v -0.834570 0.841593 0.446419
v -0.054262 0.841593 0.446419
v -0.894076 0.841593 -0.011034
v -0.822356 0.841593 0.446349
v -0.810061 0.841593 0.416666
v -0.894076 0.841593 0.374576
v -0.825954 0.841593 0.378297
v -0.864323 0.841593 0.362404
v -0.822246 0.841593 0.416666
v -0.834570 0.841593 0.386913
v -0.864323 0.841593 0.374589
v -0.894076 0.841593 0.386913
v -0.038369 0.841593 0.416666
v -0.029753 0.841593 0.416596
v 0.000351 0.841593 0.404272
v -0.864323 0.841593 -0.011034
v -0.825954 0.841593 -0.011034
v 0.000351 0.841593 0.378297
v 0.000351 0.841593 -0.011034
v 0.042779 0.841593 0.446419
v 0.835273 0.841593 0.446419
v 0.054964 0.841593 0.446419
v 0.894778 0.841593 -0.011034
v 0.823059 0.841593 0.446349
v 0.810764 0.841593 0.416666
v 0.894778 0.841593 0.374576
v 0.826657 0.841593 0.378297
v 0.865026 0.841593 0.362404
v 0.822949 0.841593 0.416666
v 0.835273 0.841593 0.386913
v 0.865026 0.841593 0.374589
v 0.894778 0.841593 0.386913
v 0.039071 0.841593 0.416666
v 0.030455 0.841593 0.416596
v 0.865026 0.841593 -0.011034
v 0.826657 0.841593 -0.011034
v -0.042077 0.841593 -0.468486
v -0.834570 0.841593 -0.468486
v -0.054262 0.841593 -0.468486
v -0.822356 0.841593 -0.468416
v -0.810061 0.841593 -0.438733
v -0.894076 0.841593 -0.396643
v -0.825954 0.841593 -0.400364
v -0.864323 0.841593 -0.384471
v -0.822246 0.841593 -0.438733
v -0.834570 0.841593 -0.408980
v -0.864323 0.841593 -0.396656
v -0.894076 0.841593 -0.408980
v -0.038369 0.841593 -0.438733
v -0.029753 0.841593 -0.438664
v 0.000351 0.841593 -0.426340
v 0.000351 0.841593 -0.400364
v 0.042779 0.841593 -0.468486
v 0.835273 0.841593 -0.468486
v 0.054964 0.841593 -0.468486
v 0.823059 0.841593 -0.468416
v 0.810764 0.841593 -0.438733
v 0.894778 0.841593 -0.396643
v 0.826657 0.841593 -0.400364
v 0.865026 0.841593 -0.384471
v 0.822949 0.841593 -0.438733
v 0.835273 0.841593 -0.408980
v 0.865026 0.841593 -0.396656
v 0.894778 0.841593 -0.408980
v 0.039071 0.841593 -0.438733
v 0.030455 0.841593 -0.438664
vn -0.0000 1.0000 -0.0000
vt 0.335886 0.915779
vt 0.335302 0.916091
vt 0.335302 0.900946
vt 0.335885 0.900705
vt 0.334549 0.916851
vt 0.334549 0.900634
vt 0.335302 0.900707
vt 0.335886 0.900465
vt 0.335886 0.916018
vt 0.335301 0.916260
vt 0.334718 0.900465
vt 0.334476 0.899881
vt 0.334237 0.899881
vt 0.334476 0.899297
vt 0.326908 0.899881
vt 0.326908 0.899297
vt 0.334718 0.899297
vt 0.326908 0.900634
vt 0.326908 0.916851
vt 0.335059 0.916851
vt 0.335886 0.917922
vt 0.335885 0.932997
vt 0.335302 0.932755
vt 0.335302 0.917611
vt 0.334549 0.933067
vt 0.335302 0.932994
vt 0.335886 0.933236
vt 0.335886 0.917683
vt 0.335301 0.917441
vt 0.334718 0.933236
vt 0.334476 0.933820
vt 0.334237 0.933820
vt 0.334476 0.934404
vt 0.326908 0.934404
vt 0.326908 0.933820
vt 0.334718 0.934404
vt 0.326908 0.933067
vt 0.317931 0.915779
vt 0.317932 0.900705
vt 0.318515 0.900946
vt 0.318515 0.916091
vt 0.319268 0.900634
vt 0.319268 0.916851
vt 0.318515 0.900707
vt 0.317931 0.900465
vt 0.317931 0.916018
vt 0.318516 0.916260
vt 0.319098 0.900465
vt 0.319340 0.899881
vt 0.319579 0.899881
vt 0.319341 0.899297
vt 0.319098 0.899297
vt 0.318758 0.916851
vt 0.317931 0.917922
vt 0.318515 0.917611
vt 0.318515 0.932755
vt 0.317932 0.932997
vt 0.319268 0.933067
vt 0.318515 0.932994
vt 0.317931 0.933236
vt 0.317931 0.917683
vt 0.318516 0.917441
vt 0.319098 0.933236
vt 0.319340 0.933820
vt 0.319579 0.933820
vt 0.319341 0.934404
vt 0.319098 0.934404
s 1
usemtl Material.005
f 3/1/1 14/2/1 6/3/1 5/4/1
f 14/2/1 19/5/1 8/6/1 6/3/1
f 10/7/1 2/8/1 5/4/1 6/3/1
f 1/9/1 15/10/1 14/2/1 3/1/1
f 11/11/1 10/7/1 6/3/1 8/6/1
f 12/12/1 11/11/1 8/6/1 9/13/1
f 7/14/1 9/13/1 17/15/1 4/16/1
f 7/14/1 13/17/1 12/12/1 9/13/1
f 8/6/1 18/18/1 17/15/1 9/13/1
f 18/18/1 8/6/1 19/5/1 20/19/1
f 15/10/1 16/20/1 19/5/1 14/2/1
f 23/21/1 25/22/1 26/23/1 34/24/1
f 34/24/1 26/23/1 28/25/1 19/5/1
f 30/26/1 26/23/1 25/22/1 22/27/1
f 21/28/1 23/21/1 34/24/1 35/29/1
f 31/30/1 28/25/1 26/23/1 30/26/1
f 32/31/1 29/32/1 28/25/1 31/30/1
f 27/33/1 24/34/1 36/35/1 29/32/1
f 27/33/1 29/32/1 32/31/1 33/36/1
f 28/25/1 29/32/1 36/35/1 37/37/1
f 37/37/1 20/19/1 19/5/1 28/25/1
f 35/29/1 34/24/1 19/5/1 16/20/1
f 40/38/1 41/39/1 42/40/1 50/41/1
f 50/41/1 42/40/1 44/42/1 53/43/1
f 46/44/1 42/40/1 41/39/1 39/45/1
f 38/46/1 40/38/1 50/41/1 51/47/1
f 47/48/1 44/42/1 42/40/1 46/44/1
f 48/49/1 45/50/1 44/42/1 47/48/1
f 43/51/1 4/16/1 17/15/1 45/50/1
f 43/51/1 45/50/1 48/49/1 49/52/1
f 44/42/1 45/50/1 17/15/1 18/18/1
f 18/18/1 20/19/1 53/43/1 44/42/1
f 51/47/1 50/41/1 53/43/1 52/53/1
f 56/54/1 66/55/1 58/56/1 57/57/1
f 66/55/1 53/43/1 60/58/1 58/56/1
f 62/59/1 55/60/1 57/57/1 58/56/1
f 54/61/1 67/62/1 66/55/1 56/54/1
f 63/63/1 62/59/1 58/56/1 60/58/1
f 64/64/1 63/63/1 60/58/1 61/65/1
f 59/66/1 61/65/1 36/35/1 24/34/1
f 59/66/1 65/67/1 64/64/1 61/65/1
f 60/58/1 37/37/1 36/35/1 61/65/1
f 37/37/1 60/58/1 53/43/1 20/19/1
f 67/62/1 52/53/1 53/43/1 66/55/1
12 changes: 12 additions & 0 deletions resources/models/pool/table_collider_holes.mtl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
# Blender 4.1.1 MTL File: 'None'
# www.blender.org

newmtl Material.003
Ns 0.000000
Ka 1.000000 1.000000 1.000000
Kd 0.800000 0.800000 0.800000
Ks 0.000000 0.000000 0.000000
Ke 0.000000 0.000000 0.000000
Ni 1.500000
d 1.000000
illum 1
Loading