Merge wip with master branch

lib/include/vgui/VGUI_Dar.h

@@ -66,7 +66,7 @@ template<class ELEMTYPE> class VGUIAPI Dar
 		}
 		_count=count;
 	}
-	unsigned int getCount()
+	int getCount()
 	{
 		return _count;
 	}

lib/include/vgui/VGUI_String.h

@@ -37,7 +37,7 @@ class VGUIAPI String
 
 public:
 
-	unsigned int    getCount();
+	int    getCount();
 	String operator+(String text);
 	String operator+(const char* text);
 	bool   operator==(String text);

src/common/beamdef.h

@@ -37,9 +37,9 @@ struct beam_s
 	BEAM *next;
 	int type;
 	int flags;
-	vec3_t source;
-	vec3_t target;
-	vec3_t delta;
+	Vector source;
+	Vector target;
+	Vector delta;
 	float t; // 0 .. 1 over lifetime of beam
 	float freq;
 	float die;

src/common/cl_entity.h

@@ -39,8 +39,8 @@ typedef struct
 	float prevanimtime;
 	float sequencetime;
 	byte prevseqblending[2];
-	vec3_t prevorigin;
-	vec3_t prevangles;
+	Vector prevorigin;
+	Vector prevangles;
 
 	int prevsequence;
 	float prevframe;
@@ -54,8 +54,8 @@ typedef struct
 	// Time stamp for this movement
 	float animtime;
 
-	vec3_t origin;
-	vec3_t angles;
+	Vector origin;
+	Vector angles;
 } position_history_t;
 
 typedef struct cl_entity_s cl_entity_t;
@@ -93,11 +93,11 @@ struct cl_entity_s
 	float lastmove;
 
 	// Actual render position and angles
-	vec3_t origin;
-	vec3_t angles;
+	Vector origin;
+	Vector angles;
 
 	// Attachment points
-	vec3_t attachment[4];
+	Vector attachment[4];
 
 	// Other entity local information
 	int trivial_accept;

src/common/com_model.h

@@ -87,7 +87,7 @@ typedef struct
 //  'model.h' and 'gl_model.h'
 typedef struct mplane_s
 {
-    vec3_t normal; // surface normal
+    Vector normal; // surface normal
     float dist;    // closest appoach to origin
     byte type;     // for texture axis selection and fast side tests
     byte signbits; // signx + signy<<1 + signz<<1
@@ -96,7 +96,7 @@ typedef struct mplane_s
 
 typedef struct
 {
-    vec3_t position;
+    Vector position;
 } mvertex_t;
 
 // 06/23/2002 MAH
@@ -387,8 +387,8 @@ typedef struct hull_s
     mplane_t *planes;
     int firstclipnode;
     int lastclipnode;
-    vec3_t clip_mins;
-    vec3_t clip_maxs;
+    Vector clip_mins;
+    Vector clip_maxs;
 } hull_t;
 
 #if !defined(CACHE_USER) && !defined(QUAKEDEF_H)
@@ -413,7 +413,7 @@ typedef struct model_s
     //
     // volume occupied by the model
     //
-    vec3_t mins, maxs; // +0x054, +060
+    Vector mins, maxs; // +0x054, +060
     float radius;      // +0x06C
 
     //
@@ -478,7 +478,7 @@ typedef struct alight_s
 {
     int ambientlight; // clip at 128
     int shadelight;   // clip at 192 - ambientlight
-    vec3_t color;
+    Vector color;
     float *plightvec;
 } alight_t;
 
@@ -523,7 +523,7 @@ typedef struct player_info_s
     int gaitsequence;
     float gaitframe;
     float gaityaw;
-    vec3_t prevgaitorigin;
+    Vector prevgaitorigin;
 
     customization_t customdata;
 } player_info_t;

src/common/const.h

@@ -20,6 +20,7 @@
 // Most came from server.h
 
 #include "Platform.h"
+#include "vector.h"
 
 // edict->flags
 #define FL_FLY (1 << 0)	 // Changes the SV_Movestep() behavior to not need to be on ground
@@ -760,7 +761,7 @@ typedef struct edict_s edict_t;
 
 typedef struct
 {
-	vec3_t normal;
+	Vector normal;
 	float dist;
 } plane_t;
 
@@ -770,7 +771,7 @@ typedef struct
 	qboolean startsolid; // if true, the initial point was in a solid area
 	qboolean inopen, inwater;
 	float fraction; // time completed, 1.0 = didn't hit anything
-	vec3_t endpos;	// final position
+	Vector endpos;	// final position
 	plane_t plane;	// surface normal at impact
 	edict_t *ent;	// entity the surface is on
 	int hitgroup;	// 0 == generic, non zero is specific body part

src/common/dlight.h

