diff --git a/CHANGES.md b/CHANGES.md index f4593f81..d9c9d0c5 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -20,7 +20,7 @@ - Added more interactivity to L15.AbstractTrace: ability to show/hide generator; ability to pause/resume trace. - Fixed Earth rotation with mouse left button in L16.SphereCamera. - Added showing all bombs when game is lost in L17.Minesweeper. -- Removed 20.ManagedLights and 24.CursorControl due to lack of support. +- Removed 20.ManagedLights, 24.CursorControl and L19.CustomSceneNodeAnimator due to lack of support. - Removed unused media: d3d8.psh and d3d8.vsh. ## Changes in r538 (final commit on SF) diff --git a/IrrlichtLime.sln b/IrrlichtLime.sln index 8949c941..773e7a10 100644 --- a/IrrlichtLime.sln +++ b/IrrlichtLime.sln @@ -77,8 +77,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "L17.Minesweeper", "examples EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "L18.LightningShots", "examples\L18.LightningShots\L18.LightningShots.csproj", "{91D210C0-D78B-4285-B10F-01036BDDB4B5}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "L19.CustomSceneNodeAnimator", "examples\L19.CustomSceneNodeAnimator\L19.CustomSceneNodeAnimator.csproj", "{E348C23E-45E1-4A4A-BE2B-9A6AB73AE4D6}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Win32 = Debug|Win32 @@ -461,16 +459,6 @@ Global {91D210C0-D78B-4285-B10F-01036BDDB4B5}.Release|x64.Build.0 = Release|x64 {91D210C0-D78B-4285-B10F-01036BDDB4B5}.Release|x86.ActiveCfg = Release|x86 {91D210C0-D78B-4285-B10F-01036BDDB4B5}.Release|x86.Build.0 = Release|x86 - {E348C23E-45E1-4A4A-BE2B-9A6AB73AE4D6}.Debug|Win32.ActiveCfg = Debug|x86 - {E348C23E-45E1-4A4A-BE2B-9A6AB73AE4D6}.Debug|x64.ActiveCfg = Debug|x64 - {E348C23E-45E1-4A4A-BE2B-9A6AB73AE4D6}.Debug|x64.Build.0 = Debug|x64 - {E348C23E-45E1-4A4A-BE2B-9A6AB73AE4D6}.Debug|x86.ActiveCfg = Debug|x86 - {E348C23E-45E1-4A4A-BE2B-9A6AB73AE4D6}.Debug|x86.Build.0 = Debug|x86 - {E348C23E-45E1-4A4A-BE2B-9A6AB73AE4D6}.Release|Win32.ActiveCfg = Release|x86 - {E348C23E-45E1-4A4A-BE2B-9A6AB73AE4D6}.Release|x64.ActiveCfg = Release|x64 - {E348C23E-45E1-4A4A-BE2B-9A6AB73AE4D6}.Release|x64.Build.0 = Release|x64 - {E348C23E-45E1-4A4A-BE2B-9A6AB73AE4D6}.Release|x86.ActiveCfg = Release|x86 - {E348C23E-45E1-4A4A-BE2B-9A6AB73AE4D6}.Release|x86.Build.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/examples/L19.CustomSceneNodeAnimator/L19.CustomSceneNodeAnimator.csproj b/examples/L19.CustomSceneNodeAnimator/L19.CustomSceneNodeAnimator.csproj deleted file mode 100644 index 079677ef..00000000 --- a/examples/L19.CustomSceneNodeAnimator/L19.CustomSceneNodeAnimator.csproj +++ /dev/null @@ -1,85 +0,0 @@ - - - - Debug - x86 - 8.0.30703 - 2.0 - {E348C23E-45E1-4A4A-BE2B-9A6AB73AE4D6} - Exe - Properties - L19.CustomSceneNodeAnimator - L19.CustomSceneNodeAnimator - v4.0 - Client - 512 - - - x86 - true - full - false - ..\..\bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - x86 - pdbonly - true - ..\..\bin\Release\ - TRACE - prompt - 4 - - - true - ..\..\bin\Debug-x64\ - DEBUG;TRACE - full - x64 - prompt - true - true - - - ..\..\bin\Release-x64\ - TRACE - true - pdbonly - x64 - prompt - true - true - false - - - - - - - - - - - - - - - - - {4F6EF8E3-F26F-49DB-867D-FD10FB083B0D} - IrrlichtLime - False - - - - - \ No newline at end of file diff --git a/examples/L19.CustomSceneNodeAnimator/Program.cs b/examples/L19.CustomSceneNodeAnimator/Program.cs deleted file mode 100644 index 443be12b..00000000 --- a/examples/L19.CustomSceneNodeAnimator/Program.cs +++ /dev/null @@ -1,139 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -using IrrlichtLime; -using IrrlichtLime.Core; -using IrrlichtLime.Video; -using IrrlichtLime.Scene; -using IrrlichtLime.GUI; - -namespace L19.CustomSceneNodeAnimator -{ - class Program - { - - static SceneNodeAnimator customAnimator; - static IrrlichtDevice device; - - static void Main(string[] args) - { - device = IrrlichtDevice.CreateDevice(DriverType.OpenGL, new Dimension2Di(640, 480), 16, false); - - VideoDriver driver = device.VideoDriver; - SceneManager smgr = device.SceneManager; - - smgr.AddCameraSceneNode(null, new Vector3Df(0, -40, 0), new Vector3Df(0)); - - smgr.AddLightSceneNode(null, new Vector3Df(3f, 4f, 1f)); - smgr.AmbientLight = new Colorf(0.3f, 0.3f, 0.4f); - - MeshSceneNode node = smgr.AddCubeSceneNode(); - node.SetMaterialTexture(0, driver.GetTexture("../../media/stones.jpg")); - - customAnimator = new SampleSceneNodeAnimator(); - - if (customAnimator != null) - { - node.AddAnimator(customAnimator); - - //usually, we would drop it, but we keep it so the user can pause the animation by pressing space - //customAnimator.Drop(); - //customAnimator = null; - } - - node = null; - - device.OnEvent += new IrrlichtDevice.EventHandler(device_OnEvent); - - int frames = 0; - while (device.Run()) - { - driver.BeginScene(ClearBufferFlag.All, new Color(100, 100, 100)); - smgr.DrawAll(); - driver.EndScene(); - - if (++frames == 100) - { - device.SetWindowCaption(String.Format( - "Custom Scene Node - Irrlicht Engine [{0}] fps: {1}", - driver.Name, driver.FPS)); - - frames = 0; - } - } - - //now we really don't need it anymore - customAnimator.Drop(); - customAnimator = null; - device.Drop(); - } - - static bool device_OnEvent(Event evnt) - { - if (evnt.Type == EventType.Key) - if (evnt.Key.Char == ' ') - { - customAnimator.SetEnabled(!customAnimator.Enabled, device.Timer.Time); - return true; - } - return false; - } - } - - class SampleSceneNodeAnimator : SceneNodeAnimator -#if DEBUG - , IDisposable //Only extend IDisposable in debug mode. This is only for demonstration. You only extend IDisposable if you need it as well in the release. -#endif - { - public SampleSceneNodeAnimator() - : base(true) - { - this.OnAnimateNode += new AnimateNodeEventHandler(SampleSceneNodeAnimator_OnAnimateNode); - this.OnGetFinished += new GetFinishedEventHandler(SampleSceneNodeAnimator_OnGetFinished); - this.OnCreateClone += new CreateCloneEventHandler(SampleSceneNodeAnimator_OnCreateClone); - this.OnIsEventReceiverEnabled += new IsEventReceiverEnabledEventHandler(SampleSceneNodeAnimator_OnIsEventReceiverEnabled); - } - - bool SampleSceneNodeAnimator_OnIsEventReceiverEnabled() - { - //Does not receive events from camera. - return false; - } - - void SampleSceneNodeAnimator_OnAnimateNode(SceneNode node, uint time) - { - if (node == null) - return; - //calculate new time without pause and relative to the start time - int newTime = ((int)time - (int)(StartTime + PauseTimeSum)); - //simply move up and down - node.Position = new Vector3Df((float)Math.Sin((double)newTime / 1000) * 5, 0, 0); - } - - bool SampleSceneNodeAnimator_OnGetFinished() - { - //Never finishes. - return false; - } - - SceneNodeAnimator SampleSceneNodeAnimator_OnCreateClone(SceneNode node, SceneManager newManager) - { - //We don't have to copy any attributes. - //The properties Enabled, StartTime, PauseTimeStart and PauseTime are copied automaticly. - return new SampleSceneNodeAnimator(); - } - -#if DEBUG //Only compiles in debug mode - public void Dispose() - { - //This method is called, when the scene node is being deleted. You can use it for cleanup purpose. - //It is called immediatly when the node's reference count is 0, unlike a finalizer, which is called after a random amount of time. - //It only works, if you inherit IDisposable. - Console.WriteLine(ToString() + " disposed!"); - Console.ReadKey(); - } -#endif - } -} diff --git a/examples/L19.CustomSceneNodeAnimator/Properties/AssemblyInfo.cs b/examples/L19.CustomSceneNodeAnimator/Properties/AssemblyInfo.cs deleted file mode 100644 index be8c0606..00000000 --- a/examples/L19.CustomSceneNodeAnimator/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// Allgemeine Informationen über eine Assembly werden über die folgenden -// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern, -// die mit einer Assembly verknüpft sind. -[assembly: AssemblyTitle("L19.CustomSceneNodeAnimator")] -[assembly: AssemblyDescription("")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("L19.CustomSceneNodeAnimator")] -[assembly: AssemblyCopyright("Copyright © 2014")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar -// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von -// COM zugreifen müssen, legen Sie das ComVisible-Attribut für diesen Typ auf "true" fest. -[assembly: ComVisible(false)] - -// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird -[assembly: Guid("3da5cf2c-7e50-4c18-9f9f-e83d70f7704b")] - -// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten: -// -// Hauptversion -// Nebenversion -// Buildnummer -// Revision -// -// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern -// übernehmen, indem Sie "*" eingeben: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")]