Skip to content
This repository has been archived by the owner on Mar 30, 2019. It is now read-only.

Commit

Permalink
[Toolkit] Fixed assemblies compilation for WP8 platform (#398).
Browse files Browse the repository at this point in the history
  • Loading branch information
ArtiomCiumac committed Jun 4, 2014
1 parent 8cbe348 commit b407610
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,12 @@
// THE SOFTWARE.

#if WP8

using System;
using System.Diagnostics;
using System.Runtime.InteropServices;
using System.Windows;
using System.Windows.Controls;

using SharpDX.Mathematics;
using SharpDX.Direct3D11;
using SharpDX.Toolkit.Graphics;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
#if WP8

#if WP8
using System;
using System.Diagnostics;
using System.Runtime.InteropServices;
Expand All @@ -27,6 +27,8 @@
using SharpDX.Direct3D11;
using SharpDX.Toolkit.Graphics;
using Texture2D = SharpDX.Direct3D11.Texture2D;
using SharpDX.Mathematics;
using SharpDX.Mathematics.Interop;

namespace SharpDX.Toolkit
{
Expand Down Expand Up @@ -124,12 +126,12 @@ void IDrawingSurfaceContentProviderNative.Disconnect()
//Utilities.Dispose(ref host);
}

void IDrawingSurfaceContentProviderNative.PrepareResources(DateTime presentTargetTime, out Bool isContentDirty)
void IDrawingSurfaceContentProviderNative.PrepareResources(DateTime presentTargetTime, out RawBool isContentDirty)
{
isContentDirty = true;
}

void IDrawingSurfaceContentProviderNative.GetTexture(Size2F surfaceSize, out DrawingSurfaceSynchronizedTexture synchronizedTexture, out RectangleF textureSubRectangle)
void IDrawingSurfaceContentProviderNative.GetTexture(Size2F surfaceSize, out DrawingSurfaceSynchronizedTexture synchronizedTexture, out RawRectangleF textureSubRectangle)
{
try
{
Expand Down Expand Up @@ -174,7 +176,8 @@ void IDrawingSurfaceContentProviderNative.GetTexture(Size2F surfaceSize, out Dra
}

// Set output parameters.
textureSubRectangle = new RectangleF(0f, 0f, surfaceSize.Width, surfaceSize.Height);
var output = new RectangleF(0f, 0f, surfaceSize.Width, surfaceSize.Height);
textureSubRectangle = new RawRectangleF { Left = output.Left, Top = output.Top, Right = output.Right, Bottom = output.Bottom };
synchronizedTexture = this.synchronizedTexture;
}

Expand Down
3 changes: 2 additions & 1 deletion Source/Toolkit/SharpDX.Toolkit.Input/PointerPlatformWP8.cs
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@
// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
// THE SOFTWARE.
#if WP8

using SharpDX.Mathematics;
#if WP8
using System;
using System.Windows.Controls;
using Windows.Phone.Input.Interop;
Expand Down

0 comments on commit b407610

Please sign in to comment.