@@ -20,7 +20,7 @@
 
 typedef struct dlight_s
 {
-	vec3_t origin;
+	Vector origin;
 	float radius;
 	color24 color;
 	float die;		// stop lighting after this time

src/common/entity_state.h

@@ -38,8 +38,8 @@ struct entity_state_s
 	int messagenum;
 
 	// Fields which can be transmitted and reconstructed over the network stream
-	vec3_t origin;
-	vec3_t angles;
+	Vector origin;
+	Vector angles;
 
 	int modelindex;
 	int sequence;
@@ -64,11 +64,11 @@ struct entity_state_s
 	int body;
 	byte controller[4];
 	byte blending[4];
-	vec3_t velocity;
+	Vector velocity;
 
 	// Send bbox down to client for use during prediction.
-	vec3_t mins;
-	vec3_t maxs;
+	Vector mins;
+	Vector maxs;
 
 	int aiment;
 	// If owned by a player, the index of that player ( for projectiles ).
@@ -87,7 +87,7 @@ struct entity_state_s
 	int weaponmodel;
 	int gaitsequence;
 	// If standing on conveyor, e.g.
-	vec3_t basevelocity;
+	Vector basevelocity;
 	// Use the crouched hull, or the regular player hull.
 	int usehull;
 	// Latched buttons last time state updated.
@@ -102,8 +102,8 @@ struct entity_state_s
 	int weaponanim;
 
 	// Parametric movement overrides
-	vec3_t startpos;
-	vec3_t endpos;
+	Vector startpos;
+	Vector endpos;
 	float impacttime; //MS - Used for model scale
 	float starttime;
 
@@ -116,25 +116,25 @@ struct entity_state_s
 	float fuser2;
 	float fuser3;
 	float fuser4;
-	vec3_t vuser1;
-	vec3_t vuser2;
-	vec3_t vuser3;
-	vec3_t vuser4; //MS - vuser4.x used to store idx of extra info (including all current bone positions)
+	Vector vuser1;
+	Vector vuser2;
+	Vector vuser3;
+	Vector vuser4; //MS - vuser4.x used to store idx of extra info (including all current bone positions)
 };
 
 #include "pm_info.h"
 
 typedef struct clientdata_s
 {
-	vec3_t origin;
-	vec3_t velocity;
+	Vector origin;
+	Vector velocity;
 
 	int viewmodel;
-	vec3_t punchangle;
+	Vector punchangle;
 	int flags;
 	int waterlevel;
 	int watertype;
-	vec3_t view_ofs;
+	Vector view_ofs;
 	float health;
 
 	int bInDuck;
@@ -175,10 +175,10 @@ typedef struct clientdata_s
 	float fuser2;
 	float fuser3;
 	float fuser4;
-	vec3_t vuser1;
-	vec3_t vuser2;
-	vec3_t vuser3;
-	vec3_t vuser4;
+	Vector vuser1;
+	Vector vuser2;
+	Vector vuser3;
+	Vector vuser4;
 } clientdata_t;
 
 #include "weaponinfo.h"

src/common/mathlib.h

@@ -17,7 +17,7 @@
 #pragma once
 
 #include <cmath>
-#include "hl/vector.h"
+#include "vector.h"
 
 typedef float vec_t;
 typedef vec_t vec4_t[4]; // x,y,z,w

src/common/particledef.h

@@ -37,12 +37,12 @@ typedef enum
 typedef struct particle_s
 {
 	// driver-usable fields
-	vec3_t org;
+	Vector org;
 	short color;
 	short packedColor;
 	// drivers never touch the following fields
 	struct particle_s *next;
-	vec3_t vel;
+	Vector vel;
 	float ramp;
 	float die;
 	ptype_t type;

src/common/pmtrace.h

@@ -20,7 +20,7 @@
 
 typedef struct
 {
-	vec3_t normal;
+	Vector normal;
 	float dist;
 } pmplane_t;
 
@@ -32,10 +32,10 @@ struct pmtrace_s
 	qboolean startsolid;	  // if true, the initial point was in a solid area
 	qboolean inopen, inwater; // End point is in empty space or in water
 	float fraction;			  // time completed, 1.0 = didn't hit anything
-	vec3_t endpos;			  // final position
+	Vector endpos;			  // final position
 	pmplane_t plane;		  // surface normal at impact
 	int ent;				  // entity at impact
-	vec3_t deltavelocity;	  // Change in player's velocity caused by impact.
+	Vector deltavelocity;	  // Change in player's velocity caused by impact.
 							  // Only run on server.
 	int hitgroup;
 };

src/common/r_efx.h

@@ -106,7 +106,7 @@ typedef struct tempent_s
 					   // if COLLIDEALL, this is the index of the client to ignore
 					   // TENTS with FTENT_PLYRATTACHMENT MUST set the clientindex!
 
-	vec3_t tentOffset; // if attached, client origin + tentOffset = tent origin.
+	Vector tentOffset; // if attached, client origin + tentOffset = tent origin.
 	cl_entity_t entity;
 
 	// baseline.origin		- velocity

src/common/r_studioint.h

@@ -135,8 +135,8 @@ typedef struct sv_blending_interface_s
 	void (*SV_StudioSetupBones)(struct model_s *pModel,
 								float frame,
 								int sequence,
-								const vec3_t angles,
-								const vec3_t origin,
+								const Vector angles,
+								const Vector origin,
 								const byte *pcontroller,
 								const byte *pblending,
 								int iBone,

src/common/triangleapi.h

@@ -45,7 +45,7 @@ typedef struct triangleapi_s
 	void (*Color4f)(float r, float g, float b, float a);
 	void (*Color4ub)(unsigned char r, unsigned char g, unsigned char b, unsigned char a);
 	void (*TexCoord2f)(float u, float v);
-	void (*Vertex3fv)(float *worldPnt);
+	void (*Vertex3fv)(const float *worldPnt);
 	void (*Vertex3f)(float x, float y, float z);
 	void (*Brightness)(float brightness);
 	void (*CullFace)(TRICULLSTYLE style);

src/common/usercmd.h

@@ -22,7 +22,7 @@ typedef struct usercmd_s
 {
 	short lerp_msec;   // Interpolation time on client
 	byte msec;		   // Duration in ms of command
-	vec3_t viewangles; // Command view angles.
+	Vector viewangles; // Command view angles.
 
 	// intended velocities
 	float forwardmove;		// Forward velocity.
@@ -35,7 +35,7 @@ typedef struct usercmd_s
 
 	// Experimental player impact stuff.
 	int impact_index;
-	vec3_t impact_position;
+	Vector impact_position;
 } usercmd_t;
 
 #endif // USERCMD_H