Skip to content

Commit

Permalink
fix: renaming issues
Browse files Browse the repository at this point in the history
  • Loading branch information
Rikarin committed Apr 2, 2024
1 parent eebced0 commit 8903fe2
Show file tree
Hide file tree
Showing 29 changed files with 55 additions and 48 deletions.
2 changes: 1 addition & 1 deletion .nuke/parameters.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"$schema": "./build.schema.json",
"Solution": "Rin.sln"
"Solution": "Vixen.sln"
}
2 changes: 1 addition & 1 deletion Examples/Project1/ProjectSettings/Editor/Default.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[Window][Rin Editor]
[Window][Vixen Editor]
Pos=0,0
Size=1600,900
Collapsed=0
Expand Down
2 changes: 1 addition & 1 deletion Examples/Project1/ProjectSettings/Editor/Layouts/Basic.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[Window][Rin Editor]
[Window][Vixen Editor]
Pos=0,0
Size=1600,900
Collapsed=0
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ Create game engine with requirements:

## Topics (TODO)

- FIX <RootNamespace>Rin.Core</RootNamespace>
- FIX <RootNamespace>Vixen.Core</RootNamespace>

- Generic interface for wrapping Vulkan & OpenGL
- Rendering Pipelines
Expand Down
6 changes: 3 additions & 3 deletions Tests/Vixen.Core.Shaders.Tests/Example1.rsh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package Rin.Test
package Vixen.Test

import Rin.Core
import Rin.BaseShaders
import Vixen.Core
import Vixen.BaseShaders

