Skip to content

Commit 28e505d

Browse files
author
Thomas Gravgaard
committed
Made the XBox version compile.
1 parent 03e38dd commit 28e505d

File tree

9 files changed

+383
-4
lines changed

9 files changed

+383
-4
lines changed

‎Framework/PressPlay.FFWD/DebugCamera.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ public override int Draw(Microsoft.Xna.Framework.Graphics.GraphicsDevice device,
7979
RaycastHit[] hits = Physics.PointcastAll(castPos, cam.cullingMask);
8080
if (hits.Length > 0)
8181
{
82-
Debug.Display("Over", String.Join("\n", hits.Select(h => h.collider.ToString()).OrderBy(s => s)));
82+
Debug.Display("Over", String.Join("\n", hits.Select(h => h.collider.ToString()).OrderBy(s => s).ToArray()));
8383
}
8484
else
8585
{

‎Framework/PressPlay.FFWD/PressPlay.FFWD.X360.csproj

+315
Large diffs are not rendered by default.

‎Tests/FFWD.Unity.Tests/FFWD.Unity.Tests.Scripts/FFWD.Unity.Tests.Scripts.X360.csproj

+6
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,12 @@
6262
<Reference Include="System.Xml" />
6363
<Reference Include="System.Xml.Linq" />
6464
</ItemGroup>
65+
<ItemGroup>
66+
<ProjectReference Include="..\..\..\Framework\PressPlay.FFWD\PressPlay.FFWD.X360.csproj">
67+
<Project>{1034C53A-128D-4F83-BAC0-706151EAEC94}</Project>
68+
<Name>PressPlay.FFWD.X360</Name>
69+
</ProjectReference>
70+
</ItemGroup>
6571
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
6672
<Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\Microsoft.Xna.GameStudio.targets" />
6773
<!--

‎Tests/FFWD.Unity.Tests/FFWD.Unity.Tests.Scripts/GameObjects/CloningAGameObject.cs

+5-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,9 @@
33
using Microsoft.Xna.Framework.Content;
44
using System;
55
using System.Collections.Generic;
6+
#if !XBOX
67
using FluentAssertions;
8+
#endif
79

810
public class CloningAGameObject : MonoBehaviour {
911

@@ -16,6 +18,7 @@ public override void Start () {
1618

1719
// Update is called once per frame
1820
public override void Update () {
21+
#if !XBOX
1922
if (!tested.HasValue) {
2023
tested = true;
2124

@@ -58,5 +61,6 @@ public override void Update () {
5861
Destroy(helpClone.gameObject);
5962
}
6063
}
61-
}
64+
#endif
65+
}
6266
}

‎Tests/FFWD.Unity.Tests/FFWD.Unity.Tests.sln

+50
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FFWD.Unity.Tests.Scripts.X3
2323
EndProject
2424
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PipelineDebug", "PipelineDebug\PipelineDebug.csproj", "{63CBEA8E-F9AA-4FD9-AF08-4322A20491B4}"
2525
EndProject
26+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PressPlay.FFWD.X360", "..\..\Framework\PressPlay.FFWD\PressPlay.FFWD.X360.csproj", "{1034C53A-128D-4F83-BAC0-706151EAEC94}"
27+
EndProject
2628
Global
2729
GlobalSection(SolutionConfigurationPlatforms) = preSolution
2830
Debug - component profiler|Mixed Platforms = Debug - component profiler|Mixed Platforms
@@ -607,6 +609,54 @@ Global
607609
{63CBEA8E-F9AA-4FD9-AF08-4322A20491B4}.Release-LOWDEF|x86.ActiveCfg = Release|x86
608610
{63CBEA8E-F9AA-4FD9-AF08-4322A20491B4}.Release-LOWDEF|x86.Build.0 = Release|x86
609611
{63CBEA8E-F9AA-4FD9-AF08-4322A20491B4}.Release-LOWDEF|Xbox 360.ActiveCfg = Release|x86
612+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Debug - component profiler|Mixed Platforms.ActiveCfg = Debug|Xbox 360
613+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Debug - component profiler|Mixed Platforms.Build.0 = Debug|Xbox 360
614+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Debug - component profiler|Windows Phone.ActiveCfg = Debug|Xbox 360
615+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Debug - component profiler|x86.ActiveCfg = Debug|Xbox 360
616+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Debug - component profiler|Xbox 360.ActiveCfg = Debug|Xbox 360
617+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Debug - component profiler|Xbox 360.Build.0 = Debug|Xbox 360
618+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Debug- component profiler|Mixed Platforms.ActiveCfg = Debug|Xbox 360
619+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Debug- component profiler|Mixed Platforms.Build.0 = Debug|Xbox 360
620+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Debug- component profiler|Windows Phone.ActiveCfg = Debug|Xbox 360
621+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Debug- component profiler|x86.ActiveCfg = Debug|Xbox 360
622+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Debug- component profiler|Xbox 360.ActiveCfg = Debug|Xbox 360
623+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Debug- component profiler|Xbox 360.Build.0 = Debug|Xbox 360
624+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Debug|Mixed Platforms.ActiveCfg = Debug|Xbox 360
625+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Debug|Mixed Platforms.Build.0 = Debug|Xbox 360
626+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Debug|Windows Phone.ActiveCfg = Debug|Xbox 360
627+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Debug|x86.ActiveCfg = Debug|Xbox 360
628+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Debug|Xbox 360.ActiveCfg = Debug|Xbox 360
629+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Debug|Xbox 360.Build.0 = Debug|Xbox 360
630+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.DebugWithContent|Mixed Platforms.ActiveCfg = Debug|Xbox 360
631+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.DebugWithContent|Mixed Platforms.Build.0 = Debug|Xbox 360
632+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.DebugWithContent|Windows Phone.ActiveCfg = Debug|Xbox 360
633+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.DebugWithContent|x86.ActiveCfg = Debug|Xbox 360
634+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.DebugWithContent|Xbox 360.ActiveCfg = Debug|Xbox 360
635+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.DebugWithContent|Xbox 360.Build.0 = Debug|Xbox 360
636+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.PipelineDebug|Mixed Platforms.ActiveCfg = Debug|Xbox 360
637+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.PipelineDebug|Mixed Platforms.Build.0 = Debug|Xbox 360
638+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.PipelineDebug|Windows Phone.ActiveCfg = Debug|Xbox 360
639+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.PipelineDebug|x86.ActiveCfg = Debug|Xbox 360
640+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.PipelineDebug|Xbox 360.ActiveCfg = Debug|Xbox 360
641+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.PipelineDebug|Xbox 360.Build.0 = Debug|Xbox 360
642+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Release all levels unlocked|Mixed Platforms.ActiveCfg = Release|Xbox 360
643+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Release all levels unlocked|Mixed Platforms.Build.0 = Release|Xbox 360
644+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Release all levels unlocked|Windows Phone.ActiveCfg = Release|Xbox 360
645+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Release all levels unlocked|x86.ActiveCfg = Release|Xbox 360
646+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Release all levels unlocked|Xbox 360.ActiveCfg = Release|Xbox 360
647+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Release all levels unlocked|Xbox 360.Build.0 = Release|Xbox 360
648+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Release|Mixed Platforms.ActiveCfg = Release|Xbox 360
649+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Release|Mixed Platforms.Build.0 = Release|Xbox 360
650+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Release|Windows Phone.ActiveCfg = Release|Xbox 360
651+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Release|x86.ActiveCfg = Release|Xbox 360
652+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Release|Xbox 360.ActiveCfg = Release|Xbox 360
653+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Release|Xbox 360.Build.0 = Release|Xbox 360
654+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Release-LOWDEF|Mixed Platforms.ActiveCfg = Release|Xbox 360
655+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Release-LOWDEF|Mixed Platforms.Build.0 = Release|Xbox 360
656+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Release-LOWDEF|Windows Phone.ActiveCfg = Release|Xbox 360
657+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Release-LOWDEF|x86.ActiveCfg = Release|Xbox 360
658+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Release-LOWDEF|Xbox 360.ActiveCfg = Release|Xbox 360
659+
{1034C53A-128D-4F83-BAC0-706151EAEC94}.Release-LOWDEF|Xbox 360.Build.0 = Release|Xbox 360
610660
EndGlobalSection
611661
GlobalSection(SolutionProperties) = preSolution
612662
HideSolutionNode = FALSE

‎Tests/FFWD.Unity.Tests/FFWD.Unity.Tests/FFWD.Unity.Tests.X360.csproj

+4
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,10 @@
5858
<XnaCompressContent>true</XnaCompressContent>
5959
</PropertyGroup>
6060
<ItemGroup>
61+
<ProjectReference Include="..\..\..\Framework\PressPlay.FFWD\PressPlay.FFWD.X360.csproj">
62+
<Project>{1034C53A-128D-4F83-BAC0-706151EAEC94}</Project>
63+
<Name>PressPlay.FFWD.X360</Name>
64+
</ProjectReference>
6165
<ProjectReference Include="..\FFWD.Unity.Tests.Scripts\FFWD.Unity.Tests.Scripts.X360.csproj">
6266
<Project>{1C8FE13D-BEAF-437C-908A-5AC780102B31}</Project>
6367
<Name>FFWD.Unity.Tests.Scripts.X360</Name>

‎Tests/Unity.Tests/Assets/Assets/Leafs.png

23.8 KB
Loading

‎Tests/Unity.Tests/Unity.Tests-csharp.sln

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Global
2323
GlobalSection(SolutionProperties) = preSolution
2424
HideSolutionNode = FALSE
2525
EndGlobalSection
26-
GlobalSection(MonoDevelopProperties) = preSolution
26+
GlobalSection(MonoDevelopProperties) = preSolution
2727
StartupItem = Assembly-CSharp.csproj
2828
Policies = $0
2929
$0.TextStylePolicy = $1

‎Tests/Unity.Tests/Unity.Tests.sln

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Global
2323
GlobalSection(SolutionProperties) = preSolution
2424
HideSolutionNode = FALSE
2525
EndGlobalSection
26-
GlobalSection(MonoDevelopProperties) = preSolution
26+
GlobalSection(MonoDevelopProperties) = preSolution
2727
StartupItem = Assembly-CSharp.csproj
2828
Policies = $0
2929
$0.TextStylePolicy = $1

0 commit comments

Comments
 (0)