ubergames/rpgxef
0
0
Fork 0
mirror of https://github.com/UberGames/rpgxEF.git synced 2024-11-10 07:11:34 +00:00
Code Issues Projects Releases Packages Wiki Activity

commit revert changes to q_math

Browse source
This commit is contained in:
Walter Julius Hennecke 2015-03-21 13:55:36 +01:00
parent bc54f1593d
commit 8bce48a798
5 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
code/game/bg_public.h
View file

@ -23,6 +23,10 @@ static const char RPGX_COMPILEDATE[] = __DATE__ " " __TIME__;
static const char RPGX_COMPILEDBY[] = "Jenkins Buildserver";
#define GAME_VERSION "RPG-X v" RPGX_VERSION
//RPG-X: TiM - Tricorder InfoStrings
#define MAX_TRIC_STRINGS 64
#define MAX_DECOYS 64 //128
static const uint32_t INJURED_MODE_HEALTH = 20; //!<For the injured mode health system.
static const uint32_t DEFAULT_GRAVITY = 800;
@ -1052,11 +1056,11 @@ ID system.
#define SECURITY_FILE "rpgxid.dat"
typedef struct {
uint64_t ID;
unsigned long ID;
//short padding;
uint64_t hash;
unsigned long hash;
//short padding2;
uint64_t playerID;
unsigned long playerID;
//short padding3;
} rpgxSecurityFile_t;

2
code/game/q_math.c
View file

@ -1259,7 +1259,7 @@ int32_t PlaneTypeForNormal (vec3_t normal) {
MatrixMultiply
================
*/
void MatrixMultiply(double** in1, double** in2, double** out) {
void MatrixMultiply(float in1[3][3], float in2[3][3], float out[3][3]) {
out[0][0] = in1[0][0] * in2[0][0] + in1[0][1] * in2[1][0] +
in1[0][2] * in2[2][0];
out[0][1] = in1[0][0] * in2[0][1] + in1[0][1] * in2[1][1] +

2
code/game/q_shared.h
View file

@ -625,7 +625,7 @@ void MakeNormalVectors( const vec3_t forward, vec3_t right, vec3_t up );
int32_t PlaneTypeForNormal (vec3_t normal);
void MatrixMultiply(double** in1, double** in2, double** out);
void MatrixMultiply(float in1[3][3], float in2[3][3], float out[3][3]);
void AngleVectors( const vec3_t angles, /*@null@*/ /*@out@*/ vec3_t forward, /*@null@*/ /*@out@*/ vec3_t right, /*@null@*/ /*@out@*/ vec3_t up);
void PerpendicularVector( vec3_t dst, const vec3_t src );
void VectorShort(vec3_t vect);

2
code/ui/ui.vcxproj
View file

@ -93,7 +93,7 @@
<SuppressStartupBanner>true</SuppressStartupBanner>
<ModuleDefinitionFile>.\ui.def</ModuleDefinitionFile>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>../Debug/ui.pdb</ProgramDatabaseFile>
<ProgramDatabaseFile>../Debug/ui/ui.pdb</ProgramDatabaseFile>
<GenerateMapFile>true</GenerateMapFile>
<MapFileName>.\Debug/uix86.map</MapFileName>
<BaseAddress>0x40000000</BaseAddress>

4
code/ui/ui_players.c
View file

@ -377,8 +377,8 @@ static void UI_PositionRotatedEntityOnTag( refEntity_t *entity, const refEntity_
}
// cast away const because of compiler problems
MatrixMultiply((double**)entity->axis, (double**)((refEntity_t *)parent)->axis, (double**)tempAxis);
MatrixMultiply((double**)lerped.axis, (double**)tempAxis, (double**)entity->axis);
MatrixMultiply((float**)entity->axis, (float**)((refEntity_t *)parent)->axis, (float**)tempAxis);
MatrixMultiply((float**)lerped.axis, (float**)tempAxis, (float**)entity->axis);
UI_LogFuncEnd();
}