Menu
▾
▴
cs-sdl-commits
|
From: <je...@us...> - 2007-05-30 20:18:02
|
Revision: 1409
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1409&view=rev
Author: jendave
Date: 2007-05-30 13:18:00 -0700 (Wed, 30 May 2007)
Log Message:
-----------
update to .NET 2.0. All the enet functionality does not work anymore.
Modified Paths:
--------------
trunk/Mezzanine/Mezzanine/GameMain.cs
trunk/Mezzanine/Mezzanine/Mezzanine.csproj
trunk/Mezzanine/Mezzanine.sln
trunk/Mezzanine/MezzanineLib/GameInit.cs
trunk/Mezzanine/MezzanineLib/MezzanineLib.csproj
trunk/Mezzanine/MezzanineLib/Render/RenderGl.cs
trunk/Mezzanine/MezzanineLib/Support/Sound.cs
trunk/Mezzanine/MezzanineManagedLib/MezzanineManagedLib.vcproj
trunk/Mezzanine/MezzanineManagedLib/enet/host.c
trunk/Mezzanine/MezzanineManagedLib/enet/include/enet/list.h
trunk/Mezzanine/MezzanineManagedLib/enet/list.c
trunk/Mezzanine/MezzanineManagedLib/enet/peer.c
trunk/Mezzanine/MezzanineManagedLib/enet/protocol.c
trunk/Mezzanine/MezzanineManagedLib/src/console.cpp
trunk/Mezzanine/MezzanineManagedLib/src/editing.cpp
trunk/Mezzanine/MezzanineManagedLib/src/menus.cpp
trunk/Mezzanine/MezzanineManagedLib/src/worldio.cpp
trunk/Mezzanine/lib/SdlDotNet.dll
trunk/Mezzanine/lib/SdlDotNet.xml
trunk/Mezzanine/lib/Tao.OpenGl.dll
trunk/Mezzanine/lib/Tao.Sdl.dll
Added Paths:
-----------
trunk/Mezzanine/lib/Tao.OpenGl.License.txt
trunk/Mezzanine/lib/Tao.OpenGl.Readme.txt
trunk/Mezzanine/lib/Tao.OpenGl.dll.config
trunk/Mezzanine/lib/Tao.OpenGl.xml
trunk/Mezzanine/lib/Tao.Sdl.License.txt
trunk/Mezzanine/lib/Tao.Sdl.dll.config
Removed Paths:
-------------
trunk/Mezzanine/lib/Tao.OpenGl.ExtensionLoader.dll
trunk/Mezzanine/lib/Tao.OpenGl.ExtensionLoader.xml
trunk/Mezzanine/lib/Tao.OpenGl.Glu.dll
trunk/Mezzanine/lib/Tao.OpenGl.Glu.xml
Modified: trunk/Mezzanine/Mezzanine/GameMain.cs
===================================================================
--- trunk/Mezzanine/Mezzanine/GameMain.cs 2007-05-30 19:56:49 UTC (rev 1408)
+++ trunk/Mezzanine/Mezzanine/GameMain.cs 2007-05-30 20:18:00 UTC (rev 1409)
@@ -36,7 +36,10 @@
using System.IO;
using Tao.Sdl;
using Tao.OpenGl;
-using SdlDotNet;
+using SdlDotNet.Core;
+using SdlDotNet.Input;
+using SdlDotNet.Graphics;
+using SdlDotNet.Audio;
using System.Runtime.InteropServices;
using MezzanineLib;
@@ -155,7 +158,7 @@
{
Video.GrabInput = true;
}
- Video.SetVideoModeWindowOpenGL(GameInit.ScreenWidth, GameInit.ScreenHeight);
+ Video.SetVideoMode(GameInit.ScreenWidth, GameInit.ScreenHeight, false, true);
MezzanineLib.GameInit.Log("video: misc");
Keyboard.KeyRepeat = false;
@@ -212,13 +215,13 @@
MezzanineLib.Bindings.changemap("metl3");
MezzanineLib.GameInit.Log("mainloop");
- Events.KeyboardDown += new KeyboardEventHandler(this.KeyDown);
- Events.KeyboardUp += new KeyboardEventHandler(this.KeyUp);
- Events.Tick += new TickEventHandler(this.Tick);
- Events.Quit += new QuitEventHandler(this.Quit);
- Events.MouseMotion += new MouseMotionEventHandler(this.MouseMotion);
- Events.MouseButtonUp += new MouseButtonEventHandler(this.MouseButtonUp);
- Events.MouseButtonDown += new MouseButtonEventHandler(this.MouseButtonDown);
+ Events.KeyboardDown += new EventHandler<KeyboardEventArgs>(this.KeyDown);
+ Events.KeyboardUp += new EventHandler<KeyboardEventArgs>(this.KeyUp);
+ Events.Tick += new EventHandler<TickEventArgs>(this.Tick);
+ Events.Quit += new EventHandler<QuitEventArgs>(this.Quit);
+ Events.MouseMotion += new EventHandler<MouseMotionEventArgs>(this.MouseMotion);
+ Events.MouseButtonUp += new EventHandler<MouseButtonEventArgs>(this.MouseButtonUp);
+ Events.MouseButtonDown += new EventHandler<MouseButtonEventArgs>(this.MouseButtonDown);
Events.Run();
}
private void Tick(object sender, TickEventArgs e)
Modified: trunk/Mezzanine/Mezzanine/Mezzanine.csproj
===================================================================
--- trunk/Mezzanine/Mezzanine/Mezzanine.csproj 2007-05-30 19:56:49 UTC (rev 1408)
+++ trunk/Mezzanine/Mezzanine/Mezzanine.csproj 2007-05-30 20:18:00 UTC (rev 1409)
@@ -1,139 +1,122 @@
-<VisualStudioProject>
- <CSHARP
- ProjectType = "Local"
- ProductVersion = "7.10.3077"
- SchemaVersion = "2.0"
- ProjectGuid = "{456AA9A9-6B2C-4710-97A8-8DC7CB2D7A35}"
- >
- <Build>
- <Settings
- ApplicationIcon = "App.ico"
- AssemblyKeyContainerName = ""
- AssemblyName = "Mezzanine"
- AssemblyOriginatorKeyFile = ""
- DefaultClientScript = "JScript"
- DefaultHTMLPageLayout = "Grid"
- DefaultTargetSchema = "IE50"
- DelaySign = "false"
- OutputType = "WinExe"
- PreBuildEvent = ""
- PostBuildEvent = ""
- RootNamespace = "Mezzanine"
- RunPostBuildEvent = "OnBuildSuccess"
- StartupObject = "Mezzanine.GameMain"
- >
- <Config
- Name = "Debug"
- AllowUnsafeBlocks = "false"
- BaseAddress = "285212672"
- CheckForOverflowUnderflow = "false"
- ConfigurationOverrideFile = ""
- DefineConstants = "DEBUG;TRACE"
- DocumentationFile = ""
- DebugSymbols = "true"
- FileAlignment = "4096"
- IncrementalBuild = "false"
- NoStdLib = "false"
- NoWarn = ""
- Optimize = "false"
- OutputPath = "bin\Debug\"
- RegisterForComInterop = "false"
- RemoveIntegerChecks = "false"
- TreatWarningsAsErrors = "false"
- WarningLevel = "4"
- />
- <Config
- Name = "Release"
- AllowUnsafeBlocks = "false"
- BaseAddress = "285212672"
- CheckForOverflowUnderflow = "false"
- ConfigurationOverrideFile = ""
- DefineConstants = "TRACE"
- DocumentationFile = ""
- DebugSymbols = "false"
- FileAlignment = "4096"
- IncrementalBuild = "false"
- NoStdLib = "false"
- NoWarn = ""
- Optimize = "true"
- OutputPath = "bin\Release\"
- RegisterForComInterop = "false"
- RemoveIntegerChecks = "false"
- TreatWarningsAsErrors = "false"
- WarningLevel = "4"
- />
- </Settings>
- <References>
- <Reference
- Name = "System"
- AssemblyName = "System"
- HintPath = "..\..\..\..\..\..\WINNT\Microsoft.NET\Framework\v1.1.4322\System.dll"
- />
- <Reference
- Name = "System.Data"
- AssemblyName = "System.Data"
- HintPath = "..\..\..\..\..\..\WINNT\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
- />
- <Reference
- Name = "System.XML"
- AssemblyName = "System.Xml"
- HintPath = "..\..\..\..\..\..\WINNT\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
- />
- <Reference
- Name = "Tao.OpenGl.Glu"
- AssemblyName = "Tao.OpenGl.Glu"
- HintPath = "..\lib\Tao.OpenGl.Glu.dll"
- />
- <Reference
- Name = "Tao.OpenGl"
- AssemblyName = "Tao.OpenGl"
- HintPath = "..\lib\Tao.OpenGl.dll"
- />
- <Reference
- Name = "Tao.OpenGl.ExtensionLoader"
- AssemblyName = "Tao.OpenGl.ExtensionLoader"
- HintPath = "..\lib\Tao.OpenGl.ExtensionLoader.dll"
- />
- <Reference
- Name = "SdlDotNet"
- AssemblyName = "SdlDotNet"
- HintPath = "..\lib\SdlDotNet.dll"
- />
- <Reference
- Name = "MezzanineLib"
- Project = "{DF0A7A59-91FA-438C-B859-D35C3963A553}"
- Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
- />
- <Reference
- Name = "MezzanineManagedLib"
- Project = "{7923259E-4B01-4566-9B36-EA5173A0C60C}"
- Package = "{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}"
- />
- <Reference
- Name = "Tao.Sdl"
- AssemblyName = "Tao.Sdl"
- HintPath = "..\lib\Tao.Sdl.dll"
- />
- </References>
- </Build>
- <Files>
- <Include>
- <File
- RelPath = "App.ico"
- BuildAction = "EmbeddedResource"
- />
- <File
- RelPath = "AssemblyInfo.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "GameMain.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- </Include>
- </Files>
- </CSHARP>
-</VisualStudioProject>
-
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectType>Local</ProjectType>
+ <ProductVersion>8.0.50727</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{456AA9A9-6B2C-4710-97A8-8DC7CB2D7A35}</ProjectGuid>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ApplicationIcon>App.ico</ApplicationIcon>
+ <AssemblyKeyContainerName>
+ </AssemblyKeyContainerName>
+ <AssemblyName>Mezzanine</AssemblyName>
+ <AssemblyOriginatorKeyFile>
+ </AssemblyOriginatorKeyFile>
+ <DefaultClientScript>JScript</DefaultClientScript>
+ <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+ <DefaultTargetSchema>IE50</DefaultTargetSchema>
+ <DelaySign>false</DelaySign>
+ <OutputType>WinExe</OutputType>
+ <RootNamespace>Mezzanine</RootNamespace>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+ <StartupObject>Mezzanine.GameMain</StartupObject>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <OutputPath>bin\Debug\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DocumentationFile>
+ </DocumentationFile>
+ <DebugSymbols>true</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn>
+ </NoWarn>
+ <Optimize>false</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>full</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <OutputPath>bin\Release\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>TRACE</DefineConstants>
+ <DocumentationFile>
+ </DocumentationFile>
+ <DebugSymbols>false</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn>
+ </NoWarn>
+ <Optimize>true</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>none</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="SdlDotNet, Version=6.0.0.0, Culture=neutral, PublicKeyToken=26ad4f7e10c61408, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\lib\SdlDotNet.dll</HintPath>
+ </Reference>
+ <Reference Include="System">
+ <Name>System</Name>
+ </Reference>
+ <Reference Include="System.Data">
+ <Name>System.Data</Name>
+ </Reference>
+ <Reference Include="System.Xml">
+ <Name>System.XML</Name>
+ </Reference>
+ <Reference Include="Tao.OpenGl, Version=2.1.0.4, Culture=neutral, PublicKeyToken=1ca010269a4501ef, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\lib\Tao.OpenGl.dll</HintPath>
+ </Reference>
+ <Reference Include="Tao.Sdl, Version=1.2.11.1, Culture=neutral, PublicKeyToken=9c7a200e36c0094e, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\lib\Tao.Sdl.dll</HintPath>
+ </Reference>
+ <ProjectReference Include="..\MezzanineLib\MezzanineLib.csproj">
+ <Name>MezzanineLib</Name>
+ <Project>{DF0A7A59-91FA-438C-B859-D35C3963A553}</Project>
+ <Package>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</Package>
+ </ProjectReference>
+ <ProjectReference Include="..\MezzanineManagedLib\MezzanineManagedLib.vcproj">
+ <Project>{7923259E-4B01-4566-9B36-EA5173A0C60C}</Project>
+ <Name>MezzanineManagedLib</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="App.ico" />
+ <Compile Include="AssemblyInfo.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="GameMain.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <PropertyGroup>
+ <PreBuildEvent>
+ </PreBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
Modified: trunk/Mezzanine/Mezzanine.sln
===================================================================
--- trunk/Mezzanine/Mezzanine.sln 2007-05-30 19:56:49 UTC (rev 1408)
+++ trunk/Mezzanine/Mezzanine.sln 2007-05-30 20:18:00 UTC (rev 1409)
@@ -1,45 +1,74 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
+Microsoft Visual Studio Solution File, Format Version 9.00
+# Visual Studio 2005
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mezzanine", "Mezzanine\Mezzanine.csproj", "{456AA9A9-6B2C-4710-97A8-8DC7CB2D7A35}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MezzanineLib", "MezzanineLib\MezzanineLib.csproj", "{DF0A7A59-91FA-438C-B859-D35C3963A553}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MezzanineManagedLib", "MezzanineManagedLib\MezzanineManagedLib.vcproj", "{7923259E-4B01-4566-9B36-EA5173A0C60C}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
EndProject
Global
- GlobalSection(SolutionConfiguration) = preSolution
- Debug = Debug
- Profile = Profile
- Release = Release
+ GlobalSection(SolutionConfigurationPlatforms) = preSolution
+ Debug|Any CPU = Debug|Any CPU
+ Debug|Mixed Platforms = Debug|Mixed Platforms
+ Debug|Win32 = Debug|Win32
+ Profile|Any CPU = Profile|Any CPU
+ Profile|Mixed Platforms = Profile|Mixed Platforms
+ Profile|Win32 = Profile|Win32
+ Release|Any CPU = Release|Any CPU
+ Release|Mixed Platforms = Release|Mixed Platforms
+ Release|Win32 = Release|Win32
EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {456AA9A9-6B2C-4710-97A8-8DC7CB2D7A35}.Debug.ActiveCfg = Debug|.NET
- {456AA9A9-6B2C-4710-97A8-8DC7CB2D7A35}.Debug.Build.0 = Debug|.NET
- {456AA9A9-6B2C-4710-97A8-8DC7CB2D7A35}.Profile.ActiveCfg = Release|.NET
- {456AA9A9-6B2C-4710-97A8-8DC7CB2D7A35}.Profile.Build.0 = Release|.NET
- {456AA9A9-6B2C-4710-97A8-8DC7CB2D7A35}.Release.ActiveCfg = Release|.NET
- {456AA9A9-6B2C-4710-97A8-8DC7CB2D7A35}.Release.Build.0 = Release|.NET
- {DF0A7A59-91FA-438C-B859-D35C3963A553}.Debug.ActiveCfg = Debug|.NET
- {DF0A7A59-91FA-438C-B859-D35C3963A553}.Debug.Build.0 = Debug|.NET
- {DF0A7A59-91FA-438C-B859-D35C3963A553}.Profile.ActiveCfg = Release|.NET
- {DF0A7A59-91FA-438C-B859-D35C3963A553}.Profile.Build.0 = Release|.NET
- {DF0A7A59-91FA-438C-B859-D35C3963A553}.Release.ActiveCfg = Release|.NET
- {DF0A7A59-91FA-438C-B859-D35C3963A553}.Release.Build.0 = Release|.NET
- {7923259E-4B01-4566-9B36-EA5173A0C60C}.Debug.ActiveCfg = Debug|Win32
- {7923259E-4B01-4566-9B36-EA5173A0C60C}.Debug.Build.0 = Debug|Win32
- {7923259E-4B01-4566-9B36-EA5173A0C60C}.Profile.ActiveCfg = Profile|Win32
- {7923259E-4B01-4566-9B36-EA5173A0C60C}.Profile.Build.0 = Profile|Win32
- {7923259E-4B01-4566-9B36-EA5173A0C60C}.Release.ActiveCfg = Release|Win32
- {7923259E-4B01-4566-9B36-EA5173A0C60C}.Release.Build.0 = Release|Win32
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {456AA9A9-6B2C-4710-97A8-8DC7CB2D7A35}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {456AA9A9-6B2C-4710-97A8-8DC7CB2D7A35}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {456AA9A9-6B2C-4710-97A8-8DC7CB2D7A35}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {456AA9A9-6B2C-4710-97A8-8DC7CB2D7A35}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {456AA9A9-6B2C-4710-97A8-8DC7CB2D7A35}.Debug|Win32.ActiveCfg = Debug|Any CPU
+ {456AA9A9-6B2C-4710-97A8-8DC7CB2D7A35}.Profile|Any CPU.ActiveCfg = Release|Any CPU
+ {456AA9A9-6B2C-4710-97A8-8DC7CB2D7A35}.Profile|Any CPU.Build.0 = Release|Any CPU
+ {456AA9A9-6B2C-4710-97A8-8DC7CB2D7A35}.Profile|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {456AA9A9-6B2C-4710-97A8-8DC7CB2D7A35}.Profile|Mixed Platforms.Build.0 = Release|Any CPU
+ {456AA9A9-6B2C-4710-97A8-8DC7CB2D7A35}.Profile|Win32.ActiveCfg = Release|Any CPU
+ {456AA9A9-6B2C-4710-97A8-8DC7CB2D7A35}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {456AA9A9-6B2C-4710-97A8-8DC7CB2D7A35}.Release|Any CPU.Build.0 = Release|Any CPU
+ {456AA9A9-6B2C-4710-97A8-8DC7CB2D7A35}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {456AA9A9-6B2C-4710-97A8-8DC7CB2D7A35}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {456AA9A9-6B2C-4710-97A8-8DC7CB2D7A35}.Release|Win32.ActiveCfg = Release|Any CPU
+ {DF0A7A59-91FA-438C-B859-D35C3963A553}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {DF0A7A59-91FA-438C-B859-D35C3963A553}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {DF0A7A59-91FA-438C-B859-D35C3963A553}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {DF0A7A59-91FA-438C-B859-D35C3963A553}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {DF0A7A59-91FA-438C-B859-D35C3963A553}.Debug|Win32.ActiveCfg = Debug|Any CPU
+ {DF0A7A59-91FA-438C-B859-D35C3963A553}.Profile|Any CPU.ActiveCfg = Release|Any CPU
+ {DF0A7A59-91FA-438C-B859-D35C3963A553}.Profile|Any CPU.Build.0 = Release|Any CPU
+ {DF0A7A59-91FA-438C-B859-D35C3963A553}.Profile|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {DF0A7A59-91FA-438C-B859-D35C3963A553}.Profile|Mixed Platforms.Build.0 = Release|Any CPU
+ {DF0A7A59-91FA-438C-B859-D35C3963A553}.Profile|Win32.ActiveCfg = Release|Any CPU
+ {DF0A7A59-91FA-438C-B859-D35C3963A553}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {DF0A7A59-91FA-438C-B859-D35C3963A553}.Release|Any CPU.Build.0 = Release|Any CPU
+ {DF0A7A59-91FA-438C-B859-D35C3963A553}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {DF0A7A59-91FA-438C-B859-D35C3963A553}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {DF0A7A59-91FA-438C-B859-D35C3963A553}.Release|Win32.ActiveCfg = Release|Any CPU
+ {7923259E-4B01-4566-9B36-EA5173A0C60C}.Debug|Any CPU.ActiveCfg = Debug|Win32
+ {7923259E-4B01-4566-9B36-EA5173A0C60C}.Debug|Mixed Platforms.ActiveCfg = Debug|Win32
+ {7923259E-4B01-4566-9B36-EA5173A0C60C}.Debug|Mixed Platforms.Build.0 = Debug|Win32
+ {7923259E-4B01-4566-9B36-EA5173A0C60C}.Debug|Win32.ActiveCfg = Debug|Win32
+ {7923259E-4B01-4566-9B36-EA5173A0C60C}.Debug|Win32.Build.0 = Debug|Win32
+ {7923259E-4B01-4566-9B36-EA5173A0C60C}.Profile|Any CPU.ActiveCfg = Profile|Win32
+ {7923259E-4B01-4566-9B36-EA5173A0C60C}.Profile|Mixed Platforms.ActiveCfg = Profile|Win32
+ {7923259E-4B01-4566-9B36-EA5173A0C60C}.Profile|Mixed Platforms.Build.0 = Profile|Win32
+ {7923259E-4B01-4566-9B36-EA5173A0C60C}.Profile|Win32.ActiveCfg = Profile|Win32
+ {7923259E-4B01-4566-9B36-EA5173A0C60C}.Profile|Win32.Build.0 = Profile|Win32
+ {7923259E-4B01-4566-9B36-EA5173A0C60C}.Release|Any CPU.ActiveCfg = Release|Win32
+ {7923259E-4B01-4566-9B36-EA5173A0C60C}.Release|Mixed Platforms.ActiveCfg = Release|Win32
+ {7923259E-4B01-4566-9B36-EA5173A0C60C}.Release|Mixed Platforms.Build.0 = Release|Win32
+ {7923259E-4B01-4566-9B36-EA5173A0C60C}.Release|Win32.ActiveCfg = Release|Win32
+ {7923259E-4B01-4566-9B36-EA5173A0C60C}.Release|Win32.Build.0 = Release|Win32
EndGlobalSection
+ GlobalSection(SolutionProperties) = preSolution
+ HideSolutionNode = FALSE
+ EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
DPBuild = 5
EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
- EndGlobalSection
EndGlobal
Modified: trunk/Mezzanine/MezzanineLib/GameInit.cs
===================================================================
--- trunk/Mezzanine/MezzanineLib/GameInit.cs 2007-05-30 19:56:49 UTC (rev 1408)
+++ trunk/Mezzanine/MezzanineLib/GameInit.cs 2007-05-30 20:18:00 UTC (rev 1409)
@@ -34,7 +34,9 @@
using System.IO;
using Tao.Sdl;
using Tao.OpenGl;
-using SdlDotNet;
+using SdlDotNet.Input;
+using SdlDotNet.Graphics;
+using SdlDotNet.Core;
using System.Runtime.InteropServices;
using MezzanineLib.ClientServer;
using MezzanineLib.Render;
@@ -525,7 +527,7 @@
//Note that the openGL surface is flip upside down and the bits are reversed. These lines correct that.
Surface temp = new Surface(ScreenWidth, ScreenHeight, 24, 0x0000FF, 0x00FF00, 0xFF0000, 0);
Gl.glReadPixels(0, 0, ScreenWidth, ScreenHeight, Gl.GL_RGB, Gl.GL_UNSIGNED_BYTE, temp.Pixels);
- temp.FlipVertical();
+ temp = temp.CreateFlippedVerticalSurface();
temp.SaveBmp("screenshots/screenshot_"+Timer.TicksElapsed.ToString()+".bmp");
temp.Dispose();
}
Modified: trunk/Mezzanine/MezzanineLib/MezzanineLib.csproj
===================================================================
--- trunk/Mezzanine/MezzanineLib/MezzanineLib.csproj 2007-05-30 19:56:49 UTC (rev 1408)
+++ trunk/Mezzanine/MezzanineLib/MezzanineLib.csproj 2007-05-30 20:18:00 UTC (rev 1409)
@@ -1,290 +1,213 @@
-<VisualStudioProject>
- <CSHARP
- ProjectType = "Local"
- ProductVersion = "7.10.3077"
- SchemaVersion = "2.0"
- ProjectGuid = "{DF0A7A59-91FA-438C-B859-D35C3963A553}"
- >
- <Build>
- <Settings
- ApplicationIcon = ""
- AssemblyKeyContainerName = ""
- AssemblyName = "MezzanineLib"
- AssemblyOriginatorKeyFile = ""
- DefaultClientScript = "JScript"
- DefaultHTMLPageLayout = "Grid"
- DefaultTargetSchema = "IE50"
- DelaySign = "false"
- OutputType = "Library"
- PreBuildEvent = ""
- PostBuildEvent = ""
- RootNamespace = "MezzanineLib"
- RunPostBuildEvent = "OnBuildSuccess"
- StartupObject = ""
- >
- <Config
- Name = "Debug"
- AllowUnsafeBlocks = "false"
- BaseAddress = "285212672"
- CheckForOverflowUnderflow = "false"
- ConfigurationOverrideFile = ""
- DefineConstants = "DEBUG;TRACE"
- DocumentationFile = ""
- DebugSymbols = "true"
- FileAlignment = "4096"
- IncrementalBuild = "false"
- NoStdLib = "false"
- NoWarn = ""
- Optimize = "false"
- OutputPath = "bin\Debug\"
- RegisterForComInterop = "false"
- RemoveIntegerChecks = "false"
- TreatWarningsAsErrors = "false"
- WarningLevel = "4"
- />
- <Config
- Name = "Release"
- AllowUnsafeBlocks = "false"
- BaseAddress = "285212672"
- CheckForOverflowUnderflow = "false"
- ConfigurationOverrideFile = ""
- DefineConstants = "TRACE"
- DocumentationFile = ""
- DebugSymbols = "false"
- FileAlignment = "4096"
- IncrementalBuild = "false"
- NoStdLib = "false"
- NoWarn = ""
- Optimize = "true"
- OutputPath = "bin\Release\"
- RegisterForComInterop = "false"
- RemoveIntegerChecks = "false"
- TreatWarningsAsErrors = "false"
- WarningLevel = "4"
- />
- </Settings>
- <References>
- <Reference
- Name = "System"
- AssemblyName = "System"
- HintPath = "..\..\..\..\..\..\WINNT\Microsoft.NET\Framework\v1.1.4322\System.dll"
- />
- <Reference
- Name = "System.Data"
- AssemblyName = "System.Data"
- HintPath = "..\..\..\..\..\..\WINNT\Microsoft.NET\Framework\v1.1.4322\System.Data.dll"
- />
- <Reference
- Name = "System.XML"
- AssemblyName = "System.Xml"
- HintPath = "..\..\..\..\..\..\WINNT\Microsoft.NET\Framework\v1.1.4322\System.XML.dll"
- />
- <Reference
- Name = "SdlDotNet"
- AssemblyName = "SdlDotNet"
- HintPath = "..\lib\SdlDotNet.dll"
- />
- <Reference
- Name = "Tao.OpenGl.ExtensionLoader"
- AssemblyName = "Tao.OpenGl.ExtensionLoader"
- HintPath = "..\lib\Tao.OpenGl.ExtensionLoader.dll"
- />
- <Reference
- Name = "Tao.OpenGl.Glu"
- AssemblyName = "Tao.OpenGl.Glu"
- HintPath = "..\lib\Tao.OpenGl.Glu.dll"
- />
- <Reference
- Name = "Tao.OpenGl"
- AssemblyName = "Tao.OpenGl"
- HintPath = "..\lib\Tao.OpenGl.dll"
- />
- <Reference
- Name = "System.Drawing"
- AssemblyName = "System.Drawing"
- HintPath = "..\..\..\..\..\..\WINNT\Microsoft.NET\Framework\v1.1.4322\System.Drawing.dll"
- />
- <Reference
- Name = "Tao.Sdl"
- AssemblyName = "Tao.Sdl"
- HintPath = "..\lib\Tao.Sdl.dll"
- />
- </References>
- </Build>
- <Files>
- <Include>
- <File
- RelPath = "AssemblyInfo.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "Bindings.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "Enumerations.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "GameInit.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "ClientServer\Client.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "ClientServer\ClientExtras.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "ClientServer\ClientGame.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "ClientServer\Clients2C.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "ClientServer\Server.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "ClientServer\ServerBrowser.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "ClientServer\ServerMS.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "ClientServer\ServerUtil.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "Game\Entities.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "Game\Monster.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "Game\Physics.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "Game\SaveGameDemo.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "Game\Weapon.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "Render\RenderCubes.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "Render\RenderExtras.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "Render\RenderGl.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "Render\RenderMD2.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "Render\RenderParticles.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "Render\RenderText.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "Support\Command.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "Support\Console.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "Support\Menus.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "Support\Sound.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "Support\Tools.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "World\Editing.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "World\World.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "World\WorldIO.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "World\WorldLight.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "World\WorldOcull.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- <File
- RelPath = "World\WorldRender.cs"
- SubType = "Code"
- BuildAction = "Compile"
- />
- </Include>
- </Files>
- </CSHARP>
-</VisualStudioProject>
-
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <ProjectType>Local</ProjectType>
+ <ProductVersion>8.0.50727</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{DF0A7A59-91FA-438C-B859-D35C3963A553}</ProjectGuid>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ApplicationIcon>
+ </ApplicationIcon>
+ <AssemblyKeyContainerName>
+ </AssemblyKeyContainerName>
+ <AssemblyName>MezzanineLib</AssemblyName>
+ <AssemblyOriginatorKeyFile>
+ </AssemblyOriginatorKeyFile>
+ <DefaultClientScript>JScript</DefaultClientScript>
+ <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
+ <DefaultTargetSchema>IE50</DefaultTargetSchema>
+ <DelaySign>false</DelaySign>
+ <OutputType>Library</OutputType>
+ <RootNamespace>MezzanineLib</RootNamespace>
+ <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+ <StartupObject>
+ </StartupObject>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <UpgradeBackupLocation>
+ </UpgradeBackupLocation>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <OutputPath>bin\Debug\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>DEBUG;TRACE</DefineConstants>
+ <DocumentationFile>
+ </DocumentationFile>
+ <DebugSymbols>true</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn>
+ </NoWarn>
+ <Optimize>false</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>full</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <OutputPath>bin\Release\</OutputPath>
+ <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
+ <BaseAddress>285212672</BaseAddress>
+ <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
+ <ConfigurationOverrideFile>
+ </ConfigurationOverrideFile>
+ <DefineConstants>TRACE</DefineConstants>
+ <DocumentationFile>
+ </DocumentationFile>
+ <DebugSymbols>false</DebugSymbols>
+ <FileAlignment>4096</FileAlignment>
+ <NoStdLib>false</NoStdLib>
+ <NoWarn>
+ </NoWarn>
+ <Optimize>true</Optimize>
+ <RegisterForComInterop>false</RegisterForComInterop>
+ <RemoveIntegerChecks>false</RemoveIntegerChecks>
+ <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
+ <WarningLevel>4</WarningLevel>
+ <DebugType>none</DebugType>
+ <ErrorReport>prompt</ErrorReport>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="SdlDotNet, Version=6.0.0.0, Culture=neutral, PublicKeyToken=26ad4f7e10c61408, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\lib\SdlDotNet.dll</HintPath>
+ </Reference>
+ <Reference Include="System">
+ <Name>System</Name>
+ </Reference>
+ <Reference Include="System.Data">
+ <Name>System.Data</Name>
+ </Reference>
+ <Reference Include="System.Drawing">
+ <Name>System.Drawing</Name>
+ </Reference>
+ <Reference Include="System.Xml">
+ <Name>System.XML</Name>
+ </Reference>
+ <Reference Include="Tao.OpenGl, Version=2.1.0.4, Culture=neutral, PublicKeyToken=1ca010269a4501ef, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\lib\Tao.OpenGl.dll</HintPath>
+ </Reference>
+ <Reference Include="Tao.Sdl, Version=1.2.11.1, Culture=neutral, PublicKeyToken=9c7a200e36c0094e, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\lib\Tao.Sdl.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="AssemblyInfo.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Bindings.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="ClientServer\Client.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="ClientServer\ClientExtras.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="ClientServer\ClientGame.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="ClientServer\Clients2C.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="ClientServer\Server.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="ClientServer\ServerBrowser.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="ClientServer\ServerMS.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="ClientServer\ServerUtil.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Enumerations.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="GameInit.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Game\Entities.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Game\Monster.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Game\Physics.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Game\SaveGameDemo.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Game\Weapon.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Render\RenderCubes.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Render\RenderExtras.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Render\RenderGl.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Render\RenderMD2.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Render\RenderParticles.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Render\RenderText.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Support\Command.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Support\Console.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Support\Menus.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Support\Sound.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="Support\Tools.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="World\Editing.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="World\World.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="World\WorldIO.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="World\WorldLight.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="World\WorldOcull.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ <Compile Include="World\WorldRender.cs">
+ <SubType>Code</SubType>
+ </Compile>
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <PropertyGroup>
+ <PreBuildEvent>
+ </PreBuildEvent>
+ <PostBuildEvent>
+ </PostBuildEvent>
+ </PropertyGroup>
+</Project>
\ No newline at end of file
Modified: trunk/Mezzanine/MezzanineLib/Render/RenderGl.cs
===================================================================
--- trunk/Mezzanine/MezzanineLib/Render/RenderGl.cs 2007-05-30 19:56:49 UTC (rev 1408)
+++ trunk/Mezzanine/MezzanineLib/Render/RenderGl.cs 2007-05-30 20:18:00 UTC (rev 1409)
@@ -37,7 +37,7 @@
using System.IO;
using Tao.Sdl;
using Tao.OpenGl;
-using SdlDotNet;
+using SdlDotNet.Graphics;
using System.Runtime.InteropServices;
namespace MezzanineLib.Render
@@ -45,7 +45,7 @@
public sealed class RenderGl
{
static Glu.GLUquadric qsphere;
- static int glmaxtexsize = 256;
+ static int[] glmaxtexsize = { 256 };
static bool hasOverBright = false;
static string[] hudGunNames =
{
@@ -327,12 +327,12 @@
Gl.glCullFace(Gl.GL_FRONT);
Gl.glEnable(Gl.GL_CULL_FACE);
- IntPtr exts = Gl.glGetString(Gl.GL_EXTENSIONS);
+ string exts = Gl.glGetString(Gl.GL_EXTENSIONS);
//if(strstr(exts, "GL_EXT_texture_env_combine")) hasoverbright = true;
//else conoutf("WARNING: cannot use overbright lighting, using old lighting model!");
- Gl.glGetIntegerv(Gl.GL_MAX_TEXTURE_SIZE, out glmaxtexsize);
+ Gl.glGetIntegerv(Gl.GL_MAX_TEXTURE_SIZE, glmaxtexsize);
PurgeTextures();
@@ -540,7 +540,7 @@
Gl.glTexEnvi(Gl.GL_TEXTURE_ENV, Gl.GL_TEXTURE_ENV_MODE, Gl.GL_MODULATE);
xs = s.Width;
ys = s.Height;
- while(xs>glmaxtexsize || ys>glmaxtexsize)
+ while(xs>glmaxtexsize[0] || ys>glmaxtexsize[0])
{
xs /= 2;
ys /= 2;
Modified: trunk/Mezzanine/MezzanineLib/Support/Sound.cs
===================================================================
--- trunk/Mezzanine/MezzanineLib/Support/Sound.cs 2007-05-30 19:56:49 UTC (rev 1408)
+++ trunk/Mezzanine/MezzanineLib/Support/Sound.cs 2007-05-30 20:18:00 UTC (rev 1409)
@@ -37,7 +37,7 @@
using System.IO;
using Tao.Sdl;
using Tao.OpenGl;
-using SdlDotNet;
+using SdlDotNet.Audio;
using System.Runtime.InteropServices;
namespace MezzanineLib.Support
@@ -65,7 +65,7 @@
public static bool noSound = false;
static int soundVolume = 255;
static int musicVolume = 128;
- static SdlDotNet.Music music;
+ static SdlDotNet.Audio.Music music;
static SoundLocation[] soundLocations = new SoundLocation[MAXCHAN];
public static ArrayList samples = new ArrayList();
public static ArrayList snames = new ArrayList();
@@ -98,7 +98,7 @@
{
return;
}
- SdlDotNet.Music.Stop();
+ SdlDotNet.Audio.MusicPlayer.Stop();
if(soundVolume!= 0 && musicVolume!=0)
{
// string soundName = @"packages/" + filename;
@@ -126,7 +126,7 @@
public static void CleanSound()
{
- SdlDotNet.Music.Stop();
+ SdlDotNet.Audio.MusicPlayer.Stop();
Mixer.Close();
}
@@ -205,11 +205,11 @@
if(samples[n]==null)
{
- samples[n] = new SdlDotNet.Sound(GameInit.NormalizePath("packages/sounds/" + snames[n] + ".wav"));
+ samples[n] = new SdlDotNet.Audio.Sound(GameInit.NormalizePath("packages/sounds/" + snames[n] + ".wav"));
// if(!samples[n]) { conoutf("failed to load sample: %s", buf); return; };
}
- SdlDotNet.Channel channel = ((SdlDotNet.Sound)samples[n]).Play();
+ Channel channel = ((SdlDotNet.Audio.Sound)samples[n]).Play();
if(channel.Index<0)
{
return;
Modified: trunk/Mezzanine/MezzanineManagedLib/MezzanineManagedLib.vcproj
===================================================================
--- trunk/Mezzanine/MezzanineManagedLib/MezzanineManagedLib.vcproj 2007-05-30 19:56:49 UTC (rev 1408)
+++ trunk/Mezzanine/MezzanineManagedLib/MezzanineManagedLib.vcproj 2007-05-30 20:18:00 UTC (rev 1409)
@@ -1,45 +1,63 @@
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
- Version="7.10"
+ Version="8.00"
Name="MezzanineManagedLib"
ProjectGUID="{7923259E-4B01-4566-9B36-EA5173A0C60C}"
RootNamespace="cube"
- SccProjectName=""
- SccLocalPath="">
+ >
<Platforms>
<Platform
- Name="Win32"/>
+ Name="Win32"
+ />
</Platforms>
+ <ToolFiles>
+ </ToolFiles>
<Configurations>
<Configuration
Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
- WholeProgramOptimization="TRUE">
+ WholeProgramOptimization="1"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Release/cube.tlb"
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="3"
- GlobalOptimizations="TRUE"
InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="TRUE"
+ EnableIntrinsicFunctions="true"
FavorSizeOrSpeed="1"
- OmitFramePointers="TRUE"
- OptimizeForProcessor="2"
+ OmitFramePointers="true"
AdditionalIncludeDirectories=""C:\Documents and Settings\DYYH\My Documents\workspace\tess\include";"C:\Documents and Settings\DYYH\My Documents\workspace\tess\enet\include""
PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE"
- StringPooling="TRUE"
- MinimalRebuild="FALSE"
- ExceptionHandling="FALSE"
+ StringPooling="true"
+ MinimalRebuild="false"
+ ExceptionHandling="0"
RuntimeLibrary="0"
- BufferSecurityCheck="FALSE"
- EnableFunctionLevelLinking="FALSE"
- DisableLanguageExtensions="FALSE"
- ForceConformanceInForLoopScope="TRUE"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ DisableLanguageExtensions="false"
+ ForceConformanceInForLoopScope="true"
UsePrecompiledHeader="0"
PrecompiledHeaderThrough="cube.h"
PrecompiledHeaderFile=".\Release/cube.pch"
@@ -47,69 +65,96 @@
ObjectFile=".\Release/"
ProgramDataBaseFileName=".\Release/"
WarningLevel="3"
- SuppressStartupBanner="TRUE"
- Detect64BitPortabilityProblems="TRUE"
+ SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
DebugInformationFormat="0"
- CompileAs="0"/>
+ CompileAs="0"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="2057"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="odbc32.lib odbccp32.lib zlib.lib opengl32.lib glu32.lib msvcrt.lib SDLmain.lib SDL.lib SDL_image.lib ws2_32.lib winmm.lib SDL_mixer.lib"
OutputFile=""C:\Documents and Settings\DYYH\My Documents\workspace\Tess\bin\cube.dll""
LinkIncremental="1"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
AdditionalLibraryDirectories=""C:\Documents and Settings\DYYH\My Documents\workspace\Tess\lib""
- IgnoreAllDefaultLibraries="TRUE"
- GenerateDebugInformation="TRUE"
+ IgnoreAllDefaultLibraries="true"
+ GenerateDebugInformation="true"
ProgramDatabaseFile=".\Release/cube.pdb"
- GenerateMapFile="TRUE"
+ GenerateMapFile="true"
MapFileName=".\Release/cube.map"
- MapExports="TRUE"
- MapLines="TRUE"
+ MapExports="true"
SubSystem="1"
OptimizeReferences="2"
EnableCOMDATFolding="2"
- OptimizeForWindows98="1"/>
+ OptimizeForWindows98="1"
+ />
<Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Release/cube.tlb"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="2057"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Debug|Win32"
OutputDirectory="bin\Debug"
IntermediateDirectory="obj\Debug"
ConfigurationType="2"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="0"
- ManagedExtensions="TRUE"
- WholeProgramOptimization="FALSE">
+ ManagedExtensions="4"
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Debug/cube.tlb"
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="0"
- OptimizeForProcessor="0"
AdditionalIncludeDirectories="..\include;enet\include"
AdditionalUsingDirectories=""
PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;ENET_DEBUG"
@@ -122,78 +167,105 @@
ObjectFile="./obj/Debug/"
ProgramDataBaseFileName="./obj/Debug/"
WarningLevel="3"
- SuppressStartupBanner="TRUE"
- Detect64BitPortabilityProblems="FALSE"
+ SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="false"
DebugInformationFormat="3"
- CompileAs="0"/>
+ CompileAs="2"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="_DEBUG"
+ Culture="1033"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="odbc32.lib odbccp32.lib zlib.lib opengl32.lib glu32.lib msvcrt.lib SDLmain.lib SDL.lib SDL_image.lib SDL_mixer.lib ws2_32.lib winmm.lib"
OutputFile="bin\Debug\MezzanineManagedLib.dll"
LinkIncremental="2"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
AdditionalLibraryDirectories="..\lib"
- IgnoreAllDefaultLibraries="FALSE"
+ IgnoreAllDefaultLibraries="false"
ForceSymbolReferences="__DllMainCRTStartup@12"
- GenerateDebugInformation="TRUE"
+ GenerateDebugInformation="true"
ProgramDatabaseFile="bin/Debug/MezzanineManagedLib_debug.pdb"
SubSystem="2"
- ResourceOnlyDLL="TRUE"
- ImportLibrary="./bin/Debug/MezzanineManagedLib.lib"/>
+ ResourceOnlyDLL="true"
+ ImportLibrary="./bin/Debug/MezzanineManagedLib.lib"
+ />
<Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Debug/cube.tlb"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="_DEBUG"
- Culture="1033"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
<Configuration
Name="Profile|Win32"
OutputDirectory="Profile"
IntermediateDirectory="Profile"
ConfigurationType="1"
+ InheritedPropertySheets="$(VCInstallDir)VCProjectDefaults\UpgradeFromVC71.vsprops"
UseOfMFC="0"
- ATLMinimizesCRunTimeLibraryUsage="FALSE"
+ ATLMinimizesCRunTimeLibraryUsage="false"
CharacterSet="2"
- WholeProgramOptimization="FALSE">
+ >
<Tool
+ Name="VCPreBuildEventTool"
+ />
+ <Tool
+ Name="VCCustomBuildTool"
+ />
+ <Tool
+ Name="VCXMLDataGeneratorTool"
+ />
+ <Tool
+ Name="VCWebServiceProxyGeneratorTool"
+ />
+ <Tool
+ Name="VCMIDLTool"
+ TypeLibraryName=".\Release/cube.tlb"
+ />
+ <Tool
Name="VCCLCompilerTool"
Optimization="2"
- GlobalOptimizations="FALSE"
InlineFunctionExpansion="2"
- EnableIntrinsicFunctions="FALSE"
+ EnableIntrinsicFunctions="false"
FavorSizeOrSpeed="2"
- OmitFramePointers="TRUE"
- OptimizeForProcessor="2"
+ OmitFramePointers="true"
AdditionalIncludeDirectories=""C:\Documents and Settings\DYYH\My Documents\workspace\tess\include";"C:\Documents and Settings\DYYH\My Documents\workspace\tess\enet\include""
PreprocessorDefinitions="WIN32,NDEBUG,_CONSOLE,USE_ENET"
- StringPooling="TRUE"
- MinimalRebuild="TRUE"
- ExceptionHandling="FALSE"
+ StringPooling="true"
+ MinimalRebuild="true"
+ ExceptionHandling="0"
RuntimeLibrary="2"
- BufferSecurityCheck="FALSE"
- EnableFunctionLevelLinking="FALSE"
- ForceConformanceInForLoopScope="TRUE"
+ BufferSecurityCheck="false"
+ EnableFunctionLevelLinking="false"
+ ForceConformanceInForLoopScope="true"
UsePrecompiledHeader="0"
PrecompiledHeaderFile=".\Release/cube.pch"
AssemblerListingLocation=".\Release/"
@@ -201,983 +273,1291 @@
ProgramDataBaseFileName=".\Release/"
BrowseInformation="1"
WarningLevel="3"
- SuppressStartupBanner="TRUE"
- Detect64BitPortabilityProblems="TRUE"
- CompileAs="0"/>
+ SuppressStartupBanner="true"
+ Detect64BitPortabilityProblems="true"
+ CompileAs="0"
+ />
<Tool
- Name="VCCustomBuildTool"/>
+ Name="VCManagedResourceCompilerTool"
+ />
<Tool
+ Name="VCResourceCompilerTool"
+ PreprocessorDefinitions="NDEBUG"
+ Culture="2057"
+ />
+ <Tool
+ Name="VCPreLinkEventTool"
+ />
+ <Tool
Name="VCLinkerTool"
AdditionalOptions="/MACHINE:I386"
AdditionalDependencies="msvcrt.lib zlib.lib opengl32.lib glu32.lib SDLmain.lib SDL.lib SDL_image.lib ws2_32.lib SDL_mixer.lib fmodvc.lib"
OutputFile=""C:\Documents and Settings\DYYH\My Documents\workspace\Tess\bin\cube.dll""
LinkIncremental="1"
- SuppressStartupBanner="TRUE"
+ SuppressStartupBanner="true"
AdditionalLibraryDirectories=""C:\Documents and Settings\DYYH\My Documents\workspace\Tess\lib""
- IgnoreAllDefaultLibraries="TRUE"
- GenerateDebugInformation="TRUE"
+ IgnoreAllDefaultLibraries="true"
+ GenerateDebugInformation="true"
ProgramDatabaseFile=".\Release/cube.pdb"
- GenerateMapFile="TRUE"
+ GenerateMapFile="true"
MapFileName=".\Release/cube.map"
- MapExports="TRUE"
- MapLines="TRUE"
+ MapExports="true"
SubSystem="1"
- OptimizeForWindows98="1"/>
+ OptimizeForWindows98="1"
+ />
<Tool
- Name="VCMIDLTool"
- TypeLibraryName=".\Release/cube.tlb"/>
+ Name="VCALinkTool"
+ />
<Tool
- Name="VCPostBuildEventTool"/>
+ Name="VCManifestTool"
+ />
<Tool
- Name="VCPreBuildEventTool"/>
+ Name="VCXDCMakeTool"
+ />
<Tool
- Name="VCPreLinkEventTool"/>
+ Name="VCBscMakeTool"
+ />
<Tool
- Name="VCResourceCompilerTool"
- PreprocessorDefinitions="NDEBUG"
- Culture="2057"/>
+ Name="VCFxCopTool"
+ />
<Tool
- Name="VCWebServiceProxyGeneratorTool"/>
+ Name="VCAppVerifierTool"
+ />
<Tool
- Name="VCXMLDataGeneratorTool"/>
+ Name="VCWebDeploymentTool"
+ />
<Tool
- Name="VCWebDeploymentTool"/>
- <Tool
- Name="VCManagedWrapperGeneratorTool"/>
- <Tool
- Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
+ Name="VCPostBuildEventTool"
+ />
</Configuration>
</Configurations>
<References>
<ProjectReference
ReferencedProjectIdentifier="{DF0A7A59-91FA-438C-B859-D35C3963A553}"
- Name="MezzanineLib"/>
+ RelativePathToProject=".\MezzanineLib\MezzanineLib.csproj"
+ />
<AssemblyReference
- RelativePath="$(SolutionDir)lib\SdlDotNet.dll"/>
+ RelativePath="..\lib\SdlDotNet.dll"
+ AssemblyName="SdlDotNet, Version=6.0.0.0, PublicKeyToken=26ad4f7e10c61408, processorArchitecture=MSIL"
+ />
<AssemblyReference
- RelativePath="$(SolutionDir)lib\Tao.OpenGl.dll"/>
+ RelativePath="..\lib\Tao.OpenGl.dll"
+ AssemblyName="Tao.OpenGl, Version=2.1.0.4, PublicKeyToken=1ca010269a4501ef, processorArchitecture=MSIL"
+ />
<AssemblyReference
- RelativePath="$(SolutionDir)lib\Tao.OpenGl.ExtensionLoader.dll"/>
- <AssemblyReference
- RelativePath="$(SolutionDir)lib\Tao.OpenGl.Glu.dll"/>
- <AssemblyReference
- RelativePath="$(SolutionDir)lib\Tao.Sdl.dll"/>
+ RelativePath="..\lib\Tao.Sdl.dll"
+ AssemblyName="Tao.Sdl, Version=1.2.11.1, PublicKeyToken=9c7a200e36c0094e, processorArchitecture=MSIL"
+ />
</References>
<Files>
<Filter
Name="headers"
- Filter="h;hpp;hxx;hm;inl">
+ Filter="h;hpp;hxx;hm;inl"
+ >
<File
- RelativePath=".\src\cube.h">
+ RelativePath=".\src\cube.h"
+ >
</File>
<File
- RelativePath=".\src\protos.h">
+ RelativePath=".\src\protos.h"
+ >
</File>
<File
- RelativePath=".\src\tools.h">
+ RelativePath=".\src\tools.h"
+ >
</File>
<Filter
Name="eneth"
- Filter="">
+ >
<File
- RelativePath=".\enet\include\enet\callbacks.h">
+ RelativePath=".\enet\include\enet\callbacks.h"
+ >
</File>
<File
- RelativePath=".\enet\include\enet\enet.h">
+ RelativePath=".\enet\include\enet\enet.h"
+ >
</File>
<File
- RelativePath=".\enet\include\enet\list.h">
+ RelativePath=".\enet\include\enet\list.h"
+ >
</File>
<File
- RelativePath=".\enet\include\enet\memory.h">
+ RelativePath=".\enet\include\enet\memory.h"
+ >
</File>
<File
- RelativePath=".\enet\include\enet\protocol.h">
+ RelativePath=".\enet\include\enet\protocol.h"
+ >
</File>
<File
- RelativePath=".\enet\include\enet\time.h">
+ RelativePath=".\enet\include\enet\time.h"
+ >
</File>
<File
- RelativePath=".\enet\include\enet\types.h">
+ RelativePath=".\enet\include\enet\types.h"
+ >
</File>
<File
- RelativePath=".\enet\include\enet\unix.h">
+ RelativePath=".\enet\include\enet\unix.h"
+ >
</File>
<File
- RelativePath=".\enet\include\enet\utility.h">
+ RelativePath=".\enet\include\enet\utility.h"
+ ...
[truncated message content] |
|
From: <je...@us...> - 2007-06-06 22:30:18
|
Revision: 1415
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1415&view=rev
Author: jendave
Date: 2007-06-06 15:30:15 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
removed editing
Modified Paths:
--------------
trunk/Mezzanine/MezzanineLib/World/Editing.cs
trunk/Mezzanine/MezzanineManagedLib/MezzanineManagedLib.vcproj
Removed Paths:
-------------
trunk/Mezzanine/MezzanineManagedLib/src/editing.cpp
Modified: trunk/Mezzanine/MezzanineLib/World/Editing.cs
===================================================================
--- trunk/Mezzanine/MezzanineLib/World/Editing.cs 2007-06-06 22:06:28 UTC (rev 1414)
+++ trunk/Mezzanine/MezzanineLib/World/Editing.cs 2007-06-06 22:30:15 UTC (rev 1415)
@@ -58,5 +58,467 @@
public static int lasttex = 0;
public const int MAXARCHVERT = 50;
public static bool archvinit = false;
+
+ //// editing.cpp: most map editing commands go here, entity editing commands are in world.cpp
+ //
+ //#include "cube.h"
+ //#using <mscorlib.dll>
+ //using namespace MezzanineLib;
+ //using namespace MezzanineLib::World;
+ //
+ //// the current selection, used by almost all editing commands
+ //// invariant: all code assumes that these are kept inside MINBORD distance of the edge of the map
+ //
+ //block sel =
+ //{
+ // variable("selx", 0, 0, 4096, &sel.x, NULL, false),
+ // variable("sely", 0, 0, 4096, &sel.y, NULL, false),
+ // variable("selxs", 0, 0, 4096, &sel.xs, NULL, false),
+ // variable("selys", 0, 0, 4096, &sel.ys, NULL, false),
+ //};
+ //
+ //#define loopselxy(b) { makeundo(); loop(x,sel.xs) loop(y,sel.ys) { sqr *s = S(sel.x+x, sel.y+y); b; }; remip(sel); }
+ //int curedittex[] = { -1, -1, -1 };
+ //sqr rtex;
+ //
+ //VAR(editing,0,0,1);
+ //
+ //void toggleedit()
+ //{
+ // if(player1->state==CSStatus::CS_DEAD) return; // do not allow dead players to edit to avoid state confusion
+ // if(!GameInit::EditMode && !allowedittoggle()) return; // not in most multiplayer modes
+ // GameInit::EditMode = !GameInit::EditMode;
+ // if(!GameInit::EditMode)
+ // {
+ // settagareas(); // reset triggers to allow quick playtesting
+ // entinmap(player1); // find spawn closest to current floating pos
+ // }
+ // else
+ // {
+ // resettagareas(); // clear trigger areas to allow them to be edited
+ // player1->health = 100;
+ // if(m_classicsp) monsterclear(); // all monsters back at their spawns for editing
+ // projreset();
+ // };
+ // SdlDotNet::Input::Keyboard::KeyRepeat = GameInit::EditMode;
+ // Editing::selset = false;
+ // editing = GameInit::EditMode;
+ //};
+ //
+ //COMMANDN(edittoggle, toggleedit, Support::FunctionSignatures::ARG_NONE);
+ //
+ //void correctsel() // ensures above invariant
+ //{
+ // Editing::selset = !OUTBORD(sel.x, sel.y);
+ // int bsize = GameInit::SSize-GameInit::MinBord;
+ // if(sel.xs+sel.x>bsize) sel.xs = bsize-sel.x;
+ // if(sel.ys+sel.y>bsize) sel.ys = bsize-sel.y;
+ // if(sel.xs<=0 || sel.ys<=0) Editing::selset = false;
+ //};
+ //
+ //bool noteditmode()
+ //{
+ // correctsel();
+ // if(!GameInit::EditMode) conoutf("this function is only allowed in edit mode");
+ // return !GameInit::EditMode;
+ //};
+ //
+ //bool noselection()
+ //{
+ // if(!Editing::selset) conoutf("no selection");
+ // return !Editing::selset;
+ //};
+ //
+ //#define EDITSEL if(noteditmode() || noselection()) return;
+ //#define EDITSELMP if(noteditmode() || noselection() || multiplayer()) return;
+ //#define EDITMP if(noteditmode() || multiplayer()) return;
+ //
+ //void selectpos(int x, int y, int xs, int ys)
+ //{
+ // block s = { x, y, xs, ys };
+ // sel = s;
+ // Editing::selh = 0;
+ // correctsel();
+ //};
+ //
+ //void makesel()
+ //{
+ // block s = { min(Editing::lastx,Editing::cx), min(Editing::lasty,Editing::cy), abs(Editing::lastx-Editing::cx)+1, abs(Editing::lasty-Editing::cy)+1 };
+ // sel = s;
+ // Editing::selh = max(Editing::lasth,Editing::ch);
+ // correctsel();
+ // if(Editing::selset) rtex = *S(sel.x, sel.y);
+ //};
+ //
+ //VAR(flrceil,0,0,2);
+ //
+ //float sheight(sqr *s, sqr *t, float z) // finds out z height when cursor points at wall
+ //{
+ // return !flrceil //z-s->floor<s->ceil-z
+ // ? (s->type==BlockTypes::FHF ? s->floor-t->vdelta/4.0f : (float)s->floor)
+ // : (s->type==BlockTypes::CHF ? s->ceil+t->vdelta/4.0f : (float)s->ceil);
+ //};
+ //
+ //void cursorupdate() // called every frame from hud
+ //{
+ // flrceil = ((int)(player1->pitch>=0))*2;
+ //
+ // volatile float x = worldpos.x; // volatile needed to prevent msvc7 optimizer bug?
+ // volatile float y = worldpos.y;
+ // volatile float z = worldpos.z;
+ //
+ // Editing::cx = (int)x;
+ // Editing::cy = (int)y;
+ //
+ // if(OUTBORD(Editing::cx, Editing::cy)) return;
+ // sqr *s = S(Editing::cx,Editing::cy);
+ //
+ // if(fabs(sheight(s,s,z)-z)>1) // selected wall
+ // {
+ // x += x>player1->o.x ? 0.5f : -0.5f; // find right wall cube
+ // y += y>player1->o.y ? 0.5f : -0.5f;
+ //
+ // Editing::cx = (int)x;
+ // Editing::cy = (int)y;
+ //
+ // if(OUTBORD(Editing::cx, Editing::cy)) return;
+ // };
+ //
+ // if(Editing::dragging) makesel();
+ //
+ // const int GRIDSIZE = 5;
+ // const float GRIDW = 0.5f;
+ // const float GRID8 = 2.0f;
+ // const float GRIDS = 2.0f;
+ // const int GRIDM = 0x7;
+ //
+ // // render editing grid
+ //
+ // for(int ix = Editing::cx-GRIDSIZE; ix<=Editing::cx+GRIDSIZE; ix++) for(int iy = Editing::cy-GRIDSIZE; iy<=Editing::cy+GRIDSIZE; iy++)
+ // {
+ // if(OUTBORD(ix, iy)) continue;
+ // sqr *s = S(ix,iy);
+ // if(SOLID(s)) continue;
+ // float h1 = sheight(s, s, z);
+ // float h2 = sheight(s, SWS(s,1,0,GameInit::SSize), z);
+ // float h3 = sheight(s, SWS(s,1,1,GameInit::SSize), z);
+ // float h4 = sheight(s, SWS(s,0,1,GameInit::SSize), z);
+ // if(s->tag) Render::RenderExtras::LineStyle(GRIDW, 0xFF, 0x40, 0x40);
+ // else if(s->type==BlockTypes::FHF || s->type==BlockTypes::CHF) Render::RenderExtras::LineStyle(GRIDW, 0x80, 0xFF, 0x80);
+ // else Render::RenderExtras::LineStyle(GRIDW, 0x80, 0x80, 0x80);
+ // block b = { ix, iy, 1, 1 };
+ // box(b, h1, h2, h3, h4);
+ // Render::RenderExtras::LineStyle(GRID8, 0x40, 0x40, 0xFF);
+ // if(!(ix&GRIDM)) Render::RenderExtras::Line(ix, iy, h1, ix, iy+1, h4);
+ // if(!(ix+1&GRIDM)) Render::RenderExtras::Line(ix+1, iy, h2, ix+1, iy+1, h3);
+ // if(!(iy&GRIDM)) Render::RenderExtras::Line(ix, iy, h1, ix+1, iy, h2);
+ // if(!(iy+1&GRIDM)) Render::RenderExtras::Line(ix, iy+1, h4, ix+1, iy+1, h3);
+ // };
+ //
+ // if(!SOLID(s))
+ // {
+ // float ih = sheight(s, s, z);
+ // Render::RenderExtras::LineStyle(GRIDS, 0xFF, 0xFF, 0xFF);
+ // block b = { Editing::cx, Editing::cy, 1, 1 };
+ // box(b, ih, sheight(s, SWS(s,1,0,GameInit::SSize), z), sheight(s, SWS(s,1,1,GameInit::SSize), z), sheight(s, SWS(s,0,1,GameInit::SSize), z));
+ // Render::RenderExtras::LineStyle(GRIDS, 0xFF, 0x00, 0x00);
+ // Render::RenderExtras::Dot(Editing::cx, Editing::cy, ih);
+ // Editing::ch = (int)ih;
+ // };
+ //
+ // if(Editing::selset)
+ // {
+ // Render::RenderExtras::LineStyle(GRIDS, 0xFF, 0x40, 0x40);
+ // box(sel, (float)Editing::selh, (float)Editing::selh, (float)Editing::selh, (float)Editing::selh);
+ // };
+ //};
+ //
+ //vector<block *> undos; // unlimited undo
+ //VARP(undomegs, 0, 1, 10); // bounded by n megs
+ //
+ //void pruneundos(int maxremain) // bound memory
+ //{
+ // int t = 0;
+ // loopvrev(undos)
+ // {
+ // t += undos[i]->xs*undos[i]->ys*sizeof(sqr);
+ // if(t>maxremain) free(undos.remove(i));
+ // };
+ //};
+ //
+ //void makeundo()
+ //{
+ // undos.add(blockcopy(sel));
+ // pruneundos(undomegs<<20);
+ //};
+ //
+ //void editundo()
+ //{
+ // EDITMP;
+ // if(undos.empty()) { conoutf("nothing more to undo"); return; };
+ // block *p = undos.pop();
+ // blockpaste(*p);
+ // free(p);
+ //};
+ //
+ //block *copybuf = NULL;
+ //
+ //void copy()
+ //{
+ // EDITSELMP;
+ // if(copybuf) free(copybuf);
+ // copybuf = blockcopy(sel);
+ //};
+ //
+ //void paste()
+ //{
+ // EDITMP;
+ // if(!copybuf) { conoutf("nothing to paste"); return; };
+ // sel.xs = copybuf->xs;
+ // sel.ys = copybuf->ys;
+ // correctsel();
+ // if(!Editing::selset || sel.xs!=copybuf->xs || sel.ys!=copybuf->ys) { conoutf("incorrect selection"); return; };
+ // makeundo();
+ // copybuf->x = sel.x;
+ // copybuf->y = sel.y;
+ // blockpaste(*copybuf);
+ //};
+ //
+ //void tofronttex() // maintain most recently used of the texture lists when applying texture
+ //{
+ // loopi(3)
+ // {
+ // int c = curedittex[i];
+ // if(c>=0)
+ // {
+ // uchar *p = hdr.texlists[i];
+ // int t = p[c];
+ // for(int a = c-1; a>=0; a--) p[a+1] = p[a];
+ // p[0] = t;
+ // curedittex[i] = -1;
+ // };
+ // };
+ //};
+ //
+ //void editdrag(bool isdown)
+ //{
+ // if(Editing::dragging = isdown)
+ // {
+ // Editing::lastx = Editing::cx;
+ // Editing::lasty = Editing::cy;
+ // Editing::lasth = Editing::ch;
+ // Editing::selset = false;
+ // tofronttex();
+ // };
+ // makesel();
+ //};
+ //
+ //// the core editing function. all the *xy functions perform the core operations
+ //// and are also called directly from the network, the function below it is strictly
+ //// triggered locally. They all have very similar structure.
+ //
+ //void editheightxy(bool isfloor, int amount, block &sel)
+ //{
+ // loopselxy(if(isfloor)
+ // {
+ // s->floor += amount;
+ // if(s->floor>=s->ceil) s->floor = s->ceil-1;
+ // }
+ // else
+ // {
+ // s->ceil += amount;
+ // if(s->ceil<=s->floor) s->ceil = s->floor+1;
+ // });
+ //};
+ //
+ //void editheight(int flr, int amount)
+ //{
+ // EDITSEL;
+ // bool isfloor = flr==0;
+ // editheightxy(isfloor, amount, sel);
+ // addmsg(1, 7, NetworkMessages::SV_EDITH, sel.x, sel.y, sel.xs, sel.ys, isfloor, amount);
+ //};
+ //
+ //COMMAND(editheight, Support::FunctionSignatures::ARG_2INT);
+ //
+ //void edittexxy(int type, int t, block &sel)
+ //{
+ // loopselxy(switch(type)
+ // {
+ // case 0: s->ftex = t; break;
+ // case 1: s->wtex = t; break;
+ // case 2: s->ctex = t; break;
+ // case 3: s->utex = t; break;
+ // });
+ //};
+ //
+ //void edittex(int type, int dir)
+ //{
+ // EDITSEL;
+ // if(type<0 || type>3) return;
+ // if(type!=Editing::lasttype) { tofronttex(); Editing::lasttype = type; };
+ // int atype = type==3 ? 1 : type;
+ // int i = curedittex[atype];
+ // i = i<0 ? 0 : i+dir;
+ // curedittex[atype] = i = min(max(i, 0), 255);
+ // int t = Editing::lasttex = hdr.texlists[atype][i];
+ // edittexxy(type, t, sel);
+ // addmsg(1, 7, NetworkMessages::SV_EDITT, sel.x, sel.y, sel.xs, sel.ys, type, t);
+ //};
+ //
+ //void replace()
+ //{
+ // EDITSELMP;
+ // loop(x,GameInit::SSize) loop(y,GameInit::SSize)
+ // {
+ // sqr *s = S(x, y);
+ // switch(Editing::lasttype)
+ // {
+ // case 0: if(s->ftex == rtex.ftex) s->ftex = Editing::lasttex; break;
+ // case 1: if(s->wtex == rtex.wtex) s->wtex = Editing::lasttex; break;
+ // case 2: if(s->ctex == rtex.ctex) s->ctex = Editing::lasttex; break;
+ // case 3: if(s->utex == rtex.utex) s->utex = Editing::lasttex; break;
+ // };
+ // };
+ // block b = { 0, 0, GameInit::SSize, GameInit::SSize };
+ // remip(b);
+ //};
+ //
+ //void edittypexy(int type, block &sel)
+ //{
+ // loopselxy(s->type = type);
+ //};
+ //
+ //void edittype(int type)
+ //{
+ // EDITSEL;
+ // if(type==BlockTypes::CORNER && (sel.xs!=sel.ys || sel.xs==3 || sel.xs>4 && sel.xs!=8
+ // || sel.x&~-sel.xs || sel.y&~-sel.ys))
+ // { conoutf("corner selection must be power of 2 aligned"); return; };
+ // edittypexy(type, sel);
+ // addmsg(1, 6, NetworkMessages::SV_EDITS, sel.x, sel.y, sel.xs, sel.ys, type);
+ //};
+ //
+ //void heightfield(int t) { edittype(t==0 ? BlockTypes::FHF : BlockTypes::CHF); };
+ //void solid(int t) { edittype(t==0 ? BlockTypes::SPACE : BlockTypes::SOLID); };
+ //void corner() { edittype(BlockTypes::CORNER); };
+ //
+ //COMMAND(heightfield, Support::FunctionSignatures::ARG_1INT);
+ //COMMAND(solid, Support::FunctionSignatures::ARG_1INT);
+ //COMMAND(corner, Support::FunctionSignatures::ARG_NONE);
+ //
+ //void editequalisexy(bool isfloor, block &sel)
+ //{
+ // int low = 127, hi = -128;
+ // loopselxy(
+ // {
+ // if(s->floor<low) low = s->floor;
+ // if(s->ceil>hi) hi = s->ceil;
+ // });
+ // loopselxy(
+ // {
+ // if(isfloor) s->floor = low; else s->ceil = hi;
+ // if(s->floor>=s->ceil) s->floor = s->ceil-1;
+ // });
+ //};
+ //
+ //void equalize(int flr)
+ //{
+ // bool isfloor = flr==0;
+ // EDITSEL;
+ // editequalisexy(isfloor, sel);
+ // addmsg(1, 6, NetworkMessages::SV_EDITE, sel.x, sel.y, sel.xs, sel.ys, isfloor);
+ //};
+ //
+ //COMMAND(equalize, Support::FunctionSignatures::ARG_1INT);
+ //
+ //void setvdeltaxy(int delta, block &sel)
+ //{
+ // loopselxy(s->vdelta = max(s->vdelta+delta, 0));
+ // remipmore(sel);
+ //};
+ //
+ //void setvdelta(int delta)
+ //{
+ // EDITSEL;
+ // setvdeltaxy(delta, sel);
+ // addmsg(1, 6, NetworkMessages::SV_EDITD, sel.x, sel.y, sel.xs, sel.ys, delta);
+ //};
+ //
+ //int archverts[Editing::MAXARCHVERT][Editing::MAXARCHVERT];
+ //
+ //void archvertex(int span, int vert, int delta)
+ //{
+ // if(!Editing::archvinit)
+ // {
+ // Editing::archvinit = true;
+ // loop(s,Editing::MAXARCHVERT) loop(v,Editing::MAXARCHVERT) archverts[s][v] = 0;
+ // };
+ // if(span>=Editing::MAXARCHVERT || vert>=Editing::MAXARCHVERT || span<0 || vert<0) return;
+ // archverts[span][vert] = delta;
+ //};
+ //
+ //void arch(int sidedelta, int _a)
+ //{
+ // EDITSELMP;
+ // sel.xs++;
+ // sel.ys++;
+ // if(sel.xs>Editing::MAXARCHVERT) sel.xs = Editing::MAXARCHVERT;
+ // if(sel.ys>Editing::MAXARCHVERT) sel.ys = Editing::MAXARCHVERT;
+ // loopselxy(s->vdelta =
+ // sel.xs>sel.ys
+ // ? (archverts[sel.xs-1][x] + (y==0 || y==sel.ys-1 ? sidedelta : 0))
+ // : (archverts[sel.ys-1][y] + (x==0 || x==sel.xs-1 ? sidedelta : 0)));
+ // remipmore(sel);
+ //};
+ //
+ //void slope(int xd, int yd)
+ //{
+ // EDITSELMP;
+ // int off = 0;
+ // if(xd<0) off -= xd*sel.xs;
+ // if(yd<0) off -= yd*sel.ys;
+ // sel.xs++;
+ // sel.ys++;
+ // loopselxy(s->vdelta = xd*x+yd*y+off);
+ // remipmore(sel);
+ //};
+ //
+ //
+ //VARF(fullbright, 0, 0, 1,
+ // if(fullbright)
+ // {
+ // if(noteditmode()) return;
+ // loopi(GameInit::MipSize) world[i].r = world[i].g = world[i].b = 176;
+ // };
+ //);
+ //
+ //void edittag(int tag)
+ //{
+ // EDITSELMP;
+ // loopselxy(s->tag = tag);
+ //};
+ //
+ //void newent(char *what, char *a1, char *a2, char *a3, char *a4)
+ //{
+ // EDITSEL;
+ // newentity(sel.x, sel.y, (int)player1->o.z, what, ATOI(a1), ATOI(a2), ATOI(a3), ATOI(a4));
+ //};
+ //
+ //COMMANDN(select, selectpos, Support::FunctionSignatures::ARG_4INT);
+ //COMMAND(edittag, Support::FunctionSignatures::ARG_1INT);
+ //COMMAND(replace, Support::FunctionSignatures::ARG_NONE);
+ //COMMAND(archvertex, Support::FunctionSignatures::ARG_3INT);
+ //COMMAND(arch, Support::FunctionSignatures::ARG_2INT);
+ //COMMAND(slope, Support::FunctionSignatures::ARG_2INT);
+ //COMMANDN(vdelta, setvdelta, Support::FunctionSignatures::ARG_1INT);
+ //COMMANDN(undo, editundo, Support::FunctionSignatures::ARG_NONE);
+ //COMMAND(copy, Support::FunctionSignatures::ARG_NONE);
+ //COMMAND(paste, Support::FunctionSignatures::ARG_NONE);
+ //COMMAND(edittex, Support::FunctionSignatures::ARG_2INT);
+ //COMMAND(newent, Support::FunctionSignatures::ARG_5STR);
+ //
+ //
+
}
}
Modified: trunk/Mezzanine/MezzanineManagedLib/MezzanineManagedLib.vcproj
===================================================================
--- trunk/Mezzanine/MezzanineManagedLib/MezzanineManagedLib.vcproj 2007-06-06 22:06:28 UTC (rev 1414)
+++ trunk/Mezzanine/MezzanineManagedLib/MezzanineManagedLib.vcproj 2007-06-06 22:30:15 UTC (rev 1415)
@@ -1084,34 +1084,6 @@
Name="world"
>
<File
- RelativePath=".\src\editing.cpp"
- >
- <FileConfiguration
- Name="Release|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Debug|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- <FileConfiguration
- Name="Profile|Win32"
- >
- <Tool
- Name="VCCLCompilerTool"
- ObjectFile="$(IntDir)/$(InputName)1.obj"
- />
- </FileConfiguration>
- </File>
- <File
RelativePath=".\src\world.cpp"
>
<FileConfiguration
Deleted: trunk/Mezzanine/MezzanineManagedLib/src/editing.cpp
===================================================================
--- trunk/Mezzanine/MezzanineManagedLib/src/editing.cpp 2007-06-06 22:06:28 UTC (rev 1414)
+++ trunk/Mezzanine/MezzanineManagedLib/src/editing.cpp 2007-06-06 22:30:15 UTC (rev 1415)
@@ -1,460 +0,0 @@
-//// editing.cpp: most map editing commands go here, entity editing commands are in world.cpp
-//
-//#include "cube.h"
-//#using <mscorlib.dll>
-//using namespace MezzanineLib;
-//using namespace MezzanineLib::World;
-//
-//// the current selection, used by almost all editing commands
-//// invariant: all code assumes that these are kept inside MINBORD distance of the edge of the map
-//
-//block sel =
-//{
-// variable("selx", 0, 0, 4096, &sel.x, NULL, false),
-// variable("sely", 0, 0, 4096, &sel.y, NULL, false),
-// variable("selxs", 0, 0, 4096, &sel.xs, NULL, false),
-// variable("selys", 0, 0, 4096, &sel.ys, NULL, false),
-//};
-//
-//#define loopselxy(b) { makeundo(); loop(x,sel.xs) loop(y,sel.ys) { sqr *s = S(sel.x+x, sel.y+y); b; }; remip(sel); }
-//int curedittex[] = { -1, -1, -1 };
-//sqr rtex;
-//
-//VAR(editing,0,0,1);
-//
-//void toggleedit()
-//{
-// if(player1->state==CSStatus::CS_DEAD) return; // do not allow dead players to edit to avoid state confusion
-// if(!GameInit::EditMode && !allowedittoggle()) return; // not in most multiplayer modes
-// GameInit::EditMode = !GameInit::EditMode;
-// if(!GameInit::EditMode)
-// {
-// settagareas(); // reset triggers to allow quick playtesting
-// entinmap(player1); // find spawn closest to current floating pos
-// }
-// else
-// {
-// resettagareas(); // clear trigger areas to allow them to be edited
-// player1->health = 100;
-// if(m_classicsp) monsterclear(); // all monsters back at their spawns for editing
-// projreset();
-// };
-// SdlDotNet::Input::Keyboard::KeyRepeat = GameInit::EditMode;
-// Editing::selset = false;
-// editing = GameInit::EditMode;
-//};
-//
-//COMMANDN(edittoggle, toggleedit, Support::FunctionSignatures::ARG_NONE);
-//
-//void correctsel() // ensures above invariant
-//{
-// Editing::selset = !OUTBORD(sel.x, sel.y);
-// int bsize = GameInit::SSize-GameInit::MinBord;
-// if(sel.xs+sel.x>bsize) sel.xs = bsize-sel.x;
-// if(sel.ys+sel.y>bsize) sel.ys = bsize-sel.y;
-// if(sel.xs<=0 || sel.ys<=0) Editing::selset = false;
-//};
-//
-//bool noteditmode()
-//{
-// correctsel();
-// if(!GameInit::EditMode) conoutf("this function is only allowed in edit mode");
-// return !GameInit::EditMode;
-//};
-//
-//bool noselection()
-//{
-// if(!Editing::selset) conoutf("no selection");
-// return !Editing::selset;
-//};
-//
-//#define EDITSEL if(noteditmode() || noselection()) return;
-//#define EDITSELMP if(noteditmode() || noselection() || multiplayer()) return;
-//#define EDITMP if(noteditmode() || multiplayer()) return;
-//
-//void selectpos(int x, int y, int xs, int ys)
-//{
-// block s = { x, y, xs, ys };
-// sel = s;
-// Editing::selh = 0;
-// correctsel();
-//};
-//
-//void makesel()
-//{
-// block s = { min(Editing::lastx,Editing::cx), min(Editing::lasty,Editing::cy), abs(Editing::lastx-Editing::cx)+1, abs(Editing::lasty-Editing::cy)+1 };
-// sel = s;
-// Editing::selh = max(Editing::lasth,Editing::ch);
-// correctsel();
-// if(Editing::selset) rtex = *S(sel.x, sel.y);
-//};
-//
-//VAR(flrceil,0,0,2);
-//
-//float sheight(sqr *s, sqr *t, float z) // finds out z height when cursor points at wall
-//{
-// return !flrceil //z-s->floor<s->ceil-z
-// ? (s->type==BlockTypes::FHF ? s->floor-t->vdelta/4.0f : (float)s->floor)
-// : (s->type==BlockTypes::CHF ? s->ceil+t->vdelta/4.0f : (float)s->ceil);
-//};
-//
-//void cursorupdate() // called every frame from hud
-//{
-// flrceil = ((int)(player1->pitch>=0))*2;
-//
-// volatile float x = worldpos.x; // volatile needed to prevent msvc7 optimizer bug?
-// volatile float y = worldpos.y;
-// volatile float z = worldpos.z;
-//
-// Editing::cx = (int)x;
-// Editing::cy = (int)y;
-//
-// if(OUTBORD(Editing::cx, Editing::cy)) return;
-// sqr *s = S(Editing::cx,Editing::cy);
-//
-// if(fabs(sheight(s,s,z)-z)>1) // selected wall
-// {
-// x += x>player1->o.x ? 0.5f : -0.5f; // find right wall cube
-// y += y>player1->o.y ? 0.5f : -0.5f;
-//
-// Editing::cx = (int)x;
-// Editing::cy = (int)y;
-//
-// if(OUTBORD(Editing::cx, Editing::cy)) return;
-// };
-//
-// if(Editing::dragging) makesel();
-//
-// const int GRIDSIZE = 5;
-// const float GRIDW = 0.5f;
-// const float GRID8 = 2.0f;
-// const float GRIDS = 2.0f;
-// const int GRIDM = 0x7;
-//
-// // render editing grid
-//
-// for(int ix = Editing::cx-GRIDSIZE; ix<=Editing::cx+GRIDSIZE; ix++) for(int iy = Editing::cy-GRIDSIZE; iy<=Editing::cy+GRIDSIZE; iy++)
-// {
-// if(OUTBORD(ix, iy)) continue;
-// sqr *s = S(ix,iy);
-// if(SOLID(s)) continue;
-// float h1 = sheight(s, s, z);
-// float h2 = sheight(s, SWS(s,1,0,GameInit::SSize), z);
-// float h3 = sheight(s, SWS(s,1,1,GameInit::SSize), z);
-// float h4 = sheight(s, SWS(s,0,1,GameInit::SSize), z);
-// if(s->tag) Render::RenderExtras::LineStyle(GRIDW, 0xFF, 0x40, 0x40);
-// else if(s->type==BlockTypes::FHF || s->type==BlockTypes::CHF) Render::RenderExtras::LineStyle(GRIDW, 0x80, 0xFF, 0x80);
-// else Render::RenderExtras::LineStyle(GRIDW, 0x80, 0x80, 0x80);
-// block b = { ix, iy, 1, 1 };
-// box(b, h1, h2, h3, h4);
-// Render::RenderExtras::LineStyle(GRID8, 0x40, 0x40, 0xFF);
-// if(!(ix&GRIDM)) Render::RenderExtras::Line(ix, iy, h1, ix, iy+1, h4);
-// if(!(ix+1&GRIDM)) Render::RenderExtras::Line(ix+1, iy, h2, ix+1, iy+1, h3);
-// if(!(iy&GRIDM)) Render::RenderExtras::Line(ix, iy, h1, ix+1, iy, h2);
-// if(!(iy+1&GRIDM)) Render::RenderExtras::Line(ix, iy+1, h4, ix+1, iy+1, h3);
-// };
-//
-// if(!SOLID(s))
-// {
-// float ih = sheight(s, s, z);
-// Render::RenderExtras::LineStyle(GRIDS, 0xFF, 0xFF, 0xFF);
-// block b = { Editing::cx, Editing::cy, 1, 1 };
-// box(b, ih, sheight(s, SWS(s,1,0,GameInit::SSize), z), sheight(s, SWS(s,1,1,GameInit::SSize), z), sheight(s, SWS(s,0,1,GameInit::SSize), z));
-// Render::RenderExtras::LineStyle(GRIDS, 0xFF, 0x00, 0x00);
-// Render::RenderExtras::Dot(Editing::cx, Editing::cy, ih);
-// Editing::ch = (int)ih;
-// };
-//
-// if(Editing::selset)
-// {
-// Render::RenderExtras::LineStyle(GRIDS, 0xFF, 0x40, 0x40);
-// box(sel, (float)Editing::selh, (float)Editing::selh, (float)Editing::selh, (float)Editing::selh);
-// };
-//};
-//
-//vector<block *> undos; // unlimited undo
-//VARP(undomegs, 0, 1, 10); // bounded by n megs
-//
-//void pruneundos(int maxremain) // bound memory
-//{
-// int t = 0;
-// loopvrev(undos)
-// {
-// t += undos[i]->xs*undos[i]->ys*sizeof(sqr);
-// if(t>maxremain) free(undos.remove(i));
-// };
-//};
-//
-//void makeundo()
-//{
-// undos.add(blockcopy(sel));
-// pruneundos(undomegs<<20);
-//};
-//
-//void editundo()
-//{
-// EDITMP;
-// if(undos.empty()) { conoutf("nothing more to undo"); return; };
-// block *p = undos.pop();
-// blockpaste(*p);
-// free(p);
-//};
-//
-//block *copybuf = NULL;
-//
-//void copy()
-//{
-// EDITSELMP;
-// if(copybuf) free(copybuf);
-// copybuf = blockcopy(sel);
-//};
-//
-//void paste()
-//{
-// EDITMP;
-// if(!copybuf) { conoutf("nothing to paste"); return; };
-// sel.xs = copybuf->xs;
-// sel.ys = copybuf->ys;
-// correctsel();
-// if(!Editing::selset || sel.xs!=copybuf->xs || sel.ys!=copybuf->ys) { conoutf("incorrect selection"); return; };
-// makeundo();
-// copybuf->x = sel.x;
-// copybuf->y = sel.y;
-// blockpaste(*copybuf);
-//};
-//
-//void tofronttex() // maintain most recently used of the texture lists when applying texture
-//{
-// loopi(3)
-// {
-// int c = curedittex[i];
-// if(c>=0)
-// {
-// uchar *p = hdr.texlists[i];
-// int t = p[c];
-// for(int a = c-1; a>=0; a--) p[a+1] = p[a];
-// p[0] = t;
-// curedittex[i] = -1;
-// };
-// };
-//};
-//
-//void editdrag(bool isdown)
-//{
-// if(Editing::dragging = isdown)
-// {
-// Editing::lastx = Editing::cx;
-// Editing::lasty = Editing::cy;
-// Editing::lasth = Editing::ch;
-// Editing::selset = false;
-// tofronttex();
-// };
-// makesel();
-//};
-//
-//// the core editing function. all the *xy functions perform the core operations
-//// and are also called directly from the network, the function below it is strictly
-//// triggered locally. They all have very similar structure.
-//
-//void editheightxy(bool isfloor, int amount, block &sel)
-//{
-// loopselxy(if(isfloor)
-// {
-// s->floor += amount;
-// if(s->floor>=s->ceil) s->floor = s->ceil-1;
-// }
-// else
-// {
-// s->ceil += amount;
-// if(s->ceil<=s->floor) s->ceil = s->floor+1;
-// });
-//};
-//
-//void editheight(int flr, int amount)
-//{
-// EDITSEL;
-// bool isfloor = flr==0;
-// editheightxy(isfloor, amount, sel);
-// addmsg(1, 7, NetworkMessages::SV_EDITH, sel.x, sel.y, sel.xs, sel.ys, isfloor, amount);
-//};
-//
-//COMMAND(editheight, Support::FunctionSignatures::ARG_2INT);
-//
-//void edittexxy(int type, int t, block &sel)
-//{
-// loopselxy(switch(type)
-// {
-// case 0: s->ftex = t; break;
-// case 1: s->wtex = t; break;
-// case 2: s->ctex = t; break;
-// case 3: s->utex = t; break;
-// });
-//};
-//
-//void edittex(int type, int dir)
-//{
-// EDITSEL;
-// if(type<0 || type>3) return;
-// if(type!=Editing::lasttype) { tofronttex(); Editing::lasttype = type; };
-// int atype = type==3 ? 1 : type;
-// int i = curedittex[atype];
-// i = i<0 ? 0 : i+dir;
-// curedittex[atype] = i = min(max(i, 0), 255);
-// int t = Editing::lasttex = hdr.texlists[atype][i];
-// edittexxy(type, t, sel);
-// addmsg(1, 7, NetworkMessages::SV_EDITT, sel.x, sel.y, sel.xs, sel.ys, type, t);
-//};
-//
-//void replace()
-//{
-// EDITSELMP;
-// loop(x,GameInit::SSize) loop(y,GameInit::SSize)
-// {
-// sqr *s = S(x, y);
-// switch(Editing::lasttype)
-// {
-// case 0: if(s->ftex == rtex.ftex) s->ftex = Editing::lasttex; break;
-// case 1: if(s->wtex == rtex.wtex) s->wtex = Editing::lasttex; break;
-// case 2: if(s->ctex == rtex.ctex) s->ctex = Editing::lasttex; break;
-// case 3: if(s->utex == rtex.utex) s->utex = Editing::lasttex; break;
-// };
-// };
-// block b = { 0, 0, GameInit::SSize, GameInit::SSize };
-// remip(b);
-//};
-//
-//void edittypexy(int type, block &sel)
-//{
-// loopselxy(s->type = type);
-//};
-//
-//void edittype(int type)
-//{
-// EDITSEL;
-// if(type==BlockTypes::CORNER && (sel.xs!=sel.ys || sel.xs==3 || sel.xs>4 && sel.xs!=8
-// || sel.x&~-sel.xs || sel.y&~-sel.ys))
-// { conoutf("corner selection must be power of 2 aligned"); return; };
-// edittypexy(type, sel);
-// addmsg(1, 6, NetworkMessages::SV_EDITS, sel.x, sel.y, sel.xs, sel.ys, type);
-//};
-//
-//void heightfield(int t) { edittype(t==0 ? BlockTypes::FHF : BlockTypes::CHF); };
-//void solid(int t) { edittype(t==0 ? BlockTypes::SPACE : BlockTypes::SOLID); };
-//void corner() { edittype(BlockTypes::CORNER); };
-//
-//COMMAND(heightfield, Support::FunctionSignatures::ARG_1INT);
-//COMMAND(solid, Support::FunctionSignatures::ARG_1INT);
-//COMMAND(corner, Support::FunctionSignatures::ARG_NONE);
-//
-//void editequalisexy(bool isfloor, block &sel)
-//{
-// int low = 127, hi = -128;
-// loopselxy(
-// {
-// if(s->floor<low) low = s->floor;
-// if(s->ceil>hi) hi = s->ceil;
-// });
-// loopselxy(
-// {
-// if(isfloor) s->floor = low; else s->ceil = hi;
-// if(s->floor>=s->ceil) s->floor = s->ceil-1;
-// });
-//};
-//
-//void equalize(int flr)
-//{
-// bool isfloor = flr==0;
-// EDITSEL;
-// editequalisexy(isfloor, sel);
-// addmsg(1, 6, NetworkMessages::SV_EDITE, sel.x, sel.y, sel.xs, sel.ys, isfloor);
-//};
-//
-//COMMAND(equalize, Support::FunctionSignatures::ARG_1INT);
-//
-//void setvdeltaxy(int delta, block &sel)
-//{
-// loopselxy(s->vdelta = max(s->vdelta+delta, 0));
-// remipmore(sel);
-//};
-//
-//void setvdelta(int delta)
-//{
-// EDITSEL;
-// setvdeltaxy(delta, sel);
-// addmsg(1, 6, NetworkMessages::SV_EDITD, sel.x, sel.y, sel.xs, sel.ys, delta);
-//};
-//
-//int archverts[Editing::MAXARCHVERT][Editing::MAXARCHVERT];
-//
-//void archvertex(int span, int vert, int delta)
-//{
-// if(!Editing::archvinit)
-// {
-// Editing::archvinit = true;
-// loop(s,Editing::MAXARCHVERT) loop(v,Editing::MAXARCHVERT) archverts[s][v] = 0;
-// };
-// if(span>=Editing::MAXARCHVERT || vert>=Editing::MAXARCHVERT || span<0 || vert<0) return;
-// archverts[span][vert] = delta;
-//};
-//
-//void arch(int sidedelta, int _a)
-//{
-// EDITSELMP;
-// sel.xs++;
-// sel.ys++;
-// if(sel.xs>Editing::MAXARCHVERT) sel.xs = Editing::MAXARCHVERT;
-// if(sel.ys>Editing::MAXARCHVERT) sel.ys = Editing::MAXARCHVERT;
-// loopselxy(s->vdelta =
-// sel.xs>sel.ys
-// ? (archverts[sel.xs-1][x] + (y==0 || y==sel.ys-1 ? sidedelta : 0))
-// : (archverts[sel.ys-1][y] + (x==0 || x==sel.xs-1 ? sidedelta : 0)));
-// remipmore(sel);
-//};
-//
-//void slope(int xd, int yd)
-//{
-// EDITSELMP;
-// int off = 0;
-// if(xd<0) off -= xd*sel.xs;
-// if(yd<0) off -= yd*sel.ys;
-// sel.xs++;
-// sel.ys++;
-// loopselxy(s->vdelta = xd*x+yd*y+off);
-// remipmore(sel);
-//};
-//
-//
-//VARF(fullbright, 0, 0, 1,
-// if(fullbright)
-// {
-// if(noteditmode()) return;
-// loopi(GameInit::MipSize) world[i].r = world[i].g = world[i].b = 176;
-// };
-//);
-//
-//void edittag(int tag)
-//{
-// EDITSELMP;
-// loopselxy(s->tag = tag);
-//};
-//
-//void newent(char *what, char *a1, char *a2, char *a3, char *a4)
-//{
-// EDITSEL;
-// newentity(sel.x, sel.y, (int)player1->o.z, what, ATOI(a1), ATOI(a2), ATOI(a3), ATOI(a4));
-//};
-//
-//COMMANDN(select, selectpos, Support::FunctionSignatures::ARG_4INT);
-//COMMAND(edittag, Support::FunctionSignatures::ARG_1INT);
-//COMMAND(replace, Support::FunctionSignatures::ARG_NONE);
-//COMMAND(archvertex, Support::FunctionSignatures::ARG_3INT);
-//COMMAND(arch, Support::FunctionSignatures::ARG_2INT);
-//COMMAND(slope, Support::FunctionSignatures::ARG_2INT);
-//COMMANDN(vdelta, setvdelta, Support::FunctionSignatures::ARG_1INT);
-//COMMANDN(undo, editundo, Support::FunctionSignatures::ARG_NONE);
-//COMMAND(copy, Support::FunctionSignatures::ARG_NONE);
-//COMMAND(paste, Support::FunctionSignatures::ARG_NONE);
-//COMMAND(edittex, Support::FunctionSignatures::ARG_2INT);
-//COMMAND(newent, Support::FunctionSignatures::ARG_5STR);
-//
-//
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2007-06-06 22:06:31
|
Revision: 1414
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1414&view=rev
Author: jendave
Date: 2007-06-06 15:06:28 -0700 (Wed, 06 Jun 2007)
Log Message:
-----------
removed editing functionality
Modified Paths:
--------------
trunk/Mezzanine/MezzanineLib/Game/Monster.cs
trunk/Mezzanine/MezzanineManagedLib/src/clientgame.cpp
trunk/Mezzanine/MezzanineManagedLib/src/clients2c.cpp
trunk/Mezzanine/MezzanineManagedLib/src/editing.cpp
trunk/Mezzanine/MezzanineManagedLib/src/protos.h
trunk/Mezzanine/MezzanineManagedLib/src/rendercubes.cpp
trunk/Mezzanine/MezzanineManagedLib/src/renderextras.cpp
trunk/Mezzanine/MezzanineManagedLib/src/world.cpp
trunk/Mezzanine/MezzanineManagedLib/src/worldio.cpp
trunk/Mezzanine/MezzanineManagedLib/src/worldlight.cpp
Modified: trunk/Mezzanine/MezzanineLib/Game/Monster.cs
===================================================================
--- trunk/Mezzanine/MezzanineLib/Game/Monster.cs 2007-06-04 22:25:48 UTC (rev 1413)
+++ trunk/Mezzanine/MezzanineLib/Game/Monster.cs 2007-06-06 22:06:28 UTC (rev 1414)
@@ -40,17 +40,27 @@
namespace MezzanineLib.Game
{
- /// <summary>
- ///
- /// </summary>
- public sealed class Monster
- {
- public static int nextmonster;
- public static int spawnremain;
- public static int numkilled;
- public static int monstertotal;
- public static int mtimestart;
- public const int TOTMFREQ = 13;
- public const int NUMMONSTERTYPES = 8;
- }
+ /// <summary>
+ ///
+ /// </summary>
+ public sealed class Monster
+ {
+ public static int nextmonster;
+ public static int spawnremain;
+ public static int numkilled;
+ public static int monstertotal;
+ public static int mtimestart;
+ public const int TOTMFREQ = 13;
+ public const int NUMMONSTERTYPES = 8;
+
+ //public static void endsp(bool allkilled)
+ //{
+ // conoutf(allkilled ? "you have cleared the map!" : "you reached the exit!");
+ // conoutf("score: %d kills in %d seconds", Monster.numkilled, (GameInit.LastMillis - Monster.mtimestart) / 1000);
+ // Monster.monstertotal = 0;
+ // startintermission();
+ //}
+ }
+
+
}
Modified: trunk/Mezzanine/MezzanineManagedLib/src/clientgame.cpp
===================================================================
--- trunk/Mezzanine/MezzanineManagedLib/src/clientgame.cpp 2007-06-04 22:25:48 UTC (rev 1413)
+++ trunk/Mezzanine/MezzanineManagedLib/src/clientgame.cpp 2007-06-06 22:06:28 UTC (rev 1414)
@@ -306,7 +306,7 @@
void attack(bool on)
{
if(ClientGame::intermission) return;
- if(GameInit::EditMode) editdrag(on);
+ //if(GameInit::EditMode) editdrag(on);
else if(player1->attacking = on) respawn();
};
@@ -434,7 +434,7 @@
loopv(players) if(players[i]) players[i]->frags = 0;
resetspawns();
strcpy_s(getclientmap(), name);
- if(GameInit::EditMode) toggleedit();
+ //if(GameInit::EditMode) toggleedit();
setvar("gamespeed", 100);
//setvar("fog", 180);
//setvar("fogcolour", 0x8099B3);
Modified: trunk/Mezzanine/MezzanineManagedLib/src/clients2c.cpp
===================================================================
--- trunk/Mezzanine/MezzanineManagedLib/src/clients2c.cpp 2007-06-04 22:25:48 UTC (rev 1413)
+++ trunk/Mezzanine/MezzanineManagedLib/src/clients2c.cpp 2007-06-06 22:06:28 UTC (rev 1414)
@@ -281,11 +281,11 @@
block b = { x, y, xs, ys };
switch(type)
{
- case NetworkMessages::SV_EDITH: editheightxy(v!=0, getint(p), b); break;
- case NetworkMessages::SV_EDITT: edittexxy(v, getint(p), b); break;
- case NetworkMessages::SV_EDITS: edittypexy(v, b); break;
- case NetworkMessages::SV_EDITD: setvdeltaxy(v, b); break;
- case NetworkMessages::SV_EDITE: editequalisexy(v!=0, b); break;
+ //case NetworkMessages::SV_EDITH: editheightxy(v!=0, getint(p), b); break;
+ //case NetworkMessages::SV_EDITT: edittexxy(v, getint(p), b); break;
+ //case NetworkMessages::SV_EDITS: edittypexy(v, b); break;
+ //case NetworkMessages::SV_EDITD: setvdeltaxy(v, b); break;
+ //case NetworkMessages::SV_EDITE: editequalisexy(v!=0, b); break;
};
break;
};
Modified: trunk/Mezzanine/MezzanineManagedLib/src/editing.cpp
===================================================================
--- trunk/Mezzanine/MezzanineManagedLib/src/editing.cpp 2007-06-04 22:25:48 UTC (rev 1413)
+++ trunk/Mezzanine/MezzanineManagedLib/src/editing.cpp 2007-06-06 22:06:28 UTC (rev 1414)
@@ -1,460 +1,460 @@
-// editing.cpp: most map editing commands go here, entity editing commands are in world.cpp
-
-#include "cube.h"
-#using <mscorlib.dll>
-using namespace MezzanineLib;
-using namespace MezzanineLib::World;
-
-// the current selection, used by almost all editing commands
-// invariant: all code assumes that these are kept inside MINBORD distance of the edge of the map
-
-block sel =
-{
- variable("selx", 0, 0, 4096, &sel.x, NULL, false),
- variable("sely", 0, 0, 4096, &sel.y, NULL, false),
- variable("selxs", 0, 0, 4096, &sel.xs, NULL, false),
- variable("selys", 0, 0, 4096, &sel.ys, NULL, false),
-};
-
-#define loopselxy(b) { makeundo(); loop(x,sel.xs) loop(y,sel.ys) { sqr *s = S(sel.x+x, sel.y+y); b; }; remip(sel); }
-int curedittex[] = { -1, -1, -1 };
-sqr rtex;
-
-VAR(editing,0,0,1);
-
-void toggleedit()
-{
- if(player1->state==CSStatus::CS_DEAD) return; // do not allow dead players to edit to avoid state confusion
- if(!GameInit::EditMode && !allowedittoggle()) return; // not in most multiplayer modes
- GameInit::EditMode = !GameInit::EditMode;
- if(!GameInit::EditMode)
- {
- settagareas(); // reset triggers to allow quick playtesting
- entinmap(player1); // find spawn closest to current floating pos
- }
- else
- {
- resettagareas(); // clear trigger areas to allow them to be edited
- player1->health = 100;
- if(m_classicsp) monsterclear(); // all monsters back at their spawns for editing
- projreset();
- };
- SdlDotNet::Input::Keyboard::KeyRepeat = GameInit::EditMode;
- Editing::selset = false;
- editing = GameInit::EditMode;
-};
-
-COMMANDN(edittoggle, toggleedit, Support::FunctionSignatures::ARG_NONE);
-
-void correctsel() // ensures above invariant
-{
- Editing::selset = !OUTBORD(sel.x, sel.y);
- int bsize = GameInit::SSize-GameInit::MinBord;
- if(sel.xs+sel.x>bsize) sel.xs = bsize-sel.x;
- if(sel.ys+sel.y>bsize) sel.ys = bsize-sel.y;
- if(sel.xs<=0 || sel.ys<=0) Editing::selset = false;
-};
-
-bool noteditmode()
-{
- correctsel();
- if(!GameInit::EditMode) conoutf("this function is only allowed in edit mode");
- return !GameInit::EditMode;
-};
-
-bool noselection()
-{
- if(!Editing::selset) conoutf("no selection");
- return !Editing::selset;
-};
-
-#define EDITSEL if(noteditmode() || noselection()) return;
-#define EDITSELMP if(noteditmode() || noselection() || multiplayer()) return;
-#define EDITMP if(noteditmode() || multiplayer()) return;
-
-void selectpos(int x, int y, int xs, int ys)
-{
- block s = { x, y, xs, ys };
- sel = s;
- Editing::selh = 0;
- correctsel();
-};
-
-void makesel()
-{
- block s = { min(Editing::lastx,Editing::cx), min(Editing::lasty,Editing::cy), abs(Editing::lastx-Editing::cx)+1, abs(Editing::lasty-Editing::cy)+1 };
- sel = s;
- Editing::selh = max(Editing::lasth,Editing::ch);
- correctsel();
- if(Editing::selset) rtex = *S(sel.x, sel.y);
-};
-
-VAR(flrceil,0,0,2);
-
-float sheight(sqr *s, sqr *t, float z) // finds out z height when cursor points at wall
-{
- return !flrceil //z-s->floor<s->ceil-z
- ? (s->type==BlockTypes::FHF ? s->floor-t->vdelta/4.0f : (float)s->floor)
- : (s->type==BlockTypes::CHF ? s->ceil+t->vdelta/4.0f : (float)s->ceil);
-};
-
-void cursorupdate() // called every frame from hud
-{
- flrceil = ((int)(player1->pitch>=0))*2;
-
- volatile float x = worldpos.x; // volatile needed to prevent msvc7 optimizer bug?
- volatile float y = worldpos.y;
- volatile float z = worldpos.z;
-
- Editing::cx = (int)x;
- Editing::cy = (int)y;
-
- if(OUTBORD(Editing::cx, Editing::cy)) return;
- sqr *s = S(Editing::cx,Editing::cy);
-
- if(fabs(sheight(s,s,z)-z)>1) // selected wall
- {
- x += x>player1->o.x ? 0.5f : -0.5f; // find right wall cube
- y += y>player1->o.y ? 0.5f : -0.5f;
-
- Editing::cx = (int)x;
- Editing::cy = (int)y;
-
- if(OUTBORD(Editing::cx, Editing::cy)) return;
- };
-
- if(Editing::dragging) makesel();
-
- const int GRIDSIZE = 5;
- const float GRIDW = 0.5f;
- const float GRID8 = 2.0f;
- const float GRIDS = 2.0f;
- const int GRIDM = 0x7;
-
- // render editing grid
-
- for(int ix = Editing::cx-GRIDSIZE; ix<=Editing::cx+GRIDSIZE; ix++) for(int iy = Editing::cy-GRIDSIZE; iy<=Editing::cy+GRIDSIZE; iy++)
- {
- if(OUTBORD(ix, iy)) continue;
- sqr *s = S(ix,iy);
- if(SOLID(s)) continue;
- float h1 = sheight(s, s, z);
- float h2 = sheight(s, SWS(s,1,0,GameInit::SSize), z);
- float h3 = sheight(s, SWS(s,1,1,GameInit::SSize), z);
- float h4 = sheight(s, SWS(s,0,1,GameInit::SSize), z);
- if(s->tag) Render::RenderExtras::LineStyle(GRIDW, 0xFF, 0x40, 0x40);
- else if(s->type==BlockTypes::FHF || s->type==BlockTypes::CHF) Render::RenderExtras::LineStyle(GRIDW, 0x80, 0xFF, 0x80);
- else Render::RenderExtras::LineStyle(GRIDW, 0x80, 0x80, 0x80);
- block b = { ix, iy, 1, 1 };
- box(b, h1, h2, h3, h4);
- Render::RenderExtras::LineStyle(GRID8, 0x40, 0x40, 0xFF);
- if(!(ix&GRIDM)) Render::RenderExtras::Line(ix, iy, h1, ix, iy+1, h4);
- if(!(ix+1&GRIDM)) Render::RenderExtras::Line(ix+1, iy, h2, ix+1, iy+1, h3);
- if(!(iy&GRIDM)) Render::RenderExtras::Line(ix, iy, h1, ix+1, iy, h2);
- if(!(iy+1&GRIDM)) Render::RenderExtras::Line(ix, iy+1, h4, ix+1, iy+1, h3);
- };
-
- if(!SOLID(s))
- {
- float ih = sheight(s, s, z);
- Render::RenderExtras::LineStyle(GRIDS, 0xFF, 0xFF, 0xFF);
- block b = { Editing::cx, Editing::cy, 1, 1 };
- box(b, ih, sheight(s, SWS(s,1,0,GameInit::SSize), z), sheight(s, SWS(s,1,1,GameInit::SSize), z), sheight(s, SWS(s,0,1,GameInit::SSize), z));
- Render::RenderExtras::LineStyle(GRIDS, 0xFF, 0x00, 0x00);
- Render::RenderExtras::Dot(Editing::cx, Editing::cy, ih);
- Editing::ch = (int)ih;
- };
-
- if(Editing::selset)
- {
- Render::RenderExtras::LineStyle(GRIDS, 0xFF, 0x40, 0x40);
- box(sel, (float)Editing::selh, (float)Editing::selh, (float)Editing::selh, (float)Editing::selh);
- };
-};
-
-vector<block *> undos; // unlimited undo
-VARP(undomegs, 0, 1, 10); // bounded by n megs
-
-void pruneundos(int maxremain) // bound memory
-{
- int t = 0;
- loopvrev(undos)
- {
- t += undos[i]->xs*undos[i]->ys*sizeof(sqr);
- if(t>maxremain) free(undos.remove(i));
- };
-};
-
-void makeundo()
-{
- undos.add(blockcopy(sel));
- pruneundos(undomegs<<20);
-};
-
-void editundo()
-{
- EDITMP;
- if(undos.empty()) { conoutf("nothing more to undo"); return; };
- block *p = undos.pop();
- blockpaste(*p);
- free(p);
-};
-
-block *copybuf = NULL;
-
-void copy()
-{
- EDITSELMP;
- if(copybuf) free(copybuf);
- copybuf = blockcopy(sel);
-};
-
-void paste()
-{
- EDITMP;
- if(!copybuf) { conoutf("nothing to paste"); return; };
- sel.xs = copybuf->xs;
- sel.ys = copybuf->ys;
- correctsel();
- if(!Editing::selset || sel.xs!=copybuf->xs || sel.ys!=copybuf->ys) { conoutf("incorrect selection"); return; };
- makeundo();
- copybuf->x = sel.x;
- copybuf->y = sel.y;
- blockpaste(*copybuf);
-};
-
-void tofronttex() // maintain most recently used of the texture lists when applying texture
-{
- loopi(3)
- {
- int c = curedittex[i];
- if(c>=0)
- {
- uchar *p = hdr.texlists[i];
- int t = p[c];
- for(int a = c-1; a>=0; a--) p[a+1] = p[a];
- p[0] = t;
- curedittex[i] = -1;
- };
- };
-};
-
-void editdrag(bool isdown)
-{
- if(Editing::dragging = isdown)
- {
- Editing::lastx = Editing::cx;
- Editing::lasty = Editing::cy;
- Editing::lasth = Editing::ch;
- Editing::selset = false;
- tofronttex();
- };
- makesel();
-};
-
-// the core editing function. all the *xy functions perform the core operations
-// and are also called directly from the network, the function below it is strictly
-// triggered locally. They all have very similar structure.
-
-void editheightxy(bool isfloor, int amount, block &sel)
-{
- loopselxy(if(isfloor)
- {
- s->floor += amount;
- if(s->floor>=s->ceil) s->floor = s->ceil-1;
- }
- else
- {
- s->ceil += amount;
- if(s->ceil<=s->floor) s->ceil = s->floor+1;
- });
-};
-
-void editheight(int flr, int amount)
-{
- EDITSEL;
- bool isfloor = flr==0;
- editheightxy(isfloor, amount, sel);
- addmsg(1, 7, NetworkMessages::SV_EDITH, sel.x, sel.y, sel.xs, sel.ys, isfloor, amount);
-};
-
-COMMAND(editheight, Support::FunctionSignatures::ARG_2INT);
-
-void edittexxy(int type, int t, block &sel)
-{
- loopselxy(switch(type)
- {
- case 0: s->ftex = t; break;
- case 1: s->wtex = t; break;
- case 2: s->ctex = t; break;
- case 3: s->utex = t; break;
- });
-};
-
-void edittex(int type, int dir)
-{
- EDITSEL;
- if(type<0 || type>3) return;
- if(type!=Editing::lasttype) { tofronttex(); Editing::lasttype = type; };
- int atype = type==3 ? 1 : type;
- int i = curedittex[atype];
- i = i<0 ? 0 : i+dir;
- curedittex[atype] = i = min(max(i, 0), 255);
- int t = Editing::lasttex = hdr.texlists[atype][i];
- edittexxy(type, t, sel);
- addmsg(1, 7, NetworkMessages::SV_EDITT, sel.x, sel.y, sel.xs, sel.ys, type, t);
-};
-
-void replace()
-{
- EDITSELMP;
- loop(x,GameInit::SSize) loop(y,GameInit::SSize)
- {
- sqr *s = S(x, y);
- switch(Editing::lasttype)
- {
- case 0: if(s->ftex == rtex.ftex) s->ftex = Editing::lasttex; break;
- case 1: if(s->wtex == rtex.wtex) s->wtex = Editing::lasttex; break;
- case 2: if(s->ctex == rtex.ctex) s->ctex = Editing::lasttex; break;
- case 3: if(s->utex == rtex.utex) s->utex = Editing::lasttex; break;
- };
- };
- block b = { 0, 0, GameInit::SSize, GameInit::SSize };
- remip(b);
-};
-
-void edittypexy(int type, block &sel)
-{
- loopselxy(s->type = type);
-};
-
-void edittype(int type)
-{
- EDITSEL;
- if(type==BlockTypes::CORNER && (sel.xs!=sel.ys || sel.xs==3 || sel.xs>4 && sel.xs!=8
- || sel.x&~-sel.xs || sel.y&~-sel.ys))
- { conoutf("corner selection must be power of 2 aligned"); return; };
- edittypexy(type, sel);
- addmsg(1, 6, NetworkMessages::SV_EDITS, sel.x, sel.y, sel.xs, sel.ys, type);
-};
-
-void heightfield(int t) { edittype(t==0 ? BlockTypes::FHF : BlockTypes::CHF); };
-void solid(int t) { edittype(t==0 ? BlockTypes::SPACE : BlockTypes::SOLID); };
-void corner() { edittype(BlockTypes::CORNER); };
-
-COMMAND(heightfield, Support::FunctionSignatures::ARG_1INT);
-COMMAND(solid, Support::FunctionSignatures::ARG_1INT);
-COMMAND(corner, Support::FunctionSignatures::ARG_NONE);
-
-void editequalisexy(bool isfloor, block &sel)
-{
- int low = 127, hi = -128;
- loopselxy(
- {
- if(s->floor<low) low = s->floor;
- if(s->ceil>hi) hi = s->ceil;
- });
- loopselxy(
- {
- if(isfloor) s->floor = low; else s->ceil = hi;
- if(s->floor>=s->ceil) s->floor = s->ceil-1;
- });
-};
-
-void equalize(int flr)
-{
- bool isfloor = flr==0;
- EDITSEL;
- editequalisexy(isfloor, sel);
- addmsg(1, 6, NetworkMessages::SV_EDITE, sel.x, sel.y, sel.xs, sel.ys, isfloor);
-};
-
-COMMAND(equalize, Support::FunctionSignatures::ARG_1INT);
-
-void setvdeltaxy(int delta, block &sel)
-{
- loopselxy(s->vdelta = max(s->vdelta+delta, 0));
- remipmore(sel);
-};
-
-void setvdelta(int delta)
-{
- EDITSEL;
- setvdeltaxy(delta, sel);
- addmsg(1, 6, NetworkMessages::SV_EDITD, sel.x, sel.y, sel.xs, sel.ys, delta);
-};
-
-int archverts[Editing::MAXARCHVERT][Editing::MAXARCHVERT];
-
-void archvertex(int span, int vert, int delta)
-{
- if(!Editing::archvinit)
- {
- Editing::archvinit = true;
- loop(s,Editing::MAXARCHVERT) loop(v,Editing::MAXARCHVERT) archverts[s][v] = 0;
- };
- if(span>=Editing::MAXARCHVERT || vert>=Editing::MAXARCHVERT || span<0 || vert<0) return;
- archverts[span][vert] = delta;
-};
-
-void arch(int sidedelta, int _a)
-{
- EDITSELMP;
- sel.xs++;
- sel.ys++;
- if(sel.xs>Editing::MAXARCHVERT) sel.xs = Editing::MAXARCHVERT;
- if(sel.ys>Editing::MAXARCHVERT) sel.ys = Editing::MAXARCHVERT;
- loopselxy(s->vdelta =
- sel.xs>sel.ys
- ? (archverts[sel.xs-1][x] + (y==0 || y==sel.ys-1 ? sidedelta : 0))
- : (archverts[sel.ys-1][y] + (x==0 || x==sel.xs-1 ? sidedelta : 0)));
- remipmore(sel);
-};
-
-void slope(int xd, int yd)
-{
- EDITSELMP;
- int off = 0;
- if(xd<0) off -= xd*sel.xs;
- if(yd<0) off -= yd*sel.ys;
- sel.xs++;
- sel.ys++;
- loopselxy(s->vdelta = xd*x+yd*y+off);
- remipmore(sel);
-};
-
-
-VARF(fullbright, 0, 0, 1,
- if(fullbright)
- {
- if(noteditmode()) return;
- loopi(GameInit::MipSize) world[i].r = world[i].g = world[i].b = 176;
- };
-);
-
-void edittag(int tag)
-{
- EDITSELMP;
- loopselxy(s->tag = tag);
-};
-
-void newent(char *what, char *a1, char *a2, char *a3, char *a4)
-{
- EDITSEL;
- newentity(sel.x, sel.y, (int)player1->o.z, what, ATOI(a1), ATOI(a2), ATOI(a3), ATOI(a4));
-};
-
-COMMANDN(select, selectpos, Support::FunctionSignatures::ARG_4INT);
-COMMAND(edittag, Support::FunctionSignatures::ARG_1INT);
-COMMAND(replace, Support::FunctionSignatures::ARG_NONE);
-COMMAND(archvertex, Support::FunctionSignatures::ARG_3INT);
-COMMAND(arch, Support::FunctionSignatures::ARG_2INT);
-COMMAND(slope, Support::FunctionSignatures::ARG_2INT);
-COMMANDN(vdelta, setvdelta, Support::FunctionSignatures::ARG_1INT);
-COMMANDN(undo, editundo, Support::FunctionSignatures::ARG_NONE);
-COMMAND(copy, Support::FunctionSignatures::ARG_NONE);
-COMMAND(paste, Support::FunctionSignatures::ARG_NONE);
-COMMAND(edittex, Support::FunctionSignatures::ARG_2INT);
-COMMAND(newent, Support::FunctionSignatures::ARG_5STR);
-
-
+//// editing.cpp: most map editing commands go here, entity editing commands are in world.cpp
+//
+//#include "cube.h"
+//#using <mscorlib.dll>
+//using namespace MezzanineLib;
+//using namespace MezzanineLib::World;
+//
+//// the current selection, used by almost all editing commands
+//// invariant: all code assumes that these are kept inside MINBORD distance of the edge of the map
+//
+//block sel =
+//{
+// variable("selx", 0, 0, 4096, &sel.x, NULL, false),
+// variable("sely", 0, 0, 4096, &sel.y, NULL, false),
+// variable("selxs", 0, 0, 4096, &sel.xs, NULL, false),
+// variable("selys", 0, 0, 4096, &sel.ys, NULL, false),
+//};
+//
+//#define loopselxy(b) { makeundo(); loop(x,sel.xs) loop(y,sel.ys) { sqr *s = S(sel.x+x, sel.y+y); b; }; remip(sel); }
+//int curedittex[] = { -1, -1, -1 };
+//sqr rtex;
+//
+//VAR(editing,0,0,1);
+//
+//void toggleedit()
+//{
+// if(player1->state==CSStatus::CS_DEAD) return; // do not allow dead players to edit to avoid state confusion
+// if(!GameInit::EditMode && !allowedittoggle()) return; // not in most multiplayer modes
+// GameInit::EditMode = !GameInit::EditMode;
+// if(!GameInit::EditMode)
+// {
+// settagareas(); // reset triggers to allow quick playtesting
+// entinmap(player1); // find spawn closest to current floating pos
+// }
+// else
+// {
+// resettagareas(); // clear trigger areas to allow them to be edited
+// player1->health = 100;
+// if(m_classicsp) monsterclear(); // all monsters back at their spawns for editing
+// projreset();
+// };
+// SdlDotNet::Input::Keyboard::KeyRepeat = GameInit::EditMode;
+// Editing::selset = false;
+// editing = GameInit::EditMode;
+//};
+//
+//COMMANDN(edittoggle, toggleedit, Support::FunctionSignatures::ARG_NONE);
+//
+//void correctsel() // ensures above invariant
+//{
+// Editing::selset = !OUTBORD(sel.x, sel.y);
+// int bsize = GameInit::SSize-GameInit::MinBord;
+// if(sel.xs+sel.x>bsize) sel.xs = bsize-sel.x;
+// if(sel.ys+sel.y>bsize) sel.ys = bsize-sel.y;
+// if(sel.xs<=0 || sel.ys<=0) Editing::selset = false;
+//};
+//
+//bool noteditmode()
+//{
+// correctsel();
+// if(!GameInit::EditMode) conoutf("this function is only allowed in edit mode");
+// return !GameInit::EditMode;
+//};
+//
+//bool noselection()
+//{
+// if(!Editing::selset) conoutf("no selection");
+// return !Editing::selset;
+//};
+//
+//#define EDITSEL if(noteditmode() || noselection()) return;
+//#define EDITSELMP if(noteditmode() || noselection() || multiplayer()) return;
+//#define EDITMP if(noteditmode() || multiplayer()) return;
+//
+//void selectpos(int x, int y, int xs, int ys)
+//{
+// block s = { x, y, xs, ys };
+// sel = s;
+// Editing::selh = 0;
+// correctsel();
+//};
+//
+//void makesel()
+//{
+// block s = { min(Editing::lastx,Editing::cx), min(Editing::lasty,Editing::cy), abs(Editing::lastx-Editing::cx)+1, abs(Editing::lasty-Editing::cy)+1 };
+// sel = s;
+// Editing::selh = max(Editing::lasth,Editing::ch);
+// correctsel();
+// if(Editing::selset) rtex = *S(sel.x, sel.y);
+//};
+//
+//VAR(flrceil,0,0,2);
+//
+//float sheight(sqr *s, sqr *t, float z) // finds out z height when cursor points at wall
+//{
+// return !flrceil //z-s->floor<s->ceil-z
+// ? (s->type==BlockTypes::FHF ? s->floor-t->vdelta/4.0f : (float)s->floor)
+// : (s->type==BlockTypes::CHF ? s->ceil+t->vdelta/4.0f : (float)s->ceil);
+//};
+//
+//void cursorupdate() // called every frame from hud
+//{
+// flrceil = ((int)(player1->pitch>=0))*2;
+//
+// volatile float x = worldpos.x; // volatile needed to prevent msvc7 optimizer bug?
+// volatile float y = worldpos.y;
+// volatile float z = worldpos.z;
+//
+// Editing::cx = (int)x;
+// Editing::cy = (int)y;
+//
+// if(OUTBORD(Editing::cx, Editing::cy)) return;
+// sqr *s = S(Editing::cx,Editing::cy);
+//
+// if(fabs(sheight(s,s,z)-z)>1) // selected wall
+// {
+// x += x>player1->o.x ? 0.5f : -0.5f; // find right wall cube
+// y += y>player1->o.y ? 0.5f : -0.5f;
+//
+// Editing::cx = (int)x;
+// Editing::cy = (int)y;
+//
+// if(OUTBORD(Editing::cx, Editing::cy)) return;
+// };
+//
+// if(Editing::dragging) makesel();
+//
+// const int GRIDSIZE = 5;
+// const float GRIDW = 0.5f;
+// const float GRID8 = 2.0f;
+// const float GRIDS = 2.0f;
+// const int GRIDM = 0x7;
+//
+// // render editing grid
+//
+// for(int ix = Editing::cx-GRIDSIZE; ix<=Editing::cx+GRIDSIZE; ix++) for(int iy = Editing::cy-GRIDSIZE; iy<=Editing::cy+GRIDSIZE; iy++)
+// {
+// if(OUTBORD(ix, iy)) continue;
+// sqr *s = S(ix,iy);
+// if(SOLID(s)) continue;
+// float h1 = sheight(s, s, z);
+// float h2 = sheight(s, SWS(s,1,0,GameInit::SSize), z);
+// float h3 = sheight(s, SWS(s,1,1,GameInit::SSize), z);
+// float h4 = sheight(s, SWS(s,0,1,GameInit::SSize), z);
+// if(s->tag) Render::RenderExtras::LineStyle(GRIDW, 0xFF, 0x40, 0x40);
+// else if(s->type==BlockTypes::FHF || s->type==BlockTypes::CHF) Render::RenderExtras::LineStyle(GRIDW, 0x80, 0xFF, 0x80);
+// else Render::RenderExtras::LineStyle(GRIDW, 0x80, 0x80, 0x80);
+// block b = { ix, iy, 1, 1 };
+// box(b, h1, h2, h3, h4);
+// Render::RenderExtras::LineStyle(GRID8, 0x40, 0x40, 0xFF);
+// if(!(ix&GRIDM)) Render::RenderExtras::Line(ix, iy, h1, ix, iy+1, h4);
+// if(!(ix+1&GRIDM)) Render::RenderExtras::Line(ix+1, iy, h2, ix+1, iy+1, h3);
+// if(!(iy&GRIDM)) Render::RenderExtras::Line(ix, iy, h1, ix+1, iy, h2);
+// if(!(iy+1&GRIDM)) Render::RenderExtras::Line(ix, iy+1, h4, ix+1, iy+1, h3);
+// };
+//
+// if(!SOLID(s))
+// {
+// float ih = sheight(s, s, z);
+// Render::RenderExtras::LineStyle(GRIDS, 0xFF, 0xFF, 0xFF);
+// block b = { Editing::cx, Editing::cy, 1, 1 };
+// box(b, ih, sheight(s, SWS(s,1,0,GameInit::SSize), z), sheight(s, SWS(s,1,1,GameInit::SSize), z), sheight(s, SWS(s,0,1,GameInit::SSize), z));
+// Render::RenderExtras::LineStyle(GRIDS, 0xFF, 0x00, 0x00);
+// Render::RenderExtras::Dot(Editing::cx, Editing::cy, ih);
+// Editing::ch = (int)ih;
+// };
+//
+// if(Editing::selset)
+// {
+// Render::RenderExtras::LineStyle(GRIDS, 0xFF, 0x40, 0x40);
+// box(sel, (float)Editing::selh, (float)Editing::selh, (float)Editing::selh, (float)Editing::selh);
+// };
+//};
+//
+//vector<block *> undos; // unlimited undo
+//VARP(undomegs, 0, 1, 10); // bounded by n megs
+//
+//void pruneundos(int maxremain) // bound memory
+//{
+// int t = 0;
+// loopvrev(undos)
+// {
+// t += undos[i]->xs*undos[i]->ys*sizeof(sqr);
+// if(t>maxremain) free(undos.remove(i));
+// };
+//};
+//
+//void makeundo()
+//{
+// undos.add(blockcopy(sel));
+// pruneundos(undomegs<<20);
+//};
+//
+//void editundo()
+//{
+// EDITMP;
+// if(undos.empty()) { conoutf("nothing more to undo"); return; };
+// block *p = undos.pop();
+// blockpaste(*p);
+// free(p);
+//};
+//
+//block *copybuf = NULL;
+//
+//void copy()
+//{
+// EDITSELMP;
+// if(copybuf) free(copybuf);
+// copybuf = blockcopy(sel);
+//};
+//
+//void paste()
+//{
+// EDITMP;
+// if(!copybuf) { conoutf("nothing to paste"); return; };
+// sel.xs = copybuf->xs;
+// sel.ys = copybuf->ys;
+// correctsel();
+// if(!Editing::selset || sel.xs!=copybuf->xs || sel.ys!=copybuf->ys) { conoutf("incorrect selection"); return; };
+// makeundo();
+// copybuf->x = sel.x;
+// copybuf->y = sel.y;
+// blockpaste(*copybuf);
+//};
+//
+//void tofronttex() // maintain most recently used of the texture lists when applying texture
+//{
+// loopi(3)
+// {
+// int c = curedittex[i];
+// if(c>=0)
+// {
+// uchar *p = hdr.texlists[i];
+// int t = p[c];
+// for(int a = c-1; a>=0; a--) p[a+1] = p[a];
+// p[0] = t;
+// curedittex[i] = -1;
+// };
+// };
+//};
+//
+//void editdrag(bool isdown)
+//{
+// if(Editing::dragging = isdown)
+// {
+// Editing::lastx = Editing::cx;
+// Editing::lasty = Editing::cy;
+// Editing::lasth = Editing::ch;
+// Editing::selset = false;
+// tofronttex();
+// };
+// makesel();
+//};
+//
+//// the core editing function. all the *xy functions perform the core operations
+//// and are also called directly from the network, the function below it is strictly
+//// triggered locally. They all have very similar structure.
+//
+//void editheightxy(bool isfloor, int amount, block &sel)
+//{
+// loopselxy(if(isfloor)
+// {
+// s->floor += amount;
+// if(s->floor>=s->ceil) s->floor = s->ceil-1;
+// }
+// else
+// {
+// s->ceil += amount;
+// if(s->ceil<=s->floor) s->ceil = s->floor+1;
+// });
+//};
+//
+//void editheight(int flr, int amount)
+//{
+// EDITSEL;
+// bool isfloor = flr==0;
+// editheightxy(isfloor, amount, sel);
+// addmsg(1, 7, NetworkMessages::SV_EDITH, sel.x, sel.y, sel.xs, sel.ys, isfloor, amount);
+//};
+//
+//COMMAND(editheight, Support::FunctionSignatures::ARG_2INT);
+//
+//void edittexxy(int type, int t, block &sel)
+//{
+// loopselxy(switch(type)
+// {
+// case 0: s->ftex = t; break;
+// case 1: s->wtex = t; break;
+// case 2: s->ctex = t; break;
+// case 3: s->utex = t; break;
+// });
+//};
+//
+//void edittex(int type, int dir)
+//{
+// EDITSEL;
+// if(type<0 || type>3) return;
+// if(type!=Editing::lasttype) { tofronttex(); Editing::lasttype = type; };
+// int atype = type==3 ? 1 : type;
+// int i = curedittex[atype];
+// i = i<0 ? 0 : i+dir;
+// curedittex[atype] = i = min(max(i, 0), 255);
+// int t = Editing::lasttex = hdr.texlists[atype][i];
+// edittexxy(type, t, sel);
+// addmsg(1, 7, NetworkMessages::SV_EDITT, sel.x, sel.y, sel.xs, sel.ys, type, t);
+//};
+//
+//void replace()
+//{
+// EDITSELMP;
+// loop(x,GameInit::SSize) loop(y,GameInit::SSize)
+// {
+// sqr *s = S(x, y);
+// switch(Editing::lasttype)
+// {
+// case 0: if(s->ftex == rtex.ftex) s->ftex = Editing::lasttex; break;
+// case 1: if(s->wtex == rtex.wtex) s->wtex = Editing::lasttex; break;
+// case 2: if(s->ctex == rtex.ctex) s->ctex = Editing::lasttex; break;
+// case 3: if(s->utex == rtex.utex) s->utex = Editing::lasttex; break;
+// };
+// };
+// block b = { 0, 0, GameInit::SSize, GameInit::SSize };
+// remip(b);
+//};
+//
+//void edittypexy(int type, block &sel)
+//{
+// loopselxy(s->type = type);
+//};
+//
+//void edittype(int type)
+//{
+// EDITSEL;
+// if(type==BlockTypes::CORNER && (sel.xs!=sel.ys || sel.xs==3 || sel.xs>4 && sel.xs!=8
+// || sel.x&~-sel.xs || sel.y&~-sel.ys))
+// { conoutf("corner selection must be power of 2 aligned"); return; };
+// edittypexy(type, sel);
+// addmsg(1, 6, NetworkMessages::SV_EDITS, sel.x, sel.y, sel.xs, sel.ys, type);
+//};
+//
+//void heightfield(int t) { edittype(t==0 ? BlockTypes::FHF : BlockTypes::CHF); };
+//void solid(int t) { edittype(t==0 ? BlockTypes::SPACE : BlockTypes::SOLID); };
+//void corner() { edittype(BlockTypes::CORNER); };
+//
+//COMMAND(heightfield, Support::FunctionSignatures::ARG_1INT);
+//COMMAND(solid, Support::FunctionSignatures::ARG_1INT);
+//COMMAND(corner, Support::FunctionSignatures::ARG_NONE);
+//
+//void editequalisexy(bool isfloor, block &sel)
+//{
+// int low = 127, hi = -128;
+// loopselxy(
+// {
+// if(s->floor<low) low = s->floor;
+// if(s->ceil>hi) hi = s->ceil;
+// });
+// loopselxy(
+// {
+// if(isfloor) s->floor = low; else s->ceil = hi;
+// if(s->floor>=s->ceil) s->floor = s->ceil-1;
+// });
+//};
+//
+//void equalize(int flr)
+//{
+// bool isfloor = flr==0;
+// EDITSEL;
+// editequalisexy(isfloor, sel);
+// addmsg(1, 6, NetworkMessages::SV_EDITE, sel.x, sel.y, sel.xs, sel.ys, isfloor);
+//};
+//
+//COMMAND(equalize, Support::FunctionSignatures::ARG_1INT);
+//
+//void setvdeltaxy(int delta, block &sel)
+//{
+// loopselxy(s->vdelta = max(s->vdelta+delta, 0));
+// remipmore(sel);
+//};
+//
+//void setvdelta(int delta)
+//{
+// EDITSEL;
+// setvdeltaxy(delta, sel);
+// addmsg(1, 6, NetworkMessages::SV_EDITD, sel.x, sel.y, sel.xs, sel.ys, delta);
+//};
+//
+//int archverts[Editing::MAXARCHVERT][Editing::MAXARCHVERT];
+//
+//void archvertex(int span, int vert, int delta)
+//{
+// if(!Editing::archvinit)
+// {
+// Editing::archvinit = true;
+// loop(s,Editing::MAXARCHVERT) loop(v,Editing::MAXARCHVERT) archverts[s][v] = 0;
+// };
+// if(span>=Editing::MAXARCHVERT || vert>=Editing::MAXARCHVERT || span<0 || vert<0) return;
+// archverts[span][vert] = delta;
+//};
+//
+//void arch(int sidedelta, int _a)
+//{
+// EDITSELMP;
+// sel.xs++;
+// sel.ys++;
+// if(sel.xs>Editing::MAXARCHVERT) sel.xs = Editing::MAXARCHVERT;
+// if(sel.ys>Editing::MAXARCHVERT) sel.ys = Editing::MAXARCHVERT;
+// loopselxy(s->vdelta =
+// sel.xs>sel.ys
+// ? (archverts[sel.xs-1][x] + (y==0 || y==sel.ys-1 ? sidedelta : 0))
+// : (archverts[sel.ys-1][y] + (x==0 || x==sel.xs-1 ? sidedelta : 0)));
+// remipmore(sel);
+//};
+//
+//void slope(int xd, int yd)
+//{
+// EDITSELMP;
+// int off = 0;
+// if(xd<0) off -= xd*sel.xs;
+// if(yd<0) off -= yd*sel.ys;
+// sel.xs++;
+// sel.ys++;
+// loopselxy(s->vdelta = xd*x+yd*y+off);
+// remipmore(sel);
+//};
+//
+//
+//VARF(fullbright, 0, 0, 1,
+// if(fullbright)
+// {
+// if(noteditmode()) return;
+// loopi(GameInit::MipSize) world[i].r = world[i].g = world[i].b = 176;
+// };
+//);
+//
+//void edittag(int tag)
+//{
+// EDITSELMP;
+// loopselxy(s->tag = tag);
+//};
+//
+//void newent(char *what, char *a1, char *a2, char *a3, char *a4)
+//{
+// EDITSEL;
+// newentity(sel.x, sel.y, (int)player1->o.z, what, ATOI(a1), ATOI(a2), ATOI(a3), ATOI(a4));
+//};
+//
+//COMMANDN(select, selectpos, Support::FunctionSignatures::ARG_4INT);
+//COMMAND(edittag, Support::FunctionSignatures::ARG_1INT);
+//COMMAND(replace, Support::FunctionSignatures::ARG_NONE);
+//COMMAND(archvertex, Support::FunctionSignatures::ARG_3INT);
+//COMMAND(arch, Support::FunctionSignatures::ARG_2INT);
+//COMMAND(slope, Support::FunctionSignatures::ARG_2INT);
+//COMMANDN(vdelta, setvdelta, Support::FunctionSignatures::ARG_1INT);
+//COMMANDN(undo, editundo, Support::FunctionSignatures::ARG_NONE);
+//COMMAND(copy, Support::FunctionSignatures::ARG_NONE);
+//COMMAND(paste, Support::FunctionSignatures::ARG_NONE);
+//COMMAND(edittex, Support::FunctionSignatures::ARG_2INT);
+//COMMAND(newent, Support::FunctionSignatures::ARG_5STR);
+//
+//
Modified: trunk/Mezzanine/MezzanineManagedLib/src/protos.h
===================================================================
--- trunk/Mezzanine/MezzanineManagedLib/src/protos.h 2007-06-04 22:25:48 UTC (rev 1413)
+++ trunk/Mezzanine/MezzanineManagedLib/src/protos.h 2007-06-06 22:06:28 UTC (rev 1414)
@@ -133,16 +133,16 @@
extern DECLSPEC int CDECL text_width(char *str);
// editing
-extern DECLSPEC void CDECL cursorupdate();
-extern DECLSPEC void CDECL toggleedit();
-extern DECLSPEC void CDECL editdrag(bool isdown);
-extern DECLSPEC void CDECL setvdeltaxy(int delta, block &sel);
-extern DECLSPEC void CDECL editequalisexy(bool isfloor, block &sel);
-extern DECLSPEC void CDECL edittypexy(int type, block &sel);
-extern DECLSPEC void CDECL edittexxy(int type, int t, block &sel);
-extern DECLSPEC void CDECL editheightxy(bool isfloor, int amount, block &sel);
-extern DECLSPEC bool CDECL noteditmode();
-extern DECLSPEC void CDECL pruneundos(int maxremain = 0);
+//extern DECLSPEC void CDECL cursorupdate();
+//extern DECLSPEC void CDECL toggleedit();
+//extern DECLSPEC void CDECL editdrag(bool isdown);
+//extern DECLSPEC void CDECL setvdeltaxy(int delta, block &sel);
+//extern DECLSPEC void CDECL editequalisexy(bool isfloor, block &sel);
+//extern DECLSPEC void CDECL edittypexy(int type, block &sel);
+//extern DECLSPEC void CDECL edittexxy(int type, int t, block &sel);
+//extern DECLSPEC void CDECL editheightxy(bool isfloor, int amount, block &sel);
+//extern DECLSPEC bool CDECL noteditmode();
+//extern DECLSPEC void CDECL pruneundos(int maxremain = 0);
// renderextras
extern DECLSPEC void CDECL box(block &b, float z1, float z2, float z3, float z4);
Modified: trunk/Mezzanine/MezzanineManagedLib/src/rendercubes.cpp
===================================================================
--- trunk/Mezzanine/MezzanineManagedLib/src/rendercubes.cpp 2007-06-04 22:25:48 UTC (rev 1413)
+++ trunk/Mezzanine/MezzanineManagedLib/src/rendercubes.cpp 2007-06-06 22:06:28 UTC (rev 1414)
@@ -254,7 +254,7 @@
};
VAR(watersubdiv, 1, 4, 64);
-VARF(waterlevel, -128, -128, 127, if(!noteditmode()) hdr.waterlevel = waterlevel);
+VARF(waterlevel, -128, -128, 127, /*if(!noteditmode()) hdr.waterlevel = waterlevel*/);
inline void vertw(int v1, float v2, int v3, sqr *c, float t1, float t2, float t)
{
Modified: trunk/Mezzanine/MezzanineManagedLib/src/renderextras.cpp
===================================================================
--- trunk/Mezzanine/MezzanineManagedLib/src/renderextras.cpp 2007-06-04 22:25:48 UTC (rev 1413)
+++ trunk/Mezzanine/MezzanineManagedLib/src/renderextras.cpp 2007-06-06 22:06:28 UTC (rev 1414)
@@ -166,7 +166,7 @@
{
if(cursordepth==1.0f) worldpos = player1->o;
glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
- cursorupdate();
+ //cursorupdate();
glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
};
Modified: trunk/Mezzanine/MezzanineManagedLib/src/world.cpp
===================================================================
--- trunk/Mezzanine/MezzanineManagedLib/src/world.cpp 2007-06-04 22:25:48 UTC (rev 1413)
+++ trunk/Mezzanine/MezzanineManagedLib/src/world.cpp 2007-06-06 22:06:28 UTC (rev 1414)
@@ -165,8 +165,9 @@
int closestent() // used for delent and edit mode ent display
{
- if(noteditmode()) return -1;
- int best;
+ return -1;
+ //if(noteditmode()) return -1;
+ /*int best;
float bdist = 99999;
loopv(ents)
{
@@ -180,7 +181,7 @@
bdist = dist;
};
};
- return bdist==99999 ? -1 : best;
+ return bdist==99999 ? -1 : best; */
};
void entproperty(int prop, int amount)
@@ -238,13 +239,14 @@
void clearents(char *name)
{
int type = MezzanineLib::World::World::FindType(name);
- if(noteditmode() || multiplayer()) return;
- loopv(ents)
+ return;
+ //if(noteditmode() || multiplayer()) return;
+ /*loopv(ents)
{
entity &e = ents[i];
if(e.type==type) e.type = StaticEntity::NOTUSED;
};
- if(type==StaticEntity::LIGHT) calclight();
+ if(type==StaticEntity::LIGHT) calclight();*/
};
COMMAND(clearents, Support::FunctionSignatures::ARG_1STR);
@@ -298,9 +300,10 @@
void empty_world(int factor, bool force) // main empty world creation routine, if passed factor -1 will enlarge old world by 1
{
- if(!force && noteditmode()) return;
+ //if(!force && noteditmode()) return;
+ if(!force) return;
cleardlights();
- pruneundos();
+ //pruneundos();
sqr *oldworld = world;
bool copy = false;
if(oldworld && factor<0) { factor = GameInit::SFactor+1; copy = true; };
@@ -347,7 +350,7 @@
loopk(3) loopi(256) hdr.texlists[k][i] = i;
ents.setsize(0);
block b = { 8, 8, GameInit::SSize-16, GameInit::SSize-16 };
- edittypexy(BlockTypes::SPACE, b);
+ //edittypexy(BlockTypes::SPACE, b);
};
calclight();
@@ -355,8 +358,8 @@
if(oldworld)
{
free(oldworld);
- toggleedit();
- execute("fullbright 1");
+ //toggleedit();
+ //execute("fullbright 1");
};
};
Modified: trunk/Mezzanine/MezzanineManagedLib/src/worldio.cpp
===================================================================
--- trunk/Mezzanine/MezzanineManagedLib/src/worldio.cpp 2007-06-04 22:25:48 UTC (rev 1413)
+++ trunk/Mezzanine/MezzanineManagedLib/src/worldio.cpp 2007-06-06 22:06:28 UTC (rev 1414)
@@ -213,7 +213,7 @@
{
stopifrecording();
cleardlights();
- pruneundos();
+ //pruneundos();
setnames(mname);
gzFile f = gzopen(cgzname, "rb9");
if(!f) { conoutf("could not read map %s", cgzname); return; };
Modified: trunk/Mezzanine/MezzanineManagedLib/src/worldlight.cpp
===================================================================
--- trunk/Mezzanine/MezzanineManagedLib/src/worldlight.cpp 2007-06-04 22:25:48 UTC (rev 1413)
+++ trunk/Mezzanine/MezzanineManagedLib/src/worldlight.cpp 2007-06-06 22:06:28 UTC (rev 1414)
@@ -155,7 +155,7 @@
block b = { 1, 1, GameInit::SSize-2, GameInit::SSize-2 };
postlightarea(b);
- setvar("fullbright", 0);
+ //setvar("fullbright", 0);
};
VARP(dynlight, 0, 16, 32);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <je...@us...> - 2008-02-29 20:49:14
|
Revision: 1473
http://cs-sdl.svn.sourceforge.net/cs-sdl/?rev=1473&view=rev
Author: jendave
Date: 2008-02-29 12:49:08 -0800 (Fri, 29 Feb 2008)
Log Message:
-----------
update to latest versions
Modified Paths:
--------------
trunk/Mezzanine/lib/SdlDotNet.dll
trunk/Mezzanine/lib/SdlDotNet.xml
trunk/Mezzanine/lib/Tao.OpenGl.dll
trunk/Mezzanine/lib/Tao.OpenGl.dll.config
trunk/Mezzanine/lib/Tao.Sdl.dll
trunk/Mezzanine/lib/Tao.Sdl.dll.config
trunk/Mezzanine/lib/Tao.Sdl.xml
Added Paths:
-----------
trunk/Mezzanine/lib/Tao.Sdl.Readme.txt
Property Changed:
----------------
trunk/Mezzanine/
Property changes on: trunk/Mezzanine
___________________________________________________________________
Name: svn:ignore
- packages
bin
data
Mezzanine.ncb
Mezzanine.suo
config.cfg
servers.cfg
docsold
temp
game
_UpgradeReport_Files
UpgradeLog.XML
+ packages
bin
data
Mezzanine.ncb
Mezzanine.suo
config.cfg
servers.cfg
docsold
temp
game
_UpgradeReport_Files
UpgradeLog.XML
Mezzanine.vshost.exe
Modified: trunk/Mezzanine/lib/SdlDotNet.dll
===================================================================
(Binary files differ)
Modified: trunk/Mezzanine/lib/SdlDotNet.xml
===================================================================
--- trunk/Mezzanine/lib/SdlDotNet.xml 2008-02-27 23:39:49 UTC (rev 1472)
+++ trunk/Mezzanine/lib/SdlDotNet.xml 2008-02-29 20:49:08 UTC (rev 1473)
@@ -4,110 +4,6 @@
<name>SdlDotNet</name>
</assembly>
<members>
- <member name="T:SdlDotNet.Windows.SurfaceControl">
- <summary>
- Provides a simple Sdl Surface control allowing
- quick development of Windows Forms-based
- Sdl Surface applications.
- </summary>
- </member>
- <member name="M:SdlDotNet.Windows.SurfaceControl.#ctor">
- <summary>
- Constructor
- </summary>
- </member>
- <member name="M:SdlDotNet.Windows.SurfaceControl.Blit(SdlDotNet.Graphics.Surface)">
- <summary>
- Copies surface to this surface
- </summary>
- <param name="surface">surface to copy onto control</param>
- </member>
- <member name="M:SdlDotNet.Windows.SurfaceControl.Blit(SdlDotNet.Graphics.Surface,System.Drawing.Point)">
- <summary>
- Copies surface onto this surface at a set position.
- </summary>
- <param name="sourceSurface"></param>
- <param name="destinationPosition"></param>
- </member>
- <member name="M:SdlDotNet.Windows.SurfaceControl.KeyPressed(System.Windows.Forms.KeyEventArgs)">
- <summary>
-
- </summary>
- <param name="e"></param>
- </member>
- <member name="M:SdlDotNet.Windows.SurfaceControl.KeyReleased(System.Windows.Forms.KeyEventArgs)">
- <summary>
-
- </summary>
- <param name="e"></param>
- </member>
- <member name="M:SdlDotNet.Windows.SurfaceControl.OnResize(System.EventArgs)">
- <summary>
- Raises the OnResize event
- </summary>
- <param name="e">Contains the event data</param>
- </member>
- <member name="M:SdlDotNet.Windows.SurfaceControl.OnSizeChanged(System.EventArgs)">
- <summary>
- Raises the SizeChanged event
- </summary>
- <param name="e">Contains the event data</param>
- </member>
- <member name="M:SdlDotNet.Windows.SurfaceControl.OnMouseDown(System.Windows.Forms.MouseEventArgs)">
- <summary>
- Raises the MouseDown event
- </summary>
- <param name="e">Contains the event data</param>
- </member>
- <member name="M:SdlDotNet.Windows.SurfaceControl.OnMouseUp(System.Windows.Forms.MouseEventArgs)">
- <summary>
- Raises the MouseUp event
- </summary>
- <param name="e">Contains the event data</param>
- </member>
- <member name="M:SdlDotNet.Windows.SurfaceControl.OnMouseMove(System.Windows.Forms.MouseEventArgs)">
- <summary>
- Raises the MouseMove event
- </summary>
- <param name="e">Contains the event data</param>
- </member>
- <member name="M:SdlDotNet.Windows.SurfaceControl.OnKeyDown(System.Windows.Forms.KeyEventArgs)">
- <summary>
- Raises the
- <see cref="E:System.Windows.Forms.Control.KeyDown"/> event.
- </summary>
- <param name="e">A
- <see cref="T:System.Windows.Forms.KeyEventArgs"/>
- that contains the event data.</param>
- </member>
- <member name="M:SdlDotNet.Windows.SurfaceControl.OnKeyUp(System.Windows.Forms.KeyEventArgs)">
- <summary>
- Raises the
- <see cref="E:System.Windows.Forms.Control.KeyUp"/>
- event.
- </summary>
- <param name="e">A
- <see cref="T:System.Windows.Forms.KeyEventArgs"/>
- that contains the event data.</param>
- </member>
- <member name="M:SdlDotNet.Windows.SurfaceControl.Dispose(System.Boolean)">
- <summary>
- Clean up any resources being used.
- </summary>
- <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
- </member>
- <member name="M:SdlDotNet.Windows.SurfaceControl.InitializeComponent">
- <summary>
- Required method for Designer support - do not modify
- the contents of this method with the code editor.
- </summary>
- </member>
- <member name="T:SdlDotNet.Windows.SurfaceControl.BlitEvent">
- <summary>
-
- </summary>
- <param name="surface"></param>
- </member>
<member name="T:SdlDotNet.Audio.AudioException">
<summary>
Represents a Audio run-time error from the Sdl library.
@@ -3315,6 +3211,2593 @@
Gets and sets the vectors x and y points using integers.
</summary>
</member>
+ <member name="T:SdlDotNet.Graphics.Primitives.Bezier">
+ <summary>
+ Bezier curve
+ </summary>
+ </member>
+ <member name="T:SdlDotNet.Graphics.IPrimitive">
+ <summary>
+ Interface for primitive shapes
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Graphics.IPrimitive.Draw(SdlDotNet.Graphics.Surface,System.Drawing.Color)">
+ <summary>
+
+ </summary>
+ <param name="surface"></param>
+ <param name="color"></param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.IPrimitive.Draw(SdlDotNet.Graphics.Surface,System.Drawing.Color,System.Boolean)">
+ <summary>
+
+ </summary>
+ <param name="surface"></param>
+ <param name="color"></param>
+ <param name="antiAlias"></param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.IPrimitive.Draw(SdlDotNet.Graphics.Surface,System.Drawing.Color,System.Boolean,System.Boolean)">
+ <summary>
+
+ </summary>
+ <param name="surface"></param>
+ <param name="color"></param>
+ <param name="antiAlias"></param>
+ <param name="fill"></param>
+ </member>
+ <member name="P:SdlDotNet.Graphics.IPrimitive.Center">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Bezier.#ctor(System.Int16[],System.Int16[],System.Int32)">
+ <summary>
+ Constructor
+ </summary>
+ <param name="positionsX">array of x positions</param>
+ <param name="positionsY">array of y positions</param>
+ <param name="steps">number of steps in curve</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Bezier.#ctor(System.Collections.ArrayList,System.Int32)">
+ <summary>
+ Constructor
+ </summary>
+ <param name="points">Points of curve</param>
+ <param name="steps">number of steps in curve</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Bezier.PositionsX">
+ <summary>
+ Get array of x positions of point
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Bezier.PositionsX(System.Int16[])">
+ <summary>
+ Set array of x positions of points
+ </summary>
+ <param name="arrayX">array of positions</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Bezier.PositionsY">
+ <summary>
+ Get array of y positions of points
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Bezier.PositionsY(System.Int16[])">
+ <summary>
+ Set array of y positions of points
+ </summary>
+ <param name="arrayY">array of positions</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Bezier.Draw(SdlDotNet.Graphics.Surface,System.Drawing.Color,System.Boolean,System.Boolean)">
+ <summary>
+ Draw filled primitive onto surface
+ </summary>
+ <param name="surface">Surface to draw to</param>
+ <param name="color">Color to fill primitive</param>
+ <param name="antiAlias">antialias primitive</param>
+ <param name="fill">fill primitive with color</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Bezier.Draw(SdlDotNet.Graphics.Surface,System.Drawing.Color,System.Boolean)">
+ <summary>
+ Draw primitive onto surface
+ </summary>
+ <param name="surface">surface to draw to</param>
+ <param name="color">Color of primitive</param>
+ <param name="antiAlias">Antialias primitive</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Bezier.Draw(SdlDotNet.Graphics.Surface,System.Drawing.Color)">
+ <summary>
+ Draw primitive onto surface
+ </summary>
+ <param name="surface">surface to draw to</param>
+ <param name="color">Color of primitive</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Bezier.ToString">
+ <summary>
+ String representation of bezier curve
+ </summary>
+ <returns>string representation</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Bezier.Equals(System.Object)">
+ <summary>
+ Equals operator
+ </summary>
+ <param name="obj">bezier to compare</param>
+ <returns>true if bezier curves are equals</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Bezier.op_Equality(SdlDotNet.Graphics.Primitives.Bezier,SdlDotNet.Graphics.Primitives.Bezier)">
+ <summary>
+ Equals operator
+ </summary>
+ <param name="bezier1">curve to compare</param>
+ <param name="bezier2">curve to compare</param>
+ <returns>true if curves are equal</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Bezier.op_Inequality(SdlDotNet.Graphics.Primitives.Bezier,SdlDotNet.Graphics.Primitives.Bezier)">
+ <summary>
+ Not equals operator
+ </summary>
+ <param name="bezier1">curve to compare</param>
+ <param name="bezier2">curve to compare</param>
+ <returns>true if curves are not equal</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Bezier.GetHashCode">
+ <summary>
+ Hash code
+ </summary>
+ <returns>hash code</returns>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Bezier.NumberOfPoints">
+ <summary>
+ Number of points in curve
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Bezier.Steps">
+ <summary>
+ Number of steps in curve
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Bezier.Points">
+ <summary>
+ List of point that make up curve
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Bezier.Center">
+ <summary>
+ Center of curve
+ </summary>
+ </member>
+ <member name="T:SdlDotNet.Graphics.Primitives.Box">
+ <summary>
+ Box primitive
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Box.#ctor(System.Int16,System.Int16,System.Int16,System.Int16)">
+ <summary>
+ Constructor
+ </summary>
+ <param name="x1">X position of upper-left point</param>
+ <param name="y1">Y position of upper-left point</param>
+ <param name="x2">X position of lower-right point</param>
+ <param name="y2">Y position of lower-right point</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Box.#ctor(System.Drawing.Point,System.Drawing.Size)">
+ <summary>
+ Constructor
+ </summary>
+ <param name="upperLeftPoint">Position of upper-left point</param>
+ <param name="size">Size of box</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Box.#ctor(System.Drawing.Point,System.Drawing.Point)">
+ <summary>
+ Constructor
+ </summary>
+ <param name="upperLeftPoint">Position of upper-left point</param>
+ <param name="lowerRightPoint">Position of lower-right point</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Box.Draw(SdlDotNet.Graphics.Surface,System.Drawing.Color,System.Boolean,System.Boolean)">
+ <summary>
+ Draw filled primitive onto surface
+ </summary>
+ <param name="surface">Surface to draw to</param>
+ <param name="color">Color to fill primitive</param>
+ <param name="antiAlias">antialias primitive</param>
+ <param name="fill">fill primitive with color</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Box.Draw(SdlDotNet.Graphics.Surface,System.Drawing.Color,System.Boolean)">
+ <summary>
+ Draw primitive onto surface
+ </summary>
+ <param name="surface">surface to draw to</param>
+ <param name="color">Color of primitive</param>
+ <param name="antiAlias">Antialias primitive</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Box.Draw(SdlDotNet.Graphics.Surface,System.Drawing.Color)">
+ <summary>
+ Draw primitive onto surface
+ </summary>
+ <param name="surface">surface to draw to</param>
+ <param name="color">Color of primitive</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Box.ToString">
+ <summary>
+ String representation of box
+ </summary>
+ <returns></returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Box.Equals(System.Object)">
+ <summary>
+ Equals operator
+ </summary>
+ <param name="obj">box to compare</param>
+ <returns>true if boxes are the same</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Box.op_Equality(SdlDotNet.Graphics.Primitives.Box,SdlDotNet.Graphics.Primitives.Box)">
+ <summary>
+ Equals operator
+ </summary>
+ <param name="box1">box to compare</param>
+ <param name="box2">box to compare</param>
+ <returns>true if boxes are the equal</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Box.op_Inequality(SdlDotNet.Graphics.Primitives.Box,SdlDotNet.Graphics.Primitives.Box)">
+ <summary>
+ Not equals operator
+ </summary>
+ <param name="box1">box to compare</param>
+ <param name="box2">box to compare</param>
+ <returns>true if boxes are not equal</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Box.GetHashCode">
+ <summary>
+ Hash code
+ </summary>
+ <returns>hash code</returns>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Box.XPosition1">
+ <summary>
+ X position of upper-left point
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Box.YPosition1">
+ <summary>
+ Y position of upper-left point
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Box.XPosition2">
+ <summary>
+ X position of lower-right point
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Box.YPosition2">
+ <summary>
+ Y position of lower-right point
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Box.Height">
+ <summary>
+ Height of box
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Box.Width">
+ <summary>
+ Width of box
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Box.Location">
+ <summary>
+ Position of upper-left point
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Box.Size">
+ <summary>
+ Size of box
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Box.Center">
+ <summary>
+ Center of box
+ </summary>
+ </member>
+ <member name="T:SdlDotNet.Graphics.Primitives.Circle">
+ <summary>
+ Circle Primitive
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Circle.#ctor(System.Int16,System.Int16,System.Int16)">
+ <summary>
+ Constructor for Circle
+ </summary>
+ <param name="positionX">X coordinate of Center</param>
+ <param name="positionY">Y coordinate of Center</param>
+ <param name="radius">Radius</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Circle.#ctor(System.Drawing.Point,System.Int16)">
+ <summary>
+ Constructor for Circle
+ </summary>
+ <param name="center">Center point</param>
+ <param name="radius">Radius</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Circle.Draw(SdlDotNet.Graphics.Surface,System.Drawing.Color,System.Boolean,System.Boolean)">
+ <summary>
+ Draw filled primitive onto surface
+ </summary>
+ <param name="surface">Surface to draw to</param>
+ <param name="color">Color to fill primitive</param>
+ <param name="antiAlias">antialias primitive</param>
+ <param name="fill">fill primitive with color</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Circle.Draw(SdlDotNet.Graphics.Surface,System.Drawing.Color,System.Boolean)">
+ <summary>
+ Draw primitive onto surface
+ </summary>
+ <param name="surface">surface to draw to</param>
+ <param name="color">Color of primitive</param>
+ <param name="antiAlias">Antialias primitive</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Circle.Draw(SdlDotNet.Graphics.Surface,System.Drawing.Color)">
+ <summary>
+ Draw primitive onto surface
+ </summary>
+ <param name="surface">surface to draw to</param>
+ <param name="color">Color of primitive</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Circle.ToString">
+ <summary>
+ String representation of circle
+ </summary>
+ <returns>string representation of circle</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Circle.Equals(System.Object)">
+ <summary>
+ Equals operator
+ </summary>
+ <param name="obj">Circle to compare</param>
+ <returns>true if circles are equal</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Circle.op_Equality(SdlDotNet.Graphics.Primitives.Circle,SdlDotNet.Graphics.Primitives.Circle)">
+ <summary>
+ Equals operator
+ </summary>
+ <param name="c1">Circle to compare</param>
+ <param name="c2">Circle to compare</param>
+ <returns>True if circles are equal</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Circle.op_Inequality(SdlDotNet.Graphics.Primitives.Circle,SdlDotNet.Graphics.Primitives.Circle)">
+ <summary>
+ Not equals operator
+ </summary>
+ <param name="c1">Circle to compare</param>
+ <param name="c2">Circle to compare</param>
+ <returns>True if circles are not equal</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Circle.GetHashCode">
+ <summary>
+ Hash Code
+ </summary>
+ <returns>Hash code</returns>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Circle.Center">
+ <summary>
+ Center of circle
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Circle.PositionX">
+ <summary>
+ X position of circle
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Circle.PositionY">
+ <summary>
+ Y position of circle
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Circle.Radius">
+ <summary>
+ Radius of circle
+ </summary>
+ </member>
+ <member name="T:SdlDotNet.Graphics.Primitives.Ellipse">
+ <summary>
+ Ellipse Primitive
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Ellipse.#ctor(System.Int16,System.Int16,System.Int16,System.Int16)">
+ <summary>
+ Constructor
+ </summary>
+ <param name="positionX">X coordinate of center</param>
+ <param name="positionY">Y coordinate of center</param>
+ <param name="radiusX">Radius on X axis</param>
+ <param name="radiusY">Radius on Y axis</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Ellipse.#ctor(System.Drawing.Point,System.Drawing.Size)">
+ <summary>
+ Constructor
+ </summary>
+ <param name="point">Center</param>
+ <param name="size">Width and height of ellipse</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Ellipse.Draw(SdlDotNet.Graphics.Surface,System.Drawing.Color,System.Boolean,System.Boolean)">
+ <summary>
+ Draw filled primitive onto surface
+ </summary>
+ <param name="surface">Surface to draw to</param>
+ <param name="color">Color to fill primitive</param>
+ <param name="antiAlias">antialias primitive</param>
+ <param name="fill">fill primitive with color</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Ellipse.Draw(SdlDotNet.Graphics.Surface,System.Drawing.Color,System.Boolean)">
+ <summary>
+ Draw primitive onto surface
+ </summary>
+ <param name="surface">surface to draw to</param>
+ <param name="color">Color of primitive</param>
+ <param name="antiAlias">Antialias primitive</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Ellipse.Draw(SdlDotNet.Graphics.Surface,System.Drawing.Color)">
+ <summary>
+ Draw primitive onto surface
+ </summary>
+ <param name="surface">surface to draw to</param>
+ <param name="color">Color of primitive</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Ellipse.ToString">
+ <summary>
+ String representation of ellipse
+ </summary>
+ <returns>string representation of ellipse</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Ellipse.Equals(System.Object)">
+ <summary>
+ Equals operator
+ </summary>
+ <param name="obj">Ellipse to compare</param>
+ <returns>True if ellipses are equal</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Ellipse.op_Equality(SdlDotNet.Graphics.Primitives.Ellipse,SdlDotNet.Graphics.Primitives.Ellipse)">
+ <summary>
+ Equals operator
+ </summary>
+ <param name="e1">Ellipse to compare</param>
+ <param name="e2">Ellipse to compare</param>
+ <returns>True if ellipses are equal</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Ellipse.op_Inequality(SdlDotNet.Graphics.Primitives.Ellipse,SdlDotNet.Graphics.Primitives.Ellipse)">
+ <summary>
+ Not equals operator
+ </summary>
+ <param name="e1">Ellipse to compare</param>
+ <param name="e2">Ellipse to compare</param>
+ <returns>True if ellipses are not equal</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Ellipse.GetHashCode">
+ <summary>
+ Hash code
+ </summary>
+ <returns>hash code</returns>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Ellipse.Center">
+ <summary>
+ Center of ellipse
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Ellipse.Size">
+ <summary>
+ Size struct representing width and height of ellipse
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Ellipse.PositionX">
+ <summary>
+ X position of center of ellipse
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Ellipse.PositionY">
+ <summary>
+ Y position of center of ellipse
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Ellipse.RadiusX">
+ <summary>
+ Width of ellipse
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Ellipse.RadiusY">
+ <summary>
+ Height of ellipse
+ </summary>
+ </member>
+ <member name="T:SdlDotNet.Graphics.Primitives.Line">
+ <summary>
+ Line primitive
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Line.#ctor(System.Int16,System.Int16,System.Int16,System.Int16)">
+ <summary>
+ Constructor
+ </summary>
+ <param name="x1">X coordinate of first point</param>
+ <param name="y1">Y coordinate of first point</param>
+ <param name="x2">X coordinate of second point</param>
+ <param name="y2">Y coordinate of second point</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Line.#ctor(System.Drawing.Point,System.Drawing.Point)">
+ <summary>
+ Constructor
+ </summary>
+ <param name="point1">First point</param>
+ <param name="point2">Second point</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Line.Vertical">
+ <summary>
+ Set to vertical line
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Line.Horizontal">
+ <summary>
+ Set to horizontal line
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Line.Draw(SdlDotNet.Graphics.Surface,System.Drawing.Color,System.Boolean,System.Boolean)">
+ <summary>
+ Draw filled primitive onto surface
+ </summary>
+ <param name="surface">Surface to draw to</param>
+ <param name="color">Color to fill primitive</param>
+ <param name="antiAlias">antialias primitive</param>
+ <param name="fill">fill primitive with color</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Line.Draw(SdlDotNet.Graphics.Surface,System.Drawing.Color,System.Boolean)">
+ <summary>
+ Draw primitive onto surface
+ </summary>
+ <param name="surface">surface to draw to</param>
+ <param name="color">Color of primitive</param>
+ <param name="antiAlias">Antialias primitive</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Line.Draw(SdlDotNet.Graphics.Surface,System.Drawing.Color)">
+ <summary>
+ Draw primitive onto surface
+ </summary>
+ <param name="surface">surface to draw to</param>
+ <param name="color">Color of primitive</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Line.ToString">
+ <summary>
+ String representation of line
+ </summary>
+ <returns>String represenation of line</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Line.Equals(System.Object)">
+ <summary>
+ Equals operator
+ </summary>
+ <param name="obj">line to compare</param>
+ <returns>True if lines are equal</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Line.op_Equality(SdlDotNet.Graphics.Primitives.Line,SdlDotNet.Graphics.Primitives.Line)">
+ <summary>
+ Equals operator
+ </summary>
+ <param name="line1">Line to compare</param>
+ <param name="line2">Line to compare</param>
+ <returns>True if lines are equal</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Line.op_Inequality(SdlDotNet.Graphics.Primitives.Line,SdlDotNet.Graphics.Primitives.Line)">
+ <summary>
+ Not equals operator
+ </summary>
+ <param name="line1">Line to compare</param>
+ <param name="line2">Line to compare</param>
+ <returns>True if lines are equal</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Line.GetHashCode">
+ <summary>
+ hash code
+ </summary>
+ <returns>hash code</returns>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Line.XPosition1">
+ <summary>
+ X position of first point
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Line.YPosition1">
+ <summary>
+ Y position of first point
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Line.XPosition2">
+ <summary>
+ X position of second point
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Line.YPosition2">
+ <summary>
+ Y position of second point
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Line.Point1">
+ <summary>
+ First point
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Line.Point2">
+ <summary>
+ Second point
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Line.Center">
+ <summary>
+ Center of line
+ </summary>
+ </member>
+ <member name="T:SdlDotNet.Graphics.Primitives.Pie">
+ <summary>
+ Pie-shaped primitive
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Pie.#ctor(System.Int16,System.Int16,System.Int16,System.Int16,System.Int16)">
+ <summary>
+ Constructor
+ </summary>
+ <param name="positionX">X position of vertex</param>
+ <param name="positionY">Y position of vertex</param>
+ <param name="radius">Radius</param>
+ <param name="startingAngle">Starting angle in degrees</param>
+ <param name="endingAngle">Ending angle in degrees</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Pie.#ctor(System.Drawing.Point,System.Int16,System.Int16,System.Int16)">
+ <summary>
+ Constructor
+ </summary>
+ <param name="point">Position of vertex</param>
+ <param name="radius">Radius</param>
+ <param name="startingAngle">Starting angle in degrees</param>
+ <param name="endingAngle">Ending angle in degrees</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Pie.Draw(SdlDotNet.Graphics.Surface,System.Drawing.Color,System.Boolean,System.Boolean)">
+ <summary>
+ Draw filled primitive onto surface
+ </summary>
+ <param name="surface">Surface to draw to</param>
+ <param name="color">Color to fill primitive</param>
+ <param name="antiAlias">antialias primitive</param>
+ <param name="fill">fill primitive with color</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Pie.Draw(SdlDotNet.Graphics.Surface,System.Drawing.Color,System.Boolean)">
+ <summary>
+ Draw primitive onto surface
+ </summary>
+ <param name="surface">surface to draw to</param>
+ <param name="color">Color of primitive</param>
+ <param name="antiAlias">Antialias primitive</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Pie.Draw(SdlDotNet.Graphics.Surface,System.Drawing.Color)">
+ <summary>
+ Draw primitive onto surface
+ </summary>
+ <param name="surface">surface to draw to</param>
+ <param name="color">Color of primitive</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Pie.ToString">
+ <summary>
+ String representation of pie
+ </summary>
+ <returns>String representation</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Pie.Equals(System.Object)">
+ <summary>
+ Equals operator
+ </summary>
+ <param name="obj">pie to compare</param>
+ <returns>true if pies are equal</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Pie.op_Equality(SdlDotNet.Graphics.Primitives.Pie,SdlDotNet.Graphics.Primitives.Pie)">
+ <summary>
+ Equals operator
+ </summary>
+ <param name="pie1">pie to compare</param>
+ <param name="pie2">pie to compare</param>
+ <returns>true if pies are equal</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Pie.op_Inequality(SdlDotNet.Graphics.Primitives.Pie,SdlDotNet.Graphics.Primitives.Pie)">
+ <summary>
+ not equals operator
+ </summary>
+ <param name="pie1">pie to compare</param>
+ <param name="pie2">pie to comapre</param>
+ <returns>true if pies are not equal</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Pie.GetHashCode">
+ <summary>
+ hash code
+ </summary>
+ <returns>hash code</returns>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Pie.PositionX">
+ <summary>
+ X position of vertex
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Pie.PositionY">
+ <summary>
+ Y position of vertex
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Pie.Point">
+ <summary>
+ Vertex
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Pie.Radius">
+ <summary>
+ Radius
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Pie.StartingAngle">
+ <summary>
+ Starting angle in degrees
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Pie.EndingAngle">
+ <summary>
+ Ending angle in degrees
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Pie.Center">
+ <summary>
+ Center of pie
+ </summary>
+ </member>
+ <member name="T:SdlDotNet.Graphics.Primitives.Polygon">
+ <summary>
+ Polygon primitive
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Polygon.#ctor(System.Int16[],System.Int16[])">
+ <summary>
+ Constructor
+ </summary>
+ <param name="positionsX">array of x positions of points</param>
+ <param name="positionsY">array of y positions of points</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Polygon.#ctor(System.Collections.ArrayList)">
+ <summary>
+ Constructor
+ </summary>
+ <param name="points">ArrayList of points</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Polygon.PositionsX">
+ <summary>
+ Get Array of all X positions
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Polygon.PositionsX(System.Int16[])">
+ <summary>
+ Set array of X positions
+ </summary>
+ <param name="arrayX">x positions</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Polygon.PositionsY">
+ <summary>
+ Get array of Y positions
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Polygon.PositionsY(System.Int16[])">
+ <summary>
+ Set array of Y positions
+ </summary>
+ <param name="arrayY">array of Y positions</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Polygon.Draw(SdlDotNet.Graphics.Surface,System.Drawing.Color,System.Boolean,System.Boolean)">
+ <summary>
+ Draw filled primitive onto surface
+ </summary>
+ <param name="surface">Surface to draw to</param>
+ <param name="color">Color to fill primitive</param>
+ <param name="antiAlias">antialias primitive</param>
+ <param name="fill">fill primitive with color</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Polygon.Draw(SdlDotNet.Graphics.Surface,System.Drawing.Color,System.Boolean)">
+ <summary>
+ Draw primitive onto surface
+ </summary>
+ <param name="surface">surface to draw to</param>
+ <param name="color">Color of primitive</param>
+ <param name="antiAlias">Antialias primitive</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Polygon.Draw(SdlDotNet.Graphics.Surface,System.Drawing.Color)">
+ <summary>
+ Draw primitive onto surface
+ </summary>
+ <param name="surface">surface to draw to</param>
+ <param name="color">Color of primitive</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Polygon.ToString">
+ <summary>
+ String representation of polygon
+ </summary>
+ <returns>string representation</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Polygon.Equals(System.Object)">
+ <summary>
+ Equals operator
+ </summary>
+ <param name="obj">polygon to compare</param>
+ <returns>true if the polygons are equal</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Polygon.op_Equality(SdlDotNet.Graphics.Primitives.Polygon,SdlDotNet.Graphics.Primitives.Polygon)">
+ <summary>
+ Equals operator
+ </summary>
+ <param name="polygon1">polygon to compare</param>
+ <param name="polygon2">polygon to compare</param>
+ <returns>true if the polygons are equal</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Polygon.op_Inequality(SdlDotNet.Graphics.Primitives.Polygon,SdlDotNet.Graphics.Primitives.Polygon)">
+ <summary>
+ Not equals operator
+ </summary>
+ <param name="polygon1">polygon to compare</param>
+ <param name="polygon2">polygon to compare</param>
+ <returns>true if the polygons are equal</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Polygon.GetHashCode">
+ <summary>
+ Hash code
+ </summary>
+ <returns>hash code</returns>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Polygon.NumberOfSides">
+ <summary>
+ Number of sides of the polygon
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Polygon.Points">
+ <summary>
+ Arraylist of all the points of the polygon
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Polygon.Center">
+ <summary>
+ Center of polygon
+ </summary>
+ </member>
+ <member name="T:SdlDotNet.Graphics.Primitives.TexturedPolygon">
+ <summary>
+ Polygon primitive
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.TexturedPolygon.#ctor(SdlDotNet.Graphics.Surface,System.Int16[],System.Int16[],System.Int32,System.Int32)">
+ <summary>
+ Constructor
+ </summary>
+ <param name="positionsX">array of x positions of points</param>
+ <param name="positionsY">array of y positions of points</param>
+ <param name="surface">Textured surface</param>
+ <param name="textureOffsetX">Texture is offset on the X axis</param>
+ <param name="textureOffsetY">Texture is offset on the Y axis</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.TexturedPolygon.#ctor(SdlDotNet.Graphics.Surface,System.Collections.ArrayList,System.Drawing.Point)">
+ <summary>
+ Constructor
+ </summary>
+ <param name="points">ArrayList of points</param>
+ <param name="surface">Textured Surface</param>
+ <param name="offset">Texture is offset on the X and Y axes</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.TexturedPolygon.PositionsX">
+ <summary>
+ Get Array of all X positions
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.TexturedPolygon.PositionsX(System.Int16[])">
+ <summary>
+ Set array of X positions
+ </summary>
+ <param name="arrayX">x positions</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.TexturedPolygon.PositionsY">
+ <summary>
+ Get array of Y positions
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.TexturedPolygon.PositionsY(System.Int16[])">
+ <summary>
+ Set array of Y positions
+ </summary>
+ <param name="arrayY">array of Y positions</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.TexturedPolygon.Draw(SdlDotNet.Graphics.Surface,System.Drawing.Color,System.Boolean,System.Boolean)">
+ <summary>
+ Draw filled primitive onto surface
+ </summary>
+ <param name="surface">Surface to draw to</param>
+ <param name="color">Color to fill primitive</param>
+ <param name="antiAlias">antialias primitive</param>
+ <param name="fill">fill primitive with color</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.TexturedPolygon.Draw(SdlDotNet.Graphics.Surface,System.Drawing.Color,System.Boolean)">
+ <summary>
+ Draw primitive onto surface
+ </summary>
+ <param name="surface">surface to draw to</param>
+ <param name="color">Color of primitive</param>
+ <param name="antiAlias">Antialias primitive</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.TexturedPolygon.Draw(SdlDotNet.Graphics.Surface,System.Drawing.Color)">
+ <summary>
+ Draw primitive onto surface
+ </summary>
+ <param name="surface">surface to draw to</param>
+ <param name="color">Color of primitive</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.TexturedPolygon.ToString">
+ <summary>
+ String representation of polygon
+ </summary>
+ <returns>string representation</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.TexturedPolygon.Equals(System.Object)">
+ <summary>
+ Equals operator
+ </summary>
+ <param name="obj">polygon to compare</param>
+ <returns>true if the polygons are equal</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.TexturedPolygon.op_Equality(SdlDotNet.Graphics.Primitives.TexturedPolygon,SdlDotNet.Graphics.Primitives.TexturedPolygon)">
+ <summary>
+ Equals operator
+ </summary>
+ <param name="polygon1">polygon to compare</param>
+ <param name="polygon2">polygon to compare</param>
+ <returns>true if the polygons are equal</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.TexturedPolygon.op_Inequality(SdlDotNet.Graphics.Primitives.TexturedPolygon,SdlDotNet.Graphics.Primitives.TexturedPolygon)">
+ <summary>
+ Not equals operator
+ </summary>
+ <param name="polygon1">polygon to compare</param>
+ <param name="polygon2">polygon to compare</param>
+ <returns>true if the polygons are equal</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.TexturedPolygon.GetHashCode">
+ <summary>
+ Hash code
+ </summary>
+ <returns>hash code</returns>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.TexturedPolygon.TextureOffset">
+ <summary>
+ Texture Offset
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.TexturedPolygon.TexturedSurface">
+ <summary>
+ Textured Surface
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.TexturedPolygon.NumberOfSides">
+ <summary>
+ Number of sides of the polygon
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.TexturedPolygon.Points">
+ <summary>
+ Arraylist of all the points of the polygon
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.TexturedPolygon.Center">
+ <summary>
+ Center of polygon
+ </summary>
+ </member>
+ <member name="T:SdlDotNet.Graphics.Primitives.Triangle">
+ <summary>
+ Triangle primitive
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Triangle.#ctor(System.Int16,System.Int16,System.Int16,System.Int16,System.Int16,System.Int16)">
+ <summary>
+ Constructor
+ </summary>
+ <param name="x1">X position of first point</param>
+ <param name="y1">Y position of first point</param>
+ <param name="x2">X position of second point</param>
+ <param name="y2">Y position of second point</param>
+ <param name="x3">X position of third point</param>
+ <param name="y3">Y position of third point</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Triangle.#ctor(System.Drawing.Point,System.Drawing.Point,System.Drawing.Point)">
+ <summary>
+ Constructor
+ </summary>
+ <param name="point1">First point</param>
+ <param name="point2">Second point</param>
+ <param name="point3">Third point</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Triangle.Draw(SdlDotNet.Graphics.Surface,System.Drawing.Color,System.Boolean,System.Boolean)">
+ <summary>
+ Draw filled primitive onto surface
+ </summary>
+ <param name="surface">Surface to draw to</param>
+ <param name="color">Color to fill primitive</param>
+ <param name="antiAlias">antialias primitive</param>
+ <param name="fill">fill primitive with color</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Triangle.Draw(SdlDotNet.Graphics.Surface,System.Drawing.Color,System.Boolean)">
+ <summary>
+ Draw primitive onto surface
+ </summary>
+ <param name="surface">surface to draw to</param>
+ <param name="color">Color of primitive</param>
+ <param name="antiAlias">Antialias primitive</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Triangle.Draw(SdlDotNet.Graphics.Surface,System.Drawing.Color)">
+ <summary>
+ Draw primitive onto surface
+ </summary>
+ <param name="surface">surface to draw to</param>
+ <param name="color">Color of primitive</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Triangle.ToString">
+ <summary>
+ String representation of triangle
+ </summary>
+ <returns>string representation</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Triangle.Equals(System.Object)">
+ <summary>
+ Equals operator
+ </summary>
+ <param name="obj">triangle to compare</param>
+ <returns>true if triangles are equal</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Triangle.op_Equality(SdlDotNet.Graphics.Primitives.Triangle,SdlDotNet.Graphics.Primitives.Triangle)">
+ <summary>
+ Equals operator
+ </summary>
+ <param name="triangle1">triangle to compare</param>
+ <param name="triangle2">triangle to compare</param>
+ <returns>true if triangles are equal</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Triangle.op_Inequality(SdlDotNet.Graphics.Primitives.Triangle,SdlDotNet.Graphics.Primitives.Triangle)">
+ <summary>
+ Not equals operator
+ </summary>
+ <param name="triangle1">triangle to compare</param>
+ <param name="triangle2">triangle to compare</param>
+ <returns>true if triangles are not equal</returns>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Primitives.Triangle.GetHashCode">
+ <summary>
+ Hash code
+ </summary>
+ <returns>hash code</returns>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Triangle.Point1">
+ <summary>
+ First point
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Triangle.Point2">
+ <summary>
+ Second point
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Triangle.Point3">
+ <summary>
+ Third point
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Triangle.XPosition1">
+ <summary>
+ X position of first point
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Triangle.YPosition1">
+ <summary>
+ Y position of first point
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Triangle.XPosition2">
+ <summary>
+ X position of second point
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Triangle.YPosition2">
+ <summary>
+ Y position of second point
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Triangle.XPosition3">
+ <summary>
+ X position of third point
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Triangle.YPosition3">
+ <summary>
+ Y position of third point
+ </summary>
+ </member>
+ <member name="P:SdlDotNet.Graphics.Primitives.Triangle.Center">
+ <summary>
+ Center of triangle
+ </summary>
+ </member>
+ <member name="T:SdlDotNet.Graphics.Sprites.AnimatedSprite">
+ <summary>
+
+ </summary>
+ </member>
+ <member name="T:SdlDotNet.Graphics.Sprites.Sprite">
+ <summary>
+ Sprite class contains both a Surface and a Rectangle so that
+ an object can be easily displayed and manipulated.
+ </summary>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.#ctor">
+ <summary>
+ Basic constructor.
+ </summary>
+ <remarks>
+ Use this with caution.
+ This is provided as a convenience.
+ Please give the sprite a Surface and a Vector.</remarks>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.#ctor(SdlDotNet.Graphics.Surface,System.Drawing.Point)">
+ <summary>
+ Create a new Sprite
+ </summary>
+ <param name="position">Starting position</param>
+ <param name="surface">Surface of Sprite</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.#ctor(SdlDotNet.Graphics.Surface)">
+ <summary>
+ Create new Sprite at (0, 0)
+ </summary>
+ <param name="surface">Surface of Sprite</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.#ctor(System.String)">
+ <summary>
+ Creates a new sprite using the given surface file.
+ </summary>
+ <param name="surfaceFile">
+ The file path of the surface to use as the sprite.
+ </param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.#ctor(SdlDotNet.Graphics.Surface,SdlDotNet.Core.Vector)">
+ <summary>
+ Create new Sprite
+ </summary>
+ <param name="vector">Vector of Sprite</param>
+ <param name="surface">Surface of Sprite</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.#ctor(SdlDotNet.Graphics.Surface,SdlDotNet.Core.Vector,SdlDotNet.Graphics.Sprites.SpriteCollection)">
+ <summary>
+ Create new sprite
+ </summary>
+ <param name="vector">Vector of Sprite</param>
+ <param name="surface">Surface of Sprite</param>
+ <param name="group">
+ SpriteCollection group to put Sprite into.
+ </param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.#ctor(SdlDotNet.Graphics.Surface,System.Drawing.Point,SdlDotNet.Graphics.Sprites.SpriteCollection)">
+ <summary>
+ Create new sprite
+ </summary>
+ <param name="position">position of Sprite</param>
+ <param name="surface">Surface of Sprite</param>
+ <param name="group">
+ SpriteCollection group to put Sprite into.
+ </param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.Update(SdlDotNet.Input.ActiveEventArgs)">
+ <summary>
+ Processes Active events
+ </summary>
+ <param name="args">Event args</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.Update(SdlDotNet.Input.KeyboardEventArgs)">
+ <summary>
+ Processes the keyboard.
+ </summary>
+ <param name="args">Event args</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.Update(SdlDotNet.Input.MouseButtonEventArgs)">
+ <summary>
+ Processes a mouse button. This event is trigger by the SDL
+ system.
+ </summary>
+ <param name="args">Event args</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.Update(SdlDotNet.Input.MouseMotionEventArgs)">
+ <summary>
+ Processes a mouse motion event. This event is triggered by
+ SDL. Only
+ sprites that are MouseSensitive are processed.
+ </summary>
+ <param name="args">Event args</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.Update(SdlDotNet.Input.JoystickAxisEventArgs)">
+ <summary>
+ Processes a joystick motion event. This event is triggered by
+ SDL. Only
+ sprites that are JoystickSensitive are processed.
+ </summary>
+ <param name="args">Event args</param>
+ </member>
+ <member name="M:SdlDotNet.Graphics.Sprites.Sprite.Update(SdlDotNet.Input.JoystickButtonEventArgs)">
+ <summary>
+ Processes a joystick button event. This event is triggered by
+ SDL. Only
+ sprites that are JoystickSensitive are processed.
+ </summary>
+ <param name="args">Event args</param>
+ ...
[truncated message content] |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X