zune/ZuneShell.dll
0
0
Fork 0
mirror of https://github.com/ZuneDev/ZuneShell.dll.git synced 2026-07-27 13:11:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Removed unnecessary casts

Browse Source
This commit is contained in:
Joshua Askharoun
2021-03-31 17:15:06 -05:00
parent f7d5fa4120
commit 9b09412b45
587 changed files with 7864 additions and 7862 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UIX/Microsoft/Iris/Accessibility/Accessible.cs
+29 -29
View File
@@ -41,7 +41,7 @@ namespace Microsoft.Iris.Accessibility
private static readonly DataCookie s_popupStateSlot = DataCookie.ReserveSlot();
private static readonly DataCookie s_multiSelectableStateSlot = DataCookie.ReserveSlot();
public Accessible() => this.SetData(Accessible.s_roleSlot, (object)AccRole.Client);
public Accessible() => this.SetData(Accessible.s_roleSlot, AccRole.Client);
public void Attach(AccessibleProxy proxy)
{
@@ -51,8 +51,8 @@ namespace Microsoft.Iris.Accessibility
public void Detach()
{
this.SetData(Accessible.s_defaultActionCommandSlot, (object)null);
this._proxy = (AccessibleProxy)null;
this.SetData(Accessible.s_defaultActionCommandSlot, null);
this._proxy = null;
}
public bool Enabled => this._proxy != null;
@@ -65,7 +65,7 @@ namespace Microsoft.Iris.Accessibility
string description = this.Description;
if (!(value != description))
return;
this.SetData(Accessible.s_descriptionSlot, (object)value);
this.SetData(Accessible.s_descriptionSlot, value);
this.FireAccessiblePropertyChanged(NotificationID.Description, AccessibleProperty.Description);
}
}
@@ -78,7 +78,7 @@ namespace Microsoft.Iris.Accessibility
string defaultAction = this.DefaultAction;
if (!(value != defaultAction))
return;
this.SetData(Accessible.s_defaultActionSlot, (object)value);
this.SetData(Accessible.s_defaultActionSlot, value);
this.FireAccessiblePropertyChanged(NotificationID.DefaultAction, AccessibleProperty.DefaultAction);
}
}
@@ -91,7 +91,7 @@ namespace Microsoft.Iris.Accessibility
IUICommand defaultActionCommand = this.DefaultActionCommand;
if (value == defaultActionCommand)
return;
this.SetData(Accessible.s_defaultActionCommandSlot, (object)value);
this.SetData(Accessible.s_defaultActionCommandSlot, value);
this.FireAccessiblePropertyChanged(NotificationID.DefaultActionCommand, AccessibleProperty.DefaultActionCommand);
}
}
@@ -104,7 +104,7 @@ namespace Microsoft.Iris.Accessibility
string help = this.Help;
if (!(value != help))
return;
this.SetData(Accessible.s_helpSlot, (object)value);
this.SetData(Accessible.s_helpSlot, value);
this.FireAccessiblePropertyChanged(NotificationID.Help, AccessibleProperty.Help);
}
}
@@ -121,7 +121,7 @@ namespace Microsoft.Iris.Accessibility
int helpTopic = this.HelpTopic;
if (value == helpTopic)
return;
this.SetData(Accessible.s_helpTopicSlot, (object)value);
this.SetData(Accessible.s_helpTopicSlot, value);
this.FireAccessiblePropertyChanged(NotificationID.HelpTopic, AccessibleProperty.HelpTopic);
}
}
@@ -134,7 +134,7 @@ namespace Microsoft.Iris.Accessibility
string keyboardShortcut = this.KeyboardShortcut;
if (!(value != keyboardShortcut))
return;
this.SetData(Accessible.s_keyboardShortcutSlot, (object)value);
this.SetData(Accessible.s_keyboardShortcutSlot, value);
this.FireAccessiblePropertyChanged(NotificationID.KeyboardShortcut, AccessibleProperty.KeyboardShortcut);
}
}
@@ -147,7 +147,7 @@ namespace Microsoft.Iris.Accessibility
string name = this.Name;
if (!(value != name))
return;
this.SetData(Accessible.s_nameSlot, (object)value);
this.SetData(Accessible.s_nameSlot, value);
this.FireAccessiblePropertyChanged(NotificationID.Name, AccessibleProperty.Name);
}
}
@@ -164,7 +164,7 @@ namespace Microsoft.Iris.Accessibility
AccRole role = this.Role;
if (value == role)
return;
this.SetData(Accessible.s_roleSlot, (object)value);
this.SetData(Accessible.s_roleSlot, value);
this.FireAccessiblePropertyChanged(NotificationID.Role, AccessibleProperty.Role);
}
}
@@ -177,7 +177,7 @@ namespace Microsoft.Iris.Accessibility
string str = this.Value;
if (!(value != str))
return;
this.SetData(Accessible.s_valueSlot, (object)value);
this.SetData(Accessible.s_valueSlot, value);
this.FireAccessiblePropertyChanged(NotificationID.Value, AccessibleProperty.Value);
}
}
@@ -194,7 +194,7 @@ namespace Microsoft.Iris.Accessibility
bool isAnimated = this.IsAnimated;
if (value == isAnimated)
return;
this.SetData(Accessible.s_animatedStateSlot, (object)value);
this.SetData(Accessible.s_animatedStateSlot, value);
this.FireAccessiblePropertyChanged(NotificationID.IsAnimated, AccessibleProperty.IsAnimated);
}
}
@@ -211,7 +211,7 @@ namespace Microsoft.Iris.Accessibility
bool isUnavailable = this.IsUnavailable;
if (value == isUnavailable)
return;
this.SetData(Accessible.s_unavailableStateSlot, (object)value);
this.SetData(Accessible.s_unavailableStateSlot, value);
this.FireAccessiblePropertyChanged(NotificationID.IsUnavailable, AccessibleProperty.IsUnavailable);
}
}
@@ -228,7 +228,7 @@ namespace Microsoft.Iris.Accessibility
bool isSelected = this.IsSelected;
if (value == isSelected)
return;
this.SetData(Accessible.s_selectedStateSlot, (object)value);
this.SetData(Accessible.s_selectedStateSlot, value);
this.FireAccessiblePropertyChanged(NotificationID.IsSelected, AccessibleProperty.IsSelected);
}
}
@@ -245,7 +245,7 @@ namespace Microsoft.Iris.Accessibility
bool isBusy = this.IsBusy;
if (value == isBusy)
return;
this.SetData(Accessible.s_busyStateSlot, (object)value);
this.SetData(Accessible.s_busyStateSlot, value);
this.FireAccessiblePropertyChanged(NotificationID.IsBusy, AccessibleProperty.IsBusy);
}
}
@@ -262,7 +262,7 @@ namespace Microsoft.Iris.Accessibility
bool isPressed = this.IsPressed;
if (value == isPressed)
return;
this.SetData(Accessible.s_pressedStateSlot, (object)value);
this.SetData(Accessible.s_pressedStateSlot, value);
this.FireAccessiblePropertyChanged(NotificationID.IsPressed, AccessibleProperty.IsPressed);
}
}
@@ -279,7 +279,7 @@ namespace Microsoft.Iris.Accessibility
bool isChecked = this.IsChecked;
if (value == isChecked)
return;
this.SetData(Accessible.s_checkedStateSlot, (object)value);
this.SetData(Accessible.s_checkedStateSlot, value);
this.FireAccessiblePropertyChanged(NotificationID.IsChecked, AccessibleProperty.IsChecked);
}
}
@@ -296,7 +296,7 @@ namespace Microsoft.Iris.Accessibility
bool isCollapsed = this.IsCollapsed;
if (value == isCollapsed)
return;
this.SetData(Accessible.s_collapsedStateSlot, (object)value);
this.SetData(Accessible.s_collapsedStateSlot, value);
this.FireAccessiblePropertyChanged(NotificationID.IsCollapsed, AccessibleProperty.IsCollapsed);
}
}
@@ -313,7 +313,7 @@ namespace Microsoft.Iris.Accessibility
bool isDefault = this.IsDefault;
if (value == isDefault)
return;
this.SetData(Accessible.s_defaultStateSlot, (object)value);
this.SetData(Accessible.s_defaultStateSlot, value);
this.FireAccessiblePropertyChanged(NotificationID.IsDefault, AccessibleProperty.IsDefault);
}
}
@@ -330,7 +330,7 @@ namespace Microsoft.Iris.Accessibility
bool isMarquee = this.IsMarquee;
if (value == isMarquee)
return;
this.SetData(Accessible.s_marqueeStateSlot, (object)value);
this.SetData(Accessible.s_marqueeStateSlot, value);
this.FireAccessiblePropertyChanged(NotificationID.IsMarquee, AccessibleProperty.IsMarquee);
}
}
@@ -347,7 +347,7 @@ namespace Microsoft.Iris.Accessibility
bool isMixed = this.IsMixed;
if (value == isMixed)
return;
this.SetData(Accessible.s_mixedStateSlot, (object)value);
this.SetData(Accessible.s_mixedStateSlot, value);
this.FireAccessiblePropertyChanged(NotificationID.IsMixed, AccessibleProperty.IsMixed);
}
}
@@ -364,7 +364,7 @@ namespace Microsoft.Iris.Accessibility
bool isExpanded = this.IsExpanded;
if (value == isExpanded)
return;
this.SetData(Accessible.s_expandedStateSlot, (object)value);
this.SetData(Accessible.s_expandedStateSlot, value);
this.FireAccessiblePropertyChanged(NotificationID.IsExpanded, AccessibleProperty.IsExpanded);
}
}
@@ -381,7 +381,7 @@ namespace Microsoft.Iris.Accessibility
bool isTraversed = this.IsTraversed;
if (value == isTraversed)
return;
this.SetData(Accessible.s_traversedStateSlot, (object)value);
this.SetData(Accessible.s_traversedStateSlot, value);
this.FireAccessiblePropertyChanged(NotificationID.IsTraversed, AccessibleProperty.IsTraversed);
}
}
@@ -398,7 +398,7 @@ namespace Microsoft.Iris.Accessibility
bool isSelectable = this.IsSelectable;
if (value == isSelectable)
return;
this.SetData(Accessible.s_selectableStateSlot, (object)value);
this.SetData(Accessible.s_selectableStateSlot, value);
this.FireAccessiblePropertyChanged(NotificationID.IsSelectable, AccessibleProperty.IsSelectable);
}
}
@@ -415,7 +415,7 @@ namespace Microsoft.Iris.Accessibility
bool isMultiSelectable = this.IsMultiSelectable;
if (value == isMultiSelectable)
return;
this.SetData(Accessible.s_multiSelectableStateSlot, (object)value);
this.SetData(Accessible.s_multiSelectableStateSlot, value);
this.FireAccessiblePropertyChanged(NotificationID.IsMultiSelectable, AccessibleProperty.IsMultiSelectable);
}
}
@@ -432,7 +432,7 @@ namespace Microsoft.Iris.Accessibility
bool isProtected = this.IsProtected;
if (value == isProtected)
return;
this.SetData(Accessible.s_protectedStateSlot, (object)value);
this.SetData(Accessible.s_protectedStateSlot, value);
this.FireAccessiblePropertyChanged(NotificationID.IsProtected, AccessibleProperty.IsProtected);
}
}
@@ -449,7 +449,7 @@ namespace Microsoft.Iris.Accessibility
bool hasPopup = this.HasPopup;
if (value == hasPopup)
return;
this.SetData(Accessible.s_popupStateSlot, (object)value);
this.SetData(Accessible.s_popupStateSlot, value);
this.FireAccessiblePropertyChanged(NotificationID.HasPopup, AccessibleProperty.HasPopup);
}
}
@@ -467,7 +467,7 @@ namespace Microsoft.Iris.Accessibility
{
if (accessibleProperty == AccessibleProperty.Name)
return;
ErrorManager.ReportWarning("Accessibility: Script modifications to the 'Accessible' object ('{0}' property) detected even though an Accessibility client is not is use. Use 'if (Accessible.Enabled) {{ ... }}' to bypass Accessible property access in this case", (object)propertyName);
ErrorManager.ReportWarning("Accessibility: Script modifications to the 'Accessible' object ('{0}' property) detected even though an Accessibility client is not is use. Use 'if (Accessible.Enabled) {{ ... }}' to bypass Accessible property access in this case", propertyName);
}
}
UIX/Microsoft/Iris/Accessibility/AccessibleChildren.cs
+2 -2
View File
@@ -29,7 +29,7 @@ namespace Microsoft.Iris.Accessibility
this._current = position;
}
internal IEnumVARIANT Clone() => (IEnumVARIANT)new AccessibleChildren(this._proxy, this._current);
internal IEnumVARIANT Clone() => new AccessibleChildren(this._proxy, this._current);
internal int Next(int count, object[] children)
{
@@ -43,7 +43,7 @@ namespace Microsoft.Iris.Accessibility
break;
}
UIClass child = (UIClass)this._proxy.UI.Children[this._current];
children[index] = (object)child.AccessibleProxy;
children[index] = child.AccessibleProxy;
++index;
}
while (index < count);
UIX/Microsoft/Iris/Accessibility/AccessibleProxy.cs
+17 -17
View File
@@ -36,7 +36,7 @@ namespace Microsoft.Iris.Accessibility
this._ui = ui;
this._data = data;
this._data.Attach(this);
this._children = (IEnumVARIANT)new AccessibleChildren(this);
this._children = new AccessibleChildren(this);
}
internal UIClass UI => this._ui;
@@ -44,7 +44,7 @@ namespace Microsoft.Iris.Accessibility
internal void Detach()
{
this._data.Detach();
this._ui = (UIClass)null;
this._ui = null;
if (this._proxyID == -1)
return;
AccessibleProxy.s_proxyFromID.Remove(this._proxyID);
@@ -56,7 +56,7 @@ namespace Microsoft.Iris.Accessibility
set => AccessibleProxy.s_accessibilityActive = true;
}
internal virtual IAccessible Parent => this._ui.Parent != null ? (IAccessible)this._ui.Parent.AccessibleProxy : (IAccessible)null;
internal virtual IAccessible Parent => this._ui.Parent != null ? _ui.Parent.AccessibleProxy : null;
internal int ChildCount => this._ui.Children.Count;
@@ -157,7 +157,7 @@ namespace Microsoft.Iris.Accessibility
internal virtual IAccessible Navigate(AccNavDirs navDir)
{
UIClass resultUI = (UIClass)null;
UIClass resultUI = null;
switch (navDir)
{
case AccNavDirs.Up:
@@ -185,7 +185,7 @@ namespace Microsoft.Iris.Accessibility
resultUI = (UIClass)this._ui.LastChild;
break;
}
return resultUI != null ? (IAccessible)resultUI.AccessibleProxy : (IAccessible)null;
return resultUI != null ? resultUI.AccessibleProxy : null;
}
internal void DoDefaultAction()
@@ -290,10 +290,10 @@ namespace Microsoft.Iris.Accessibility
private void QueueNotifyEvent(AccEvents eventType)
{
object obj = (object)new object[2]
object obj = new object[2]
{
(object) this,
(object) (int) eventType
this,
(int) eventType
};
DeferredCall.Post(DispatchPriority.AppEvent, AccessibleProxy.s_notifyEventHandler, obj);
}
@@ -315,7 +315,7 @@ namespace Microsoft.Iris.Accessibility
get
{
this.VerifyProxyAccess();
return (object)this.Parent;
return Parent;
}
}
@@ -323,7 +323,7 @@ namespace Microsoft.Iris.Accessibility
{
this.VerifyProxyAccess();
this.VerifySelfChildID(varChild);
return (object)this;
return this;
}
int IAccessible.accChildCount
@@ -360,14 +360,14 @@ namespace Microsoft.Iris.Accessibility
{
this.VerifyProxyAccess();
this.VerifySelfChildID(varChild);
return (object)(int)this.Role;
return (int)this.Role;
}
object IAccessible.get_accState(object varChild)
{
this.VerifyProxyAccess();
this.VerifySelfChildID(varChild);
return (object)(int)this.State;
return (int)this.State;
}
string IAccessible.get_accHelp(object varChild)
@@ -381,7 +381,7 @@ namespace Microsoft.Iris.Accessibility
{
this.VerifyProxyAccess();
this.VerifySelfChildID(varChild);
pszHelpFile = (string)null;
pszHelpFile = null;
return this.HelpTopic;
}
@@ -397,7 +397,7 @@ namespace Microsoft.Iris.Accessibility
get
{
this.VerifyProxyAccess();
return this.HasFocus ? (object)0 : (object)null;
return this.HasFocus ? 0 : (object)null;
}
}
@@ -407,7 +407,7 @@ namespace Microsoft.Iris.Accessibility
{
this.VerifyProxyAccess();
Marshal.ThrowExceptionForHR(-2147467263);
return (object)null;
return null;
}
}
@@ -445,14 +445,14 @@ namespace Microsoft.Iris.Accessibility
{
this.VerifyProxyAccess();
this.VerifySelfChildID(varStart);
return (object)this.Navigate((AccNavDirs)navDir);
return this.Navigate((AccNavDirs)navDir);
}
object IAccessible.accHitTest(int xLeft, int yTop)
{
this.VerifyProxyAccess();
Marshal.ThrowExceptionForHR(-2147467263);
return (object)null;
return null;
}
void IAccessible.accDoDefaultAction(object varChild)
UIX/Microsoft/Iris/Accessibility/RootAccessibleProxy.cs
+2 -2
View File
@@ -25,7 +25,7 @@ namespace Microsoft.Iris.Accessibility
internal override IAccessible Navigate(AccNavDirs navDir)
{
IAccessible accessible = (IAccessible)null;
IAccessible accessible = null;
switch (navDir)
{
case AccNavDirs.Up:
@@ -34,7 +34,7 @@ namespace Microsoft.Iris.Accessibility
case AccNavDirs.Right:
case AccNavDirs.Next:
case AccNavDirs.Previous:
accessible = (IAccessible)this._clientBridge.accNavigate((int)navDir, (object)0);
accessible = (IAccessible)this._clientBridge.accNavigate((int)navDir, 0);
break;
case AccNavDirs.FirstChild:
case AccNavDirs.LastChild:
UIX/Microsoft/Iris/AggregateList.cs
+5 -5
View File
@@ -16,7 +16,7 @@ namespace Microsoft.Iris
private IList[] _lists;
public AggregateList()
: this((IList[])null)
: this(null)
{
}
@@ -51,7 +51,7 @@ namespace Microsoft.Iris
for (int index = 0; index < this._lists.Length; ++index)
{
if (this._lists[index] == null)
this._lists[index] = (IList)new ArrayList();
this._lists[index] = new ArrayList();
IList list = this._lists[index];
if (list is INotifyList notifyList)
notifyList.ContentsChanged += contentsChangedHandler;
@@ -71,7 +71,7 @@ namespace Microsoft.Iris
if (list is INotifyList notifyList)
notifyList.ContentsChanged -= contentsChangedHandler;
if (list is IVirtualList virtualList && virtualList.SlowDataRequestsEnabled)
virtualList.SlowDataAcquireCompleteHandler = (SlowDataAcquireCompleteHandler)null;
virtualList.SlowDataAcquireCompleteHandler = null;
}
}
base.OnDispose(disposing);
@@ -108,7 +108,7 @@ namespace Microsoft.Iris
private bool ChildListSlowDataAcquired(IVirtualList childList, int index)
{
this.NotifySlowDataAcquireComplete(this.ListIndexToMasterIndex((IList)childList, index));
this.NotifySlowDataAcquireComplete(this.ListIndexToMasterIndex(childList, index));
return true;
}
@@ -171,7 +171,7 @@ namespace Microsoft.Iris
{
int num = 0;
int index1 = 0;
list = (IList)null;
list = null;
for (; index1 < this._lists.Length; ++index1)
{
list = this._lists[index1];
UIX/Microsoft/Iris/Animations/ActiveSequence.cs
+19 -19
View File
@@ -40,13 +40,13 @@ namespace Microsoft.Iris.Animations
if (animationCollection != null)
{
foreach (DisposableObject disposableObject in animationCollection)
disposableObject.Dispose((object)this);
disposableObject.Dispose(this);
this.FireComplete(false);
}
this._session = (UISession)null;
this._animatableTarget = (IAnimatable)null;
this._template = (AnimationTemplate)null;
this._ready = (Vector<AnimationProxy>)null;
this._session = null;
this._animatableTarget = null;
this._template = null;
this._ready = null;
}
public UISession Session => this._session;
@@ -62,7 +62,7 @@ namespace Microsoft.Iris.Animations
public void Play()
{
Vector<AnimationProxy> ready = this._ready;
this._ready = (Vector<AnimationProxy>)null;
this._ready = null;
if (ready.Count > 0)
{
foreach (AnimationProxy animationProxy in ready)
@@ -77,7 +77,7 @@ namespace Microsoft.Iris.Animations
}
}
public void Stop() => this.Stop((StopCommandSet)null);
public void Stop() => this.Stop(null);
public void Stop(StopCommandSet stopSetCommand)
{
@@ -91,7 +91,7 @@ namespace Microsoft.Iris.Animations
{
if (!this.Session.IsValid)
return;
DeferredCall.Post(DispatchPriority.High, new DeferredHandler(this.DeferredStop), (object)stopSetCommand);
DeferredCall.Post(DispatchPriority.High, new DeferredHandler(this.DeferredStop), stopSetCommand);
}
catch (InvalidOperationException ex)
{
@@ -126,7 +126,7 @@ namespace Microsoft.Iris.Animations
internal void OnAttachChildAnimation(AnimationProxy child)
{
child.DeclareOwner((object)this);
child.DeclareOwner(this);
this._ready.Add(child);
}
@@ -138,8 +138,8 @@ namespace Microsoft.Iris.Animations
if (animationCollection == null)
return;
animationCollection.Remove(child);
child.Dispose((object)this);
if ((double)this._lastProgress < (double)progress)
child.Dispose(this);
if (_lastProgress < (double)progress)
this._lastProgress = progress;
if (animationCollection != this._playing || animationCollection.Count != 0)
return;
@@ -151,13 +151,13 @@ namespace Microsoft.Iris.Animations
private void FireComplete(bool notify)
{
if (this._playing != null)
this._playing = (Vector<AnimationProxy>)null;
this._playing = null;
this.OnStop(this._lastProgress, notify);
}
public StopCommandSet GetStopCommandSet()
{
StopCommandSet stopCommandSet = (StopCommandSet)null;
StopCommandSet stopCommandSet = null;
foreach (AnimationProxy animation in this.GetAnimationCollection())
{
if (animation.HasDynamicKeyframes)
@@ -258,8 +258,8 @@ namespace Microsoft.Iris.Animations
else
{
Animation template = this._template as Animation;
if ((object)template != null)
stringBuilder.Append((object)template.Type);
if (template != null)
stringBuilder.Append(template.Type);
else
stringBuilder.Append("<Unknown>");
}
@@ -285,7 +285,7 @@ namespace Microsoft.Iris.Animations
++this._playingCount;
if (this._playingCount != 1 || this.AnimationStarted == null)
return;
this.AnimationStarted((object)this, EventArgs.Empty);
this.AnimationStarted(this, EventArgs.Empty);
}
internal void OnStop(float progress, bool notify)
@@ -293,12 +293,12 @@ namespace Microsoft.Iris.Animations
--this._playingCount;
if (notify && this._playingCount == 0)
{
EventArgs e = (EventArgs)new AnimationCompleteArgs(progress);
EventArgs e = new AnimationCompleteArgs(progress);
if (this.AnimationCompleted != null)
this.AnimationCompleted((object)this, e);
this.AnimationCompleted(this, e);
if (this.AfterAnimationCompleted == null)
return;
this.AfterAnimationCompleted((object)this, e);
this.AfterAnimationCompleted(this, e);
}
else
{
UIX/Microsoft/Iris/Animations/AlphaKeyframe.cs
+1 -1
View File
@@ -26,7 +26,7 @@ namespace Microsoft.Iris.Animations
public override void MagnifyValue(float magnifyValue)
{
float num = this.Value * magnifyValue;
if ((double)num > 1.0)
if (num > 1.0)
num = 1f;
this.Value = num;
}
UIX/Microsoft/Iris/Animations/Animation.cs
+5 -5
View File
@@ -32,8 +32,8 @@ namespace Microsoft.Iris.Animations
public override object Clone()
{
Animation animation = new Animation();
this.CloneWorker((AnimationTemplate)animation);
return (object)animation;
this.CloneWorker(animation);
return animation;
}
protected override void CloneWorker(AnimationTemplate rawAnimation)
@@ -71,7 +71,7 @@ namespace Microsoft.Iris.Animations
{
if (!(this.CenterPointPercent != value))
return;
this.SetData(Animation.s_centerPointScaleProperty, (object)value);
this.SetData(Animation.s_centerPointScaleProperty, value);
this.SetBit(Animation.Bits.CenterPointScale, true);
}
}
@@ -83,7 +83,7 @@ namespace Microsoft.Iris.Animations
{
if (!(this.RotationAxis != value))
return;
this.SetData(Animation.s_rotationAxisProperty, (object)value);
this.SetData(Animation.s_rotationAxisProperty, value);
this.SetBit(Animation.Bits.RotationAxis, true);
}
}
@@ -98,7 +98,7 @@ namespace Microsoft.Iris.Animations
ref AnimationArgs args)
{
this.PrepareToPlay(ref args);
return (AnimationTemplate)this;
return this;
}
public bool CanCache => true;
UIX/Microsoft/Iris/Animations/AnimationArgs.cs
+1 -1
View File
@@ -34,7 +34,7 @@ namespace Microsoft.Iris.Animations
public AnimationArgs(Camera cam)
{
this.ViewItem = (ViewItem)null;
this.ViewItem = null;
this.OldPosition = Vector3.Zero;
this.OldSize = Vector2.Zero;
this.OldScale = Vector3.Zero;
UIX/Microsoft/Iris/Animations/AnimationHandle.cs
+1 -1
View File
@@ -30,7 +30,7 @@ namespace Microsoft.Iris.Animations
internal void FireCompleted()
{
if (this.Completed != null)
this.Completed((object)this, EventArgs.Empty);
this.Completed(this, EventArgs.Empty);
this.FireNotification(NotificationID.Completed);
}
UIX/Microsoft/Iris/Animations/AnimationManager.cs
+17 -17
View File
@@ -42,7 +42,7 @@ namespace Microsoft.Iris.Animations
public void Dispose()
{
GC.SuppressFinalize((object)this);
GC.SuppressFinalize(this);
this.Dispose(true);
}
@@ -52,7 +52,7 @@ namespace Microsoft.Iris.Animations
if (!inDisposeFlag)
return;
foreach (DisposableObject orphan in this._orphans)
orphan.Dispose((object)this);
orphan.Dispose(this);
this._orphans.Clear();
}
@@ -83,26 +83,26 @@ namespace Microsoft.Iris.Animations
internal IKeyframeAnimation BuildAnimation(AnimationProxy owner)
{
this.ValidateConnected();
IKeyframeAnimation keyframeAnimation = (IKeyframeAnimation)null;
IKeyframeAnimation keyframeAnimation = null;
switch (owner.Type)
{
case AnimationType.Position:
keyframeAnimation = this._session.AnimationSystem.CreateKeyframeAnimation((object)owner, (AnimationInput)AnimationManager.s_defaultPositionInput);
keyframeAnimation = this._session.AnimationSystem.CreateKeyframeAnimation(owner, s_defaultPositionInput);
break;
case AnimationType.Size:
keyframeAnimation = this._session.AnimationSystem.CreateKeyframeAnimation((object)owner, (AnimationInput)AnimationManager.s_defaultSizeInput);
keyframeAnimation = this._session.AnimationSystem.CreateKeyframeAnimation(owner, s_defaultSizeInput);
break;
case AnimationType.Alpha:
keyframeAnimation = this._session.AnimationSystem.CreateKeyframeAnimation((object)owner, (AnimationInput)AnimationManager.s_defaultAlphaInput);
keyframeAnimation = this._session.AnimationSystem.CreateKeyframeAnimation(owner, s_defaultAlphaInput);
break;
case AnimationType.Scale:
keyframeAnimation = this._session.AnimationSystem.CreateKeyframeAnimation((object)owner, (AnimationInput)AnimationManager.s_defaultScaleInput);
keyframeAnimation = this._session.AnimationSystem.CreateKeyframeAnimation(owner, s_defaultScaleInput);
break;
case AnimationType.Rotate:
keyframeAnimation = this._session.AnimationSystem.CreateKeyframeAnimation((object)owner, (AnimationInput)AnimationManager.s_defaultRotationInput);
keyframeAnimation = this._session.AnimationSystem.CreateKeyframeAnimation(owner, s_defaultRotationInput);
break;
case AnimationType.Orientation:
keyframeAnimation = this._session.AnimationSystem.CreateKeyframeAnimation((object)owner, (AnimationInput)AnimationManager.s_defaultOrientationInput);
keyframeAnimation = this._session.AnimationSystem.CreateKeyframeAnimation(owner, s_defaultOrientationInput);
break;
case AnimationType.PositionX:
case AnimationType.PositionY:
@@ -111,28 +111,28 @@ namespace Microsoft.Iris.Animations
case AnimationType.ScaleX:
case AnimationType.ScaleY:
case AnimationType.Float:
keyframeAnimation = this._session.AnimationSystem.CreateKeyframeAnimation((object)owner, (AnimationInput)AnimationManager.s_defaultFloatInput);
keyframeAnimation = this._session.AnimationSystem.CreateKeyframeAnimation(owner, s_defaultFloatInput);
break;
case AnimationType.Vector2:
keyframeAnimation = this._session.AnimationSystem.CreateKeyframeAnimation((object)owner, (AnimationInput)AnimationManager.s_defaultVector2Input);
keyframeAnimation = this._session.AnimationSystem.CreateKeyframeAnimation(owner, s_defaultVector2Input);
break;
case AnimationType.Vector3:
keyframeAnimation = this._session.AnimationSystem.CreateKeyframeAnimation((object)owner, (AnimationInput)AnimationManager.s_defaultVector3Input);
keyframeAnimation = this._session.AnimationSystem.CreateKeyframeAnimation(owner, s_defaultVector3Input);
break;
case AnimationType.Vector4:
keyframeAnimation = this._session.AnimationSystem.CreateKeyframeAnimation((object)owner, (AnimationInput)AnimationManager.s_defaultVector4Input);
keyframeAnimation = this._session.AnimationSystem.CreateKeyframeAnimation(owner, s_defaultVector4Input);
break;
case AnimationType.CameraEye:
keyframeAnimation = this._session.AnimationSystem.CreateKeyframeAnimation((object)owner, (AnimationInput)AnimationManager.s_defaultCameraEyeInput);
keyframeAnimation = this._session.AnimationSystem.CreateKeyframeAnimation(owner, s_defaultCameraEyeInput);
break;
case AnimationType.CameraAt:
keyframeAnimation = this._session.AnimationSystem.CreateKeyframeAnimation((object)owner, (AnimationInput)AnimationManager.s_defaultCameraAtInput);
keyframeAnimation = this._session.AnimationSystem.CreateKeyframeAnimation(owner, s_defaultCameraAtInput);
break;
case AnimationType.CameraUp:
keyframeAnimation = this._session.AnimationSystem.CreateKeyframeAnimation((object)owner, (AnimationInput)AnimationManager.s_defaultCameraUpInput);
keyframeAnimation = this._session.AnimationSystem.CreateKeyframeAnimation(owner, s_defaultCameraUpInput);
break;
case AnimationType.CameraZn:
keyframeAnimation = this._session.AnimationSystem.CreateKeyframeAnimation((object)owner, (AnimationInput)AnimationManager.s_defaultCameraZnInput);
keyframeAnimation = this._session.AnimationSystem.CreateKeyframeAnimation(owner, s_defaultCameraZnInput);
break;
}
return keyframeAnimation;
UIX/Microsoft/Iris/Animations/AnimationProxy.cs
+33 -33
View File
@@ -46,8 +46,8 @@ namespace Microsoft.Iris.Animations
{
this._animation.RepeatCount = loopCount;
this._animation.AsyncNotifyEvent += new AsyncNotifyHandler(this.OnAsyncNotification);
this._animation.AddStageEvent(AnimationStage.Complete, new AnimationEvent((IActivatable)this._animation, "AsyncNotify", 1U));
this._animation.AddStageEvent(AnimationStage.Reset, new AnimationEvent((IActivatable)this._animation, "AsyncNotify", 2U));
this._animation.AddStageEvent(AnimationStage.Complete, new AnimationEvent(_animation, "AsyncNotify", 1U));
this._animation.AddStageEvent(AnimationStage.Reset, new AnimationEvent(_animation, "AsyncNotify", 2U));
this.SetStopCommand(stopCmd);
this._activeSequence.OnAttachChildAnimation(this);
}
@@ -78,19 +78,19 @@ namespace Microsoft.Iris.Animations
{
this._dynamicFlag = true;
animationInput1 = keyframe.RelativeTo.CreateAnimationInput(this._animatableTarget, this._rendererProperty.Property, this._rendererProperty.SourceMask);
if (keyframe.Multiply && (double)value != 1.0)
if (keyframe.Multiply && value != 1.0)
{
AnimationInput animationInput2 = (AnimationInput)new ConstantAnimationInput(value);
AnimationInput animationInput2 = new ConstantAnimationInput(value);
animationInput1 *= animationInput2;
}
else if (!keyframe.Multiply && (double)value != 0.0)
else if (!keyframe.Multiply && value != 0.0)
{
AnimationInput animationInput2 = (AnimationInput)new ConstantAnimationInput(value);
AnimationInput animationInput2 = new ConstantAnimationInput(value);
animationInput1 += animationInput2;
}
}
else
animationInput1 = (AnimationInput)new ConstantAnimationInput(value);
animationInput1 = new ConstantAnimationInput(value);
this._animation.AddKeyframe(new AnimationKeyframe(keyframe.Time, animationInput1, AnimationProxy.GenerateInterpolation(keyframe.Interpolation)));
}
@@ -104,17 +104,17 @@ namespace Microsoft.Iris.Animations
animationInput1 = keyframe.RelativeTo.CreateAnimationInput(this._animatableTarget, this._rendererProperty.Property, this._rendererProperty.SourceMask);
if (keyframe.Multiply && value != Vector2.UnitVector)
{
AnimationInput animationInput2 = (AnimationInput)new ConstantAnimationInput(value);
AnimationInput animationInput2 = new ConstantAnimationInput(value);
animationInput1 *= animationInput2;
}
else if (!keyframe.Multiply && value != Vector2.Zero)
{
AnimationInput animationInput2 = (AnimationInput)new ConstantAnimationInput(value);
AnimationInput animationInput2 = new ConstantAnimationInput(value);
animationInput1 += animationInput2;
}
}
else
animationInput1 = (AnimationInput)new ConstantAnimationInput(value);
animationInput1 = new ConstantAnimationInput(value);
this._animation.AddKeyframe(new AnimationKeyframe(keyframe.Time, animationInput1, AnimationProxy.GenerateInterpolation(keyframe.Interpolation)));
}
@@ -128,17 +128,17 @@ namespace Microsoft.Iris.Animations
animationInput1 = keyframe.RelativeTo.CreateAnimationInput(this._animatableTarget, this._rendererProperty.Property, this._rendererProperty.SourceMask);
if (keyframe.Multiply && value != Vector3.UnitVector)
{
AnimationInput animationInput2 = (AnimationInput)new ConstantAnimationInput(value);
AnimationInput animationInput2 = new ConstantAnimationInput(value);
animationInput1 *= animationInput2;
}
else if (!keyframe.Multiply && value != Vector3.Zero)
{
AnimationInput animationInput2 = (AnimationInput)new ConstantAnimationInput(value);
AnimationInput animationInput2 = new ConstantAnimationInput(value);
animationInput1 += animationInput2;
}
}
else
animationInput1 = (AnimationInput)new ConstantAnimationInput(value);
animationInput1 = new ConstantAnimationInput(value);
this._animation.AddKeyframe(new AnimationKeyframe(keyframe.Time, animationInput1, AnimationProxy.GenerateInterpolation(keyframe.Interpolation)));
}
@@ -152,17 +152,17 @@ namespace Microsoft.Iris.Animations
animationInput1 = keyframe.RelativeTo.CreateAnimationInput(this._animatableTarget, this._rendererProperty.Property, this._rendererProperty.SourceMask);
if (keyframe.Multiply && value != Vector4.UnitVector)
{
AnimationInput animationInput2 = (AnimationInput)new ConstantAnimationInput(value);
AnimationInput animationInput2 = new ConstantAnimationInput(value);
animationInput1 *= animationInput2;
}
else if (!keyframe.Multiply && value != Vector4.Zero)
{
AnimationInput animationInput2 = (AnimationInput)new ConstantAnimationInput(value);
AnimationInput animationInput2 = new ConstantAnimationInput(value);
animationInput1 += animationInput2;
}
}
else
animationInput1 = (AnimationInput)new ConstantAnimationInput(value);
animationInput1 = new ConstantAnimationInput(value);
this._animation.AddKeyframe(new AnimationKeyframe(keyframe.Time, animationInput1, AnimationProxy.GenerateInterpolation(keyframe.Interpolation)));
}
@@ -182,12 +182,12 @@ namespace Microsoft.Iris.Animations
animationInput1 = keyframe.RelativeTo.CreateAnimationInput(this._animatableTarget, this._rendererProperty.Property, this._rendererProperty.SourceMask);
if (value != Rotation.Default)
{
AnimationInput animationInput2 = (AnimationInput)new ConstantAnimationInput(new Quaternion(value.Axis, value.AngleRadians));
AnimationInput animationInput2 = new ConstantAnimationInput(new Quaternion(value.Axis, value.AngleRadians));
animationInput1 *= animationInput2;
}
}
else
animationInput1 = (AnimationInput)new ConstantAnimationInput(new Quaternion(value.Axis, value.AngleRadians));
animationInput1 = new ConstantAnimationInput(new Quaternion(value.Axis, value.AngleRadians));
AnimationInterpolation interpolation = AnimationProxy.GenerateInterpolation(keyframe.Interpolation);
interpolation.UseSphericalCombination = true;
this._animation.AddKeyframe(new AnimationKeyframe(keyframe.Time, animationInput1, interpolation));
@@ -266,7 +266,7 @@ namespace Microsoft.Iris.Animations
{
if (!this.Session.IsValid)
return;
DeferredCall.Post(DispatchPriority.Housekeeping, AnimationProxy.s_deferredCleanupWorker, (object)this);
DeferredCall.Post(DispatchPriority.Housekeeping, AnimationProxy.s_deferredCleanupWorker, this);
}
}
@@ -276,10 +276,10 @@ namespace Microsoft.Iris.Animations
if (this._animation != null)
{
this._animation.AsyncNotifyEvent -= new AsyncNotifyHandler(this.OnAsyncNotification);
this._animation.UnregisterUsage((object)this);
this._animation = (IKeyframeAnimation)null;
this._animation.UnregisterUsage(this);
this._animation = null;
}
this._animatableTarget = (IAnimatable)null;
this._animatableTarget = null;
if (!withNotifications)
return;
this._activeSequence.OnDetachChildAnimation(this, progress);
@@ -291,29 +291,29 @@ namespace Microsoft.Iris.Animations
Interpolation interpolation)
{
if (interpolation == null)
return (AnimationInterpolation)new LinearInterpolation();
return new LinearInterpolation();
switch (interpolation.Type)
{
case InterpolationType.Linear:
return (AnimationInterpolation)new LinearInterpolation();
return new LinearInterpolation();
case InterpolationType.SCurve:
return (AnimationInterpolation)new SCurveInterpolation(interpolation.Weight * 10f);
return new SCurveInterpolation(interpolation.Weight * 10f);
case InterpolationType.Exp:
return (double)interpolation.Weight > 0.0 ? (AnimationInterpolation)new ExponentialInterpolation(interpolation.Weight * 10f) : (AnimationInterpolation)new LinearInterpolation();
return interpolation.Weight > 0.0 ? new ExponentialInterpolation(interpolation.Weight * 10f) : (AnimationInterpolation)new LinearInterpolation();
case InterpolationType.Log:
return (double)interpolation.Weight > 0.0 ? (AnimationInterpolation)new LogarithmicInterpolation(interpolation.Weight * 10f) : (AnimationInterpolation)new LinearInterpolation();
return interpolation.Weight > 0.0 ? new LogarithmicInterpolation(interpolation.Weight * 10f) : (AnimationInterpolation)new LinearInterpolation();
case InterpolationType.Sine:
return (AnimationInterpolation)new SineInterpolation();
return new SineInterpolation();
case InterpolationType.Cosine:
return (AnimationInterpolation)new CosineInterpolation();
return new CosineInterpolation();
case InterpolationType.Bezier:
return (AnimationInterpolation)new BezierInterpolation(interpolation.BezierHandle1, interpolation.BezierHandle2);
return new BezierInterpolation(interpolation.BezierHandle1, interpolation.BezierHandle2);
case InterpolationType.EaseIn:
return (AnimationInterpolation)new EaseInInterpolation(interpolation.Weight * 10f, interpolation.EasePercent);
return new EaseInInterpolation(interpolation.Weight * 10f, interpolation.EasePercent);
case InterpolationType.EaseOut:
return (AnimationInterpolation)new EaseOutInterpolation(interpolation.Weight * 10f, interpolation.EasePercent);
return new EaseOutInterpolation(interpolation.Weight * 10f, interpolation.EasePercent);
default:
return (AnimationInterpolation)new LinearInterpolation();
return new LinearInterpolation();
}
}
UIX/Microsoft/Iris/Animations/AnimationSystem.cs
+4 -4
View File
@@ -25,11 +25,11 @@ namespace Microsoft.Iris.Animations
public static AnimationTemplate GetSequenceByID(string id)
{
if (!AnimationSystem.Enabled)
return (AnimationTemplate)null;
return AnimationSystem.SequenceExists(id) ? (AnimationTemplate)AnimationSystem._sequences[id].Clone() : (AnimationTemplate)null;
return null;
return AnimationSystem.SequenceExists(id) ? (AnimationTemplate)AnimationSystem._sequences[id].Clone() : null;
}
public static AnimationTemplate GetSequenceByIDAlways(string id) => AnimationSystem.SequenceExists(id) ? (AnimationTemplate)AnimationSystem._sequences[id].Clone() : (AnimationTemplate)null;
public static AnimationTemplate GetSequenceByIDAlways(string id) => AnimationSystem.SequenceExists(id) ? (AnimationTemplate)AnimationSystem._sequences[id].Clone() : null;
public static void AddSequenceByID(string id, AnimationTemplate seq)
{
@@ -40,7 +40,7 @@ namespace Microsoft.Iris.Animations
public static void ClearSequences() => AnimationSystem._sequences = new Dictionary<string, AnimationTemplate>();
public static ICollection GetAllSequences() => (ICollection)AnimationSystem._sequences.Values;
public static ICollection GetAllSequences() => _sequences.Values;
public static bool Enabled => AnimationSystem._enabledFlag;
UIX/Microsoft/Iris/Animations/AnimationTemplate.cs
+16 -16
View File
@@ -23,7 +23,7 @@ namespace Microsoft.Iris.Animations
private StopCommandSet _StopCommandSet;
public AnimationTemplate()
: this((string)null)
: this(null)
{
}
@@ -50,7 +50,7 @@ namespace Microsoft.Iris.Animations
public ActiveSequence Play(ViewItem vi)
{
AnimationArgs args = new AnimationArgs(vi);
return this.Play(vi.RendererVisual, ref args, (EventHandler)null);
return this.Play(vi.RendererVisual, ref args, null);
}
public ActiveSequence Play(
@@ -58,7 +58,7 @@ namespace Microsoft.Iris.Animations
ref AnimationArgs args,
EventHandler onCompleteHandler)
{
ActiveSequence instance = this.CreateInstance((IAnimatable)visualTarget, ref args);
ActiveSequence instance = this.CreateInstance(visualTarget, ref args);
if (onCompleteHandler != null)
instance.AnimationCompleted += onCompleteHandler;
instance.Play();
@@ -73,7 +73,7 @@ namespace Microsoft.Iris.Animations
if (this._keyframesList.Count == 0)
{
ErrorManager.ReportError("Animations must have at least 2 keyframes to play");
return (ActiveSequence)null;
return null;
}
ActiveSequence aseq = new ActiveSequence(this, animatableTarget, UISession.Default);
AnimationProxy[] animationProxyArray = new AnimationProxy[20];
@@ -84,7 +84,7 @@ namespace Microsoft.Iris.Animations
int type = (int)keyframes.Type;
keyframes.AddtoAnimation(this, aseq, property, ref args, ref animationProxyArray[type]);
++numArray[type];
flagArray[type] |= (double)keyframes.Time == 0.0;
flagArray[type] |= keyframes.Time == 0.0;
}
for (int index = 0; index <= 19; ++index)
{
@@ -93,24 +93,24 @@ namespace Microsoft.Iris.Animations
AnimationType animationType = (AnimationType)index;
if (numArray[index] < 2)
{
ErrorManager.ReportError("Animation must have at least 2 keyframes of each type. Attempted to play an animation that only has {0} keyframe of type '{1}'.", (object)numArray[index], (object)animationType);
return (ActiveSequence)null;
ErrorManager.ReportError("Animation must have at least 2 keyframes of each type. Attempted to play an animation that only has {0} keyframe of type '{1}'.", numArray[index], animationType);
return null;
}
if (!flagArray[index])
{
ErrorManager.ReportError("Animation must have a keyframe at time 0.0 for each type. Attempted to play an animation that has no start keyframe for type '{0}'", (object)animationType);
return (ActiveSequence)null;
ErrorManager.ReportError("Animation must have a keyframe at time 0.0 for each type. Attempted to play an animation that has no start keyframe for type '{0}'", animationType);
return null;
}
}
}
return !aseq.ValidatePlayable() ? (ActiveSequence)null : aseq;
return !aseq.ValidatePlayable() ? null : aseq;
}
public ActiveSequence CreateInstance(
IAnimatable animatableTarget,
ref AnimationArgs args)
{
return this.CreateInstance(animatableTarget, (string)null, ref args);
return this.CreateInstance(animatableTarget, null, ref args);
}
public void AddKeyframe(BaseKeyframe key) => this.InsertSorted(key);
@@ -124,7 +124,7 @@ namespace Microsoft.Iris.Animations
if (AnimationTemplate.IsSameTime(time, keyframes.Time))
return keyframes;
}
return (BaseKeyframe)null;
return null;
}
public void RemoveKeyframe(float time)
@@ -158,7 +158,7 @@ namespace Microsoft.Iris.Animations
{
AnimationTemplate anim = new AnimationTemplate(this._debugIDName);
this.CloneWorker(anim);
return (object)anim;
return anim;
}
protected virtual void CloneWorker(AnimationTemplate anim)
@@ -174,7 +174,7 @@ namespace Microsoft.Iris.Animations
{
for (int index = this._keyframesList.Count - 1; index >= 0; --index)
{
if ((double)this._keyframesList[index].Time < (double)key.Time)
if (_keyframesList[index].Time < (double)key.Time)
{
this._keyframesList.Insert(index + 1, key);
return;
@@ -186,9 +186,9 @@ namespace Microsoft.Iris.Animations
private static bool IsSameTime(float t1, float t2)
{
float num = t2 - t1;
if ((double)num < 0.0)
if (num < 0.0)
num *= -1f;
return (double)num < 9.99999974737875E-05;
return num < 9.99999974737875E-05;
}
internal class AnimationTemplateComparer : IComparer
UIX/Microsoft/Iris/Animations/BaseFloatKeyframe.cs
+2 -2
View File
@@ -18,7 +18,7 @@ namespace Microsoft.Iris.Animations
ref AnimationArgs args)
{
float effectiveValue = this.GetEffectiveValue(targetObject, this._value, ref args);
animation.AddFloatKeyframe((BaseKeyframe)this, effectiveValue);
animation.AddFloatKeyframe(this, effectiveValue);
}
public float Value
@@ -27,7 +27,7 @@ namespace Microsoft.Iris.Animations
set => this._value = value;
}
public override object ObjectValue => (object)this.Value;
public override object ObjectValue => Value;
public virtual float GetEffectiveValue(
IAnimatable targetObject,
UIX/Microsoft/Iris/Animations/BaseKeyframe.cs
+2 -2
View File
@@ -72,7 +72,7 @@ namespace Microsoft.Iris.Animations
public BaseKeyframe Clone() => (BaseKeyframe)this.MemberwiseClone();
object ICloneable.Clone() => (object)this.Clone();
object ICloneable.Clone() => this.Clone();
protected abstract void PopulateAnimationWorker(
IAnimatable targetObject,
@@ -126,7 +126,7 @@ namespace Microsoft.Iris.Animations
if (this._relative != RelativeTo.Absolute)
{
stringBuilder.Append(" RelativeTo=\"");
stringBuilder.Append((object)this._relative);
stringBuilder.Append(_relative);
stringBuilder.Append("\"");
}
stringBuilder.Append(" Value=\"");
UIX/Microsoft/Iris/Animations/BaseRotationKeyframe.cs
+2 -2
View File
@@ -21,7 +21,7 @@ namespace Microsoft.Iris.Animations
ref AnimationArgs args)
{
Rotation effectiveValue = this.GetEffectiveValue(targetObject, this._valueRotation, ref args);
animation.AddRotationKeyframe((BaseKeyframe)this, effectiveValue);
animation.AddRotationKeyframe(this, effectiveValue);
}
public Rotation Value
@@ -30,7 +30,7 @@ namespace Microsoft.Iris.Animations
set => this._valueRotation = value;
}
public override object ObjectValue => (object)this.Value;
public override object ObjectValue => Value;
public virtual Rotation GetEffectiveValue(
IAnimatable targetObject,
UIX/Microsoft/Iris/Animations/BaseVector2Keyframe.cs
+2 -2
View File
@@ -18,7 +18,7 @@ namespace Microsoft.Iris.Animations
ref AnimationArgs args)
{
Vector2 effectiveValue = this.GetEffectiveValue(targetObject, this._valueVector, ref args);
animation.AddVector2Keyframe((BaseKeyframe)this, effectiveValue);
animation.AddVector2Keyframe(this, effectiveValue);
}
public Vector2 Value
@@ -27,7 +27,7 @@ namespace Microsoft.Iris.Animations
set => this._valueVector = value;
}
public override object ObjectValue => (object)this.Value;
public override object ObjectValue => Value;
public virtual Vector2 GetEffectiveValue(
IAnimatable targetObject,
UIX/Microsoft/Iris/Animations/BaseVector3Keyframe.cs
+2 -2
View File
@@ -18,7 +18,7 @@ namespace Microsoft.Iris.Animations
ref AnimationArgs args)
{
Vector3 effectiveValue = this.GetEffectiveValue(targetObject, this._valueVector, ref args);
animation.AddVector3Keyframe((BaseKeyframe)this, effectiveValue);
animation.AddVector3Keyframe(this, effectiveValue);
}
public Vector3 Value
@@ -27,7 +27,7 @@ namespace Microsoft.Iris.Animations
set => this._valueVector = value;
}
public override object ObjectValue => (object)this.Value;
public override object ObjectValue => Value;
public virtual Vector3 GetEffectiveValue(
IAnimatable targetObject,
UIX/Microsoft/Iris/Animations/BaseVector4Keyframe.cs
+2 -2
View File
@@ -18,7 +18,7 @@ namespace Microsoft.Iris.Animations
ref AnimationArgs args)
{
Vector4 effectiveValue = this.GetEffectiveValue(targetObject, this._valueVector, ref args);
animation.AddVector4Keyframe((BaseKeyframe)this, effectiveValue);
animation.AddVector4Keyframe(this, effectiveValue);
}
public Vector4 Value
@@ -27,7 +27,7 @@ namespace Microsoft.Iris.Animations
set => this._valueVector = value;
}
public override object ObjectValue => (object)this.Value;
public override object ObjectValue => Value;
public virtual Vector4 GetEffectiveValue(
IAnimatable targetObject,

Some files were not shown because too many files have changed in this diff Show More