* Made sure physics dlls end up in /bin/Physics

* Re-fixed the timer bug.
* Added a README note explaining the fast track to building and running sandbox on Windows/VS 2005
adam
lbsa71 2007-03-14 14:04:02 +00:00
parent 51804d4cc5
commit a9ee8f9382
4 changed files with 33 additions and 10 deletions

19
README.txt Normal file
View File

@ -0,0 +1,19 @@
Build Instructions
=== Microsoft Visual Studio 2005 Sandbox Build ===
* Check out the trunk code
* Build the /src/opensim.sln solution
* open cmd window, go to /bin and launch
OpenSim.exe -sandbox -loginserver
* open another cmd window, locate the secondlife executable
(In something like C:\Program Files\SecondLife )
* run the viewer with
secondlife.exe -loginuri http://localhost:8080/
* Have fun with your own sandbox!

View File

@ -154,16 +154,12 @@ namespace OpenSim
ServerConsole.MainConsole.Instance.WriteLine("Initialising world"); ServerConsole.MainConsole.Instance.WriteLine("Initialising world");
local_world = cfg.LoadWorld(); local_world = cfg.LoadWorld();
timer1.Enabled = true;
timer1.Interval = 100;
timer1.Elapsed += new ElapsedEventHandler(this.Timer1Tick);
this.physManager = new PhysicsSystem.PhysicsManager(); this.physManager = new PhysicsSystem.PhysicsManager();
this.physManager.LoadPlugins(); this.physManager.LoadPlugins();
ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting up messaging system"); ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting up messaging system");
local_world.PhysScene = this.physManager.GetPhysicsScene(this._physicsEngine); //should be reading from the config file what physics engine to use local_world.PhysScene = this.physManager.GetPhysicsScene(this._physicsEngine); //should be reading from the config file what physics engine to use
local_world.PhysScene.SetTerrain(local_world.LandMap); local_world.PhysScene.SetTerrain(local_world.LandMap);
OpenSim_Main.gridServers.AssetServer.SetServerInfo(OpenSim_Main.cfg.AssetURL, OpenSim_Main.cfg.AssetSendKey); OpenSim_Main.gridServers.AssetServer.SetServerInfo(OpenSim_Main.cfg.AssetURL, OpenSim_Main.cfg.AssetSendKey);
OpenSim_Main.gridServers.GridServer.SetServerInfo(OpenSim_Main.cfg.GridURL, OpenSim_Main.cfg.GridSendKey); OpenSim_Main.gridServers.GridServer.SetServerInfo(OpenSim_Main.cfg.GridURL, OpenSim_Main.cfg.GridSendKey);
@ -173,7 +169,11 @@ namespace OpenSim
ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting CAPS HTTP server"); ServerConsole.MainConsole.Instance.WriteLine("Main.cs:Startup() - Starting CAPS HTTP server");
http_server = new SimCAPSHTTPServer(); http_server = new SimCAPSHTTPServer();
MainServerListener(); timer1.Enabled = true;
timer1.Interval = 100;
timer1.Elapsed += new ElapsedEventHandler(this.Timer1Tick);
MainServerListener();
} }

View File

@ -1,4 +1,4 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<RootNamespace>RealPhysXplugin</RootNamespace> <RootNamespace>RealPhysXplugin</RootNamespace>
@ -8,7 +8,7 @@
<ProjectGuid>{56C1D214-F389-4228-921A-0A3A0712C159}</ProjectGuid> <ProjectGuid>{56C1D214-F389-4228-921A-0A3A0712C159}</ProjectGuid>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' "> <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<OutputPath>bin\Debug\</OutputPath> <OutputPath>..\..\..\..\bin\Physics\</OutputPath>
<Optimize>False</Optimize> <Optimize>False</Optimize>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugSymbols>True</DebugSymbols> <DebugSymbols>True</DebugSymbols>
@ -29,6 +29,7 @@
<Reference Include="PhysX_Wrapper_Dotnet"> <Reference Include="PhysX_Wrapper_Dotnet">
<HintPath>..\..\..\..\bin\PhysX_Wrapper_Dotnet.dll</HintPath> <HintPath>..\..\..\..\bin\PhysX_Wrapper_Dotnet.dll</HintPath>
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<Private>False</Private>
</Reference> </Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -39,6 +40,7 @@
<ProjectReference Include="..\..\PhysicsManager.csproj"> <ProjectReference Include="..\..\PhysicsManager.csproj">
<Project>{3C86A846-7977-4EE7-A8DC-DD487FA5DC2B}</Project> <Project>{3C86A846-7977-4EE7-A8DC-DD487FA5DC2B}</Project>
<Name>PhysicsManager</Name> <Name>PhysicsManager</Name>
<Private>False</Private>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />

View File

@ -1,4 +1,4 @@
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -14,7 +14,7 @@
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType> <DebugType>full</DebugType>
<Optimize>false</Optimize> <Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath> <OutputPath>..\..\..\bin\Physics\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants> <DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport> <ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel> <WarningLevel>4</WarningLevel>
@ -31,6 +31,7 @@
<Reference Include="Axiom.MathLib, Version=0.7.0.25497, Culture=neutral"> <Reference Include="Axiom.MathLib, Version=0.7.0.25497, Culture=neutral">
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath> <HintPath>..\..\..\bin\Axiom.MathLib.dll</HintPath>
<Private>False</Private>
</Reference> </Reference>
<Reference Include="System" /> <Reference Include="System" />
<Reference Include="System.Data" /> <Reference Include="System.Data" />
@ -44,6 +45,7 @@
<ProjectReference Include="..\PhysicsManager.csproj"> <ProjectReference Include="..\PhysicsManager.csproj">
<Project>{3C86A846-7977-4EE7-A8DC-DD487FA5DC2B}</Project> <Project>{3C86A846-7977-4EE7-A8DC-DD487FA5DC2B}</Project>
<Name>PhysicsManager</Name> <Name>PhysicsManager</Name>
<Private>False</Private>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />