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

Fix polymodel writing on x64

Browse source 
Packed writing a structure containing a pointer, but reading it as an
int, is wrong on x64.
This commit is contained in:
Kp 2014-07-24 03:25:00 +00:00
parent 4e0665b8ee
commit ebb1b70350
6 changed files with 32 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
common/include/vecmat.h
View file

@ -46,6 +46,10 @@ struct vms_vector
};
};
#define DEFINE_SERIAL_VMS_VECTOR_TO_MESSAGE() \
DEFINE_SERIAL_UDT_TO_MESSAGE(vms_vector, v, (v.x, v.y, v.z)); \
ASSERT_SERIAL_UDT_MESSAGE_SIZE(vms_vector, 12)
typedef struct vms_vector vms_vector_array;

23
common/main/polyobj.h
View file

@ -35,6 +35,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "piggy.h"
#ifdef __cplusplus
#include "pack.h"
struct glow_values_t;
@ -55,26 +56,26 @@ extern int Dead_modelnums[MAX_POLYGON_MODELS];
#define MAX_SUBMODELS 10
//used to describe a polygon model
struct polymodel
struct polymodel : prohibit_void_ptr<polymodel>
{
int n_models;
int model_data_size;
ubyte *model_data;
int submodel_ptrs[MAX_SUBMODELS];
vms_vector submodel_offsets[MAX_SUBMODELS];
vms_vector submodel_norms[MAX_SUBMODELS]; // norm for sep plane
vms_vector submodel_pnts[MAX_SUBMODELS]; // point on sep plane
fix submodel_rads[MAX_SUBMODELS]; // radius for each submodel
ubyte submodel_parents[MAX_SUBMODELS]; // what is parent for each submodel
vms_vector submodel_mins[MAX_SUBMODELS];
vms_vector submodel_maxs[MAX_SUBMODELS];
array<int, MAX_SUBMODELS> submodel_ptrs;
array<vms_vector, MAX_SUBMODELS> submodel_offsets;
array<vms_vector, MAX_SUBMODELS> submodel_norms; // norm for sep plane
array<vms_vector, MAX_SUBMODELS> submodel_pnts; // point on sep plane
array<fix, MAX_SUBMODELS> submodel_rads; // radius for each submodel
array<ubyte, MAX_SUBMODELS> submodel_parents; // what is parent for each submodel
array<vms_vector, MAX_SUBMODELS> submodel_mins;
array<vms_vector, MAX_SUBMODELS> submodel_maxs;
vms_vector mins,maxs; // min,max for whole model
fix rad;
ubyte n_textures;
ushort first_texture;
ubyte simpler_model; // alternate model with less detail (0 if none, model_num+1 else)
//vms_vector min,max;
} __pack__;
};
#if defined(DXX_BUILD_DESCENT_I) || defined(DXX_BUILD_DESCENT_II)
// array of pointers to polygon objects
@ -109,6 +110,7 @@ void draw_model_picture(int mn,vms_angvec *orient_angles);
void free_model(polymodel *po);
#define MAX_POLYOBJ_TEXTURES 100
static const unsigned N_D2_POLYGON_MODELS = 166;
#endif
extern grs_bitmap *texture_list[MAX_POLYOBJ_TEXTURES];
extern bitmap_index texture_list_index[MAX_POLYOBJ_TEXTURES];
@ -120,6 +122,7 @@ extern g3s_point robot_points[MAX_POLYGON_VECS];
* reads a polymodel structure from a PHYSFS_file
*/
extern void polymodel_read(polymodel *pm, PHYSFS_file *fp);
void polymodel_write(PHYSFS_file *fp, const polymodel &pm);
/*
* reads n polymodel structs from a PHYSFS_file

2
d1x-rebirth/main/bmread.cpp
View file

@ -1777,7 +1777,7 @@ void bm_write_all(PHYSFS_file *fp)
PHYSFS_write( fp, &N_polygon_models, sizeof(int), 1);
range_for (const auto &p, partial_range(Polygon_models, N_polygon_models))
PHYSFS_write( fp, &p, sizeof(p), 1);
polymodel_write(fp, p);
range_for (const auto &p, partial_range(Polygon_models, N_polygon_models))
PHYSFS_write( fp, p.model_data, sizeof(ubyte), p.model_data_size);

6
d2x-rebirth/main/bmread.cpp
View file

@ -2085,7 +2085,6 @@ void bm_read_hostage()
//extra items added after the release get written in an additional hamfile
#define N_D2_ROBOT_TYPES 66
#define N_D2_ROBOT_JOINTS 1145
#define N_D2_POLYGON_MODELS 166
#define N_D2_OBJBITMAPS 422
#define N_D2_OBJBITMAPPTRS 502
#define N_D2_WEAPON_TYPES 62
@ -2158,7 +2157,7 @@ void bm_write_all(PHYSFS_file *fp)
t = N_D2_POLYGON_MODELS;
PHYSFS_write( fp, &t, sizeof(int), 1 );
range_for (const auto &p, partial_range(Polygon_models, t))
PHYSFS_write( fp, &p, sizeof(p), 1 );
polymodel_write(fp, p);
PHYSFSX_printf(tfile, "N_polygon_models = %d, Polygon_models array = %d\n", t, (int) sizeof(polymodel)*t);
for (i=0; i<t; i++ ) {
@ -2236,7 +2235,8 @@ void bm_write_extra_robots()
t = N_polygon_models - N_D2_POLYGON_MODELS;
PHYSFS_write( fp, &t, sizeof(int), 1);
PHYSFS_write( fp, &Polygon_models[N_D2_POLYGON_MODELS], sizeof(polymodel), t);
range_for (auto &p, partial_range(Polygon_models, N_D2_POLYGON_MODELS, N_polygon_models))
polymodel_write(fp, p);
for (i=N_D2_POLYGON_MODELS; i<N_polygon_models; i++ ) {
g3_uninit_polygon_model(Polygon_models[i].model_data); //get RGB colors

1
similar/main/bm.cpp
View file

@ -383,7 +383,6 @@ void bm_read_all(PHYSFS_file * fp)
//extra items added after the release get written in an additional hamfile
#define N_D2_ROBOT_TYPES 66
#define N_D2_ROBOT_JOINTS 1145
#define N_D2_POLYGON_MODELS 166
#define N_D2_OBJBITMAPS 422
#define N_D2_OBJBITMAPPTRS 502
#define N_D2_WEAPON_TYPES 62

36
similar/main/polyobj.cpp
View file

@ -36,6 +36,7 @@ COPYRIGHT 1993-1999 PARALLAX SOFTWARE CORPORATION. ALL RIGHTS RESERVED.
#include "u_mem.h"
#include "args.h"
#include "byteutil.h"
#include "physfs-serial.h"
#include "physfsx.h"
#ifndef DRIVE
#include "texmap.h"
@ -723,37 +724,22 @@ void draw_model_picture(int mn,vms_angvec *orient_angles)
g3_end_frame();
}
DEFINE_SERIAL_VMS_VECTOR_TO_MESSAGE();
DEFINE_SERIAL_UDT_TO_MESSAGE(polymodel, p, (p.n_models, p.model_data_size, serial::pad<4>(), p.submodel_ptrs, p.submodel_offsets, p.submodel_norms, p.submodel_pnts, p.submodel_rads, p.submodel_parents, p.submodel_mins, p.submodel_maxs, p.mins, p.maxs, p.rad, p.n_textures, p.first_texture, p.simpler_model));
ASSERT_SERIAL_UDT_MESSAGE_SIZE(polymodel, 12 + (10 * 4) + (10 * 3 * sizeof(vms_vector)) + (10 * sizeof(fix)) + 10 + (10 * 2 * sizeof(vms_vector)) + (2 * sizeof(vms_vector)) + 8);
/*
* reads a polymodel structure from a PHYSFS_file
*/
void polymodel_read(polymodel *pm, PHYSFS_file *fp)
{
int i;
pm->model_data.reset();
PHYSFSX_serialize_read(fp, *pm);
}
pm->n_models = PHYSFSX_readInt(fp);
pm->model_data_size = PHYSFSX_readInt(fp);
pm->model_data = (ubyte *)(size_t)PHYSFSX_readInt(fp); // garbage, read it anyway just for consistency
for (i = 0; i < MAX_SUBMODELS; i++)
pm->submodel_ptrs[i] = PHYSFSX_readInt(fp);
for (i = 0; i < MAX_SUBMODELS; i++)
PHYSFSX_readVector(&(pm->submodel_offsets[i]), fp);
for (i = 0; i < MAX_SUBMODELS; i++)
PHYSFSX_readVector(&(pm->submodel_norms[i]), fp);
for (i = 0; i < MAX_SUBMODELS; i++)
PHYSFSX_readVector(&(pm->submodel_pnts[i]), fp);
for (i = 0; i < MAX_SUBMODELS; i++)
pm->submodel_rads[i] = PHYSFSX_readFix(fp);
PHYSFS_read(fp, pm->submodel_parents, MAX_SUBMODELS, 1);
for (i = 0; i < MAX_SUBMODELS; i++)
PHYSFSX_readVector(&(pm->submodel_mins[i]), fp);
for (i = 0; i < MAX_SUBMODELS; i++)
PHYSFSX_readVector(&(pm->submodel_maxs[i]), fp);
PHYSFSX_readVector(&(pm->mins), fp);
PHYSFSX_readVector(&(pm->maxs), fp);
pm->rad = PHYSFSX_readFix(fp);
pm->n_textures = PHYSFSX_readByte(fp);
pm->first_texture = PHYSFSX_readShort(fp);
pm->simpler_model = PHYSFSX_readByte(fp);
void polymodel_write(PHYSFS_file *fp, const polymodel &pm)
{
PHYSFSX_serialize_write(fp, pm);
}
/*