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

Work on portal projectile effect

Browse source
This commit is contained in:
James Lambert 2023-09-15 22:08:32 -06:00
parent aea526a537
commit a391432c72
8 changed files with 122 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
assets/materials/effects/brightglow_y.ims Normal file
View file

@ -0,0 +1 @@
-set colorspace Gray -separate -average -resize 16x16

10
assets/materials/effects/portal_2_particle.ims Normal file
View file

@ -0,0 +1,10 @@
-background black
\( +clone -resize 80x80 -repage +0+2 \)
\( +clone -resize 32x32 -repage +8+8 \)
\( +clone -resize 10x10 -repage +12+12 \)
-compose Plus
-layers merge
-resize 32x32
\( +clone -set colorspace Gray -separate -average \)
-compose CopyOpacity
-composite

35
assets/materials/static.skm.yaml
View file

@ -1087,4 +1087,37 @@ materials:
alpha: ["SHADE", "0", "TEXEL0", "0"]
gSPGeometryMode:
clear: [G_CULL_BACK, G_CULL_FRONT, G_LIGHTING]
set: [G_SHADE]
set: [G_SHADE]
portal_2_particle:
gDPSetTile:
filename: ../../portal_pak_modified/materials/effects/portal_2_particle.png
fmt: G_IM_FMT_RGBA
siz: G_IM_SIZ_32b
gDPSetRenderMode: G_RM_XLU_SURF
gDPSetCombineMode:
color: ["0", "0", "0", "TEXEL0"]
alpha: ["0", "0", "0", "TEXEL0"]
gSPGeometryMode:
clear: [G_CULL_BACK, G_CULL_FRONT, G_LIGHTING]
set: [G_SHADE]
brightglow_y:
gDPSetTile:
filename: ../../portal_pak_modified/materials/effects/brightglow_y.png
fmt: G_IM_FMT_I
siz: G_IM_SIZ_4b
s:
shift: 1
t:
shift: 1
gDPSetRenderMode: G_RM_XLU_SURF
gDPSetCombineMode:
color: ["1", "PRIMITIVE", "TEXEL0_ALPHA", "PRIMITIVE"]
alpha: ["PRIMITIVE", "0", "TEXEL0", "0"]
gSPGeometryMode:
clear: [G_CULL_BACK, G_CULL_FRONT]

4
src/physics/collision_scene.c
View file

@ -443,7 +443,9 @@ int collisionSceneRaycast(struct CollisionScene* scene, int roomIndex, struct Ra
roomIndex = nextRoom;
// even on a miss, the raycast should report which room it ended up in
hit->roomIndex = roomIndex;
if (roomIndex != -1) {
hit->roomIndex = roomIndex;
}
--roomsToCheck;
}

4
src/player/player.c
View file

