Moved all bindings to new namespace

The namespaces were getting a bit hap hazard for adding new ones so removed categories and put them all in one namespace.
grofit · Mar 10, 2017 · e7d04ff · e7d04ff
1 parent 005e8a7
commit e7d04ff
Show file tree

Hide file tree

Showing 39 changed files with 70 additions and 79 deletions.
diff --git a/src/Assets/BindingsRx/Bindings.meta b/src/Assets/BindingsRx/Bindings.meta
diff --git a/.../BindingsRx/UI/CanvasElementExtensions.cs → ...ngsRx/Bindings/CanvasElementExtensions.cs b/.../BindingsRx/UI/CanvasElementExtensions.cs → ...ngsRx/Bindings/CanvasElementExtensions.cs
@@ -1,12 +1,10 @@
 using System;
 using BindingsRx.Filters;
-using BindingsRx.GameObjects;
-using BindingsRx.Generic;
 using UniRx;
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace BindingsRx.UI
+namespace BindingsRx.Bindings
 {
     public static class CanvasElementExtensions
     {

diff --git a/...ingsRx/UI/CanvasElementExtensions.cs.meta → .../Bindings/CanvasElementExtensions.cs.meta b/...ingsRx/UI/CanvasElementExtensions.cs.meta → .../Bindings/CanvasElementExtensions.cs.meta
diff --git a/...ssets/BindingsRx/UI/DropdownExtensions.cs → ...BindingsRx/Bindings/DropdownExtensions.cs b/...ssets/BindingsRx/UI/DropdownExtensions.cs → ...BindingsRx/Bindings/DropdownExtensions.cs
@@ -1,15 +1,11 @@
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Security.Cryptography.X509Certificates;
-using BindingsRx.Extensions;
 using BindingsRx.Filters;
-using BindingsRx.Generic;
 using UniRx;
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace BindingsRx.UI
+namespace BindingsRx.Bindings
 {
     public static class DropdownExtensions
     {

diff --git a/.../BindingsRx/UI/DropdownExtensions.cs.meta → ...ngsRx/Bindings/DropdownExtensions.cs.meta b/.../BindingsRx/UI/DropdownExtensions.cs.meta → ...ngsRx/Bindings/DropdownExtensions.cs.meta
diff --git a/...ngsRx/GameObjects/GameObjectExtensions.cs → ...ndingsRx/Bindings/GameObjectExtensions.cs b/...ngsRx/GameObjects/GameObjectExtensions.cs → ...ndingsRx/Bindings/GameObjectExtensions.cs
@@ -1,10 +1,9 @@
 using System;
 using BindingsRx.Filters;
-using BindingsRx.Generic;
 using UniRx;
 using UnityEngine;
 
-namespace BindingsRx.GameObjects
+namespace BindingsRx.Bindings
 {
     public static class GameObjectExtensions
     {

diff --git a/.../GameObjects/GameObjectExtensions.cs.meta → ...sRx/Bindings/GameObjectExtensions.cs.meta b/.../GameObjects/GameObjectExtensions.cs.meta → ...sRx/Bindings/GameObjectExtensions.cs.meta
diff --git a/...ets/BindingsRx/Generic/GenericBindings.cs → ...ts/BindingsRx/Bindings/GenericBindings.cs b/...ets/BindingsRx/Generic/GenericBindings.cs → ...ts/BindingsRx/Bindings/GenericBindings.cs
@@ -4,9 +4,8 @@
 using BindingsRx.Extensions;
 using BindingsRx.Filters;
 using UniRx;
-using UnityEngine;
 
-namespace BindingsRx.Generic
+namespace BindingsRx.Bindings
 {
     public static class GenericBindings
     {

diff --git a/...indingsRx/Generic/GenericBindings.cs.meta → ...ndingsRx/Bindings/GenericBindings.cs.meta b/...indingsRx/Generic/GenericBindings.cs.meta → ...ndingsRx/Bindings/GenericBindings.cs.meta
diff --git a/...ets/BindingsRx/UI/InputFieldExtensions.cs → ...ndingsRx/Bindings/InputFieldExtensions.cs b/...ets/BindingsRx/UI/InputFieldExtensions.cs → ...ndingsRx/Bindings/InputFieldExtensions.cs
@@ -1,12 +1,11 @@
 using System;
 using BindingsRx.Convertors;
 using BindingsRx.Filters;
-using BindingsRx.Generic;
 using UniRx;
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace BindingsRx.UI
+namespace BindingsRx.Bindings
 {
     public static class InputFieldExtensions
     {

diff --git a/...indingsRx/UI/InputFieldExtensions.cs.meta → ...sRx/Bindings/InputFieldExtensions.cs.meta b/...indingsRx/UI/InputFieldExtensions.cs.meta → ...sRx/Bindings/InputFieldExtensions.cs.meta
diff --git a/src/Assets/BindingsRx/Bindings/MaterialExtensions.cs b/src/Assets/BindingsRx/Bindings/MaterialExtensions.cs
@@ -0,0 +1,31 @@
+using System;
+using BindingsRx.Filters;
+using UniRx;
+using UnityEngine;
+
+namespace BindingsRx.Bindings
+{
+    /// <summary>
+    /// All material bindings require explicit cleanup as Material is not IDisposable
+    /// </summary>
+    public static class MaterialExtensions
+    {
+        public static IDisposable BindColorTo(this Material input, IReactiveProperty<Color> property, BindingTypes bindingType = BindingTypes.Default, params IFilter<Color>[] filters)
+        { return GenericBindings.Bind(() => input.color, x => input.color = x, property, bindingType, filters); }
+
+        public static IDisposable BindColorTo(this Material input, Func<Color> getter, Action<Color> setter, BindingTypes bindingType = BindingTypes.Default, params IFilter<Color>[] filters)
+        { return GenericBindings.Bind(() => input.color, x => input.color = x, getter, setter, bindingType, filters); }
+
+        public static IDisposable BindTextureTo(this Material input, IReactiveProperty<Texture> property, BindingTypes bindingType = BindingTypes.Default, params IFilter<Texture>[] filters)
+        { return GenericBindings.Bind(() => input.mainTexture, x => input.mainTexture = x, property, bindingType, filters); }
+
+        public static IDisposable BindColorTo(this Material input, Func<Texture> getter, Action<Texture> setter, BindingTypes bindingType = BindingTypes.Default, params IFilter<Texture>[] filters)
+        { return GenericBindings.Bind(() => input.mainTexture, x => input.mainTexture = x, getter, setter, bindingType, filters); }
+
+        public static IDisposable BindShaderTo(this Material input, IReactiveProperty<Shader> property, BindingTypes bindingType = BindingTypes.Default, params IFilter<Shader>[] filters)
+        { return GenericBindings.Bind(() => input.shader, x => input.shader = x, property, bindingType, filters); }
+
+        public static IDisposable BindShaderTo(this Material input, Func<Shader> getter, Action<Shader> setter, BindingTypes bindingType = BindingTypes.Default, params IFilter<Shader>[] filters)
+        { return GenericBindings.Bind(() => input.shader, x => input.shader = x, getter, setter, bindingType, filters); }
+    }
+}
diff --git a/src/Assets/BindingsRx/Bindings/MaterialExtensions.cs.meta b/src/Assets/BindingsRx/Bindings/MaterialExtensions.cs.meta
diff --git a/...Rx/GameObjects/MonobehaviourExtensions.cs → ...ngsRx/Bindings/MonoBehaviourExtensions.cs b/...Rx/GameObjects/MonobehaviourExtensions.cs → ...ngsRx/Bindings/MonoBehaviourExtensions.cs
@@ -1,10 +1,9 @@
 using System;
 using BindingsRx.Filters;
-using BindingsRx.Generic;
 using UniRx;
 using UnityEngine;
 
-namespace BindingsRx.GameObjects
+namespace BindingsRx.Bindings
 {
     public static class MonoBehaviourExtensions
     {

diff --git a/...meObjects/MonobehaviourExtensions.cs.meta → .../Bindings/MonoBehaviourExtensions.cs.meta b/...meObjects/MonobehaviourExtensions.cs.meta → .../Bindings/MonoBehaviourExtensions.cs.meta
diff --git a/...Rx/GameObjects/RectTransformExtensions.cs → ...ngsRx/Bindings/RectTransformExtensions.cs b/...Rx/GameObjects/RectTransformExtensions.cs → ...ngsRx/Bindings/RectTransformExtensions.cs
@@ -1,11 +1,9 @@
 using System;
 using BindingsRx.Filters;
-using BindingsRx.Generic;
-using BindingsRx.UI;
 using UniRx;
 using UnityEngine;
 
-namespace BindingsRx.GameObjects
+namespace BindingsRx.Bindings
 {
     public static class RectTransformExtensions
     {

diff --git a/...meObjects/RectTransformExtensions.cs.meta → .../Bindings/RectTransformExtensions.cs.meta b/...meObjects/RectTransformExtensions.cs.meta → .../Bindings/RectTransformExtensions.cs.meta
diff --git a/...sets/BindingsRx/UI/ScrollBarExtensions.cs → ...indingsRx/Bindings/ScrollBarExtensions.cs b/...sets/BindingsRx/UI/ScrollBarExtensions.cs → ...indingsRx/Bindings/ScrollBarExtensions.cs
@@ -1,10 +1,9 @@
 using System;
 using BindingsRx.Filters;
-using BindingsRx.Generic;
 using UniRx;
 using UnityEngine.UI;
 
-namespace BindingsRx.UI
+namespace BindingsRx.Bindings
 {
     public static class ScrollBarExtensions
     {

diff --git a/...BindingsRx/UI/ScrollBarExtensions.cs.meta → ...gsRx/Bindings/ScrollBarExtensions.cs.meta b/...BindingsRx/UI/ScrollBarExtensions.cs.meta → ...gsRx/Bindings/ScrollBarExtensions.cs.meta
diff --git a/...ets/BindingsRx/UI/ScrollRectExtensions.cs → ...ndingsRx/Bindings/ScrollRectExtensions.cs b/...ets/BindingsRx/UI/ScrollRectExtensions.cs → ...ndingsRx/Bindings/ScrollRectExtensions.cs
@@ -1,10 +1,9 @@
 using System;
 using BindingsRx.Filters;
-using BindingsRx.Generic;
 using UniRx;
 using UnityEngine.UI;
 
-namespace BindingsRx.UI
+namespace BindingsRx.Bindings
 {
     public static class ScrollRectExtensions
     {

diff --git a/...indingsRx/UI/ScrollRectExtensions.cs.meta → ...sRx/Bindings/ScrollRectExtensions.cs.meta b/...indingsRx/UI/ScrollRectExtensions.cs.meta → ...sRx/Bindings/ScrollRectExtensions.cs.meta
diff --git a/src/Assets/BindingsRx/UI/SliderExtensions.cs → ...s/BindingsRx/Bindings/SliderExtensions.cs b/src/Assets/BindingsRx/UI/SliderExtensions.cs → ...s/BindingsRx/Bindings/SliderExtensions.cs
@@ -1,11 +1,9 @@
 using System;
-using BindingsRx.Exceptions;
 using BindingsRx.Filters;
-using BindingsRx.Generic;
 using UniRx;
 using UnityEngine.UI;
 
-namespace BindingsRx.UI
+namespace BindingsRx.Bindings
 {
     public static class SliderExtensions
     {

diff --git a/...ts/BindingsRx/UI/SliderExtensions.cs.meta → ...dingsRx/Bindings/SliderExtensions.cs.meta b/...ts/BindingsRx/UI/SliderExtensions.cs.meta → ...dingsRx/Bindings/SliderExtensions.cs.meta
diff --git a/src/Assets/BindingsRx/UI/TextExtensions.cs → ...ets/BindingsRx/Bindings/TextExtensions.cs b/src/Assets/BindingsRx/UI/TextExtensions.cs → ...ets/BindingsRx/Bindings/TextExtensions.cs
@@ -1,12 +1,11 @@
 using System;
 using BindingsRx.Convertors;
 using BindingsRx.Filters;
-using BindingsRx.Generic;
 using UniRx;
 using UnityEngine;
 using UnityEngine.UI;
 
-namespace BindingsRx.UI
+namespace BindingsRx.Bindings
 {
     public static class TextExtensions
     {

diff --git a/...sets/BindingsRx/UI/TextExtensions.cs.meta → ...indingsRx/Bindings/TextExtensions.cs.meta b/...sets/BindingsRx/UI/TextExtensions.cs.meta → ...indingsRx/Bindings/TextExtensions.cs.meta
diff --git a/src/Assets/BindingsRx/UI/ToggleExtensions.cs → ...s/BindingsRx/Bindings/ToggleExtensions.cs b/src/Assets/BindingsRx/UI/ToggleExtensions.cs → ...s/BindingsRx/Bindings/ToggleExtensions.cs
@@ -1,10 +1,9 @@
 using System;
 using BindingsRx.Filters;
-using BindingsRx.Generic;
 using UniRx;
 using UnityEngine.UI;
 
-namespace BindingsRx.UI
+namespace BindingsRx.Bindings
 {
     public static class ToggleExtensions
     {

diff --git a/...ts/BindingsRx/UI/ToggleExtensions.cs.meta → ...dingsRx/Bindings/ToggleExtensions.cs.meta b/...ts/BindingsRx/UI/ToggleExtensions.cs.meta → ...dingsRx/Bindings/ToggleExtensions.cs.meta
diff --git a/...ingsRx/GameObjects/TransformExtensions.cs → ...indingsRx/Bindings/TransformExtensions.cs b/...ingsRx/GameObjects/TransformExtensions.cs → ...indingsRx/Bindings/TransformExtensions.cs
@@ -1,11 +1,9 @@
 using System;
 using BindingsRx.Filters;
-using BindingsRx.Generic;
-using BindingsRx.UI;
 using UniRx;
 using UnityEngine;
 
-namespace BindingsRx.GameObjects
+namespace BindingsRx.Bindings
 {
     public static class TransformExtensions
     {

diff --git a/...x/GameObjects/TransformExtensions.cs.meta → ...gsRx/Bindings/TransformExtensions.cs.meta b/...x/GameObjects/TransformExtensions.cs.meta → ...gsRx/Bindings/TransformExtensions.cs.meta
diff --git a/src/Assets/BindingsRx/GameObjects.meta b/src/Assets/BindingsRx/GameObjects.meta
diff --git a/src/Assets/BindingsRx/Generic.meta b/src/Assets/BindingsRx/Generic.meta
diff --git a/src/Assets/BindingsRx/UI.meta b/src/Assets/BindingsRx/UI.meta
diff --git a/src/Assets/Editor/Tests/GenericBindingTests.cs b/src/Assets/Editor/Tests/GenericBindingTests.cs
@@ -1,5 +1,5 @@
 using BindingsRx;
-using BindingsRx.Generic;
+using BindingsRx.Bindings;
 using NUnit.Framework;
 using UniRx;
 

diff --git a/src/Assets/Examples/InputBindings/SetupDropdownBinding.cs b/src/Assets/Examples/InputBindings/SetupDropdownBinding.cs
@@ -1,4 +1,4 @@
-using BindingsRx.UI;
+using BindingsRx.Bindings;
 using UniRx;
 using UnityEngine;
 using UnityEngine.UI;

diff --git a/src/Assets/Examples/InputBindings/SetupTextBinding.cs b/src/Assets/Examples/InputBindings/SetupTextBinding.cs
@@ -1,4 +1,4 @@
-using BindingsRx.UI;
+using BindingsRx.Bindings;
 using UnityEngine;
 using UnityEngine.UI;
 

diff --git a/src/Assets/Examples/InputBindings/SetupTextualValueBinding.cs b/src/Assets/Examples/InputBindings/SetupTextualValueBinding.cs
@@ -1,5 +1,5 @@
 using System;
-using BindingsRx.UI;
+using BindingsRx.Bindings;
 using UniRx;
 using UnityEngine;
 using UnityEngine.UI;

diff --git a/src/Assets/Examples/InputBindings/SetupThrottledTextBinding.cs b/src/Assets/Examples/InputBindings/SetupThrottledTextBinding.cs
@@ -1,6 +1,6 @@
 using System;
+using BindingsRx.Bindings;
 using BindingsRx.Filters;
-using BindingsRx.UI;
 using UniRx;
 using UnityEngine;
 using UnityEngine.UI;

diff --git a/src/Assets/Examples/InputBindings/SetupToggleBinding.cs b/src/Assets/Examples/InputBindings/SetupToggleBinding.cs
@@ -1,5 +1,5 @@
 using BindingsRx;
-using BindingsRx.UI;
+using BindingsRx.Bindings;
 using UniRx;
 using UnityEngine;
 using UnityEngine.UI;

diff --git a/src/src.csproj b/src/src.csproj
@@ -83,6 +83,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Assets\BindingsRx\Bindings\MaterialExtensions.cs" />
     <Compile Include="Assets\BindingsRx\BindingTypes.cs" />
     <Compile Include="Assets\BindingsRx\Convertors\IConvertor.cs" />
     <Compile Include="Assets\BindingsRx\Convertors\IntConvertor.cs" />
@@ -94,19 +95,19 @@
     <Compile Include="Assets\BindingsRx\Filters\DynamicSampleFilter.cs" />
     <Compile Include="Assets\BindingsRx\Filters\IFilter.cs" />
     <Compile Include="Assets\BindingsRx\Filters\SampleFilter.cs" />
-    <Compile Include="Assets\BindingsRx\GameObjects\GameObjectExtensions.cs" />
-    <Compile Include="Assets\BindingsRx\GameObjects\MonoBehaviourExtensions.cs" />
-    <Compile Include="Assets\BindingsRx\GameObjects\RectTransformExtensions.cs" />
-    <Compile Include="Assets\BindingsRx\GameObjects\TransformExtensions.cs" />
-    <Compile Include="Assets\BindingsRx\Generic\GenericBindings.cs" />
-    <Compile Include="Assets\BindingsRx\UI\CanvasElementExtensions.cs" />
-    <Compile Include="Assets\BindingsRx\UI\DropdownExtensions.cs" />
-    <Compile Include="Assets\BindingsRx\UI\InputFieldExtensions.cs" />
-    <Compile Include="Assets\BindingsRx\UI\ScrollBarExtensions.cs" />
-    <Compile Include="Assets\BindingsRx\UI\ScrollRectExtensions.cs" />
-    <Compile Include="Assets\BindingsRx\UI\SliderExtensions.cs" />
-    <Compile Include="Assets\BindingsRx\UI\TextExtensions.cs" />
-    <Compile Include="Assets\BindingsRx\UI\ToggleExtensions.cs" />
+    <Compile Include="Assets\BindingsRx\Bindings\GameObjectExtensions.cs" />
+    <Compile Include="Assets\BindingsRx\Bindings\MonoBehaviourExtensions.cs" />
+    <Compile Include="Assets\BindingsRx\Bindings\RectTransformExtensions.cs" />
+    <Compile Include="Assets\BindingsRx\Bindings\TransformExtensions.cs" />
+    <Compile Include="Assets\BindingsRx\Bindings\GenericBindings.cs" />
+    <Compile Include="Assets\BindingsRx\Bindings\CanvasElementExtensions.cs" />
+    <Compile Include="Assets\BindingsRx\Bindings\DropdownExtensions.cs" />
+    <Compile Include="Assets\BindingsRx\Bindings\InputFieldExtensions.cs" />
+    <Compile Include="Assets\BindingsRx\Bindings\ScrollBarExtensions.cs" />
+    <Compile Include="Assets\BindingsRx\Bindings\ScrollRectExtensions.cs" />
+    <Compile Include="Assets\BindingsRx\Bindings\SliderExtensions.cs" />
+    <Compile Include="Assets\BindingsRx\Bindings\TextExtensions.cs" />
+    <Compile Include="Assets\BindingsRx\Bindings\ToggleExtensions.cs" />
     <Compile Include="Assets\Examples\InputBindings\SetupDropdownBinding.cs" />
     <Compile Include="Assets\Examples\InputBindings\SetupTextBinding.cs" />
     <Compile Include="Assets\Examples\InputBindings\SetupTextualValueBinding.cs" />