Updated the SDK with the latest code from the TF and HL2 branches

* Adds support for Visual Studio 2012 and 2013
* VR Mode:
. Switches from headtrack.dll to sourcevr.dll
. Improved readability of the UI in VR
. Removed the IPD calibration tool. TF2 will now obey the Oculus
configuration file. Use the Oculus calibration tool in your SDK or
install and run "OpenVR" under Tools in Steam to calibrate your IPD.
. Added dropdown to enable VR mode in the Video options. Removed the -vr
command line option.
. Added the ability to switch in and out of VR mode without quitting the
game
. By default VR mode will run full screen. To switch back to a
borderless window set the vr_force_windowed convar.
. Added support for VR mode on Linux
* Many assorted bug fixes and other changes from Team Fortress in
various shared files

3 files changed, 10 insertions, 2 deletions

diff --git a/sp/src/public/matsys_controls/mdlpanel.h b/sp/src/public/matsys_controls/mdlpanel.h
index 8f0ccb30..91f936e7 100644
--- a/sp/src/public/matsys_controls/mdlpanel.h
+++ b/sp/src/public/matsys_controls/mdlpanel.h
@@ -51,6 +51,8 @@ public:
 
 	virtual void OnTick();
 
+	virtual void Paint();
+
 	// Sets the current mdl
 	virtual void SetMDL( MDLHandle_t handle, void *pProxyData = NULL );
 	virtual void SetMDL( const char *pMDLName, void *pProxyData = NULL );
@@ -78,6 +80,7 @@ public:
 	void SetSkin( int nSkin );
 	void SetLookAtCamera( bool bLookAtCamera );
 	void SetIgnoreDoubleClick( bool bState );
+	void SetThumbnailSafeZone( bool bVisible );
 
 	// Bounds.
 	bool GetBoundingBox( Vector &vecBoundsMin, Vector &vecBoundsMax );
@@ -103,6 +106,8 @@ public:
 
 protected:
 
+	virtual void SetupRenderState( int nDisplayWidth, int nDisplayHeight ) OVERRIDE;
+
 	struct MDLData_t
 	{
 		CMDL		m_MDL;
@@ -122,7 +127,7 @@ protected:
 
 private:
 	// paint it!
-	void OnPaint3D();
+	virtual void OnPaint3D();
 	virtual void PrePaint3D( IMatRenderContext *pRenderContext ) { };
 	virtual void PostPaint3D( IMatRenderContext *pRenderContext ) { };
 	virtual void RenderingMergedModel( IMatRenderContext *pRenderContext, CStudioHdr *pStudioHdr, MDLHandle_t mdlHandle, matrix3x4_t *pWorldMatrix ) { };
@@ -141,6 +146,7 @@ private:
 	bool	m_bWireFrame : 1;
 	bool	m_bLookAtCamera : 1;
 	bool	m_bIgnoreDoubleClick : 1;
+	bool	m_bThumbnailSafeZone : 1;
 
 	float	m_PoseParameters[ MAXSTUDIOPOSEPARAM ];
 };
diff --git a/sp/src/public/matsys_controls/mdlpicker.h b/sp/src/public/matsys_controls/mdlpicker.h
index 202167c5..fcacfc9c 100644
--- a/sp/src/public/matsys_controls/mdlpicker.h
+++ b/sp/src/public/matsys_controls/mdlpicker.h
@@ -101,6 +101,7 @@ private:
 
 	void WriteBackbackVMTFiles( const char *assetName );
 	void GenerateBackpackIcons( void );
+	CUtlString GetOutputFileSuffix();
 
 	MESSAGE_FUNC_PARAMS( OnCheckButtonChecked, "CheckButtonChecked", kv );
 	MESSAGE_FUNC_PARAMS( OnItemSelected, "ItemSelected", kv );
diff --git a/sp/src/public/matsys_controls/potterywheelpanel.h b/sp/src/public/matsys_controls/potterywheelpanel.h
index 8cb41497..47125a3f 100644
--- a/sp/src/public/matsys_controls/potterywheelpanel.h
+++ b/sp/src/public/matsys_controls/potterywheelpanel.h
@@ -131,8 +131,9 @@ protected:
 
 	bool	m_bRenderToTexture;
 
+	virtual void SetupRenderState( int nDisplayWidth, int nDisplayHeight );
+
 private:
-	void SetupRenderState( int nDisplayWidth, int nDisplayHeight );
 	void CreateDefaultLights();
 	void DestroyLights();