Skip to content

Commit 2738258

Browse files
authored
Ported more stuff from: (#687)
* Ported more stuff from: xCamera, xEntMotion, xPad, xSerializer, xString * Elegant code
1 parent cc739ad commit 2738258

File tree

17 files changed

+1425
-241
lines changed

17 files changed

+1425
-241
lines changed

src/SB/Core/x/xCamera.cpp

Lines changed: 560 additions & 1 deletion
Large diffs are not rendered by default.

src/SB/Core/x/xCamera.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,7 @@ void xCameraMove(xCamera* cam, const xVec3& loc);
286286
void xCameraMove(xCamera* cam, const xVec3& loc, F32 maxSpeed);
287287
void xCameraFOV(xCamera* cam, F32 fov, F32 maxSpeed, F32 dt);
288288
void xCameraRotate(xCamera* cam, const xMat3x3& m, F32 time, F32 accel, F32 decl);
289+
void xCameraLook(xCamera* cam, U32 flags, const xQuat* orn_goal, F32 tm, F32 tm_acc, F32 tm_dec);
289290
void xCameraLookYPR(xCamera* cam, U32 flags, F32 yaw, F32 pitch, F32 roll, F32 tm, F32 tm_acc,
290291
F32 tm_dec);
291292
F32 xCameraGetFOV(const xCamera* cam);

src/SB/Core/x/xCollide.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,7 @@ struct xScene;
126126
void xCollideInit(xScene* sc);
127127
void xCollideCalcTri(xCollis::tri_data&, const xModelInstance&, const xVec3&, const xVec3&);
128128
S32 xSweptSphereToBox(xSweptSphere* sws, xBox* box, xMat4x3* mat);
129+
S32 xSweptSphereToEnv(xSweptSphere* sws, xEnv* env);
129130
S32 xSweptSphereToModel(xSweptSphere* sws, RpAtomic* model, RwMatrix* mat);
130131
S32 xSweptSphereToScene(xSweptSphere* sws, xScene* sc, xEnt* mover, U8 collType);
131132
void xSweptSpherePrepare(xSweptSphere* sws, xVec3* start, xVec3* end, F32 radius);

0 commit comments

Comments
 (0)