// Test class
shader TestShader : ExampleBase, CustomShader {
Expand Down
2 changes: 1 addition & 1 deletion Tests/Vixen.Core.Shaders.Tests/Parser.Test.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ void TestParser() {
var tree = parser.compilation_unit();
var module = tree.Accept(visitor) as Module;

Assert.Equal("Rin.Test", module.Package.Name.Text);
Assert.Equal("Vixen.Test", module.Package.Name.Text);

var shader = module.Declarations.OfType<Shader>().First();
Assert.Equal("TestShader", shader.Name.Text);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -663,7 +663,7 @@ public void DeserializeNullList() {
var settings = new SerializerSettings();
settings.RegisterAssembly(typeof(Z).Assembly);
var sut = new Serializer(settings);
const string yaml = @"!Rin.Core.Yaml.Tests.Serialization.SerializationTests+W
const string yaml = @"!Vixen.Core.Yaml.Tests.Serialization.SerializationTests+W
MyList:
- aaa
- bbb
Expand Down
12 changes: 6 additions & 6 deletions Tests/Vixen.Core.Yaml.Tests/TagTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Xunit;

// ReSharper disable once CheckNamespace - we explicitely want a custom namespace for the sake of the tests
namespace Rin.Core.Yaml.Tests.TestNamespace;
namespace Vixen.Core.Yaml.Tests.TestNamespace;

// Note: do not move these types! If the namespace must be changed, be sure to update TagTests.Namespace.

Expand Down Expand Up @@ -59,8 +59,8 @@ public class AliasType2 { }
#endregion Types

public class TagTests : YamlTest {
const string AssemblyName = "Rin.Core.Yaml.Tests";
const string Namespace = "Rin.Core.Yaml.Tests.TestNamespace";
const string AssemblyName = "Vixen.Core.Yaml.Tests";
const string Namespace = "Vixen.Core.Yaml.Tests.TestNamespace";

[Fact]
public void TestNullType() {
Expand Down Expand Up @@ -88,7 +88,7 @@ public void TestNullableType() {
TestType(typeof(int?), "!System.Nullable%601[[System.Int32,System.Private.CoreLib]],System.Private.CoreLib");
// TODO: we would like to have something like "!System.Guid?,System.Private.CoreLib"
TestType(typeof(Guid?), "!System.Nullable%601[[System.Guid,System.Private.CoreLib]],System.Private.CoreLib");
// TODO: we would like to have something like "!Rin.Core.Yaml.Tests.TestNamespace.SimpleStruct?,Rin.Core.Yaml.Tests"
// TODO: we would like to have something like "!Vixen.Core.Yaml.Tests.TestNamespace.SimpleStruct?,Vixen.Core.Yaml.Tests"
TestType(
typeof(SimpleStruct?),
$"!System.Nullable%601[[{Namespace}.SimpleStruct,{AssemblyName}]],System.Private.CoreLib"
Expand Down Expand Up @@ -173,7 +173,7 @@ public void TestDataContractType() {

[Fact]
public void TestGenericDataContractType() {
// TODO: we would like to have: !CustomName2[[Rin.Core.Yaml.Tests.TestNamespace.SimpleType,Rin.Core.Yaml.Tests]]
// TODO: we would like to have: !CustomName2[[Vixen.Core.Yaml.Tests.TestNamespace.SimpleType,Vixen.Core.Yaml.Tests]]
TestType(
typeof(GenericDataContractType<SimpleType>),
$"!{Namespace}.GenericDataContractType%601[[{Namespace}.SimpleType,{AssemblyName}]],{AssemblyName}"
Expand Down Expand Up @@ -456,7 +456,7 @@ public void TestDataContractTypeArray() {

[Fact]
public void TestGenericDataContractTypeArray() {
// TODO: we would like to have: !CustomName2[[Rin.Core.Yaml.Tests.TestNamespace.SimpleType,Rin.Core.Yaml.Tests]][]
// TODO: we would like to have: !CustomName2[[Vixen.Core.Yaml.Tests.TestNamespace.SimpleType,Vixen.Core.Yaml.Tests]][]
TestType(
typeof(GenericDataContractType<SimpleType>[]),
$"!{Namespace}.GenericDataContractType%601[[{Namespace}.SimpleType,{AssemblyName}]][],{AssemblyName}"
Expand Down
2 changes: 1 addition & 1 deletion Tests/Vixen.Core.Yaml.Tests/files/explicitType.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
!Rin.Core.Yaml.Tests.Serialization.SerializationTests%2BZ%2C%20Rin.Core.Yaml.Tests {
!Vixen.Core.Yaml.Tests.Serialization.SerializationTests%2BZ%2C%20Vixen.Core.Yaml.Tests {
aaa: bbb
}
2 changes: 1 addition & 1 deletion Vixen.BuildEngine.Common/Builder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ namespace Vixen.BuildEngine.Common;
public class Builder : IDisposable {
public const int ExpectedVersion = 4;

public const string MonitorPipeName = "Rin/BuildEngine/Monitor";
public const string MonitorPipeName = "Vixen/BuildEngine/Monitor";
public static readonly string DoNotCompressTag = "DoNotCompress";
public static readonly string DoNotPackTag = "DoNotPack";

Expand Down
2 changes: 1 addition & 1 deletion Vixen.BuildEngine.Common/FileVersionTracker.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ namespace Vixen.BuildEngine.Common;
/// A tracker of file date.
/// </summary>
public class FileVersionTracker : IDisposable {
const string DefaultFileVersionTrackerFile = "Rin/FileVersionTracker.cache";
const string DefaultFileVersionTrackerFile = "Vixen/FileVersionTracker.cache";

readonly FileVersionStorage storage;
readonly Dictionary<FileVersionKey, object> locks;
Expand Down
4 changes: 2 additions & 2 deletions Vixen.Core.MicroThreading/MicroThreadProfiling.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
namespace Vixen.Core.MicroThreading;

public static class MicroThreadProfiling {
public static readonly ActivitySource MicroThreadingSource = new("Rin.Core.MicroThreading");
public static readonly Meter MicroThreadingMeter = new("Rin.Core.MicroThreading");
public static readonly ActivitySource MicroThreadingSource = new("Vixen.Core.MicroThreading");
public static readonly Meter MicroThreadingMeter = new("Vixen.Core.MicroThreading");

public static readonly Histogram<double> MicroThread = MicroThreadingMeter.CreateHistogram<double>("MicroThread");

Expand Down
2 changes: 1 addition & 1 deletion Vixen.Core.Shaders/VixenLexerBase.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ protected void OnColon() {
// }
//
// if (switchToFormatString) {
// Mode(RinLexer.INTERPOLATION_FORMAT);
// Mode(VixenLexer.INTERPOLATION_FORMAT);
// }
// }
}
Expand Down
4 changes: 2 additions & 2 deletions Vixen.Core/Diagnostics/ApplicationProfiling.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
namespace Vixen.Core.Diagnostics;

public static class ApplicationProfiling {
public static readonly ActivitySource ApplicationSource = new("Rin.Application");
public static readonly Meter ApplicationMeter = new("Rin.Application");
public static readonly ActivitySource ApplicationSource = new("Vixen.Application");
public static readonly Meter ApplicationMeter = new("Vixen.Application");

public static readonly Histogram<double> Initialization = ApplicationMeter.CreateHistogram<double>("Initialization");
public static readonly Histogram<double> WorkTime = ApplicationMeter.CreateHistogram<double>("WorkTime");
Expand Down
2 changes: 1 addition & 1 deletion Vixen.Core/General/Application.cs
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ public void Run() {

public static Application CreateDefault(Action<ApplicationOptions>? configureOptions = null) {
var options = new ApplicationOptions {
Name = "Rin Engine", ThreadingPolicy = ThreadingPolicy.MultiThreaded, VSync = true
Name = "Vixen Engine", ThreadingPolicy = ThreadingPolicy.MultiThreaded, VSync = true
};
configureOptions?.Invoke(options);

Expand Down
2 changes: 1 addition & 1 deletion Vixen.Core/General/Window.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public class Window {
internal readonly IWindow Handle;

public Window(Action<WindowOptions>? configureOptions = null) {
var options = new WindowOptions { Title = "Rin Engine", Size = new(1600, 900), Decorated = true, VSync = true };
var options = new WindowOptions { Title = "Vixen Engine", Size = new(1600, 900), Decorated = true, VSync = true };

configureOptions?.Invoke(options);

Expand Down
5 changes: 3 additions & 2 deletions Vixen.Core/Serialization/MemberSerializerGenerated.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// <auto-generated/>

using System;
using System.Reflection;
using System.Runtime.CompilerServices;
using Vixen.Core.Storage;

Expand Down Expand Up @@ -1563,4 +1564,4 @@ public override void Serialize(ref T obj, ArchiveMode mode, SerializationStream
}

}
}
}
6 changes: 3 additions & 3 deletions Vixen.Core/Serialization/MemberSerializerGenerated.tt
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
using System;
using System.Reflection;
using System.Runtime.CompilerServices;
using Rin.Core.Storage;
using Vixen.Core.Storage;

namespace Rin.Core.Serialization;
namespace Vixen.Core.Serialization;

<#
var className = "MemberNullableSerializer";
Expand All @@ -36,4 +36,4 @@ supportsNonSealed = true;
supportsValueType = false;
supportsReuseReferences = true;
supportsExternalIdentifiableAsGuid = true; #>
<#@ include file="MemberSerializerClass.ttinclude" #>
<#@ include file="MemberSerializerClass.ttinclude" #>
2 changes: 2 additions & 0 deletions Vixen.Core/Serialization/SerializerExtensions.cs
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
using System;
using System.IO;
using System.Runtime.CompilerServices;
using System.Runtime.InteropServices;
using Vixen.Core.Serialization.Binary;
Expand Down
4 changes: 4 additions & 0 deletions Vixen.Core/Vixen.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
<Generator>TextTemplatingFileGenerator</Generator>
<LastGenOutput>MemberSerializerGenerated.cs</LastGenOutput>
</None>
<None Update="Serialization\MemberSerializerCore.ttinclude">
<Generator>TextTemplatingFilePreprocessor</Generator>
<LastGenOutput>MemberSerializerCore.cs</LastGenOutput>
</None>
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion Vixen.Diagnostics/Profiler.cs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ public static void Initialize(Action<MeterProviderBuilder>? configure = null) {
eventSourcesListener = new();

tracerProvider = Sdk.CreateTracerProviderBuilder()
.AddSource("Rin.*")
.AddSource("Vixen.*")
// .AddConsoleExporter()
// .AddInMemoryExporter(traces)
.Build();
Expand Down
2 changes: 1 addition & 1 deletion Vixen.Editor/GuiRenderer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ public void OnUpdate() {
// We cannot preserve the docking relationship between an active window and an inactive docking, otherwise
// any change of dockspace/settings would lead to windows being stuck in limbo and never being visible.
ImGui.PushStyleVar(ImGuiStyleVar.WindowPadding, Vector2.Zero);
ImGui.Begin("Rin Editor", ref dockSpaceOpen, windowFlags);
ImGui.Begin("Vixen Editor", ref dockSpaceOpen, windowFlags);
ImGui.PopStyleVar();

if (fullScreenDock) {
Expand Down
12 changes: 6 additions & 6 deletions Vixen.Editor/Panes/ProfilerPane.cs
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,12 @@ protected override void OnRender() {
ImGui.Spacing();
ImGui.Text("Engine");
ImGui.Separator();
PlotLineMetric("Rin.Renderer.SubmitCount", Cyan);
PlotLineMetric("Rin.Renderer.SubmitDisposalCount", Cyan);
PlotLineMetric("Rin.Application.WorkTime", LightBlue);
PlotLineMetric("Rin.Application.WaitTime", Yellow);
PlotLineMetric("Rin.Renderer.WorkTime", Cyan);
PlotLineMetric("Rin.Renderer.WaitTime", Pink);
PlotLineMetric("Vixen.Renderer.SubmitCount", Cyan);
PlotLineMetric("Vixen.Renderer.SubmitDisposalCount", Cyan);
PlotLineMetric("Vixen.Application.WorkTime", LightBlue);
PlotLineMetric("Vixen.Application.WaitTime", Yellow);
PlotLineMetric("Vixen.Renderer.WorkTime", Cyan);
PlotLineMetric("Vixen.Renderer.WaitTime", Pink);

ImGui.Spacing();
ImGui.Spacing();
Expand Down
6 changes: 3 additions & 3 deletions Vixen.Editor/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@

Log.Logger = new LoggerConfiguration()
.MinimumLevel.Debug()
.MinimumLevel.Override("Rin.Platform.Abstractions.Rendering.RendererContext", LogEventLevel.Information)
.MinimumLevel.Override("Rin.Platform.Abstractions.Rendering.ISwapchain", LogEventLevel.Information)
// .MinimumLevel.Override("Rin.Editor.ShaderCompiler", LogEventLevel.Information)
.MinimumLevel.Override("Vixen.Platform.Abstractions.Rendering.RendererContext", LogEventLevel.Information)
.MinimumLevel.Override("Vixen.Platform.Abstractions.Rendering.ISwapchain", LogEventLevel.Information)
// .MinimumLevel.Override("Vixen.Editor.ShaderCompiler", LogEventLevel.Information)

// For debugging pipeline
// .MinimumLevel.Verbose()
Expand Down
2 changes: 1 addition & 1 deletion Vixen.Editor/SourceContextEnricher.cs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ public void Enrich(LogEvent logEvent, ILogEventPropertyFactory propertyFactory)
var scalarValue = property as ScalarValue;
var value = scalarValue?.Value as string;

if (value?.StartsWith("Rin") ?? false) {
if (value?.StartsWith("Vixen") ?? false) {
var lastElement = value.Split(".").LastOrDefault();
if (!string.IsNullOrWhiteSpace(lastElement)) {
logEvent.AddOrUpdateProperty(new("SourceContext", new ScalarValue($"[{lastElement}]")));
Expand Down
2 changes: 1 addition & 1 deletion Vixen.Editor/imgui.ini
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[Window][Rin Editor]
[Window][Vixen Editor]
Pos=0,0
Size=1600,900
Collapsed=0
Expand Down
4 changes: 2 additions & 2 deletions Vixen.Platform.Common/Diagnostics/RendererProfiling.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
namespace Vixen.Platform.Common.Diagnostics;

public static class RendererProfiling {
public static readonly ActivitySource ApplicationSource = new("Rin.Renderer");
public static readonly Meter ApplicationMeter = new("Rin.Renderer");
public static readonly ActivitySource ApplicationSource = new("Vixen.Renderer");
public static readonly Meter ApplicationMeter = new("Vixen.Renderer");

public static readonly Histogram<double> WorkTime = ApplicationMeter.CreateHistogram<double>("WorkTime");
public static readonly Histogram<double> WaitTime = ApplicationMeter.CreateHistogram<double>("WaitTime");
Expand Down
4 changes: 2 additions & 2 deletions Vixen.Platform/Silk/ImGuiRenderer.cs_old
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using ImGuiNET;
using Rin.Platform.Internal;
using Vixen.Platform.Internal;
using Serilog;
using Silk.NET.OpenGL.Extensions.ImGui;
using System.Numerics;
using System.Runtime.InteropServices;

namespace Rin.Platform.Silk;
namespace Vixen.Platform.Silk;

class SilkImGuiRenderer2 : IInternalGuiRenderer {
readonly ImGuiController controller;
Expand Down
2 changes: 1 addition & 1 deletion Vixen.Platform/Vulkan/VulkanContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ public unsafe void CreateInstance() {
// TODO: fix these
PApplicationName = (byte*)Marshal.StringToHGlobalAnsi("Hello Triangle"),
ApplicationVersion = Vk.MakeVersion(1, 0),
PEngineName = (byte*)Marshal.StringToHGlobalAnsi("Rin"),
PEngineName = (byte*)Marshal.StringToHGlobalAnsi("Vixen"),
EngineVersion = Vk.MakeVersion(1, 0),
ApiVersion = Vk.MakeVersion(1, 2)
};
Expand Down

0 comments on commit 8903fe2

Please sign in to comment.