nzp-team/dquakeplus
0
0
Fork 0
mirror of https://github.com/nzp-team/dquakeplus.git synced 2024-11-29 23:22:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #16 from shpuld/feat/use-vertex-morphs

Browse source
This commit is contained in:
cypress 2023-09-11 10:29:58 -04:00 committed by GitHub
commit 0ba4ccebb5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
source/psp/video_hardware_main.cpp
View file

@ -1169,14 +1169,13 @@ void GL_DrawAliasBlendedFrame (aliashdr_t *paliashdr, int pose1, int pose2, floa
struct vertex struct vertex
{ {
int uvs; int uvs;
char x, y, z; int xyz;
char _padding;
}; };
sceGuColor(GU_COLOR(lightcolor[0], lightcolor[1], lightcolor[2], 1.0f)); sceGuColor(GU_COLOR(lightcolor[0], lightcolor[1], lightcolor[2], 1.0f));
// Allocate the vertices. // Allocate the vertices.
vertex* const out = static_cast<vertex*>(sceGuGetMemory(sizeof(vertex) * numcommands)); vertex* const out = static_cast<vertex*>(sceGuGetMemory(sizeof(vertex) * numcommands * 2));
int vertex_index = 0; int vertex_index = 0;
//for blubs's alternate BuildTris: 1) Disable while(1) loop 2) Disable the break; 3) replace GU_TRIANGLE_STRIP with GU_TRIANGLES //for blubs's alternate BuildTris: 1) Disable while(1) loop 2) Disable the break; 3) replace GU_TRIANGLE_STRIP with GU_TRIANGLES
@ -1197,19 +1196,17 @@ void GL_DrawAliasBlendedFrame (aliashdr_t *paliashdr, int pose1, int pose2, floa
//prim = GU_TRIANGLES; //used for blubs' alternate BuildTris with one continual triangle list //prim = GU_TRIANGLES; //used for blubs' alternate BuildTris with one continual triangle list
} }
for (int start = vertex_index; vertex_index < (start + count); ++vertex_index, ++order, ++verts1, ++verts2) for (int start = vertex_index; vertex_index < (start + count * 2); ++vertex_index, ++order, ++verts1, ++verts2)
{ {
// texture coordinates come from the draw list
out[vertex_index].uvs = order[0]; out[vertex_index].uvs = order[0];
out[vertex_index].xyz = ((int*)verts1->v)[0];
VectorSubtract(verts2->v, verts1->v, d); ++vertex_index;
out[vertex_index].uvs = order[0];
// blend the vertex positions from each frame together out[vertex_index].xyz = ((int*)verts2->v)[0];
out[vertex_index].x = verts1->v[0] + (blend * d[0]);
out[vertex_index].y = verts1->v[1] + (blend * d[1]);
out[vertex_index].z = verts1->v[2] + (blend * d[2]);
} }
sceGuDrawArray(prim, GU_TEXTURE_16BIT | GU_VERTEX_8BIT, count, 0, &out[vertex_index - count]); sceGuMorphWeight(0, 1 - blend);
sceGuMorphWeight(1, blend);
sceGuDrawArray(prim, GU_TEXTURE_16BIT | GU_VERTEX_8BIT | GU_VERTICES(2), count, 0, &out[vertex_index - count * 2]);
} }
sceGuColor(0xffffffff); sceGuColor(0xffffffff);
} }
@ -1271,7 +1268,7 @@ void R_SetupAliasBlendedFrame (int frame, aliashdr_t *paliashdr, entity_t* e)
int distance_from_client = (int)((dist_x) * (dist_x) + (dist_y) * (dist_y)); // no use sqrting, just slows us down. int distance_from_client = (int)((dist_x) * (dist_x) + (dist_y) * (dist_y)); // no use sqrting, just slows us down.
// They're too far away from us to care about blending their frames. // They're too far away from us to care about blending their frames.
if (distance_from_client >= 40000) { // 200 * 200 if (distance_from_client >= 160000) { // 400 * 400
// Fix them from jumping from last lerp // Fix them from jumping from last lerp
e->pose1 = e->pose2 = paliashdr->frames[frame].firstpose; e->pose1 = e->pose2 = paliashdr->frames[frame].firstpose;
e->frame_interval = 0.1; e->frame_interval = 0.1;