Merge pull request #452 from micvbang/micvbang/grenade-trajectory-timing

grenade trajectories: collect timings of each location

Author: markus-wa

pkg/demoinfocs/common/common.go

@@ -67,9 +67,13 @@ func (h *DemoHeader) FrameTime() time.Duration {
 type GrenadeProjectile struct {
 	Entity         st.Entity
 	WeaponInstance *Equipment
-	Thrower        *Player     // Always seems to be the same as Owner, even if the grenade was picked up
-	Owner          *Player     // Always seems to be the same as Thrower, even if the grenade was picked up
-	Trajectory     []r3.Vector // List of all known locations of the grenade up to the current point
+	Thrower        *Player // Always seems to be the same as Owner, even if the grenade was picked up
+	Owner          *Player // Always seems to be the same as Thrower, even if the grenade was picked up
+
+	// Deprecated: use Trajectory2 instead
+	Trajectory []r3.Vector // List of all known locations of the grenade up to the current point
+
+	Trajectory2 []TrajectoryEntry // List of all known locations and the point in time of the grenade up to the current point
 
 	// uniqueID is used to distinguish different grenades (which potentially have the same, reused entityID) from each other.
 	uniqueID int64
@@ -225,6 +229,13 @@ func NewTeamState(team Team, membersCallback func(Team) []*Player, demoInfoProvi
 	}
 }
 
+// TrajectoryEntry represents the location of a grenade's trajectory at a specific point in time.
+type TrajectoryEntry struct {
+	Position r3.Vector
+	FrameID  int
+	Time     time.Duration
+}
+
 // ConvertSteamIDTxtTo32 converts a Steam-ID in text format to a 32-bit variant.
 // See https://developer.valvesoftware.com/wiki/SteamID
 func ConvertSteamIDTxtTo32(steamID string) (uint32, error) {

pkg/demoinfocs/datatables.go

@@ -860,6 +860,12 @@ func (p *parser) bindGrenadeProjectiles(entity st.Entity) {
 
 	entity.OnPositionUpdate(func(newPos r3.Vector) {
 		proj.Trajectory = append(proj.Trajectory, newPos)
+
+		proj.Trajectory2 = append(proj.Trajectory2, common.TrajectoryEntry{
+			Position: newPos,
+			FrameID:  p.CurrentFrame(),
+			Time:     p.CurrentTime(),
+		})
 	})
 
 	// Some demos don't have this property as it seems