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

Pass object_base &to my_extract_shortpos

Browse source
This commit is contained in:
Kp 2016-04-23 17:59:47 +00:00
parent 377effa46d
commit 8575f3df21
1 changed files with 20 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
similar/main/newdemo.cpp
View file

@ -257,34 +257,32 @@ int newdemo_get_percent_done() {
#define VEL_PRECISION 12
static void my_extract_shortpos(const vobjptr_t objp, shortpos *spp)
static void my_extract_shortpos(object_base &objp, const shortpos *const spp)
{
segnum_t segnum;
sbyte *sp;
auto sp = spp->bytemat;
objp.orient.rvec.x = *sp++ << MATRIX_PRECISION;
objp.orient.uvec.x = *sp++ << MATRIX_PRECISION;
objp.orient.fvec.x = *sp++ << MATRIX_PRECISION;
sp = spp->bytemat;
objp->orient.rvec.x = *sp++ << MATRIX_PRECISION;
objp->orient.uvec.x = *sp++ << MATRIX_PRECISION;
objp->orient.fvec.x = *sp++ << MATRIX_PRECISION;
objp.orient.rvec.y = *sp++ << MATRIX_PRECISION;
objp.orient.uvec.y = *sp++ << MATRIX_PRECISION;
objp.orient.fvec.y = *sp++ << MATRIX_PRECISION;
objp->orient.rvec.y = *sp++ << MATRIX_PRECISION;
objp->orient.uvec.y = *sp++ << MATRIX_PRECISION;
objp->orient.fvec.y = *sp++ << MATRIX_PRECISION;
objp.orient.rvec.z = *sp++ << MATRIX_PRECISION;
objp.orient.uvec.z = *sp++ << MATRIX_PRECISION;
objp.orient.fvec.z = *sp++ << MATRIX_PRECISION;
objp->orient.rvec.z = *sp++ << MATRIX_PRECISION;
objp->orient.uvec.z = *sp++ << MATRIX_PRECISION;
objp->orient.fvec.z = *sp++ << MATRIX_PRECISION;
segnum_t segnum = spp->segment;
objp.segnum = segnum;
segnum = spp->segment;
objp->segnum = segnum;
auto &v = Vertices[vsegptr(segnum)->verts[0]];
objp.pos.x = (spp->xo << RELPOS_PRECISION) + v.x;
objp.pos.y = (spp->yo << RELPOS_PRECISION) + v.y;
objp.pos.z = (spp->zo << RELPOS_PRECISION) + v.z;
objp->pos.x = (spp->xo << RELPOS_PRECISION) + Vertices[Segments[segnum].verts[0]].x;
objp->pos.y = (spp->yo << RELPOS_PRECISION) + Vertices[Segments[segnum].verts[0]].y;
objp->pos.z = (spp->zo << RELPOS_PRECISION) + Vertices[Segments[segnum].verts[0]].z;
objp->mtype.phys_info.velocity.x = (spp->velx << VEL_PRECISION);
objp->mtype.phys_info.velocity.y = (spp->vely << VEL_PRECISION);
objp->mtype.phys_info.velocity.z = (spp->velz << VEL_PRECISION);
objp.mtype.phys_info.velocity.x = (spp->velx << VEL_PRECISION);
objp.mtype.phys_info.velocity.y = (spp->vely << VEL_PRECISION);
objp.mtype.phys_info.velocity.z = (spp->velz << VEL_PRECISION);
}
static int _newdemo_read( void *buffer, int elsize, int nelem )