space-wizards/RobustToolbox
1
0
Fork 0
mirror of https://github.com/space-wizards/RobustToolbox.git synced 2026-02-15 03:30:53 +01:00
Code Issues Packages Projects Releases Wiki Activity

Removed all traces of Mogre from the server. Fixed packagebuild.bat.

Browse Source
This commit is contained in:
spoogemonster
2011-06-15 19:23:38 +00:00
parent 6e1a7adbb2
commit b2a7ecd288
14 changed files with 60 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
SS3D_Client/Atom/Atom.cs
View File

@@ -5,6 +5,7 @@ using System.Text;
using Mogre;
using SS3D_shared.HelperClasses;
using SS3D.HelperClasses;
using Lidgren.Network;
namespace SS3D.Atom
@@ -142,7 +143,7 @@ namespace SS3D.Atom
public virtual void HandleInterpolationPacket(NetIncomingMessage message)
{
SS3D_shared.HelperClasses.InterpolationPacket intPacket = new SS3D_shared.HelperClasses.InterpolationPacket(message);
SS3D.HelperClasses.InterpolationPacket intPacket = new SS3D.HelperClasses.InterpolationPacket(message);
// This makes the client discard interpolation packets for the atom the local player is controlling,
// unless the force flag is set. If the force flag is set, the server is trying to correct an issue.

2
SS3D_Client/Modules/Items/ItemManager.cs
View File

@@ -103,7 +103,7 @@ namespace SS3D.Modules.Items
float x = msg.ReadFloat();
float y = msg.ReadFloat();
float z = msg.ReadFloat();
SS3D_shared.HelperClasses.InterpolationPacket intPacket = new SS3D_shared.HelperClasses.InterpolationPacket(x,y,z,0,0,0);
HelperClasses.InterpolationPacket intPacket = new HelperClasses.InterpolationPacket(x,y,z,0,0,0);
itemDict[itemID].interpolationPacket.Add(intPacket);
if (itemDict[itemID].interpolationPacket.Count > 2)

8
SS3D_Client/Modules/Map/MapSaver.cs
View File

@@ -5,7 +5,7 @@ using System.IO;
using Mogre;
using SS3D.HelperClasses;
using SS3D_shared;
using SS3D.Modules.Items;
//using SS3D.Modules.Items;
using System.Xml;
using System.Xml.Serialization;
@@ -94,7 +94,7 @@ namespace SS3D.Modules.Map
// Maybe save / Load in separate threads.
// Support for rotated Items & Objects.
public static void SaveMap(string path, Map map, ItemManager itemManager)
public static void SaveMap(string path, Map map)
{
MapFile MapToSave = new MapFile();
@@ -119,7 +119,7 @@ namespace SS3D.Modules.Map
//Preparing the item data. ADD CHECK FOR PICKED UP ITEMS / ITEMS NOT IN WORLD / ITEMS IN OBJECTS OR OTHER ITEMS (CLOSET?) !!!
MapToSave.ItemData = new ItemData();
MapToSave.ItemData.ItemEntries = new List<ItemEntry>();
foreach(KeyValuePair<ushort, Item> pair in itemManager.itemDict)
/*foreach(KeyValuePair<ushort, Item> pair in itemManager.itemDict)
{
Item currentItem = pair.Value;
ItemEntry newEntry = new ItemEntry();
@@ -127,7 +127,7 @@ namespace SS3D.Modules.Map
newEntry.position = new Vec3f(currentItem.Node.Position.x,currentItem.Node.Position.y,currentItem.Node.Position.z);
newEntry.rotation = new RotaDeg(currentItem.Node.Orientation.Yaw.ValueDegrees, currentItem.Node.Orientation.Pitch.ValueDegrees, currentItem.Node.Orientation.Roll.ValueDegrees);
MapToSave.ItemData.ItemEntries.Add(newEntry);
}
}*/
//Serialize & Write map to file.
if (!Directory.Exists(Path.GetDirectoryName(path))) Directory.CreateDirectory(Path.GetDirectoryName(path));

5
SS3D_Client/SS3D_client.csproj
View File

@@ -130,14 +130,15 @@
<Compile Include="Atom\Mob\Mob.cs" />
<Compile Include="HelperClasses\AtomUtil.cs" />
<Compile Include="HelperClasses\CollisionTools.cs" />
<Compile Include="HelperClasses\InterpolationPacket.cs" />
<Compile Include="HelperClasses\Rect2D.cs" />
<Compile Include="Modules\ConfigManager.cs" />
<Compile Include="Modules\Items\ItemManager.cs" />
<None Include="Modules\Items\ItemManager.cs" />
<Compile Include="Modules\Map\Map.cs" />
<Compile Include="Modules\Map\MapFile.cs" />
<Compile Include="Modules\Map\MapSaver.cs" />
<Compile Include="Modules\MiyagiRessources.cs" />
<Compile Include="Modules\Mobs\MobManager.cs" />
<None Include="Modules\Mobs\MobManager.cs" />
<Compile Include="Modules\Network\NetworkManager.cs" />
<Compile Include="Modules\OgreEventArgs.cs" />
<Compile Include="Modules\OgreManager.cs" />

20
SS3D_Client/States/EditScreen.cs
View File

@@ -7,7 +7,7 @@ using Lidgren.Network;
using SS3D.Modules;
using SS3D.Modules.Map;
using SS3D.Modules.Items;
//using SS3D.Modules.Items;
using SS3D.Modules.Network;
using SS3D_shared;
@@ -32,13 +32,13 @@ namespace SS3D.States
private OgreManager mEngine;
private StateManager mStateMgr;
private Map map;
private ItemManager itemManager;
//private ItemManager itemManager;
private MapSaver mapSaver;
private GUI guiEditOptions;
private GUI guiEditScreen;
private Dictionary<TileType, string> tileList = new Dictionary<TileType, string>();
private TileType newTileType = TileType.None;
private ItemType newItemType = ItemType.None;
//private ItemType newItemType = ItemType.None;
private ushort lastID = 0;
private AtomBaseClass selectedItem;
@@ -86,7 +86,7 @@ namespace SS3D.States
mEngine.Camera.Position = new Mogre.Vector3(0, 300, 0);
mEngine.Camera.LookAt(new Mogre.Vector3(160,64,160));
itemManager = new ItemManager(mEngine, map, mEngine.mNetworkMgr, null);
//itemManager = new ItemManager(mEngine, map, mEngine.mNetworkMgr, null);
AddSetUpButtons();
@@ -101,8 +101,8 @@ namespace SS3D.States
mEngine.mMiyagiSystem.GUIManager.GUIs.Remove(guiEditScreen);
map.Shutdown();
map = null;
itemManager.Shutdown();
itemManager = null;
//itemManager.Shutdown();
//itemManager = null;
}
else
{
@@ -112,7 +112,7 @@ namespace SS3D.States
public override void Update(long _frameTime)
{
itemManager.Update();
//itemManager.Update();
if (inEditor)
{
Point mousePos = mEngine.mMiyagiSystem.InputManager.MouseLocation;
@@ -878,7 +878,7 @@ namespace SS3D.States
private void itemDropDown_SelectedIndexChanged(object sender, EventArgs e)
{
DropDownList ddList = (DropDownList)sender;
newItemType = (ItemType)ddList.SelectedIndex;
//newItemType = (ItemType)ddList.SelectedIndex;
}
private void SaveButtonMouseDown(object sender, MouseButtonEventArgs e)
@@ -1104,7 +1104,7 @@ namespace SS3D.States
}
else if (button == MOIS.MouseButtonID.MB_Right)
{
if (newItemType != ItemType.None)
/*if (newItemType != ItemType.None)
{
//Mogre.Vector3 position = new Mogre.Vector3(SelectedObject.Node.Position.x, 1, SelectedObject.Node.Position.z);
Mogre.Vector3 position = worldPos + new Mogre.Vector3(0, 1, 0);
@@ -1149,7 +1149,7 @@ namespace SS3D.States
selectedItem = SelectedObject;
selectedItem.Node.ShowBoundingBox = true;
}
}
}*/
}
}

6
SS3D_Client/States/EditorScreen.cs
View File

@@ -8,7 +8,7 @@ using Mogre;
using SS3D.Modules;
using SS3D.Modules.UI;
using SS3D.Modules.Map;
using SS3D.Modules.Items;
//using SS3D.Modules.Items;
using SS3D.Modules.Network;
using SS3D_shared;
@@ -30,7 +30,7 @@ namespace SS3D.States
public OgreManager mEngine;
public StateManager mStateMgr;
public ItemManager itemManager;
//public ItemManager itemManager;
public Map currentMap;
public LoadingTracker currentLoadingTracker = null;
@@ -106,7 +106,7 @@ namespace SS3D.States
mEngine.Camera.LookAt(new Mogre.Vector3(160, 64, 160));
currentMap = new Map(mEngine, true);
itemManager = new ItemManager(mEngine, currentMap, mEngine.mNetworkMgr, null);
//itemManager = new ItemManager(mEngine, currentMap, mEngine.mNetworkMgr, null);
toolBar = new EditorToolbar(mStateMgr, this);
mEngine.mMiyagiSystem.GUIManager.GUIs.Add(toolBar);

4
SS3D_Client/States/GameScreen.cs
View File

@@ -6,8 +6,8 @@ using Lidgren.Network;
using SS3D.Modules;
using SS3D.Modules.Map;
using SS3D.Modules.Items;
using SS3D.Modules.Mobs;
//using SS3D.Modules.Items;
//using SS3D.Modules.Mobs;
using SS3D.Modules.Network;
using SS3D.Modules.UI;
using SS3D.Atom;

20
SS3D_shared/ObjectTypeEnum.cs
View File

@@ -10,11 +10,11 @@ public enum AtomType
[AtomClassAttribute(typeof(SS3D_shared.BaseTile))]
Tile, //Walls, floors etc
[AtomClassAttribute(typeof(SS3D_shared.Item))]
Item, //Objects that can be picked up. Crowbar etc.
//[AtomClassAttribute(typeof(SS3D_shared.Item))]
//Item, //Objects that can be picked up. Crowbar etc.
[AtomClassAttribute(typeof(SS3D_shared.Object))]
Object, //Objects that never can be picked up. Doors , computers etc.
//[AtomClassAttribute(typeof(SS3D_shared.Object))]
//Object, //Objects that never can be picked up. Doors , computers etc.
[AtomClassAttribute(typeof(SS3D_shared.AtomBaseClass))]
Mob //Players. Returns atombaseclass until we have a playerclass.
@@ -37,17 +37,17 @@ public enum TileType
public enum ItemType
{
[AtomClassAttribute(typeof(SS3D_shared.Item))]
None = 0,
//[AtomClassAttribute(typeof(SS3D_shared.Item))]
//None = 0,
[AtomClassAttribute(typeof(SS3D_shared.Crowbar))]
Crowbar
//[AtomClassAttribute(typeof(SS3D_shared.Crowbar))]
//Crowbar
}
public enum ObjectType
{
[AtomClassAttribute(typeof(SS3D_shared.Object))]
None = 0
//[AtomClassAttribute(typeof(SS3D_shared.Object))]
//None = 0
}
public enum MobType

11
SS3D_shared/SS3D_shared.csproj
View File

@@ -80,16 +80,15 @@
<Compile Include="Atom\Item\Item.cs" />
<Compile Include="Atom\Mob\Mob.cs" />
<Compile Include="Atom\Mob\Player.cs" />
<Compile Include="HelperClasses\InterpolationPacket.cs" />
<Compile Include="HelperClasses\QueryFlags.cs" />
<Compile Include="HelperClasses\Vector3.cs" />
<Compile Include="Mobs\Mob.cs" />
<Compile Include="Mobs\Player.cs" />
<None Include="Mobs\Mob.cs" />
<None Include="Mobs\Player.cs" />
<Compile Include="ObjectTypeEnum.cs" />
<Compile Include="NetworkEnums.cs" />
<Compile Include="Objects\Items\Crowbar.cs" />
<Compile Include="Objects\Items\Item.cs" />
<Compile Include="Objects\Objects\Object.cs" />
<None Include="Objects\Items\Crowbar.cs" />
<None Include="Objects\Items\Item.cs" />
<None Include="Objects\Objects\Object.cs" />
<Compile Include="Objects\ServerItemInfo.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Tiles\BaseTile.cs" />

3
SS3d_server/Atom/Atom.cs
View File

@@ -2,8 +2,9 @@
using System.Collections.Generic;
using System.Linq;
using System.Text;
using SS3D_shared.HelperClasses;
using SS3d_server.HelperClasses;
using Lidgren.Network;
using SS3D_shared.HelperClasses;
namespace SS3d_server.Atom
{

17
SS3d_server/Modules/Chat/ChatManager.cs
View File

@@ -7,7 +7,7 @@ using Lidgren.Network;
using SS3D_shared;
using SS3D_shared.HelperClasses;
using SS3d_server.Modules.Mobs;
//using SS3d_server.Modules.Mobs;
namespace SS3d_server.Modules.Chat
{
@@ -34,10 +34,8 @@ namespace SS3d_server.Modules.Chat
text = text.Trim(); // Remove whitespace
if (text[0] == '/')
ProcessCommand(text, name, channel, atomID);
SendChatMessage(channel, text, name, atomID);
else
SendChatMessage(channel, text, name, atomID);
}
public void SendChatMessage(ushort channel, string text, string name, ushort atomID)
@@ -63,8 +61,13 @@ namespace SS3d_server.Modules.Chat
string command = args[0];
string message = "Command: " + command;
SendChatMessage(channel, message, name, atomID);
switch (command)
{
default:
string message = "Command '" + command + "' not recognized.";
SendChatMessage(channel, message, name, atomID);
break;
}
}
private void ParseArguments(string text, List<string> args)

4
SS3d_server/SS3DNetserver.cs
View File

@@ -7,8 +7,8 @@ using System.Threading;
using SS3d_server.Modules;
using SS3d_server.Modules.Client;
using SS3d_server.Modules.Map;
using SS3d_server.Modules.Items;
using SS3d_server.Modules.Mobs;
//using SS3d_server.Modules.Items;
//using SS3d_server.Modules.Mobs;
using SS3d_server.Modules.Chat;
using SS3d_server.Atom;

10
SS3d_server/SS3D_server.csproj
View File

@@ -62,11 +62,6 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\References\$(Configuration)\Lidgren.Network.dll</HintPath>
</Reference>
<Reference Include="Mogre, Version=1.7.1.0, Culture=neutral, processorArchitecture=x86">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\References\$(Configuration)\Mogre.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core">
<RequiredTargetFramework>3.5</RequiredTargetFramework>
@@ -89,12 +84,13 @@
<Compile Include="Atom\Mob\HelperClasses\Appendage.cs" />
<Compile Include="Atom\Mob\Human.cs" />
<Compile Include="Atom\Mob\Mob.cs" />
<Compile Include="Helper Classes\InterpolationPacket.cs" />
<Compile Include="Helper Classes\Point.cs" />
<Compile Include="Modules\Chat\ChatManager.cs" />
<Compile Include="Modules\Client\Client.cs" />
<Compile Include="Modules\Items\ItemManager.cs" />
<None Include="Modules\Items\ItemManager.cs" />
<Compile Include="Modules\Map\Map.cs" />
<Compile Include="Modules\Mobs\MobManager.cs" />
<None Include="Modules\Mobs\MobManager.cs" />
<Compile Include="Modules\PlayerManager.cs" />
<Compile Include="Modules\PlayerSession.cs" />
<Compile Include="Program.cs" />

4
packagebuild.bat
View File

@@ -15,4 +15,6 @@ cd %dir%
FOR /F "tokens=*" %%G IN ('DIR /B /AD /S *.svn*') DO RMDIR /S /Q "%%G"
cd ..
%zip% -tzip a %dir%.zip %dir%
rd /S /Q %dir%
rd /S /Q %dir%
pause