Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

BulletSim: fix line endings.

  • Loading branch information...
commit d3adf9b2b3bd8e0e76168cd6eb6414f3123c5f02 1 parent 7c14057
Robert Adams authored August 25, 2012
44  OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
@@ -102,7 +102,7 @@ public class BSScene : PhysicsScene, IPhysicsParameters
102 102
     public uint WorldID { get; private set; }
103 103
     public BulletSim World { get; private set; }
104 104
 
105  
-    // All the constraints that have been allocated in this instance.
  105
+    // All the constraints that have been allocated in this instance.
106 106
     public BSConstraintCollection Constraints { get; private set; }
107 107
 
108 108
     // Simulation parameters
@@ -117,7 +117,7 @@ public class BSScene : PhysicsScene, IPhysicsParameters
117 117
     public float LastSimulatedTimestep { get; private set; }
118 118
 
119 119
     // A value of the time now so all the collision and update routines do not have to get their own
120  
-    // Set to 'now' just before all the prims and actors are called for collisions and updates
  120
+    // Set to 'now' just before all the prims and actors are called for collisions and updates
121 121
     public int SimulationNowTime { get; private set; }
122 122
 
123 123
     // True if initialized and ready to do simulation steps
@@ -140,8 +140,8 @@ public class BSScene : PhysicsScene, IPhysicsParameters
140 140
 
141 141
     public const uint TERRAIN_ID = 0;       // OpenSim senses terrain with a localID of zero
142 142
     public const uint GROUNDPLANE_ID = 1;
143  
-    public const uint CHILDTERRAIN_ID = 2;  // Terrain allocated based on our mega-prim childre start here
144  
-
  143
+    public const uint CHILDTERRAIN_ID = 2;  // Terrain allocated based on our mega-prim childre start here
  144
+
145 145
     private float m_waterLevel;
146 146
     public BSTerrainManager TerrainManager { get; private set; }
147 147
 
@@ -189,8 +189,8 @@ public TaintCallbackEntry(string i, TaintCallback c)
189 189
     private bool m_physicsLoggingEnabled;
190 190
     private string m_physicsLoggingDir;
191 191
     private string m_physicsLoggingPrefix;
192  
-    private int m_physicsLoggingFileMinutes;
193  
-    // 'true' of the vehicle code is to log lots of details
  192
+    private int m_physicsLoggingFileMinutes;
  193
+    // 'true' of the vehicle code is to log lots of details
194 194
     public bool VehicleLoggingEnabled { get; private set; }
195 195
 
196 196
     #region Construction and Initialization
@@ -266,7 +266,7 @@ public override void Initialise(IMesher meshmerizer, IConfigSource config)
266 266
         Constraints = new BSConstraintCollection(World);
267 267
 
268 268
         // Note: choose one of the  two following lines
269  
-        // BulletSimAPI.CreateInitialGroundPlaneAndTerrain(WorldID);
  269
+        // BulletSimAPI.CreateInitialGroundPlaneAndTerrain(WorldID);
270 270
         TerrainManager = new BSTerrainManager(this);
271 271
         TerrainManager.CreateInitialGroundPlaneAndTerrain();
272 272
 
@@ -471,7 +471,7 @@ public override float Simulate(float timeStep)
471 471
 
472 472
         int simulateStartTime = Util.EnvironmentTickCount();
473 473
 
474  
-        // update the prim states while we know the physics engine is not busy
  474
+        // update the prim states while we know the physics engine is not busy
475 475
         int numTaints = _taintedObjects.Count;
476 476
         ProcessTaints();
477 477
 
@@ -611,7 +611,7 @@ private void SendCollision(uint localID, uint collidingWith, Vector3 collidePoin
611 611
 
612 612
     #region Terrain
613 613
 
614  
-    public override void SetTerrain(float[] heightMap) {
  614
+    public override void SetTerrain(float[] heightMap) {
615 615
         TerrainManager.SetTerrain(heightMap);
616 616
     }
617 617
 
@@ -628,25 +628,25 @@ public float GetWaterLevel()
628 628
     public override void DeleteTerrain() 
629 629
     {
630 630
         // m_log.DebugFormat("{0}: DeleteTerrain()", LogHeader);
631  
-    }
632  
-
633  
-    // Although no one seems to check this, I do support combining.
634  
-    public override bool SupportsCombining()
635  
-    {
636  
-        return TerrainManager.SupportsCombining();
  631
+    }
  632
+
  633
+    // Although no one seems to check this, I do support combining.
  634
+    public override bool SupportsCombining()
  635
+    {
  636
+        return TerrainManager.SupportsCombining();
637 637
     }
638 638
     // This call says I am a child to region zero in a mega-region. 'pScene' is that
639 639
     //    of region zero, 'offset' is my offset from regions zero's origin, and
640 640
     //    'extents' is the largest XY that is handled in my region.
641 641
     public override void Combine(PhysicsScene pScene, Vector3 offset, Vector3 extents)
642  
-    {
  642
+    {
643 643
         TerrainManager.Combine(pScene, offset, extents);
644  
-    }
645  
-
646  
-    // Unhook all the combining that I know about.
647  
-    public override void UnCombine(PhysicsScene pScene)
648  
-    {
649  
-        TerrainManager.UnCombine(pScene);
  644
+    }
  645
+
  646
+    // Unhook all the combining that I know about.
  647
+    public override void UnCombine(PhysicsScene pScene)
  648
+    {
  649
+        TerrainManager.UnCombine(pScene);
650 650
     }
651 651
 
652 652
     #endregion // Terrain

0 notes on commit d3adf9b

Please sign in to comment.
Something went wrong with that request. Please try again.