Skip to content

Commit 5650dc1

Browse files
committed
Fix collision rendering for spheres
1 parent fcc9836 commit 5650dc1

File tree

4 files changed

+34
-5
lines changed

4 files changed

+34
-5
lines changed
Lines changed: 30 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,36 @@
11
struct CCollisionActorManager {
2-
//std::vector<CJointCollisionDescription> x0_jointDescriptions;
2+
rstl::vector<CJointCollisionDescription> jointDescriptions 0x4
33
i32 ownerId 0x10
44
bool active 0x12
55
bool destroyed 0x13
66
bool movable 0x14
7+
}
8+
9+
struct CJointCollisionDescription {
10+
size 0x44
11+
ECollisionType colType 0x0
12+
EOrientationType orientType 0x4
13+
CSegId pivotId 0x8
14+
CSegId nextId 0x9
15+
CVector3f bounds 0xc
16+
CVector3f _pivotPoint 0x18
17+
f32 radius 0x24
18+
f32 maxSeparation 0x28
19+
*u8 _name 0x2c
20+
u16 actorId 0x3C
21+
f32 mass 0x40
22+
}
23+
24+
enum ECollisionType {
25+
Sphere=0,
26+
SphereSubdivide,
27+
AABox,
28+
OBBAutoSize,
29+
OBB,
30+
}
31+
32+
enum EOrientationType { Zero=0, One }
33+
34+
struct CSegId {
35+
u8 segId 0x0
736
}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
struct CThardus: CPatterned {
2-
2+
*CCollisionActorManager rockColliders 0x5f0
33
}

prime_defs/prime1/entities/player/CMorphBall.bs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
struct CMorphBall {
2-
CSphere collisionSphere 0x38
2+
CCollidableSphere collisionSphere 0x38
33
// TODO: this may be handy later CCollisionInfoList x74_collisionInfos;\
44

55
ESpiderBallState spiderBallState 0x187C
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
struct CSphere {
2-
CVector3f origin 0x10
3-
f32 radius 0x1C
2+
CVector3f origin 0x0
3+
f32 radius 0xC
44
}

0 commit comments

Comments
 (0)