Archive/Portal64
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Some more portal gun polish

Browse source
This commit is contained in:
James Lambert 2023-11-21 18:29:47 -07:00
parent 3a1ddebb26
commit 403e0d1bb9
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
assets/models/portal_gun/v_portalgun.blend
View file

Binary file not shown.

2
assets/models/portal_gun/v_portalgun.flags
View file

@ -1 +1 @@
--fixed-point-scale 512 -m assets/materials/objects.skm.yaml --sort-dir 0.029977,0.118112,0.030978 --model
--fixed-point-scale 512 -m assets/materials/objects.skm.yaml --sort-dir 0,1,0 --model

13
src/scene/portal_gun.c
View file

@ -24,6 +24,8 @@
#define PORTAL_GUN_SCALE 512.0f
struct Quaternion gFlipAroundY = {0.0f, 1.0f, 0.0f, 0.0f};
struct Transform gGunTransform = {
{0.0f, 0.0f, 0.0f},
{0.0f, 1.0f, 0.0f, 0.0f},
@ -43,6 +45,8 @@ void portalGunInit(struct PortalGun* portalGun, struct Transform* at, int isFres
portalTrailInit(&portalGun->projectiles[0].trail);
portalTrailInit(&portalGun->projectiles[1].trail);
portalGun->rotation = at->rotation;
if (isFreshStart) {
skAnimatorRunClip(&portalGun->animator, &portal_gun_v_portalgun_Armature_draw_clip, 0.0f, 0);
} else {
@ -143,6 +147,13 @@ void portalGunRenderReal(struct PortalGun* portalGun, struct RenderState* render
} else {
gDPSetEnvColor(renderState->dl++, 128, 128, 128, 255);
}
struct Quaternion relativeRotation;
struct Quaternion inverseCameraRotation;
quatConjugate(&fromCamera->transform.rotation, &inverseCameraRotation);
quatMultiply(&inverseCameraRotation, &portalGun->rotation, &relativeRotation);
quatMultiply(&relativeRotation, &gFlipAroundY, &gGunTransform.rotation);
transformToMatrixL(&gGunTransform, &matrix[0], PORTAL_GUN_SCALE);
gSPMatrix(renderState->dl++, &matrix[0], G_MTX_MODELVIEW | G_MTX_PUSH | G_MTX_MUL);
@ -156,7 +167,7 @@ void portalGunRenderReal(struct PortalGun* portalGun, struct RenderState* render
#define MAX_PROJECTILE_DISTANCE 100.0f
void portalGunUpdatePosition(struct PortalGun* portalGun, struct Player* player) {
portalGun->rotation = player->lookTransform.rotation;
quatLerp(&portalGun->rotation, &player->lookTransform.rotation, 0.45f, &portalGun->rotation);
}
void portalGunUpdate(struct PortalGun* portalGun, struct Player* player) {