Messy fixup of nant build files
Ready to cleanup and merge into trunkConvertToPlugins
gareth
parent
ecbb5404dc
commit
6a1cc7c70f
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -0,0 +1,9 @@
|
||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
MAJOR=0
|
||||||
|
MINOR=1
|
||||||
|
BUILD=`date +%s`
|
||||||
|
REVISION=`svnversion | sed s/:// | sed s/M//`
|
||||||
|
REALREVISION=`svnversion`
|
||||||
|
cat src/VersionInfo.cs.template | sed s/@@VERSION/"$MAJOR.$MINOR, Build $BUILD, Revision $REALREVISION"/g >src/VersionInfo.cs
|
||||||
|
echo -n $MAJOR.$MINOR.*.$REVISION >VERSION
|
||||||
|
|
@ -0,0 +1,80 @@
|
||||||
|
<?xml version="1.0"?>
|
||||||
|
<project name="OpenSim" default="build" basedir=".">
|
||||||
|
<description>nant buildfile for OpenSim</description>
|
||||||
|
<property name="debug" value="true" overwrite="false" />
|
||||||
|
<target name="clean" description="remove all generated files">
|
||||||
|
<delete file="bin/OpenSim.exe" failonerror="false" />
|
||||||
|
<delete file="bin/OpenSim.pdb" failonerror="false" />
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="svnupdate" description="updates to latest SVN">
|
||||||
|
<exec program="svn">
|
||||||
|
<arg value="update" />
|
||||||
|
</exec>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build">
|
||||||
|
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="build" description="compiles the source code">
|
||||||
|
|
||||||
|
<exec program="genvers.sh" />
|
||||||
|
<loadfile file="VERSION" property="svnver"/>
|
||||||
|
|
||||||
|
<asminfo output="src/AssemblyInfo.cs" language="CSharp">
|
||||||
|
<imports>
|
||||||
|
<import namespace="System" />
|
||||||
|
<import namespace="System.Reflection" />
|
||||||
|
<import namespace="System.Runtime.InteropServices" />
|
||||||
|
</imports>
|
||||||
|
<attributes>
|
||||||
|
<attribute type="ComVisibleAttribute" value="false" />
|
||||||
|
<attribute type="CLSCompliantAttribute" value="false" />
|
||||||
|
<attribute type="AssemblyVersionAttribute" value="${svnver}" />
|
||||||
|
<attribute type="AssemblyTitleAttribute" value="opensim" />
|
||||||
|
<attribute type="AssemblyDescriptionAttribute" value="The C# implementation of the simulator portion of OGS" />
|
||||||
|
<attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/>
|
||||||
|
</attributes>
|
||||||
|
</asminfo>
|
||||||
|
|
||||||
|
<nant>
|
||||||
|
<buildfiles>
|
||||||
|
<include name="src/GridInterfaces/default.build" />
|
||||||
|
<include name="src/ServerConsole/default.build" />
|
||||||
|
<include name="src/LocalServers/default.build" />
|
||||||
|
<include name="src/RemoteServers/default.build" />
|
||||||
|
<include name="src/physics/default.build" />
|
||||||
|
<include name="src/physics/plugins/default.build" />
|
||||||
|
</buildfiles>
|
||||||
|
</nant>
|
||||||
|
|
||||||
|
<csc target="exe" output="bin/OpenSim.exe" debug="${debug}" verbose="true" warninglevel="4">
|
||||||
|
<references basedir="bin/" failonempty="true">
|
||||||
|
<include name="System" />
|
||||||
|
<include name="System.Data" />
|
||||||
|
<include name="System.Xml" />
|
||||||
|
<include name="Axiom.MathLib.dll" />
|
||||||
|
<include name="libsecondlife.dll" />
|
||||||
|
<include name="log4net.dll" />
|
||||||
|
<include name="Db4objects.Db4o.dll" />
|
||||||
|
<include name="ServerConsole.dll" />
|
||||||
|
<include name="GridInterfaces.dll" />
|
||||||
|
<include name="PhysicsManager.dll" />
|
||||||
|
</references>
|
||||||
|
<sources basedir="src/">
|
||||||
|
<include name="*.cs" />
|
||||||
|
<include name="types/*.cs" />
|
||||||
|
<include name="world/*.cs" />
|
||||||
|
<include name="GridServers/*.cs" />
|
||||||
|
<include name="Assets/*.cs" />
|
||||||
|
</sources>
|
||||||
|
</csc>
|
||||||
|
|
||||||
|
<nant>
|
||||||
|
<buildfiles>
|
||||||
|
<include name="src/Config/default.build" />
|
||||||
|
</buildfiles>
|
||||||
|
</nant>
|
||||||
|
</target>
|
||||||
|
</project>
|
||||||
|
|
@ -59,6 +59,8 @@ namespace OpenSim.Assets
|
||||||
{
|
{
|
||||||
_assetServer = assetServer;
|
_assetServer = assetServer;
|
||||||
_assetServer.SetReceiver(this);
|
_assetServer.SetReceiver(this);
|
||||||
|
Assets = new Dictionary<libsecondlife.LLUUID, AssetInfo> ();
|
||||||
|
Textures = new Dictionary<libsecondlife.LLUUID, TextureImage> ();
|
||||||
this._assetCacheThread = new Thread( new ThreadStart(RunAssetManager));
|
this._assetCacheThread = new Thread( new ThreadStart(RunAssetManager));
|
||||||
this._assetCacheThread.IsBackground = true;
|
this._assetCacheThread.IsBackground = true;
|
||||||
this._assetCacheThread.Start();
|
this._assetCacheThread.Start();
|
||||||
|
|
|
||||||
|
|
@ -1,31 +1,21 @@
|
||||||
using System.Reflection;
|
using System;
|
||||||
using System.Runtime.CompilerServices;
|
using System.Reflection;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
// Information about this assembly is defined by the following
|
// ------------------------------------------------------------------------------
|
||||||
// attributes.
|
// <autogenerated>
|
||||||
//
|
// This code was generated by a tool.
|
||||||
// change them to the information which is associated with the assembly
|
// Mono Runtime Version: 2.0.50727.42
|
||||||
// you compile.
|
//
|
||||||
|
// Changes to this file may cause incorrect behavior and will be lost if
|
||||||
[assembly: AssemblyTitle("SimConfig")]
|
// the code is regenerated.
|
||||||
[assembly: AssemblyDescription("")]
|
// </autogenerated>
|
||||||
[assembly: AssemblyConfiguration("")]
|
// ------------------------------------------------------------------------------
|
||||||
[assembly: AssemblyCompany("")]
|
|
||||||
[assembly: AssemblyProduct("SimConfig")]
|
[assembly: ComVisibleAttribute(false)]
|
||||||
[assembly: AssemblyCopyright("")]
|
[assembly: CLSCompliantAttribute(false)]
|
||||||
[assembly: AssemblyTrademark("")]
|
[assembly: AssemblyVersionAttribute("0.1.*.148")]
|
||||||
[assembly: AssemblyCulture("")]
|
[assembly: AssemblyTitleAttribute("opensim-simconfig")]
|
||||||
|
[assembly: AssemblyDescriptionAttribute("The default configuration handler")]
|
||||||
// This sets the default COM visibility of types in the assembly to invisible.
|
[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
|
||||||
// If you need to expose a type to COM, use [ComVisible(true)] on that type.
|
|
||||||
[assembly: ComVisible(false)]
|
|
||||||
|
|
||||||
// The assembly version has following format :
|
|
||||||
//
|
|
||||||
// Major.Minor.Build.Revision
|
|
||||||
//
|
|
||||||
// You can specify all values by your own or you can build default build and revision
|
|
||||||
// numbers with the '*' character (the default):
|
|
||||||
|
|
||||||
[assembly: AssemblyVersion("1.0.*")]
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,52 @@
|
||||||
|
<?xml version="1.0"?>
|
||||||
|
<project name="OpenSim" default="build" basedir=".">
|
||||||
|
<description>nant buildfile for OpenSim</description>
|
||||||
|
<property name="debug" value="true" overwrite="false" />
|
||||||
|
<target name="clean" description="remove all generated files">
|
||||||
|
<delete file="../bin/SimConfig.dll" failonerror="false" />
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="svnupdate" description="updates to latest SVN">
|
||||||
|
<exec program="svn">
|
||||||
|
<arg value="update" />
|
||||||
|
</exec>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build">
|
||||||
|
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="build" description="compiles the source code">
|
||||||
|
|
||||||
|
<loadfile file="../../VERSION" property="svnver"/>
|
||||||
|
<asminfo output="SimConfig/AssemblyInfo.cs" language="CSharp">
|
||||||
|
<imports>
|
||||||
|
<import namespace="System" />
|
||||||
|
<import namespace="System.Reflection" />
|
||||||
|
<import namespace="System.Runtime.InteropServices" />
|
||||||
|
</imports>
|
||||||
|
<attributes>
|
||||||
|
<attribute type="ComVisibleAttribute" value="false" />
|
||||||
|
<attribute type="CLSCompliantAttribute" value="false" />
|
||||||
|
<attribute type="AssemblyVersionAttribute" value="${svnver}" />
|
||||||
|
<attribute type="AssemblyTitleAttribute" value="opensim-simconfig" />
|
||||||
|
<attribute type="AssemblyDescriptionAttribute" value="The default configuration handler" />
|
||||||
|
<attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/>
|
||||||
|
</attributes>
|
||||||
|
</asminfo>
|
||||||
|
|
||||||
|
<csc target="library" output="../../bin/SimConfig.dll" debug="${debug}" verbose="true" warninglevel="4">
|
||||||
|
<references basedir="../../bin/" failonempty="true">
|
||||||
|
<include name="System" />
|
||||||
|
<include name="System.Data" />
|
||||||
|
<include name="System.Xml" />
|
||||||
|
<include name="ServerConsole.dll" />
|
||||||
|
<include name="OpenSim.exe" />
|
||||||
|
<include name="Db4objects.Db4o.dll" />
|
||||||
|
</references>
|
||||||
|
<sources basedir="SimConfig/">
|
||||||
|
<include name="*.cs" />
|
||||||
|
</sources>
|
||||||
|
</csc>
|
||||||
|
</target>
|
||||||
|
</project>
|
||||||
|
|
@ -1,31 +1,21 @@
|
||||||
using System.Reflection;
|
using System;
|
||||||
using System.Runtime.CompilerServices;
|
using System.Reflection;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
// Information about this assembly is defined by the following
|
// ------------------------------------------------------------------------------
|
||||||
// attributes.
|
// <autogenerated>
|
||||||
//
|
// This code was generated by a tool.
|
||||||
// change them to the information which is associated with the assembly
|
// Mono Runtime Version: 2.0.50727.42
|
||||||
// you compile.
|
//
|
||||||
|
// Changes to this file may cause incorrect behavior and will be lost if
|
||||||
[assembly: AssemblyTitle("GridInterfaces")]
|
// the code is regenerated.
|
||||||
[assembly: AssemblyDescription("")]
|
// </autogenerated>
|
||||||
[assembly: AssemblyConfiguration("")]
|
// ------------------------------------------------------------------------------
|
||||||
[assembly: AssemblyCompany("")]
|
|
||||||
[assembly: AssemblyProduct("GridInterfaces")]
|
[assembly: ComVisibleAttribute(false)]
|
||||||
[assembly: AssemblyCopyright("")]
|
[assembly: CLSCompliantAttribute(false)]
|
||||||
[assembly: AssemblyTrademark("")]
|
[assembly: AssemblyVersionAttribute("0.1.*.148")]
|
||||||
[assembly: AssemblyCulture("")]
|
[assembly: AssemblyTitleAttribute("opensim-gridinterfaces")]
|
||||||
|
[assembly: AssemblyDescriptionAttribute("Definitions for OGS interface")]
|
||||||
// This sets the default COM visibility of types in the assembly to invisible.
|
[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
|
||||||
// If you need to expose a type to COM, use [ComVisible(true)] on that type.
|
|
||||||
[assembly: ComVisible(false)]
|
|
||||||
|
|
||||||
// The assembly version has following format :
|
|
||||||
//
|
|
||||||
// Major.Minor.Build.Revision
|
|
||||||
//
|
|
||||||
// You can specify all values by your own or you can build default build and revision
|
|
||||||
// numbers with the '*' character (the default):
|
|
||||||
|
|
||||||
[assembly: AssemblyVersion("1.0.*")]
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,49 @@
|
||||||
|
<?xml version="1.0"?>
|
||||||
|
<project name="OpenSim" default="build" basedir=".">
|
||||||
|
<description>nant buildfile for OpenSim</description>
|
||||||
|
<property name="debug" value="true" overwrite="false" />
|
||||||
|
<target name="clean" description="remove all generated files">
|
||||||
|
<delete file="../../bin/GridInterfaces.dll" failonerror="false" />
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="svnupdate" description="updates to latest SVN">
|
||||||
|
<exec program="svn">
|
||||||
|
<arg value="update" />
|
||||||
|
</exec>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build">
|
||||||
|
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="build" description="compiles the source code">
|
||||||
|
|
||||||
|
<loadfile file="../../VERSION" property="svnver"/>
|
||||||
|
<asminfo output="AssemblyInfo.cs" language="CSharp">
|
||||||
|
<imports>
|
||||||
|
<import namespace="System" />
|
||||||
|
<import namespace="System.Reflection" />
|
||||||
|
<import namespace="System.Runtime.InteropServices" />
|
||||||
|
</imports>
|
||||||
|
<attributes>
|
||||||
|
<attribute type="ComVisibleAttribute" value="false" />
|
||||||
|
<attribute type="CLSCompliantAttribute" value="false" />
|
||||||
|
<attribute type="AssemblyVersionAttribute" value="${svnver}" />
|
||||||
|
<attribute type="AssemblyTitleAttribute" value="opensim-gridinterfaces" />
|
||||||
|
<attribute type="AssemblyDescriptionAttribute" value="Definitions for OGS interface" />
|
||||||
|
<attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/>
|
||||||
|
</attributes>
|
||||||
|
</asminfo>
|
||||||
|
|
||||||
|
<csc target="library" output="../../bin/GridInterfaces.dll" debug="${debug}" verbose="true" warninglevel="4">
|
||||||
|
<references basedir="../../bin" failonempty="true">
|
||||||
|
<include name="System" />
|
||||||
|
<include name="System.Xml" />
|
||||||
|
<include name="libsecondlife.dll" />
|
||||||
|
</references>
|
||||||
|
<sources basedir="./">
|
||||||
|
<include name="*.cs" />
|
||||||
|
</sources>
|
||||||
|
</csc>
|
||||||
|
</target>
|
||||||
|
</project>
|
||||||
|
|
@ -1,31 +1,21 @@
|
||||||
using System.Reflection;
|
using System;
|
||||||
using System.Runtime.CompilerServices;
|
using System.Reflection;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
// Information about this assembly is defined by the following
|
// ------------------------------------------------------------------------------
|
||||||
// attributes.
|
// <autogenerated>
|
||||||
//
|
// This code was generated by a tool.
|
||||||
// change them to the information which is associated with the assembly
|
// Mono Runtime Version: 2.0.50727.42
|
||||||
// you compile.
|
//
|
||||||
|
// Changes to this file may cause incorrect behavior and will be lost if
|
||||||
[assembly: AssemblyTitle("LocalGridServers")]
|
// the code is regenerated.
|
||||||
[assembly: AssemblyDescription("")]
|
// </autogenerated>
|
||||||
[assembly: AssemblyConfiguration("")]
|
// ------------------------------------------------------------------------------
|
||||||
[assembly: AssemblyCompany("")]
|
|
||||||
[assembly: AssemblyProduct("LocalGridServers")]
|
[assembly: ComVisibleAttribute(false)]
|
||||||
[assembly: AssemblyCopyright("")]
|
[assembly: CLSCompliantAttribute(false)]
|
||||||
[assembly: AssemblyTrademark("")]
|
[assembly: AssemblyVersionAttribute("0.1.*.148")]
|
||||||
[assembly: AssemblyCulture("")]
|
[assembly: AssemblyTitleAttribute("opensim-localservers")]
|
||||||
|
[assembly: AssemblyDescriptionAttribute("local grid servers")]
|
||||||
// This sets the default COM visibility of types in the assembly to invisible.
|
[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
|
||||||
// If you need to expose a type to COM, use [ComVisible(true)] on that type.
|
|
||||||
[assembly: ComVisible(false)]
|
|
||||||
|
|
||||||
// The assembly version has following format :
|
|
||||||
//
|
|
||||||
// Major.Minor.Build.Revision
|
|
||||||
//
|
|
||||||
// You can specify all values by your own or you can build default build and revision
|
|
||||||
// numbers with the '*' character (the default):
|
|
||||||
|
|
||||||
[assembly: AssemblyVersion("1.0.*")]
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,51 @@
|
||||||
|
<?xml version="1.0"?>
|
||||||
|
<project name="OpenSim" default="build" basedir=".">
|
||||||
|
<description>nant buildfile for OpenSim</description>
|
||||||
|
<property name="debug" value="true" overwrite="false" />
|
||||||
|
<target name="clean" description="remove all generated files">
|
||||||
|
<delete file="../../bin/LocalGridServers.dll" failonerror="false" />
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="svnupdate" description="updates to latest SVN">
|
||||||
|
<exec program="svn">
|
||||||
|
<arg value="update" />
|
||||||
|
</exec>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build">
|
||||||
|
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="build" description="compiles the source code">
|
||||||
|
|
||||||
|
<loadfile file="../../VERSION" property="svnver"/>
|
||||||
|
<asminfo output="LocalGridServers/AssemblyInfo.cs" language="CSharp">
|
||||||
|
<imports>
|
||||||
|
<import namespace="System" />
|
||||||
|
<import namespace="System.Reflection" />
|
||||||
|
<import namespace="System.Runtime.InteropServices" />
|
||||||
|
</imports>
|
||||||
|
<attributes>
|
||||||
|
<attribute type="ComVisibleAttribute" value="false" />
|
||||||
|
<attribute type="CLSCompliantAttribute" value="false" />
|
||||||
|
<attribute type="AssemblyVersionAttribute" value="${svnver}" />
|
||||||
|
<attribute type="AssemblyTitleAttribute" value="opensim-localservers" />
|
||||||
|
<attribute type="AssemblyDescriptionAttribute" value="local grid servers" />
|
||||||
|
<attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/>
|
||||||
|
</attributes>
|
||||||
|
</asminfo>
|
||||||
|
|
||||||
|
<csc target="library" output="../../bin/LocalGridServers.dll" debug="${debug}" verbose="true" warninglevel="4">
|
||||||
|
<references basedir="../../bin" failonempty="true">
|
||||||
|
<include name="System" />
|
||||||
|
<include name="System.Xml" />
|
||||||
|
<include name="libsecondlife.dll" />
|
||||||
|
<include name="GridInterfaces.dll" />
|
||||||
|
<include name="ServerConsole.dll" />
|
||||||
|
</references>
|
||||||
|
<sources basedir="LocalGridServers/">
|
||||||
|
<include name="*.cs" />
|
||||||
|
</sources>
|
||||||
|
</csc>
|
||||||
|
</target>
|
||||||
|
</project>
|
||||||
|
|
@ -121,7 +121,7 @@ namespace OpenSim
|
||||||
sim.Startup();
|
sim.Startup();
|
||||||
|
|
||||||
while(true) {
|
while(true) {
|
||||||
ServerConsole.MainConsole.Instance.MainConsolePrompt();
|
ServerConsole.MainConsole.Instance.MainConsolePrompt();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -237,7 +237,8 @@ namespace OpenSim
|
||||||
|
|
||||||
void Timer1Tick( object sender, System.EventArgs e )
|
void Timer1Tick( object sender, System.EventArgs e )
|
||||||
{
|
{
|
||||||
local_world.Update();
|
Console.WriteLine("UPDATE WORLD!");
|
||||||
|
local_world.Update();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,31 +1,21 @@
|
||||||
using System.Reflection;
|
using System;
|
||||||
using System.Runtime.CompilerServices;
|
using System.Reflection;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
// Information about this assembly is defined by the following
|
// ------------------------------------------------------------------------------
|
||||||
// attributes.
|
// <autogenerated>
|
||||||
//
|
// This code was generated by a tool.
|
||||||
// change them to the information which is associated with the assembly
|
// Mono Runtime Version: 2.0.50727.42
|
||||||
// you compile.
|
//
|
||||||
|
// Changes to this file may cause incorrect behavior and will be lost if
|
||||||
[assembly: AssemblyTitle("RemoteGridServers")]
|
// the code is regenerated.
|
||||||
[assembly: AssemblyDescription("")]
|
// </autogenerated>
|
||||||
[assembly: AssemblyConfiguration("")]
|
// ------------------------------------------------------------------------------
|
||||||
[assembly: AssemblyCompany("")]
|
|
||||||
[assembly: AssemblyProduct("RemoteGridServers")]
|
[assembly: ComVisibleAttribute(false)]
|
||||||
[assembly: AssemblyCopyright("")]
|
[assembly: CLSCompliantAttribute(false)]
|
||||||
[assembly: AssemblyTrademark("")]
|
[assembly: AssemblyVersionAttribute("0.1.*.148")]
|
||||||
[assembly: AssemblyCulture("")]
|
[assembly: AssemblyTitleAttribute("opensim-remoteservers")]
|
||||||
|
[assembly: AssemblyDescriptionAttribute("Connects to remote OGS installation")]
|
||||||
// This sets the default COM visibility of types in the assembly to invisible.
|
[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
|
||||||
// If you need to expose a type to COM, use [ComVisible(true)] on that type.
|
|
||||||
[assembly: ComVisible(false)]
|
|
||||||
|
|
||||||
// The assembly version has following format :
|
|
||||||
//
|
|
||||||
// Major.Minor.Build.Revision
|
|
||||||
//
|
|
||||||
// You can specify all values by your own or you can build default build and revision
|
|
||||||
// numbers with the '*' character (the default):
|
|
||||||
|
|
||||||
[assembly: AssemblyVersion("1.0.*")]
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,51 @@
|
||||||
|
<?xml version="1.0"?>
|
||||||
|
<project name="OpenSim" default="build" basedir=".">
|
||||||
|
<description>nant buildfile for OpenSim</description>
|
||||||
|
<property name="debug" value="true" overwrite="false" />
|
||||||
|
<target name="clean" description="remove all generated files">
|
||||||
|
<delete file="../../bin/RemoteGridServers.dll" failonerror="false" />
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="svnupdate" description="updates to latest SVN">
|
||||||
|
<exec program="svn">
|
||||||
|
<arg value="update" />
|
||||||
|
</exec>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build">
|
||||||
|
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="build" description="compiles the source code">
|
||||||
|
|
||||||
|
<loadfile file="../../VERSION" property="svnver"/>
|
||||||
|
<asminfo output="RemoteGridServers/AssemblyInfo.cs" language="CSharp">
|
||||||
|
<imports>
|
||||||
|
<import namespace="System" />
|
||||||
|
<import namespace="System.Reflection" />
|
||||||
|
<import namespace="System.Runtime.InteropServices" />
|
||||||
|
</imports>
|
||||||
|
<attributes>
|
||||||
|
<attribute type="ComVisibleAttribute" value="false" />
|
||||||
|
<attribute type="CLSCompliantAttribute" value="false" />
|
||||||
|
<attribute type="AssemblyVersionAttribute" value="${svnver}" />
|
||||||
|
<attribute type="AssemblyTitleAttribute" value="opensim-remoteservers" />
|
||||||
|
<attribute type="AssemblyDescriptionAttribute" value="Connects to remote OGS installation" />
|
||||||
|
<attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/>
|
||||||
|
</attributes>
|
||||||
|
</asminfo>
|
||||||
|
|
||||||
|
<csc target="library" output="../../bin/RemoteGridServers.dll" debug="${debug}" verbose="true" warninglevel="4">
|
||||||
|
<references basedir="../../bin" failonempty="true">
|
||||||
|
<include name="System" />
|
||||||
|
<include name="System.Xml" />
|
||||||
|
<include name="libsecondlife.dll" />
|
||||||
|
<include name="GridInterfaces.dll" />
|
||||||
|
<include name="ServerConsole.dll" />
|
||||||
|
</references>
|
||||||
|
<sources basedir="RemoteGridServers/">
|
||||||
|
<include name="*.cs" />
|
||||||
|
</sources>
|
||||||
|
</csc>
|
||||||
|
</target>
|
||||||
|
</project>
|
||||||
|
|
@ -1,31 +1,21 @@
|
||||||
using System.Reflection;
|
using System;
|
||||||
using System.Runtime.CompilerServices;
|
using System.Reflection;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
// Information about this assembly is defined by the following
|
// ------------------------------------------------------------------------------
|
||||||
// attributes.
|
// <autogenerated>
|
||||||
//
|
// This code was generated by a tool.
|
||||||
// change them to the information which is associated with the assembly
|
// Mono Runtime Version: 2.0.50727.42
|
||||||
// you compile.
|
//
|
||||||
|
// Changes to this file may cause incorrect behavior and will be lost if
|
||||||
[assembly: AssemblyTitle("ServerConsole")]
|
// the code is regenerated.
|
||||||
[assembly: AssemblyDescription("")]
|
// </autogenerated>
|
||||||
[assembly: AssemblyConfiguration("")]
|
// ------------------------------------------------------------------------------
|
||||||
[assembly: AssemblyCompany("")]
|
|
||||||
[assembly: AssemblyProduct("ServerConsole")]
|
[assembly: ComVisibleAttribute(false)]
|
||||||
[assembly: AssemblyCopyright("")]
|
[assembly: CLSCompliantAttribute(false)]
|
||||||
[assembly: AssemblyTrademark("")]
|
[assembly: AssemblyVersionAttribute("0.1.*.148")]
|
||||||
[assembly: AssemblyCulture("")]
|
[assembly: AssemblyTitleAttribute("opensim-serverconsole")]
|
||||||
|
[assembly: AssemblyDescriptionAttribute("The default server console")]
|
||||||
// This sets the default COM visibility of types in the assembly to invisible.
|
[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
|
||||||
// If you need to expose a type to COM, use [ComVisible(true)] on that type.
|
|
||||||
[assembly: ComVisible(false)]
|
|
||||||
|
|
||||||
// The assembly version has following format :
|
|
||||||
//
|
|
||||||
// Major.Minor.Build.Revision
|
|
||||||
//
|
|
||||||
// You can specify all values by your own or you can build default build and revision
|
|
||||||
// numbers with the '*' character (the default):
|
|
||||||
|
|
||||||
[assembly: AssemblyVersion("1.0.*")]
|
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,48 @@
|
||||||
|
<?xml version="1.0"?>
|
||||||
|
<project name="OpenSim" default="build" basedir=".">
|
||||||
|
<description>nant buildfile for OpenSim</description>
|
||||||
|
<property name="debug" value="true" overwrite="false" />
|
||||||
|
<target name="clean" description="remove all generated files">
|
||||||
|
<delete file="../../bin/ServerConsole.dll" failonerror="false" />
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="svnupdate" description="updates to latest SVN">
|
||||||
|
<exec program="svn">
|
||||||
|
<arg value="update" />
|
||||||
|
</exec>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build">
|
||||||
|
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="build" description="compiles the source code">
|
||||||
|
|
||||||
|
<loadfile file="../../VERSION" property="svnver"/>
|
||||||
|
<asminfo output="ServerConsole/AssemblyInfo.cs" language="CSharp">
|
||||||
|
<imports>
|
||||||
|
<import namespace="System" />
|
||||||
|
<import namespace="System.Reflection" />
|
||||||
|
<import namespace="System.Runtime.InteropServices" />
|
||||||
|
</imports>
|
||||||
|
<attributes>
|
||||||
|
<attribute type="ComVisibleAttribute" value="false" />
|
||||||
|
<attribute type="CLSCompliantAttribute" value="false" />
|
||||||
|
<attribute type="AssemblyVersionAttribute" value="${svnver}" />
|
||||||
|
<attribute type="AssemblyTitleAttribute" value="opensim-serverconsole" />
|
||||||
|
<attribute type="AssemblyDescriptionAttribute" value="The default server console" />
|
||||||
|
<attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/>
|
||||||
|
</attributes>
|
||||||
|
</asminfo>
|
||||||
|
|
||||||
|
<csc target="library" output="../../bin/ServerConsole.dll" debug="${debug}" verbose="true" warninglevel="4">
|
||||||
|
<references>
|
||||||
|
<include name="System" />
|
||||||
|
<include name="System.Xml" />
|
||||||
|
</references>
|
||||||
|
<sources basedir="ServerConsole/">
|
||||||
|
<include name="*.cs" />
|
||||||
|
</sources>
|
||||||
|
</csc>
|
||||||
|
</target>
|
||||||
|
</project>
|
||||||
|
|
@ -32,6 +32,6 @@ namespace OpenSim
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class VersionInfo
|
public class VersionInfo
|
||||||
{
|
{
|
||||||
public static string Version = "0.0.1-*";
|
public static string Version = "0.1, Build 1173288035, Revision 148M";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,37 @@
|
||||||
|
/*
|
||||||
|
Copyright (c) OpenSim project, http://osgrid.org/
|
||||||
|
*
|
||||||
|
* Redistribution and use in source and binary forms, with or without
|
||||||
|
* modification, are permitted provided that the following conditions are met:
|
||||||
|
* * Redistributions of source code must retain the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer.
|
||||||
|
* * Redistributions in binary form must reproduce the above copyright
|
||||||
|
* notice, this list of conditions and the following disclaimer in the
|
||||||
|
* documentation and/or other materials provided with the distribution.
|
||||||
|
* * Neither the name of the <organization> nor the
|
||||||
|
* names of its contributors may be used to endorse or promote products
|
||||||
|
* derived from this software without specific prior written permission.
|
||||||
|
*
|
||||||
|
* THIS SOFTWARE IS PROVIDED BY <copyright holder> ``AS IS'' AND ANY
|
||||||
|
* EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
||||||
|
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
||||||
|
* DISCLAIMED. IN NO EVENT SHALL <copyright holder> BE LIABLE FOR ANY
|
||||||
|
* DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
|
||||||
|
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
|
||||||
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
|
||||||
|
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
||||||
|
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
|
||||||
|
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||||
|
*/
|
||||||
|
|
||||||
|
using System;
|
||||||
|
|
||||||
|
namespace OpenSim
|
||||||
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// </summary>
|
||||||
|
public class VersionInfo
|
||||||
|
{
|
||||||
|
public static string Version = "@@VERSION";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,31 +1,21 @@
|
||||||
using System.Reflection;
|
using System;
|
||||||
using System.Runtime.CompilerServices;
|
using System.Reflection;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
// Information about this assembly is defined by the following
|
// ------------------------------------------------------------------------------
|
||||||
// attributes.
|
// <autogenerated>
|
||||||
//
|
// This code was generated by a tool.
|
||||||
// change them to the information which is associated with the assembly
|
// Mono Runtime Version: 2.0.50727.42
|
||||||
// you compile.
|
//
|
||||||
|
// Changes to this file may cause incorrect behavior and will be lost if
|
||||||
[assembly: AssemblyTitle("PhysicsManager")]
|
// the code is regenerated.
|
||||||
[assembly: AssemblyDescription("")]
|
// </autogenerated>
|
||||||
[assembly: AssemblyConfiguration("")]
|
// ------------------------------------------------------------------------------
|
||||||
[assembly: AssemblyCompany("")]
|
|
||||||
[assembly: AssemblyProduct("PhysicsManager")]
|
[assembly: ComVisibleAttribute(false)]
|
||||||
[assembly: AssemblyCopyright("")]
|
[assembly: CLSCompliantAttribute(false)]
|
||||||
[assembly: AssemblyTrademark("")]
|
[assembly: AssemblyVersionAttribute("0.1.*.148")]
|
||||||
[assembly: AssemblyCulture("")]
|
[assembly: AssemblyTitleAttribute("opensim-physicsmanager")]
|
||||||
|
[assembly: AssemblyDescriptionAttribute("Handles physics plugins")]
|
||||||
// This sets the default COM visibility of types in the assembly to invisible.
|
[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
|
||||||
// If you need to expose a type to COM, use [ComVisible(true)] on that type.
|
|
||||||
[assembly: ComVisible(false)]
|
|
||||||
|
|
||||||
// The assembly version has following format :
|
|
||||||
//
|
|
||||||
// Major.Minor.Build.Revision
|
|
||||||
//
|
|
||||||
// You can specify all values by your own or you can build default build and revision
|
|
||||||
// numbers with the '*' character (the default):
|
|
||||||
|
|
||||||
[assembly: AssemblyVersion("1.0.*")]
|
|
||||||
|
|
|
||||||
|
|
@ -61,7 +61,7 @@ namespace PhysicsSystem
|
||||||
public void LoadPlugins()
|
public void LoadPlugins()
|
||||||
{
|
{
|
||||||
string path = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory ,"Physics");
|
string path = Path.Combine(System.AppDomain.CurrentDomain.BaseDirectory ,"Physics");
|
||||||
string[] pluginFiles = Directory.GetFiles(path, "*.Dll");
|
string[] pluginFiles = Directory.GetFiles(path, "*.dll");
|
||||||
|
|
||||||
|
|
||||||
for(int i= 0; i<pluginFiles.Length; i++)
|
for(int i= 0; i<pluginFiles.Length; i++)
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,49 @@
|
||||||
|
<?xml version="1.0"?>
|
||||||
|
<project name="OpenSim" default="build" basedir=".">
|
||||||
|
<description>nant buildfile for OpenSim</description>
|
||||||
|
<property name="debug" value="true" overwrite="false" />
|
||||||
|
<target name="clean" description="remove all generated files">
|
||||||
|
<delete file="../../bin/PhysicsManager.dll" failonerror="false" />
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="svnupdate" description="updates to latest SVN">
|
||||||
|
<exec program="svn">
|
||||||
|
<arg value="update" />
|
||||||
|
</exec>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build">
|
||||||
|
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="build" description="compiles the source code">
|
||||||
|
|
||||||
|
<loadfile file="../../VERSION" property="svnver"/>
|
||||||
|
<asminfo output="AssemblyInfo.cs" language="CSharp">
|
||||||
|
<imports>
|
||||||
|
<import namespace="System" />
|
||||||
|
<import namespace="System.Reflection" />
|
||||||
|
<import namespace="System.Runtime.InteropServices" />
|
||||||
|
</imports>
|
||||||
|
<attributes>
|
||||||
|
<attribute type="ComVisibleAttribute" value="false" />
|
||||||
|
<attribute type="CLSCompliantAttribute" value="false" />
|
||||||
|
<attribute type="AssemblyVersionAttribute" value="${svnver}" />
|
||||||
|
<attribute type="AssemblyTitleAttribute" value="opensim-physicsmanager" />
|
||||||
|
<attribute type="AssemblyDescriptionAttribute" value="Handles physics plugins" />
|
||||||
|
<attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/>
|
||||||
|
</attributes>
|
||||||
|
</asminfo>
|
||||||
|
|
||||||
|
<csc target="library" output="../../bin/PhysicsManager.dll" debug="${debug}" verbose="true" warninglevel="4">
|
||||||
|
<references basedir="../../bin" failonempty="true">
|
||||||
|
<include name="System" />
|
||||||
|
<include name="System.Xml" />
|
||||||
|
<include name="ServerConsole.dll" />
|
||||||
|
</references>
|
||||||
|
<sources basedir="./">
|
||||||
|
<include name="*.cs" />
|
||||||
|
</sources>
|
||||||
|
</csc>
|
||||||
|
</target>
|
||||||
|
</project>
|
||||||
|
|
@ -1,31 +1,21 @@
|
||||||
using System.Reflection;
|
using System;
|
||||||
using System.Runtime.CompilerServices;
|
using System.Reflection;
|
||||||
using System.Runtime.InteropServices;
|
using System.Runtime.InteropServices;
|
||||||
|
|
||||||
// Information about this assembly is defined by the following
|
// ------------------------------------------------------------------------------
|
||||||
// attributes.
|
// <autogenerated>
|
||||||
//
|
// This code was generated by a tool.
|
||||||
// change them to the information which is associated with the assembly
|
// Mono Runtime Version: 2.0.50727.42
|
||||||
// you compile.
|
//
|
||||||
|
// Changes to this file may cause incorrect behavior and will be lost if
|
||||||
[assembly: AssemblyTitle("PhysXplugin")]
|
// the code is regenerated.
|
||||||
[assembly: AssemblyDescription("")]
|
// </autogenerated>
|
||||||
[assembly: AssemblyConfiguration("")]
|
// ------------------------------------------------------------------------------
|
||||||
[assembly: AssemblyCompany("")]
|
|
||||||
[assembly: AssemblyProduct("PhysXplugin")]
|
[assembly: ComVisibleAttribute(false)]
|
||||||
[assembly: AssemblyCopyright("")]
|
[assembly: CLSCompliantAttribute(false)]
|
||||||
[assembly: AssemblyTrademark("")]
|
[assembly: AssemblyVersionAttribute("0.1.*.148")]
|
||||||
[assembly: AssemblyCulture("")]
|
[assembly: AssemblyTitleAttribute("opensim-physicsmanager-physx")]
|
||||||
|
[assembly: AssemblyDescriptionAttribute("PhysX plugin for OpenSim")]
|
||||||
// This sets the default COM visibility of types in the assembly to invisible.
|
[assembly: AssemblyCopyrightAttribute("Copyright © OGS development team 2007")]
|
||||||
// If you need to expose a type to COM, use [ComVisible(true)] on that type.
|
|
||||||
[assembly: ComVisible(false)]
|
|
||||||
|
|
||||||
// The assembly version has following format :
|
|
||||||
//
|
|
||||||
// Major.Minor.Build.Revision
|
|
||||||
//
|
|
||||||
// You can specify all values by your own or you can build default build and revision
|
|
||||||
// numbers with the '*' character (the default):
|
|
||||||
|
|
||||||
[assembly: AssemblyVersion("1.0.*")]
|
|
||||||
|
|
|
||||||
|
|
@ -87,8 +87,10 @@ namespace PhysXplugin
|
||||||
|
|
||||||
public override void Simulate(float timeStep)
|
public override void Simulate(float timeStep)
|
||||||
{
|
{
|
||||||
|
Console.WriteLine("SIMULATE!");
|
||||||
foreach (PhysXActor actor in _actors)
|
foreach (PhysXActor actor in _actors)
|
||||||
{
|
{
|
||||||
|
Console.WriteLine("AN ACTOR!");
|
||||||
actor.Position.X = actor.Position.X + actor.Velocity.X * timeStep;
|
actor.Position.X = actor.Position.X + actor.Velocity.X * timeStep;
|
||||||
actor.Position.Y = actor.Position.Y + actor.Velocity.Y * timeStep;
|
actor.Position.Y = actor.Position.Y + actor.Velocity.Y * timeStep;
|
||||||
actor.Position.Z = actor.Position.Z + actor.Velocity.Z * timeStep;
|
actor.Position.Z = actor.Position.Z + actor.Velocity.Z * timeStep;
|
||||||
|
|
@ -118,7 +120,7 @@ namespace PhysXplugin
|
||||||
|
|
||||||
public override void GetResults()
|
public override void GetResults()
|
||||||
{
|
{
|
||||||
|
Console.WriteLine("GET RESULTS!");
|
||||||
}
|
}
|
||||||
|
|
||||||
public override bool IsThreaded
|
public override bool IsThreaded
|
||||||
|
|
@ -143,7 +145,9 @@ namespace PhysXplugin
|
||||||
|
|
||||||
public PhysXActor()
|
public PhysXActor()
|
||||||
{
|
{
|
||||||
|
_velocity = new PhysicsVector();
|
||||||
|
_position = new PhysicsVector();
|
||||||
|
_acceleration = new PhysicsVector();
|
||||||
}
|
}
|
||||||
|
|
||||||
public override PhysicsVector Position
|
public override PhysicsVector Position
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,49 @@
|
||||||
|
<?xml version="1.0"?>
|
||||||
|
<project name="OpenSim" default="build" basedir=".">
|
||||||
|
<description>nant buildfile for OpenSim</description>
|
||||||
|
<property name="debug" value="true" overwrite="false" />
|
||||||
|
<target name="clean" description="remove all generated files">
|
||||||
|
<delete file="../../../bin/Physics/PhysXplugin.dll" failonerror="false" />
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="svnupdate" description="updates to latest SVN">
|
||||||
|
<exec program="svn">
|
||||||
|
<arg value="update" />
|
||||||
|
</exec>
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="upgrade" description="updates from SVN and then builds" depends="clean,svnupdate,build">
|
||||||
|
|
||||||
|
</target>
|
||||||
|
|
||||||
|
<target name="build" description="compiles the source code">
|
||||||
|
|
||||||
|
<loadfile file="../../../VERSION" property="svnver"/>
|
||||||
|
<asminfo output="AssemblyInfo.cs" language="CSharp">
|
||||||
|
<imports>
|
||||||
|
<import namespace="System" />
|
||||||
|
<import namespace="System.Reflection" />
|
||||||
|
<import namespace="System.Runtime.InteropServices" />
|
||||||
|
</imports>
|
||||||
|
<attributes>
|
||||||
|
<attribute type="ComVisibleAttribute" value="false" />
|
||||||
|
<attribute type="CLSCompliantAttribute" value="false" />
|
||||||
|
<attribute type="AssemblyVersionAttribute" value="${svnver}" />
|
||||||
|
<attribute type="AssemblyTitleAttribute" value="opensim-physicsmanager-physx" />
|
||||||
|
<attribute type="AssemblyDescriptionAttribute" value="PhysX plugin for OpenSim" />
|
||||||
|
<attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/>
|
||||||
|
</attributes>
|
||||||
|
</asminfo>
|
||||||
|
|
||||||
|
<csc target="library" output="../../../bin/Physics/PhysXplugin.dll" debug="${debug}" verbose="true" warninglevel="4">
|
||||||
|
<references basedir="../../../bin" failonempty="true">
|
||||||
|
<include name="System" />
|
||||||
|
<include name="System.Xml" />
|
||||||
|
<include name="PhysicsManager.dll" />
|
||||||
|
</references>
|
||||||
|
<sources basedir="./">
|
||||||
|
<include name="*.cs" />
|
||||||
|
</sources>
|
||||||
|
</csc>
|
||||||
|
</target>
|
||||||
|
</project>
|
||||||
|
|
@ -35,7 +35,7 @@ namespace OpenSim.world
|
||||||
this._physActor = value;
|
this._physActor = value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public override void addFroces()
|
public override void addForces()
|
||||||
{
|
{
|
||||||
lock(this.forcesList)
|
lock(this.forcesList)
|
||||||
{
|
{
|
||||||
|
|
@ -43,6 +43,7 @@ namespace OpenSim.world
|
||||||
{
|
{
|
||||||
for(int i=0 ; i < this.forcesList.Count; i++)
|
for(int i=0 ; i < this.forcesList.Count; i++)
|
||||||
{
|
{
|
||||||
|
Console.WriteLine("ADDING A FORCE!");
|
||||||
NewForce force = this.forcesList[i];
|
NewForce force = this.forcesList[i];
|
||||||
PhysicsVector phyVector = new PhysicsVector(force.X, force.Y, force.Z);
|
PhysicsVector phyVector = new PhysicsVector(force.X, force.Y, force.Z);
|
||||||
this._physActor.Velocity = phyVector;
|
this._physActor.Velocity = phyVector;
|
||||||
|
|
@ -60,7 +61,8 @@ namespace OpenSim.world
|
||||||
|
|
||||||
public override void update()
|
public override void update()
|
||||||
{
|
{
|
||||||
if(this.updateflag)
|
Console.WriteLine("UPDATING AVATAR!");
|
||||||
|
if(this.updateflag)
|
||||||
{
|
{
|
||||||
//need to send movement info
|
//need to send movement info
|
||||||
//so create the improvedterseobjectupdate packet
|
//so create the improvedterseobjectupdate packet
|
||||||
|
|
@ -75,7 +77,7 @@ namespace OpenSim.world
|
||||||
client.OutPacket(terse);
|
client.OutPacket(terse);
|
||||||
}
|
}
|
||||||
|
|
||||||
updateflag =false;
|
updateflag =false;
|
||||||
this._updateCount = 0;
|
this._updateCount = 0;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
|
|
||||||
|
|
@ -27,11 +27,11 @@ namespace OpenSim.world
|
||||||
name = "(basic entity)";
|
name = "(basic entity)";
|
||||||
children = new List<Entity>();
|
children = new List<Entity>();
|
||||||
}
|
}
|
||||||
public virtual void addFroces()
|
public virtual void addForces()
|
||||||
{
|
{
|
||||||
foreach (Entity child in children)
|
foreach (Entity child in children)
|
||||||
{
|
{
|
||||||
child.addFroces();
|
child.addForces();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
public virtual void update() {
|
public virtual void update() {
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,8 @@ namespace OpenSim.world
|
||||||
|
|
||||||
public void Update()
|
public void Update()
|
||||||
{
|
{
|
||||||
if(this.phyScene.IsThreaded)
|
|
||||||
|
if(this.phyScene.IsThreaded)
|
||||||
{
|
{
|
||||||
this.phyScene.GetResults();
|
this.phyScene.GetResults();
|
||||||
|
|
||||||
|
|
@ -54,7 +55,7 @@ namespace OpenSim.world
|
||||||
|
|
||||||
foreach (libsecondlife.LLUUID UUID in Entities.Keys)
|
foreach (libsecondlife.LLUUID UUID in Entities.Keys)
|
||||||
{
|
{
|
||||||
Entities[UUID].addFroces();
|
Entities[UUID].addForces();
|
||||||
}
|
}
|
||||||
|
|
||||||
this.phyScene.Simulate(timeStep);
|
this.phyScene.Simulate(timeStep);
|
||||||
|
|
@ -87,13 +88,13 @@ namespace OpenSim.world
|
||||||
ServerConsole.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
|
ServerConsole.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Creating new avatar for remote viewer agent");
|
||||||
Avatar NewAvatar = new Avatar(AgentClient);
|
Avatar NewAvatar = new Avatar(AgentClient);
|
||||||
ServerConsole.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Adding new avatar to world");
|
ServerConsole.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Adding new avatar to world");
|
||||||
this.Entities.Add(AgentClient.AgentID, NewAvatar);
|
|
||||||
ServerConsole.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Starting RegionHandshake ");
|
ServerConsole.MainConsole.Instance.WriteLine("World.cs:AddViewerAgent() - Starting RegionHandshake ");
|
||||||
NewAvatar.SendRegionHandshake(this);
|
NewAvatar.SendRegionHandshake(this);
|
||||||
|
|
||||||
NewAvatar.PhysActor = this.phyScene.AddAvatar(new PhysicsVector(NewAvatar.position.X, NewAvatar.position.Y, NewAvatar.position.Z));
|
NewAvatar.PhysActor = this.phyScene.AddAvatar(new PhysicsVector(NewAvatar.position.X, NewAvatar.position.Y, NewAvatar.position.Z));
|
||||||
//this.Update(); // will work for now, but needs to be optimised so we don't update everything in the sim for each new user
|
//this.Update(); // will work for now, but needs to be optimised so we don't update everything in the sim for each new user
|
||||||
}
|
this.Entities.Add(AgentClient.AgentID, NewAvatar);
|
||||||
|
}
|
||||||
|
|
||||||
public bool Backup() {
|
public bool Backup() {
|
||||||
/* TODO: Save the current world entities state. */
|
/* TODO: Save the current world entities state. */
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue