Compare commits

...

2 Commits

Author SHA1 Message Date
gareth 8820cbfb13 Imported the broken code 2007-03-02 18:53:53 +00:00
gareth f23a33a727 Added new branch to demonstrate plugins 2007-03-02 18:52:36 +00:00
9 changed files with 155 additions and 2 deletions

View File

@ -37,6 +37,14 @@
<attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/> <attribute type="AssemblyCopyrightAttribute" value="Copyright © OGS development team 2007"/>
</attributes> </attributes>
</asminfo> </asminfo>
<nant>
<buildfiles>
<include name="**/default.build" />
<exclude name="${project::get-buildfile-path()}" />
</buildfiles>
</nant>
<csc target="exe" output="bin/OpenSim.exe" debug="${debug}" verbose="true" warninglevel="4"> <csc target="exe" output="bin/OpenSim.exe" debug="${debug}" verbose="true" warninglevel="4">
<references basedir="bin/" failonempty="true"> <references basedir="bin/" failonempty="true">
<include name="System" /> <include name="System" />

View File

@ -150,6 +150,9 @@ namespace OpenSim
Thread AssetLoaderThread = new Thread(new ThreadStart(AssetLoader)); Thread AssetLoaderThread = new Thread(new ThreadStart(AssetLoader));
AssetLoaderThread.Start(); AssetLoaderThread.Start();
break; break;
case PacketType.AgentUpdate:
ClientAvatar.HandleUpdate((AgentUpdatePacket)Pack);
break;
} }
} }

View File

@ -0,0 +1,66 @@
/*
Copyright (c) OpenSim project, http://osgrid.org/
* All rights reserved.
*
* 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;
using System.Text;
using System.Threading;
using System.Collections;
using System.Collections.Generic;
using libsecondlife;
using libsecondlife.Packets;
using OpenSim.world;
namespace OpenSim
{
public class Physics_Simulation {
private OpenWim.world.World simworld; // The world we are simulating
private Thread PhysicsEngine;
public Physics_Simulation(OpenSim.world.World physical_world) {
this.simworld = physical_world;
// PUT CODE TO INIT PHYSICS ENGINE HERE
PhysicsEngine = new Thread(new ThreadStart(PhysicsThread));
PhysicsEngine.Start();
}
public void Iterate() {
// PUT CODE TO RUN A STEP OF THE SIMULATION HERE
}
public void PhysicsThread() {
Console.WriteLine("Physics_Simulation:PhysicsThread() - Starting thread");
while(true) {
this.Iterate();
simworld.Update();
}
}
}
}

38
src/plugins/default.build Normal file
View File

@ -0,0 +1,38 @@
<?xml version="1.0"?>
<project name="OpenSim-Plugins" default="build" basedir=".">
<description>Builds opensim plugins</description>
<property name="debug" value="true" overwrite="false" />
<target name="clean" description="remove all generated files">
<delete file="../../bin/plugins/*.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">
<csc target="library" output="../../bin/plugins/physics.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="Axiom.MathLib.dll" />
<include name="libsecondlife.dll" />
<include name="log4net.dll" />
<include name="Db4objects.Db4o.dll" />
<include name="world.dll" />
</references>
<sources basedir=".">
<include name="PhysicsEngine.cs" />
</sources>
</csc>
</target>
</project>

View File

@ -9,7 +9,7 @@ namespace OpenSim.world
public class Entity public class Entity
{ {
protected libsecondlife.LLUUID uuid; protected libsecondlife.LLUUID uuid;
protected Vector3 position; protected libsecondlife.LLVector3 position;
protected Vector3 velocity; protected Vector3 velocity;
protected Quaternion rotation; protected Quaternion rotation;
protected string name; protected string name;
@ -18,7 +18,7 @@ namespace OpenSim.world
public Entity() public Entity()
{ {
uuid = new libsecondlife.LLUUID(); uuid = new libsecondlife.LLUUID();
position = new Vector3(); position = new libsecondlife.LLVector3();
velocity = new Vector3(); velocity = new Vector3();
rotation = new Quaternion(); rotation = new Quaternion();
name = "(basic entity)"; name = "(basic entity)";

38
src/world/default.build Normal file
View File

@ -0,0 +1,38 @@
<?xml version="1.0"?>
<project name="OpenSim-world" default="build" basedir=".">
<description>Builds opensim world library</description>
<property name="debug" value="true" overwrite="false" />
<target name="clean" description="remove all generated files">
<delete file="../../bin/world.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">
<csc target="library" output="../../bin/world.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="Axiom.MathLib.dll" />
<include name="libsecondlife.dll" />
<include name="log4net.dll" />
<include name="Db4objects.Db4o.dll" />
</references>
<sources basedir=".">
<include name="*.cs" />
<include name="types/*.cs" />
</sources>
</csc>
</target>
</project>