Improved performance of Player.view_angle.

Moved Player.get_view_angle and Player.set_view_angle to PlayerMixin.
Added optional fixangle parameter to Player.set_view_angle.
Fixed inaccuracy of the angle returned by Player.view_angle and PlayerMixin.get_view_angle (now matches client's getpos command).
Exported fix angle constants as players.constants.FixAngle enumerator.

Author: jordanbriere

addons/source-python/packages/source-python/players/_base.py

@@ -405,22 +405,6 @@ def set_eye_location(self, eye_location):
 
     eye_location = property(Entity.get_eye_location, set_eye_location)
 
-    def get_view_angle(self):
-        """Return the player's view angle.
-
-        :rtype: QAngle
-        """
-        return super().view_angle
-
-    def set_view_angle(self, angle):
-        """Set the player's view angle."""
-        # Make sure that only QAngle objects are passed. Otherwise you can
-        # easily crash the server or cause unexpected behaviour
-        assert isinstance(angle, QAngle)
-        self.teleport(None, angle, None)
-
-    view_angle = property(get_view_angle, set_view_angle)
-
     def push(self, horiz_mul, vert_mul, vert_override=False):
         """Push the player along his view vector.
 

addons/source-python/packages/source-python/players/constants.py

@@ -16,6 +16,9 @@
 # =============================================================================
 # Source.Python Imports
 #   Players
+from _players._constants import FIXANGLE_NONE
+from _players._constants import FIXANGLE_ABSOLUTE
+from _players._constants import FIXANGLE_RELATIVE
 from _players._constants import FL_ONGROUND
 from _players._constants import FL_DUCKING
 from _players._constants import FL_WATERJUMP
@@ -93,7 +96,8 @@
 # =============================================================================
 # >> ALL DECLARATION
 # =============================================================================
-__all__ = ('HideHudFlags',
+__all__ = ('FixAngle',
+           'HideHudFlags',
            'HitGroup',
            'INVALID_PLAYER_USERID',
            'LifeState',
@@ -107,6 +111,14 @@
 # =============================================================================
 # >> ENUMERATORS
 # =============================================================================
+class FixAngle(IntEnum):
+    """Player fix angle enumerator."""
+
+    NONE = FIXANGLE_NONE
+    ABSOLUTE = FIXANGLE_ABSOLUTE
+    RELATIVE = FIXANGLE_RELATIVE
+
+
 class PlayerStates(IntFlag):
     """Player states wrapper enumerator."""
 

src/core/modules/players/players_constants_wrap.cpp

@@ -54,6 +54,7 @@ void export_hide_hud_flags(scope);
 void export_hit_groups(scope);
 void export_player_animation(scope);
 void export_observer_modes(scope);
+void export_fixangle(scope);
 void export_players_miscellaneous_constants(scope);
 
 
@@ -69,6 +70,7 @@ DECLARE_SP_SUBMODULE(_players, _constants)
 	export_hit_groups(_constants);
 	export_player_animation(_constants);
 	export_observer_modes(_constants);
+	export_fixangle(_constants);
 	export_players_miscellaneous_constants(_constants);
 }
 
@@ -223,6 +225,17 @@ void export_observer_modes(scope _constants)
 }
 
 
+//-----------------------------------------------------------------------------
+// Exports fixangle constants.
+//-----------------------------------------------------------------------------
+void export_fixangle(scope _constants)
+{
+	_constants.attr("FIXANGLE_NONE") = FIXANGLE_NONE;
+	_constants.attr("FIXANGLE_ABSOLUTE") = FIXANGLE_ABSOLUTE;
+	_constants.attr("FIXANGLE_RELATIVE") = FIXANGLE_RELATIVE;
+}
+
+
 //-----------------------------------------------------------------------------
 // Exports miscellaneous constants.
 //-----------------------------------------------------------------------------

src/core/modules/players/players_entity.cpp

@@ -30,6 +30,16 @@
 // Source.Python
 #include "players_entity.h"
 
+// SDK
+#include "eiface.h"
+#include "public/PlayerState.h"
+
+
+// ============================================================================
+// >> EXTERNALS
+// ============================================================================
+extern IServerGameClients *servergameclients;
+
 
 // ============================================================================
 // >> PlayerMixin
@@ -448,16 +458,21 @@ void PlayerMixin::SetViewVector(Vector& value)
 
 QAngle PlayerMixin::GetViewAngle()
 {
-	QAngle eye_angle = GetEyeAngle();
-	return QAngle(
-		eye_angle.x,
-		eye_angle.y < 0 ? eye_angle.y + 360 : eye_angle.y,
-		GetRotation().z);
+	CPlayerState *pState = servergameclients->GetPlayerState(GetEdict());
+	if (!pState)
+		BOOST_RAISE_EXCEPTION(PyExc_ValueError, "Failed to get the player state instance for this player.")
+
+	return pState->v_angle;
 }
 
-void PlayerMixin::SetViewAngle(QAngle& value)
+void PlayerMixin::SetViewAngle(QAngle& value, int fixangle)
 {
-	BOOST_RAISE_EXCEPTION(PyExc_NotImplementedError, "Setting view_angle is not implemented.");
+	CPlayerState *pState = servergameclients->GetPlayerState(GetEdict());
+	if (!pState)
+		BOOST_RAISE_EXCEPTION(PyExc_ValueError, "Failed to get the player state instance for this player.")
+
+	pState->v_angle = value;
+	pState->fixangle = fixangle;
 }
 
 

src/core/modules/players/players_entity.h

@@ -163,7 +163,7 @@ class PlayerMixin: public CBaseEntityWrapper
 	void SetViewVector(Vector& value);
 
 	QAngle GetViewAngle();
-	void SetViewAngle(QAngle& value);
+	void SetViewAngle(QAngle& value, int fixangle = FIXANGLE_ABSOLUTE);
 
 	// Game specific
 	// CS:S, CS:GO

src/core/modules/players/players_wrap.cpp

@@ -587,10 +587,22 @@ void export_player_wrapper(scope _players)
 		"Get/set the player's view vector.\n\n"
 		":rtype: Vector");
 
+	_PlayerMixin.def(
+		"get_view_angle",
+		&PlayerMixin::GetViewAngle,
+		"Returns the player's view angle.\n\n"
+		":rtype: QAngle");
+
+	_PlayerMixin.def(
+		"set_view_angle",
+		&PlayerMixin::SetViewAngle,
+		"Sets the player's view angle.",
+		("self", "angle", arg("fixangle")=FIXANGLE_ABSOLUTE));
+
 	_PlayerMixin.add_property(
 		"view_angle",
 		&PlayerMixin::GetViewAngle,
-		&PlayerMixin::SetViewAngle,
+		_PlayerMixin.attr("set_view_angle"),
 		"Get/set the player's view angle.\n\n"
 		":rtype: QAngle");
 

src/core/sp_main.cpp

@@ -92,6 +92,7 @@ IEngineSound*			enginesound			= NULL;
 CGlobalVars*			gpGlobals			= NULL;
 IFileSystem*			filesystem			= NULL;
 IServerGameDLL*			servergamedll		= NULL;
+IServerGameClients*		servergameclients	= NULL;
 IServerTools*			servertools			= NULL;
 IPhysics*				physics				= NULL;
 IPhysicsCollision*		physcollision		= NULL;
@@ -153,6 +154,7 @@ InterfaceHelper_t gGameInterfaces[] = {
 	{INTERFACEVERSION_PLAYERINFOMANAGER, (void **)&playerinfomanager},
 	{INTERFACEVERSION_PLAYERBOTMANAGER, (void **)&botmanager},
 	{INTERFACEVERSION_SERVERGAMEDLL, (void **)&servergamedll},
+	{INTERFACEVERSION_SERVERGAMECLIENTS, (void **)&servergameclients},
 	{VSERVERTOOLS_INTERFACE_VERSION, (void **)&servertools},
 	{NULL, NULL}
 };