浏览代码

merge Animation project

Nikos Kastellanos 5 月之前
父节点
当前提交
82fc0b1d39

+ 2 - 2
Aether.Extras.NET4.sln

@@ -17,9 +17,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AnimationImporters", "Conte
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TilemapImporter", "Content.Pipeline\TilemapImporters\TilemapImporter.csproj", "{9B0F9C6B-3C43-472D-B0C1-91E11A9FDE89}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Animation.NET4", "Animation\Aether.Animation.NET4.csproj", "{F08D6D4C-60FB-4543-8D81-594080EB8051}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Animation", "Animation\Aether.Animation.csproj", "{F08D6D4C-60FB-4543-8D81-594080EB8051}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Animation.NET4.DX", "Animation\Aether.Animation.NET4.DX.csproj", "{57903A6B-1576-4361-8F03-1D5F038A782A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Animation.DX", "Animation\Aether.Animation.DX.csproj", "{57903A6B-1576-4361-8F03-1D5F038A782A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Aether.Shaders", "Aether.Shaders", "{13D47E11-4A7C-49C8-942E-2543E9C0098A}"
 EndProject

+ 2 - 2
Aether.Extras.NETSTANDARD.sln

@@ -17,9 +17,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnimationImporters", "Conte
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TilemapImporter", "Content.Pipeline\TilemapImporters\TilemapImporter.csproj", "{9B0F9C6B-3C43-472D-B0C1-91E11A9FDE89}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Animation.NETSTANDARD", "Animation\Aether.Animation.NETSTANDARD.csproj", "{F08D6D4C-60FB-4543-8D81-594080EB8051}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Animation", "Animation\Aether.Animation.csproj", "{F08D6D4C-60FB-4543-8D81-594080EB8051}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Animation.NETSTANDARD.DX", "Animation\Aether.Animation.NETSTANDARD.DX.csproj", "{57903A6B-1576-4361-8F03-1D5F038A782A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Animation.DX", "Animation\Aether.Animation.DX.csproj", "{57903A6B-1576-4361-8F03-1D5F038A782A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Aether.Shaders", "Aether.Shaders", "{13D47E11-4A7C-49C8-942E-2543E9C0098A}"
 EndProject

+ 8 - 25
Animation/Aether.Animation.NETSTANDARD.DX.csproj → Animation/Aether.Animation.DX.csproj

@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <ProjectGuid>{57903A6B-1576-4361-8F03-1D5F038A782A}</ProjectGuid>
     <EnableDefaultItems>false</EnableDefaultItems>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>nkast.Aether.Animation</RootNamespace>
     <AssemblyName>Aether.Animation</AssemblyName>
@@ -18,30 +19,12 @@
     <DefineConstants>TRACE;WINDOWS MG MAPPEDMEM</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="SharpDX" Version="4.0.1.0">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="SharpDX.Direct3D11" Version="4.0.1.0">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="SharpDX.DXGI" Version="4.0.1.0">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Content" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="4.0.9001" />
+    <PackageReference Include="SharpDX" Version="4.0.1.0" />
+    <PackageReference Include="SharpDX.Direct3D11" Version="4.0.1.0" />
+    <PackageReference Include="SharpDX.DXGI" Version="4.0.1.0" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Animation\Animations.cs" />

+ 0 - 79
Animation/Aether.Animation.NET4.DX.csproj

@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{57903A6B-1576-4361-8F03-1D5F038A782A}</ProjectGuid>
-    <ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>nkast.Aether.Animation</RootNamespace>
-    <AssemblyName>Aether.Animation</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\Artifacts\Debug\Libraries\net4.DX\</OutputPath>
-    <BaseIntermediateOutputPath>obj\net4.DX\</BaseIntermediateOutputPath>
-    <DefineConstants>TRACE;DEBUG;WINDOWS MG MAPPEDMEM</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\Artifacts\Release\Libraries\net4.DX\</OutputPath>
-    <BaseIntermediateOutputPath>obj\net4.DX\</BaseIntermediateOutputPath>
-    <DefineConstants>TRACE;WINDOWS MG MAPPEDMEM</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="mscorlib" />
-    <PackageReference Include="nkast.Xna.Framework" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="SharpDX" Version="4.0.1.0">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="SharpDX.Direct3D11" Version="4.0.1.0">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="SharpDX.DXGI" Version="4.0.1.0">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Animation\Animations.cs" />
-    <Compile Include="Animation\Clip.cs" />
-    <Compile Include="Animation\CpuAnimatedVertexBuffer.Unsafe.cs" />
-    <Compile Include="Animation\Extensions.cs" />
-    <Compile Include="Animation\Keyframe.cs" />
-    <Compile Include="ContentReaders\AnimationsReader.cs" />
-    <Compile Include="ContentReaders\ClipReader.cs" />
-    <Compile Include="ContentReaders\CpuAnimatedVertexBufferReader.cs" />
-    <Compile Include="Graphics\VertexTypes\VertexIndicesWeightsPositionNormal.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>

+ 0 - 67
Animation/Aether.Animation.NET4.csproj

@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectGuid>{F08D6D4C-60FB-4543-8D81-594080EB8051}</ProjectGuid>
-    <ProjectTypeGuids>{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>nkast.Aether.Animation</RootNamespace>
-    <AssemblyName>Aether.Animation</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>..\Artifacts\Debug\Libraries\net4\</OutputPath>
-    <BaseIntermediateOutputPath>obj\net4\</BaseIntermediateOutputPath>
-    <DefineConstants>TRACE;DEBUG;WINDOWS MG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>..\Artifacts\Release\Libraries\net4\</OutputPath>
-    <BaseIntermediateOutputPath>obj\net4\</BaseIntermediateOutputPath>
-    <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="mscorlib" />
-    <PackageReference Include="nkast.Xna.Framework" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Animation\Animations.cs" />
-    <Compile Include="Animation\Clip.cs" />
-    <Compile Include="Animation\CpuAnimatedVertexBuffer.Unsafe.cs" />
-    <Compile Include="Animation\Extensions.cs" />
-    <Compile Include="Animation\Keyframe.cs" />
-    <Compile Include="ContentReaders\AnimationsReader.cs" />
-    <Compile Include="ContentReaders\ClipReader.cs" />
-    <Compile Include="ContentReaders\CpuAnimatedVertexBufferReader.cs" />
-    <Compile Include="Graphics\VertexTypes\VertexIndicesWeightsPositionNormal.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>

+ 5 - 13
Animation/Aether.Animation.NETSTANDARD.csproj → Animation/Aether.Animation.csproj

@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <ProjectGuid>{F08D6D4C-60FB-4543-8D81-594080EB8051}</ProjectGuid>
     <EnableDefaultItems>false</EnableDefaultItems>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>nkast.Aether.Animation</RootNamespace>
     <AssemblyName>Aether.Animation</AssemblyName>
@@ -18,18 +19,9 @@
     <DefineConstants>TRACE;WINDOWS MG</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="nkast.Xna.Framework" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Content" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
-    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="4.0.9001">
-      <PrivateAssets>all</PrivateAssets>
-      <ExcludeAssets>runtime</ExcludeAssets>
-    </PackageReference>
+    <PackageReference Include="nkast.Xna.Framework" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Content" Version="4.0.9001" />
+    <PackageReference Include="nkast.Xna.Framework.Graphics" Version="4.0.9001" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Animation\Animations.cs" />

+ 2 - 2
Samples.DESKTOPGL.NET8.sln

@@ -17,9 +17,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnimationImporters", "Conte
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TilemapImporter", "Content.Pipeline\TilemapImporters\TilemapImporter.csproj", "{9B0F9C6B-3C43-472D-B0C1-91E11A9FDE89}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Animation.NETSTANDARD", "Animation\Aether.Animation.NETSTANDARD.csproj", "{F08D6D4C-60FB-4543-8D81-594080EB8051}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Animation", "Animation\Aether.Animation.csproj", "{F08D6D4C-60FB-4543-8D81-594080EB8051}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Animation.NETSTANDARD.DX", "Animation\Aether.Animation.NETSTANDARD.DX.csproj", "{57903A6B-1576-4361-8F03-1D5F038A782A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Animation.DX", "Animation\Aether.Animation.DX.csproj", "{57903A6B-1576-4361-8F03-1D5F038A782A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Aether.Shaders", "Aether.Shaders", "{13D47E11-4A7C-49C8-942E-2543E9C0098A}"
 EndProject

+ 2 - 2
Samples.WINDOWS.NET8.sln

@@ -17,9 +17,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AnimationImporters", "Conte
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TilemapImporter", "Content.Pipeline\TilemapImporters\TilemapImporter.csproj", "{9B0F9C6B-3C43-472D-B0C1-91E11A9FDE89}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Animation.NETSTANDARD", "Animation\Aether.Animation.NETSTANDARD.csproj", "{F08D6D4C-60FB-4543-8D81-594080EB8051}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Animation", "Animation\Aether.Animation.csproj", "{F08D6D4C-60FB-4543-8D81-594080EB8051}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Animation.NETSTANDARD.DX", "Animation\Aether.Animation.NETSTANDARD.DX.csproj", "{57903A6B-1576-4361-8F03-1D5F038A782A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Aether.Animation.DX", "Animation\Aether.Animation.DX.csproj", "{57903A6B-1576-4361-8F03-1D5F038A782A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Aether.Shaders", "Aether.Shaders", "{13D47E11-4A7C-49C8-942E-2543E9C0098A}"
 EndProject

+ 2 - 2
Samples.WINDOWS.sln

@@ -17,9 +17,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AnimationImporters", "Conte
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TilemapImporter", "Content.Pipeline\TilemapImporters\TilemapImporter.csproj", "{9B0F9C6B-3C43-472D-B0C1-91E11A9FDE89}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Animation.NET4", "Animation\Aether.Animation.NET4.csproj", "{F08D6D4C-60FB-4543-8D81-594080EB8051}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Animation", "Animation\Aether.Animation.csproj", "{F08D6D4C-60FB-4543-8D81-594080EB8051}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Animation.NET4.DX", "Animation\Aether.Animation.NET4.DX.csproj", "{57903A6B-1576-4361-8F03-1D5F038A782A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Aether.Animation.DX", "Animation\Aether.Animation.DX.csproj", "{57903A6B-1576-4361-8F03-1D5F038A782A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Aether.Shaders", "Aether.Shaders", "{13D47E11-4A7C-49C8-942E-2543E9C0098A}"
 EndProject

+ 1 - 1
Samples/Animation/Animation.Shared/Samples.Animation.WINDOWS.NET8.csproj

@@ -54,7 +54,7 @@
     </KniContentReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Animation\Aether.Animation.NETSTANDARD.DX.csproj" />
+    <ProjectReference Include="..\..\..\Animation\Aether.Animation.DX.csproj" />
     <ProjectReference Include="..\..\..\Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.csproj" />
   </ItemGroup>
 

+ 2 - 2
Samples/Animation/Animation.Shared/Samples.Animation.WINDOWS.csproj

@@ -70,9 +70,9 @@
     <None Include="app.manifest" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\Animation\Aether.Animation.NET4.DX.csproj">
+    <ProjectReference Include="..\..\..\Animation\Aether.Animation.DX.csproj">
       <Project>{57903a6b-1576-4361-8f03-1d5f038a782a}</Project>
-      <Name>Aether.Animation.NET4.DX</Name>
+      <Name>Aether.Animation.DX</Name>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Shaders\InfiniteGrid\Aether.Shaders.InfiniteGrid.csproj">
       <Project>{08296a2e-becf-4db9-a518-8a613d07b80e}</Project>