Skip to content

Commit

Permalink
Fixes for the grid3d actions not preserving the background render con…
Browse files Browse the repository at this point in the history
…tents properly. Also fixed placement of lens/distortion effects.
  • Loading branch information
totallyevil committed Apr 15, 2014
1 parent 718e974 commit 93a246d
Show file tree
Hide file tree
Showing 6 changed files with 183 additions and 185 deletions.
6 changes: 3 additions & 3 deletions cocos2d/platform/CCDrawManager.cs
Expand Up @@ -303,8 +303,8 @@ private static void UpdatePresentationParametrs(GraphicsDeviceManager manager)
pp.BackBufferWidth = manager.PreferredBackBufferWidth;
pp.BackBufferHeight = manager.PreferredBackBufferHeight;
pp.BackBufferFormat = manager.PreferredBackBufferFormat;
pp.DepthStencilFormat = manager.PreferredDepthStencilFormat;
pp.RenderTargetUsage = RenderTargetUsage.DiscardContents; //??? DiscardContents fast
pp.DepthStencilFormat = manager.PreferredDepthStencilFormat;
pp.RenderTargetUsage = m_presentationParameters.RenderTargetUsage;
}

public static void InitializeDisplay(Game game, GraphicsDeviceManager graphics, DisplayOrientation supportedOrientations)
Expand All @@ -328,7 +328,7 @@ public static void Init(IGraphicsDeviceService service)
m_graphicsService = service;
m_presentationParameters = new PresentationParameters()
{
RenderTargetUsage = RenderTargetUsage.DiscardContents,
RenderTargetUsage = RenderTargetUsage.PreserveContents,
DepthStencilFormat = DepthFormat.Depth24Stencil8,
BackBufferFormat = SurfaceFormat.Color
};
Expand Down
214 changes: 106 additions & 108 deletions tests/cocos2d-xna.Tests.WindowsGL.sln
@@ -1,108 +1,106 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cocos2d.WindowsGL", "..\cocos2d\cocos2d.WindowsGL.csproj", "{0C0AFDFF-A4E4-49F4-B6DB-A761B0DB64A8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tests.WindowsGL", "tests\tests.WindowsGL.csproj", "{4EF34363-1190-4444-9F4B-7A262B397EE8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network.Windows", "..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.Windows.csproj", "{AE483C29-042E-4226-BA52-D247CE7676DA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Framework.WindowsGL", "..\MonoGame\MonoGame.Framework\MonoGame.Framework.WindowsGL.csproj", "{7DE47032-A904-4C29-BD22-2D235E8D91BA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "box2d.WindowsGL", "..\box2d\box2d.WindowsGL.csproj", "{B81B6701-7A78-4846-BF6F-04E0591F0F38}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|Mixed Platforms = Debug|Mixed Platforms
Debug|Windows Phone = Debug|Windows Phone
Debug|x86 = Debug|x86
Debug|Xbox 360 = Debug|Xbox 360
Release|Any CPU = Release|Any CPU
Release|Mixed Platforms = Release|Mixed Platforms
Release|Windows Phone = Release|Windows Phone
Release|x86 = Release|x86
Release|Xbox 360 = Release|Xbox 360
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0C0AFDFF-A4E4-49F4-B6DB-A761B0DB64A8}.Debug|Any CPU.ActiveCfg = Debug|x86
{0C0AFDFF-A4E4-49F4-B6DB-A761B0DB64A8}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{0C0AFDFF-A4E4-49F4-B6DB-A761B0DB64A8}.Debug|Mixed Platforms.Build.0 = Debug|x86
{0C0AFDFF-A4E4-49F4-B6DB-A761B0DB64A8}.Debug|Windows Phone.ActiveCfg = Debug|x86
{0C0AFDFF-A4E4-49F4-B6DB-A761B0DB64A8}.Debug|x86.ActiveCfg = Debug|x86
{0C0AFDFF-A4E4-49F4-B6DB-A761B0DB64A8}.Debug|x86.Build.0 = Debug|x86
{0C0AFDFF-A4E4-49F4-B6DB-A761B0DB64A8}.Debug|Xbox 360.ActiveCfg = Debug|x86
{0C0AFDFF-A4E4-49F4-B6DB-A761B0DB64A8}.Release|Any CPU.ActiveCfg = Release|x86
{0C0AFDFF-A4E4-49F4-B6DB-A761B0DB64A8}.Release|Mixed Platforms.ActiveCfg = Release|x86
{0C0AFDFF-A4E4-49F4-B6DB-A761B0DB64A8}.Release|Mixed Platforms.Build.0 = Release|x86
{0C0AFDFF-A4E4-49F4-B6DB-A761B0DB64A8}.Release|Windows Phone.ActiveCfg = Release|x86
{0C0AFDFF-A4E4-49F4-B6DB-A761B0DB64A8}.Release|x86.ActiveCfg = Release|x86
{0C0AFDFF-A4E4-49F4-B6DB-A761B0DB64A8}.Release|x86.Build.0 = Release|x86
{0C0AFDFF-A4E4-49F4-B6DB-A761B0DB64A8}.Release|Xbox 360.ActiveCfg = Release|x86
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Debug|Any CPU.ActiveCfg = Debug|x86
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Debug|Mixed Platforms.Build.0 = Debug|x86
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Debug|Windows Phone.ActiveCfg = Debug|x86
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Debug|x86.ActiveCfg = Debug|x86
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Debug|x86.Build.0 = Debug|x86
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Debug|Xbox 360.ActiveCfg = Debug|x86
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Release|Any CPU.ActiveCfg = Release|x86
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Release|Mixed Platforms.ActiveCfg = Release|x86
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Release|Mixed Platforms.Build.0 = Release|x86
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Release|Windows Phone.ActiveCfg = Release|x86
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Release|x86.ActiveCfg = Release|x86
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Release|x86.Build.0 = Release|x86
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Release|Xbox 360.ActiveCfg = Release|x86
{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Windows Phone.ActiveCfg = Debug|Any CPU
{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|x86.ActiveCfg = Debug|Any CPU
{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|x86.Build.0 = Debug|Any CPU
{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Xbox 360.ActiveCfg = Debug|Any CPU
{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|Any CPU.Build.0 = Release|Any CPU
{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|Windows Phone.ActiveCfg = Release|Any CPU
{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|x86.ActiveCfg = Release|Any CPU
{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|Xbox 360.ActiveCfg = Release|Any CPU
{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Debug|Mixed Platforms.Build.0 = Debug|x86
{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Debug|Windows Phone.ActiveCfg = Debug|Any CPU
{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Debug|x86.ActiveCfg = Debug|x86
{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Debug|x86.Build.0 = Debug|x86
{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Debug|Xbox 360.ActiveCfg = Debug|Any CPU
{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Release|Any CPU.Build.0 = Release|Any CPU
{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Release|Mixed Platforms.ActiveCfg = Release|x86
{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Release|Mixed Platforms.Build.0 = Release|x86
{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Release|Windows Phone.ActiveCfg = Release|Any CPU
{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Release|x86.ActiveCfg = Release|x86
{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Release|x86.Build.0 = Release|x86
{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Release|Xbox 360.ActiveCfg = Release|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Debug|Windows Phone.ActiveCfg = Debug|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Debug|x86.ActiveCfg = Debug|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Debug|Xbox 360.ActiveCfg = Debug|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|Any CPU.Build.0 = Release|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|Windows Phone.ActiveCfg = Release|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|x86.ActiveCfg = Release|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|Xbox 360.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = cocos2d\cocos2d.WindowsGL.csproj
EndGlobalSection
EndGlobal

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2012
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "cocos2d.WindowsGL", "..\cocos2d\cocos2d.WindowsGL.csproj", "{0C0AFDFF-A4E4-49F4-B6DB-A761B0DB64A8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tests.WindowsGL", "tests\tests.WindowsGL.csproj", "{4EF34363-1190-4444-9F4B-7A262B397EE8}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lidgren.Network.Windows", "..\MonoGame\ThirdParty\Lidgren.Network\Lidgren.Network.Windows.csproj", "{AE483C29-042E-4226-BA52-D247CE7676DA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoGame.Framework.WindowsGL", "..\MonoGame\MonoGame.Framework\MonoGame.Framework.WindowsGL.csproj", "{7DE47032-A904-4C29-BD22-2D235E8D91BA}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "box2d.WindowsGL", "..\box2d\box2d.WindowsGL.csproj", "{B81B6701-7A78-4846-BF6F-04E0591F0F38}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Debug|Mixed Platforms = Debug|Mixed Platforms
Debug|Windows Phone = Debug|Windows Phone
Debug|x86 = Debug|x86
Debug|Xbox 360 = Debug|Xbox 360
Release|Any CPU = Release|Any CPU
Release|Mixed Platforms = Release|Mixed Platforms
Release|Windows Phone = Release|Windows Phone
Release|x86 = Release|x86
Release|Xbox 360 = Release|Xbox 360
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0C0AFDFF-A4E4-49F4-B6DB-A761B0DB64A8}.Debug|Any CPU.ActiveCfg = Debug|x86
{0C0AFDFF-A4E4-49F4-B6DB-A761B0DB64A8}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{0C0AFDFF-A4E4-49F4-B6DB-A761B0DB64A8}.Debug|Mixed Platforms.Build.0 = Debug|x86
{0C0AFDFF-A4E4-49F4-B6DB-A761B0DB64A8}.Debug|Windows Phone.ActiveCfg = Debug|x86
{0C0AFDFF-A4E4-49F4-B6DB-A761B0DB64A8}.Debug|x86.ActiveCfg = Debug|x86
{0C0AFDFF-A4E4-49F4-B6DB-A761B0DB64A8}.Debug|x86.Build.0 = Debug|x86
{0C0AFDFF-A4E4-49F4-B6DB-A761B0DB64A8}.Debug|Xbox 360.ActiveCfg = Debug|x86
{0C0AFDFF-A4E4-49F4-B6DB-A761B0DB64A8}.Release|Any CPU.ActiveCfg = Release|x86
{0C0AFDFF-A4E4-49F4-B6DB-A761B0DB64A8}.Release|Mixed Platforms.ActiveCfg = Release|x86
{0C0AFDFF-A4E4-49F4-B6DB-A761B0DB64A8}.Release|Mixed Platforms.Build.0 = Release|x86
{0C0AFDFF-A4E4-49F4-B6DB-A761B0DB64A8}.Release|Windows Phone.ActiveCfg = Release|x86
{0C0AFDFF-A4E4-49F4-B6DB-A761B0DB64A8}.Release|x86.ActiveCfg = Release|x86
{0C0AFDFF-A4E4-49F4-B6DB-A761B0DB64A8}.Release|x86.Build.0 = Release|x86
{0C0AFDFF-A4E4-49F4-B6DB-A761B0DB64A8}.Release|Xbox 360.ActiveCfg = Release|x86
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Debug|Any CPU.ActiveCfg = Debug|x86
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Debug|Mixed Platforms.Build.0 = Debug|x86
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Debug|Windows Phone.ActiveCfg = Debug|x86
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Debug|x86.ActiveCfg = Debug|x86
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Debug|x86.Build.0 = Debug|x86
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Debug|Xbox 360.ActiveCfg = Debug|x86
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Release|Any CPU.ActiveCfg = Release|x86
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Release|Mixed Platforms.ActiveCfg = Release|x86
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Release|Mixed Platforms.Build.0 = Release|x86
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Release|Windows Phone.ActiveCfg = Release|x86
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Release|x86.ActiveCfg = Release|x86
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Release|x86.Build.0 = Release|x86
{4EF34363-1190-4444-9F4B-7A262B397EE8}.Release|Xbox 360.ActiveCfg = Release|x86
{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Windows Phone.ActiveCfg = Debug|Any CPU
{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|x86.ActiveCfg = Debug|Any CPU
{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|x86.Build.0 = Debug|Any CPU
{AE483C29-042E-4226-BA52-D247CE7676DA}.Debug|Xbox 360.ActiveCfg = Debug|Any CPU
{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|Any CPU.Build.0 = Release|Any CPU
{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|Windows Phone.ActiveCfg = Release|Any CPU
{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|x86.ActiveCfg = Release|Any CPU
{AE483C29-042E-4226-BA52-D247CE7676DA}.Release|Xbox 360.ActiveCfg = Release|Any CPU
{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Debug|Windows Phone.ActiveCfg = Debug|Any CPU
{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Debug|x86.ActiveCfg = Debug|Any CPU
{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Debug|Xbox 360.ActiveCfg = Debug|Any CPU
{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Release|Any CPU.Build.0 = Release|Any CPU
{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Release|Windows Phone.ActiveCfg = Release|Any CPU
{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Release|x86.ActiveCfg = Release|Any CPU
{7DE47032-A904-4C29-BD22-2D235E8D91BA}.Release|Xbox 360.ActiveCfg = Release|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Debug|Windows Phone.ActiveCfg = Debug|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Debug|x86.ActiveCfg = Debug|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Debug|Xbox 360.ActiveCfg = Debug|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|Any CPU.Build.0 = Release|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|Mixed Platforms.Build.0 = Release|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|Windows Phone.ActiveCfg = Release|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|x86.ActiveCfg = Release|Any CPU
{B81B6701-7A78-4846-BF6F-04E0591F0F38}.Release|Xbox 360.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = cocos2d\cocos2d.WindowsGL.csproj
EndGlobalSection
EndGlobal
74 changes: 37 additions & 37 deletions tests/tests/classes/tests/EffectsAdvancedTest/Effect1.cs
@@ -1,38 +1,38 @@
using Cocos2D;

namespace tests
{
public class Effect1 : EffectAdvanceTextLayer
{
public override void OnEnter()
{
base.OnEnter();

CCNode target = GetChildByTag(EffectAdvanceScene.kTagBackground);

// To reuse a grid the grid size and the grid type must be the same.
// in this case:
// Lens3D is Grid3D and it's size is (15,10)
// Waves3D is Grid3D and it's size is (15,10)

CCSize size = CCDirector.SharedDirector.WinSize;
CCActionInterval lens = new CCLens3D(0.0f, new CCGridSize(15, 10), new CCPoint(size.Width / 2, size.Height / 2), 240);
CCActionInterval waves = new CCWaves3D(10, new CCGridSize(15, 10), 18, 15);


CCFiniteTimeAction reuse = new CCReuseGrid(1);
CCActionInterval delay = new CCDelayTime (8);

CCActionInterval orbit = new CCOrbitCamera(5, 1, 2, 0, 180, 0, -90);
CCFiniteTimeAction orbit_back = orbit.Reverse();

target.RunAction(new CCRepeatForever ((new CCSequence(orbit, orbit_back))));
target.RunAction(new CCSequence(lens, delay, reuse, waves));
}

public override string title()
{
return "Lens + Waves3d and OrbitCamera";
}
}
using Cocos2D;

namespace tests
{
public class Effect1 : EffectAdvanceTextLayer
{
public override void OnEnter()
{
base.OnEnter();

CCNode target = GetChildByTag(EffectAdvanceScene.kTagBackground);

// To reuse a grid the grid size and the grid type must be the same.
// in this case:
// Lens3D is Grid3D and it's size is (15,10)
// Waves3D is Grid3D and it's size is (15,10)

CCSize size = CCDirector.SharedDirector.WinSize;
CCActionInterval lens = new CCLens3D(0.0f, new CCGridSize(15, 10), new CCPoint(size.Width / 4, size.Height / 4), 240);
CCActionInterval waves = new CCWaves3D(10, new CCGridSize(15, 10), 18, 15);


CCFiniteTimeAction reuse = new CCReuseGrid(1);
CCActionInterval delay = new CCDelayTime (8);

CCActionInterval orbit = new CCOrbitCamera(5, 1, 2, 0, 180, 0, -90);
CCFiniteTimeAction orbit_back = orbit.Reverse();

target.RunAction(new CCRepeatForever ((new CCSequence(orbit, orbit_back))));
target.RunAction(new CCSequence(lens, delay, reuse, waves));
}

public override string title()
{
return "Lens + Waves3d and OrbitCamera";
}
}
}

0 comments on commit 93a246d

Please sign in to comment.