aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/src/Main.cs
diff options
context:
space:
mode:
authorMW2007-03-10 20:30:25 +0000
committerMW2007-03-10 20:30:25 +0000
commit76569ff4fba09f22ed4a06b8073deaed7f64a2e3 (patch)
treef83430652d8874f299733f505b6b7ded13910bb8 /src/Main.cs
parentAnother attempt to fix the project files (diff)
downloadopensim-SC-76569ff4fba09f22ed4a06b8073deaed7f64a2e3.zip
opensim-SC-76569ff4fba09f22ed4a06b8073deaed7f64a2e3.tar.gz
opensim-SC-76569ff4fba09f22ed4a06b8073deaed7f64a2e3.tar.bz2
opensim-SC-76569ff4fba09f22ed4a06b8073deaed7f64a2e3.tar.xz
A PhysX physics plugin (that actually uses physX now but currently only works on windows)
Can now change direction when walking without stopping Flying works when using the Physx dll
Diffstat (limited to 'src/Main.cs')
-rw-r--r--src/Main.cs8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/Main.cs b/src/Main.cs
index 600ce38..3103ea3 100644
--- a/src/Main.cs
+++ b/src/Main.cs
@@ -71,6 +71,7 @@ namespace OpenSim
71 private PhysicsManager physManager; 71 private PhysicsManager physManager;
72 private System.Timers.Timer timer1 = new System.Timers.Timer(); 72 private System.Timers.Timer timer1 = new System.Timers.Timer();
73 private string ConfigDll = "SimConfig.dll"; 73 private string ConfigDll = "SimConfig.dll";
74 private string _physicsEngine = "PhysX";
74 public bool sandbox = false; 75 public bool sandbox = false;
75 public bool loginserver = false; 76 public bool loginserver = false;
76 77
@@ -93,6 +94,11 @@ namespace OpenSim
93 { 94 {
94 sim.loginserver = true; 95 sim.loginserver = true;
95 } 96 }
97 if(args[i] == "-realphysx")
98 {
99 sim._physicsEngine = "RealPhysX";
100 OpenSim.world.Avatar.PhysicsEngineFlying = true;
101 }
96 } 102 }
97 103
98 OpenSim_Main.gridServers = new Grid(); 104 OpenSim_Main.gridServers = new Grid();
@@ -148,7 +154,7 @@ namespace OpenSim
148 this.physManager = new PhysicsSystem.PhysicsManager(); 154 this.physManager = new PhysicsSystem.PhysicsManager();
149 this.physManager.LoadPlugins(); 155 this.physManager.LoadPlugins();
150 ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting up messaging system"); 156 ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting up messaging system");
151 local_world.PhysScene = this.physManager.GetPhysicsScene("PhysX"); //should be reading from the config file what physics engine to use 157 local_world.PhysScene = this.physManager.GetPhysicsScene(this._physicsEngine); //should be reading from the config file what physics engine to use
152 local_world.PhysScene.SetTerrain(local_world.LandMap); 158 local_world.PhysScene.SetTerrain(local_world.LandMap);
153 159
154 OpenSim_Main.gridServers.AssetServer.SetServerInfo(OpenSim_Main.cfg.AssetURL, OpenSim_Main.cfg.AssetSendKey); 160 OpenSim_Main.gridServers.AssetServer.SetServerInfo(OpenSim_Main.cfg.AssetURL, OpenSim_Main.cfg.AssetSendKey);