Skip to content

Commit

Permalink
Rename
Browse files Browse the repository at this point in the history
  • Loading branch information
JensKrumsieck committed Sep 4, 2023
1 parent 2955bdf commit 22b3f61
Show file tree
Hide file tree
Showing 58 changed files with 285 additions and 227 deletions.
27 changes: 27 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
name: Publish
on:
push:
tags:
- v*.*.*
workflow_dispatch:

jobs:
publish:
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- name: Setup .NET
uses: actions/setup-dotnet@v3
with:
dotnet-version: |
7.0.x
env:
NUGET_AUTH_TOKEN: ${{secrets.NUGET_TOKEN}}
- name: Install Dependencies
run: dotnet restore
- name: Build
run: dotnet build --configuration Release --no-restore
- name: Pack
run: dotnet pack -c Release --no-restore --no-build
- name: Push Nuget
run: dotnet nuget push .\Catalyze\**\*.nupkg --skip-duplicate --no-symbols -k ${{secrets.NUGET_TOKEN}} -s https://api.nuget.org/v3/index.json
1 change: 0 additions & 1 deletion Catalyst/GlobalUsings.cs

This file was deleted.

2 changes: 1 addition & 1 deletion Catalyst.sln → Catalyze.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ VisualStudioVersion = 17.7.34003.232
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TriangleExample", "Examples\TriangleExample\TriangleExample.csproj", "{FFAF4979-5CE5-4336-9BAD-4B216DC2DAB9}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Catalyst", "Catalyst\Catalyst.csproj", "{9607AC72-F0F4-4664-A2FF-F9440DF2E9A0}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Catalyze", "Catalyze\Catalyze.csproj", "{9607AC72-F0F4-4664-A2FF-F9440DF2E9A0}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Examples", "Examples", "{ACA4C31C-0201-48BC-91AA-F2F13BAAFCEB}"
EndProject
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Silk.NET.Vulkan;

namespace Catalyst.Allocation;
namespace Catalyze.Allocation;

public readonly struct AllocatedImage
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Silk.NET.Vulkan;

namespace Catalyst.Allocation;
namespace Catalyze.Allocation;

public unsafe struct Allocation : IDisposable
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Silk.NET.Vulkan;

namespace Catalyst.Allocation;
namespace Catalyze.Allocation;

public struct AllocationCreateInfo
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Silk.NET.Vulkan;

namespace Catalyst.Allocation;
namespace Catalyze.Allocation;

public static class AllocatorExtensions
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Silk.NET.Vulkan;

namespace Catalyst.Allocation;
namespace Catalyze.Allocation;

public interface IAllocator : IDisposable
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System.Runtime.InteropServices;
using Catalyst.Tools;
using Catalyze.Tools;
using Silk.NET.Vulkan;

namespace Catalyst.Allocation;
namespace Catalyze.Allocation;

public sealed unsafe class PassthroughAllocator : IAllocator
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using System.Collections.ObjectModel;
using Catalyst.Allocation;
using Catalyst.UI;
using Catalyze.Allocation;
using Catalyze.UI;
using Silk.NET.Input;
using Silk.NET.Windowing;

namespace Catalyst.Applications;
namespace Catalyze.Applications;

public class Application : IDisposable
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
using Silk.NET.Core.Contexts;
using Silk.NET.Input;
using Silk.NET.Input;
using Silk.NET.Windowing;

namespace Catalyst.Applications;
namespace Catalyze.Applications;

public class ApplicationBuilder
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Catalyst.Applications;
namespace Catalyze.Applications;

public interface IAppLayer
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
namespace Catalyst.Applications;
namespace Catalyze.Applications;

public interface IAppModule : IDisposable { }
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Catalyst.Applications;
namespace Catalyze.Applications;

public enum Lifetime
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
using System.Collections.ObjectModel;
using Silk.NET.Core.Contexts;
using Silk.NET.Input;
using Silk.NET.Windowing;

namespace Catalyst.Applications;
namespace Catalyze.Applications;

public class ServiceCollection
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Catalyst.Applications;
namespace Catalyze.Applications;

