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

4 files changed, 9 insertions, 4 deletions

diff --git a/mp/src/public/matsys_controls/QCGenerator.h b/mp/src/public/matsys_controls/QCGenerator.h
index d9978f88..d6b69d21 100644
--- a/mp/src/public/matsys_controls/QCGenerator.h
+++ b/mp/src/public/matsys_controls/QCGenerator.h
@@ -79,9 +79,9 @@ struct QCInfo
 	{
 		pQCGenerator = pPanel;
 
-		Q_strcpy( pszSMDPath, "" );
-		Q_strcpy( pszCollisionPath, "" );
-		Q_strcpy( pszSurfaceProperty, "default" );
+		V_strcpy_safe( pszSMDPath, "" );
+		V_strcpy_safe( pszCollisionPath, "" );
+		V_strcpy_safe( pszSurfaceProperty, "default" );
 		bStaticProp = false;
 		bMostlyOpaque = false;
 		bDisableCollision = false;
diff --git a/mp/src/public/matsys_controls/manipulator.h b/mp/src/public/matsys_controls/manipulator.h
index a08426ef..f030509a 100644
--- a/mp/src/public/matsys_controls/manipulator.h
+++ b/mp/src/public/matsys_controls/manipulator.h
@@ -19,6 +19,7 @@
 class IManipulator
 {
 public:
+	virtual ~IManipulator(){}
 	virtual void OnBeginManipulation( void ) = 0;
 	virtual void OnAcceptManipulation( void ) = 0;
 	virtual void OnCancelManipulation( void ) = 0;
diff --git a/mp/src/public/matsys_controls/mdlpanel.h b/mp/src/public/matsys_controls/mdlpanel.h
index 070fb973..60068567 100644
--- a/mp/src/public/matsys_controls/mdlpanel.h
+++ b/mp/src/public/matsys_controls/mdlpanel.h
@@ -64,7 +64,7 @@ public:
 	void SetLOD( int nLOD );
 
 	// Sets the current sequence
-	void SetSequence( int nSequence );
+	void SetSequence( int nSequence, bool bResetSequence = false );
 
 	// Set the pose parameters
 	void SetPoseParameters( const float *pPoseParameters, int nCount );
@@ -113,6 +113,7 @@ protected:
 		CMDL		m_MDL;
 		matrix3x4_t	m_MDLToWorld;
 		bool		m_bDisabled;
+		float		m_flCycleStartTime;
 	};
 
 	MDLData_t				m_RootMDL;
diff --git a/mp/src/public/matsys_controls/potterywheelpanel.h b/mp/src/public/matsys_controls/potterywheelpanel.h
index 47125a3f..5da55e48 100644
--- a/mp/src/public/matsys_controls/potterywheelpanel.h
+++ b/mp/src/public/matsys_controls/potterywheelpanel.h
@@ -45,6 +45,7 @@ public:
 	virtual ~CPotteryWheelPanel();
 
 	// Overriden methods of vgui::Panel
+	virtual void ApplySettings( KeyValues *inResourceData );
 	virtual void Init( int x, int y, int wide, int tall );
 	virtual void Paint();
 
@@ -117,6 +118,7 @@ protected:
 	bool WarpMouse( int &x, int &y );
 	IManipulator		*m_pCurrentManip;
 	int m_nManipStartX, m_nManipStartY;
+	int m_nClickStartX, m_nClickStartY;
 
 	// Re-apply the manipulators on a new model
 	void ApplyManipulation();
@@ -136,6 +138,7 @@ protected:
 private:
 	void CreateDefaultLights();
 	void DestroyLights();
+	void ParseLightsFromKV( KeyValues *pLightsKV );
 
 	CMaterialReference m_LightProbeBackground;
 	CMaterialReference m_LightProbeHDRBackground;