Merge remote-tracking branch 'origin/update-csharp-docs' into update-…

…csharp-docs
godotengine · Aug 27, 2024 · 3e555ae · 3e555ae
2 parents 97f42b0 + ffc4331
commit 3e555ae
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/tutorials/io/runtime_file_loading_and_saving.rst b/tutorials/io/runtime_file_loading_and_saving.rst
@@ -345,7 +345,7 @@ then adding it as a theme override to a :ref:`class_Label` node:
 
  .. code-tab:: csharp
 
-    var path = "/path/to/font.ttf";
+    string path = "/Path/To/Font.ttf";
     var fontFile = new FontFile();
 
     if (
@@ -359,7 +359,7 @@ then adding it as a theme override to a :ref:`class_Label` node:
     {
         fontFile.LoadDynamicFont(path);
     }
-    else if (path.EndsWith(".fnt") || path.EndsWith(".font"))
+    else if (path.EndsWith(".fnt", StringComparison.OrdinalIgnoreCase) || path.EndsWith(".font", StringComparison.OrdinalIgnoreCase))
     {
         fontFile.LoadBitmapFont(path);
     }

diff --git a/tutorials/navigation/navigation_using_navigationagents.rst b/tutorials/navigation/navigation_using_navigationagents.rst
@@ -371,8 +371,7 @@ The following sections provides script templates for nodes commonly used with Na
                         return;
                     }
 
-
-                    _movementDelta = _movementSpeed * (float)delta;
+                    _movementDelta = MovementSpeed * (float)delta;
                     Vector2 nextPathPosition = _navigationAgent.GetNextPathPosition();
                     Vector2 newVelocity = GlobalPosition.DirectionTo(nextPathPosition) * _movementDelta;
                     if (_navigationAgent.AvoidanceEnabled)
@@ -383,7 +382,6 @@ The following sections provides script templates for nodes commonly used with Na
                     {
                         OnVelocityComputed(newVelocity);
                     }
-
                 }
 
                 private void OnVelocityComputed(Vector2 safeVelocity)
@@ -427,7 +425,7 @@ The following sections provides script templates for nodes commonly used with Na
                     }
 
                     Vector2 nextPathPosition = _navigationAgent.GetNextPathPosition();
-                    Vector2 newVelocity = GlobalPosition.DirectionTo(nextPathPosition) * _movementSpeed;
+                    Vector2 newVelocity = GlobalPosition.DirectionTo(nextPathPosition) * MovementSpeed;
                     if (_navigationAgent.AvoidanceEnabled)
                     {
                         _navigationAgent.Velocity = newVelocity;
@@ -480,7 +478,7 @@ The following sections provides script templates for nodes commonly used with Na
                     }
 
                     Vector2 nextPathPosition = _navigationAgent.GetNextPathPosition();
-                    Vector2 newVelocity = GlobalPosition.DirectionTo(nextPathPosition) * _movementSpeed;
+                    Vector2 newVelocity = GlobalPosition.DirectionTo(nextPathPosition) * MovementSpeed;
                     if (_navigationAgent.AvoidanceEnabled)
                     {
                         _navigationAgent.Velocity = newVelocity;
@@ -633,7 +631,7 @@ The following sections provides script templates for nodes commonly used with Na
                         return;
                     }
 
-                    _movementDelta = _movementSpeed * (float)delta;
+                    _movementDelta = MovementSpeed * (float)delta;
                     Vector3 nextPathPosition = _navigationAgent.GetNextPathPosition();
                     Vector3 newVelocity = GlobalPosition.DirectionTo(nextPathPosition) * _movementDelta;
                     if (_navigationAgent.AvoidanceEnabled)
@@ -687,7 +685,7 @@ The following sections provides script templates for nodes commonly used with Na
                     }
 
                     Vector3 nextPathPosition = _navigationAgent.GetNextPathPosition();
-                    Vector3 newVelocity = GlobalPosition.DirectionTo(nextPathPosition) * _movementSpeed;
+                    Vector3 newVelocity = GlobalPosition.DirectionTo(nextPathPosition) * MovementSpeed;
                     if (_navigationAgent.AvoidanceEnabled)
                     {
                         _navigationAgent.Velocity = newVelocity;
@@ -740,7 +738,7 @@ The following sections provides script templates for nodes commonly used with Na
                     }
 
                     Vector3 nextPathPosition = _navigationAgent.GetNextPathPosition();
-                    Vector3 newVelocity = GlobalPosition.DirectionTo(nextPathPosition) * _movementSpeed;
+                    Vector3 newVelocity = GlobalPosition.DirectionTo(nextPathPosition) * MovementSpeed;
                     if (_navigationAgent.AvoidanceEnabled)
                     {
                         _navigationAgent.Velocity = newVelocity;

diff --git a/tutorials/navigation/navigation_using_navigationobstacles.rst b/tutorials/navigation/navigation_using_navigationobstacles.rst
@@ -228,7 +228,7 @@ For static use an array of ``vertices`` is required.
     Rid defaultMapRid = GetWorld2D().NavigationMap;
 
     NavigationServer2D.ObstacleSetMap(newObstacleRid, defaultMapRid);
-    NavigationServer2D.ObstacleSetPosition(newObstacleRid, globalPosition);
+    NavigationServer2D.ObstacleSetPosition(newObstacleRid, GlobalPosition);
 
     // Use obstacle dynamic by increasing radius above zero.
     NavigationServer2D.ObstacleSetRadius(newObstacleRid, 5.0f);
@@ -274,7 +274,7 @@ For static use an array of ``vertices`` is required.
     Rid defaultMapRid = GetWorld3D().NavigationMap;
 
     NavigationServer3D.ObstacleSetMap(newObstacleRid, defaultMapRid);
-    NavigationServer3D.ObstacleSetPosition(newObstacleRid, globalPosition);
+    NavigationServer3D.ObstacleSetPosition(newObstacleRid, GlobalPosition);
 
     // Use obstacle dynamic by increasing radius above zero.
     NavigationServer3D.ObstacleSetRadius(newObstacleRid, 5.0f);