TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Pass vertex factory to create_shortpos_native

Browse source
This commit is contained in:
Kp 2018-09-19 02:13:30 +00:00
parent 9cedc53f52
commit c2944896de
5 changed files with 41 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/main/fwd-object.h
View file

@ -289,8 +289,8 @@ void dead_player_end();
// Extract information from an object (objp->orient, objp->pos,
// objp->segnum), stuff in a shortpos structure. See typedef
// shortpos.
void create_shortpos_little(fvcsegptr &vcsegptr, fvcvertptr &vcvertptr, shortpos *spp, const object_base &objp);
void create_shortpos_native(fvcsegptr &vcsegptr, fvcvertptr &vcvertptr, shortpos *spp, const object_base &objp);
void create_shortpos_little(const d_level_shared_segment_state &, shortpos &spp, const object_base &objp);
void create_shortpos_native(const d_level_shared_segment_state &, shortpos &spp, const object_base &objp);
// Extract information from a shortpos, stuff in objp->orient
// (matrix), objp->pos, objp->segnum

8
common/main/segment.h
View file

@ -310,6 +310,14 @@ struct d_level_shared_segment_state
{
return Segments;
}
auto &get_vertices()
{
return Vertices;
}
const auto &get_vertices() const
{
return Vertices;
}
};
extern d_level_shared_segment_state LevelSharedSegmentState;

59
similar/main/gameseg.cpp
View file

@ -980,49 +980,46 @@ namespace dsx {
// Extract the matrix into byte values.
// Create a position relative to vertex 0 with 1/256 normal "fix" precision.
// Stuff segment in a short.
void create_shortpos_native(fvcsegptr &vcsegptr, fvcvertptr &vcvertptr, shortpos *spp, const object_base &objp)
void create_shortpos_native(const d_level_shared_segment_state &LevelSharedSegmentState, shortpos &spp, const object_base &objp)
{
// int segnum;
sbyte *sp;
auto &vcsegptr = LevelSharedSegmentState.get_segments().vcptr;
auto &vcvertptr = LevelSharedSegmentState.get_vertices().vcptr;
spp.bytemat[0] = convert_to_byte(objp.orient.rvec.x);
spp.bytemat[1] = convert_to_byte(objp.orient.uvec.x);
spp.bytemat[2] = convert_to_byte(objp.orient.fvec.x);
spp.bytemat[3] = convert_to_byte(objp.orient.rvec.y);
spp.bytemat[4] = convert_to_byte(objp.orient.uvec.y);
spp.bytemat[5] = convert_to_byte(objp.orient.fvec.y);
spp.bytemat[6] = convert_to_byte(objp.orient.rvec.z);
spp.bytemat[7] = convert_to_byte(objp.orient.uvec.z);
spp.bytemat[8] = convert_to_byte(objp.orient.fvec.z);
sp = spp->bytemat;
*sp++ = convert_to_byte(objp.orient.rvec.x);
*sp++ = convert_to_byte(objp.orient.uvec.x);
*sp++ = convert_to_byte(objp.orient.fvec.x);
*sp++ = convert_to_byte(objp.orient.rvec.y);
*sp++ = convert_to_byte(objp.orient.uvec.y);
*sp++ = convert_to_byte(objp.orient.fvec.y);
*sp++ = convert_to_byte(objp.orient.rvec.z);
*sp++ = convert_to_byte(objp.orient.uvec.z);
*sp++ = convert_to_byte(objp.orient.fvec.z);
spp->segment = objp.segnum;
spp.segment = objp.segnum;
auto &segp = *vcsegptr(objp.segnum);
auto &vert = *vcvertptr(segp.verts[0]);
spp->xo = (objp.pos.x - vert.x) >> RELPOS_PRECISION;
spp->yo = (objp.pos.y - vert.y) >> RELPOS_PRECISION;
spp->zo = (objp.pos.z - vert.z) >> RELPOS_PRECISION;
spp.xo = (objp.pos.x - vert.x) >> RELPOS_PRECISION;
spp.yo = (objp.pos.y - vert.y) >> RELPOS_PRECISION;
spp.zo = (objp.pos.z - vert.z) >> RELPOS_PRECISION;
spp->velx = (objp.mtype.phys_info.velocity.x) >> VEL_PRECISION;
spp->vely = (objp.mtype.phys_info.velocity.y) >> VEL_PRECISION;
spp->velz = (objp.mtype.phys_info.velocity.z) >> VEL_PRECISION;
spp.velx = (objp.mtype.phys_info.velocity.x) >> VEL_PRECISION;
spp.vely = (objp.mtype.phys_info.velocity.y) >> VEL_PRECISION;
spp.velz = (objp.mtype.phys_info.velocity.z) >> VEL_PRECISION;
}
void create_shortpos_little(fvcsegptr &vcsegptr, fvcvertptr &vcvertptr, shortpos *spp, const object_base &objp)
void create_shortpos_little(const d_level_shared_segment_state &LevelSharedSegmentState, shortpos &spp, const object_base &objp)
{
create_shortpos_native(vcsegptr, vcvertptr, spp, objp);
create_shortpos_native(LevelSharedSegmentState, spp, objp);
// swap the short values for the big-endian machines.
if (words_bigendian)
{
spp->xo = INTEL_SHORT(spp->xo);
spp->yo = INTEL_SHORT(spp->yo);
spp->zo = INTEL_SHORT(spp->zo);
spp->segment = INTEL_SHORT(spp->segment);
spp->velx = INTEL_SHORT(spp->velx);
spp->vely = INTEL_SHORT(spp->vely);
spp->velz = INTEL_SHORT(spp->velz);
spp.xo = INTEL_SHORT(spp.xo);
spp.yo = INTEL_SHORT(spp.yo);
spp.zo = INTEL_SHORT(spp.zo);
spp.segment = INTEL_SHORT(spp.segment);
spp.velx = INTEL_SHORT(spp.velx);
spp.vely = INTEL_SHORT(spp.vely);
spp.velz = INTEL_SHORT(spp.velz);
}
}

4
similar/main/multi.cpp
View file

@ -3827,7 +3827,7 @@ void multi_send_guided_info (const vmobjptr_t miss,char done)
if (words_bigendian)
{
shortpos sp;
create_shortpos_little(vcsegptr, vcvertptr, &sp, miss);
create_shortpos_little(LevelSharedSegmentState, sp, miss);
memcpy(&multibuf[count], sp.bytemat, 9);
count += 9;
memcpy(&multibuf[count], &sp.xo, 14);
@ -3835,7 +3835,7 @@ void multi_send_guided_info (const vmobjptr_t miss,char done)
}
else
{
create_shortpos_little(vcsegptr, vcvertptr, reinterpret_cast<shortpos *>(&multibuf[count]), miss);
create_shortpos_little(LevelSharedSegmentState, *reinterpret_cast<shortpos *>(&multibuf[count]), miss);
count += sizeof(shortpos);
}
multi_send_data(multibuf, 0);

2
similar/main/newdemo.cpp
View file

@ -396,7 +396,7 @@ static void nd_write_shortpos(const vcobjptr_t obj)
shortpos sp;
ubyte render_type;
create_shortpos_native(vcsegptr, vcvertptr, &sp, obj);
create_shortpos_native(LevelSharedSegmentState, sp, obj);
render_type = obj->render_type;
if (((render_type == RT_POLYOBJ) || (render_type == RT_HOSTAGE) || (render_type == RT_MORPH)) || (obj->type == OBJ_CAMERA)) {