Merged SM2D.DrawColor/DrawComplex/DrawPolygon/DrawShader/DrawTexture into DrawObject2D
This commit is contained in:
Michel Fedde
parent
beb9c19081
commit
0895c600cf
14 changed files with 320 additions and 256 deletions
162
MigrationBackup/d4ed0f1f/SMRenderer/SM2D/NuGetUpgradeLog.html
Normal file
162
MigrationBackup/d4ed0f1f/SMRenderer/SM2D/NuGetUpgradeLog.html
Normal file
|
|
@ -0,0 +1,162 @@
|
||||||
|
<!DOCTYPE html>
|
||||||
|
<!-- saved from url=(0014)about:internet -->
|
||||||
|
|
||||||
|
<html xmlns:msxsl="urn:schemas-microsoft-com:xslt"><head><meta content="en-us" http-equiv="Content-Language" /><meta content="text/html; charset=utf-16" http-equiv="Content-Type" /><title _locID="NuGetUpgradeReportTitle">
|
||||||
|
NuGetMigrationLog
|
||||||
|
</title><style>
|
||||||
|
|
||||||
|
/* Body style, for the entire document */
|
||||||
|
body
|
||||||
|
{
|
||||||
|
background: #F3F3F4;
|
||||||
|
color: #1E1E1F;
|
||||||
|
font-family: "Segoe UI", Tahoma, Geneva, Verdana, sans-serif;
|
||||||
|
font-size: 12pt;
|
||||||
|
padding: 0;
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Header1 style, used for the main title */
|
||||||
|
h1
|
||||||
|
{
|
||||||
|
padding: 10px 0px 10px 10px;
|
||||||
|
font-size: 21pt;
|
||||||
|
background-color: #E2E2E2;
|
||||||
|
border-bottom: 1px #C1C1C2 solid;
|
||||||
|
color: #201F20;
|
||||||
|
margin: 0;
|
||||||
|
font-weight: normal;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Header2 style, used for "Overview" and other sections */
|
||||||
|
h2
|
||||||
|
{
|
||||||
|
font-size: 18pt;
|
||||||
|
font-weight: normal;
|
||||||
|
padding: 15px 0 5px 0;
|
||||||
|
margin: 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Header3 style, used for sub-sections, such as project name */
|
||||||
|
h3
|
||||||
|
{
|
||||||
|
font-weight: normal;
|
||||||
|
font-size: 15pt;
|
||||||
|
margin: 0;
|
||||||
|
padding: 15px 0 5px 0;
|
||||||
|
background-color: transparent;
|
||||||
|
}
|
||||||
|
|
||||||
|
.info-text
|
||||||
|
{
|
||||||
|
margin: 0px 0 0.75em 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Color all hyperlinks one color */
|
||||||
|
a
|
||||||
|
{
|
||||||
|
color: #1382CE;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Table styles */
|
||||||
|
table
|
||||||
|
{
|
||||||
|
border-spacing: 0 0;
|
||||||
|
border-collapse: collapse;
|
||||||
|
font-size: 11pt;
|
||||||
|
}
|
||||||
|
|
||||||
|
table th
|
||||||
|
{
|
||||||
|
background: #E7E7E8;
|
||||||
|
text-align: left;
|
||||||
|
text-decoration: none;
|
||||||
|
font-weight: normal;
|
||||||
|
padding: 3px 6px 3px 6px;
|
||||||
|
}
|
||||||
|
|
||||||
|
table td
|
||||||
|
{
|
||||||
|
vertical-align: top;
|
||||||
|
padding: 3px 6px 5px 5px;
|
||||||
|
margin: 0px;
|
||||||
|
border: 1px solid #E7E7E8;
|
||||||
|
background: #F7F7F8;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Local link is a style for hyperlinks that link to file:/// content, there are lots so color them as 'normal' text until the user mouse overs */
|
||||||
|
.localLink
|
||||||
|
{
|
||||||
|
color: #1E1E1F;
|
||||||
|
background: #EEEEED;
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.localLink:hover
|
||||||
|
{
|
||||||
|
color: #1382CE;
|
||||||
|
background: #FFFF99;
|
||||||
|
text-decoration: none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.issueCell
|
||||||
|
{
|
||||||
|
width: 100%;
|
||||||
|
}
|
||||||
|
|
||||||
|
.packageIssue
|
||||||
|
{
|
||||||
|
margin-left: 25px;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* Padding around the content after the h1 */
|
||||||
|
#content
|
||||||
|
{
|
||||||
|
padding: 0px 20px 20px 20px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.issues table
|
||||||
|
{
|
||||||
|
width: 97%;
|
||||||
|
}
|
||||||
|
|
||||||
|
/* All Icons */
|
||||||
|
.IconSuccessEncoded, .IconInfoEncoded, .IconWarningEncoded, .IconErrorEncoded
|
||||||
|
{
|
||||||
|
min-width:18px;
|
||||||
|
min-height:18px;
|
||||||
|
background-repeat:no-repeat;
|
||||||
|
background-position:center;
|
||||||
|
}
|
||||||
|
|
||||||
|
.IconSuccessEncoded
|
||||||
|
{
|
||||||
|
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAA7EAAAOxAGVKw4bAAABcElEQVR4Xq2TsUsCURzHv15g8ZJcBWlyiYYgCIWcb9DFRRwMW5TA2c0/QEFwFkxxUQdxVlBwCYWOi6IhWgQhBLHJUCkhLr/BW8S7gvrAg+N+v8/v+x68Z8MGy+XSCyABQAXgBgHGALoASkIIDWSLeLBetdHryMjd5IxQPWT4rn1c/P7+xxp72Cs9m5SZ0Bq2vPnbPFafK2zDvmNHypdC0BPkLlQhxJsCAhQoZwdZU5mwxh720qGo8MzTxTTKZDPCx2HoVzp6lz0Q9tKhyx0kGs8Ny+TkWRKk8lCROwEduhyg9l/6lunOPSfmH3NUH6uQ0KHLAe7JYvJjevm+DAMGJHToKtigE+vwvIidxLamb8IBY9e+C5LiXREkfho3TSd06HJA13/oh6T51MTsfQbHrsMynQ5dDihFjiK8JJAU9AKIWTp76dCVN7HWHrajmUEGvyF9nkbAE6gLIS7kTUyuf2gscLoJrElZo/Mvj+nPz/kLTmfnEwP3tB0AAAAASUVORK5CYII=);
|
||||||
|
}
|
||||||
|
|
||||||
|
.IconInfoEncoded
|
||||||
|
{
|
||||||
|
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABHElEQVR4Xs2TsUoDQRRF7wwoziokjZUKadInhdhukR9YP8DMX1hYW+QvdsXa/QHBbcXC7W0CamWTQnclFutceIQJwwaWNLlwm5k5d94M76mmaeCrrmsLYOocY12FcxZFUeozCqKqqgYA8uevv1H6VuPxcwlfk5N92KHBxfFeCSAxxswlYAW/Xr989x/mv9gkhtyMDhcAxgzRsp7flj8B/HF1RsMXq+NZMkopaHe7lbKxQUEIGbKsYNoGn969060hZBkQex/W8oRQwsQaW2o3Ago2SVcJUzAgY3N0lTCZZm+zPS8HB51gMmS1DEYyOz9acKO1D8JWTlafKIMxdhvlfdyT94Vv5h7P8Ky7nQzACmhvKq3zk3PjW9asz9D/1oigecsioooAAAAASUVORK5CYII=);
|
||||||
|
}
|
||||||
|
|
||||||
|
.IconWarningEncoded
|
||||||
|
{
|
||||||
|
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAA7EAAAOxAGVKw4bAAAAx0lEQVR4XpWSMQ7CMAxFf4xAyBMLCxMrO8dhaBcuwdCJS3RJBw7SA/QGTCxdWJgiQYWKXJWKIXHIlyw5lqr34tQgEOdcBsCOx5yZK3hCCKdYXneQkh4pEfqzLfu+wVDSyyzFoJjfz9NB+pAF+eizx2Vruts0k15mPgvS6GYvpVtQhB61IB/dk6AF6fS4Ben0uIX5odtFe8Q/eW1KvFeH4e8khT6+gm5B+t3juyDt7n0jpe+CANTd+oTUjN/U3yVaABnSUjFz/gFq44JaVSCXeQAAAABJRU5ErkJggg==);
|
||||||
|
}
|
||||||
|
|
||||||
|
.IconErrorEncoded
|
||||||
|
{
|
||||||
|
background-image: url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAABQElEQVR4XqWTvUoEQRCE6wYPZUA80AfwAQz23uCMjA7MDRQEIzPBVEyNTQUFIw00vcQTTMzuAh/AxEQQT8HF/3G/oGGnEUGuoNnd6qoZuqltyKEsyzVJq5I6rnUp6SjGeGhESikzzlc1eL7opfuVbrqbU1Zw9NCgtQMaZpY0eNnaaL2fHusvTK5vKu7sjSS1Y4y3QUA6K3e3Mau5UFDyMP7tYF9o8cAHZv68vipoIJg971PZIZ5HiwdvYGGvFVFHmGmZ2MxwmQYPXubPl9Up0tfoMQGetXd6mRbvhBw+boZ6WF7Mbv1+GsHRk0fQmPAH1GfmZirbCfDJ61tw3Px8/8pZsPAG4jlVhcPgZ7adwNWBB68lkRQWFiTgFlbnLY3DGGM7izIJIyT/jjIvEJw6fdJTc6krDzh6aMwMP9bvDH4ADSsa9uSWVJkAAAAASUVORK5CYII=);
|
||||||
|
}
|
||||||
|
|
||||||
|
</style></head><body><h1>
|
||||||
|
NuGet Migration Report - SMRenderer\SM2D</h1><div id="content"><h2 _locID="OverviewTitle">Overview</h2><div class="info-text">Migration to PackageReference was completed successfully. Please build and run your solution to verify that all packages are available.</div><div class="info-text">
|
||||||
|
If you run into any problems, have feedback, questions, or concerns, please
|
||||||
|
<a href="https://github.com/NuGet/Home/issues/">file an issue on the NuGet GitHub repository.</a></div><div class="info-text">
|
||||||
|
Changed files and this report have been backed up here:
|
||||||
|
<a href="C:\Users\user\source\repos\IedSoftworks\SMRendererV3\MigrationBackup\d4ed0f1f\SMRenderer\SM2D">C:\Users\user\source\repos\IedSoftworks\SMRendererV3\MigrationBackup\d4ed0f1f\SMRenderer\SM2D</a></div><div class="info-text"><a href="https://aka.ms/nuget-pc2pr-migrator-rollback">Help me rollback to packages.config</a></div><h2 _locID="PackagesTitle">Packages processed</h2><h3 _locID="IncludePackagesTitle">Top-level dependencies:</h3><div class="issues"><table><tr><th class="issueCell">Package Id</th><th>Version</th></tr><tr><td class="issueCell"><span>OpenTK</span></td><td><span>
|
||||||
|
v3.2.1</span></td></tr></table></div><p /><h3 _locID="IncludePackagesTitle">Transitive dependencies:</h3><div class="issues"><table><tr><th class="issueCell">Package Id</th><th>Version</th></tr><tr><td class="issueCell">
|
||||||
|
No transitive dependencies found.
|
||||||
|
</td><td /></tr></table></div><h2 _locID="IssuesTitle">Package compatibility issues</h2><div class="issues"><table><tr><th /><th class="issueCell" _locID="DescriptionTableHeader">Description</th></tr><tr><td class="IconInfoEncoded" /><td class="issueCell">
|
||||||
|
No issues were found.
|
||||||
|
</td></tr></table></div></div></body></html>
|
||||||
82
MigrationBackup/d4ed0f1f/SMRenderer/SM2D/SM2D.csproj
Normal file
82
MigrationBackup/d4ed0f1f/SMRenderer/SM2D/SM2D.csproj
Normal file
|
|
@ -0,0 +1,82 @@
|
||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
|
||||||
|
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
|
||||||
|
<PropertyGroup>
|
||||||
|
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
|
||||||
|
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
|
||||||
|
<ProjectGuid>{A4565538-625A-42C6-A330-DD4F1ABB3986}</ProjectGuid>
|
||||||
|
<OutputType>Library</OutputType>
|
||||||
|
<AppDesignerFolder>Properties</AppDesignerFolder>
|
||||||
|
<RootNamespace>SM2D</RootNamespace>
|
||||||
|
<AssemblyName>SM2D</AssemblyName>
|
||||||
|
<TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
|
||||||
|
<FileAlignment>512</FileAlignment>
|
||||||
|
<Deterministic>true</Deterministic>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
|
||||||
|
<DebugSymbols>true</DebugSymbols>
|
||||||
|
<DebugType>full</DebugType>
|
||||||
|
<Optimize>false</Optimize>
|
||||||
|
<OutputPath>bin\Debug\</OutputPath>
|
||||||
|
<DefineConstants>DEBUG;TRACE</DefineConstants>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
<WarningLevel>4</WarningLevel>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
|
||||||
|
<DebugType>pdbonly</DebugType>
|
||||||
|
<Optimize>true</Optimize>
|
||||||
|
<OutputPath>bin\Release\</OutputPath>
|
||||||
|
<DefineConstants>TRACE</DefineConstants>
|
||||||
|
<ErrorReport>prompt</ErrorReport>
|
||||||
|
<WarningLevel>4</WarningLevel>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Reference Include="OpenTK, Version=3.2.1.0, Culture=neutral, PublicKeyToken=bad199fe84eb3df4, processorArchitecture=MSIL">
|
||||||
|
<HintPath>..\..\packages\OpenTK.3.2.1\lib\net20\OpenTK.dll</HintPath>
|
||||||
|
</Reference>
|
||||||
|
<Reference Include="System" />
|
||||||
|
<Reference Include="System.Core" />
|
||||||
|
<Reference Include="System.Drawing" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="Controls\Mouse2D.cs" />
|
||||||
|
<Compile Include="Drawing\DrawBackground.cs" />
|
||||||
|
<Compile Include="Drawing\DrawBackgroundShader.cs" />
|
||||||
|
<Compile Include="Drawing\DrawColor.cs" />
|
||||||
|
<Compile Include="Drawing\DrawComplex.cs" />
|
||||||
|
<Compile Include="Drawing\DrawObject2D.cs" />
|
||||||
|
<Compile Include="Drawing\DrawParticles.cs" />
|
||||||
|
<Compile Include="Drawing\DrawPolygon.cs" />
|
||||||
|
<Compile Include="Drawing\DrawShader.cs" />
|
||||||
|
<Compile Include="Drawing\DrawText.cs" />
|
||||||
|
<Compile Include="Drawing\DrawTexture.cs" />
|
||||||
|
<Compile Include="GLWindow2D.cs" />
|
||||||
|
<Compile Include="Object\Polygon.cs" />
|
||||||
|
<Compile Include="Object\PolygonVertex.cs" />
|
||||||
|
<Compile Include="Pipelines\Adv2DPipeline.cs" />
|
||||||
|
<Compile Include="Pipelines\Basic2DPipeline.cs" />
|
||||||
|
<Compile Include="Properties\AssemblyInfo.cs" />
|
||||||
|
<Compile Include="Scene\Camera.cs" />
|
||||||
|
<Compile Include="Scene\I2DShowItem.cs" />
|
||||||
|
<Compile Include="Scene\ItemCollection.cs" />
|
||||||
|
<Compile Include="Scene\Scene.cs" />
|
||||||
|
<Compile Include="Shader\Default2DShader.cs" />
|
||||||
|
<Compile Include="Types\Transformation.cs" />
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<ProjectReference Include="..\SM.Base\SM.Base.csproj">
|
||||||
|
<Project>{8e733844-4204-43e7-b3dc-3913cddabb0d}</Project>
|
||||||
|
<Name>SM.Base</Name>
|
||||||
|
</ProjectReference>
|
||||||
|
<ProjectReference Include="..\SM.OGL\SM.OGL.csproj">
|
||||||
|
<Project>{f604d684-bc1d-4819-88b5-8b5d03a17be0}</Project>
|
||||||
|
<Name>SM.OGL</Name>
|
||||||
|
</ProjectReference>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<None Include="OpenTK.dll.config" />
|
||||||
|
<None Include="packages.config" />
|
||||||
|
<EmbeddedResource Include="Shader\ShaderFiles\default.glsl" />
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
|
</Project>
|
||||||
|
|
@ -76,7 +76,7 @@ namespace SM.Base.Drawing
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
protected override void DrawContext(ref DrawContext context)
|
protected override void DrawContext(ref DrawContext context)
|
||||||
{
|
{
|
||||||
context.ModelMaster = Transform.GetMatrix();
|
context.ModelMaster *= Transform.GetMatrix();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -49,7 +49,7 @@ namespace SM.OGL
|
||||||
ShadingVersion = Version.CreateGLVersion(GL.GetString(StringName.ShadingLanguageVersion));
|
ShadingVersion = Version.CreateGLVersion(GL.GetString(StringName.ShadingLanguageVersion));
|
||||||
Extensions = GL.GetString(StringName.Extensions).Split(' ');
|
Extensions = GL.GetString(StringName.Extensions).Split(' ');
|
||||||
|
|
||||||
Debugging = Extensions.Contains("khr_debug");
|
Debugging = Extensions.Contains("GL_KHR_debug");
|
||||||
if (Debugging) GLDebugging.EnableDebugging();
|
if (Debugging) GLDebugging.EnableDebugging();
|
||||||
|
|
||||||
_init = true;
|
_init = true;
|
||||||
|
|
|
||||||
|
|
@ -1,20 +0,0 @@
|
||||||
using SM.Base.Contexts;
|
|
||||||
using SM.Base.Drawing;
|
|
||||||
using SM.Base.Scene;
|
|
||||||
using SM2D.Scene;
|
|
||||||
|
|
||||||
namespace SM2D.Drawing
|
|
||||||
{
|
|
||||||
public class DrawBackgroundShader : DrawShader, IBackgroundItem
|
|
||||||
{
|
|
||||||
public DrawBackgroundShader(MaterialShader shader) : base(shader)
|
|
||||||
{ }
|
|
||||||
|
|
||||||
protected override void DrawContext(ref DrawContext context)
|
|
||||||
{
|
|
||||||
Transform.Size.Set(context.WorldScale);
|
|
||||||
|
|
||||||
base.DrawContext(ref context);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,38 +0,0 @@
|
||||||
#region usings
|
|
||||||
|
|
||||||
using OpenTK.Graphics;
|
|
||||||
using SM.Base.Contexts;
|
|
||||||
using SM.Base.Drawing;
|
|
||||||
using SM.Base.Scene;
|
|
||||||
using SM2D.Scene;
|
|
||||||
using SM2D.Types;
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
namespace SM2D.Drawing
|
|
||||||
{
|
|
||||||
public class DrawColor : DrawingBasis<Transformation>, I2DShowItem
|
|
||||||
{
|
|
||||||
public DrawColor()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public DrawColor(Color4 color)
|
|
||||||
{
|
|
||||||
_material.Tint = color;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Color4 Color
|
|
||||||
{
|
|
||||||
get => _material.Tint;
|
|
||||||
set => _material.Tint = value;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int ZIndex { get; set; }
|
|
||||||
|
|
||||||
protected override void DrawContext(ref DrawContext context)
|
|
||||||
{
|
|
||||||
context.Shader.Draw(context);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,37 +0,0 @@
|
||||||
#region usings
|
|
||||||
|
|
||||||
using SM.Base.Contexts;
|
|
||||||
using SM.Base.Drawing;
|
|
||||||
using SM.Base.Scene;
|
|
||||||
using SM.OGL.Mesh;
|
|
||||||
using SM2D.Scene;
|
|
||||||
using SM2D.Types;
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
namespace SM2D.Drawing
|
|
||||||
{
|
|
||||||
public class DrawComplex : DrawingBasis<Transformation>, I2DShowItem
|
|
||||||
{
|
|
||||||
public Material Material
|
|
||||||
{
|
|
||||||
get => _material;
|
|
||||||
set => _material = value;
|
|
||||||
}
|
|
||||||
|
|
||||||
public GenericMesh Mesh
|
|
||||||
{
|
|
||||||
get => _mesh;
|
|
||||||
set => _mesh = value;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int ZIndex { get; set; }
|
|
||||||
|
|
||||||
protected override void DrawContext(ref DrawContext context)
|
|
||||||
{
|
|
||||||
base.DrawContext(ref context);
|
|
||||||
|
|
||||||
context.Shader.Draw(context);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
68
SMCode/SM2D/Drawing/DrawObject2D.cs
Normal file
68
SMCode/SM2D/Drawing/DrawObject2D.cs
Normal file
|
|
@ -0,0 +1,68 @@
|
||||||
|
using System.Collections.Generic;
|
||||||
|
using System.Drawing;
|
||||||
|
using OpenTK;
|
||||||
|
using OpenTK.Graphics;
|
||||||
|
using SM.Base.Contexts;
|
||||||
|
using SM.Base.Drawing;
|
||||||
|
using SM.Base.Objects;
|
||||||
|
using SM.Base.Textures;
|
||||||
|
using SM2D.Object;
|
||||||
|
using SM2D.Scene;
|
||||||
|
using SM2D.Types;
|
||||||
|
|
||||||
|
namespace SM2D.Drawing
|
||||||
|
{
|
||||||
|
public class DrawObject2D : DrawingBasis<Transformation>, I2DShowItem
|
||||||
|
{
|
||||||
|
public int ZIndex { get; set; }
|
||||||
|
|
||||||
|
public Texture Texture
|
||||||
|
{
|
||||||
|
get => (Texture) _material.Texture;
|
||||||
|
set => _material.Texture = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
public Color4 Color
|
||||||
|
{
|
||||||
|
get => _material.Tint;
|
||||||
|
set => _material.Tint = value;
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override void DrawContext(ref DrawContext context)
|
||||||
|
{
|
||||||
|
base.DrawContext(ref context);
|
||||||
|
context.Shader.Draw(context);
|
||||||
|
}
|
||||||
|
|
||||||
|
public Material GetMaterialReference() => _material;
|
||||||
|
public void SetMaterialReference(Material material) => _material = material;
|
||||||
|
|
||||||
|
public void SetShader(MaterialShader shader) => _material.CustomShader = shader;
|
||||||
|
|
||||||
|
public Polygon ApplyPolygon(ICollection<Vector2> vertices)
|
||||||
|
{
|
||||||
|
Polygon polygon = new Polygon(vertices);
|
||||||
|
_mesh = polygon;
|
||||||
|
return polygon;
|
||||||
|
}
|
||||||
|
public Polygon ApplyPolygon(ICollection<PolygonVertex> vertices)
|
||||||
|
{
|
||||||
|
Polygon polygon = new Polygon(vertices);
|
||||||
|
_mesh = polygon;
|
||||||
|
return polygon;
|
||||||
|
}
|
||||||
|
public void ApplyPolygon(Polygon polygon)
|
||||||
|
{
|
||||||
|
_mesh = polygon;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void ApplyMesh(Mesh mesh) => _mesh = mesh;
|
||||||
|
|
||||||
|
public Polygon ApplyCircle(int segments = 32)
|
||||||
|
{
|
||||||
|
Polygon pol = Polygon.GenerateCircle(segments);
|
||||||
|
_mesh = pol;
|
||||||
|
return pol;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -1,46 +0,0 @@
|
||||||
#region usings
|
|
||||||
|
|
||||||
using System.Drawing;
|
|
||||||
using OpenTK.Graphics;
|
|
||||||
using SM.Base.Textures;
|
|
||||||
using SM2D.Object;
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
namespace SM2D.Drawing
|
|
||||||
{
|
|
||||||
public class DrawPolygon : DrawColor
|
|
||||||
{
|
|
||||||
public DrawPolygon(Polygon polygon) : this(polygon, Color4.White)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public DrawPolygon(Polygon polygon, Bitmap map) : this(polygon, map, Color4.White)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public DrawPolygon(Polygon polygon, Color4 color) : base(color)
|
|
||||||
{
|
|
||||||
_mesh = polygon;
|
|
||||||
}
|
|
||||||
|
|
||||||
public DrawPolygon(Polygon polygon, Bitmap map, Color4 tint) : base(tint)
|
|
||||||
{
|
|
||||||
_mesh = polygon;
|
|
||||||
|
|
||||||
_material.Texture = new Texture(map);
|
|
||||||
}
|
|
||||||
|
|
||||||
public Polygon Polygon
|
|
||||||
{
|
|
||||||
get => (Polygon) _mesh;
|
|
||||||
set => _mesh = value;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Texture Texture
|
|
||||||
{
|
|
||||||
get => (Texture) _material.Texture;
|
|
||||||
set => _material.Texture = value;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,24 +0,0 @@
|
||||||
using SM.Base.Contexts;
|
|
||||||
using SM.Base.Drawing;
|
|
||||||
using SM.Base.Scene;
|
|
||||||
using SM2D.Scene;
|
|
||||||
using SM2D.Types;
|
|
||||||
|
|
||||||
namespace SM2D.Drawing
|
|
||||||
{
|
|
||||||
public class DrawShader : DrawingBasis<Transformation>, I2DShowItem
|
|
||||||
{
|
|
||||||
public int ZIndex { get; set; }
|
|
||||||
|
|
||||||
public DrawShader(MaterialShader shader)
|
|
||||||
{
|
|
||||||
_material.CustomShader = shader;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void DrawContext(ref DrawContext context)
|
|
||||||
{
|
|
||||||
base.DrawContext(ref context);
|
|
||||||
_material.CustomShader.Draw(context);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,56 +0,0 @@
|
||||||
#region usings
|
|
||||||
|
|
||||||
using System.Drawing;
|
|
||||||
using OpenTK.Graphics;
|
|
||||||
using SM.Base.Contexts;
|
|
||||||
using SM.Base.Textures;
|
|
||||||
using SM.Base.Types;
|
|
||||||
|
|
||||||
#endregion
|
|
||||||
|
|
||||||
namespace SM2D.Drawing
|
|
||||||
{
|
|
||||||
public class DrawTexture : DrawColor
|
|
||||||
{
|
|
||||||
public static float MasterScale = .25f;
|
|
||||||
public bool ManualSize = false;
|
|
||||||
|
|
||||||
public float Scale = 1;
|
|
||||||
|
|
||||||
public DrawTexture()
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
protected DrawTexture(Color4 color) : base(color)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public DrawTexture(Bitmap map) : this(map, Color4.White)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public DrawTexture(Bitmap map, Color4 color) : this((Texture) map, color)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
|
|
||||||
public DrawTexture(Texture texture, Color4 color)
|
|
||||||
{
|
|
||||||
_material.Texture = texture;
|
|
||||||
_material.Tint = color;
|
|
||||||
}
|
|
||||||
|
|
||||||
public Texture Texture
|
|
||||||
{
|
|
||||||
get => (Texture) _material.Texture;
|
|
||||||
set => _material.Texture = value;
|
|
||||||
}
|
|
||||||
|
|
||||||
protected override void DrawContext(ref DrawContext context)
|
|
||||||
{
|
|
||||||
if (!ManualSize)
|
|
||||||
Transform.Size = new CVector2(Texture.Map.Width * MasterScale * Scale,
|
|
||||||
Texture.Map.Height * MasterScale * Scale);
|
|
||||||
base.DrawContext(ref context);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -1,25 +0,0 @@
|
||||||
<configuration>
|
|
||||||
<dllmap os="linux" dll="opengl32.dll" target="libGL.so.1"/>
|
|
||||||
<dllmap os="linux" dll="glu32.dll" target="libGLU.so.1"/>
|
|
||||||
<dllmap os="linux" dll="openal32.dll" target="libopenal.so.1"/>
|
|
||||||
<dllmap os="linux" dll="alut.dll" target="libalut.so.0"/>
|
|
||||||
<dllmap os="linux" dll="opencl.dll" target="libOpenCL.so"/>
|
|
||||||
<dllmap os="linux" dll="libX11" target="libX11.so.6"/>
|
|
||||||
<dllmap os="linux" dll="libXi" target="libXi.so.6"/>
|
|
||||||
<dllmap os="linux" dll="SDL2.dll" target="libSDL2-2.0.so.0"/>
|
|
||||||
<dllmap os="osx" dll="opengl32.dll" target="/System/Library/Frameworks/OpenGL.framework/OpenGL"/>
|
|
||||||
<dllmap os="osx" dll="openal32.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
|
|
||||||
<dllmap os="osx" dll="alut.dll" target="/System/Library/Frameworks/OpenAL.framework/OpenAL" />
|
|
||||||
<dllmap os="osx" dll="libGLES.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
|
|
||||||
<dllmap os="osx" dll="libGLESv1_CM.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
|
|
||||||
<dllmap os="osx" dll="libGLESv2.dll" target="/System/Library/Frameworks/OpenGLES.framework/OpenGLES" />
|
|
||||||
<dllmap os="osx" dll="opencl.dll" target="/System/Library/Frameworks/OpenCL.framework/OpenCL"/>
|
|
||||||
<dllmap os="osx" dll="SDL2.dll" target="libSDL2.dylib"/>
|
|
||||||
<!-- XQuartz compatibility (X11 on Mac) -->
|
|
||||||
<dllmap os="osx" dll="libGL.so.1" target="/usr/X11/lib/libGL.dylib"/>
|
|
||||||
<dllmap os="osx" dll="libX11" target="/usr/X11/lib/libX11.dylib"/>
|
|
||||||
<dllmap os="osx" dll="libXcursor.so.1" target="/usr/X11/lib/libXcursor.dylib"/>
|
|
||||||
<dllmap os="osx" dll="libXi" target="/usr/X11/lib/libXi.dylib"/>
|
|
||||||
<dllmap os="osx" dll="libXinerama" target="/usr/X11/lib/libXinerama.dylib"/>
|
|
||||||
<dllmap os="osx" dll="libXrandr.so.2" target="/usr/X11/lib/libXrandr.dylib"/>
|
|
||||||
</configuration>
|
|
||||||
|
|
@ -41,14 +41,9 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="Controls\Mouse2D.cs" />
|
<Compile Include="Controls\Mouse2D.cs" />
|
||||||
<Compile Include="Drawing\DrawBackground.cs" />
|
<Compile Include="Drawing\DrawBackground.cs" />
|
||||||
<Compile Include="Drawing\DrawBackgroundShader.cs" />
|
<Compile Include="Drawing\DrawObject2D.cs" />
|
||||||
<Compile Include="Drawing\DrawColor.cs" />
|
|
||||||
<Compile Include="Drawing\DrawComplex.cs" />
|
|
||||||
<Compile Include="Drawing\DrawParticles.cs" />
|
<Compile Include="Drawing\DrawParticles.cs" />
|
||||||
<Compile Include="Drawing\DrawPolygon.cs" />
|
|
||||||
<Compile Include="Drawing\DrawShader.cs" />
|
|
||||||
<Compile Include="Drawing\DrawText.cs" />
|
<Compile Include="Drawing\DrawText.cs" />
|
||||||
<Compile Include="Drawing\DrawTexture.cs" />
|
|
||||||
<Compile Include="GLWindow2D.cs" />
|
<Compile Include="GLWindow2D.cs" />
|
||||||
<Compile Include="Object\Polygon.cs" />
|
<Compile Include="Object\Polygon.cs" />
|
||||||
<Compile Include="Object\PolygonVertex.cs" />
|
<Compile Include="Object\PolygonVertex.cs" />
|
||||||
|
|
@ -73,9 +68,12 @@
|
||||||
</ProjectReference>
|
</ProjectReference>
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<None Include="OpenTK.dll.config" />
|
|
||||||
<None Include="packages.config" />
|
|
||||||
<EmbeddedResource Include="Shader\ShaderFiles\default.glsl" />
|
<EmbeddedResource Include="Shader\ShaderFiles\default.glsl" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<PackageReference Include="OpenTK">
|
||||||
|
<Version>3.2.1</Version>
|
||||||
|
</PackageReference>
|
||||||
|
</ItemGroup>
|
||||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||||
</Project>
|
</Project>
|
||||||
Loading…
Add table
Add a link
Reference in a new issue