thegeneralist01/Scene-Manager-DevRepo
1
Fork 0
mirror of https://github.com/thegeneralist01/Scene-Manager-DevRepo synced 2026-01-11 15:40:29 +01:00
Code Issues Activity

Adjusted driving style flags. Updated references to driving flag property

Browse source
This commit is contained in:
Rich Dunne 2020-10-10 20:09:47 -06:00
parent 5ddcf3aead
commit 69cf4a8cd3
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
SceneManager/Object Classes/Waypoint.cs
View file

@ -7,7 +7,7 @@ namespace SceneManager
public enum DrivingFlagType public enum DrivingFlagType
{ {
Normal = 263075, Normal = 263075,
Direct = 17040299 Direct = 17040259
} }
public class Waypoint public class Waypoint
@ -16,7 +16,7 @@ namespace SceneManager
internal int Number { get; set; } internal int Number { get; set; }
internal Vector3 Position { get; set; } internal Vector3 Position { get; set; }
internal float Speed { get; set; } internal float Speed { get; set; }
internal VehicleDrivingFlags DrivingFlag { get; set; } //internal VehicleDrivingFlags DrivingFlag { get; set; }
internal DrivingFlagType DrivingFlagType { get; private set; } internal DrivingFlagType DrivingFlagType { get; private set; }
internal bool IsStopWaypoint { get; set; } internal bool IsStopWaypoint { get; set; }
internal Blip Blip { get; } internal Blip Blip { get; }
@ -28,14 +28,14 @@ namespace SceneManager
internal bool EnableWaypointMarker { get; set; } = true; internal bool EnableWaypointMarker { get; set; } = true;
internal bool EnableEditMarker { get; set; } internal bool EnableEditMarker { get; set; }
internal Waypoint(Path path, int waypointNum, Vector3 waypointPos, float speed, VehicleDrivingFlags drivingFlag, bool stopWaypoint, Blip waypointBlip, bool collector = false, float collectorRadius = 1, float speedZoneRadius = 5) internal Waypoint(Path path, int waypointNum, Vector3 waypointPos, float speed, DrivingFlagType drivingFlag, bool stopWaypoint, Blip waypointBlip, bool collector = false, float collectorRadius = 1, float speedZoneRadius = 5)
{ {
Path = path; Path = path;
Number = waypointNum; Number = waypointNum;
Position = waypointPos; Position = waypointPos;
Speed = speed; Speed = speed;
DrivingFlag = drivingFlag; //DrivingFlag = drivingFlag;
DrivingFlagType = (DrivingFlagType)DrivingFlag; DrivingFlagType = drivingFlag;
IsStopWaypoint = stopWaypoint; IsStopWaypoint = stopWaypoint;
Blip = waypointBlip; Blip = waypointBlip;
IsCollector = collector; IsCollector = collector;
@ -60,13 +60,13 @@ namespace SceneManager
DrawWaypointMarker(); DrawWaypointMarker();
} }
internal void UpdateWaypoint(Waypoint currentWaypoint, VehicleDrivingFlags drivingFlag, bool stopWaypoint, float speed, bool collectorWaypointChecked, float collectorRadius, float speedZoneRadius, bool updateWaypointPositionChecked) internal void UpdateWaypoint(Waypoint currentWaypoint, DrivingFlagType drivingFlag, bool stopWaypoint, float speed, bool collectorWaypointChecked, float collectorRadius, float speedZoneRadius, bool updateWaypointPositionChecked)
{ {
if(IsStopWaypoint != stopWaypoint) if(IsStopWaypoint != stopWaypoint)
{ {
UpdateIfStopWaypoint(); UpdateIfStopWaypoint();
} }
DrivingFlag = drivingFlag; DrivingFlagType = drivingFlag;
UpdateWaypointSpeed(speed); UpdateWaypointSpeed(speed);
UpdateCollectorOptions(); UpdateCollectorOptions();
if (updateWaypointPositionChecked) if (updateWaypointPositionChecked)