ShibaGit/khaotic-engine-Reborn
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 13 Wiki Activity

Merge branch 'main' into ImGui-V2

Browse Source
This commit is contained in:
CatChow0
2024-04-05 14:49:58 +02:00
parent 2b56e2bd1d e999885b62
commit 00151de879
4 changed files with 8 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
enginecustom/enginecustom.vcxproj
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.220531.1\build\native\Microsoft.Windows.CppWinRT.props" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220531.1\build\native\Microsoft.Windows.CppWinRT.props')" />
<ItemGroup Label="ProjectConfigurations">
<ProjectConfiguration Include="Debug|Win32">
<Configuration>Debug</Configuration>
@@ -58,10 +57,6 @@
<ClCompile Include="textureclass.cpp" />
<ClCompile Include="textureshaderclass.cpp" />
<ClCompile Include="Timerclass.cpp" />
<ClCompile Include="translate.cpp">
<DependentUpon>translate.vs</DependentUpon>
<SubType>Code</SubType>
</ClCompile>
<ClCompile Include="translateshaderclass.cpp" />
</ItemGroup>
<ItemGroup>
@@ -103,10 +98,6 @@
<ClInclude Include="textureclass.h" />
<ClInclude Include="textureshaderclass.h" />
<ClInclude Include="Timerclass.h" />
<ClInclude Include="translate.h">
<DependentUpon>translate.vs</DependentUpon>
<SubType>Code</SubType>
</ClInclude>
<ClInclude Include="translateshaderclass.h" />
</ItemGroup>
<ItemGroup>
@@ -286,14 +277,4 @@
</Link>
</ItemDefinitionGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\Microsoft.Windows.CppWinRT.2.0.220531.1\build\native\Microsoft.Windows.CppWinRT.targets" Condition="Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220531.1\build\native\Microsoft.Windows.CppWinRT.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>Ce projet fait référence à des packages NuGet qui sont manquants sur cet ordinateur. Utilisez l'option de restauration des packages NuGet pour les télécharger. Pour plus d'informations, consultez http://go.microsoft.com/fwlink/?LinkID=322105. Le fichier manquant est : {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220531.1\build\native\Microsoft.Windows.CppWinRT.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.220531.1\build\native\Microsoft.Windows.CppWinRT.props'))" />
<Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.220531.1\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.220531.1\build\native\Microsoft.Windows.CppWinRT.targets'))" />
</Target>
</Project>

8
enginecustom/enginecustom.vcxproj.filters
View File

@@ -391,4 +391,12 @@
<Filter>assets</Filter>
</Text>
</ItemGroup>
<ItemGroup>
<Midl Include="translate.ps">
<Filter>shader</Filter>
</Midl>
<Midl Include="translate.vs">
<Filter>shader</Filter>
</Midl>
</ItemGroup>
</Project>

18
enginecustom/translate.cpp
View File

@@ -1,18 +0,0 @@
#include "pch.h"
#include "Translate.h"
#if __has_include("Translate.g.cpp")
#include "Translate.g.cpp"
#endif
namespace winrt::enginecustom::implementation
{
int32_t Translate::MyProperty()
{
throw hresult_not_implemented();
}
void Translate::MyProperty(int32_t /*value*/)
{
throw hresult_not_implemented();
}
}

21
enginecustom/translate.h
View File

@@ -1,21 +0,0 @@
#pragma once
#include "Translate.g.h"
namespace winrt::enginecustom::implementation
{
struct Translate : TranslateT<Translate>
{
Translate() = default;
int32_t MyProperty();
void MyProperty(int32_t value);
};
}
namespace winrt::enginecustom::factory_implementation
{
struct Translate : TranslateT<Translate, implementation::Translate>
{
};
}