Skip to content

Commit

Permalink
UniRx integration fixes
Browse files Browse the repository at this point in the history
# Changed
- Changed `ReactiveDataCatalog` icon.
- Moved the namespace of `IReadOnlyReactiveData<T>` and  `IReactiveData<T>` from 'MackySoft.UniData.UniRx.Data' to `MackySoft.UniData.UniRx`.

# Fixed
- Fixed `UniDataSettings` were not generated when initialized `UniDataSettingsInitializer`.
  • Loading branch information
mackysoft committed Apr 9, 2021
1 parent 58409ca commit 0ca51c4
Show file tree
Hide file tree
Showing 7 changed files with 32 additions and 11 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ class UniDataSettingsInitializer {

[InitializeOnLoadMethod]
static void Initialize () {
CreateSettings();
EditorApplication.projectChanged -= CreateSettings;
EditorApplication.projectChanged += CreateSettings;
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
#if UNIDATA_UNIRX_SUPPORT

using UniRx;

namespace MackySoft.UniData.UniRx {

public interface IReadOnlyReactiveData<T> : IReadOnlyData<T>, IReadOnlyReactiveProperty<T> {
new T Value { get; }
}

public interface IReactiveData<T> : IReadOnlyReactiveData<T>, IData<T>, IReactiveProperty<T> {
new T Value { get; set; }
}

}
#endif

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,6 @@

namespace MackySoft.UniData.UniRx.Data {

public interface IReadOnlyReactiveData<T> : IReadOnlyData<T>, IReadOnlyReactiveProperty<T> {
new T Value { get; }
}

public interface IReactiveData<T> : IReadOnlyReactiveData<T>, IData<T>, IReactiveProperty<T> {
new T Value { get; set; }
}

/// <summary>
/// Base class that is useful for creating reactive data.
/// </summary>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#if UNIDATA_UNIRX_SUPPORT
#pragma warning disable IDE0074 // 複合代入を使用

#pragma warning disable IDE0074 // 複合代入を使用
#if UNIDATA_UNIRX_SUPPORT

using System;
using UnityEngine;
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions MackySoft.UniData.UniRx.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
<Analyzer Include="C:\Program Files (x86)\Microsoft Visual Studio Tools for Unity\16.0\Analyzers\Microsoft.Unity.Analyzers.dll" />
</ItemGroup>
<ItemGroup>
<Compile Include="Assets\MackySoft\MackySoft.UniData\External\UniRx\Runtime\IReactiveData.cs" />
<Compile Include="Assets\MackySoft\MackySoft.UniData\External\UniRx\Runtime\ReactiveEntryReference.cs" />
<Compile Include="Assets\MackySoft\MackySoft.UniData\External\UniRx\Runtime\ReactiveData.cs" />
<Compile Include="Assets\MackySoft\MackySoft.UniData\External\UniRx\Runtime\ReactiveDataCatalog.cs" />
Expand Down

0 comments on commit 0ca51c4

Please sign in to comment.