@ -417,10 +417,8 @@ void playerUpdateGunObject(struct Player* player) {
quatLook(&forward, &gPortalGunUp, &relativeRotation);
quatMultiply(&player->lookTransform.rotation, &relativeRotation, &player->gunConstraint.object->body->transform.rotation);
struct Vector3 gunPoint;
struct Vector3 temp_gun_dist = offset;
transformPoint(&player->lookTransform, &temp_gun_dist, &gunPoint);
transformPoint(&player->lookTransform, &offset, &gunPoint);
pointConstraintUpdateTarget(&player->gunConstraint, &gunPoint, &player->gunConstraint.object->body->transform.rotation);

108
src/scene/portal_gun.c
View file

@ -3,6 +3,8 @@
#include "../physics/collision_scene.h"
#include "../physics/collision_cylinder.h"
#include "../effects/effect_definitions.h"
#include "../../build/assets/models/grav_flare.h"
#include "../../build/assets/models/portal_gun/v_portalgun.h"
#include "../../build/assets/materials/static.h"
@ -45,13 +47,76 @@ void portalGunInit(struct PortalGun* portalGun, struct Transform* at){
portalGun->portalGunVisible = 0;
portalGun->shootAnimationTimer = 0.0;
portalGun->projectiles[0].dynamicId = -1;
portalGun->projectiles[0].roomIndex = -1;
portalGun->projectiles[1].dynamicId = -1;
portalGun->projectiles[1].roomIndex = -1;
}
void portalGunRenderReal(struct PortalGun* portalGun, struct RenderState* renderState){
#define PORTAL_PROJECTILE_RADIUS 0.15f
#define DISTANCE_FADE_SCALAR (255.0f / 5.0f)
struct Coloru8 gProjectileColor[] = {
{200, 100, 50, 255},
{50, 70, 200, 255},
};
void portalBallRender(struct PortalGunProjectile* projectile, struct RenderState* renderState, struct Transform* fromView, int portalIndex) {
struct Transform transform;
if (projectile->distance < projectile->maxDistance) {
vector3AddScaled(
&projectile->positionDirection.origin,
&projectile->effectOffset,
1.0f - projectile->distance / projectile->maxDistance,
&transform.position
);
} else {
transform.position = projectile->positionDirection.origin;
}
transform.rotation = fromView->rotation;
vector3Scale(&gOneVec, &transform.scale, PORTAL_PROJECTILE_RADIUS);
Mtx* mtx = renderStateRequestMatrices(renderState, 1);
transformToMatrixL(&transform, mtx, SCENE_SCALE);
Gfx* material = static_brightglow_y;
Gfx* materialRevert = static_brightglow_y_revert;
struct Coloru8* color = &gProjectileColor[portalIndex];
float alpha = projectile->distance * DISTANCE_FADE_SCALAR;
if (alpha > 255.0f) {
alpha = 255.0f;
}
gDPSetPrimColor(renderState->dl++, 255, 255, color->r, color->g, color->b, (u8)alpha);
if (projectile->distance == 0.0f) {
material = static_portal_2_particle;
materialRevert = static_portal_2_particle_revert;
}
gSPMatrix(renderState->dl++, mtx, G_MTX_MODELVIEW | G_MTX_MUL | G_MTX_PUSH);
gSPDisplayList(renderState->dl++, material);
gSPDisplayList(renderState->dl++, grav_flare_model_gfx);
gSPDisplayList(renderState->dl++, materialRevert);
gSPPopMatrix(renderState->dl++, G_MTX_MODELVIEW);
}
void portalGunRenderReal(struct PortalGun* portalGun, struct RenderState* renderState, struct Transform* fromView){
for (int i = 0; i < 2; ++i) {
struct PortalGunProjectile* projectile = &portalGun->projectiles[i];
if (projectile->roomIndex == -1) {
continue;
}
portalBallRender(projectile, renderState, fromView, i);
}
portalGun->rigidBody.transform.scale = gOneVec;
Mtx* matrix = renderStateRequestMatrices(renderState, 1);
@ -65,9 +130,8 @@ void portalGunRenderReal(struct PortalGun* portalGun, struct RenderState* render
gSPPopMatrix(renderState->dl++, G_MTX_MODELVIEW);
}
#define PORTAL_PROJECTILE_RADIUS 0.2f
#define NO_HIT_DISTANCE 20.0f
#define PORTAL_PROJECTILE_SPEED 10.0f
#define PORTAL_PROJECTILE_SPEED 50.0f
#define MAX_PROJECTILE_DISTANCE 100.0f
void portalGunUpdate(struct PortalGun* portalGun, struct Player* player) {
@ -92,7 +156,7 @@ void portalGunUpdate(struct PortalGun* portalGun, struct Player* player) {
for (int i = 0; i < 2; ++i) {
struct PortalGunProjectile* projectile = &portalGun->projectiles[i];
if (projectile->dynamicId == -1) {
if (projectile->roomIndex == -1) {
continue;
}
@ -100,8 +164,7 @@ void portalGunUpdate(struct PortalGun* portalGun, struct Player* player) {
if (collisionSceneRaycast(&gCollisionScene, projectile->roomIndex, &projectile->positionDirection, COLLISION_LAYERS_STATIC | COLLISION_LAYERS_BLOCK_PORTAL, PORTAL_PROJECTILE_SPEED * FIXED_DELTA_TIME + 0.1f, 0, &hit)) {
// TODO open portal
dynamicSceneRemove(projectile->dynamicId);
projectile->dynamicId = -1;
projectile->roomIndex = -1;
} else {
projectile->roomIndex = hit.roomIndex;
}
@ -116,31 +179,6 @@ void portalGunUpdate(struct PortalGun* portalGun, struct Player* player) {
}
}
void portalBallRender(void* data, struct RenderScene* renderScene, struct Transform* fromView) {
struct PortalGunProjectile* projectile = (struct PortalGunProjectile*)data;
struct Transform transform;
if (projectile->distance < projectile->maxDistance) {
vector3AddScaled(
&projectile->positionDirection.origin,
&projectile->effectOffset,
1.0f - projectile->distance / projectile->maxDistance,
&transform.position
);
} else {
transform.position = projectile->positionDirection.origin;
}
transform.rotation = fromView->rotation;
vector3Scale(&gOneVec, &transform.scale, PORTAL_PROJECTILE_RADIUS);
Mtx* mtx = renderStateRequestMatrices(renderScene->renderState, 1);
transformToMatrixL(&transform, mtx, SCENE_SCALE);
renderSceneAdd(renderScene, grav_flare_model_gfx, mtx, GRAV_FLARE_INDEX, &transform.position, NULL);
}
struct Vector3 gPortalGunExit = {0.0f, 0.0f, 0.154008};
void portalGunFire(struct PortalGun* portalGun, int portalIndex, struct Ray* ray, struct Vector3* playerUp, int roomIndex) {
@ -167,8 +205,4 @@ void portalGunFire(struct PortalGun* portalGun, int portalIndex, struct Ray* ray
struct Vector3 fireFrom;
transformPoint(&portalGun->rigidBody.transform, &gPortalGunExit, &fireFrom);
vector3Sub(&fireFrom, &ray->origin, &projectile->effectOffset);
if (projectile->dynamicId == -1) {
projectile->dynamicId = dynamicSceneAddViewDependant(projectile, portalBallRender, &projectile->positionDirection.origin, 0.5f);
}
}

3
src/scene/portal_gun.h
View file

@ -21,7 +21,6 @@ struct PortalGunProjectile {
float maxDistance;
short roomIndex;
short dynamicId;
};
struct PortalGun {
@ -36,7 +35,7 @@ struct PortalGun {
void portalGunInit(struct PortalGun* portalGun, struct Transform* at);
// void portalGunDummyRender(void* data, struct DynamicRenderDataList* renderList, struct RenderState* renderState);
void portalGunUpdate(struct PortalGun* portalGun, struct Player* player);
void portalGunRenderReal(struct PortalGun* portalGun, struct RenderState* renderState);
void portalGunRenderReal(struct PortalGun* portalGun, struct RenderState* renderState, struct Transform* fromView);
void portalGunFire(struct PortalGun* portalGun, int portalIndex, struct Ray* ray, struct Vector3* playerUp, int roomIndex);

2
src/scene/scene.c
View file

@ -307,7 +307,7 @@ void sceneRender(struct Scene* scene, struct RenderState* renderState, struct Gr
if (scene->portalGun.portalGunVisible){
cameraModifyProjectionViewForPortalGun(&scene->camera, renderState, PORTAL_GUN_NEAR_PLANE * SCENE_SCALE, renderPlan.stageProps[0].aspectRatio);
portalGunRenderReal(&scene->portalGun, renderState);
portalGunRenderReal(&scene->portalGun, renderState, &scene->camera.transform);
}
gDPPipeSync(renderState->dl++);