public class ServiceDescriptor
{
Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions Catalyst/Buffer.cs → Catalyze/Buffer.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Catalyst.Tools;
using Catalyze.Tools;
using Silk.NET.Vulkan;

namespace Catalyst;
namespace Catalyze;

public unsafe struct Buffer : IDisposable, IConvertibleTo<Silk.NET.Vulkan.Buffer>
{
Expand Down
18 changes: 18 additions & 0 deletions Catalyst/Catalyst.csproj → Catalyze/Catalyze.csproj
Original file line number Diff line number Diff line change
@@ -1,12 +1,30 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<PackageId>Catalyze</PackageId>
<Version>0.1.0-alpha.1</Version>

<Description>Vulkan &amp; ImGui Apps in C# using Silk.NET and ImGui.NET</Description>
<Authors>Jens Krumsieck</Authors>
<Copyright>Jens Krumsieck</Copyright>
<PackageProjectUrl>https://github.com/JensKrumsieck/Catalyst</PackageProjectUrl>
<RepositoryUrl>https://github.com/JensKrumsieck/Catalyst</RepositoryUrl>
<PackageLicenseExpression>MIT</PackageLicenseExpression>
<RepositoryType>git</RepositoryType>
<PackageTags>3D, Vulkan, Silk.NET, ImGui, Engine</PackageTags>

<TargetFramework>net7.0</TargetFramework>
<LangVersion>preview</LangVersion>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

<ItemGroup>
<!--<None Include="..\icon.png" Pack="true" PackagePath=""/>-->
<None Include="..\README.md" Pack="true" PackagePath="\"/>
</ItemGroup>

<ItemGroup>
<PackageReference Include="Silk.NET.Vulkan" Version="2.17.1" />
<PackageReference Include="Silk.NET.Vulkan.Extensions.EXT" Version="2.17.1" />
Expand Down
6 changes: 3 additions & 3 deletions Catalyst/CommandBuffer.cs → Catalyze/CommandBuffer.cs
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using Catalyst.Pipeline;
using Catalyst.Tools;
using Catalyze.Pipeline;
using Catalyze.Tools;
using Silk.NET.Vulkan;

namespace Catalyst;
namespace Catalyze;

public unsafe struct CommandBuffer : IConvertibleTo<Silk.NET.Vulkan.CommandBuffer>
{
Expand Down
2 changes: 1 addition & 1 deletion Catalyst/Constants.cs → Catalyze/Constants.cs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace Catalyst;
namespace Catalyze;

public static class Constants
{
Expand Down
4 changes: 2 additions & 2 deletions Catalyst/DescriptorPool.cs → Catalyze/DescriptorPool.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Catalyst.Tools;
using Catalyze.Tools;
using Silk.NET.Vulkan;

namespace Catalyst;
namespace Catalyze;

public readonly unsafe struct DescriptorPool : IDisposable, IConvertibleTo<Silk.NET.Vulkan.DescriptorPool>
{
Expand Down
4 changes: 2 additions & 2 deletions Catalyst/DescriptorSet.cs → Catalyze/DescriptorSet.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Catalyst.Tools;
using Catalyze.Tools;
using Silk.NET.Vulkan;

namespace Catalyst;
namespace Catalyze;

public readonly unsafe struct DescriptorSet : IConvertibleTo<Silk.NET.Vulkan.DescriptorSet>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Catalyst.Tools;
using Catalyze.Tools;
using Silk.NET.Vulkan;

namespace Catalyst;
namespace Catalyze;

public readonly unsafe struct DescriptorSetLayout : IDisposable, IConvertibleTo<Silk.NET.Vulkan.DescriptorSetLayout>
{
Expand Down
1 change: 1 addition & 0 deletions Catalyze/GlobalUsings.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
global using static Catalyze.Vulkan;
8 changes: 4 additions & 4 deletions Catalyst/GraphicsDevice.cs → Catalyze/GraphicsDevice.cs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
using Catalyst.Allocation;
using Catalyst.Applications;
using Catalyst.Tools;
using Catalyze.Allocation;
using Catalyze.Applications;
using Catalyze.Tools;
using Silk.NET.Core.Contexts;
using Silk.NET.Core.Native;
using Silk.NET.Vulkan;
using Silk.NET.Vulkan.Extensions.EXT;
using Silk.NET.Vulkan.Extensions.KHR;

namespace Catalyst;
namespace Catalyze;

public unsafe class GraphicsDevice : IAppModule
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
using System.Runtime.InteropServices;
using Catalyst.Tools;
using Catalyze.Tools;
using Silk.NET.Core;
using Silk.NET.Vulkan;
using Silk.NET.Vulkan.Extensions.EXT;
using Silk.NET.Vulkan.Extensions.KHR;

namespace Catalyst;
namespace Catalyze;

public struct GraphicsDeviceCreateOptions
{
public string ApplicationName = "Catalyst";
public string ApplicationName = "Catalyze";
public string EngineName = "No Engine";
public Version32 ApplicationVersion = Vk.Version10;
public Version32 EngineVersion = Vk.Version10;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Catalyst.Tools;
using Catalyze.Tools;
using Silk.NET.Vulkan;

namespace Catalyst.Pipeline;
namespace Catalyze.Pipeline;

public unsafe struct ComputePass : IDisposable, IConvertibleTo<Silk.NET.Vulkan.Pipeline>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Catalyst.Tools;
using Catalyze.Tools;
using Silk.NET.Vulkan;

namespace Catalyst.Pipeline;
namespace Catalyze.Pipeline;

public readonly unsafe struct ShaderEffect : IDisposable
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Catalyst.Tools;
using Catalyze.Tools;
using Silk.NET.Vulkan;

namespace Catalyst.Pipeline;
namespace Catalyze.Pipeline;

public readonly unsafe struct ShaderPass : IDisposable, IConvertibleTo<Silk.NET.Vulkan.Pipeline>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Silk.NET.Vulkan;

namespace Catalyst.Pipeline;
namespace Catalyze.Pipeline;

public struct ShaderPassInfo
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Catalyst.Tools;
using Catalyze.Tools;
using Silk.NET.Vulkan;

namespace Catalyst.Pipeline;
namespace Catalyze.Pipeline;

public readonly struct ShaderStage
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Silk.NET.Vulkan;

namespace Catalyst.Pipeline;
namespace Catalyze.Pipeline;

public readonly struct VertexInfo
{
Expand Down
2 changes: 1 addition & 1 deletion Catalyst/Random.cs → Catalyze/Random.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Numerics;
using System.Runtime.CompilerServices;

namespace Catalyst;
namespace Catalyze;

public static class Random
{
Expand Down
6 changes: 3 additions & 3 deletions Catalyst/Renderer.cs → Catalyze/Renderer.cs
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using Catalyst.Applications;
using Catalyst.Tools;
using Catalyze.Applications;
using Catalyze.Tools;
using Silk.NET.Vulkan;
using Silk.NET.Windowing;

namespace Catalyst;
namespace Catalyze;

public class Renderer : IAppModule
{
Expand Down
6 changes: 3 additions & 3 deletions Catalyst/Swapchain.cs → Catalyze/Swapchain.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using Catalyst.Allocation;
using Catalyst.Tools;
using Catalyze.Allocation;
using Catalyze.Tools;
using Silk.NET.Vulkan;
using Silk.NET.Vulkan.Extensions.KHR;
using Semaphore = Silk.NET.Vulkan.Semaphore;

namespace Catalyst;
namespace Catalyze;

public unsafe struct Swapchain : IDisposable, IConvertibleTo<SwapchainKHR>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Silk.NET.Vulkan;

namespace Catalyst;
namespace Catalyze;

public record struct SwapchainSupport(
SurfaceCapabilitiesKHR Capabilities,
Expand Down
8 changes: 4 additions & 4 deletions Catalyst/Texture.cs → Catalyze/Texture.cs
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
using Catalyst.Allocation;
using Catalyst.Pipeline;
using Catalyst.Tools;
using Catalyze.Allocation;
using Catalyze.Pipeline;
using Catalyze.Tools;
using Silk.NET.Vulkan;
using SkiaSharp;

namespace Catalyst;
namespace Catalyze;

public unsafe class Texture : IDisposable
{
Expand Down

0 comments on commit 22b3f61

Please sign in to comment.