X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=src%2FTitleLayer.hh;h=e2b74d37e2ce2802f2e9fbdfc83b05ad9150bbb9;hp=da4b4c5a5b2b712b01e8239976a2be8c1963f4bd;hb=c78934a448d0126709fccec3d5a636b3baa87da4;hpb=a4debfe4a5f5d339410788971b698ba00cb7f09c

diff --git a/src/TitleLayer.hh b/src/TitleLayer.hh
index da4b4c5..e2b74d3 100644
--- a/src/TitleLayer.hh
+++ b/src/TitleLayer.hh
@@ -1,30 +1,13 @@
 
-/*******************************************************************************
-
- Copyright (c) 2009, Charles McGarvey
- All rights reserved.
- 
- Redistribution   and   use  in  source  and  binary  forms,  with  or  without
- modification, are permitted provided that the following conditions are met:
- 
-   * Redistributions  of  source  code  must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-   * Redistributions  in binary form must reproduce the above copyright notice,
-     this  list of conditions and the following disclaimer in the documentation
-     and/or other materials provided with the distribution.
- 
- THIS  SOFTWARE  IS  PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- AND  ANY  EXPRESS  OR  IMPLIED  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED.  IN  NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
- FOR  ANY  DIRECT,  INDIRECT,  INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES  (INCLUDING,  BUT  NOT  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES;  LOSS  OF  USE,  DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED  AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR  TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-*******************************************************************************/
+/*]  Copyright (c) 2009-2010, Charles McGarvey  [**************************
+**]  All rights reserved.
+*
+* vi:ts=4 sw=4 tw=75
+*
+* Distributable under the terms and conditions of the 2-clause BSD license;
+* see the file COPYING for a complete text of the license.
+*
+**************************************************************************/
 
 #ifndef _TITLELAYER_HH_
 #define _TITLELAYER_HH_
@@ -32,21 +15,23 @@
 #include <boost/shared_ptr.hpp>
 
 #include <Moof/Interpolator.hh>
-#include <Moof/Layer.hh>
 #include <Moof/Math.hh>
+#include <Moof/View.hh>
 
 
 class TitleLayer;
 typedef boost::shared_ptr<TitleLayer> TitleLayerP;
 
-struct TitleLayer : public Mf::Layer
+class TitleLayer : public Mf::View
 {
+public:
+
 	static TitleLayerP alloc()
 	{
 		return TitleLayerP(new TitleLayer);
 	}
 
-	void pushed(Mf::Engine& engine);
+	void didAddToView();
 
 	void update(Mf::Scalar t, Mf::Scalar dt);
 	void draw(Mf::Scalar alpha) const;
@@ -54,14 +39,10 @@ struct TitleLayer : public Mf::Layer
 
 private:
 
-	Mf::Lerp fadeIn;
-	Mf::Engine* engine;
-
-	Mf::LayerP gameLayer;
+	Mf::Lerp 		mFadeIn;
+	Mf::ViewP		mGameLayer;
 };
 
 
 #endif // _TITLELAYER_HH_
 
-/** vim: set ts=4 sw=4 tw=80: *************************************************/
-